From 918708a227ad8e7bfa03dda018ce49e18da7e794 Mon Sep 17 00:00:00 2001
From: liyang <liyang1987jay@163.com>
Date: 星期二, 12 七月 2022 21:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-sms/src/main/java/com/ruoyi/sms/config/SmsConfig.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-sms/src/main/java/com/ruoyi/sms/config/SmsConfig.java b/ruoyi-sms/src/main/java/com/ruoyi/sms/config/SmsConfig.java
index abc4bb9..753773e 100644
--- a/ruoyi-sms/src/main/java/com/ruoyi/sms/config/SmsConfig.java
+++ b/ruoyi-sms/src/main/java/com/ruoyi/sms/config/SmsConfig.java
@@ -16,10 +16,10 @@
* @version 4.2.0
*/
@Configuration
-@ConditionalOnProperty(value = "sms.enabled", havingValue = "true")
public class SmsConfig {
@Configuration
+ @ConditionalOnProperty(value = "sms.enabled", havingValue = "true")
@ConditionalOnClass(com.aliyun.dysmsapi20170525.Client.class)
static class AliyunSmsConfig {
@@ -31,6 +31,7 @@
}
@Configuration
+ @ConditionalOnProperty(value = "sms.enabled", havingValue = "true")
@ConditionalOnClass(com.tencentcloudapi.sms.v20190711.SmsClient.class)
static class TencentSmsConfig {
--
Gitblit v1.9.3