1.userId 调整为 Long 类型

2.实现 file-api 中的接口

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

@@ -47,12 +47,13 @@ public class ObjectController {
         return WebResult.success();
     }
 
+    // TODO 接口作废
     @ApiOperation(value = "获取对象签名 url")
     @GetMapping(value = "/url", produces = MediaType.APPLICATION_JSON_VALUE)
     public String getObjectUrl(@RequestParam("channelId") Integer channelId,
                                @RequestParam("objectId") String objectId) throws Exception {
-        String signedUrl = ossObjectService.getSignedUrl(channelId, objectId);
-        return WebResult.success(signedUrl);
+        //String signedUrl = ossObjectService.getSignedUrl(channelId, objectId);
+        return WebResult.success();
     }
 
     @ApiOperation(value = "获取对象信息")

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

@@ -40,7 +40,7 @@ public class OssServerController {
     @ApiOperation(value = "根据 channel_id 获取 UploadChannel")
     @GetMapping(value = "/channel", produces = MediaType.APPLICATION_JSON_VALUE)
     public String getChannel(@RequestParam("channelId") int channelId) {
-        int loginUser = AuthKeyContext.getUser();
+        long loginUser = AuthKeyContext.getUser();
         ObjectChannel objectChannel = uploadChannelService.getObjectChannelByChannelId(channelId, loginUser);
         return WebResult.success(objectChannel);
     }

oss-console/src/main/java/cn/reghao/oss/console/app/db/repository/UploadChannelRepository.java

@@ -12,10 +12,10 @@ import java.util.List;
  * @date 2024-02-23 15:05:30
  */
 public interface UploadChannelRepository extends JpaRepository<UploadChannel, Integer> {
-    int countByCreateBy(int createBy);
-    List<UploadChannel> findByNodeIdAndCreateBy(int nodeId, int createBy);
-    UploadChannel findByChannelIdAndCreateBy(int channelId, int createBy);
-    UploadChannel findByPrefixAndCreateByAndNodeId(String prefix, int createBy, int nodeId);
+    int countByCreateBy(long createBy);
+    List<UploadChannel> findByNodeIdAndCreateBy(int nodeId, long createBy);
+    UploadChannel findByChannelIdAndCreateBy(int channelId, long createBy);
+    UploadChannel findByPrefixAndCreateByAndNodeId(String prefix, long createBy, int nodeId);
     UploadChannel findByPrefixAndNodeId(String prefix, int nodeId);
     List<UploadChannel> findByNodeId(int nodeId);
     Page<UploadChannel> findByCreateBy(int createBy, Pageable pageable);

oss-console/src/main/java/cn/reghao/oss/console/app/db/repository/UserKeyRepository.java

@@ -8,6 +8,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
  * @date 2024-02-27 10:35:53
  */
 public interface UserKeyRepository extends JpaRepository<UserKey, Integer> {
-    UserKey findByCreateBy(int createBy);
+    UserKey findByCreateBy(long createBy);
     UserKey findByAccessKeyId(String accessKeyId);
 }

oss-console/src/main/java/cn/reghao/oss/console/app/db/repository/UserNodeRepository.java

@@ -12,6 +12,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
  */
 public interface UserNodeRepository extends JpaRepository<UserNode, Integer> {
     int countByNodeId(int nodeId);
-    UserNode findByNodeIdAndUserId(int nodeId, int userId);
-    Page<UserNode> findByUserId(int userId, Pageable pageable);
+    UserNode findByNodeIdAndUserId(int nodeId, long userId);
+    Page<UserNode> findByUserId(long userId, Pageable pageable);
 }

oss-console/src/main/java/cn/reghao/oss/console/app/model/po/UploadChannel.java

@@ -27,9 +27,9 @@ public class UploadChannel extends BaseEntity {
     private Boolean seturl;
     private Integer scope;
     private Integer nodeId;
-    private Integer createBy;
+    private Long createBy;
 
-    public UploadChannel(int channelId, UploadChannelDto uploadChannelDto, int createBy) {
+    public UploadChannel(int channelId, UploadChannelDto uploadChannelDto, long createBy) {
         this.channelId = channelId;
         this.name = uploadChannelDto.getName();
         this.prefix = uploadChannelDto.getChannelPrefix();

oss-console/src/main/java/cn/reghao/oss/console/app/model/po/UserKey.java

@@ -22,5 +22,5 @@ public class UserKey extends BaseEntity {
     @Column(unique = true)
     private String accessKeyId;
     private String accessKeySecret;
-    private Integer createBy;
+    private Long createBy;
 }

oss-console/src/main/java/cn/reghao/oss/console/app/model/po/UserNode.java

@@ -20,9 +20,9 @@ import javax.persistence.Entity;
 @Entity
 public class UserNode extends BaseEntity {
     private Integer nodeId;
-    private Integer userId;
+    private Long userId;
 
-    public UserNode(UserNodeDto userNodeDto, int userId) {
+    public UserNode(UserNodeDto userNodeDto, long userId) {
         this.nodeId = userNodeDto.getNodeId();
         this.userId = userId;
     }

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

@@ -7,6 +7,7 @@ import cn.reghao.tnb.file.api.dto.media.*;
 import cn.reghao.tnb.file.api.iface.MediaService;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -23,23 +24,24 @@ public class MediaRpcService {
 
     public VideoInfo getVideoInfo(int channelId, String videoFileId) throws Exception {
         MediaService mediaService = getMediaService(channelId);
-        return mediaService.getVideoInfo(videoFileId);
+        return mediaService.getVideoInfo(channelId, videoFileId);
     }
 
+    @Deprecated
     public List<ImageInfo> getImagesInfo(int channelId, List<String> imageFileIds) throws Exception {
         MediaService mediaService = getMediaService(channelId);
-        return mediaService.getImagesInfo(imageFileIds);
+        return Collections.emptyList();
     }
 
     public List<ConvertedImageInfo> getWebpInfo(int channelId, List<String> imageFileIds) throws Exception {
-        int loginUser = AuthKeyContext.getUser();
+        long loginUser = AuthKeyContext.getUser();
         MediaService mediaService = getMediaService(channelId);
-        return mediaService.getWebpInfo(loginUser, imageFileIds);
+        return mediaService.getWebpInfo(channelId, imageFileIds);
     }
 
     public AudioInfo getAudioInfo(int channelId, String audioFileId) throws Exception {
         MediaService mediaService = getMediaService(channelId);
-        return mediaService.getAudioInfo(audioFileId);
+        return mediaService.getAudioInfo(channelId, audioFileId);
     }
 
     private MediaService getMediaService(int channelId) throws Exception {

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

@@ -28,16 +28,16 @@ public class OssObjectService {
         ObjectService objectService = getObjectService(channelId);
         int scope = objectsScopeDto.getScope();
         List<String> objectIds = objectsScopeDto.getObjectIds();
-        objectService.setObjectsScope(scope, objectIds);
+        objectService.setObjectsScope(channelId, objectIds, scope);
     }
 
     public void deleteByObjectIds(int channelId, List<String> objectIds) throws Exception {
         ObjectService objectService = getObjectService(channelId);
-        objectService.deleteByObjectIds(objectIds);
+        objectService.deleteByObjectIds(channelId, objectIds);
     }
 
     public void deleteByObjectUrl(String objectUrl) throws Exception {
-        int loginUser = AuthKeyContext.getUser();
+        long loginUser = AuthKeyContext.getUser();
         String domain = objectUrl.replace("//", "").split("/")[0];
         String objectName = objectUrl.replace("//" + domain + "/", "");
         List<UploadChannel> uploadChannels = uploadChannelService.getByDomainAndCreateBy(domain, loginUser);
@@ -47,7 +47,7 @@ public class OssObjectService {
             if (objectName.startsWith(prefix)) {
                 int channelId = uploadChannel.getChannelId();
                 ObjectService objectService = getObjectService(channelId);
-                objectService.deleteByObjectName(objectName);
+                objectService.deleteByObjectUrl(objectName);
                 return;
             }
         }
@@ -56,18 +56,11 @@ public class OssObjectService {
         throw new Exception(errMsg);
     }
 
-    public String getSignedUrl(int channelId, String objectId) throws Exception {
-        ObjectService objectService = getObjectService(channelId);
-        int loginUser = AuthKeyContext.getUser();
-        int expireSecond = 3600;
-        return objectService.getSignedUrl(loginUser, objectId, expireSecond);
-    }
-
     public ObjectInfo getObjectInfo(int channelId, String objectId) throws Exception {
         ObjectService objectService = getObjectService(channelId);
-        int loginUser = AuthKeyContext.getUser();
+        long loginUser = AuthKeyContext.getUser();
         int expireSecond = 3600;
-        return objectService.getObjectInfo(loginUser, objectId, expireSecond);
+        return objectService.getObjectInfo(channelId, objectId);
     }
 
     private ObjectService getObjectService(int channelId) throws Exception {

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

@@ -24,7 +24,7 @@ public class OssService {
     }
 
     public ServerInfo getServerInfo(int channelId) throws Exception {
-        int userId = AuthKeyContext.getUser();
+        long userId = AuthKeyContext.getUser();
         UploadChannel uploadChannel = uploadChannelService.getByChannelIdAndCreateBy(channelId, userId);
         if (uploadChannel == null) {
             String errMsg = String.format("channel_id %s not exist", channelId);

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

@@ -47,7 +47,7 @@ public class UploadChannelService {
             return Result.fail(String.format("store_node with id %s not exist", nodeId));
         }
 
-        int createBy = UserContext.getUser().getId();
+        long createBy = UserContext.getUser().getId();
         //int createBy = 410;
         String channelPrefix = uploadChannelDto.getChannelPrefix();
         UploadChannel uploadChannel = uploadChannelRepository.findByPrefixAndCreateByAndNodeId(channelPrefix, createBy, nodeId);
@@ -80,7 +80,7 @@ public class UploadChannelService {
         return Result.success();
     }
 
-    private int getNextChannelId(int userId) {
+    private int getNextChannelId(long userId) {
         int channelId = 101;
         int total = uploadChannelRepository.countByCreateBy(userId);
         return channelId + total;
@@ -136,11 +136,11 @@ public class UploadChannelService {
         return uploadChannelRepository.findById(id).orElse(null);
     }
 
-    public UploadChannel getByChannelIdAndCreateBy(int channelId, int createBy) {
+    public UploadChannel getByChannelIdAndCreateBy(int channelId, long createBy) {
         return uploadChannelRepository.findByChannelIdAndCreateBy(channelId, createBy);
     }
 
-    public ObjectChannel getObjectChannelByChannelId(int channelId, int createBy) {
+    public ObjectChannel getObjectChannelByChannelId(int channelId, long createBy) {
         UploadChannel uploadChannel = uploadChannelRepository.findByChannelIdAndCreateBy(channelId, createBy);
         return getObjectChannel(uploadChannel);
     }
@@ -154,12 +154,12 @@ public class UploadChannelService {
         boolean seturl = uploadChannel.getSeturl();
         int scope = uploadChannel.getScope();
         String domain = storeNodeService.getById(uploadChannel.getNodeId()).getDomain();
-        int createBy = uploadChannel.getCreateBy();
+        long createBy = uploadChannel.getCreateBy();
         return new ObjectChannel(channelId, name, channelPrefix, maxSize, fileType, seturl, scope, domain, createBy);
     }
 
     public StoreNode getStoreNodeByChannelId(int channelId) throws Exception {
-        int userId = AuthKeyContext.getUser();
+        long userId = AuthKeyContext.getUser();
         UploadChannel uploadChannel = uploadChannelRepository.findByChannelIdAndCreateBy(channelId, userId);
         if (uploadChannel == null) {
             String errMsg = String.format("channel_id %s not exist", channelId);
@@ -179,11 +179,11 @@ public class UploadChannelService {
         return storeNode;
     }
 
-    public List<UploadChannel> getByNodeIdAndUserId(int nodeId, int userId) {
+    public List<UploadChannel> getByNodeIdAndUserId(int nodeId, long userId) {
         return uploadChannelRepository.findByNodeIdAndCreateBy(nodeId, userId);
     }
 
-    public List<UploadChannel> getByDomainAndCreateBy(String domain, int createBy) {
+    public List<UploadChannel> getByDomainAndCreateBy(String domain, long createBy) {
         StoreNode storeNode = storeNodeService.getByDomain(domain);
         int nodeId = storeNode.getId();
         return getByNodeIdAndUserId(nodeId, createBy);

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

@@ -28,7 +28,7 @@ public class UserKeyService {
     }
 
     public Result create() {
-        int loginUser = UserContext.getUser().getId();
+        long loginUser = UserContext.getUser().getId();
         UserKey userKey = userKeyRepository.findByCreateBy(loginUser);
         if (userKey != null) {
             String errMsg = String.format("you already have key");
@@ -54,12 +54,12 @@ public class UserKeyService {
             return Result.fail("secret not matched");
         }
 
-        int loginUser = userKey.getCreateBy();
+        long loginUser = userKey.getCreateBy();
         String token = getToken(loginUser);
         return Result.success(token);
     }
 
-    public String getToken(int loginUser) {
+    public String getToken(long loginUser) {
         String secretKey = "ossconsole.reghao.cn";
         long timestamp = System.currentTimeMillis() + 3600*24*365*1000L;
         String action = ChannelAction.all.getName();
@@ -68,7 +68,7 @@ public class UserKeyService {
         return JwtUtil.createToken(ossPayload, timestamp, secretKey);
     }
 
-    public int getUserIdFromToken(String token) {
+    public long getUserIdFromToken(String token) {
         String secretKey = "ossconsole.reghao.cn";
         OssPayload ossPayload = JwtUtil.getOssPayload(token, secretKey);
         return ossPayload.getUserId();

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

@@ -42,7 +42,7 @@ public class ConsoleAuthInterceptor implements HandlerInterceptor {
                 response.setStatus(403);
                 return false;
             } else {
-                int userId = userKeyService.getUserIdFromToken(token);
+                long userId = userKeyService.getUserIdFromToken(token);
                 log.info("{} access {}", userId, uri);
                 AuthKeyContext authKeyContext = new AuthKeyContext(userId);
             }

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

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

oss-store/src/main/java/cn/reghao/oss/store/util/UserContext.java → oss-store/src/main/java/cn/reghao/oss/store/config/UserContext.java

@@ -1,17 +1,17 @@
-package cn.reghao.oss.store.util;
+package cn.reghao.oss.store.config;
 
 /**
  * @author reghao
  * @date 2023-06-02 10:48:59
  */
 public class UserContext implements AutoCloseable {
-    static final ThreadLocal<Integer> CURRENT = new ThreadLocal<>();
+    static final ThreadLocal<Long> CURRENT = new ThreadLocal<>();
 
-    public UserContext(Integer user) {
+    public UserContext(Long user) {
         CURRENT.set(user);
     }
 
-    public static int getUser() {
+    public static long getUser() {
         return CURRENT.get();
     }
 

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

@@ -80,7 +80,7 @@ public class ObjectGetController {
         }
 
         OssPayload ossPayload = JwtUtil.getOssPayload(token, storeLocalService.getSecretKey());
-        int loginUser = ossPayload.getUserId();
+        long loginUser = ossPayload.getUserId();
         int channelId = ossPayload.getChannelId();
         ObjectChannel objectChannel = storeLocalService.getChannelByChannelId(loginUser, channelId);
         if (objectChannel == null) {
@@ -89,7 +89,7 @@ public class ObjectGetController {
             return;
         }
 
-        int userId = ossPayload.getUserId();
+        long userId = ossPayload.getUserId();
         String prefix = objectChannel.getPrefix();
         if (!objectName.startsWith(prefix)) {
             String payload = String.format("channel prefix %s not matched", prefix);

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

@@ -11,7 +11,7 @@ import cn.reghao.jutil.jdk.security.DigestUtil;
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.oss.storeapi.dto.OssPayload;
 import cn.reghao.oss.storeapi.rest.UploadFileRet;
-import cn.reghao.oss.store.util.UserContext;
+import cn.reghao.oss.store.config.UserContext;
 import org.apache.commons.io.FileUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -73,7 +73,7 @@ public class ObjectUploadController {
                     .body(WebResult.failWithMsg("channel not match in token"));
         }
 
-        int loginUser = ossPayload.getUserId();
+        long loginUser = ossPayload.getUserId();
         ObjectChannel objectChannel = storeLocalService.getChannelByChannelId(loginUser, channelId);
         if (objectChannel == null) {
             String errMsg = String.format("channel validate failed, channel %s not exist", channelId);
@@ -81,7 +81,7 @@ public class ObjectUploadController {
                     .body(WebResult.failWithMsg(errMsg));
         }
 
-        int userId1 = ossPayload.getUserId();
+        long userId1 = ossPayload.getUserId();
         UserContext context = new UserContext(userId1);
 
         /* channel validate */

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

@@ -2,7 +2,7 @@ package cn.reghao.oss.store.inerceptor;
 
 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.store.config.UserContext;
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.oss.storeapi.dto.OssPayload;
 import org.springframework.stereotype.Component;
@@ -29,7 +29,7 @@ public class TokenFilter implements Filter {
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
             throws IOException, ServletException {
-        int userId = -1;
+        long userId = -1;
         String token = ServletUtil.getBearerToken(request);
         if (token != null) {
             OssPayload ossPayload = JwtUtil.getOssPayload(token, storeLocalService.getSecretKey());

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.store.config.UserContext;
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -26,7 +26,7 @@ public class FileMeta extends BaseObject<Integer> {
     private Integer fileType;
     private String contentType;
     private Integer scope;
-    private Integer uploadBy;
+    private Long uploadBy;
 
     // 目录对象
     public FileMeta(String objectName, String objectId, String filename, String pid, int scope) {

oss-store/src/main/java/cn/reghao/oss/store/rpc/MediaServiceImpl.java

@@ -6,7 +6,6 @@ import cn.reghao.oss.store.service.ObjectNameService;
 import cn.reghao.oss.store.service.SignService;
 import cn.reghao.tnb.file.api.dto.media.*;
 import cn.reghao.oss.store.task.MediaFileProcessor;
-import cn.reghao.oss.store.util.UserContext;
 import cn.reghao.tnb.file.api.iface.MediaService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -33,40 +32,10 @@ public class MediaServiceImpl implements MediaService {
         this.mediaFileProcessor = mediaFileProcessor;
     }
 
+    @Override
     public VideoInfo getVideoInfo(int channelId, String objectId) {
-        return null;
-    }
-
-    public ImageInfo getImageInfo(int channelId, String objectId) {
-        return null;
-    }
-
-
-    public List<ConvertedImageInfo> getWebpInfo(int channelId, List<String> objectIds) {
-        return null;
-    }
-
-    public AudioInfo getAudioInfo(int channelId, String objectId) {
-        return null;
-    }
-
-
-    public String getSignedUrl(int loginUser, String objectId, int expireSecond) {
-        FileMeta fileMeta = objectRepository.getByObjectId(objectId);
-        String objectName = fileMeta.getObjectName();
-        String url = objectNameService.getObjectUrl(objectName);
-        String signedUrl = signService.getSignedUrl(loginUser, url, expireSecond);
-        return signedUrl;
-    }
-
-    public String getSignedUrl(int channelId, String uploadId) {
-        return null;
-    }
-
-    @Deprecated
-    public VideoInfo getVideoInfo(String videoFileId) {
         try {
-            VideoInfo videoInfo = mediaFileProcessor.getVideoInfo(videoFileId);
+            VideoInfo videoInfo = mediaFileProcessor.getVideoInfo(objectId);
             return videoInfo;
         } catch (Exception e) {
             e.printStackTrace();
@@ -75,34 +44,27 @@ public class MediaServiceImpl implements MediaService {
         return null;
     }
 
-    @Deprecated
-    public ImageInfo getImageInfo(String imageFileId) {
+    @Override
+    public ImageInfo getImageInfo(int channelId, String objectId) {
         try {
-            ImageInfo imageInfo = mediaFileProcessor.getImageInfo(imageFileId);
+            ImageInfo imageInfo = mediaFileProcessor.getImageInfo(objectId);
             return imageInfo;
         } catch (Exception e) {
             e.printStackTrace();
         }
 
-
         return null;
     }
 
-    @Deprecated
-    public List<ImageInfo> getImagesInfo(List<String> imageFileIds) {
-        return mediaFileProcessor.getImagesInfo(imageFileIds);
-    }
-
-    @Deprecated
-    public List<ConvertedImageInfo> getWebpInfo1(int loginUser, List<String> imageFileIds) {
-        UserContext userContext = new UserContext(loginUser);
-        return mediaFileProcessor.getWebpInfos(imageFileIds);
+    @Override
+    public List<ConvertedImageInfo> getWebpInfo(int channelId, List<String> objectIds) {
+        return mediaFileProcessor.getWebpInfos(objectIds);
     }
 
-    @Deprecated
-    public AudioInfo getAudioInfo(String audioFileId) {
+    @Override
+    public AudioInfo getAudioInfo(int channelId, String objectId) {
         try {
-            AudioInfo audioInfo = mediaFileProcessor.getAudioInfo(audioFileId);
+            AudioInfo audioInfo = mediaFileProcessor.getAudioInfo(objectId);
             return audioInfo;
         } catch (Exception e) {
             e.printStackTrace();
@@ -110,4 +72,20 @@ public class MediaServiceImpl implements MediaService {
 
         return null;
     }
+
+    @Override
+    public String getSignedUrl(int channelId, String objectId) {
+        long userId = getUserIdByChannelId(channelId);
+
+        int expireSecond = 3600;
+        FileMeta fileMeta = objectRepository.getByObjectId(objectId);
+        String objectName = fileMeta.getObjectName();
+        String url = objectNameService.getObjectUrl(objectName);
+        String signedUrl = signService.getSignedUrl(userId, url, expireSecond);
+        return signedUrl;
+    }
+
+    private Long getUserIdByChannelId(int channelId) {
+        return 1L;
+    }
 }

oss-store/src/main/java/cn/reghao/oss/store/rpc/ObjectServiceImpl.java

@@ -38,28 +38,8 @@ public class ObjectServiceImpl implements ObjectService {
         this.storeLocalService = storeLocalService;
     }
 
+    @Override
     public void setObjectsScope(int channelId, List<String> objectIds, int scope) {
-
-    }
-
-    public void deleteByObjectIds(int channelId, List<String> objectIds) {
-
-    }
-
-    public void deleteByObjectUrl(String objectUrl) {
-
-    }
-
-    public ObjectInfo getObjectInfo(int channelId, String objectId) {
-        return null;
-    }
-
-    public ObjectChannel getObjectChannel(int channelId) {
-        return null;
-    }
-
-    @Deprecated
-    public void setObjectsScope(int scope, List<String> objectIds) {
         if (objectIds.isEmpty()) {
             return;
         }
@@ -70,22 +50,26 @@ public class ObjectServiceImpl implements ObjectService {
         });
     }
 
-    @Deprecated
-    public void deleteByObjectIds(List<String> objectIds) {
+    @Override
+    public void deleteByObjectIds(int channelId, List<String> objectIds) {
         objectIds.forEach(objectId -> {
             FileMeta fileMeta = objectRepository.getByObjectId(objectId);
             objectRepository.deleteObject(fileMeta);
         });
     }
 
-    @Deprecated
-    public void deleteByObjectName(String objectName) {
+    @Override
+    public void deleteByObjectUrl(String objectUrl) {
+        String objectName = "";
         FileMeta fileMeta = objectRepository.getByObjectName(objectName);
         objectRepository.deleteObject(fileMeta);
     }
 
-    @Deprecated
-    public ObjectInfo getObjectInfo(int loginUser, String objectId, int expireSecond) {
+    @Override
+    public ObjectInfo getObjectInfo(int channelId, String objectId) {
+        long loginUser = 1;
+        int expireSecond = 3600;
+
         FileMeta fileMeta = fileMetaMapper.findByObjectId(objectId);
         if (fileMeta == null) {
             return null;
@@ -107,4 +91,9 @@ public class ObjectServiceImpl implements ObjectService {
 
         return objectInfo;
     }
+
+    @Override
+    public ObjectChannel getObjectChannel(int channelId) {
+        return null;
+    }
 }

oss-store/src/main/java/cn/reghao/oss/store/rpc/StoreServiceImpl.java

@@ -42,7 +42,7 @@ public class StoreServiceImpl implements StoreService {
     }
 
     @Override
-    public String getUploadToken(int userId, int channelId) {
+    public String getUploadToken(long userId, int channelId) {
         String secretKey = storeLocalService.getSecretKey();
         String action = ChannelAction.upload.getName();
         long expireAt = System.currentTimeMillis() + 3600*1000;
@@ -51,7 +51,7 @@ public class StoreServiceImpl implements StoreService {
     }
 
     @Override
-    public void createChannel(int userId, ObjectChannel channel) {
+    public void createChannel(long userId, ObjectChannel channel) {
         String objectName = channel.getPrefix();
         objectNameService.createParentDirs(objectName, ObjectScope.PUBLIC.getCode());
         storeLocalService.addObjectChannel(channel);

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

@@ -22,7 +22,7 @@ public class SignService {
         this.storeLocalService = storeLocalService;
     }
 
-    public String getSignedUrl(int loginUser, String url, int expire) {
+    public String getSignedUrl(long loginUser, String url, int expire) {
         long timestamp = System.currentTimeMillis() + expire*1000L;
         int channelId = storeLocalService.getChannelIdByUrl(loginUser, url);
 

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

@@ -59,11 +59,11 @@ public class StoreLocalService {
         channelIdMap.put(createBy + "-" + channelId, channel);
     }
 
-    public ObjectChannel getChannelByChannelId(int loginUser, int channelId) {
+    public ObjectChannel getChannelByChannelId(long loginUser, int channelId) {
         return channelIdMap.get(loginUser + "-" + channelId);
     }
 
-    public ObjectChannel getChannelByUrl(int loginUser, String url) {
+    public ObjectChannel getChannelByUrl(long loginUser, String url) {
         String domain = storeProperties.getDomain();
         String objectName = url.replace("//" + domain + "/", "");
         for (String key : prefixMap.keySet()) {
@@ -76,7 +76,7 @@ public class StoreLocalService {
         return null;
     }
 
-    public int getChannelIdByUrl(int loginUser, String url) {
+    public int getChannelIdByUrl(long loginUser, String url) {
         ObjectChannel objectChannel = getChannelByUrl(loginUser, url);
         if (objectChannel == null) {
             return -1;

store-api/src/main/java/cn/reghao/oss/storeapi/dto/OssPayload.java

@@ -16,5 +16,5 @@ public class OssPayload implements Serializable {
 
     private String action;
     private int channelId;
-    private int userId;
+    private long userId;
 }

store-api/src/main/java/cn/reghao/oss/storeapi/iface/StoreService.java

@@ -9,8 +9,8 @@ import cn.reghao.oss.storeapi.dto.StoreProperties;
  * @date 2023-08-01 14:51:50
  */
 public interface StoreService {
-    String getUploadToken(int userId, int channelId);
-    void createChannel(int userId, ObjectChannel channel);
+    String getUploadToken(long userId, int channelId);
+    void createChannel(long userId, ObjectChannel channel);
     void updateStoreProperties(StoreProperties storeProperties);
     StoreInfo getStoreInfo();
 }