From a3349dd59c061a3e28bcf09051bc1853d840731c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 15:41:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 16 +++++++++++++---
server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java | 21 ++++++++++++++++-----
2 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
index 26224a8..045f486 100644
--- a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
+++ b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
@@ -154,13 +154,10 @@
*/
@PostMapping("/logout")
@ApiOperation("閫�鍑虹櫥闄�")
- public ApiResponse<String> logout(@RequestHeader(Constants.HEADER_USER_TOKEN) String oldToken,Integer isH5){
+ public ApiResponse<String> logout(@RequestHeader(Constants.HEADER_USER_TOKEN) String oldToken){
try {
- if(Objects.nonNull(isH5)){
- jwtTokenUtil.logoutForH5(oldToken);
- }else{
+
jwtTokenUtil.logout(oldToken);
- }
}catch (BusinessException e){
return ApiResponse.failed(e.getCode(),e.getMessage());
}catch (Exception e){
@@ -171,6 +168,20 @@
}
+ @PostMapping("/logoutForH5")
+ @ApiOperation("閫�鍑虹櫥闄�")
+ public ApiResponse<String> logoutForH5(@RequestHeader(Constants.HEADER_USER_TOKEN) String oldToken){
+ try {
+ jwtTokenUtil.logoutForH5(oldToken);
+ }catch (BusinessException e){
+ return ApiResponse.failed(e.getCode(),e.getMessage());
+ }catch (Exception e){
+ return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+ }
+ return ApiResponse.success(null);
+
+ }
+
/**
* 鍒锋柊JWT浠ょ墝,鐢ㄦ棫鐨勪护鐗屾崲鏂扮殑浠ょ墝
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 8024f3c..4f7ca02 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -1162,12 +1162,22 @@
}
public enum WxUrlParams {
- BISCREEN_CODE(0,0, "0", "闂ㄥ彛澶у睆浜岀淮鐮�"),
- MEETING_CODE(1,1, "1","浼氳瀹ゅぇ灞�")
+ BISCREEN_CODE(0,2, "0", "闂ㄥ彛澶у睆浜岀淮鐮�"),
+ MEETING_CODE(1,0, "1","浼氳瀹ゅぇ灞�"),
+ VISIT_RECORD_VISIT(2,1, "2","璁垮璁板綍-璁垮"),
+ VISIT_RECORD_USER(3,2, "2","璁垮璁板綍-鍛樺伐"),
+ VISIT_REPORT_RECORD_USER(5,2, "3","璁垮鎶ュ璁板綍-鍛樺伐"),
+ HIDDEN_DANGER(6,2, "4","闅愭偅闅忔墜鎷�"),
+ CAR_USE(7,2, "5","鐢ㄨ溅鐢宠"),
+ MEETING(8,2, "6","浼氳璇︽儏"),
+ PLATFORM_BOOK_DRIVER(9,0, "7","鐗╂祦杞﹂绾�-鍙告満"),
+ PLATFORM_BOOK(10,2, "7","鐗╂祦杞﹂绾�-鍛樺伐"),
+ PLATFORM_JOB_DRIVER(11,0, "8","鏈堝彴浣滀笟-鍙告満"),
+ PLATFORM_JOB_BOOK(12,2, "8","鏈堝彴浣滀笟-鍛樺伐"),
;
// 鎴愬憳鍙橀噺
private int key;
- private int type;//鐢ㄦ埛绫诲瀷 0鍛樺伐 1鍙告満 2璁垮
+ private int type;//鐢ㄦ埛绫诲瀷 0鍛樺伐 1鍙告満
private String yw;//涓氬姟绫诲瀷
private String info;//璇存槑
--
Gitblit v1.9.3