Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-…

…cloud
YunaiV · Jan 27, 2024 · 3a25879 · 3a25879
2 parents 625ad70 + edd2cef
commit 3a25879
Show file tree

Hide file tree

Showing 36 changed files with 116 additions and 255 deletions.
diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
@@ -132,11 +132,6 @@
                 <artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
                 <version>${revision}</version>
             </dependency>
-            <dependency>
-                <groupId>cn.iocoder.cloud</groupId>
-                <artifactId>yudao-spring-boot-starter-biz-sms</artifactId>
-                <version>${revision}</version>
-            </dependency>
             <dependency>
                 <groupId>cn.iocoder.cloud</groupId>
                 <artifactId>yudao-spring-boot-starter-biz-pay</artifactId>

diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml
@@ -30,7 +30,6 @@
 
         <module>yudao-spring-boot-starter-biz-operatelog</module>
         <module>yudao-spring-boot-starter-biz-dict</module>
-        <module>yudao-spring-boot-starter-biz-sms</module>
 
         <module>yudao-spring-boot-starter-biz-pay</module>
         <module>yudao-spring-boot-starter-biz-tenant</module>

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-sms/pom.xml
diff --git a/...iz-sms/src/main/java/cn/iocoder/yudao/framework/sms/config/YudaoSmsAutoConfiguration.java b/...iz-sms/src/main/java/cn/iocoder/yudao/framework/sms/config/YudaoSmsAutoConfiguration.java
diff --git a/...c/main/java/cn/iocoder/yudao/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java b/...c/main/java/cn/iocoder/yudao/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/yudao-module-system/yudao-module-system-biz/pom.xml b/yudao-module-system/yudao-module-system-biz/pom.xml
@@ -46,10 +46,6 @@
             <groupId>cn.iocoder.cloud</groupId>
             <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-biz-sms</artifactId>
-        </dependency>
         <dependency>
             <groupId>cn.iocoder.cloud</groupId>
             <artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
@@ -164,6 +160,19 @@
             <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>  <!-- 微信登录（小程序） -->
         </dependency>
 
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId> <!-- 短信（阿里云） -->
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-dysmsapi</artifactId> <!-- 短信（阿里云） -->
+        </dependency>
+        <dependency>
+            <groupId>com.tencentcloudapi</groupId>
+            <artifactId>tencentcloud-sdk-java-sms</artifactId> <!-- 短信（腾讯云） -->
+        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/.../main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java b/.../main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java
@@ -3,7 +3,7 @@
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.framework.sms.core.enums.SmsChannelEnum;
+import cn.iocoder.yudao.module.system.framework.sms.core.enums.SmsChannelEnum;
 import cn.iocoder.yudao.module.system.service.sms.SmsSendService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

diff --git a/...tem-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsChannelDO.java b/...tem-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsChannelDO.java
@@ -2,7 +2,7 @@
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.framework.sms.core.enums.SmsChannelEnum;
+import cn.iocoder.yudao.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/...-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/SmsCodeConfiguration.java b/...-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/SmsCodeConfiguration.java
diff --git a/...stem/framework/sms/SmsCodeProperties.java → ...amework/sms/config/SmsCodeProperties.java b/...stem/framework/sms/SmsCodeProperties.java → ...amework/sms/config/SmsCodeProperties.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.system.framework.sms;
+package cn.iocoder.yudao.module.system.framework.sms.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

diff --git a/...z/src/main/java/cn/iocoder/yudao/module/system/framework/sms/config/SmsConfiguration.java b/...z/src/main/java/cn/iocoder/yudao/module/system/framework/sms/config/SmsConfiguration.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.system.framework.sms.config;
+
+import cn.iocoder.yudao.module.system.framework.sms.core.client.SmsClientFactory;
+import cn.iocoder.yudao.module.system.framework.sms.core.client.impl.SmsClientFactoryImpl;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 短信配置类，包括短信客户端、短信验证码两部分
+ *
+ * @author 芋道源码
+ */
+@Configuration(proxyBeanMethods = false)
+@EnableConfigurationProperties(SmsCodeProperties.class)
+public class SmsConfiguration {
+
+    @Bean
+    public SmsClientFactory smsClientFactory() {
+        return new SmsClientFactoryImpl();
+    }
+
+}
diff --git a/.../framework/sms/core/client/SmsClient.java → .../framework/sms/core/client/SmsClient.java b/.../framework/sms/core/client/SmsClient.java → .../framework/sms/core/client/SmsClient.java
@@ -1,9 +1,9 @@
-package cn.iocoder.yudao.framework.sms.core.client;
+package cn.iocoder.yudao.module.system.framework.sms.core.client;
 
 import cn.iocoder.yudao.framework.common.core.KeyValue;
-import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO;
-import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO;
-import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO;
+import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsReceiveRespDTO;
+import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsSendRespDTO;
+import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsTemplateRespDTO;
 
 import java.util.List;
 

diff --git a/...ork/sms/core/client/SmsClientFactory.java → ...ork/sms/core/client/SmsClientFactory.java b/...ork/sms/core/client/SmsClientFactory.java → ...ork/sms/core/client/SmsClientFactory.java
@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.framework.sms.core.client;
+package cn.iocoder.yudao.module.system.framework.sms.core.client;
 
