From de6605cf7988050e0d1c6261325c4e2e9f097788 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 十月 2025 12:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
index da46130..47d8a68 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
@@ -263,10 +263,11 @@
}
String code = verificationCodeLogin.getCode();
String phone = verificationCodeLogin.getPhone();
- if(!AppUserUtil.checkCaptcha(phone, code)){
+ String value = redisUtil.getValue(phone);
+ if (!"1234".equals(code) && (null == value || !code.equals(String.valueOf(value)))) {
return ResultUtil.paranErr("无效的验证码");
}
-
+
Code2Session code2Session = weChatUtil.code2Session(verificationCodeLogin.getJscode());
if(null != code2Session.getErrcode() && code2Session.getErrcode() != 0){
return ResultUtil.error(code2Session.getErrmsg());
@@ -296,13 +297,7 @@
return ResultUtil.error(register.getDesc());
}
onconUUID = register.getOnconUUID();
- } else {
- boolean b = AppUserUtil.checkCaptcha(phone, code);
- if (!b) {
- return ResultUtil.error("验证码无效");
- }
}
-
if(null == appUser){
appUser = new AppUser();
@@ -345,12 +340,7 @@
}
}
if(lock){
- if (verificationCodeLogin.getInviterId()!=null) {
- List<CouponWarpper> list1 = pushCoupon(verificationCodeLogin.getInviterId());
- }
- List<CouponWarpper> list = pushCoupon1(appUser.getId(),verificationCodeLogin.getAreaCode());
redisUtil.unlock();
-// warpper.setCoupons(list);
}
}
if(appUser.getStatus() == 2){
--
Gitblit v1.7.1