From 92d07f2bfc87be00e3cee788992ef0c8b3688b8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
<15040126243@163.com>
Date: Mon, 9 May 2022 10:06:49 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=BF=81=E7=A7=BB=20=E7=9F=AD?=
=?UTF-8?q?=E4=BF=A1=E5=92=8C=E9=82=AE=E4=BB=B6=E5=8A=9F=E8=83=BD=20?=
=?UTF-8?q?=E5=88=B0=E8=B5=84=E6=BA=90=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/dev/application-common.yml | 32 -------------------
config/dev/ruoyi-resource.yml | 32 +++++++++++++++++++
.../ruoyi/common/sms/entity/SmsResult.java | 2 +-
ruoyi-modules/ruoyi-resource/pom.xml | 5 +++
ruoyi-modules/ruoyi-system/pom.xml | 5 ---
5 files changed, 38 insertions(+), 38 deletions(-)
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
-
-