From df6ec076733608fb1de466c2cbd609ec0cda3588 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 29 十一月 2024 17:13:30 +0800
Subject: [PATCH] 修改临时登录方案

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java |   41 +++++++++++++++++++++--------------------
 1 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index 953d74d..5d2edeb 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -90,10 +90,10 @@
 	@Override
 	public R<LoginVo> mobileLogin(MobileLogin mobileLogin) {
 		//校验验证码
-		String code = redisService.getCacheObject(mobileLogin.getPhone());
-		if(null == code || !code.equals(mobileLogin.getCode())){
-			return R.fail("验证码错误");
-		}
+//		String code = redisService.getCacheObject(mobileLogin.getPhone());
+//		if(null == code || !code.equals(mobileLogin.getCode())){
+//			return R.fail("验证码错误");
+//		}
 		
 		//查询用户是否注册,没有注册则跳转到注册页面
 		AppUser appUser = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, mobileLogin.getPhone()).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
@@ -169,22 +169,23 @@
 	@Override
 	public R<LoginVo> registerAccount(RegisterAccount registerAccount) {
 		//校验验证码
-		String code = redisService.getCacheObject(registerAccount.getPhone());
-		if(null == code || !code.equals(registerAccount.getCode())){
-			return R.fail("验证码错误");
-		}
+//		String code = redisService.getCacheObject(registerAccount.getPhone());
+//		if(null == code || !code.equals(registerAccount.getCode())){
+//			return R.fail("验证码错误");
+//		}
 		//使用jscode获取微信openid
-		Map<String, Object> map = weChatUtil.code2Session(registerAccount.getJscode());
-		Integer errcode = Integer.valueOf(map.get("errcode").toString());
-		if(0 != errcode){
-			return R.fail(map.get("msg").toString());
-		}
-		String openid = map.get("openid").toString();
-		//查询用户是否注册
-		AppUser appUser = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getWxOpenid, openid).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
-		if(null != appUser){
-			return R.fail("此微信号已注册,请直接登录!");
-		}
+//		Map<String, Object> map = weChatUtil.code2Session(registerAccount.getJscode());
+//		Integer errcode = Integer.valueOf(map.get("errcode").toString());
+//		if(0 != errcode){
+//			return R.fail(map.get("msg").toString());
+//		}
+//		String openid = map.get("openid").toString();
+//		//查询用户是否注册
+//		AppUser appUser = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getWxOpenid, openid).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
+//		if(null != appUser){
+//			return R.fail("此微信号已注册,请直接登录!");
+//		}
+		AppUser appUser = null;
 		AppUser appUser1 = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, registerAccount.getPhone()).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
 		if(null != appUser1){
 			return R.fail("手机号已注册,请直接登录!");
@@ -193,7 +194,7 @@
 			appUser = new AppUser();
 			appUser.setName(registerAccount.getName());
 			appUser.setPhone(registerAccount.getPhone());
-			appUser.setWxOpenid(openid);
+//			appUser.setWxOpenid(openid);
 			//注册默认为普通会员
 			appUser.setVipId(1);
 			appUser.setStatus(1);

--
Gitblit v1.7.1