Merge branch 'dev/precSR' into dev/mix_20190806

# Conflicts:
#	config-server/src/main/resources/shared/aipt-service-local.yml
#	config-server/src/main/resources/shared/knowledgeman-service-local.yml

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

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

config-server/src/main/resources/shared/aipt-service-local.yml

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

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

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

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

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

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

@@ -83,7 +83,7 @@ mybatis-plus:
       #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
       id-type: id_worker
       #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
+      field-strategy: 1
       #驼峰下划线转换
       column-underline: true
       #数据库大写下划线转换

config-server/src/main/resources/shared/precman-service-local.yml

@@ -83,7 +83,7 @@ mybatis-plus:
       #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
       id-type: id_worker
       #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
+      field-strategy: 1
       #驼峰下划线转换
       column-underline: true
       #数据库大写下划线转换

config-server/src/main/resources/shared/precman-service-pro.yml

@@ -83,7 +83,7 @@ mybatis-plus:
       #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
       id-type: id_worker
       #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
+      field-strategy: 1
       #驼峰下划线转换
       column-underline: true
       #数据库大写下划线转换

config-server/src/main/resources/shared/precman-service-test.yml

@@ -83,7 +83,7 @@ mybatis-plus:
       #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
       id-type: id_worker
       #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
+      field-strategy: 1
       #驼峰下划线转换
       column-underline: true
       #数据库大写下划线转换