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

Merge branch 'qr_branch'

Browse Source 
# Conflicts:
#	detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java
#	user/src/main/java/com/njcn/gather/user/user/controller/AuthController.java
This commit is contained in:
caozehui
2025-09-03 14:27:11 +08:00
parent 8963b20dd3 4ecec5e6ef
commit a7f3925a2f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
entrance/src/main/resources/model/PQ-COM.docx Normal file
View File

Binary file not shown.

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

@@ -70,7 +70,7 @@ public class AuthController extends BaseController {
if (ObjectUtil.isNull(user)) { if (ObjectUtil.isNull(user)) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, UserValidMessage.LOGIN_FAILED); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, UserValidMessage.LOGIN_FAILED);
} else { } else {
String accessToken = JwtUtil.getAccessToken(user.getId(),username); String accessToken = JwtUtil.getAccessToken(user.getId());
String refreshToken = JwtUtil.getRefreshToken(accessToken); String refreshToken = JwtUtil.getRefreshToken(accessToken);
Token token = new Token(); Token token = new Token();
token.setAccessToken(accessToken); token.setAccessToken(accessToken);
@@ -117,7 +117,7 @@ public class AuthController extends BaseController {
Map<String, Object> map = JwtUtil.parseToken(accessToken); Map<String, Object> map = JwtUtil.parseToken(accessToken);
String userId = (String) map.get(SecurityConstants.USER_ID); String userId = (String) map.get(SecurityConstants.USER_ID);
SysUser user = sysUserService.getById(userId); SysUser user = sysUserService.getById(userId);
String accessTokenNew = JwtUtil.getAccessToken(userId, user.getLoginName()); String accessTokenNew = JwtUtil.getAccessToken(userId);
request.setAttribute(SecurityConstants.AUTHENTICATE_USERNAME, user.getLoginName()); request.setAttribute(SecurityConstants.AUTHENTICATE_USERNAME, user.getLoginName());
// String refreshTokenNew = JwtUtil.getRefreshToken(accessTokenNew); // String refreshTokenNew = JwtUtil.getRefreshToken(accessTokenNew);