From e8a7beb5455d0c9f50f93004b600dd2781ad6bfd Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期一, 30 六月 2025 09:36:56 +0800
Subject: [PATCH] feat(空调控制): 实现空调控制功能并优化 SVG 数据加载- 新增 AirCondConstants 类,定义空调控制常量 - 修改 AirConditionerServiceImpl,使用常量替代硬编码值 - 更新 MQTT 消息发送逻辑,使用常量定义主题 - 优化 SVG 数据加载和处理逻辑,改进标签值更新方式 - 调整域名地址配置,支持生产环境 API

---
 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