From fd2d0724a7dd9f9923e883fd93075109891bf2c9 Mon Sep 17 00:00:00 2001
From: Chopper711 <liushuai711@gmail.com>
Date: Thu, 1 Feb 2024 15:37:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20token=20=E8=BF=87=E6=9C=9F=E5=90=8E?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=AE=BF=E9=97=AE=E6=8A=9B=E5=87=BA=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=9C=AA=E8=A2=AB=E6=8D=95=E8=8E=B7=E7=9A=84=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=B8=80=E4=B8=AA=E5=BA=97=E9=93=BA=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lili/controller/common/FileController.java     | 7 +++++++
 .../src/main/java/cn/lili/common/enums/ResultCode.java     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/common-api/src/main/java/cn/lili/controller/common/FileController.java b/common-api/src/main/java/cn/lili/controller/common/FileController.java
index 370ffe4a..b1409544 100644
--- a/common-api/src/main/java/cn/lili/controller/common/FileController.java
+++ b/common-api/src/main/java/cn/lili/controller/common/FileController.java
@@ -1,12 +1,14 @@
 package cn.lili.controller.common;
 
 import cn.lili.cache.Cache;
+import cn.lili.common.context.ThreadContextHolder;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
+import cn.lili.common.utils.ResponseUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.file.entity.File;
 import cn.lili.modules.file.entity.dto.FileOwnerDTO;
@@ -44,6 +46,11 @@ public class FileController {
     public ResultMessage<IPage<File>> getFileList(@RequestHeader String accessToken, FileOwnerDTO fileOwnerDTO) {
 
         AuthUser authUser = UserContext.getAuthUser(cache, accessToken);
+        if (authUser == null) {
+            ResponseUtil.output(ThreadContextHolder.getHttpResponse(), 403, ResponseUtil.resultMap(false,
+                    403, "登录已失效，请重新登录"));
+            return null;
+        }
         //只有买家才写入自己id
         if (authUser.getRole().equals(UserEnums.MEMBER)) {
             fileOwnerDTO.setOwnerId(authUser.getId());
diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
index e7f76805..a648110c 100644
--- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java
+++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
@@ -419,7 +419,7 @@ public enum ResultCode {
     STORE_CLOSE_ERROR(50006, "店铺关闭，请联系管理员"),
     STORE_DELIVER_GOODS_ADDRESS(50007,"请填写商家发货地址"),
     FREIGHT_TEMPLATE_NOT_EXIST(50010, "当前模版不存在"),
-    STORE_STATUS_ERROR(50011, "店铺状态异常，无法申请"),
+    STORE_STATUS_ERROR(50011, "店铺在申请中或审核中，请勿重复操作"),
     STORE_DELIVER_ADDRESS_EXIST(50012,"请填写发货地址"),
 
     /**