From 87b79ea739ec32bd7d0e493a6ea8525212f6c763 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 10 十月 2026 15:11:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into smartor_ls_261008
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
index 7c41d3b..eae6887 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
@@ -11,7 +11,9 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.utils.sms.smsUtils;
+import com.ruoyi.message.SendResult;
+import com.ruoyi.message.sms.SmsSendRequest;
+import com.ruoyi.message.sms.SmsSenderFactory;
import com.smartor.domain.BaseSmsRequest;
import com.smartor.domain.BaseSmsaccount;
import com.smartor.domain.BatchBaseSmsRequest;
@@ -27,6 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.Map;
/**
* 鐭俊璐﹀彿Controller
@@ -41,17 +44,14 @@
@Autowired
private IBaseSmsaccountService baseSmsaccountService;
- @Value("${xhsmsPath}")
- private String xhsmsPath;
-
- @Value("${xhsmsAccount}")
- private String xhsmsAccount;
-
- @Value("${xhsmsPwd}")
- private String xhsmsPwd;
-
@Value("${spring.profiles.active}")
private String active;
+
+ /**
+ * 娑堟伅鍙戦�佹柟宸ュ巶锛堢煭淇★級锛屾浛浠ｅ師鏉ョ洿鎺ユ敞鍏� xhsms* 閰嶇疆 + 鍚勭珯鐐瑰垎鏀殑鍐欐硶
+ */
+ @Autowired
+ private SmsSenderFactory smsSenderFactory;
/**
* 鏌ヨ鐭俊璐﹀彿鍒楄〃
@@ -130,11 +130,20 @@
try {
JSONObject jsTemp = JSON.parseObject(baseSmsRequest.getTemplateParam());
String content = jsTemp.getString("name");
- sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, baseSmsRequest.getPhoneNumber(), content);
+ //鐭俊鍙戦�佸凡鏀跺彛鍒� ruoyi-message 妯″潡锛涘師瀹炵幇璋冪敤鐨勬槸 smsUtils.sendSms锛堝惔灞辩鍚嶏級
+ SmsSendRequest request = SmsSendRequest.of(baseSmsRequest.getPhoneNumber(), content);
+ request.setCampus("2");
+ SendResult sendResult = smsSenderFactory.send("hzszlyy", request);
+ sendMsg = sendResult.getRawResponse();
} catch (Exception ex) {
return AjaxResult.error(ex.getMessage());
}
return AjaxResult.success(sendMsg);
+ } else if (active.equals("nhfy")) {
+ SmsSendRequest request = SmsSendRequest.of(baseSmsRequest.getPhoneNumber(), baseSmsRequest.getTemplateCode());
+ SendResult sendResult = smsSenderFactory.send("nhfy", request);
+ return AjaxResult.success(sendResult.getCode());
+
} else {
if (baseSmsaccountService.sendMsg(baseSmsRequest) == null) {
return error();
--
Gitblit v1.9.3