-import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
+import cn.iocoder.yudao.module.system.framework.sms.core.property.SmsChannelProperties;
 
 /**
  * 短信客户端的工厂接口

diff --git a/...ms/core/client/dto/SmsReceiveRespDTO.java → ...ms/core/client/dto/SmsReceiveRespDTO.java b/...ms/core/client/dto/SmsReceiveRespDTO.java → ...ms/core/client/dto/SmsReceiveRespDTO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.framework.sms.core.client.dto;
+package cn.iocoder.yudao.module.system.framework.sms.core.client.dto;
 
 import lombok.Data;
 

diff --git a/...k/sms/core/client/dto/SmsSendRespDTO.java → ...k/sms/core/client/dto/SmsSendRespDTO.java b/...k/sms/core/client/dto/SmsSendRespDTO.java → ...k/sms/core/client/dto/SmsSendRespDTO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.framework.sms.core.client.dto;
+package cn.iocoder.yudao.module.system.framework.sms.core.client.dto;
 
 import lombok.Data;
 

diff --git a/...s/core/client/dto/SmsTemplateRespDTO.java → ...s/core/client/dto/SmsTemplateRespDTO.java b/...s/core/client/dto/SmsTemplateRespDTO.java → ...s/core/client/dto/SmsTemplateRespDTO.java
@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.framework.sms.core.client.dto;
+package cn.iocoder.yudao.module.system.framework.sms.core.client.dto;
 
-import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
+import cn.iocoder.yudao.module.system.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
 import lombok.Data;
 
 /**

diff --git a/...s/core/client/impl/AbstractSmsClient.java → ...s/core/client/impl/AbstractSmsClient.java b/...s/core/client/impl/AbstractSmsClient.java → ...s/core/client/impl/AbstractSmsClient.java
@@ -1,7 +1,7 @@
-package cn.iocoder.yudao.framework.sms.core.client.impl;
+package cn.iocoder.yudao.module.system.framework.sms.core.client.impl;
 
-import cn.iocoder.yudao.framework.sms.core.client.SmsClient;
-import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
+import cn.iocoder.yudao.module.system.framework.sms.core.client.SmsClient;
+import cn.iocoder.yudao.module.system.framework.sms.core.property.SmsChannelProperties;
 import lombok.extern.slf4j.Slf4j;
 
 /**

diff --git a/...e/client/impl/aliyun/AliyunSmsClient.java → ...sms/core/client/impl/AliyunSmsClient.java b/...e/client/impl/aliyun/AliyunSmsClient.java → ...sms/core/client/impl/AliyunSmsClient.java
@@ -1,15 +1,15 @@
-package cn.iocoder.yudao.framework.sms.core.client.impl.aliyun;
+package cn.iocoder.yudao.module.system.framework.sms.core.client.impl;
 
 import cn.hutool.core.lang.Assert;
 import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO;
-import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO;
-import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO;
-import cn.iocoder.yudao.framework.sms.core.client.impl.AbstractSmsClient;
-import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
-import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
+import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsReceiveRespDTO;
+import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsSendRespDTO;
+import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsTemplateRespDTO;
+import cn.iocoder.yudao.module.system.framework.sms.core.client.impl.AbstractSmsClient;
+import cn.iocoder.yudao.module.system.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
+import cn.iocoder.yudao.module.system.framework.sms.core.property.SmsChannelProperties;
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;
 import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateRequest;

diff --git a/...nt/impl/debug/DebugDingTalkSmsClient.java → ...e/client/impl/DebugDingTalkSmsClient.java b/...nt/impl/debug/DebugDingTalkSmsClient.java → ...e/client/impl/DebugDingTalkSmsClient.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.framework.sms.core.client.impl.debug;
+package cn.iocoder.yudao.module.system.framework.sms.core.client.impl;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.lang.Assert;
@@ -10,12 +10,12 @@
 import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO;
-import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO;
-import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO;
-import cn.iocoder.yudao.framework.sms.core.client.impl.AbstractSmsClient;
-import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
-import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
+import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsReceiveRespDTO;
+import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsSendRespDTO;
+import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsTemplateRespDTO;
+import cn.iocoder.yudao.module.system.framework.sms.core.client.impl.AbstractSmsClient;
+import cn.iocoder.yudao.module.system.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
+import cn.iocoder.yudao.module.system.framework.sms.core.property.SmsChannelProperties;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/...ore/client/impl/SmsClientFactoryImpl.java → ...ore/client/impl/SmsClientFactoryImpl.java b/...ore/client/impl/SmsClientFactoryImpl.java → ...ore/client/impl/SmsClientFactoryImpl.java
@@ -1,12 +1,9 @@
-package cn.iocoder.yudao.framework.sms.core.client.impl;
+package cn.iocoder.yudao.module.system.framework.sms.core.client.impl;
 
-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.impl.aliyun.AliyunSmsClient;
-import cn.iocoder.yudao.framework.sms.core.client.impl.debug.DebugDingTalkSmsClient;
-import cn.iocoder.yudao.framework.sms.core.client.impl.tencent.TencentSmsClient;
-import cn.iocoder.yudao.framework.sms.core.enums.SmsChannelEnum;
-import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
+import cn.iocoder.yudao.module.system.framework.sms.core.client.SmsClient;
+import cn.iocoder.yudao.module.system.framework.sms.core.client.SmsClientFactory;
+import cn.iocoder.yudao.module.system.framework.sms.core.enums.SmsChannelEnum;
+import cn.iocoder.yudao.module.system.framework.sms.core.property.SmsChannelProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.Assert;
 import org.springframework.validation.annotation.Validated;