From 946dc71d5679974538986e38f19c48bb2d1bdcae Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 18:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
index 570babe..27c8429 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
@@ -119,10 +119,12 @@
private WeixinProperties weixinProperties;
@Resource
private RedisService redisService;
+ @Resource
+ private MsgUtils msgUtils;
@ApiOperation(value = "通过code获得openid,获取用户信息",tags = {"微信小程序登录"})
@GetMapping("/openIdByJsCode")
public R<String> openIdByJsCode(@RequestParam String code) {
- Long userId = tokenService.getLoginUser().getUserId();
+ Long userId = tokenService.getLoginUserApplet().getUserId();
SysUser sysUser = sysUserService.selectUserById(userId);
if(Objects.isNull(sysUser)){
return R.fail("未查询到当前登录用户信息");
@@ -138,8 +140,6 @@
sysUserService.updateUser(sysUser);
return R.ok();
}
- @Resource
- private MsgUtils msgUtils;
@ApiOperation(value = "消息通知列表")
@PostMapping(value = "/noticeList")
--
Gitblit v1.7.1