同步到1.8.0

orange-demo-multi-service/zz-resource/config-data/application-dev.yaml

@@ -143,6 +143,8 @@ redis:
     # 单位毫秒。分布式锁的超时检测时长。
     # 如果一次锁内操作超该毫秒数，或在释放锁之前异常退出，Redis会在该时长之后主动删除该锁使用的key。
     lockWatchdogTimeout: 60000
+    # redis 密码，空可以不填。
+    password:
     pool:
       # 连接池数量。
       poolSize: 20

orange-demo-multi-service/zz-resource/config-data/course-class-dev.yaml

@@ -25,15 +25,13 @@ sequence:
   # zk中生成WorkNode的路径。不同的业务可以使用不同的路径，以免冲突。
   zkPath: com/orange/demo
 
-# mybatis的基本配置
-mybatis:
-  mapperLocations: classpath:com/orange/demo/*/dao/mapper/*Mapper.xml
-  typeAliasesPackage: com.orange.demo.*.model
-
-mapper:
-  mappers: tk.mybatis.mapper.common.Mapper,tk.mybatis.mapper.additional.insert.InsertListMapper
-  not-empty: false
-  identity: MYSQL
+mybatis-plus:
+  mapper-locations: classpath:com/orange/demo/*/dao/mapper/*Mapper.xml
+  type-aliases-package: com.orange.demo.*.model
+  global-config:
+    db-config:
+      logic-delete-value: -1
+      logic-not-delete-value: 1
 
 pagehelper:
   helperDialect: mysql

orange-demo-multi-service/zz-resource/config-data/stats-dev.yaml

@@ -25,15 +25,13 @@ sequence:
   # zk中生成WorkNode的路径。不同的业务可以使用不同的路径，以免冲突。
   zkPath: com/orange/demo
 
-# mybatis的基本配置
-mybatis:
-  mapperLocations: classpath:com/orange/demo/*/dao/mapper/*Mapper.xml
-  typeAliasesPackage: com.orange.demo.*.model
-
-mapper:
-  mappers: tk.mybatis.mapper.common.Mapper,tk.mybatis.mapper.additional.insert.InsertListMapper
-  not-empty: false
-  identity: MYSQL
+mybatis-plus:
+  mapper-locations: classpath:com/orange/demo/*/dao/mapper/*Mapper.xml
+  type-aliases-package: com.orange.demo.*.model
+  global-config:
+    db-config:
+      logic-delete-value: -1
+      logic-not-delete-value: 1
 
 pagehelper:
   helperDialect: mysql

orange-demo-multi-service/zz-resource/config-data/upms-dev.yaml

@@ -27,14 +27,13 @@ sequence:
   # zk中生成WorkNode的路径。不同的业务可以使用不同的路径，以免冲突。
   zkPath: com/orange/demo
 
-mybatis:
-  mapperLocations: classpath:com/orange/demo/*/dao/mapper/*Mapper.xml,com/orange/demo/common/datasync/dao/mapper/*Mapper.xml,com/orange/demo/common/log/dao/mapper/*Mapper.xml
-  typeAliasesPackage: com.orange.demo.*.model,com.orange.demo.common.datasync.model,com.orange.demo.common.log.model
-
-mapper:
-  mappers: tk.mybatis.mapper.common.Mapper,tk.mybatis.mapper.additional.insert.InsertListMapper
-  not-empty: false
-  identity: MYSQL
+mybatis-plus:
+  mapper-locations: classpath:com/orange/demo/*/dao/mapper/*Mapper.xml,com/orange/demo/common/datasync/dao/mapper/*Mapper.xml,com/orange/demo/common/log/dao/mapper/*Mapper.xml
+  type-aliases-package: com.orange.demo.*.model,com.orange.demo.common.datasync.model,com.orange.demo.common.log.model
+  global-config:
+    db-config:
+      logic-delete-value: -1
+      logic-not-delete-value: 1
 
 pagehelper:
   helperDialect: mysql