diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java index f6b90485..298dc95c 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java @@ -199,7 +199,7 @@ public class SocketSourceResponseService { phaseSequenceParam.setMoniterIdList(monitorIdList); phaseSequenceParam.setDataType(Arrays.asList("real$VRMS", "real$IRMS")); phaseSequenceParam.setReadCount(3); - phaseSequenceParam.setIgnoreCount(4); + phaseSequenceParam.setIgnoreCount(7); socketMsg.setData(JSON.toJSONString(phaseSequenceParam)); SocketManager.sendMsg(s, JSON.toJSONString(socketMsg)); diff --git a/entrance/src/main/resources/model/PQ-COM.docx b/entrance/src/main/resources/model/PQ-COM.docx new file mode 100644 index 00000000..abd178ed Binary files /dev/null and b/entrance/src/main/resources/model/PQ-COM.docx differ diff --git a/user/src/main/java/com/njcn/gather/user/user/controller/AuthController.java b/user/src/main/java/com/njcn/gather/user/user/controller/AuthController.java index ce9447cf..4ceda525 100644 --- a/user/src/main/java/com/njcn/gather/user/user/controller/AuthController.java +++ b/user/src/main/java/com/njcn/gather/user/user/controller/AuthController.java @@ -70,7 +70,7 @@ public class AuthController extends BaseController { if (ObjectUtil.isNull(user)) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, UserValidMessage.LOGIN_FAILED); } else { - String accessToken = JwtUtil.getAccessToken(user.getId()); + String accessToken = JwtUtil.getAccessToken(user.getId(),user.getLoginName()); String refreshToken = JwtUtil.getRefreshToken(accessToken); Token token = new Token(); token.setAccessToken(accessToken); @@ -117,7 +117,7 @@ public class AuthController extends BaseController { Map map = JwtUtil.parseToken(accessToken); String userId = (String) map.get(SecurityConstants.USER_ID); SysUser user = sysUserService.getById(userId); - String accessTokenNew = JwtUtil.getAccessToken(userId); + String accessTokenNew = JwtUtil.getAccessToken(userId,user.getLoginName()); request.setAttribute(SecurityConstants.AUTHENTICATE_USERNAME, user.getLoginName()); // String refreshTokenNew = JwtUtil.getRefreshToken(accessTokenNew);