From eafecc3ac0227960f2b8fa377be27f066e10e50f Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期二, 20 五月 2025 10:47:58 +0800
Subject: [PATCH] perf(lb-qms): 优化查询功能和时间范围筛选
---
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java | 51 +++++++++++++++++++++++++++++----------------------
1 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java
index bd16bd6..b993f60 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java
@@ -2,11 +2,9 @@
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
-import org.dromara.common.core.utils.SpringUtils;
-import org.dromara.common.sms.config.properties.SmsProperties;
+import org.dromara.sms4j.api.SmsBlend;
import org.dromara.sms4j.api.entity.SmsResponse;
import org.dromara.sms4j.core.factory.SmsFactory;
-import org.dromara.sms4j.provider.enumerate.SupplierType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,11 +24,6 @@
@RestController
@RequestMapping("/demo/sms")
public class SmsController {
-
- private final SmsProperties smsProperties;
-// private final SmsTemplate smsTemplate; // 鍙互浣跨敤spring娉ㄥ叆
-// private final AliyunSmsTemplate smsTemplate; // 涔熷彲浠ユ敞鍏ユ煇涓巶瀹剁殑妯℃澘宸ュ叿
-
/**
* 鍙戦�佺煭淇liyun
*
@@ -39,15 +32,10 @@
*/
@GetMapping("/sendAliyun")
public R<Object> sendAliyun(String phones, String templateId) {
- if (!smsProperties.getEnabled()) {
- return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
- }
- if (!SpringUtils.containsBean("aliyunSmsTemplate")) {
- return R.fail("闃块噷浜戜緷璧栨湭寮曞叆锛�");
- }
LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
map.put("code", "1234");
- SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.ALIBABA).sendMessage(phones, templateId, map);
+ SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
+ SmsResponse smsResponse = smsBlend.sendMessage(phones, templateId, map);
return R.ok(smsResponse);
}
@@ -59,17 +47,36 @@
*/
@GetMapping("/sendTencent")
public R<Object> sendTencent(String phones, String templateId) {
- if (!smsProperties.getEnabled()) {
- return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
- }
- if (!SpringUtils.containsBean("tencentSmsTemplate")) {
- return R.fail("鑵捐浜戜緷璧栨湭寮曞叆锛�");
- }
LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
// map.put("2", "娴嬭瘯娴嬭瘯");
map.put("1", "1234");
- SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.TENCENT).sendMessage(phones, templateId, map);
+ SmsBlend smsBlend = SmsFactory.getSmsBlend("config2");
+ SmsResponse smsResponse = smsBlend.sendMessage(phones, templateId, map);
return R.ok(smsResponse);
}
+ /**
+ * 娣诲姞榛戝悕鍗�
+ *
+ * @param phone 鎵嬫満鍙�
+ */
+ @GetMapping("/addBlacklist")
+ public R<Object> addBlacklist(String phone){
+ SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
+ smsBlend.joinInBlacklist(phone);
+ return R.ok();
+ }
+
+ /**
+ * 绉婚櫎榛戝悕鍗�
+ *
+ * @param phone 鎵嬫満鍙�
+ */
+ @GetMapping("/removeBlacklist")
+ public R<Object> removeBlacklist(String phone){
+ SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
+ smsBlend.removeFromBlacklist(phone);
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.3