zhengsl/stdproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新了获取当前用户方法。

Browse Source
This commit is contained in:
root 2025-06-20 11:12:27 +08:00
parent 2e0cac2dcb
commit f0ba4c0d31
8 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/com/stdproject/controller/MenuController.java
View File

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.stdproject.config.ResponseResult; import com.stdproject.config.ResponseResult;
import com.stdproject.entity.Menu; import com.stdproject.entity.Menu;
import com.stdproject.service.IMenuService; import com.stdproject.service.IMenuService;
import io.gisbi.utils.AuthUtils; import com.stdproject.utils.AuthUtils;
import io.micrometer.common.util.StringUtils; import io.micrometer.common.util.StringUtils;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -60,7 +60,7 @@ public class MenuController {
return ResponseResult.error("没有菜单ID"); return ResponseResult.error("没有菜单ID");
} }
//填写 当前用户名称 //填写 当前用户名称
// menu.setLastmodifier(AuthUtils.getUser().getUserId().toString()); menu.setLastmodifier(AuthUtils.getUsername());
//填写 当前日期 //填写 当前日期
menu.setLastmodifydate(LocalDateTime.now()); menu.setLastmodifydate(LocalDateTime.now());
boolean isOk = menuService.updateById(menu); boolean isOk = menuService.updateById(menu);
@ -134,7 +134,7 @@ public class MenuController {
//根据id 修改是否显示 ，最近修改人，最近修改时间 //根据id 修改是否显示 ，最近修改人，最近修改时间
updateWrapper.eq("id", id) updateWrapper.eq("id", id)
.set("isdisplay", isdisplay) .set("isdisplay", isdisplay)
// .set("lastmodifier", AuthUtils.getUser().getUserId().toString()) .set("lastmodifier", AuthUtils.getUsername())
.set("lastmodifydate", new Timestamp(System.currentTimeMillis())); .set("lastmodifydate", new Timestamp(System.currentTimeMillis()));
boolean ok = menuService.update(updateWrapper); boolean ok = menuService.update(updateWrapper);
if (ok) { if (ok) {
@ -158,7 +158,7 @@ public class MenuController {
//根据id 修改关联模块ID ，最近修改人，最近修改时间 //根据id 修改关联模块ID ，最近修改人，最近修改时间
updateWrapper.eq("id", id) updateWrapper.eq("id", id)
.set("module_id", moduleId) .set("module_id", moduleId)
// .set("lastmodifier", AuthUtils.getUser().getUserId().toString()) .set("lastmodifier", AuthUtils.getUsername())
.set("lastmodifydate", new Timestamp(System.currentTimeMillis())); .set("lastmodifydate", new Timestamp(System.currentTimeMillis()));
boolean ok = menuService.update(updateWrapper); boolean ok = menuService.update(updateWrapper);
if (ok) { if (ok) {

6
backend/src/main/java/com/stdproject/controller/OrganizationController.java
View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.stdproject.config.ResponseResult; import com.stdproject.config.ResponseResult;
import com.stdproject.entity.Organization; import com.stdproject.entity.Organization;
import com.stdproject.service.IOrganizationService; import com.stdproject.service.IOrganizationService;
import io.gisbi.utils.AuthUtils; import com.stdproject.utils.AuthUtils;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -69,7 +69,7 @@ public class OrganizationController {
return ResponseResult.error("组织信息不能为空"); return ResponseResult.error("组织信息不能为空");
} }
//填写 最近修改者 //填写 最近修改者
// organization.setLastmodifier(AuthUtils.getUser().getUserId().toString()); organization.setLastmodifier(AuthUtils.getUsername());
//填写 最近修改时间 //填写 最近修改时间
organization.setLastmodifydate(LocalDateTime.now()); organization.setLastmodifydate(LocalDateTime.now());
//根据id 修改系统组织 //根据id 修改系统组织
@ -157,7 +157,7 @@ public class OrganizationController {
UpdateWrapper<Organization> updateWrapper = new UpdateWrapper<>(); UpdateWrapper<Organization> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", id) updateWrapper.eq("id", id)
.set("isvaild", isvaild) .set("isvaild", isvaild)
// .set("lastmodifier", AuthUtils.getUser().getUserId().toString()) .set("lastmodifier", AuthUtils.getUsername())
.set("lastmodifydate", LocalDateTime.now()); .set("lastmodifydate", LocalDateTime.now());
boolean isOk = organizationService.update(updateWrapper); boolean isOk = organizationService.update(updateWrapper);
if (isOk) { if (isOk) {

6
backend/src/main/java/com/stdproject/controller/RoleController.java
View File

@ -7,7 +7,7 @@ import com.stdproject.config.ResponseResult;
import com.stdproject.entity.Role; import com.stdproject.entity.Role;
import com.stdproject.service.IRoleService; import com.stdproject.service.IRoleService;
import com.stdproject.service.IUserService; import com.stdproject.service.IUserService;
import io.gisbi.utils.AuthUtils; import com.stdproject.utils.AuthUtils;
import io.micrometer.common.util.StringUtils; import io.micrometer.common.util.StringUtils;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -63,7 +63,7 @@ public class RoleController {
return ResponseResult.error("需要提交角色ID！"); return ResponseResult.error("需要提交角色ID！");
} }
//更新最近修改人 //更新最近修改人
// role.setLastmodifier(AuthUtils.getUser().getUserId().toString()); role.setLastmodifier(AuthUtils.getUsername());
//更新最近修改时间 //更新最近修改时间
role.setLastmodifydate(LocalDateTime.now()); role.setLastmodifydate(LocalDateTime.now());
//根据id更新角色信息 //根据id更新角色信息
@ -153,7 +153,7 @@ public class RoleController {
//根据id 更新业务范围，最近修改人，最近修改时间 //根据id 更新业务范围，最近修改人，最近修改时间
updateWrapper.eq("id", id) updateWrapper.eq("id", id)
.set("isvaild", isvaild) .set("isvaild", isvaild)
// .set("lastmodifier", AuthUtils.getUser().getUserId().toString()) .set("lastmodifier", AuthUtils.getUsername())
.set("lastmodifydate",LocalDateTime.now()); .set("lastmodifydate",LocalDateTime.now());
boolean ok = roleService.update(updateWrapper); boolean ok = roleService.update(updateWrapper);
if (ok) { if (ok) {

13
backend/src/main/java/com/stdproject/controller/UserController.java
View File

@ -1,9 +1,7 @@
package com.stdproject.controller; package com.stdproject.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import cn.hutool.jwt.JWTUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.stdproject.config.ResponseResult; import com.stdproject.config.ResponseResult;
import com.stdproject.config.WebConfig; import com.stdproject.config.WebConfig;
@ -20,21 +18,14 @@ import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.*;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.DisabledException;
import org.springframework.security.authentication.LockedException;
import org.springframework.security.authentication.AccountExpiredException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
import java.sql.Timestamp;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -233,9 +224,11 @@ private Long jwtExpirationMs;
Map<String, Object> map = new HashMap(); Map<String, Object> map = new HashMap();
map.put("userid", userId); map.put("userid", userId);
map.put("username", loginUser.getUsername()); map.put("username", loginUser.getUsername());
map.put("nickname", loginUser.getUser().getNickname());
map.put("expire_time", expireTime); map.put("expire_time", expireTime);
String token = jwtUtils.generateToken(loginUser.getUsername(), userId); String token = jwtUtils.generateToken(loginUser.getUsername(), userId);
map.put("token", token); map.put("token", token);
map.put("permissions", loginUser.getPermissions());
//把完整的用户信息存入到HuTool缓存中，userId作为key //把完整的用户信息存入到HuTool缓存中，userId作为key
String jsonStr = JSONUtil.toJsonStr(loginUser); String jsonStr = JSONUtil.toJsonStr(loginUser);
webConfig.loginuserCache().put("login:" + userId, jsonStr); webConfig.loginuserCache().put("login:" + userId, jsonStr);

4
backend/src/main/java/com/stdproject/service/impl/MenuServiceImpl.java
View File

@ -9,7 +9,7 @@ import com.stdproject.mapper.MenuMapper;
import com.stdproject.mapper.RoleMapper; import com.stdproject.mapper.RoleMapper;
import com.stdproject.service.IMenuService; import com.stdproject.service.IMenuService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.gisbi.utils.AuthUtils; import com.stdproject.utils.AuthUtils;
import io.micrometer.common.util.StringUtils; import io.micrometer.common.util.StringUtils;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -129,7 +129,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
// 添加排序号 // 添加排序号
menu.setOrderno(orderno); menu.setOrderno(orderno);
//填写 当前用户名称 //填写 当前用户名称
menu.setLastmodifier(AuthUtils.getUser().getUserId().toString()); menu.setLastmodifier(AuthUtils.getUsername());
//填写 当前日期 //填写 当前日期
menu.setLastmodifydate(LocalDateTime.now()); menu.setLastmodifydate(LocalDateTime.now());
return this.save(menu); return this.save(menu);

4
backend/src/main/java/com/stdproject/service/impl/OrganizationServiceImpl.java
View File

@ -7,7 +7,7 @@ import com.stdproject.entity.Organization;
import com.stdproject.mapper.OrganizationMapper; import com.stdproject.mapper.OrganizationMapper;
import com.stdproject.service.IOrganizationService; import com.stdproject.service.IOrganizationService;
import com.stdproject.service.IUserService; import com.stdproject.service.IUserService;
import io.gisbi.utils.AuthUtils; import com.stdproject.utils.AuthUtils;
import io.micrometer.common.util.StringUtils; import io.micrometer.common.util.StringUtils;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -166,7 +166,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
//填写 编号 //填写 编号
organization.setOrgcode(code); organization.setOrgcode(code);
//填写 当前用户名称 //填写 当前用户名称
// organization.setLastmodifier(AuthUtils.getUser().getUserId().toString()); organization.setLastmodifier(AuthUtils.getUsername());
//填写 当前日期 //填写 当前日期
organization.setLastmodifydate(LocalDateTime.now()); organization.setLastmodifydate(LocalDateTime.now());

4
backend/src/main/java/com/stdproject/service/impl/RoleServiceImpl.java
View File

@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.stdproject.entity.Role; import com.stdproject.entity.Role;
import com.stdproject.mapper.RoleMapper; import com.stdproject.mapper.RoleMapper;
import com.stdproject.service.IRoleService; import com.stdproject.service.IRoleService;
import io.gisbi.utils.AuthUtils; import com.stdproject.utils.AuthUtils;
import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelInboundHandlerAdapter;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -77,7 +77,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
role.setIsvaild("1"); role.setIsvaild("1");
} }
//添加最近修改者 //添加最近修改者
// role.setLastmodifier(AuthUtils.getUser().getUserId().toString()); role.setLastmodifier(AuthUtils.getUsername());
//添加最近修改时间 //添加最近修改时间
role.setLastmodifydate(LocalDateTime.now()); role.setLastmodifydate(LocalDateTime.now());
return this.save(role); return this.save(role);

15
backend/src/main/java/com/stdproject/service/impl/UserServiceImpl.java
View File

@ -13,8 +13,7 @@ import com.stdproject.mapper.RoleMapper;
import com.stdproject.mapper.UserMapper; import com.stdproject.mapper.UserMapper;
import com.stdproject.service.IUserService; // 确保接口存在 import com.stdproject.service.IUserService; // 确保接口存在
import com.stdproject.utils.EncryptUtils; import com.stdproject.utils.EncryptUtils;
import io.gisbi.utils.AuthUtils; import com.stdproject.utils.AuthUtils;
import io.gisbi.utils.RsaUtils;
import io.micrometer.common.util.StringUtils; import io.micrometer.common.util.StringUtils;
import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelInboundHandlerAdapter;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@ -70,7 +69,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
//最近修改日期 //最近修改日期
user.setLastmodifydate(LocalDateTime.now()); user.setLastmodifydate(LocalDateTime.now());
//最近修改者 //最近修改者
// user.setLastmodifier(AuthUtils.getUser().getUserId().toString()); user.setLastmodifier(AuthUtils.getUsername());
//账号有效 状态 1-有效 0-停用 //账号有效 状态 1-有效 0-停用
user.setStatus(DEFAULT_IS_VALID); user.setStatus(DEFAULT_IS_VALID);
//判断注册的登录账号是否存在 //判断注册的登录账号是否存在
@ -116,7 +115,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
Map<String, String> result = new HashMap<>(); Map<String, String> result = new HashMap<>();
try { try {
// 设置最近修改人和时间 // 设置最近修改人和时间
user.setLastmodifier(AuthUtils.getUser().getUserId().toString()); user.setLastmodifier(AuthUtils.getUsername());
user.setLastmodifydate(LocalDateTime.now()); user.setLastmodifydate(LocalDateTime.now());
//修改用户信息 //修改用户信息
boolean ok = this.updateById(user); boolean ok = this.updateById(user);
@ -275,8 +274,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
String cryptPassword = PASSWORD_VALID; String cryptPassword = PASSWORD_VALID;
updateWrapper.eq("id", id).set("password", cryptPassword) updateWrapper.eq("id", id).set("password", cryptPassword)
.set("pwdresettime", LocalDateTime.now()) .set("pwdresettime", LocalDateTime.now())
.set("lastmodifydate", LocalDateTime.now()); .set("lastmodifydate", LocalDateTime.now())
// .set("lastmodifier", AuthUtils.getUser().getUserId().toString()); .set("lastmodifier", AuthUtils.getUsername());
//是否修改成功 //是否修改成功
isOk = this.update(updateWrapper); isOk = this.update(updateWrapper);
return isOk; return isOk;
@ -296,8 +295,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
//根据id修改用户状态，最近修改人，最近修改时间 //根据id修改用户状态，最近修改人，最近修改时间
updateWrapper.eq("id", id) updateWrapper.eq("id", id)
.set("status", status) .set("status", status)
.set("lastmodifydate", LocalDateTime.now()); .set("lastmodifydate", LocalDateTime.now())
// .set("lastmodifier", AuthUtils.getUser().getUserId().toString()); .set("lastmodifier", AuthUtils.getUsername());
//是否修改成功 //是否修改成功
isOk = this.update(updateWrapper); isOk = this.update(updateWrapper);
return isOk; return isOk;