Merge branch 'shaoyf/master' of http://192.168.2.236:10080/louhr/qc into shaoyf/master

Conflicts:
	dbanaly/src/main/resources/application-dev.yml
	kernel/src/main/resources/bootstrap.yml

dbanaly/src/main/resources/application-dev.yml

@@ -5,9 +5,9 @@ spring:
     druid:
       lantone:
         driver-class-name: com.mysql.jdbc.Driver
-        url: jdbc:mysql://192.168.2.122:3306/qc?useUnicode=true&characterEncoding=utf8
+        url: jdbc:mysql://192.168.2.121:3306/qc?useUnicode=true&characterEncoding=utf8&useSSL=false
         username: root
-        password: lantone
+        password: QuGDHNG35r
         initial-size: 8
         min-idle: 1
         max-active: 20
@@ -26,7 +26,7 @@ spring:
         use-global-data-source-stat: true
   redis:
     database: 10
-    host: 192.168.2.122
+    host: 192.168.2.121
     port: 6379
     password: lantone
     timeout: 2000
@@ -37,9 +37,13 @@ spring:
         max-wait: -1ms
         max-idle: 8
 
-mybatis-plus:
-  type-aliases-package: com.lantone.qc.dbanaly.lt.entity
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+xml-is-encryped: true
 
-xml-is-encryped: true
+CRF:
+  url: http://192.168.2.234:3456/api/mr_info_ex/entity_predict
+
+Similarity:
+  url: http://192.168.2.234:3456/api/mr_info_ex/similarity
+
+ChiefPresentSimilarity:
+  url: http://192.168.2.234:3456/api/mr_info_ex/chief_present_similarity

kernel/src/main/resources/bootstrap.yml

@@ -12,19 +12,15 @@ spring:
       charset: UTF-8
       enabled: true
   profiles:
-    active: db
+    active: local
 
 qc:
   hospital_id: 2
 
-CRF:
-  url: http://192.168.2.234:3456/api/mr_info_ex/entity_predict
-
-Similarity:
-  url: http://192.168.2.234:3456/api/mr_info_ex/similarity
-
-ChiefPresentSimilarity:
-  url: http://192.168.2.234:3456/api/mr_info_ex/chief_present_similarity
-
 logging:          # 日志
-  config: classpath:logback-spring.xml
+  config: classpath:logback-spring.xml
+
+mybatis-plus:
+  type-aliases-package: com.lantone.qc.dbanaly.lt.entity
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl