From 85bafa86f44fbe6646019fd8ecbab79f552ccd0a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 二月 2026 21:44:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-service/xp-account/src/main/java/com/xiaopeng/account/service/impl/SysLoginService.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/xp-service/xp-account/src/main/java/com/xiaopeng/account/service/impl/SysLoginService.java b/xp-service/xp-account/src/main/java/com/xiaopeng/account/service/impl/SysLoginService.java
index 27b72a9..2300778 100644
--- a/xp-service/xp-account/src/main/java/com/xiaopeng/account/service/impl/SysLoginService.java
+++ b/xp-service/xp-account/src/main/java/com/xiaopeng/account/service/impl/SysLoginService.java
@@ -1,20 +1,18 @@
package com.xiaopeng.account.service.impl;
-import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
-import com.xiaopeng.api.dto.operation.UpdatePasswordDTO;
import com.xiaopeng.account.service.ISysPermissionService;
import com.xiaopeng.account.service.ISysUserService;
+import com.xiaopeng.account.service.XpOperationsUserService;
+import com.xiaopeng.api.dto.operation.UpdatePasswordDTO;
import com.xiaopeng.api.model.account.SysUser;
import com.xiaopeng.api.model.account.XpOperationsUser;
-import com.xiaopeng.api.vo.account.LoginOperationUser;
import com.xiaopeng.api.model.operation.SysMenu;
+import com.xiaopeng.api.vo.account.LoginOperationUser;
import com.xiaopeng.api.vo.account.LoginUser;
-import com.xiaopeng.common.core.constant.VerificationCodeConstants;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import com.xiaopeng.common.core.constant.CacheConstants;
import com.xiaopeng.common.core.constant.Constants;
import com.xiaopeng.common.core.constant.UserConstants;
+import com.xiaopeng.common.core.constant.VerificationCodeConstants;
import com.xiaopeng.common.core.enums.UserStatus;
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.text.Convert;
@@ -22,11 +20,14 @@
import com.xiaopeng.common.core.utils.ip.IpUtils;
import com.xiaopeng.common.redis.service.RedisService;
import com.xiaopeng.common.security.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Set;
+import java.util.stream.Collectors;
/**
* 登录校验方法
@@ -71,7 +72,7 @@
LoginUser userInfo = new LoginUser();
userInfo.setSysUser(user);
userInfo.setRoles(roles);
- userInfo.setPermissions(menuPermission);
+ userInfo.setPermissions(menuPermission.stream().map(SysMenu::getPath).collect(Collectors.toSet()));
if (StringUtils.isNull(user)) {
recordLogService.recordLogininfor(request, null, username, Constants.LOGIN_FAIL_STATUS, "登录用户不存在");
--
Gitblit v1.7.1