diff --git a/cf-dependencies/pom.xml b/cf-dependencies/pom.xml index 7420aaf0a..3de284848 100644 --- a/cf-dependencies/pom.xml +++ b/cf-dependencies/pom.xml @@ -144,11 +144,6 @@ - - com.cf.imes - cf-spring-boot-starter-biz-sms - ${revision} - com.cf.imes cf-spring-boot-starter-biz-pay diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/pom.xml b/cf-framework/cf-spring-boot-starter-biz-sms/pom.xml deleted file mode 100644 index e0bb76ef8..000000000 --- a/cf-framework/cf-spring-boot-starter-biz-sms/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - com.cf.imes - cf-framework - ${revision} - - 4.0.0 - cf-spring-boot-starter-biz-sms - jar - - ${project.artifactId} - 短信拓展，支持阿里云、腾讯云 - - - - com.cf.imes - cf-common - - - - - org.springframework.boot - spring-boot-starter - - - - - io.opentracing - opentracing-util - - - - - com.cf.imes - cf-spring-boot-starter-test - test - - - - - com.google.guava - guava - true - - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - - - - jakarta.validation - jakarta.validation-api - - - - - - - com.aliyun - aliyun-java-sdk-core - - - com.aliyun - aliyun-java-sdk-dysmsapi - - - com.tencentcloudapi - tencentcloud-sdk-java-sms - - - - - diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cf-framework/cf-spring-boot-starter-biz-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index eb054df1d..000000000 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.cf.imes.framework.sms.config.ChenfengSmsAutoConfiguration diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/test/java/com/cf/imes/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java b/cf-framework/cf-spring-boot-starter-biz-sms/src/test/java/com/cf/imes/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java deleted file mode 100644 index 96e2ea1f6..000000000 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/test/java/com/cf/imes/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java +++ /dev/null @@ -1,188 +0,0 @@ -package com.cf.imes.framework.sms.core.client.impl.aliyun; - -import cn.hutool.core.lang.Pair; -import cn.hutool.core.util.ReflectUtil; -import com.cf.imes.framework.common.util.collection.MapUtils; -import com.cf.imes.framework.sms.core.client.dto.SmsReceiveRespDTO; -import com.cf.imes.framework.sms.core.client.dto.SmsSendRespDTO; -import com.cf.imes.framework.sms.core.client.dto.SmsTemplateRespDTO; -import com.cf.imes.framework.sms.core.enums.SmsTemplateAuditStatusEnum; -import com.cf.imes.framework.sms.core.property.SmsProperties; -import com.cf.imes.framework.test.core.ut.BaseMockitoUnitTest; -import com.aliyuncs.IAcsClient; -import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateRequest; -import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateResponse; -import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest; -import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; -import com.google.common.collect.Lists; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.mockito.ArgumentMatcher; -import org.mockito.InjectMocks; -import org.mockito.Mock; - -import java.time.LocalDateTime; -import java.util.List; - -import static com.cf.imes.framework.common.util.json.JsonUtils.*; -import static com.cf.imes.framework.test.core.util.RandomUtils.*; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.argThat; -import static org.mockito.Mockito.when; - -/** - * {@link AliyunSmsClient} 的单元测试 - * - * @author 晨丰科技 - */ -public class AliyunSmsClientTest extends BaseMockitoUnitTest { - - private final SmsProperties properties = new SmsProperties() - .setApiKey(randomString()) // 随机一个 apiKey，避免构建报错 - .setApiSecret(randomString()) // 随机一个 apiSecret，避免构建报错 - .setSignature("晨丰科技"); - - @InjectMocks - private final AliyunSmsClient smsClient = new AliyunSmsClient(properties); - - @Mock - private IAcsClient client; - - @Test - public void testDoInit() { - // 准备参数 - // mock 方法 - - // 调用 - smsClient.doInit(); - // 断言 - assertNotSame(client, ReflectUtil.getFieldValue(smsClient, "acsClient")); - } - - @Test - public void tesSendSms_success() throws Throwable { - // 准备参数 - Long sendLogId = randomLongId(); - String mobile = randomString(); - String apiTemplateId = randomString(); - List> templateParams = Lists.newArrayList( - new Pair<>("code", 1234), new Pair<>("op", "login")); - // mock 方法 - SendSmsResponse response = randomPojo(SendSmsResponse.class, o -> o.setCode("OK")); - when(client.getAcsResponse(argThat((ArgumentMatcher) acsRequest -> { - assertEquals(mobile, acsRequest.getPhoneNumbers()); - assertEquals(properties.getSignature(), acsRequest.getSignName()); - assertEquals(apiTemplateId, acsRequest.getTemplateCode()); - assertEquals(toJsonString(MapUtils.convertMap(templateParams)), acsRequest.getTemplateParam()); - assertEquals(sendLogId.toString(), acsRequest.getOutId()); - return true; - }))).thenReturn(response); - - // 调用 - SmsSendRespDTO result = smsClient.sendSms(sendLogId, mobile, - apiTemplateId, templateParams); - // 断言 - assertTrue(result.getSuccess()); - assertEquals(response.getRequestId(), result.getApiRequestId()); - assertEquals(response.getCode(), result.getApiCode()); - assertEquals(response.getMessage(), result.getApiMsg()); - assertEquals(response.getBizId(), result.getSerialNo()); - } - - @Test - public void tesSendSms_fail() throws Throwable { - // 准备参数 - Long sendLogId = randomLongId(); - String mobile = randomString(); - String apiTemplateId = randomString(); - List> templateParams = Lists.newArrayList( - new Pair<>("code", 1234), new Pair<>("op", "login")); - // mock 方法 - SendSmsResponse response = randomPojo(SendSmsResponse.class, o -> o.setCode("ERROR")); - when(client.getAcsResponse(argThat((ArgumentMatcher) acsRequest -> { - assertEquals(mobile, acsRequest.getPhoneNumbers()); - assertEquals(properties.getSignature(), acsRequest.getSignName()); - assertEquals(apiTemplateId, acsRequest.getTemplateCode()); - assertEquals(toJsonString(MapUtils.convertMap(templateParams)), acsRequest.getTemplateParam()); - assertEquals(sendLogId.toString(), acsRequest.getOutId()); - return true; - }))).thenReturn(response); - - // 调用 - SmsSendRespDTO result = smsClient.sendSms(sendLogId, mobile, apiTemplateId, templateParams); - // 断言 - assertFalse(result.getSuccess()); - assertEquals(response.getRequestId(), result.getApiRequestId()); - assertEquals(response.getCode(), result.getApiCode()); - assertEquals(response.getMessage(), result.getApiMsg()); - assertEquals(response.getBizId(), result.getSerialNo()); - } - - @Test - public void testParseSmsReceiveStatus() { - // 准备参数 - String text = "[\n" + - " {\n" + - " \"phone_number\" : \"13900000001\",\n" + - " \"send_time\" : \"2017-01-01 11:12:13\",\n" + - " \"report_time\" : \"2017-02-02 22:23:24\",\n" + - " \"success\" : true,\n" + - " \"err_code\" : \"DELIVERED\",\n" + - " \"err_msg\" : \"用户接收成功\",\n" + - " \"sms_size\" : \"1\",\n" + - " \"biz_id\" : \"12345\",\n" + - " \"out_id\" : \"67890\"\n" + - " }\n" + - "]"; - // mock 方法 - - // 调用 - List statuses = smsClient.parseSmsReceiveStatus(text); - // 断言 - assertEquals(1, statuses.size()); - assertTrue(statuses.get(0).getSuccess()); - assertEquals("DELIVERED", statuses.get(0).getErrorCode()); - assertEquals("用户接收成功", statuses.get(0).getErrorMsg()); - assertEquals("13900000001", statuses.get(0).getMobile()); - assertEquals(LocalDateTime.of(2017, 2, 2, 22, 23, 24), - statuses.get(0).getReceiveTime()); - assertEquals("12345", statuses.get(0).getSerialNo()); - assertEquals(67890L, statuses.get(0).getLogId()); - } - - @Test - public void testGetSmsTemplate() throws Throwable { - // 准备参数 - String apiTemplateId = randomString(); - // mock 方法 - QuerySmsTemplateResponse response = randomPojo(QuerySmsTemplateResponse.class, o -> { - o.setCode("OK"); - o.setTemplateStatus(1); // 设置模板通过 - }); - when(client.getAcsResponse(argThat((ArgumentMatcher) acsRequest -> { - assertEquals(apiTemplateId, acsRequest.getTemplateCode()); - return true; - }))).thenReturn(response); - - // 调用 - SmsTemplateRespDTO result = smsClient.getSmsTemplate(apiTemplateId); - // 断言 - assertEquals(response.getTemplateCode(), result.getId()); - assertEquals(response.getTemplateContent(), result.getContent()); - Assertions.assertEquals(SmsTemplateAuditStatusEnum.SUCCESS.getStatus(), result.getAuditStatus()); - assertEquals(response.getReason(), result.getAuditReason()); - } - - @Test - public void testConvertSmsTemplateAuditStatus() { - assertEquals(SmsTemplateAuditStatusEnum.CHECKING.getStatus(), - smsClient.convertSmsTemplateAuditStatus(0)); - assertEquals(SmsTemplateAuditStatusEnum.SUCCESS.getStatus(), - smsClient.convertSmsTemplateAuditStatus(1)); - assertEquals(SmsTemplateAuditStatusEnum.FAIL.getStatus(), - smsClient.convertSmsTemplateAuditStatus(2)); - assertThrows(IllegalArgumentException.class, () -> smsClient.convertSmsTemplateAuditStatus(3), - "未知审核状态(3)"); - } - -} diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/test/java/com/cf/imes/framework/sms/core/client/impl/tencent/TencentSmsClientTest.java b/cf-framework/cf-spring-boot-starter-biz-sms/src/test/java/com/cf/imes/framework/sms/core/client/impl/tencent/TencentSmsClientTest.java deleted file mode 100644 index 004eee6d3..000000000 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/test/java/com/cf/imes/framework/sms/core/client/impl/tencent/TencentSmsClientTest.java +++ /dev/null @@ -1,231 +0,0 @@ -package com.cf.imes.framework.sms.core.client.impl.tencent; - -import cn.hutool.core.lang.Pair; -import cn.hutool.core.util.ReflectUtil; -import com.cf.imes.framework.common.util.collection.ArrayUtils; -import com.cf.imes.framework.common.util.collection.MapUtils; -import com.cf.imes.framework.common.util.json.JsonUtils; -import com.cf.imes.framework.sms.core.client.dto.SmsReceiveRespDTO; -import com.cf.imes.framework.sms.core.client.dto.SmsSendRespDTO; -import com.cf.imes.framework.sms.core.client.dto.SmsTemplateRespDTO; -import com.cf.imes.framework.sms.core.enums.SmsTemplateAuditStatusEnum; -import com.cf.imes.framework.sms.core.property.SmsProperties; -import com.cf.imes.framework.test.core.ut.BaseMockitoUnitTest; -import com.google.common.collect.Lists; -import com.tencentcloudapi.sms.v20210111.SmsClient; -import com.tencentcloudapi.sms.v20210111.models.DescribeSmsTemplateListResponse; -import com.tencentcloudapi.sms.v20210111.models.DescribeTemplateListStatus; -import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse; -import com.tencentcloudapi.sms.v20210111.models.SendStatus; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; -import org.mockito.Mock; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -import static com.cf.imes.framework.common.util.json.JsonUtils.*; -import static com.cf.imes.framework.test.core.util.RandomUtils.*; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.argThat; -import static org.mockito.Mockito.when; - -/** - * {@link TencentSmsClient} 的单元测试 - * - * @author shiwp - */ -public class TencentSmsClientTest extends BaseMockitoUnitTest { - - private final SmsProperties properties = new SmsProperties() - .setApiKey(randomString() + " " + randomString()) // 随机一个 apiKey，避免构建报错 - .setApiSecret(randomString()) // 随机一个 apiSecret，避免构建报错 - .setSignature("晨丰科技"); - - @InjectMocks - private TencentSmsClient smsClient = new TencentSmsClient(properties); - - @Mock - private SmsClient client; - - @Test - public void testDoInit() { - // 准备参数 - // mock 方法 - - // 调用 - smsClient.doInit(); - // 断言 - assertNotSame(client, ReflectUtil.getFieldValue(smsClient, "client")); - } - - @Test - public void testRefresh() { - // 准备参数 - SmsProperties p = new SmsProperties() - .setApiKey(randomString() + " " + randomString()) // 随机一个 apiKey，避免构建报错 - .setApiSecret(randomString()) // 随机一个 apiSecret，避免构建报错 - .setSignature("晨丰科技"); - // 调用 - smsClient.refresh(p); - // 断言 - assertNotSame(client, ReflectUtil.getFieldValue(smsClient, "client")); - } - - @Test - public void testDoSendSms_success() throws Throwable { - // 准备参数 - Long sendLogId = randomLongId(); - String mobile = randomString(); - String apiTemplateId = randomString(); - List> templateParams = Lists.newArrayList( - new Pair<>("1", 1234), new Pair<>("2", "login")); - String requestId = randomString(); - String serialNo = randomString(); - // mock 方法 - SendSmsResponse response = randomPojo(SendSmsResponse.class, o -> { - o.setRequestId(requestId); - SendStatus[] sendStatuses = new SendStatus[1]; - o.setSendStatusSet(sendStatuses); - SendStatus sendStatus = new SendStatus(); - sendStatuses[0] = sendStatus; - sendStatus.setCode(TencentSmsClient.API_CODE_SUCCESS); - sendStatus.setMessage("send success"); - sendStatus.setSerialNo(serialNo); - }); - when(client.SendSms(argThat(request -> { - assertEquals(mobile, request.getPhoneNumberSet()[0]); - assertEquals(properties.getSignature(), request.getSignName()); - assertEquals(apiTemplateId, request.getTemplateId()); - assertEquals(toJsonString(ArrayUtils.toArray(new ArrayList<>(MapUtils.convertMap(templateParams).values()), String::valueOf)), - toJsonString(request.getTemplateParamSet())); - assertEquals(sendLogId, ReflectUtil.getFieldValue(JsonUtils.parseObject(request.getSessionContext(), TencentSmsClient.SessionContext.class), "logId")); - return true; - }))).thenReturn(response); - - // 调用 - SmsSendRespDTO result = smsClient.sendSms(sendLogId, mobile, apiTemplateId, templateParams); - // 断言 - assertTrue(result.getSuccess()); - assertEquals(response.getRequestId(), result.getApiRequestId()); - assertEquals(response.getSendStatusSet()[0].getCode(), result.getApiCode()); - assertEquals(response.getSendStatusSet()[0].getMessage(), result.getApiMsg()); - assertEquals(response.getSendStatusSet()[0].getSerialNo(), result.getSerialNo()); - } - - @Test - public void testDoSendSms_fail() throws Throwable { - // 准备参数 - Long sendLogId = randomLongId(); - String mobile = randomString(); - String apiTemplateId = randomString(); - List> templateParams = Lists.newArrayList( - new Pair<>("1", 1234), new Pair<>("2", "login")); - String requestId = randomString(); - String serialNo = randomString(); - // mock 方法 - SendSmsResponse response = randomPojo(SendSmsResponse.class, o -> { - o.setRequestId(requestId); - SendStatus[] sendStatuses = new SendStatus[1]; - o.setSendStatusSet(sendStatuses); - SendStatus sendStatus = new SendStatus(); - sendStatuses[0] = sendStatus; - sendStatus.setCode("ERROR"); - sendStatus.setMessage("send success"); - sendStatus.setSerialNo(serialNo); - }); - when(client.SendSms(argThat(request -> { - assertEquals(mobile, request.getPhoneNumberSet()[0]); - assertEquals(properties.getSignature(), request.getSignName()); - assertEquals(apiTemplateId, request.getTemplateId()); - assertEquals(toJsonString(ArrayUtils.toArray(new ArrayList<>(MapUtils.convertMap(templateParams).values()), String::valueOf)), - toJsonString(request.getTemplateParamSet())); - assertEquals(sendLogId, ReflectUtil.getFieldValue(JsonUtils.parseObject(request.getSessionContext(), TencentSmsClient.SessionContext.class), "logId")); - return true; - }))).thenReturn(response); - - // 调用 - SmsSendRespDTO result = smsClient.sendSms(sendLogId, mobile, apiTemplateId, templateParams); - // 断言 - assertFalse(result.getSuccess()); - assertEquals(response.getRequestId(), result.getApiRequestId()); - assertEquals(response.getSendStatusSet()[0].getCode(), result.getApiCode()); - assertEquals(response.getSendStatusSet()[0].getMessage(), result.getApiMsg()); - assertEquals(response.getSendStatusSet()[0].getSerialNo(), result.getSerialNo()); - } - - @Test - public void testParseSmsReceiveStatus() { - // 准备参数 - String text = "[\n" + - " {\n" + - " \"user_receive_time\": \"2015-10-17 08:03:04\",\n" + - " \"nationcode\": \"86\",\n" + - " \"mobile\": \"13900000001\",\n" + - " \"report_status\": \"SUCCESS\",\n" + - " \"errmsg\": \"DELIVRD\",\n" + - " \"description\": \"用户短信送达成功\",\n" + - " \"sid\": \"12345\",\n" + - " \"ext\": {\"logId\":\"67890\"}\n" + - " }\n" + - "]"; - // mock 方法 - - // 调用 - List statuses = smsClient.parseSmsReceiveStatus(text); - // 断言 - assertEquals(1, statuses.size()); - assertTrue(statuses.get(0).getSuccess()); - assertEquals("DELIVRD", statuses.get(0).getErrorCode()); - assertEquals("用户短信送达成功", statuses.get(0).getErrorMsg()); - assertEquals("13900000001", statuses.get(0).getMobile()); - assertEquals(LocalDateTime.of(2015, 10, 17, 8, 3, 4), statuses.get(0).getReceiveTime()); - assertEquals("12345", statuses.get(0).getSerialNo()); - assertEquals(67890L, statuses.get(0).getLogId()); - } - - @Test - public void testGetSmsTemplate() throws Throwable { - // 准备参数 - Long apiTemplateId = randomLongId(); - String requestId = randomString(); - - // mock 方法 - DescribeSmsTemplateListResponse response = randomPojo(DescribeSmsTemplateListResponse.class, o -> { - DescribeTemplateListStatus[] describeTemplateListStatuses = new DescribeTemplateListStatus[1]; - DescribeTemplateListStatus templateStatus = new DescribeTemplateListStatus(); - templateStatus.setTemplateId(apiTemplateId); - templateStatus.setStatusCode(0L);// 设置模板通过 - describeTemplateListStatuses[0] = templateStatus; - o.setDescribeTemplateStatusSet(describeTemplateListStatuses); - o.setRequestId(requestId); - }); - when(client.DescribeSmsTemplateList(argThat(request -> { - assertEquals(apiTemplateId, request.getTemplateIdSet()[0]); - return true; - }))).thenReturn(response); - - // 调用 - SmsTemplateRespDTO result = smsClient.getSmsTemplate(apiTemplateId.toString()); - // 断言 - assertEquals(response.getDescribeTemplateStatusSet()[0].getTemplateId().toString(), result.getId()); - assertEquals(response.getDescribeTemplateStatusSet()[0].getTemplateContent(), result.getContent()); - Assertions.assertEquals(SmsTemplateAuditStatusEnum.SUCCESS.getStatus(), result.getAuditStatus()); - assertEquals(response.getDescribeTemplateStatusSet()[0].getReviewReply(), result.getAuditReason()); - } - - @Test - public void testConvertSmsTemplateAuditStatus() { - assertEquals(SmsTemplateAuditStatusEnum.SUCCESS.getStatus(), - smsClient.convertSmsTemplateAuditStatus(0)); - assertEquals(SmsTemplateAuditStatusEnum.CHECKING.getStatus(), - smsClient.convertSmsTemplateAuditStatus(1)); - assertEquals(SmsTemplateAuditStatusEnum.FAIL.getStatus(), - smsClient.convertSmsTemplateAuditStatus(-1)); - assertThrows(IllegalArgumentException.class, () -> smsClient.convertSmsTemplateAuditStatus(3), - "未知审核状态(3)"); - } - -} diff --git a/cf-framework/pom.xml b/cf-framework/pom.xml index 126ca330f..8839548dd 100644 --- a/cf-framework/pom.xml +++ b/cf-framework/pom.xml @@ -28,7 +28,6 @@ cf-spring-boot-starter-test cf-spring-boot-starter-biz-operatelog - cf-spring-boot-starter-biz-sms cf-spring-boot-starter-biz-pay cf-spring-boot-starter-biz-organ diff --git a/cf-module-system/cf-module-system-biz/pom.xml b/cf-module-system/cf-module-system-biz/pom.xml index 4eec4c9da..4c7bc271f 100644 --- a/cf-module-system/cf-module-system-biz/pom.xml +++ b/cf-module-system/cf-module-system-biz/pom.xml @@ -46,10 +46,6 @@ com.cf.imes cf-spring-boot-starter-biz-operatelog - - com.cf.imes - cf-spring-boot-starter-biz-sms - com.cf.imes @@ -213,6 +209,23 @@ cf-spring-boot-starter-biz-pay + + + + + com.aliyun + aliyun-java-sdk-core + + + com.aliyun + aliyun-java-sdk-dysmsapi + + + com.tencentcloudapi + tencentcloud-sdk-java-sms + + + @@ -257,10 +270,6 @@ com.cf.imes cf-spring-boot-starter-biz-organ - - com.cf.imes - cf-spring-boot-starter-biz-sms - com.cf.imes cf-spring-boot-starter-elasticsearch diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/sms/SmsCallbackController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/sms/SmsCallbackController.java index d814899a3..9f15190b9 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/sms/SmsCallbackController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/sms/SmsCallbackController.java @@ -3,7 +3,7 @@ package com.cf.imes.module.system.controller.admin.sms; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.util.servlet.ServletUtils; import com.cf.imes.framework.operatelog.core.annotations.OperateLog; -import com.cf.imes.framework.sms.core.enums.SmsChannelEnum; +import com.cf.imes.module.system.framework.sms.core.enums.SmsChannelEnum; import com.cf.imes.module.system.service.sms.SmsSendService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/sms/SmsChannelDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/sms/SmsChannelDO.java index 8d5ceefc8..42d60d572 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/sms/SmsChannelDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/sms/SmsChannelDO.java @@ -2,7 +2,7 @@ package com.cf.imes.module.system.dal.dataobject.sms; import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import com.cf.imes.framework.sms.core.enums.SmsChannelEnum; +import com.cf.imes.module.system.framework.sms.core.enums.SmsChannelEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/config/ChenfengSmsAutoConfiguration.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/config/ChenfengSmsAutoConfiguration.java similarity index 55% rename from cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/config/ChenfengSmsAutoConfiguration.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/config/ChenfengSmsAutoConfiguration.java index 350085d23..f3b24376a 100644 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/config/ChenfengSmsAutoConfiguration.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/config/ChenfengSmsAutoConfiguration.java @@ -1,18 +1,19 @@ -package com.cf.imes.framework.sms.config; +package com.cf.imes.module.system.framework.sms.config; -import com.cf.imes.framework.sms.core.client.SmsClientFactory; -import com.cf.imes.framework.sms.core.client.impl.SmsClientFactoryImpl; -import com.cf.imes.framework.sms.core.property.SmsProperties; +import com.cf.imes.module.system.framework.sms.core.client.SmsClientFactory; +import com.cf.imes.module.system.framework.sms.core.client.impl.SmsClientFactoryImpl; +import com.cf.imes.module.system.framework.sms.core.property.SmsProperties; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; /** * 短信配置类 * * @author 晨丰科技 */ -@AutoConfiguration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(SmsProperties.class) public class ChenfengSmsAutoConfiguration { diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/SmsCodeConfiguration.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/config/SmsCodeConfiguration.java similarity index 83% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/SmsCodeConfiguration.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/config/SmsCodeConfiguration.java index f668457ca..e454b3cf5 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/SmsCodeConfiguration.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/config/SmsCodeConfiguration.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.system.framework.sms; +package com.cf.imes.module.system.framework.sms.config; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/SmsCodeProperties.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/config/SmsCodeProperties.java similarity index 95% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/SmsCodeProperties.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/config/SmsCodeProperties.java index 7f7284de6..be7df23aa 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/SmsCodeProperties.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/config/SmsCodeProperties.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.system.framework.sms; +package com.cf.imes.module.system.framework.sms.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/SmsClient.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/SmsClient.java similarity index 79% rename from cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/SmsClient.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/SmsClient.java index a3b20c62a..75f05504a 100644 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/SmsClient.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/SmsClient.java @@ -1,9 +1,9 @@ -package com.cf.imes.framework.sms.core.client; +package com.cf.imes.module.system.framework.sms.core.client; import cn.hutool.core.lang.Pair; -import com.cf.imes.framework.sms.core.client.dto.SmsReceiveRespDTO; -import com.cf.imes.framework.sms.core.client.dto.SmsSendRespDTO; -import com.cf.imes.framework.sms.core.client.dto.SmsTemplateRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsReceiveRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsSendRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsTemplateRespDTO; import java.util.List; diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/SmsClientFactory.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/SmsClientFactory.java similarity index 77% rename from cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/SmsClientFactory.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/SmsClientFactory.java index 519827e02..be6090587 100644 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/SmsClientFactory.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/SmsClientFactory.java @@ -1,6 +1,6 @@ -package com.cf.imes.framework.sms.core.client; +package com.cf.imes.module.system.framework.sms.core.client; -import com.cf.imes.framework.sms.core.property.SmsProperties; +import com.cf.imes.module.system.framework.sms.core.property.SmsProperties; /** * 短信客户端的工厂接口 diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/dto/SmsReceiveRespDTO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/dto/SmsReceiveRespDTO.java similarity index 91% rename from cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/dto/SmsReceiveRespDTO.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/dto/SmsReceiveRespDTO.java index 7c2fbf616..28011e34f 100644 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/dto/SmsReceiveRespDTO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/dto/SmsReceiveRespDTO.java @@ -1,4 +1,4 @@ -package com.cf.imes.framework.sms.core.client.dto; +package com.cf.imes.module.system.framework.sms.core.client.dto; import lombok.Data; diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/dto/SmsSendRespDTO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/dto/SmsSendRespDTO.java similarity index 92% rename from cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/dto/SmsSendRespDTO.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/dto/SmsSendRespDTO.java index 293d1557c..cbc06c985 100644 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/dto/SmsSendRespDTO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/dto/SmsSendRespDTO.java @@ -1,4 +1,4 @@ -package com.cf.imes.framework.sms.core.client.dto; +package com.cf.imes.module.system.framework.sms.core.client.dto; import lombok.Data; diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/dto/SmsTemplateRespDTO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/dto/SmsTemplateRespDTO.java similarity index 75% rename from cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/dto/SmsTemplateRespDTO.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/dto/SmsTemplateRespDTO.java index 6857de734..10937a00d 100644 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/dto/SmsTemplateRespDTO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/dto/SmsTemplateRespDTO.java @@ -1,6 +1,6 @@ -package com.cf.imes.framework.sms.core.client.dto; +package com.cf.imes.module.system.framework.sms.core.client.dto; -import com.cf.imes.framework.sms.core.enums.SmsTemplateAuditStatusEnum; +import com.cf.imes.module.system.framework.sms.core.enums.SmsTemplateAuditStatusEnum; import lombok.Data; /** diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/impl/AbstractSmsClient.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/impl/AbstractSmsClient.java similarity index 84% rename from cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/impl/AbstractSmsClient.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/impl/AbstractSmsClient.java index 9f61ddb99..339ea45f7 100644 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/impl/AbstractSmsClient.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/impl/AbstractSmsClient.java @@ -1,7 +1,7 @@ -package com.cf.imes.framework.sms.core.client.impl; +package com.cf.imes.module.system.framework.sms.core.client.impl; -import com.cf.imes.framework.sms.core.client.SmsClient; -import com.cf.imes.framework.sms.core.property.SmsProperties; +import com.cf.imes.module.system.framework.sms.core.client.SmsClient; +import com.cf.imes.module.system.framework.sms.core.property.SmsProperties; import lombok.extern.slf4j.Slf4j; /** diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/impl/SmsClientFactoryImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/impl/SmsClientFactoryImpl.java similarity index 79% rename from cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/impl/SmsClientFactoryImpl.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/impl/SmsClientFactoryImpl.java index 668198df1..d54f2eab6 100644 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/impl/SmsClientFactoryImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/impl/SmsClientFactoryImpl.java @@ -1,14 +1,14 @@ -package com.cf.imes.framework.sms.core.client.impl; +package com.cf.imes.module.system.framework.sms.core.client.impl; import cn.hutool.core.util.ObjectUtil; -import com.cf.imes.framework.sms.core.client.SmsClient; -import com.cf.imes.framework.sms.core.client.SmsClientFactory; -import com.cf.imes.framework.sms.core.client.impl.aliyun.AliyunSmsClient; -import com.cf.imes.framework.sms.core.client.impl.debug.DebugDingTalkSmsClient; -import com.cf.imes.framework.sms.core.client.impl.tencent.TencentSmsClient; -import com.cf.imes.framework.sms.core.enums.SmsChannelEnum; -import com.cf.imes.framework.sms.core.property.SmsChannelProperties; -import com.cf.imes.framework.sms.core.property.SmsProperties; +import com.cf.imes.module.system.framework.sms.core.client.SmsClient; +import com.cf.imes.module.system.framework.sms.core.client.SmsClientFactory; +import com.cf.imes.module.system.framework.sms.core.client.impl.aliyun.AliyunSmsClient; +import com.cf.imes.module.system.framework.sms.core.client.impl.debug.DebugDingTalkSmsClient; +import com.cf.imes.module.system.framework.sms.core.client.impl.tencent.TencentSmsClient; +import com.cf.imes.module.system.framework.sms.core.enums.SmsChannelEnum; +import com.cf.imes.module.system.framework.sms.core.property.SmsChannelProperties; +import com.cf.imes.module.system.framework.sms.core.property.SmsProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java similarity index 92% rename from cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java index cc158a0a1..cff829d45 100644 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java @@ -1,25 +1,25 @@ -package com.cf.imes.framework.sms.core.client.impl.aliyun; +package com.cf.imes.module.system.framework.sms.core.client.impl.aliyun; import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Pair; import cn.hutool.core.util.ObjectUtil; -import com.aliyuncs.auth.Credential; -import com.cf.imes.framework.common.util.collection.MapUtils; -import com.cf.imes.framework.common.util.json.JsonUtils; -import com.cf.imes.framework.sms.core.client.dto.SmsReceiveRespDTO; -import com.cf.imes.framework.sms.core.client.dto.SmsSendRespDTO; -import com.cf.imes.framework.sms.core.client.dto.SmsTemplateRespDTO; -import com.cf.imes.framework.sms.core.client.impl.AbstractSmsClient; -import com.cf.imes.framework.sms.core.enums.SmsTemplateAuditStatusEnum; import com.aliyuncs.DefaultAcsClient; import com.aliyuncs.IAcsClient; +import com.aliyuncs.auth.Credential; import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateRequest; import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateResponse; import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest; import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; import com.aliyuncs.profile.DefaultProfile; import com.aliyuncs.profile.IClientProfile; -import com.cf.imes.framework.sms.core.property.SmsProperties; +import com.cf.imes.framework.common.util.collection.MapUtils; +import com.cf.imes.framework.common.util.json.JsonUtils; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsReceiveRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsSendRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsTemplateRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.impl.AbstractSmsClient; +import com.cf.imes.module.system.framework.sms.core.enums.SmsTemplateAuditStatusEnum; +import com.cf.imes.module.system.framework.sms.core.property.SmsProperties; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.annotations.VisibleForTesting; diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java similarity index 87% rename from cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java index 0365e1277..c30940a4b 100644 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java @@ -1,4 +1,4 @@ -package com.cf.imes.framework.sms.core.client.impl.debug; +package com.cf.imes.module.system.framework.sms.core.client.impl.debug; import cn.hutool.core.codec.Base64; import cn.hutool.core.lang.Assert; @@ -11,12 +11,12 @@ import cn.hutool.crypto.digest.HmacAlgorithm; import cn.hutool.http.HttpUtil; import com.cf.imes.framework.common.util.collection.MapUtils; import com.cf.imes.framework.common.util.json.JsonUtils; -import com.cf.imes.framework.sms.core.client.dto.SmsReceiveRespDTO; -import com.cf.imes.framework.sms.core.client.dto.SmsSendRespDTO; -import com.cf.imes.framework.sms.core.client.dto.SmsTemplateRespDTO; -import com.cf.imes.framework.sms.core.client.impl.AbstractSmsClient; -import com.cf.imes.framework.sms.core.enums.SmsTemplateAuditStatusEnum; -import com.cf.imes.framework.sms.core.property.SmsProperties; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsReceiveRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsSendRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsTemplateRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.impl.AbstractSmsClient; +import com.cf.imes.module.system.framework.sms.core.enums.SmsTemplateAuditStatusEnum; +import com.cf.imes.module.system.framework.sms.core.property.SmsProperties; import java.util.HashMap; import java.util.List; diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/impl/tencent/TencentSmsClient.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/impl/tencent/TencentSmsClient.java similarity index 88% rename from cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/impl/tencent/TencentSmsClient.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/impl/tencent/TencentSmsClient.java index 9d49797fb..3a1960cfd 100644 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/client/impl/tencent/TencentSmsClient.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/client/impl/tencent/TencentSmsClient.java @@ -1,22 +1,27 @@ -package com.cf.imes.framework.sms.core.client.impl.tencent; +package com.cf.imes.module.system.framework.sms.core.client.impl.tencent; import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Pair; import cn.hutool.core.text.CharSequenceUtil; import com.cf.imes.framework.common.util.collection.ArrayUtils; import com.cf.imes.framework.common.util.json.JsonUtils; -import com.cf.imes.framework.sms.core.client.dto.SmsReceiveRespDTO; -import com.cf.imes.framework.sms.core.client.dto.SmsSendRespDTO; -import com.cf.imes.framework.sms.core.client.dto.SmsTemplateRespDTO; -import com.cf.imes.framework.sms.core.client.impl.AbstractSmsClient; -import com.cf.imes.framework.sms.core.enums.SmsTemplateAuditStatusEnum; -import com.cf.imes.framework.sms.core.property.SmsProperties; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsReceiveRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsSendRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsTemplateRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.impl.AbstractSmsClient; +import com.cf.imes.module.system.framework.sms.core.enums.SmsTemplateAuditStatusEnum; +import com.cf.imes.module.system.framework.sms.core.property.SmsProperties; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.annotations.VisibleForTesting; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.sms.v20210111.SmsClient; -import com.tencentcloudapi.sms.v20210111.models.*; +import com.tencentcloudapi.sms.v20210111.models.DescribeSmsTemplateListRequest; +import com.tencentcloudapi.sms.v20210111.models.DescribeSmsTemplateListResponse; +import com.tencentcloudapi.sms.v20210111.models.DescribeTemplateListStatus; +import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest; +import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse; +import com.tencentcloudapi.sms.v20210111.models.SendStatus; import lombok.Data; import java.time.LocalDateTime; diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/enums/SmsChannelEnum.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/enums/SmsChannelEnum.java similarity index 91% rename from cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/enums/SmsChannelEnum.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/enums/SmsChannelEnum.java index 14c87b5dc..17ea57c4c 100644 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/enums/SmsChannelEnum.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/enums/SmsChannelEnum.java @@ -1,4 +1,4 @@ -package com.cf.imes.framework.sms.core.enums; +package com.cf.imes.module.system.framework.sms.core.enums; import cn.hutool.core.util.ArrayUtil; import lombok.AllArgsConstructor; diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java similarity index 82% rename from cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java index d18066f76..e72dc5e05 100644 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java @@ -1,4 +1,4 @@ -package com.cf.imes.framework.sms.core.enums; +package com.cf.imes.module.system.framework.sms.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/property/SmsChannelProperties.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/property/SmsChannelProperties.java similarity index 88% rename from cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/property/SmsChannelProperties.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/property/SmsChannelProperties.java index f329e095c..f9e812779 100644 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/property/SmsChannelProperties.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/property/SmsChannelProperties.java @@ -1,6 +1,6 @@ -package com.cf.imes.framework.sms.core.property; +package com.cf.imes.module.system.framework.sms.core.property; -import com.cf.imes.framework.sms.core.enums.SmsChannelEnum; +import com.cf.imes.module.system.framework.sms.core.enums.SmsChannelEnum; import lombok.Data; import org.springframework.validation.annotation.Validated; diff --git a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/property/SmsProperties.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/property/SmsProperties.java similarity index 96% rename from cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/property/SmsProperties.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/property/SmsProperties.java index 0413fe98f..606776106 100644 --- a/cf-framework/cf-spring-boot-starter-biz-sms/src/main/java/com/cf/imes/framework/sms/core/property/SmsProperties.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/sms/core/property/SmsProperties.java @@ -1,4 +1,4 @@ -package com.cf.imes.framework.sms.core.property; +package com.cf.imes.module.system.framework.sms.core.property; import com.cf.imes.framework.common.util.encrypt.AesUtils; import org.springframework.beans.factory.annotation.Value; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsChannelService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsChannelService.java index d6dc0d99b..d9b3a2db9 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsChannelService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsChannelService.java @@ -1,7 +1,7 @@ package com.cf.imes.module.system.service.sms; import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.sms.core.client.SmsClient; +import com.cf.imes.module.system.framework.sms.core.client.SmsClient; import com.cf.imes.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO; import com.cf.imes.module.system.controller.admin.sms.vo.channel.SmsChannelSaveReqVO; import com.cf.imes.module.system.dal.dataobject.sms.SmsChannelDO; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsChannelServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsChannelServiceImpl.java index ddbc7138d..d6f5955de 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsChannelServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsChannelServiceImpl.java @@ -4,9 +4,9 @@ import cn.hutool.core.text.CharSequenceUtil; import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.framework.sms.core.client.SmsClient; -import com.cf.imes.framework.sms.core.client.SmsClientFactory; -import com.cf.imes.framework.sms.core.property.SmsProperties; +import com.cf.imes.module.system.framework.sms.core.client.SmsClient; +import com.cf.imes.module.system.framework.sms.core.client.SmsClientFactory; +import com.cf.imes.module.system.framework.sms.core.property.SmsProperties; import com.cf.imes.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO; import com.cf.imes.module.system.controller.admin.sms.vo.channel.SmsChannelSaveReqVO; import com.cf.imes.module.system.dal.dataobject.sms.SmsChannelDO; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsCodeServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsCodeServiceImpl.java index 5cab9520f..80cd9e7b7 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsCodeServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsCodeServiceImpl.java @@ -17,7 +17,7 @@ import com.cf.imes.module.system.dal.dataobject.user.AdminUserDO; import com.cf.imes.module.system.dal.mysql.sms.SmsCodeMapper; import com.cf.imes.module.system.dal.redis.RedisKeyConstants; import com.cf.imes.module.system.enums.sms.SmsSceneEnum; -import com.cf.imes.module.system.framework.sms.SmsCodeProperties; +import com.cf.imes.module.system.framework.sms.config.SmsCodeProperties; import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil; import com.cf.imes.module.system.enums.ErrorCodeConstants; import com.cf.imes.module.system.service.user.AdminUserService; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsSendServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsSendServiceImpl.java index de110eb69..0d22d8e89 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsSendServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsSendServiceImpl.java @@ -7,9 +7,9 @@ import cn.hutool.core.lang.Pair; import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.enums.UserTypeEnum; import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil; -import com.cf.imes.framework.sms.core.client.SmsClient; -import com.cf.imes.framework.sms.core.client.dto.SmsReceiveRespDTO; -import com.cf.imes.framework.sms.core.client.dto.SmsSendRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.SmsClient; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsReceiveRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsSendRespDTO; import com.cf.imes.module.system.dal.dataobject.sms.SmsTemplateDO; import com.cf.imes.module.system.dal.dataobject.user.AdminUserDO; import com.cf.imes.module.system.mq.message.sms.SmsSendMessage; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsTemplateServiceImpl.java index 907fc6eac..f1ee5f6fb 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsTemplateServiceImpl.java @@ -9,9 +9,9 @@ import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.framework.sms.core.client.SmsClient; -import com.cf.imes.framework.sms.core.client.dto.SmsTemplateRespDTO; -import com.cf.imes.framework.sms.core.enums.SmsTemplateAuditStatusEnum; +import com.cf.imes.module.system.framework.sms.core.client.SmsClient; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsTemplateRespDTO; +import com.cf.imes.module.system.framework.sms.core.enums.SmsTemplateAuditStatusEnum; import com.cf.imes.module.system.controller.admin.sms.vo.template.SmsTemplatePageReqVO; import com.cf.imes.module.system.controller.admin.sms.vo.template.SmsTemplateSaveReqVO; import com.cf.imes.module.system.dal.dataobject.sms.SmsChannelDO; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/handler/SmsSendAfterSendHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/handler/SmsSendAfterSendHandler.java index 6526ccc2b..e6b836c88 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/handler/SmsSendAfterSendHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/handler/SmsSendAfterSendHandler.java @@ -1,7 +1,7 @@ package com.cf.imes.module.system.service.sms.handler; import cn.hutool.core.lang.Pair; -import com.cf.imes.framework.sms.core.client.dto.SmsSendRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsSendRespDTO; import java.util.List; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/handler/impl/SmsSendAfterSendHandlerImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/handler/impl/SmsSendAfterSendHandlerImpl.java index eda0c1191..7f1da1cfd 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/handler/impl/SmsSendAfterSendHandlerImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/handler/impl/SmsSendAfterSendHandlerImpl.java @@ -2,10 +2,10 @@ package com.cf.imes.module.system.service.sms.handler.impl; import cn.hutool.core.lang.Pair; import cn.hutool.core.util.ObjectUtil; -import com.cf.imes.framework.sms.core.client.dto.SmsSendRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsSendRespDTO; import com.cf.imes.module.system.dal.redis.RedisKeyConstants; import com.cf.imes.module.system.enums.sms.SmsTemplateTypeEnum; -import com.cf.imes.module.system.framework.sms.SmsCodeProperties; +import com.cf.imes.module.system.framework.sms.config.SmsCodeProperties; import com.cf.imes.module.system.service.sms.handler.SmsSendAfterSendHandler; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/cf-module-system/cf-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/service/sms/SmsServiceIntegrationTest.java b/cf-module-system/cf-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/service/sms/SmsServiceIntegrationTest.java index 30b9ca741..e645469bb 100644 --- a/cf-module-system/cf-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/service/sms/SmsServiceIntegrationTest.java +++ b/cf-module-system/cf-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/service/sms/SmsServiceIntegrationTest.java @@ -3,7 +3,7 @@ package com.cf.imes.module.system.service.sms; import cn.hutool.core.map.MapUtil; import cn.hutool.core.thread.ThreadUtil; import com.cf.imes.framework.common.enums.UserTypeEnum; -import com.cf.imes.framework.sms.config.ChenfengSmsAutoConfiguration; +import com.cf.imes.module.system.framework.sms.config.ChenfengSmsAutoConfiguration; import com.cf.imes.module.system.test.BaseDbAndRedisIntegrationTest; import com.cf.imes.module.system.mq.consumer.sms.SmsSendConsumer; import com.cf.imes.module.system.mq.producer.sms.SmsProducer; diff --git a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsChannelServiceTest.java b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsChannelServiceTest.java index bfd612c8a..a289930af 100644 --- a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsChannelServiceTest.java +++ b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsChannelServiceTest.java @@ -3,10 +3,10 @@ package com.cf.imes.module.system.service.sms; import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.framework.sms.core.client.SmsClient; -import com.cf.imes.framework.sms.core.client.SmsClientFactory; -import com.cf.imes.framework.sms.core.enums.SmsChannelEnum; -import com.cf.imes.framework.sms.core.property.SmsChannelProperties; +import com.cf.imes.module.system.framework.sms.core.client.SmsClient; +import com.cf.imes.module.system.framework.sms.core.client.SmsClientFactory; +import com.cf.imes.module.system.framework.sms.core.enums.SmsChannelEnum; +import com.cf.imes.module.system.framework.sms.core.property.SmsChannelProperties; import com.cf.imes.framework.test.core.ut.BaseDbUnitTest; import com.cf.imes.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO; import com.cf.imes.module.system.controller.admin.sms.vo.channel.SmsChannelSaveReqVO; diff --git a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsCodeServiceImplTest.java b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsCodeServiceImplTest.java index 5d0e94361..82287162f 100644 --- a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsCodeServiceImplTest.java +++ b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsCodeServiceImplTest.java @@ -9,7 +9,7 @@ import com.cf.imes.module.system.api.sms.dto.code.SmsCodeValidateReqDTO; import com.cf.imes.module.system.dal.dataobject.sms.SmsCodeDO; import com.cf.imes.module.system.dal.mysql.sms.SmsCodeMapper; import com.cf.imes.module.system.enums.sms.SmsSceneEnum; -import com.cf.imes.module.system.framework.sms.SmsCodeProperties; +import com.cf.imes.module.system.framework.sms.config.SmsCodeProperties; import com.baomidou.mybatisplus.annotation.DbType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsSendServiceImplTest.java b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsSendServiceImplTest.java index b5816b223..607f4c5c3 100644 --- a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsSendServiceImplTest.java +++ b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsSendServiceImplTest.java @@ -4,9 +4,9 @@ import cn.hutool.core.lang.Pair; import cn.hutool.core.map.MapUtil; import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.enums.UserTypeEnum; -import com.cf.imes.framework.sms.core.client.SmsClient; -import com.cf.imes.framework.sms.core.client.dto.SmsReceiveRespDTO; -import com.cf.imes.framework.sms.core.client.dto.SmsSendRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.SmsClient; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsReceiveRespDTO; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsSendRespDTO; import com.cf.imes.framework.test.core.ut.BaseMockitoUnitTest; import com.cf.imes.module.system.dal.dataobject.sms.SmsChannelDO; import com.cf.imes.module.system.dal.dataobject.sms.SmsTemplateDO; diff --git a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsTemplateServiceImplTest.java b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsTemplateServiceImplTest.java index 09fe0c2a3..f35283cb9 100644 --- a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsTemplateServiceImplTest.java +++ b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsTemplateServiceImplTest.java @@ -5,9 +5,9 @@ import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.collection.ArrayUtils; import com.cf.imes.framework.common.util.object.ObjectUtils; -import com.cf.imes.framework.sms.core.client.SmsClient; -import com.cf.imes.framework.sms.core.client.dto.SmsTemplateRespDTO; -import com.cf.imes.framework.sms.core.enums.SmsTemplateAuditStatusEnum; +import com.cf.imes.module.system.framework.sms.core.client.SmsClient; +import com.cf.imes.module.system.framework.sms.core.client.dto.SmsTemplateRespDTO; +import com.cf.imes.module.system.framework.sms.core.enums.SmsTemplateAuditStatusEnum; import com.cf.imes.framework.test.core.ut.BaseDbUnitTest; import com.cf.imes.module.system.controller.admin.sms.vo.template.SmsTemplatePageReqVO; import com.cf.imes.module.system.controller.admin.sms.vo.template.SmsTemplateSaveReqVO;