diff --git a/config/dev/application-common.yml b/config/dev/application-common.yml
index a6fde852..b44b783a 100644
--- a/config/dev/application-common.yml
+++ b/config/dev/application-common.yml
@@ -292,35 +292,3 @@ seata:
server-addr: ${spring.cloud.nacos.server-addr}
group: ${spring.cloud.nacos.discovery.group}
namespace: ${spring.profiles.active}
-
-mail:
- enabled: false
- host: smtp.163.com
- port: 465
- # 是否需要用户名密码验证
- auth: true
- # 发送方,遵循RFC-822标准
- from: xxx@163.com
- # 用户名(注意:如果使用foxmail邮箱,此处user为qq号)
- user: xxx@163.com
- # 密码(注意,某些邮箱需要为SMTP服务单独设置密码,详情查看相关帮助)
- pass: xxxxxxxxxx
- # 使用 STARTTLS安全连接,STARTTLS是对纯文本通信协议的扩展。
- starttlsEnable: true
- # 使用SSL安全连接
- sslEnable: true
- # SMTP超时时长,单位毫秒,缺省值不超时
- timeout: 0
- # Socket连接超时值,单位毫秒,缺省值不超时
- connectionTimeout: 0
-
-sms:
- enabled: false
- # 阿里云 dysmsapi.aliyuncs.com
- # 腾讯云 sms.tencentcloudapi.com
- endpoint: "dysmsapi.aliyuncs.com"
- accessKeyId: xxxxxxx
- accessKeySecret: xxxxxx
- signName: 测试
- # 腾讯专用
- sdkAppId:
diff --git a/config/dev/ruoyi-resource.yml b/config/dev/ruoyi-resource.yml
index 6b3d4683..c0322b2e 100644
--- a/config/dev/ruoyi-resource.yml
+++ b/config/dev/ruoyi-resource.yml
@@ -16,3 +16,35 @@ spring:
# url:
# username:
# password:
+
+mail:
+ enabled: false
+ host: smtp.163.com
+ port: 465
+ # 是否需要用户名密码验证
+ auth: true
+ # 发送方,遵循RFC-822标准
+ from: xxx@163.com
+ # 用户名(注意:如果使用foxmail邮箱,此处user为qq号)
+ user: xxx@163.com
+ # 密码(注意,某些邮箱需要为SMTP服务单独设置密码,详情查看相关帮助)
+ pass: xxxxxxxxxx
+ # 使用 STARTTLS安全连接,STARTTLS是对纯文本通信协议的扩展。
+ starttlsEnable: true
+ # 使用SSL安全连接
+ sslEnable: true
+ # SMTP超时时长,单位毫秒,缺省值不超时
+ timeout: 0
+ # Socket连接超时值,单位毫秒,缺省值不超时
+ connectionTimeout: 0
+
+sms:
+ enabled: false
+ # 阿里云 dysmsapi.aliyuncs.com
+ # 腾讯云 sms.tencentcloudapi.com
+ endpoint: "dysmsapi.aliyuncs.com"
+ accessKeyId: xxxxxxx
+ accessKeySecret: xxxxxx
+ signName: 测试
+ # 腾讯专用
+ sdkAppId:
diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/entity/SmsResult.java b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/entity/SmsResult.java
index b1a7b28f..a72aa1ce 100644
--- a/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/entity/SmsResult.java
+++ b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/entity/SmsResult.java
@@ -15,7 +15,7 @@ public class SmsResult {
/**
* 是否成功
*/
- private boolean isSuccess;
+ private Boolean isSuccess;
/**
* 响应消息
diff --git a/ruoyi-modules/ruoyi-resource/pom.xml b/ruoyi-modules/ruoyi-resource/pom.xml
index 1e67ed03..f0598d6e 100644
--- a/ruoyi-modules/ruoyi-resource/pom.xml
+++ b/ruoyi-modules/ruoyi-resource/pom.xml
@@ -78,6 +78,11 @@
ruoyi-common-oss
+
+ com.ruoyi
+ ruoyi-common-mail
+
+
com.ruoyi
ruoyi-common-sms
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
index 50149e33..16112acb 100644
--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@@ -95,11 +95,6 @@
ruoyi-api-resource
-
- com.ruoyi
- ruoyi-common-mail
-
-