From b7fd27a4a7ac72eef5fc142cae9bb63fe69ef233 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 22 七月 2024 15:34:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/ApiController.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/ApiController.java b/server/web/src/main/java/com/doumee/api/web/ApiController.java
index 969c732..2d6d5e8 100644
--- a/server/web/src/main/java/com/doumee/api/web/ApiController.java
+++ b/server/web/src/main/java/com/doumee/api/web/ApiController.java
@@ -42,7 +42,6 @@
return request;
}
-
/**
* 鑾峰彇鐢ㄦ埛ID
*
@@ -53,9 +52,9 @@
return obj != null ? (Long) obj : null;
}
protected Long getUserId() {
- if(isDebug){
- return 2L;
- }
+// if(isDebug){
+// return 2L;
+// }
Object obj = this.getRequest().getAttribute(JwtTokenUtil.UserId_Name);
return obj != null ? (Long) obj : null;
}
@@ -75,7 +74,6 @@
Member user = memberService.findById(userId);
return user;
}
-
protected Long getUserType() {
Object obj = this.getRequest().getAttribute(JwtTokenUtil.UserType);
--
Gitblit v1.9.3