添加mycat配置

zen-core/src/main/kotlin/com/gxzc/zen/common/base/BaseModel.kt

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.annotations.TableField
 import com.baomidou.mybatisplus.annotations.TableId
 import com.baomidou.mybatisplus.annotations.TableLogic
 import com.baomidou.mybatisplus.enums.FieldFill
-import com.baomidou.mybatisplus.enums.FieldStrategy
 import com.baomidou.mybatisplus.enums.IdType
+import com.fasterxml.jackson.annotation.JsonFormat
 import com.fasterxml.jackson.annotation.JsonInclude
 import io.swagger.annotations.ApiModelProperty
 import java.io.Serializable
@@ -20,6 +20,7 @@ open class BaseModel : Serializable {
     companion object {
         private const val serialVersionUID = 1000000000000000001L
     }
+
     // 主键
     @TableId(type = IdType.AUTO)
     var id: Long? = null
@@ -27,6 +28,7 @@ open class BaseModel : Serializable {
     // 创建时间
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     var createTime: Date? = null
 
     // 创建人id
@@ -35,6 +37,7 @@ open class BaseModel : Serializable {
 
     // 更新时间
     @TableField(fill = FieldFill.UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     var updateTime: Date? = null
 
     // 更新人id

zen-orm/src/main/kotlin/com/gxzc/zen/Generator.kt

@@ -17,7 +17,7 @@ import java.io.File
  * @url https://noahlan.me
  */
 fun main(args: Array<String>) {
-    generate(true, "NorthLan", "newsys", DataSourceConfig().also {
+    generate(true, "NorthLan", "test", DataSourceConfig().also {
         it.dbType = DbType.MYSQL
         it.typeConvert = object : MySqlTypeConvert() {
             override fun processTypeConvert(fieldType: String?): DbColumnType {
@@ -76,14 +76,14 @@ fun generate(isKotlin: Boolean, author: String, pkgType: String, dataSourceConfi
         it.isEntityLombokModel = true
         it.isCapitalMode = false
         it.naming = NamingStrategy.underline_to_camel
-        //            setTablePrefix()
+//        it.setTablePrefix("t")
         it.superEntityClass = "com.gxzc.zen.common.base.BaseModel"
         it.setSuperEntityColumns("id", "create_by", "create_time", "update_by", "update_time", "remark", "enable")
         it.superMapperClass = "com.gxzc.zen.common.base.BaseMapper"
         it.superServiceClass = "com.gxzc.zen.common.base.BaseService"
         it.superServiceImplClass = "com.baomidou.mybatisplus.service.impl.ServiceImpl"
 //            superControllerClass = ""
-//        setInclude("user")
+//        it.setInclude("t_test")
         it.isEntityBooleanColumnRemoveIsPrefix = true
         it.logicDeleteFieldName = "enable"
 //            setExclude("")

zen-web/src/main/resources/application-orm-mycat.yml

@@ -0,0 +1,38 @@
+################## Alibaba Druid 配置 ##################
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      stat-view-servlet:
+        enabled: true
+        login-username: root
+        login-password: root
+        reset-enable: false
+      test-on-borrow: true
+      test-on-return: false
+      test-while-idle: true
+    driver-class-name: com.mysql.jdbc.Driver
+    username: archives
+    password: archives
+    url: jdbc:mysql://192.168.1.204:8066/SYS?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+
+
+###################  mybatis-plus配置  ###################
+mybatis-plus:
+  mapper-locations: classpath*:mapping/**/*.xml
+  type-aliases-package: com.gxzc.zen.api.sys.mapper,com.gxzc.zen.api.biz.mapper
+  global-config:
+    id-type: 0  #0:数据库ID自增   1:用户输入id  2:全局唯一id(IdWorker)  3:全局唯一ID(uuid)
+    db-column-underline: true
+    refresh-mapper: true
+    logic-delete-value: 0
+    logic-not-delete-value: 1
+    sql-injector: com.gxzc.zen.orm.sql.ZenSqlInjector # 自定义injector
+    meta-object-handler: com.gxzc.zen.orm.CustomMetaObjectHandler
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: true #配置的缓存的全局开关
+    lazyLoadingEnabled: true #延时加载的开关
+    multipleResultSetsEnabled: true #延时加载一个属性时会加载该对象全部属性，否则按需加载属性
+    interceptors: com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor, com.baomidou.mybatisplus.plugins.PaginationInterceptor
+    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用

zen-web/src/main/resources/application-orm.yml

@@ -4,18 +4,20 @@ orm:
 ################## Alibaba Druid 配置 ##################
 spring:
   datasource:
-#    type: com.alibaba.druid.pool.xa.DruidXADataSource
+    type: com.alibaba.druid.pool.DruidDataSource
     druid:
       stat-view-servlet:
         enabled: true
         login-username: root
         login-password: root
         reset-enable: false
-  jta:
-    atomikos:
-      properties:
-        serial-jta-transactions: false
-        enable-logging: false
+      test-on-borrow: true
+      test-on-return: false
+      test-while-idle: true
+    driver-class-name: com.mysql.jdbc.Driver
+    username: archives
+    password: archives
+    url: jdbc:mysql://192.168.1.10:3306/archives_sys?pinGlobalTxToPhysicalConnection=true&autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
 
 
 ################## 数据源 配置 ##################

zen-web/src/main/resources/application.yml

@@ -10,7 +10,7 @@ zen:
 spring:
   profiles:
     active: dev
-    include: orm,rpc,mq,cache,umps,platform,job
+    include: orm-mycat,rpc,mq,cache,umps,platform,job
 #  redis:
 #    host: localhost
 #    port: 6379