Merge branch 'dev/knowledge' into debug

config-server/src/main/resources/shared/knowledgeman-service-dev.yml

@@ -8,9 +8,9 @@ spring:
       driverClassName: com.mysql.jdbc.Driver
       driver-class-name: com.mysql.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.235:3306/diagbot-med?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: lantone
+      password: diagbot@20180822
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5

docker-compose.yml

@@ -155,4 +155,16 @@ services:
     environment:
     - spring.profiles.active=dev
     - myuri=eureka1
+    restart: always
+  knowledge-service:
+    image: 192.168.2.236:5000/diagbotcloud/knowledge-service:0.0.1-SNAPSHOT
+    depends_on:
+    #      - config1
+    - eureka1
+    volumes:
+    - "/etc/localtime:/etc/localtime:ro"
+    #      - "data/diagbotcloud/logs:/logs"
+    environment:
+    - spring.profiles.active=dev
+    - myuri=eureka1
     restart: always