From 33761d82e3f5569ecb6fc1aeaf77843a85032d87 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 06 十一月 2025 11:29:33 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 80 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 77 insertions(+), 3 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 78126f5..3936557 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,29 +1,48 @@
package com.ruoyi.web.controller.system;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.TAppUserResp;
import com.ruoyi.common.core.domain.model.LoginAppBody;
import com.ruoyi.common.core.domain.model.LoginUserApplet;
import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.system.service.TAppUserService;
+import com.ruoyi.system.utils.wx.body.resp.Code2SessionRespBody;
+import com.ruoyi.system.utils.wx.body.resq.Code2SessionResqBody;
+import com.ruoyi.system.utils.wx.model.WeixinProperties;
+import com.ruoyi.system.utils.wx.pojo.AppletUserDecodeData;
+import com.ruoyi.system.utils.wx.pojo.AppletUserEncrypteData;
+import com.ruoyi.system.utils.wx.tools.WxAppletTools;
+import com.ruoyi.system.utils.wx.tools.WxUtils;
import com.ruoyi.web.controller.tool.MsgUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
/**
@@ -31,6 +50,7 @@
*
* @author ruoyi
*/
+@Slf4j
@Api(tags = "登录")
@RestController
public class SysLoginController
@@ -51,7 +71,14 @@
private ISysRoleService roleService;
@Autowired
private MsgUtils msgUtils;
-
+ @Autowired
+ private RestTemplate wxRestTemplate;
+ @Autowired
+ private WeixinProperties wxConfig;
+ @Autowired
+ private RedisService redisService;
+ @Autowired
+ private TAppUserService appUserService;
/**
* 账号密码登录
*
@@ -59,7 +86,7 @@
* @return 结果
*/
@ApiOperation(value = "账号密码登录",notes = "账号密码登录")
- @PostMapping("/api/loginApp")
+ @PostMapping("/loginApp")
public AjaxResult login(@RequestBody String param)
{
LoginAppBody loginAppBody = JSON.parseObject(param, LoginAppBody.class);
@@ -68,10 +95,57 @@
LoginUserApplet loginUser = loginService.loginCodeApplet(loginAppBody.getAccount(), loginAppBody.getPassword());
ajax.put(Constants.TOKEN, tokenService.createTokenApplet(loginUser));
ajax.put("data",loginUser);
-
return ajax;
}
+ @ApiOperation(value = "通过code获得openid,获取用户信息",tags = {"微信小程序登录"})
+ @PostMapping("/openIdByJsCode")
+ public R<Map<String, Object>> openIdByJsCode(@RequestBody AppletUserEncrypteData data) {
+ log.info("<<<<<<<<换取openid开始<<<<<<<<:{}", data.getCode());
+ WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisService);
+ Code2SessionRespBody body = appletTools.getOpenIdByJscode2session(new Code2SessionResqBody().build(data.getCode()));
+ String openid = body.getOpenid();
+ String sessionKey = body.getSessionKey();
+ // 用户信息解密 数据验签
+// if (StringUtils.isNotBlank(data.getSignature())) {
+// WxUtils.verifySignature(data.getRawData(), sessionKey, data.getSignature());
+// }
+ if(StringUtils.isEmpty(data.getEncryptedData()) || StringUtils.isEmpty(data.getIv())){
+ return R.fail("已拒绝授权");
+ }
+ AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey, data.getIv());
+ appletUserDecodeData.setOpenId(openid);
+ // 先使用openId和当前手机号进行查询
+ TAppUser sysAppUser = appUserService.getOne(Wrappers.lambdaQuery(TAppUser.class)
+ .and(e->e.eq(TAppUser::getOpenId, appletUserDecodeData.getOpenId()).or()
+ .eq(TAppUser::getPhoneNumber, appletUserDecodeData.getPhoneNumber())));
+ if (sysAppUser==null){
+ sysAppUser = new TAppUser();
+ sysAppUser.setPhoneNumber(appletUserDecodeData.getPhoneNumber());
+ sysAppUser.setOpenId(appletUserDecodeData.getOpenId());
+ // 手机号中间四位替换为*
+ sysAppUser.setNickName(appletUserDecodeData.getPhoneNumber().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
+ appUserService.save(sysAppUser);
+ }else {
+ // 判断账号是否被冻结
+ if (sysAppUser.getStatus() == 2){
+ return R.fail("账号已冻结,请联系管理员");
+ }
+ // 手机号相同但openId为空的情况
+ sysAppUser.setOpenId(appletUserDecodeData.getOpenId());
+ appUserService.updateById(sysAppUser);
+ }
+ LoginUserApplet loginUserApplet = new LoginUserApplet();
+ TAppUserResp sysUserResp = new TAppUserResp();
+ BeanUtils.copyProperties(sysAppUser, sysUserResp);
+ loginUserApplet.setUser(sysUserResp);
+ loginUserApplet.setUserId(sysAppUser.getId());
+ Map<String, Object> tokenInfos = new HashMap<>();
+ tokenInfos.put("token",tokenService.createTokenApplet(loginUserApplet));
+ tokenInfos.put("info",loginUserApplet);
+ return R.ok(tokenInfos);
+ }
+
/**
* 获取用户信息
--
Gitblit v1.7.1