From 3c2c87364b89de46d12e95abd5bdf8cbd2c6dbf6 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 08:43:23 +0800
Subject: [PATCH] dev-init
---
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java | 68 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 31 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 e130cae..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
@@ -1,17 +1,16 @@
package org.dromara.demo.controller;
-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.common.sms.core.SmsTemplate;
import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.core.factory.SmsFactory;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.LinkedHashMap;
/**
* 鐭俊婕旂ず妗堜緥
@@ -25,11 +24,6 @@
@RestController
@RequestMapping("/demo/sms")
public class SmsController {
-
- private final SmsProperties smsProperties;
-// private final SmsTemplate smsTemplate; // 鍙互浣跨敤spring娉ㄥ叆
-// private final AliyunSmsTemplate smsTemplate; // 涔熷彲浠ユ敞鍏ユ煇涓巶瀹剁殑妯℃澘宸ュ叿
-
/**
* 鍙戦�佺煭淇liyun
*
@@ -38,17 +32,11 @@
*/
@GetMapping("/sendAliyun")
public R<Object> sendAliyun(String phones, String templateId) {
- if (!smsProperties.getEnabled()) {
- return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
- }
- if (!SpringUtils.containsBean("aliyunSmsTemplate")) {
- return R.fail("闃块噷浜戜緷璧栨湭寮曞叆锛�");
- }
- SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class);
- Map<String, String> map = new HashMap<>(1);
+ LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
map.put("code", "1234");
- Object send = smsTemplate.send(phones, templateId, map);
- return R.ok(send);
+ SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
+ SmsResponse smsResponse = smsBlend.sendMessage(phones, templateId, map);
+ return R.ok(smsResponse);
}
/**
@@ -59,18 +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("鑵捐浜戜緷璧栨湭寮曞叆锛�");
- }
- SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class);
- Map<String, String> map = new HashMap<>(1);
+ LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
// map.put("2", "娴嬭瘯娴嬭瘯");
map.put("1", "1234");
- Object send = smsTemplate.send(phones, templateId, map);
- return R.ok(send);
+ 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