From 467fe3b3ec6aa9d449b094bdd9df4611323d88d1 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 24 四月 2026 21:43:50 +0800
Subject: [PATCH] 代码生成

---
 server/web/src/main/java/com/doumee/api/web/AccountApi.java |   39 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/server/web/src/main/java/com/doumee/api/web/AccountApi.java b/server/web/src/main/java/com/doumee/api/web/AccountApi.java
index fcaf0aa..993e5ad 100644
--- a/server/web/src/main/java/com/doumee/api/web/AccountApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/AccountApi.java
@@ -1,8 +1,11 @@
 package com.doumee.api.web;
 
 import com.doumee.config.jwt.JwtTokenUtil;
+import com.doumee.core.annotation.LoginDriverRequired;
 import com.doumee.core.annotation.LoginRequired;
+import com.doumee.core.annotation.LoginShopRequired;
 import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.constants.Constants;
 import com.doumee.core.model.ApiResponse;
 import com.doumee.dao.business.model.Member;
 import com.doumee.dao.dto.ShopLoginDTO;
@@ -68,27 +71,53 @@
         return ApiResponse.success("鎿嶄綔鎴愬姛", shopInfoService.shopPasswordLogin(dto));
     }
 
+    @LoginRequired
     @ApiOperation(value = "闂ㄥ簵闈欓粯鐧诲綍", notes = "鏍规嵁openid鑷姩鐧诲綍闂ㄥ簵锛屾湭缁戝畾鍒欒繑鍥炵┖")
     @GetMapping("/shopSilentLogin")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "寰俊openid", required = true)
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
     })
-    public ApiResponse<ShopLoginVO> shopSilentLogin(@RequestParam String openid) {
-        return ApiResponse.success("鎿嶄綔鎴愬姛", shopInfoService.shopSilentLogin(openid));
+    public ApiResponse<ShopLoginVO> shopSilentLogin() {
+        return ApiResponse.success("鎿嶄綔鎴愬姛", shopInfoService.shopSilentLogin(getMemberId()));
     }
 
     @LoginRequired
-    @ApiOperation(value = "閫�鍑虹櫥褰�", notes = "灏忕▼搴忕")
+    @ApiOperation(value = "浼氬憳閫�鍑虹櫥褰�", notes = "灏忕▼搴忕")
     @GetMapping("/logOut")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
     })
     public ApiResponse logOut() {
         String token = this.getRequest().getHeader(JwtTokenUtil.HEADER_KEY);
-        memberService.logOut(token,getMemberId());
+        memberService.logOut(token,getMemberId(), Constants.ZERO);
         return  ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 
+
+    @LoginShopRequired
+    @ApiOperation(value = "闂ㄥ簵閫�鍑虹櫥褰�", notes = "灏忕▼搴忕")
+    @GetMapping("/logOutShop")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+    })
+    public ApiResponse logOutShop() {
+        String token = this.getRequest().getHeader(JwtTokenUtil.SHOP_HEADER_KEY);
+        memberService.logOut(token,getShopId(), Constants.TWO);
+        return  ApiResponse.success("鎿嶄綔鎴愬姛");
+    }
+
+
+    @LoginDriverRequired
+    @ApiOperation(value = "鍙告満閫�鍑虹櫥褰�", notes = "灏忕▼搴忕")
+    @GetMapping("/logOutDriver")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+    })
+    public ApiResponse logOutDriver() {
+        String token = this.getRequest().getHeader(JwtTokenUtil.HEADER_KEY);
+        memberService.logOut(token,getDriverId(), Constants.ONE);
+        return  ApiResponse.success("鎿嶄綔鎴愬姛");
+    }
     @LoginRequired
     @ApiOperation(value = "鐢ㄦ埛娉ㄩ攢", notes = "灏忕▼搴忕")
     @GetMapping("/logOff")

--
Gitblit v1.9.3