From 77eaae1a96b2c6a0a23bafbacf39806acd1980b6 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 29 一月 2026 09:29:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/ApiController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 c9eb82a..b6e10cb 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.doumee.config.jwt.JwtTokenUtil;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.vo.WebLoginUserVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.web.context.request.RequestContextHolder;
@@ -39,10 +40,10 @@
* 鑾峰彇鐧诲綍鐢ㄦ埛瀵硅薄淇℃伅
* @return
*/
- protected Member getMemberResponse(){
+ protected WebLoginUserVO getMemberResponse(){
Object obj = this.getRequest().getAttribute(JwtTokenUtil.MEMBER_INFO);
if(obj != null){
- return JSONObject.parseObject(obj.toString(),Member.class);
+ return JSONObject.parseObject(obj.toString(), WebLoginUserVO.class);
}
return null;
}
--
Gitblit v1.9.3