From ed100aa371474e9f24cce8e7a7fdc2c80f2d7086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 2 Apr 2024 17:41:18 +0800 Subject: [PATCH] TokenValidateFilter --- .../java/com/cool/store/config/TokenValidateFilter.java | 2 +- .../com/cool/store/controller/webb/DeskController.java | 9 ++------- .../cool/store/controller/webb/LineInfoController.java | 7 ------- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java index 9cc7d7d92..052896226 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java @@ -86,7 +86,7 @@ public class TokenValidateFilter implements Filter { String userStr = ""; LoginUserInfo currentUser = null; boolean isInWhiteList = excludePath(uri); - String accessToken = "1d1c34451b51e7180445b74c49b7ab09";//reqs.getHeader("accessToken"); + String accessToken = reqs.getHeader("accessToken"); String key = MessageFormat.format(CommonConstants.ACCESS_TOKEN_KEY, accessToken); if(StringUtils.isNotBlank(accessToken)){ userStr = redisUtilPool.getString(key); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java index 9736058fe..38124b621 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java @@ -34,7 +34,7 @@ public class DeskController { public ResponseResult> intendPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.intendPendingList(pageNumber,pageSize,"055740241221153440")); + return ResponseResult.success(deskService.intendPendingList(pageNumber,pageSize,userInfo.getUserId())); } @ApiOperation("待处理-邀约面谈") @@ -42,7 +42,7 @@ public class DeskController { public ResponseResult> interviewPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.interviewPendingList(pageNumber,pageSize,"055740241221153440")); + return ResponseResult.success(deskService.interviewPendingList(pageNumber,pageSize,userInfo.getUserId())); } @ApiOperation("待处理-一审") @@ -50,7 +50,6 @@ public class DeskController { public ResponseResult> firstInterviewPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - userInfo.setUserId("055740241221153440"); return ResponseResult.success(deskService.firstInterviewPendingList(pageNumber,pageSize,userInfo)); } @@ -59,7 +58,6 @@ public class DeskController { public ResponseResult> secondInterviewPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - userInfo.setUserId("055740241221153440"); return ResponseResult.success(deskService.secondInterviewPendingList(pageNumber,pageSize,userInfo)); } @@ -69,7 +67,6 @@ public class DeskController { public ResponseResult> payStagePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - userInfo.setUserId("055740241221153440"); return ResponseResult.success(deskService.payStagePendingList(pageNumber,pageSize,userInfo)); } @@ -78,7 +75,6 @@ public class DeskController { public ResponseResult> signingPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - userInfo.setUserId("055740241221153440"); return ResponseResult.success(deskService.signingPendingList(pageNumber,pageSize,userInfo)); } @@ -87,7 +83,6 @@ public class DeskController { public ResponseResult> storeExperiencePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - userInfo.setUserId("055740241221153440"); return ResponseResult.success(deskService.storeExperiencePendingList(pageNumber,pageSize,userInfo)); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java index bc660bf49..bd21c7ec7 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java @@ -51,7 +51,6 @@ public class LineInfoController { @PostMapping("/getMyLineList") public ResponseResult> getLineList(@RequestBody LineListRequest lineListRequest) { LoginUserInfo user = CurrentUserHolder.getUser(); - user.setUserId("055740241221153440"); return ResponseResult.success(lineService.getLineList(lineListRequest,user,Boolean.FALSE)); } @@ -59,7 +58,6 @@ public class LineInfoController { @PostMapping("/getTeamLineList") public ResponseResult> getTeamLineList(@RequestBody LineListRequest lineListRequest) { LoginUserInfo user = CurrentUserHolder.getUser(); - user.setUserId("055740241221153440"); return ResponseResult.success(lineService.getLineList(lineListRequest,user,Boolean.TRUE)); } @@ -67,7 +65,6 @@ public class LineInfoController { @PostMapping("/getPublicLineList") public ResponseResult> getTeamLineList(@RequestBody PublicLineListRequest publicLineListRequest) { LoginUserInfo user = CurrentUserHolder.getUser(); - user.setUserId("055740241221153440"); return ResponseResult.success(lineService.getPublicLineList(publicLineListRequest,user)); } @@ -75,7 +72,6 @@ public class LineInfoController { @PostMapping("/getPartnerList") public ResponseResult> getPartnerList(@RequestBody PartnerRequest partnerRequest) { LoginUserInfo user = CurrentUserHolder.getUser(); - user.setUserId("055740241221153440"); return ResponseResult.success(lineService.getPartnerList(partnerRequest,user,Boolean.FALSE)); } @@ -83,7 +79,6 @@ public class LineInfoController { @PostMapping("/getTeamPartnerList") public ResponseResult> getTeamPartnerList(@RequestBody PartnerRequest partnerRequest) { LoginUserInfo user = CurrentUserHolder.getUser(); - user.setUserId("055740241221153440"); return ResponseResult.success(lineService.getPartnerList(partnerRequest,user,Boolean.TRUE)); } @@ -97,7 +92,6 @@ public class LineInfoController { @PostMapping("/distributionInvestmentManager") public ResponseResult distributionInvestmentManager(@RequestBody ChangeInvestmentRequest changeInvestmentRequest) { LoginUserInfo user = CurrentUserHolder.getUser(); - user.setUserId("055740241221153440"); return ResponseResult.success(lineService.transferInvestmentManager(changeInvestmentRequest,user,Boolean.FALSE)); } @@ -105,7 +99,6 @@ public class LineInfoController { @PostMapping("/transferInvestmentManager") public ResponseResult transferInvestmentManager(@RequestBody ChangeInvestmentRequest changeInvestmentRequest) { LoginUserInfo user = CurrentUserHolder.getUser(); - user.setUserId("055740241221153440"); return ResponseResult.success(lineService.transferInvestmentManager(changeInvestmentRequest,user,Boolean.TRUE)); }