update

dfs-store/src/main/java/cn/reghao/dfs/store/auth/AuthException.java → dfs-store/src/main/java/cn/reghao/dfs/store/aop/AuthException.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.auth;
+package cn.reghao.dfs.store.aop;
 
 /**
  * @author reghao

dfs-store/src/main/java/cn/reghao/dfs/store/auth/AuthUser.java → dfs-store/src/main/java/cn/reghao/dfs/store/aop/AuthUser.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.auth;
+package cn.reghao.dfs.store.aop;
 
 import java.lang.annotation.*;
 

dfs-store/src/main/java/cn/reghao/dfs/store/auth/AuthUserAspect.java → dfs-store/src/main/java/cn/reghao/dfs/store/aop/AuthUserAspect.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.auth;
+package cn.reghao.dfs.store.aop;
 
 import cn.reghao.dfs.store.util.UserContext;
 import cn.reghao.jutil.web.ServletUtil;
@@ -26,7 +26,7 @@ public class AuthUserAspect {
     private AuthService authService;
     private final String cookieKey = "USERDATA";
 
-    @Pointcut("@annotation(cn.reghao.dfs.store.auth.AuthUser)")
+    @Pointcut("@annotation(cn.reghao.dfs.store.aop.AuthUser)")
     public void loginPointCut(){
     }
 

dfs-store/src/main/java/cn/reghao/dfs/store/controller/ObjectUploadController.java

@@ -1,6 +1,6 @@
 package cn.reghao.dfs.store.controller;
 
-import cn.reghao.dfs.store.auth.AuthUser;
+import cn.reghao.dfs.store.aop.AuthUser;
 import cn.reghao.dfs.store.model.vo.ObjectProp;
 import cn.reghao.dfs.store.model.vo.ObjectResult;
 import cn.reghao.dfs.store.service.ChannelValidateService;

dfs-store/src/main/java/cn/reghao/dfs/store/exception/ControllerExceptionHandler.java

@@ -1,6 +1,6 @@
 package cn.reghao.dfs.store.exception;
 
-import cn.reghao.dfs.store.auth.AuthException;
+import cn.reghao.dfs.store.aop.AuthException;
 import cn.reghao.jutil.jdk.exception.ExceptionUtil;
 import cn.reghao.jutil.jdk.result.WebResult;
 import lombok.extern.slf4j.Slf4j;

dfs-store/src/main/java/cn/reghao/dfs/store/inerceptor/AccessLogInterceptor.java

@@ -4,9 +4,7 @@ import cn.reghao.dfs.store.db.repository.ObjectRepository;
 import cn.reghao.dfs.store.model.po.FileMeta;
 import cn.reghao.dfs.store.util.UserContext;
 import cn.reghao.oss.api.constant.ObjectACL;
-import cn.reghao.tnb.account.api.iface.UserQuery;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -26,8 +24,6 @@ import java.nio.charset.StandardCharsets;
 @Slf4j
 @Component
 public class AccessLogInterceptor implements HandlerInterceptor {
-    @DubboReference(check = false)
-    private UserQuery userQuery;
     private final ObjectRepository objectRepository;
 
     public AccessLogInterceptor(ObjectRepository objectRepository) {
@@ -48,7 +44,6 @@ public class AccessLogInterceptor implements HandlerInterceptor {
 
     private boolean checkPermission(String method, String uri,  HttpServletResponse response) {
         long userId = UserContext.getUser();
-        //UserPermission userPermission = userQuery.getUserPermission(userId);
         if (method.equals("GET") || method.equals("HEAD")) {
             String objectName = URLDecoder.decode(uri, StandardCharsets.UTF_8).replaceFirst("/", "");
             FileMeta fileMeta = objectRepository.getByObjectName(objectName);
@@ -69,7 +64,7 @@ public class AccessLogInterceptor implements HandlerInterceptor {
             } else if (acl == ObjectACL.PUBLIC.getCode()) {
                 return true;
             } else if (acl == ObjectACL.FRIEND.getCode()) {
-                return userQuery.isFriend(userId, uploadBy);
+                return false;
             }
         } else if (method.equals("PUT") || method.equals("POST")) {
             if (userId == -1) {

dfs-store/src/main/java/cn/reghao/dfs/store/service/GetObjectService.java

@@ -1,6 +1,6 @@
 package cn.reghao.dfs.store.service;
 
-import cn.reghao.dfs.store.auth.AuthUser;
+import cn.reghao.dfs.store.aop.AuthUser;
 import cn.reghao.dfs.store.config.OssProperties;
 import cn.reghao.dfs.store.db.mapper.FileMetaMapper;
 import cn.reghao.dfs.store.db.repository.ObjectRepository;
@@ -8,7 +8,6 @@ import cn.reghao.dfs.store.model.dto.ContentRange;
 import cn.reghao.dfs.store.model.po.FileMeta;
 import cn.reghao.dfs.store.util.JwtUtil;
 import cn.reghao.dfs.store.util.UserContext;
-import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.oss.api.constant.UploadChannel;
 import cn.reghao.oss.api.dto.ObjectMeta;
 import cn.reghao.jutil.web.ServletUtil;