From 4f6517caa9af00c9ac1097ecfdc544aeab09cd5b Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Wed, 16 Apr 2025 17:39:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=AD=E4=BF=A1=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 ++++--- src/main/java/com/peanut/common/utils/SmsUtil.java | 13 ++++++++----- .../common/service/impl/MyUserServiceImpl.java | 1 - src/main/resources/application-dev.yml | 2 ++ src/main/resources/application-dev1.yml | 2 ++ src/main/resources/application-prod.yml | 2 ++ src/main/resources/application-test.yml | 2 ++ 7 files changed, 20 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 1951b6c5..2543d1e4 100644 --- a/pom.xml +++ b/pom.xml @@ -225,9 +225,9 @@ ${pom.basedir}/src/main/resources/lib/aspose-words-22.10-jdk16.jar - com.zmzm - sms-http - sms-http + com.bcloud.msg.http + bcloud.msg.http + http system ${pom.basedir}/src/main/resources/lib/http.jar @@ -448,6 +448,7 @@ spring-boot-maven-plugin true + true diff --git a/src/main/java/com/peanut/common/utils/SmsUtil.java b/src/main/java/com/peanut/common/utils/SmsUtil.java index 7644aec5..5191784e 100644 --- a/src/main/java/com/peanut/common/utils/SmsUtil.java +++ b/src/main/java/com/peanut/common/utils/SmsUtil.java @@ -8,17 +8,21 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; -@Configuration +@Component public class SmsUtil { + @Value("${sms.domestic.url}") + private String url; @Value("${sms.domestic.account}") private String account; @Value("${sms.domestic.pswd}") private String pswd; @Value("${sms.domestic.content}") private String content; + @Value("${sms.abroad.url}") + private String abroadUrl; @Value("${sms.abroad.account}") private String abroadAccount; @Value("${sms.abroad.pswd}") @@ -27,7 +31,6 @@ public class SmsUtil { private String abroadContent; public R sendSmsCode(String phone, String code) { - String uri = "http://116.62.212.142/msg/HttpBatchSendSM";//应用地址 String mobiles = phone;//手机号码，多个号码使用","分割 boolean needstatus = true;//是否需要状态报告，需要true，不需要false String product = "";//产品ID @@ -35,7 +38,7 @@ public class SmsUtil { String respType = "json";//返回json格式响应 boolean encrypt = true;// 密码使用时间戳加密 try { - String returnString = HttpSender.send(uri, account, pswd, mobiles, content.replace("XXXXXX",code), needstatus, product, extno, respType, encrypt); + String returnString = HttpSender.send(url, account, pswd, mobiles, content.replace("XXXXXX",code), needstatus, product, extno, respType, encrypt); //{"result":108,"ts":"20250416115415"} //{"result":0,"msgid":"2150416115442493200","ts":"20250416115442"} JSONObject object = JSONObject.parseObject(returnString); @@ -57,7 +60,7 @@ public class SmsUtil { public R sendSmsAbroad(String phone, String code){ try { CloseableHttpClient client = HttpClients.createDefault(); - HttpPost httpPost = new HttpPost("http://www.onesnok.net:9511/api/send-sms-single"); + HttpPost httpPost = new HttpPost(abroadUrl); StringEntity entity = new StringEntity("" + "sp_id="+abroadAccount+ "&password="+MD5Utils.getStrrMD5(abroadPswd)+ diff --git a/src/main/java/com/peanut/modules/common/service/impl/MyUserServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/MyUserServiceImpl.java index 8114eb73..b9a1bf64 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/MyUserServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/MyUserServiceImpl.java @@ -7,7 +7,6 @@ import com.aliyun.tea.TeaException; import com.aliyun.teautil.Common; import com.aliyun.teautil.models.RuntimeOptions; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bcloud.msg.http.HttpSender; import com.peanut.common.utils.R; import com.peanut.common.utils.SmsUtil; import com.peanut.modules.app.config.SMSConfig; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index fe3de1db..c684a1fd 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -73,10 +73,12 @@ aliyun: sms: domestic: + url: http://116.62.212.142/msg/HttpBatchSendSM account: MXT802795 pswd: Zm802795 content: 【天津众妙之门科技】，你的验证码为：XXXXXX，您正在进行身份验证，请勿泄露于他人！ abroad: + url: http://www.onesnok.net:9511/api/send-sms-single account: 921689 pswd: 9de2a579 content: Tianjin Zhongmiao Gate Technology:Your verification code is:XXXXXX. diff --git a/src/main/resources/application-dev1.yml b/src/main/resources/application-dev1.yml index 6b151e57..4be535e8 100644 --- a/src/main/resources/application-dev1.yml +++ b/src/main/resources/application-dev1.yml @@ -73,10 +73,12 @@ aliyun: sms: domestic: + url: http://116.62.212.142/msg/HttpBatchSendSM account: MXT802795 pswd: Zm802795 content: 【天津众妙之门科技】，你的验证码为：XXXXXX，您正在进行身份验证，请勿泄露于他人！ abroad: + url: http://www.onesnok.net:9511/api/send-sms-single account: 921689 pswd: 9de2a579 content: Tianjin Zhongmiao Gate Technology:Your verification code is:XXXXXX. diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 10fbcbab..2769c887 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -72,10 +72,12 @@ aliyun: sms: domestic: + url: http://116.62.212.142/msg/HttpBatchSendSM account: MXT802795 pswd: Zm802795 content: 【天津众妙之门科技】，你的验证码为：XXXXXX，您正在进行身份验证，请勿泄露于他人！ abroad: + url: http://www.onesnok.net:9511/api/send-sms-single account: 921689 pswd: 9de2a579 content: Tianjin Zhongmiao Gate Technology:Your verification code is:XXXXXX. diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 8d43e9d7..acaa97fd 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -73,10 +73,12 @@ aliyun: sms: domestic: + url: http://116.62.212.142/msg/HttpBatchSendSM account: MXT802795 pswd: Zm802795 content: 【天津众妙之门科技】，你的验证码为：XXXXXX，您正在进行身份验证，请勿泄露于他人！ abroad: + url: http://www.onesnok.net:9511/api/send-sms-single account: 921689 pswd: 9de2a579 content: Tianjin Zhongmiao Gate Technology:Your verification code is:XXXXXX.