配置文件优化调整，mybatis fixe 升级至1.9.7

common/orm/src/main/java/com/thing/common/orm/config/MyBatisFlexConfig.java

@@ -5,8 +5,6 @@ import com.mybatisflex.core.FlexGlobalConfig;
 import com.mybatisflex.core.audit.AuditManager;
 import com.mybatisflex.core.audit.ConsoleMessageCollector;
 import com.mybatisflex.core.keygen.KeyGenerators;
-import com.mybatisflex.core.mybatis.FlexConfiguration;
-import com.mybatisflex.spring.boot.ConfigurationCustomizer;
 import com.mybatisflex.spring.boot.MyBatisFlexCustomizer;
 import com.thing.common.orm.entity.BaseDateEntity;
 import com.thing.common.orm.entity.BaseEntity;
@@ -15,9 +13,8 @@ import com.thing.common.orm.entity.BaseTenantEntity;
 import com.thing.common.orm.listener.EntityInsertListener;
 import com.thing.common.orm.listener.EntityUpdateListener;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.logging.nologging.NoLoggingImpl;
-import org.apache.ibatis.logging.stdout.StdOutImpl;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
 
@@ -29,11 +26,12 @@ import org.springframework.context.annotation.Configuration;
 @Slf4j
 @Configuration
 @MapperScan(value = {"com.thing.**.mapper"})
-public class MyBatisFlexConfig implements ConfigurationCustomizer, MyBatisFlexCustomizer {
-    @Override
-    public void customize(FlexConfiguration configuration) {
-       configuration.setLogImpl(NoLoggingImpl.class);
-    }
+public class MyBatisFlexConfig implements MyBatisFlexCustomizer {
+
+
+    @Value("${mybatis-flex.auditEnable:false}")
+    private Boolean auditEnable;
+
 
     /**
      * Mybatis-Flex自定义初始化配置
@@ -54,7 +52,7 @@ public class MyBatisFlexConfig implements ConfigurationCustomizer, MyBatisFlexCu
         globalConfig.registerUpdateListener(new EntityUpdateListener(), BaseEntity.class, BaseDateEntity.class, BaseInfoEntity.class, BaseTenantEntity.class);
 
         // 开启审计功能
-         AuditManager.setAuditEnable(true);
+         AuditManager.setAuditEnable(auditEnable);
          AuditManager.setMessageCollector(new ConsoleMessageCollector());
     }
 

common/tskv/src/main/java/com/thing/common/tskv/service/latest/LatestPgService.java

@@ -4,7 +4,7 @@ import com.mybatisflex.annotation.UseDataSource;
 import com.mybatisflex.core.service.IService;
 import com.thing.common.tskv.entity.TsKvLatestPg;
 
-@UseDataSource("postgresql")
+@UseDataSource("pg-tskv")
 public interface LatestPgService extends IService<TsKvLatestPg>, LatestBaseService {
 
 }

common/tskv/src/main/java/com/thing/common/tskv/service/latest/LatestPgServiceImpl.java

@@ -13,7 +13,6 @@ import com.thing.common.tskv.entity.TsKvLatestPg;
 import com.thing.common.tskv.mapper.TsKvLatestPgMapper;
 import com.thing.common.tskv.service.DatabaseType;
 import com.thing.common.tskv.service.LatestNativeSQL;
-import com.thing.common.tskv.service.latest.LatestPgService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -23,14 +22,11 @@ import org.springframework.stereotype.Service;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.IntStream;
-
-import static com.thing.common.tskv.entity.table.TsKvLatestPgTableDef.TS_KV_LATEST_PG;
 
 
 @Slf4j
 @Service
-@ConditionalOnExpression("'${database.latest.type}'=='timescale' || '${database.latest.type}'=='postgresql'")
+@ConditionalOnExpression("'${database.latest.type}'=='timescale' || '${database.latest.type}'=='pg-tskv'")
 public class LatestPgServiceImpl extends ServiceImpl<TsKvLatestPgMapper, TsKvLatestPg> implements LatestPgService {
 
     @Override

common/tskv/src/main/java/com/thing/common/tskv/service/tskv/TsKvPgServiceImpl.java

@@ -46,8 +46,8 @@ import static com.thing.common.util.time.DaXiaUtils.getAmStartTime;
 
 @Slf4j
 @Service
-@UseDataSource("postgresql")
-@ConditionalOnExpression("'${database.ts_kv.type}'=='timescale' || '${database.ts_kv.type}'=='postgresql'")
+@UseDataSource("pg-tskv")
+@ConditionalOnExpression("'${database.ts_kv.type}'=='timescale' || '${database.ts_kv.type}'=='pg-tskv'")
 public class TsKvPgServiceImpl extends ServiceImpl<TsKvPgMapper, TsKvPg> implements TsKvPgService {
     @Value("${calculate.am_total.offset:24}")
     private int offset;

modules/thing/src/main/java/com/thing/sys/biz/service/impl/SysUserServiceImpl.java

@@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Maps;
 import com.mybatisflex.core.paginate.Page;
-import com.mybatisflex.core.query.QueryChain;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.thing.common.core.constants.Constant;
 import com.thing.common.core.enumeration.SuperAdminEnum;
@@ -67,17 +66,17 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUserEn
     private final SysRoleService sysRoleService;
     private static final String WECHAT_BIND_PARAMS = "WECHAT_BIND_PARAMS";
 
-    @Value("${spring.title}")
+    @Value("${thing.title}")
     private String title;
 
-    @Value("${spring.sign}")
+    @Value("${thing.sign}")
     private String sign;
 
 
-    @Value("${spring.technical}")
+    @Value("${thing.technical}")
     private String technical ;
 
-    @Value("${spring.phone}")
+    @Value("${thing.phone}")
     private String phone ;
 
     @Override

modules/thing/src/main/java/com/thing/sys/oss/service/impl/SysOssServiceImpl.java

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 @Primary
 public class SysOssServiceImpl extends BaseServiceImpl<SysOssMapper, SysOssEntity> implements SysOssService {
 
-	@Value("${spring.map-bucket}")
+	@Value("${thing.map-bucket}")
 	private String mapBucket;
 
 	@Override

pom.xml

@@ -40,7 +40,7 @@
         <commons.beanutils.version>1.9.4</commons.beanutils.version>
         <easypoi.version>4.1.0</easypoi.version>
         <jakarta.validation.version>3.0.2</jakarta.validation.version>
-        <mybatis-flex.version>1.9.5</mybatis-flex.version>
+        <mybatis-flex.version>1.9.7</mybatis-flex.version>
         <clickhouse.version>0.5.0</clickhouse.version>
         <postgresql.driver.version>42.6.0</postgresql.driver.version>
         <mysql.version>8.2.0</mysql.version>