From bb587607e147fd92f9cd653f837075455444249f Mon Sep 17 00:00:00 2001
From: 友杰 <273666957@qq.com>
Date: 星期五, 09 六月 2023 09:58:50 +0800
Subject: [PATCH] !367 集成sms4j短信 集成sms4j短信
---
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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..bd16bd6 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,18 @@
package org.dromara.demo.controller;
+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.common.sms.core.SmsTemplate;
-import lombok.RequiredArgsConstructor;
+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;
import org.springframework.web.bind.annotation.RestController;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.LinkedHashMap;
/**
* 鐭俊婕旂ず妗堜緥
@@ -44,11 +45,10 @@
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);
+ SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.ALIBABA).sendMessage(phones, templateId, map);
+ return R.ok(smsResponse);
}
/**
@@ -65,12 +65,11 @@
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);
+ SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.TENCENT).sendMessage(phones, templateId, map);
+ return R.ok(smsResponse);
}
}
--
Gitblit v1.9.3