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 4fbdf32..93b4d0b 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,7 +113,7 @@ 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()); + String phone = redisService.getCacheObject("key" + registerForm.getPhoneNumber()); if (org.apache.commons.lang3.StringUtils.isNotBlank(phone)) { redisService.deleteObject(registerForm.getPhoneNumber()); registerForm.setPhoneNumber(phone); 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 77140e6..d4ae2e5 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 @@ -46,11 +46,6 @@ public class PhoneCodeController { // if (appRegister != null && appRegister.getStatus() == 2) { // return AjaxResult.error(201, "您的账号申请被驳回,驳回原因: " + appRegister.getRemark()); // } - System.out.println("-----------------------------------" + phoneNum); - 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); @@ -73,7 +68,6 @@ public class PhoneCodeController { * @return 返回验证状态 */ @GetMapping(value ="/check") - @ApiOperation(value = "验证验证码", notes = "验证验证码", httpMethod = "GET") public AjaxResult check(@RequestParam("phoneNumber") String phoneNumber, @RequestParam("code") String code) { String verificationResults = sendNoteUtil.check(phoneNumber, code); 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 319883c..6ad15bd 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 @@ -81,6 +81,10 @@ public class SendNoteUtil { randomNumber = "1234"; } log.info("--------------------------------------------- " + PhoneNumber + "验证码:" + randomNumber); + if (PhoneNumber.indexOf("+") != -1) { + String redisKey = PhoneNumber.substring(PhoneNumber.indexOf("+") + 1,PhoneNumber.length()); + redisService.setCacheObject("key" + redisKey,PhoneNumber); + } redisService.setCacheObject(PhoneNumber, randomNumber, 300L, TimeUnit.SECONDS); if (!redisService.hasKey(PhoneNumber)) { return "Redis存入失败"; @@ -157,6 +161,7 @@ public class SendNoteUtil { String homeTem = "SMS_467520300"; String foreignTem = "SMS_468380559"; if (!isChineseMobileNumber(PhoneNumber)) { + log.info("--------------------------------------------- 审核通过啦" + PhoneNumber); PhoneNumber = PhoneNumber.replace("+",""); return sendMessageForeign(PhoneNumber,Integer.valueOf(PhoneNumber.substring(0,1))); } @@ -238,10 +243,16 @@ public class SendNoteUtil { } public static void main(String[] args) { - String phone = "852+69030916"; + /*String phone = "852+69030916"; if (!isChineseMobileNumber(phone)) { phone = phone.replace("+",""); System.out.println(sendMessageForeign(phone,Integer.valueOf(phone.substring(0,1)))); + }*/ + String PhoneNumber = "852+69030916"; + if (PhoneNumber.indexOf("+") != -1) { + String redisKey = PhoneNumber.substring(PhoneNumber.indexOf("+") + 1,PhoneNumber.length()); + System.out.println("key" + redisKey); + System.out.println(PhoneNumber); } }