wangys/schoolNews
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

前端和json优化

Browse Source
This commit is contained in:
wangys
2025-11-28 17:16:17 +08:00
parent 34e69c7f62
commit dfb11c85f1
135 changed files with 930 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
schoolNewsServ/auth/src/main/java/org/xyzh/auth/domain/UserPrincipal.java
View File

@@ -65,7 +65,7 @@ public class UserPrincipal implements UserDetails {
public Collection<? extends GrantedAuthority> getAuthorities() {
// 角色权限
List<GrantedAuthority> roleAuthorities = roles.stream()
.map(role -> new SimpleGrantedAuthority("ROLE_" + role.getID()))
.map(role -> new SimpleGrantedAuthority("ROLE_" + role.getId()))
.collect(Collectors.toList());
// 功能权限

12
schoolNewsServ/auth/src/main/java/org/xyzh/auth/service/LoginServiceImpl.java
View File

@@ -242,7 +242,7 @@ public class LoginServiceImpl implements LoginService {
loginDomain.setIpAddress(ipAddress);
// 用户信息
try {
ResultDomain<TbSysUserInfo> resultDomain = userService.getUserInfoById(user.getID());
ResultDomain<TbSysUserInfo> resultDomain = userService.getUserInfoById(user.getId());
if (resultDomain.isSuccess()) {
loginDomain.setUserInfo(resultDomain.getData());
}
@@ -251,7 +251,7 @@ public class LoginServiceImpl implements LoginService {
}
// 获取用户角色和权限（如果服务可用）
try {
ResultDomain<UserDeptRoleVO> resultDomain = roleService.getDeptRolesByUserId(user.getID());
ResultDomain<UserDeptRoleVO> resultDomain = roleService.getDeptRolesByUserId(user.getId());
if (resultDomain.isSuccess()) {
List<UserDeptRoleVO> roles = resultDomain.getDataList();
loginDomain.setRoles(roles);
@@ -263,7 +263,7 @@ public class LoginServiceImpl implements LoginService {
}
try {
ResultDomain<TbSysPermission> resultDomain = permissionService.getPermissionsByUserId(user.getID());
ResultDomain<TbSysPermission> resultDomain = permissionService.getPermissionsByUserId(user.getId());
if (resultDomain.isSuccess()) {
List<TbSysPermission> permissions = resultDomain.getDataList();
loginDomain.setPermissions(permissions);
@@ -275,7 +275,7 @@ public class LoginServiceImpl implements LoginService {
}
try {
ResultDomain<TbSysMenu> resultDomain = menuService.getMenusByUserId(user.getID());
ResultDomain<TbSysMenu> resultDomain = menuService.getMenusByUserId(user.getId());
if (resultDomain.isSuccess()) {
List<TbSysMenu> menus = resultDomain.getDataList();
loginDomain.setMenus(menus);
@@ -302,10 +302,10 @@ public class LoginServiceImpl implements LoginService {
TbSysLoginLog loginLog = new TbSysLoginLog();
// 使用IDUtils生成登录日志ID
loginLog.setID(IDUtils.generateID());
loginLog.setId(IDUtils.generateID());
if (user != null) {
loginLog.setUserID(user.getID());
loginLog.setUserID(user.getId());
loginLog.setUsername(user.getUsername());
}else{
if (loginParam.getLoginType().equals("password")) {

4
schoolNewsServ/auth/src/main/java/org/xyzh/auth/util/JwtTokenUtil.java
View File

@@ -44,7 +44,7 @@ public class JwtTokenUtil {
Map<String, Object> claims = new HashMap<>();
TbSysUser user = loginDomain.getUser();
claims.put("userId", user.getID());
claims.put("userId", user.getId());
claims.put("username", user.getUsername());
claims.put("email", user.getEmail());
claims.put("loginType", loginDomain.getLoginType());
@@ -52,7 +52,7 @@ public class JwtTokenUtil {
return Jwts.builder()
.setClaims(claims)
.setSubject(user.getID())
.setSubject(user.getId())
.setId(IDUtils.generateID()) // 使用IDUtils生成JWT ID
.setIssuedAt(new Date())
.setExpiration(generateExpirationDate())