Merge remote-tracking branch 'base-version/main' into dev

# Conflicts:
#	zt-framework/zt-spring-boot-starter-test/src/main/java/com/zt/plat/framework/test/core/ut/BaseDbUnitTest.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/sms/core/client/impl/SmsClientFactoryImpl.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/sms/core/enums/SmsChannelEnum.java
This commit is contained in:
chenbowen
2025-12-12 10:05:36 +08:00
66 changed files with 1326 additions and 211 deletions

View File

@@ -8,6 +8,10 @@ import com.zt.plat.framework.common.biz.system.sequence.SequenceCommonApi;
import com.zt.plat.framework.datasource.config.ZtDataSourceAutoConfiguration;
import com.zt.plat.framework.mybatis.config.ZtMybatisAutoConfiguration;
import com.zt.plat.framework.test.config.SqlInitializationTestConfiguration;
import com.zt.plat.module.system.mq.producer.databus.DatabusChangeProducer;
import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure;
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
import com.github.yulichang.autoconfigure.MybatisPlusJoinAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
@@ -35,6 +39,12 @@ public class BaseDbUnitTest {
@MockBean
private FeignClientFactory feignClientFactory;
/**
* Databus 变更生产者在多数 Service 中依赖,但单测无需真正发送 MQ使用 MockBean 降低装配成本。
*/
@MockBean
private DatabusChangeProducer databusChangeProducer;
@Import({
// DB 配置类
ZtDataSourceAutoConfiguration.class, // 自己的 DB 配置类

View File

@@ -0,0 +1,8 @@
package com.zt.plat.module.system.mq.producer.databus;
/**
* Minimal placeholder to allow test starter to mock DatabusChangeProducer without depending on system module.
* Real implementation lives in zt-module-system-server.
*/
public class DatabusChangeProducer {
}