From 436a7c7601980a0541b59df1d9687bd7304dc7e5 Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Tue, 3 Sep 2024 14:12:45 +0800
Subject: [PATCH] ~

---
 .../app/utils/aliyun/sms/SendNoteUtil.java    | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java
index c458054..2845a84 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java
@@ -87,7 +87,7 @@ public class SendNoteUtil {
         }
         if (!isChineseMobileNumber(PhoneNumber)) {
             PhoneNumber = PhoneNumber.replace("+","");
-            return sendForeign(PhoneNumber,randomNumber);
+            return sendForeign(PhoneNumber,randomNumber,Integer.valueOf(PhoneNumber.substring(0,1)));
         }
         CommonRequest request = new CommonRequest();
         request.setSysMethod(MethodType.POST);
@@ -158,7 +158,7 @@ public class SendNoteUtil {
         String foreignTem = "SMS_468380559";
         if (!isChineseMobileNumber(PhoneNumber)) {
             PhoneNumber = PhoneNumber.replace("+","");
-            return sendMessageForeign(PhoneNumber);
+            return sendMessageForeign(PhoneNumber,Integer.valueOf(PhoneNumber.substring(0,1)));
         }
         CommonRequest request = new CommonRequest();
         request.setSysMethod(MethodType.POST);
@@ -187,7 +187,7 @@ public class SendNoteUtil {
         return number.matches(regex);
     }
 
-    private static String sendForeign(String phone,String code){
+    private static String sendForeign(String phone,String code,int region){
         DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou","LTAI5tQMf7PG2rH4U2mZBQnK", "3l8t7cVJGTGGu89AepWtq0CddgZNfU");
         IAcsClient client = new DefaultAcsClient(profile);
         CommonRequest request = new CommonRequest();
@@ -197,8 +197,9 @@ public class SendNoteUtil {
         request.setSysAction("SendMessageToGlobe");
         request.putQueryParameter("To", phone);
         request.putQueryParameter("Message", "您的验证码是" + code + "。请不要把验证码泄露给其他人。");
-        //request.putQueryParameter("From", "18773124359");
-        request.putQueryParameter("From", "18773124359");
+        if (region == 1) {
+            request.putQueryParameter("From", "18773124359");
+        }
         request.putQueryParameter("Type", "OTP");//
 
         try {
@@ -237,16 +238,14 @@ public class SendNoteUtil {
     }
 
     public static void main(String[] args) {
-        /*String phone = "14696089013";
+        String phone = "1+4696089013";
         if (!isChineseMobileNumber(phone)) {
-            //phone = phone.replace("+","");
-            System.out.println(sendMessageForeign(phone));
-        }*/
-        String str = "1+1";
-        System.out.println(str.substring(str.indexOf("+") + 1,str.length()));
+            phone = phone.replace("+","");
+            System.out.println(sendMessageForeign(phone,Integer.valueOf(phone.substring(0,1))));
+        }
     }
 
-    private static String sendMessageForeign(String phone){
+    private static String sendMessageForeign(String phone,int region){
         DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou","LTAI5tQMf7PG2rH4U2mZBQnK", "3l8t7cVJGTGGu89AepWtq0CddgZNfU");
         IAcsClient client = new DefaultAcsClient(profile);
         CommonRequest request = new CommonRequest();
@@ -255,8 +254,10 @@ public class SendNoteUtil {
         request.setSysVersion("2017-05-25");
         request.setSysAction("SendMessageToGlobe");
         request.putQueryParameter("To", phone);
-        request.putQueryParameter("Message", "尊敬的" + phone +"用户，您的申请已通过，请使用您的手机号登录\n");
-        request.putQueryParameter("From", "18338560758");
+        request.putQueryParameter("Message", "Go Big 尊敬的" + phone +"用户，您的申请已通过，请使用您的手机号登录\n");
+        if (region == 1) {
+            request.putQueryParameter("From", "18338560758");
+        }
         request.putQueryParameter("Type", "NOTIFY");
 
         try {