update

oss-api/src/main/java/cn/reghao/oss/api/iface/ConsoleService.java

@@ -14,8 +14,7 @@ import cn.reghao.oss.api.dto.StoreNodeDto;
 public interface ConsoleService {
     void registerNode(StoreNodeDto storeNodeDto);
     NodeProperties getNodeProperties(int owner, String nodeAddress);
-    ServerInfo getUploadStore(int loginUser, int channelId);
-
     ObjectChannel getChannelById(int owner, int channelId);
     int getChannelIdByUrl(int loginUser, String url);
+    ServerInfo getUploadStore(int loginUser, int channelId);
 }

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

@@ -56,6 +56,26 @@ public class ConsoleServiceImpl implements ConsoleService {
         return null;
     }
 
+    @Override
+    public ObjectChannel getChannelById(int owner, int channelId) {
+        return uploadChannelService.getObjectChannelByChannelId(channelId, owner);
+    }
+
+    @Override
+    public int getChannelIdByUrl(int loginUser, String url) {
+        List<UploadChannel> uploadChannels = uploadChannelService.getUploadChannelsByCreateBy(loginUser);
+        String url1 = url.replace("//", "");
+        int idx = url1.indexOf("/");
+        String objectName = url1.substring(idx+1);
+        for (UploadChannel uploadChannel : uploadChannels) {
+            if (objectName.startsWith(uploadChannel.getPrefix())) {
+                return uploadChannel.getChannelId();
+            }
+        }
+
+        return 0;
+    }
+
     @Override
     public ServerInfo getUploadStore(int loginUser, int channelId) {
         UploadChannel uploadChannel = uploadChannelService.getByChannelIdAndCreateBy(channelId, loginUser);
@@ -82,24 +102,4 @@ public class ConsoleServiceImpl implements ConsoleService {
         cache.put(uploadToken, secretKey);
         return new ServerInfo(ossUrl, channelId, maxSize, uploadToken);
     }
-
-    @Override
-    public ObjectChannel getChannelById(int owner, int channelId) {
-        return uploadChannelService.getObjectChannelByChannelId(channelId, owner);
-    }
-
-    @Override
-    public int getChannelIdByUrl(int loginUser, String url) {
-        List<UploadChannel> uploadChannels = uploadChannelService.getUploadChannelsByCreateBy(loginUser);
-        String url1 = url.replace("//", "");
-        int idx = url1.indexOf("/");
-        String objectName = url1.substring(idx+1);
-        for (UploadChannel uploadChannel : uploadChannels) {
-            if (objectName.startsWith(uploadChannel.getPrefix())) {
-                return uploadChannel.getChannelId();
-            }
-        }
-
-        return 0;
-    }
 }