From 2602505147c8e101edcf3389a41cc078c1c13e19 Mon Sep 17 00:00:00 2001 From: xiachao Date: Thu, 12 Sep 2024 11:02:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=B0=83=E6=95=B4=EF=BC=8Cmybatis=20fixe=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E8=87=B31.9.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/orm/config/MyBatisFlexConfig.java | 18 ++++++++---------- .../tskv/service/latest/LatestPgService.java | 2 +- .../service/latest/LatestPgServiceImpl.java | 6 +----- .../tskv/service/tskv/TsKvPgServiceImpl.java | 4 ++-- .../biz/service/impl/SysUserServiceImpl.java | 9 ++++----- .../oss/service/impl/SysOssServiceImpl.java | 2 +- pom.xml | 2 +- 7 files changed, 18 insertions(+), 25 deletions(-) diff --git a/common/orm/src/main/java/com/thing/common/orm/config/MyBatisFlexConfig.java b/common/orm/src/main/java/com/thing/common/orm/config/MyBatisFlexConfig.java index dc4f6da..81dc194 100644 --- a/common/orm/src/main/java/com/thing/common/orm/config/MyBatisFlexConfig.java +++ b/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()); } diff --git a/common/tskv/src/main/java/com/thing/common/tskv/service/latest/LatestPgService.java b/common/tskv/src/main/java/com/thing/common/tskv/service/latest/LatestPgService.java index 24c9cae..44ce808 100644 --- a/common/tskv/src/main/java/com/thing/common/tskv/service/latest/LatestPgService.java +++ b/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, LatestBaseService { } diff --git a/common/tskv/src/main/java/com/thing/common/tskv/service/latest/LatestPgServiceImpl.java b/common/tskv/src/main/java/com/thing/common/tskv/service/latest/LatestPgServiceImpl.java index 74029bf..577baae 100644 --- a/common/tskv/src/main/java/com/thing/common/tskv/service/latest/LatestPgServiceImpl.java +++ b/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 implements LatestPgService { @Override diff --git a/common/tskv/src/main/java/com/thing/common/tskv/service/tskv/TsKvPgServiceImpl.java b/common/tskv/src/main/java/com/thing/common/tskv/service/tskv/TsKvPgServiceImpl.java index 96a7cfe..ea4206f 100644 --- a/common/tskv/src/main/java/com/thing/common/tskv/service/tskv/TsKvPgServiceImpl.java +++ b/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 implements TsKvPgService { @Value("${calculate.am_total.offset:24}") private int offset; diff --git a/modules/thing/src/main/java/com/thing/sys/biz/service/impl/SysUserServiceImpl.java b/modules/thing/src/main/java/com/thing/sys/biz/service/impl/SysUserServiceImpl.java index c618e1f..77547d1 100644 --- a/modules/thing/src/main/java/com/thing/sys/biz/service/impl/SysUserServiceImpl.java +++ b/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 implements SysOssService { - @Value("${spring.map-bucket}") + @Value("${thing.map-bucket}") private String mapBucket; @Override diff --git a/pom.xml b/pom.xml index 6a64631..2fa0276 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ 1.9.4 4.1.0 3.0.2 - 1.9.5 + 1.9.7 0.5.0 42.6.0 8.2.0