删除 oss-console 中的无用 web 接口

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

@@ -43,14 +43,6 @@ public class OssServerController {
         return WebResult.success(serverInfo);
     }
 
-    @ApiOperation(value = "根据 channel_id 获取 UploadChannel")
-    @GetMapping(value = "/server/channel", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String getChannel(@RequestParam("channelId") int channelId) {
-        int loginUser = AuthKeyContext.getUser();
-        ObjectChannel objectChannel = ossStoreService.getObjectChannel(loginUser, channelId);
-        return WebResult.success(objectChannel);
-    }
-
     @ApiOperation(value = "获取对象信息")
     @GetMapping(value = "/object/info", produces = MediaType.APPLICATION_JSON_VALUE)
     public String getObjectInfo(@RequestParam("objectId") String objectId) {

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

@@ -1,7 +1,6 @@
 package cn.reghao.oss.console.app.controller;
 
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.oss.console.app.model.po.StoreNode;
 import cn.reghao.oss.console.app.service.OssStoreService;
 import cn.reghao.oss.store.api.dto.ObjectChannel;
 import cn.reghao.oss.store.api.dto.StoreNodeDto;
@@ -42,15 +41,6 @@ public class OssStoreController {
         return WebResult.success(list);
     }
 
-    @ApiOperation(value = "获取某个 UploadChannel")
-    @GetMapping(value = "/channel", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String getChannel(@RequestParam("createBy") Integer createBy,
-                             @RequestParam("nodeAddr") String nodeAddr,
-                             @RequestParam("channelId") int channelId) {
-        ObjectChannel objectChannel = ossStoreService.getObjectChannel(createBy, nodeAddr, channelId);
-        return WebResult.success(objectChannel);
-    }
-
     @ApiOperation(value = "获取 store 的配置")
     @GetMapping(value = "/properties", produces = MediaType.APPLICATION_JSON_VALUE)
     public String getStoreProperties(@RequestParam("nodeAddr") String nodeAddr) {

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

@@ -1,6 +1,5 @@
 package cn.reghao.oss.console.app.service;
 
-import cn.reghao.oss.console.app.db.repository.UploadChannelRepository;
 import cn.reghao.oss.console.app.model.po.StoreNode;
 import cn.reghao.oss.console.app.model.po.UploadChannel;
 import cn.reghao.oss.store.api.dto.ObjectChannel;
@@ -19,12 +18,11 @@ import java.util.stream.Collectors;
 @Service
 public class OssStoreService {
     private final StoreNodeService storeNodeService;
-    private final UploadChannelRepository uploadChannelRepository;
+    private final UploadChannelService uploadChannelService;
 
-    public OssStoreService(StoreNodeService storeNodeService, UploadChannelRepository uploadChannelRepository) {
+    public OssStoreService(StoreNodeService storeNodeService, UploadChannelService uploadChannelService) {
         this.storeNodeService = storeNodeService;
-        this.uploadChannelRepository = uploadChannelRepository;
-
+        this.uploadChannelService = uploadChannelService;
     }
 
     public void registerNode(StoreNodeDto storeNodeDto) {
@@ -38,35 +36,11 @@ public class OssStoreService {
         }
 
         String domain = storeNode.getDomain();
-        return uploadChannelRepository.findByBindDomain(domain).stream()
+        return uploadChannelService.getByDomain(domain).stream()
                 .map(this::getObjectChannel)
                 .collect(Collectors.toList());
     }
 
-    public ObjectChannel getObjectChannel(int createBy, String nodeAddr, int channelId) {
-        StoreNode storeNode = storeNodeService.getByNodeAddr(nodeAddr);
-        if (storeNode == null) {
-            return null;
-        }
-
-        String domain = storeNode.getDomain();
-        UploadChannel uploadChannel = uploadChannelRepository.findByCreateByAndBindDomainAndChannelId(createBy, domain, channelId);
-        if (uploadChannel == null) {
-            return null;
-        }
-
-        return getObjectChannel(uploadChannel);
-    }
-
-    public ObjectChannel getObjectChannel(int createBy, int channelId) {
-        UploadChannel uploadChannel = uploadChannelRepository.findByChannelIdAndCreateBy(channelId, createBy);
-        if (uploadChannel == null) {
-            return null;
-        }
-
-        return getObjectChannel(uploadChannel);
-    }
-
     private ObjectChannel getObjectChannel(UploadChannel uploadChannel) {
         int channelId = uploadChannel.getChannelId();
         String name = uploadChannel.getName();

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

@@ -110,6 +110,10 @@ public class UploadChannelService {
         return new PageImpl<>(list, pageRequest, page.getTotalElements());
     }
 
+    public List<UploadChannel> getByDomain(String domain) {
+        return uploadChannelRepository.findByBindDomain(domain);
+    }
+
     public UploadChannel getUploadChannel(int id) {
         return uploadChannelRepository.findById(id).orElse(null);
     }