diff --git a/pom.xml b/pom.xml
index 88a3a34eb..d308fa9dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,16 +13,16 @@
<!-- Server 主项目 -->
<module>yudao-server</module>
<!-- 各种 module 拓展 -->
- <module>yudao-module-member</module>
<module>yudao-module-system</module>
<module>yudao-module-infra</module>
+<!-- <module>yudao-module-member</module>-->
<!-- <module>yudao-module-bpm</module>-->
<!-- <module>yudao-module-report</module>-->
<!-- <module>yudao-module-mp</module>-->
- <module>yudao-module-pay</module>
- <module>yudao-module-mall</module>
+<!-- <module>yudao-module-pay</module>-->
+<!-- <module>yudao-module-mall</module>-->
<!-- 示例项目 -->
- <module>yudao-example</module>
+<!-- <module>yudao-example</module>-->
</modules>
<name>${project.artifactId}</name>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java
index 5df011f02..999c8ee28 100755
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java
@@ -258,12 +258,12 @@ public class FileConfigServiceImplTest extends BaseDbUnitTest {
Long id = fileConfig.getId();
// mock 获得 Client
FileClient fileClient = new LocalFileClient(id, new LocalFileClientConfig());
- when(fileClientFactory.getFileClient(eq(0L))).thenReturn(fileClient);
+ when(fileClientFactory.getFileClient(eq(fileConfig.getId()))).thenReturn(fileClient);
// 调用，并断言
assertSame(fileClient, fileConfigService.getMasterFileClient());
// 断言缓存
- verify(fileClientFactory).createOrUpdateFileClient(eq(0L), eq(fileConfig.getStorage()),
+ verify(fileClientFactory).createOrUpdateFileClient(eq(fileConfig.getId()), eq(fileConfig.getStorage()),
eq(fileConfig.getConfig()));
}
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImplTest.java
index 5aaf43b30..ad6b6e733 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImplTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImplTest.java
@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import cn.iocoder.yudao.framework.sms.core.client.SmsClient;
-import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory;
import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult;
import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO;
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
@@ -36,7 +35,7 @@ import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.when;
@Import(SmsTemplateServiceImpl.class)
public class SmsTemplateServiceImplTest extends BaseDbUnitTest {
@@ -50,8 +49,6 @@ public class SmsTemplateServiceImplTest extends BaseDbUnitTest {
@MockBean
private SmsChannelService smsChannelService;
@MockBean
- private SmsClientFactory smsClientFactory;
- @MockBean
private SmsClient smsClient;
@Test
@@ -82,7 +79,7 @@ public class SmsTemplateServiceImplTest extends BaseDbUnitTest {
});
when(smsChannelService.getSmsChannel(eq(channelDO.getId()))).thenReturn(channelDO);
// mock 获得 API 短信模板成功
- when(smsClientFactory.getSmsClient(eq(reqVO.getChannelId()))).thenReturn(smsClient);
+ when(smsChannelService.getSmsClient(eq(reqVO.getChannelId()))).thenReturn(smsClient);
when(smsClient.getSmsTemplate(eq(reqVO.getApiTemplateId()))).thenReturn(randomPojo(SmsCommonResult.class, SmsTemplateRespDTO.class,
o -> o.setCode(GlobalErrorCodeConstants.SUCCESS.getCode())));
@@ -117,7 +114,7 @@ public class SmsTemplateServiceImplTest extends BaseDbUnitTest {
});
when(smsChannelService.getSmsChannel(eq(channelDO.getId()))).thenReturn(channelDO);
// mock 获得 API 短信模板成功
- when(smsClientFactory.getSmsClient(eq(reqVO.getChannelId()))).thenReturn(smsClient);
+ when(smsChannelService.getSmsClient(eq(reqVO.getChannelId()))).thenReturn(smsClient);
when(smsClient.getSmsTemplate(eq(reqVO.getApiTemplateId()))).thenReturn(randomPojo(SmsCommonResult.class, SmsTemplateRespDTO.class,
o -> o.setCode(GlobalErrorCodeConstants.SUCCESS.getCode())));
diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml
index 6dc1182ea..87a961778 100644
--- a/yudao-server/pom.xml
+++ b/yudao-server/pom.xml
@@ -37,11 +37,11 @@
</dependency>
<!-- 会员中心。默认注释，保证编译速度 -->
- <dependency>
- <groupId>cn.iocoder.boot</groupId>
- <artifactId>yudao-module-member-biz</artifactId>
- <version>${revision}</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>cn.iocoder.boot</groupId>-->
+<!-- <artifactId>yudao-module-member-biz</artifactId>-->
+<!-- <version>${revision}</version>-->
+<!-- </dependency>-->
<!-- 数据报表。默认注释，保证编译速度 -->
<!-- <dependency>-->
@@ -56,40 +56,40 @@
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- 支付服务。默认注释，保证编译速度 -->
- <dependency>
- <groupId>cn.iocoder.boot</groupId>
- <artifactId>yudao-module-pay-biz</artifactId>
- <version>${revision}</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>cn.iocoder.boot</groupId>-->
+<!-- <artifactId>yudao-module-pay-biz</artifactId>-->
+<!-- <version>${revision}</version>-->
+<!-- </dependency>-->
<!-- 微信公众号模块。默认注释，保证编译速度 -->
- <dependency>
- <groupId>cn.iocoder.boot</groupId>
- <artifactId>yudao-module-mp-biz</artifactId>
- <version>${revision}</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>cn.iocoder.boot</groupId>-->
+<!-- <artifactId>yudao-module-mp-biz</artifactId>-->
+<!-- <version>${revision}</version>-->
+<!-- </dependency>-->
<!-- 商城相关模块。默认注释，保证编译速度-->
- <dependency>
- <groupId>cn.iocoder.boot</groupId>
- <artifactId>yudao-module-promotion-biz</artifactId>
- <version>${revision}</version>
- </dependency>
- <dependency>
- <groupId>cn.iocoder.boot</groupId>
- <artifactId>yudao-module-product-biz</artifactId>
- <version>${revision}</version>
- </dependency>
- <dependency>
- <groupId>cn.iocoder.boot</groupId>
- <artifactId>yudao-module-trade-biz</artifactId>
- <version>${revision}</version>
- </dependency>
- <dependency>
- <groupId>cn.iocoder.boot</groupId>
- <artifactId>yudao-module-statistics-biz</artifactId>
- <version>${revision}</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>cn.iocoder.boot</groupId>-->
+<!-- <artifactId>yudao-module-promotion-biz</artifactId>-->
+<!-- <version>${revision}</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>cn.iocoder.boot</groupId>-->
+<!-- <artifactId>yudao-module-product-biz</artifactId>-->
+<!-- <version>${revision}</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>cn.iocoder.boot</groupId>-->
+<!-- <artifactId>yudao-module-trade-biz</artifactId>-->
+<!-- <version>${revision}</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>cn.iocoder.boot</groupId>-->
+<!-- <artifactId>yudao-module-statistics-biz</artifactId>-->
+<!-- <version>${revision}</version>-->
+<!-- </dependency>-->
<!-- spring boot 配置所需依赖 -->
<dependency>