From ec89bda2e08c1f8bf1dbb8efec22c816dadd78e5 Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Tue, 3 Sep 2024 11:39:08 +0800
Subject: [PATCH] ~

---
 .../com/ruoyi/app/controller/AppLoginController.java     | 5 +++++
 .../com/ruoyi/app/controller/PhoneCodeController.java    | 8 ++++++++
 .../com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java     | 9 ++++++---
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
index b420b61..4fbdf32 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
@@ -113,6 +113,11 @@ public class AppLoginController {
             if (org.apache.commons.lang3.StringUtils.isBlank(registerForm.getProve()) && !emailStr.equals(appSchool.getEmail())) {
                 return R.fail(2001,"您提供的邮箱后缀与您的学校不符！请提供学习邮箱或人工审核。");
             }
+            String phone = redisService.getCacheObject(registerForm.getPhoneNumber());
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(phone)) {
+                redisService.deleteObject(registerForm.getPhoneNumber());
+                registerForm.setPhoneNumber(phone);
+            }
             AppRegister appRegister = setAppRegister(registerForm);
             //校验邮箱是否已注册
             AppUser emailUser = appUserService.selectAppUserByEmail(registerForm.getEmail());
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java
index 2f19544..14f645e 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java
@@ -6,6 +6,7 @@ import com.ruoyi.app.utils.aliyun.sms.SendNoteUtil;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.redis.service.RedisService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -29,6 +30,9 @@ public class PhoneCodeController {
     @Autowired
     private IAppRegisterService appRegisterService;
 
+    @Autowired
+    private RedisService redisService;
+
     @GetMapping(value = "/send")
     @ApiOperation(value = "发送短信验证码", notes = "发送短信验证码", httpMethod = "GET")
    public AjaxResult sendCode(@RequestParam("phoneNumber") String phoneNum , @RequestParam("type") Integer type){
@@ -42,6 +46,10 @@ public class PhoneCodeController {
 //            if (appRegister != null && appRegister.getStatus() == 2) {
 //                return AjaxResult.error(201, "您的账号申请被驳回，驳回原因: " + appRegister.getRemark());
 //            }
+            if (phoneNum.indexOf("+") != -1) {
+                String redisKey = phoneNum.substring(phoneNum.indexOf("+") + 1,phoneNum.length());
+                redisService.setCacheObject(redisKey,phoneNum);
+            }
             send = sendNoteUtil.sendNoteMessgae(phoneNum);
         }else {
             send = sendNoteUtil.sendNoteMessgae(phoneNum);
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 35a8c2d..c458054 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
@@ -157,6 +157,7 @@ public class SendNoteUtil {
         String homeTem = "SMS_467520300";
         String foreignTem = "SMS_468380559";
         if (!isChineseMobileNumber(PhoneNumber)) {
+            PhoneNumber = PhoneNumber.replace("+","");
             return sendMessageForeign(PhoneNumber);
         }
         CommonRequest request = new CommonRequest();
@@ -236,11 +237,13 @@ public class SendNoteUtil {
     }
 
     public static void main(String[] args) {
-        String phone = "1+4049014566";
+        /*String phone = "14696089013";
         if (!isChineseMobileNumber(phone)) {
-            phone = phone.replace("+","");
+            //phone = phone.replace("+","");
             System.out.println(sendMessageForeign(phone));
-        }
+        }*/
+        String str = "1+1";
+        System.out.println(str.substring(str.indexOf("+") + 1,str.length()));
     }
 
     private static String sendMessageForeign(String phone){