From a75b18a4157ab486e0b51c438ac165ab3a08e3e0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 25 七月 2024 18:10:00 +0800
Subject: [PATCH] 代码提交
---
server/web/src/main/java/com/doumee/api/web/ApiController.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 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 64e7118..6efbc98 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
@@ -1,11 +1,15 @@
package com.doumee.api.web;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.config.Jwt.JwtTokenUtil;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Users;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.UsersService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.ptg.MemAreaPtg;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -51,33 +55,50 @@
Object obj = this.getRequest().getAttribute(JwtTokenUtil.UserId_Name);
return obj != null ? (Long) obj : null;
}
+
+ protected String getToken() {
+ Object obj = this.getRequest().getAttribute(JwtTokenUtil.HEADER_KEY);
+ return obj != null ? (String) 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;
}
protected Users getLoginUserInfo() {
- Long userId = getUserId();
- if(userId== null){
- return null;
- }
- Users user = usersService.findById(userId);
- return user;
+ Long userId = getUserId();
+ if(userId== null){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"鏈櫥褰�");
+ }
+ Object obj = this.getRequest().getAttribute(JwtTokenUtil.UserInfo);
+ String userInfo = obj != null ? (String) obj : null;
+ Users user = new Users();
+ if(StringUtils.isNotBlank(userInfo)){
+ user = JSONObject.toJavaObject(JSONObject.parseObject(userInfo),Users.class);
+ }
+ return user;
}
protected Member getLoginMemberInfo() {
Long userId = getMemberId();
if(userId== null){
return null;
}
- Member user = memberService.findById(userId);
- return user;
+ Object obj = this.getRequest().getAttribute(JwtTokenUtil.UserInfo);
+ String userInfo = obj != null ? (String) obj : null;
+ Member member = new Member();
+ if(StringUtils.isNotBlank(userInfo)){
+ member = JSONObject.toJavaObject(JSONObject.parseObject(userInfo),Member.class);
+ }
+ return member;
}
- protected Long getUserType() {
+ protected String getUserType() {
Object obj = this.getRequest().getAttribute(JwtTokenUtil.UserType);
- return obj != null ? (Long) obj : null;
+ return obj != null ? (String) obj : null;
}
}
--
Gitblit v1.9.3