Merge branch 'master' of ssh://10.10.100.21/source/platform-bi-web

Dockerfile

@@ -9,7 +9,7 @@ FROM ubuntu
 # MAINTAINER name Chunteng Xiao
 RUN apt-get clean
 RUN apt-get update
-RUN apt-get install software-properties-common
+RUN apt-get install -y software-properties-common
 RUN add-apt-repository ppa:certbot/certbot
 RUN apt-get update
 RUN apt-get -f install -y nodejs nginx npm curl unzip python-certbot-nginx 
@@ -22,6 +22,6 @@ COPY sonar-runner.properties ./sonar-scanner-3.2.0.1227-linux/conf/sonar-scanner
 RUN npm install cnpm -g --registry=https://registry.npm.taobao.org
 RUN cnpm install gitbook-cli -g 
 ADD default /etc/nginx/sites-available
-RUN certbot --nginx
-RUN certbot renew --dry-run
+# RUN certbot --nginx
+# RUN certbot renew --dry-run
 EXPOSE 80

gitbook/dev/book.json

@@ -1,5 +1,5 @@
 {
-    "plugins": [
-        "yahei"
-    ] 
+    "pdfOptions": {
+        "fontFamily": "Microsoft Yahei"
+    }
 }

gitbook/product/book.json

@@ -0,0 +1,5 @@
+{
+    "pdfOptions": {
+        "fontFamily": "Microsoft Yahei"
+    }
+}

src/components/myPage/fav.jsx

@@ -10,36 +10,8 @@ class Fav extends React.Component {
     }
 
     render() {
-        const columns = [{
-            title: '名称',
-            key: 'c1',
-            dataIndex: 'name'
-        }, {
-            title: '创建人',
-            key: 'c2',
-            dataIndex: 'c2'
-        }, {
-            title: '最近修改时间',
-            key: 'c3',
-            dataIndex: 'c3'
-        }, {
-            title: '操作',
-            key: 'c4',
-            dataIndex: 'c4'
-        }];
-
-        const data = [{
-            key: '1',
-            c1: 'sssss',
-            c2: 'aaaaa'
-        }, {
-            key: '2',
-            c1: '啊啊啊啊',
-            c2: 'aaaadddbb'
-        }]
-
         return (
-            <Table columns={columns} dataSource={data}/>
+            <div>收藏夹</div>
         );
     }
 }

src/components/myPage/homePage.jsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import { Table } from 'antd';
 
 class HomePage extends React.Component {
     constructor(props) {
@@ -10,36 +9,8 @@ class HomePage extends React.Component {
     }
 
     render() {
-        const columns = [{
-            title: 'HomePage',
-            key: 'c1',
-            dataIndex: 'name'
-        }, {
-            title: '创建人',
-            key: 'c2',
-            dataIndex: 'c2'
-        }, {
-            title: '最近修改时间',
-            key: 'c3',
-            dataIndex: 'c3'
-        }, {
-            title: '操作',
-            key: 'c4',
-            dataIndex: 'c4'
-        }];
-
-        const data = [{
-            key: '1',
-            c1: 'sssss',
-            c2: 'aaaaa'
-        }, {
-            key: '2',
-            c1: '啊啊啊啊',
-            c2: 'aaaadddbb'
-        }]
-
         return (
-            <Table columns={columns} dataSource={data}/>
+            <div>主页</div>
         );
     }
 }

src/components/myPage/recent.jsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import { Table } from 'antd';
 
 class Recent extends React.Component {
     constructor(props) {
@@ -10,36 +9,8 @@ class Recent extends React.Component {
     }
 
     render() {
-        const columns = [{
-            title: '名称',
-            key: 'c1',
-            dataIndex: 'name'
-        }, {
-            title: '创建人',
-            key: 'c2',
-            dataIndex: 'c2'
-        }, {
-            title: '最近修改时间',
-            key: 'c3',
-            dataIndex: 'c3'
-        }, {
-            title: '操作',
-            key: 'c4',
-            dataIndex: 'c4'
-        }];
-
-        const data = [{
-            key: '1',
-            c1: 'sssss',
-            c2: 'aaaaa'
-        }, {
-            key: '2',
-            c1: '啊啊啊啊',
-            c2: 'aaaadddbb'
-        }]
-
         return (
-            <Table columns={columns} dataSource={data}/>
+            <div>最近打开</div>
         );
     }
 }