From 8c16585ae6ec8358198d56f0bfee8996c910c52c Mon Sep 17 00:00:00 2001
From: tangzh <tangzh@3721zh.com>
Date: Tue, 15 Jul 2025 14:31:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhengjie/modules/front/rest/BusUserController.java   | 9 +++++----
 .../modules/front/service/impl/WeChatServiceImpl.java    | 6 +++---
 .../zhengjie/modules/system/service/BusUserService.java  | 2 ++
 .../modules/system/service/impl/BusUserServiceImpl.java  | 7 +++++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/rest/BusUserController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/rest/BusUserController.java
index 2da8a21..f938207 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/rest/BusUserController.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/rest/BusUserController.java
@@ -53,19 +53,20 @@ public class BusUserController {
     @GetMapping(value = "/info")
     public ResponseEntity<LoginVo> getLoginInfo() {
         JwtUserDto jwtUser = (JwtUserDto) SecurityUtils.getCurrentUser();
+        BusUser busUser = busUserService.queryById(jwtUser.getUser().getId());
         LoginVo loginVo = new LoginVo();
         loginVo.setType("login");
         loginVo.setUid(jwtUser.getUser().getId());
-        loginVo.setNikeName(jwtUser.getUser().getNickName());
-        loginVo.setAvatar(jwtUser.getUser().getAvatarPath());
-        loginVo.setPhone(jwtUser.getUser().getPhone());
+        loginVo.setNikeName(busUser.getNickname());
+        loginVo.setAvatar(busUser.getAvatar());
+        loginVo.setPhone(busUser.getPhone());
         return new ResponseEntity<>(loginVo, HttpStatus.OK);
     }
 
     @Log("信息修改")
     @ApiOperation("修改用户信息")
     @PostMapping(value = "/update")
-    public ResponseEntity<String> updateInfo(@Validated @RequestBody BusUserVo user) {
+    public ResponseEntity<String> updateInfo(@RequestBody BusUserVo user) {
         JwtUserDto jwtUser = (JwtUserDto) SecurityUtils.getCurrentUser();
         BusUser upd = new BusUser();
         upd.setId(jwtUser.getUser().getId());
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/service/impl/WeChatServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/service/impl/WeChatServiceImpl.java
index 098fb8f..9aa2bee 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/service/impl/WeChatServiceImpl.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/service/impl/WeChatServiceImpl.java
@@ -65,9 +65,9 @@ public class WeChatServiceImpl implements WeChatService {
     @Override
     public LoginVo authorizeLogin(String code, HttpServletRequest request) {
         LoginVo loginVo = new LoginVo();
-        WeChatMiniAuthorizeVo response = miniAuthCode(code);
-        // WeChatMiniAuthorizeVo response = new WeChatMiniAuthorizeVo();
-        // response.setOpenId("123456");
+//        WeChatMiniAuthorizeVo response = miniAuthCode(code);
+         WeChatMiniAuthorizeVo response = new WeChatMiniAuthorizeVo();
+         response.setOpenId("123456");
         String openId = response.getOpenId();
         String type = "login";
         BusUser BusUser = BusUserMapper.getUserByOpenId(openId);
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/BusUserService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/BusUserService.java
index f3b272c..9fcde46 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/BusUserService.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/BusUserService.java
@@ -34,6 +34,8 @@ public interface BusUserService extends IService<BusUser> {
 
     JwtUserDto addUserCache(BusUser BusUser);
 
+    BusUser queryById(Long id);
+
     /**
     * 查询数据分页
     * @param criteria 条件
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/BusUserServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/BusUserServiceImpl.java
index cc6e8d8..da52e43 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/BusUserServiceImpl.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/BusUserServiceImpl.java
@@ -17,7 +17,6 @@ package me.zhengjie.modules.system.service.impl;
 
 import me.zhengjie.modules.security.service.UserCacheManager;
 import me.zhengjie.modules.security.service.dto.JwtUserDto;
-import me.zhengjie.modules.system.domain.BusDevice;
 import me.zhengjie.modules.system.domain.BusUser;
 import me.zhengjie.modules.system.domain.User;
 import me.zhengjie.modules.system.domain.dto.BusTreeVo;
@@ -32,7 +31,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import me.zhengjie.utils.PageUtil;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.ArrayList;
 import me.zhengjie.utils.PageResult;
@@ -49,6 +47,11 @@ public class BusUserServiceImpl extends ServiceImpl<BusUserMapper, BusUser> impl
     @Autowired private BusUserMapper busUserMapper;
     @Autowired private UserCacheManager userCacheManager;
 
+    @Override
+    public BusUser queryById(Long id) {
+        return busUserMapper.selectById(id);
+    }
+
     @Override
     public PageResult<BusUser> queryAll(BusUserQueryCriteria criteria, Page<Object> page){
         return PageUtil.toPage(busUserMapper.findAll(criteria, page));