From a76e2318dd2731ff713df6e262396a9175d029f7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 13 二月 2026 09:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java |   59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java
index 1dfca5d..4e8554f 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java
@@ -1,6 +1,8 @@
 package com.doumee.api.web;
 
+import com.doumee.config.Jwt.JwtTokenUtil;
 import com.doumee.config.annotation.LoginRequired;
+import com.doumee.config.annotation.LoginShopRequired;
 import com.doumee.core.annotation.trace.Trace;
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.utils.Constants;
@@ -15,9 +17,12 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.java.Log;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.Map;
@@ -53,14 +58,14 @@
         return  ApiResponse.success(memberService.wxPhone(wxPhoneRequest));
     }
 
-    @ApiOperation(value = "娴嬭瘯鐧婚檰鎺ュ彛", notes = "灏忕▼搴忕")
-    @GetMapping("/testLogin")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "memberId", value = "鐢ㄦ埛缂栫爜", required = false)
-    })
-    public ApiResponse testLogin(@RequestParam   Integer memberId) {
-        return  ApiResponse.success(memberService.wxLoginTest(memberId));
-    }
+//    @ApiOperation(value = "娴嬭瘯鐧婚檰鎺ュ彛", notes = "灏忕▼搴忕")
+//    @GetMapping("/testLogin")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "memberId", value = "鐢ㄦ埛缂栫爜", required = false)
+//    })
+//    public ApiResponse testLogin(@RequestParam   Integer memberId) {
+//        return  ApiResponse.success(memberService.wxLoginTest(memberId));
+//    }
 
     @ApiOperation(value = "鑾峰彇绯荤粺閰嶇疆", notes = "灏忕▼搴忕")
     @GetMapping("/getPlatformAboutUs")
@@ -74,10 +79,12 @@
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
     })
-    public ApiResponse<Member> updateMember(@RequestBody UpdateMemberRequest UpdateMemberRequest) {
+    public ApiResponse updateMember(@RequestBody UpdateMemberRequest UpdateMemberRequest) {
         UpdateMemberRequest.setMemberId(getMemberId());
-        return  ApiResponse.success("鎿嶄綔鎴愬姛",memberService.updateMember(UpdateMemberRequest));
+        memberService.updateMember(UpdateMemberRequest);
+        return  ApiResponse.success("鎿嶄綔鎴愬姛");
     }
+
 
     @LoginRequired
     @ApiOperation(value = "鑾峰彇鐢ㄦ埛淇℃伅", notes = "灏忕▼搴忕")
@@ -87,9 +94,11 @@
     })
     public ApiResponse<Member> getUserInfo() {
         Member member = memberService.findById(getMemberId());
-        member.setImgFullUrl(systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
-                systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()
-                +member.getImgurl());
+        if(StringUtils.isNotBlank(member.getImgurl())){
+            member.setImgFullUrl(systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
+                    systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()
+                    +member.getImgurl());
+        }
         Areas areas = areasService.findById(member.getCityId(), Constants.ONE);
         member.setCityName(Optional.ofNullable(areas).map(s->s.getName()).orElse(""));
         return  ApiResponse.success("鑾峰彇鎴愬姛",member);
@@ -120,4 +129,28 @@
         return  ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 
+
+    @LoginRequired
+    @ApiOperation("娑堣垂鑰� - 閫�鍑虹櫥褰�")
+    @GetMapping("/logOut")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+    })
+    public ApiResponse logOut(HttpServletRequest request) {
+        memberService.logOut(request.getHeader(JwtTokenUtil.HEADER_KEY),getMemberId());
+        return ApiResponse.success("鎿嶄綔鎴愬姛");
+    }
+
+
+    @LoginRequired
+    @ApiOperation("鐢ㄦ埛娉ㄩ攢")
+    @GetMapping("/logOff")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+    })
+    public ApiResponse logOff(HttpServletRequest request) {
+        memberService.logOff(request.getHeader(JwtTokenUtil.HEADER_KEY),getMemberId());
+        return ApiResponse.success("鎿嶄綔鎴愬姛");
+    }
+
 }

--
Gitblit v1.9.3