update oss

oss-api/pom.xml

@@ -34,6 +34,12 @@
             <artifactId>validation-api</artifactId>
             <version>2.0.1.Final</version>
         </dependency>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
+        </dependency>
     </dependencies>
 
     <distributionManagement>

oss-console/src/main/java/cn/reghao/oss/console/util/AuthKeyContext.java → oss-api/src/main/java/cn/reghao/oss/api/util/AuthContext.java

@@ -1,13 +1,13 @@
-package cn.reghao.oss.console.util;
+package cn.reghao.oss.api.util;
 
 /**
  * @author reghao
  * @date 2023-06-02 10:48:59
  */
-public class AuthKeyContext implements AutoCloseable {
+public class AuthContext implements AutoCloseable {
     static final ThreadLocal<Integer> CURRENT = new ThreadLocal<>();
 
-    public AuthKeyContext(int user) {
+    public AuthContext(int user) {
         CURRENT.set(user);
     }
 

oss-store/src/main/java/cn/reghao/oss/store/util/JwtUtil.java → oss-api/src/main/java/cn/reghao/oss/api/util/JwtUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.store.util;
+package cn.reghao.oss.api.util;
 
 import cn.reghao.oss.api.dto.OssPayload;
 import io.jsonwebtoken.Claims;

oss-console/src/main/java/cn/reghao/oss/console/app/controller/OssServerController.java

@@ -1,7 +1,7 @@
 package cn.reghao.oss.console.app.controller;
 
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.oss.console.util.AuthKeyContext;
+import cn.reghao.oss.api.util.AuthContext;
 import cn.reghao.oss.api.dto.ServerInfo;
 import cn.reghao.oss.console.app.service.OssService;
 import io.swagger.annotations.Api;
@@ -29,7 +29,7 @@ public class OssServerController {
     @ApiOperation(value = "获取 oss-store 节点")
     @GetMapping(value = "/info", produces = MediaType.APPLICATION_JSON_VALUE)
     public String getServerInfo(@RequestParam("channelId") int channelId) throws Exception {
-        int loginUser = AuthKeyContext.getUser();
+        int loginUser = AuthContext.getUser();
         ServerInfo serverInfo = ossService.getServerInfo(channelId, loginUser);
         return WebResult.success(serverInfo);
     }

oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/StoreNodePageController.java

@@ -3,7 +3,6 @@ package cn.reghao.oss.console.app.controller.page;
 import cn.reghao.oss.console.app.model.po.StoreNode;
 import cn.reghao.oss.console.app.model.vo.StoreNodeVO;
 import cn.reghao.oss.console.app.service.StoreNodeService;
-import cn.reghao.oss.console.util.DefaultSetting;
 import cn.reghao.oss.console.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,11 +36,11 @@ public class StoreNodePageController {
                                 @RequestParam(value = "appName", required = false) String appName,
                                 Model model) {
         if (env == null) {
-            env = DefaultSetting.getDefaultAppEnv();
+            env = "test";
         }
 
         if (type == null) {
-            type = DefaultSetting.getDefaultAppType();
+            type = "test";
         }
 
         if (appName != null) {

oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/StoreObjectPageController.java

@@ -4,7 +4,6 @@ import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.oss.console.account.model.po.DiskFile;
 import cn.reghao.oss.console.account.service.UserContext;
 import cn.reghao.oss.console.app.service.OssService;
-import cn.reghao.oss.console.util.DefaultSetting;
 import cn.reghao.oss.console.util.db.PageSort;
 import cn.reghao.oss.api.dto.ServerInfo;
 import io.swagger.annotations.Api;
@@ -36,11 +35,11 @@ public class StoreObjectPageController {
                         @RequestParam(value = "type", required = false) String type,
                         @RequestParam(value = "appName", required = false) String appName, Model model) throws Exception {
         if (env == null) {
-            env = DefaultSetting.getDefaultAppEnv();
+            env = "test";
         }
 
         if (type == null) {
-            type = DefaultSetting.getDefaultAppType();
+            type = "test";
         }
 
         PageRequest pageRequest = PageSort.pageRequest();

oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/UploadChannelPageController.java

@@ -8,7 +8,6 @@ import cn.reghao.oss.console.app.model.vo.KeyValue;
 import cn.reghao.oss.console.app.model.vo.UploadChannelVo;
 import cn.reghao.oss.console.app.service.UploadChannelService;
 import cn.reghao.oss.console.app.service.UserNodeService;
-import cn.reghao.oss.console.util.DefaultSetting;
 import cn.reghao.oss.console.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,11 +43,11 @@ public class UploadChannelPageController {
                         @RequestParam(value = "type", required = false) String type,
                         @RequestParam(value = "appName", required = false) String appName, Model model) throws Exception {
         if (env == null) {
-            env = DefaultSetting.getDefaultAppEnv();
+            env = "test";
         }
 
         if (type == null) {
-            type = DefaultSetting.getDefaultAppType();
+            type = "test";
         }
 
         PageRequest pageRequest = PageSort.pageRequest();

oss-console/src/main/java/cn/reghao/oss/console/app/rpc/NodeServiceImpl.java

@@ -1,7 +1,5 @@
 package cn.reghao.oss.console.app.rpc;
 
-import cn.reghao.oss.console.app.db.repository.StoreNodeRepository;
-import cn.reghao.oss.console.app.db.repository.UserNodeRepository;
 import cn.reghao.oss.console.app.model.po.StoreNode;
 import cn.reghao.oss.console.app.model.po.UploadChannel;
 import cn.reghao.oss.console.app.model.po.UserNode;
@@ -11,8 +9,8 @@ import cn.reghao.oss.api.dto.NodeProperties;
 import cn.reghao.oss.api.iface.NodeService;
 import cn.reghao.oss.api.dto.StoreNodeDto;
 import cn.reghao.oss.api.dto.ObjectChannel;
+import cn.reghao.oss.console.app.service.UserNodeService;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -25,17 +23,15 @@ import java.util.List;
 @DubboService
 @Service
 public class NodeServiceImpl implements NodeService {
-    private final StoreNodeRepository storeNodeRepository;
-    private final UserNodeRepository userNodeRepository;
     private final UploadChannelService uploadChannelService;
     private final StoreNodeService storeNodeService;
+    private final UserNodeService userNodeService;
 
-    public NodeServiceImpl(StoreNodeRepository storeNodeRepository, UserNodeRepository userNodeRepository,
-                           UploadChannelService uploadChannelService, StoreNodeService storeNodeService) {
-        this.storeNodeRepository = storeNodeRepository;
-        this.userNodeRepository = userNodeRepository;
+    public NodeServiceImpl(UploadChannelService uploadChannelService, StoreNodeService storeNodeService,
+                           UserNodeService userNodeService) {
         this.uploadChannelService = uploadChannelService;
         this.storeNodeService = storeNodeService;
+        this.userNodeService = userNodeService;
     }
 
     public void registerNode(StoreNodeDto storeNodeDto) {
@@ -44,10 +40,10 @@ public class NodeServiceImpl implements NodeService {
 
     @Override
     public NodeProperties getNodeProperties(int owner, String nodeAddress) {
-        StoreNode storeNode = storeNodeRepository.findByNodeAddr(nodeAddress);
+        StoreNode storeNode = storeNodeService.getByNodeAddr(nodeAddress);
         if (storeNode != null) {
             int nodeId = storeNode.getId();
-            UserNode userNode = userNodeRepository.findByNodeIdAndUserId(nodeId, owner);
+            UserNode userNode = userNodeService.getUserNode(nodeId, owner);
             if (userNode != null) {
                 return new NodeProperties(userNode.getDomain(), userNode.getSecretKey(), userNode.getReferer());
             }
@@ -63,8 +59,7 @@ public class NodeServiceImpl implements NodeService {
 
     @Override
     public int getChannelIdByUrl(int loginUser, String url) {
-        PageRequest pageRequest = PageRequest.of(0, 100);
-        List<UserNode> list = userNodeRepository.findByUserId(loginUser, pageRequest).getContent();
+        List<UserNode> list = userNodeService.getByUserId(loginUser);
         List<UploadChannel> uploadChannels = new ArrayList<>();
         for (UserNode userNode : list) {
             int nodeId = userNode.getNodeId();

oss-console/src/main/java/cn/reghao/oss/console/app/service/OssService.java

@@ -1,7 +1,7 @@
 package cn.reghao.oss.console.app.service;
 
 import cn.reghao.oss.console.app.model.po.UserNode;
-import cn.reghao.oss.console.util.JwtUtil;
+import cn.reghao.oss.api.util.JwtUtil;
 import cn.reghao.oss.api.dto.OssPayload;
 import cn.reghao.oss.api.dto.ServerInfo;
 import cn.reghao.oss.console.app.model.po.UploadChannel;

oss-console/src/main/java/cn/reghao/oss/console/app/service/StoreNodeService.java

@@ -146,4 +146,8 @@ public class StoreNodeService {
 
         return new StoreNodeVO(storeNode, storeDisks, storeInfo);
     }
+
+    public StoreNode getByNodeAddr(String nodeAddress) {
+        return storeNodeRepository.findByNodeAddr(nodeAddress);
+    }
 }

oss-console/src/main/java/cn/reghao/oss/console/app/service/UserKeyService.java

@@ -9,7 +9,7 @@ import cn.reghao.oss.console.account.service.UserContext;
 import cn.reghao.oss.console.app.db.repository.UserKeyRepository;
 import cn.reghao.oss.console.app.model.dto.KeyAuthDto;
 import cn.reghao.oss.console.app.model.po.UserKey;
-import cn.reghao.oss.console.util.JwtUtil;
+import cn.reghao.oss.api.util.JwtUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;

oss-console/src/main/java/cn/reghao/oss/console/app/service/UserNodeService.java

@@ -69,6 +69,11 @@ public class UserNodeService {
         return Result.fail("UserNode not exists");
     }
 
+    public List<UserNode> getByUserId(int userId) {
+        PageRequest pageRequest = PageRequest.of(0, 100);
+        return userNodeRepository.findByUserId(userId, pageRequest).getContent();
+    }
+
     public List<StoreNode> getUserStoreNodes() {
         int loginUser = UserContext.getUser().getId();
         PageRequest pageRequest = PageRequest.of(0, 100);

oss-console/src/main/java/cn/reghao/oss/console/config/web/ConsoleAuthInterceptor.java

@@ -2,7 +2,7 @@ package cn.reghao.oss.console.config.web;
 
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.oss.console.app.service.UserKeyService;
-import cn.reghao.oss.console.util.AuthKeyContext;
+import cn.reghao.oss.api.util.AuthContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
@@ -44,7 +44,7 @@ public class ConsoleAuthInterceptor implements HandlerInterceptor {
             } else {
                 int userId = userKeyService.getUserIdFromToken(token);
                 log.info("{} access {}", userId, uri);
-                AuthKeyContext authKeyContext = new AuthKeyContext(userId);
+                AuthContext authContext = new AuthContext(userId);
             }
         }
 

oss-console/src/main/java/cn/reghao/oss/console/store/rpc/MediaRpcService.java

@@ -2,7 +2,7 @@ package cn.reghao.oss.console.store.rpc;
 
 import cn.reghao.oss.console.app.model.po.StoreNode;
 import cn.reghao.oss.console.app.service.UploadChannelService;
-import cn.reghao.oss.console.util.AuthKeyContext;
+import cn.reghao.oss.api.util.AuthContext;
 import cn.reghao.oss.api.dto.media.*;
 import cn.reghao.oss.api.iface.MediaService;
 import org.springframework.stereotype.Service;
@@ -34,7 +34,7 @@ public class MediaRpcService {
     }
 
     public List<ConvertedImageInfo> getWebpInfo(int channelId, List<String> imageFileIds) throws Exception {
-        int loginUser = AuthKeyContext.getUser();
+        int loginUser = AuthContext.getUser();
         MediaService mediaService = getMediaService(channelId);
         return mediaService.getWebpInfo(channelId, imageFileIds);
     }

oss-console/src/main/java/cn/reghao/oss/console/store/rpc/ObjectRpcService.java

@@ -4,7 +4,7 @@ import cn.reghao.oss.console.app.model.dto.ObjectsScopeDto;
 import cn.reghao.oss.console.app.model.po.StoreNode;
 import cn.reghao.oss.console.app.model.po.UploadChannel;
 import cn.reghao.oss.console.app.service.UploadChannelService;
-import cn.reghao.oss.console.util.AuthKeyContext;
+import cn.reghao.oss.api.util.AuthContext;
 import cn.reghao.oss.api.dto.ObjectInfo;
 import cn.reghao.oss.api.iface.ObjectService;
 import org.springframework.stereotype.Service;
@@ -37,7 +37,7 @@ public class ObjectRpcService {
     }
 
     public void deleteByObjectUrl(String objectUrl) throws Exception {
-        int loginUser = AuthKeyContext.getUser();
+        int loginUser = AuthContext.getUser();
         String domain = objectUrl.replace("//", "").split("/")[0];
         String objectName = objectUrl.replace("//" + domain + "/", "");
         List<UploadChannel> uploadChannels = uploadChannelService.getByDomainAndCreateBy(domain, loginUser);
@@ -58,7 +58,7 @@ public class ObjectRpcService {
 
     public ObjectInfo getObjectInfo(int channelId, String objectId) throws Exception {
         ObjectService objectService = getObjectService(channelId);
-        int loginUser = AuthKeyContext.getUser();
+        int loginUser = AuthContext.getUser();
         int expireSecond = 3600;
         return objectService.getObjectInfo(channelId, objectId);
     }

oss-console/src/main/java/cn/reghao/oss/console/util/DefaultSetting.java

@@ -1,38 +0,0 @@
-package cn.reghao.oss.console.util;
-
-import cn.reghao.oss.console.account.service.UserContext;
-import cn.reghao.oss.console.app.model.constant.AppType;
-import cn.reghao.oss.console.account.model.constant.RoleType;
-
-import java.util.Set;
-
-/**
- * @author reghao
- * @date 2023-12-01 11:29:21
- */
-public class DefaultSetting {
-    public static String getDefaultAppEnv() {
-        Set<String> roles = UserContext.getUserRoles();
-        if (roles.contains(RoleType.ROLE_ADMIN.name())) {
-            return EnvType.test.name();
-        } else if (roles.contains(RoleType.ROLE_BACKEND.name()) || roles.contains(RoleType.ROLE_FRONTEND.name())) {
-            return EnvType.test.name();
-        }
-
-        return EnvType.test.name();
-    }
-
-    public static String getDefaultAppType() {
-        String defaultAppType = AppType.maven.getName();
-        Set<String> roles = UserContext.getUserRoles();
-        if (roles.contains(RoleType.ROLE_ADMIN.name())) {
-            defaultAppType = AppType.dotnetCore.getName();
-        } else if (roles.contains(RoleType.ROLE_BACKEND.name())) {
-            defaultAppType = AppType.dotnetCore.getName();
-        } else if (roles.contains(RoleType.ROLE_FRONTEND.name())) {
-            defaultAppType = AppType.npm.getName();
-        }
-
-        return defaultAppType;
-    }
-}

oss-console/src/main/java/cn/reghao/oss/console/util/JwtUtil.java

@@ -1,34 +0,0 @@
-package cn.reghao.oss.console.util;
-
-import cn.reghao.oss.api.dto.OssPayload;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-
-import java.util.Date;
-
-/**
- * JWT 令牌
- *
- * @author reghao
- * @date 2023-08-23 09:10:58
- */
-public class JwtUtil {
-    public static String createToken(OssPayload ossPayload, long expireAt, String signKey) {
-        return Jwts.builder()
-                .claim("action", ossPayload.getAction())
-                .claim("channelId", ossPayload.getChannelId())
-                .setSubject(String.valueOf(ossPayload.getUserId()))
-                .setExpiration(new Date(expireAt))
-                .signWith(SignatureAlgorithm.HS256, signKey)
-                .compact();
-    }
-
-    public static OssPayload getOssPayload(String token, String signKey) {
-        Claims claims = Jwts.parser().setSigningKey(signKey).parseClaimsJws(token).getBody();
-        String action = (String) claims.get("action");
-        int channelId = (Integer) claims.get("channelId");
-        String userIdStr = claims.getSubject();
-        return new OssPayload(action, channelId, Integer.parseInt(userIdStr));
-    }
-}

oss-store/src/main/java/cn/reghao/oss/store/controller/ObjectGetController.java

@@ -7,7 +7,7 @@ import cn.reghao.oss.api.dto.ObjectMeta;
 import cn.reghao.oss.store.db.repository.ObjectRepository;
 import cn.reghao.oss.store.service.GetObjectService;
 import cn.reghao.oss.store.service.StoreLocalService;
-import cn.reghao.oss.store.util.JwtUtil;
+import cn.reghao.oss.api.util.JwtUtil;
 import cn.reghao.oss.store.util.ObjectUtil;
 import cn.reghao.oss.store.util.SignatureUtil;
 import cn.reghao.oss.api.dto.OssPayload;

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

@@ -1,17 +1,17 @@
 package cn.reghao.oss.store.controller;
 
 import cn.reghao.oss.api.dto.ObjectChannel;
+import cn.reghao.oss.api.util.AuthContext;
 import cn.reghao.oss.store.model.vo.ObjectProp;
 import cn.reghao.oss.store.model.vo.ObjectResult;
 import cn.reghao.oss.store.service.*;
-import cn.reghao.oss.store.util.JwtUtil;
+import cn.reghao.oss.api.util.JwtUtil;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.jutil.jdk.security.DigestUtil;
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.oss.api.dto.OssPayload;
 import cn.reghao.oss.api.rest.UploadFileRet;
-import cn.reghao.oss.store.util.UserContext;
 import org.apache.commons.io.FileUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -82,7 +82,7 @@ public class ObjectUploadController {
         }
 
         int userId1 = ossPayload.getUserId();
-        UserContext context = new UserContext(userId1);
+        AuthContext context = new AuthContext(userId1);
 
         /* channel validate */
         String contentId = UUID.randomUUID().toString().replace("-", "");

oss-store/src/main/java/cn/reghao/oss/store/inerceptor/TokenFilter.java

@@ -1,8 +1,8 @@
 package cn.reghao.oss.store.inerceptor;
 
+import cn.reghao.oss.api.util.AuthContext;
 import cn.reghao.oss.store.service.StoreLocalService;
-import cn.reghao.oss.store.util.JwtUtil;
-import cn.reghao.oss.store.util.UserContext;
+import cn.reghao.oss.api.util.JwtUtil;
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.oss.api.dto.OssPayload;
 import org.springframework.stereotype.Component;
@@ -36,7 +36,7 @@ public class TokenFilter implements Filter {
             userId = ossPayload.getUserId();
         }
 
-        try (UserContext context = new UserContext(userId)) {
+        try (AuthContext context = new AuthContext(userId)) {
             chain.doFilter(request, response);
         }
     }

oss-store/src/main/java/cn/reghao/oss/store/model/po/FileMeta.java

@@ -1,6 +1,6 @@
 package cn.reghao.oss.store.model.po;
 
-import cn.reghao.oss.store.util.UserContext;
+import cn.reghao.oss.api.util.AuthContext;
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -39,7 +39,7 @@ public class FileMeta extends BaseObject<Integer> {
         this.contentType = "0";
         this.sha256sum = "0";
         this.pid = pid;
-        this.uploadBy = UserContext.getUser();
+        this.uploadBy = AuthContext.getUser();
         this.scope = scope;
     }
 
@@ -54,7 +54,7 @@ public class FileMeta extends BaseObject<Integer> {
         this.contentType = contentType;
         this.sha256sum = sha256sum;
         this.pid = pid;
-        this.uploadBy = UserContext.getUser();
+        this.uploadBy = AuthContext.getUser();
         this.scope = scope;
     }
 
@@ -68,7 +68,7 @@ public class FileMeta extends BaseObject<Integer> {
         this.contentType = fileMeta.getContentType();
         this.sha256sum = fileMeta.getSha256sum();
         this.pid = fileMeta.getPid();
-        this.uploadBy = UserContext.getUser();
+        this.uploadBy = AuthContext.getUser();
         this.scope = scope;
     }
 }

oss-store/src/main/java/cn/reghao/oss/store/service/SignService.java

@@ -1,6 +1,6 @@
 package cn.reghao.oss.store.service;
 
-import cn.reghao.oss.store.util.JwtUtil;
+import cn.reghao.oss.api.util.JwtUtil;
 import cn.reghao.oss.store.util.SignatureUtil;
 import cn.reghao.oss.api.constant.ChannelAction;
 import cn.reghao.oss.api.dto.OssPayload;

oss-store/src/main/java/cn/reghao/oss/store/service/StoreLocalService.java

@@ -2,7 +2,7 @@ package cn.reghao.oss.store.service;
 
 import cn.reghao.oss.api.dto.NodeProperties;
 import cn.reghao.oss.api.iface.NodeService;
-import cn.reghao.oss.store.util.UserContext;
+import cn.reghao.oss.api.util.AuthContext;
 import cn.reghao.oss.store.config.props.OssProperties;
 import cn.reghao.oss.api.dto.StoreNodeDto;
 import cn.reghao.oss.api.dto.ObjectChannel;
@@ -27,19 +27,19 @@ public class StoreLocalService {
     }
 
     public String getDomain() {
-        int loginUser = UserContext.getUser();
+        int loginUser = AuthContext.getUser();
         NodeProperties nodeProperties = nodeService.getNodeProperties(loginUser, nodeAddress);
         return nodeProperties != null ? nodeProperties.getDomain() : null;
     }
 
     public String getReferer() {
-        int loginUser = UserContext.getUser();
+        int loginUser = AuthContext.getUser();
         NodeProperties nodeProperties = nodeService.getNodeProperties(loginUser, nodeAddress);
         return nodeProperties != null ? nodeProperties.getReferer() : null;
     }
 
     public String getSecretKey() {
-        int loginUser = UserContext.getUser();
+        int loginUser = AuthContext.getUser();
         NodeProperties nodeProperties = nodeService.getNodeProperties(loginUser, nodeAddress);
         return nodeProperties != null ? nodeProperties.getSecretKey() : null;
     }