From 3ad537052477fe31f45bd2e16045d58b35713bdc Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 24 五月 2025 09:19:59 +0800
Subject: [PATCH] refactor(env): 更新环境配置并优化代码

---
 zhitan-framework/src/main/java/com/zhitan/framework/web/service/SysLoginService.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/zhitan-framework/src/main/java/com/zhitan/framework/web/service/SysLoginService.java b/zhitan-framework/src/main/java/com/zhitan/framework/web/service/SysLoginService.java
index bdb62a4..744319d 100644
--- a/zhitan-framework/src/main/java/com/zhitan/framework/web/service/SysLoginService.java
+++ b/zhitan-framework/src/main/java/com/zhitan/framework/web/service/SysLoginService.java
@@ -64,6 +64,9 @@
     @Resource
     private ISysSocialService sysSocialService;
 
+    @Resource
+    private SysPermissionService permissionService;
+
     /**
      * 鐧诲綍楠岃瘉
      *
@@ -76,7 +79,7 @@
     public String login(String username, String password, String code, String uuid)
     {
         // 楠岃瘉鐮佹牎楠�
-        validateCaptcha(username, code, uuid);
+//        validateCaptcha(username, code, uuid);
         // 鐧诲綍鍓嶇疆鏍¢獙
         loginPreCheck(username, password);
         // 鐢ㄦ埛楠岃瘉
@@ -170,6 +173,7 @@
         LoginUser loginUser = new LoginUser();
         loginUser.setUser(userService.selectUserById(list.get(0).getUserId()));
         loginUser.setUserId(list.get(0).getUserId());
+        loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
         // 鐢熸垚token
         return tokenService.createToken(loginUser);
     }

--
Gitblit v1.9.3