ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

浙江报告与日志功能

Browse Source
This commit is contained in:
hongawen
2025-04-11 11:03:16 +08:00
parent 6727dee61e
commit 6f890daad6
50 changed files with 2703 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
user/src/main/java/com/njcn/gather/user/user/controller/AuthController.java
View File

@@ -30,6 +30,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.security.KeyPair;
import java.util.Base64;
import java.util.HashMap;
@@ -53,7 +54,7 @@ public class AuthController extends BaseController {
@OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.AUTHENTICATE)
@PostMapping("/login")
@ApiOperation("登录")
public HttpResult<Object> login(@RequestBody SysUserParam.LoginParam param) {
public HttpResult<Object> login(@RequestBody SysUserParam.LoginParam param, HttpServletRequest request) {
String methodDescribe = getMethodDescribe("login");
LogUtil.njcnDebug(log, "{}，登录参数为：{}", methodDescribe, param);
byte[] decode = Base64.getDecoder().decode(param.getUsername());
@@ -73,7 +74,8 @@ public class AuthController extends BaseController {
} catch (Exception e) {
throw new BusinessException(UserResponseEnum.RSA_DECRYT_ERROR);
}
// 因不确定是否能登陆成功先将登陆名保存到request，一遍记录谁执行了登录操作
request.setAttribute(SecurityConstants.AUTHENTICATE_USERNAME, username);
SysUser user = sysUserService.getUserByLoginNameAndPassword(username, password);
if (ObjectUtil.isNull(user)) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, UserValidMessage.LOGIN_FAILED);
@@ -112,9 +114,9 @@ public class AuthController extends BaseController {
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@ApiOperation("刷新token")
@ApiOperation("刷新accessToken")
@GetMapping("/refreshToken")
public HttpResult<Object> refreshToken() {
public HttpResult<Object> refreshToken(HttpServletRequest request) {
String methodDescribe = getMethodDescribe("refreshToken");
LogUtil.njcnDebug(log, "{}，刷新token", methodDescribe);
String accessToken = RequestUtil.getAccessToken();
@@ -125,7 +127,7 @@ public class AuthController extends BaseController {
String userId = (String) map.get(SecurityConstants.USER_ID);
SysUser user = sysUserService.getById(userId);
String accessTokenNew = JwtUtil.getAccessToken(userId);
request.setAttribute(SecurityConstants.AUTHENTICATE_USERNAME, user.getLoginName());
//String refreshTokenNew = JwtUtil.getRefreshToken(accessTokenNew);
token.setAccessToken(accessTokenNew);
@@ -141,9 +143,11 @@ public class AuthController extends BaseController {
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@ApiOperation("获取RSA公钥")
@GetMapping("/getPublicKey")
public HttpResult<String> publicKey(@RequestParam("username") String username, @RequestParam("checked") Boolean checked) throws Exception {
public HttpResult<String> publicKey(@RequestParam("username") String username, @RequestParam("checked") Boolean checked, HttpServletRequest request) throws Exception {
String methodDescribe = getMethodDescribe("publicKey");
LogUtil.njcnDebug(log, "{}，获取RSA公钥", methodDescribe);
// 因不确定是否能登陆成功先将登陆名保存到request，一遍记录谁执行了登录操作
request.setAttribute(SecurityConstants.AUTHENTICATE_USERNAME, username);
keyPair = RSAUtil.generateKeyPair();
if (checked) {
Map map = new HashMap();