From 5616a3cd8b221bcd14da8ed8cb2587aa14f9ae4d Mon Sep 17 00:00:00 2001
From: YunaiV <>
Date: Thu, 28 Feb 2019 00:11:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20admin=20=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=EF=BC=8C=E9=99=A4=E4=BA=86=E7=99=BB?=
 =?UTF-8?q?=E9=99=86=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=85=B6=E5=AE=83=E9=83=BD?=
 =?UTF-8?q?=E5=BF=85=E9=A1=BB=E7=99=BB=E9=99=86=E6=89=8D=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/sdk/interceptor/AdminSecurityInterceptor.java     | 6 ++++++
 .../iocoder/mall/admin/api/constant/AdminErrorCodeEnum.java | 1 +
 .../iocoder/common/framework/constant/SysErrorCodeEnum.java | 1 -
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java b/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java
index 18a6fefb..bfc58061 100644
--- a/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java
+++ b/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java
@@ -5,6 +5,7 @@ import cn.iocoder.common.framework.util.HttpUtil;
 import cn.iocoder.common.framework.vo.CommonResult;
 import cn.iocoder.mall.admin.api.OAuth2Service;
 import cn.iocoder.mall.admin.api.bo.OAuth2AuthenticationBO;
+import cn.iocoder.mall.admin.api.constant.AdminErrorCodeEnum;
 import cn.iocoder.mall.admin.sdk.context.AdminSecurityContext;
 import cn.iocoder.mall.admin.sdk.context.AdminSecurityContextHolder;
 import com.alibaba.dubbo.config.annotation.Reference;
@@ -38,6 +39,11 @@ public class AdminSecurityInterceptor extends HandlerInterceptorAdapter {
             // 添加到 AdminSecurityContext
             AdminSecurityContext context = new AdminSecurityContext(authentication.getAdminId(), authentication.getRoleIds());
             AdminSecurityContextHolder.setContext(context);
+        } else {
+            String url = request.getRequestURI();
+            if (!url.equals("/admin/passport/login")) { // TODO 临时写死。非登陆接口，必须已经认证身份，不允许匿名访问
+                throw new ServiceException(AdminErrorCodeEnum.OAUTH_NOT_LOGIN.getCode(), AdminErrorCodeEnum.OAUTH_NOT_LOGIN.getMessage());
+            }
         }
         // 校验是否需要已授权
         checkPermission(request, authentication);
diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/AdminErrorCodeEnum.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/AdminErrorCodeEnum.java
index 85d44564..3c17cc66 100644
--- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/AdminErrorCodeEnum.java
+++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/AdminErrorCodeEnum.java
@@ -16,6 +16,7 @@ public enum AdminErrorCodeEnum {
     OAUTH_INVALID_TOKEN_EXPIRED(1002001012, "访问令牌已过期"),
     OAUTH_INVALID_TOKEN_INVALID(1002001013, "访问令牌已失效"),
     OAUTH_INVALID_PERMISSION(1002001014, "没有该操作权限"), // TODO 芋艿，临时放在 OAUTH2 模块，理论来说，OAUTH2 只做认证，不做鉴权。
+    OAUTH_NOT_LOGIN(1002001015, "账号未登陆"),
 
     OAUTH_INVALID_TOKEN(1002001020, ""), // 预留
 
diff --git a/common/common-framework/src/main/java/cn/iocoder/common/framework/constant/SysErrorCodeEnum.java b/common/common-framework/src/main/java/cn/iocoder/common/framework/constant/SysErrorCodeEnum.java
index 8c79c157..d0ddbbed 100644
--- a/common/common-framework/src/main/java/cn/iocoder/common/framework/constant/SysErrorCodeEnum.java
+++ b/common/common-framework/src/main/java/cn/iocoder/common/framework/constant/SysErrorCodeEnum.java
@@ -9,7 +9,6 @@ public enum SysErrorCodeEnum {
 
     SYS_ERROR(2001001000, "服务端发生异常"),
     MISSING_REQUEST_PARAM_ERROR(2001001001, "参数缺失"),
-
     ;
 
     private final int code;
-- 
2.17.1