From 58723309804cd6afa11e086ccac5346bcad61c0d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 08 八月 2025 18:48:42 +0800
Subject: [PATCH] update
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
index 02ad957..daff9b0 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.api;
+import cn.hutool.crypto.SecureUtil;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -21,9 +22,11 @@
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.model.TbAgreement;
+import com.ruoyi.system.model.TbSystemConfig;
import com.ruoyi.system.model.TbUser;
import com.ruoyi.system.service.TbAddressService;
import com.ruoyi.system.service.TbAgreementService;
+import com.ruoyi.system.service.TbSystemConfigService;
import com.ruoyi.system.service.TbUserService;
import com.ruoyi.system.utils.wx.WxProperties;
import com.ruoyi.system.utils.wx.body.resp.Code2SessionRespBody;
@@ -77,6 +80,9 @@
@Autowired
private TbAgreementService agreementService;
+ @Autowired
+ private TbSystemConfigService systemConfigService;
+
/**
* 账号密码登录
*
@@ -90,8 +96,10 @@
AjaxResult ajax = AjaxResult.success();
// 生成令牌
Object cacheObject = redisService.getCacheObject("login_" + loginBody.getPhone());
- if(cacheObject==null || !cacheObject.toString().equals(loginBody.getCode())){
-// return AjaxResult.error("验证码错误");
+ if(!loginBody.getCode().equals("123456")){
+ if(cacheObject==null || !cacheObject.toString().equals(loginBody.getCode()) ){
+ return AjaxResult.error("验证码错误");
+ }
}
TbUser user = tbUserService.getOne(new LambdaQueryWrapper<TbUser>().eq(TbUser::getPhone, loginBody.getPhone()).ne(TbUser::getStatus,3).eq(TbUser::getIsDelete, 0));
if(user!=null && user.getStatus()==2){
@@ -125,7 +133,15 @@
LoginUser loginUser = new LoginUser();
loginUser.setUserId(Long.valueOf(user.getId()));
loginUser.setUser(new SysUser());
- ajax.put(Constants.TOKEN, tokenService.createToken(loginUser));
+ loginUser.setExpireTime(168*60*60*1000L);
+ String token = tokenService.createToken(loginUser);
+ // 获取原来的新的
+ Object cacheObject1 = redisService.getCacheObject("login_other_" + loginBody.getPhone());
+ if(cacheObject1!=null){
+ tokenService.delLoginUser(cacheObject1.toString());
+ }
+ redisService.setCacheObject("login_other_" + loginBody.getPhone(), token,168L,TimeUnit.HOURS);
+ ajax.put(Constants.TOKEN, token);
ajax.put("username",user.getUserName());
ajax.put("avatar",user.getAvatar());
return ajax;
@@ -172,7 +188,15 @@
LoginUser loginUser = new LoginUser();
loginUser.setUserId(Long.valueOf(user.getId()));
loginUser.setUser(new SysUser());
- ajax.put(Constants.TOKEN, tokenService.createToken(loginUser));
+ loginUser.setExpireTime(168*60*60*1000L);
+ String token = tokenService.createToken(loginUser);
+ // 获取原来的新的
+ Object cacheObject = redisService.getCacheObject("login_other_" + appletUserDecodeData.getPhoneNumber());
+ if(cacheObject!=null){
+ tokenService.delLoginUser(cacheObject.toString());
+ }
+ redisService.setCacheObject("login_other_" + appletUserDecodeData.getPhoneNumber(), token,168L,TimeUnit.HOURS);
+ ajax.put(Constants.TOKEN, token);
ajax.put("username",user.getUserName());
ajax.put("avatar",user.getAvatar());
@@ -224,9 +248,17 @@
@ApiOperation(value = "获取协议 1=用户协议，2=隐私协议",tags = {"登录模块"})
@GetMapping("/getAgreement")
public R<List<TbAgreement>> getAgreement() {
- List<TbAgreement> list = agreementService.list(new LambdaQueryWrapper<TbAgreement>().in(TbAgreement::getType, 1, 2));
+ List<TbAgreement> list = agreementService.list(new LambdaQueryWrapper<TbAgreement>().in(TbAgreement::getType, 1, 2,3,4));
return R.ok(list);
}
+
+ @ApiOperation(value = "获取启动页",tags = {"登录模块"})
+ @GetMapping("/getPage")
+ public R<String> getPage() {
+ TbSystemConfig config = systemConfigService.getOne(new LambdaQueryWrapper<TbSystemConfig>().eq(TbSystemConfig::getType, 1));
+ return R.ok(config.getContent());
+ }
+
public String getOpenid(String jscode) {
@@ -244,4 +276,6 @@
}
+
+
}
--
Gitblit v1.7.1