update

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

@@ -18,5 +18,4 @@ public interface ConsoleService {
 
     ObjectChannel getChannelById(int owner, int channelId);
     int getChannelIdByUrl(int loginUser, String url);
-    int getChannelScope(int loginUser, int channelId);
 }

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

@@ -30,19 +30,6 @@ public class StoreObjectPageController {
     public String index(@RequestParam(value = "env", required = false) String env,
                         @RequestParam(value = "type", required = false) String type,
                         @RequestParam(value = "appName", required = false) String appName, Model model) throws Exception {
-        if (env == null) {
-            env = "test";
-        }
-
-        if (type == null) {
-            type = "test";
-        }
-
-        /*PageRequest pageRequest = PageSort.pageRequest();
-        Page<DiskFile> page = Page.empty();*/
-
-        /*model.addAttribute("page", page);
-        model.addAttribute("list", page.getContent());*/
         return "/object/index";
     }
 

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

@@ -17,7 +17,6 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author reghao
@@ -47,7 +46,8 @@ public class UploadChannelPageController {
 
         /*Sort sort = Sort.by(Sort.Direction.ASC, "channelId");
         PageRequest pageRequest1 = PageRequest.of(pageNumber, pageSize, sort);*/
-        List<UploadChannelVo> list = uploadChannelService.getUploadChannels();
+        int loginUser = UserContext.getUserId();
+        List<UploadChannelVo> list = uploadChannelService.getUploadChannels(loginUser);
         //model.addAttribute("page", page);
         model.addAttribute("list", list);
         return "/channel/index";

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

@@ -11,9 +11,9 @@ import java.util.List;
  */
 public interface UploadChannelRepository extends JpaRepository<UploadChannel, Integer> {
     int countByCreateBy(int createBy);
+    List<UploadChannel> findByCreateBy(int createBy);
     List<UploadChannel> findByCreateByAndNodeId(int createBy, int nodeId);
     UploadChannel findByCreateByAndChannelId(int createBy, int channelId);
     UploadChannel findByCreateByAndPrefix(int createBy, String prefix);
     UploadChannel findById(int id);
-    List<UploadChannel> findByCreateBy(int createBy);
 }

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

@@ -86,7 +86,7 @@ public class ConsoleServiceImpl implements ConsoleService {
 
     @Override
     public int getChannelIdByUrl(int loginUser, String url) {
-        List<UploadChannel> uploadChannels = uploadChannelService.getByCreateBy(loginUser);
+        List<UploadChannel> uploadChannels = uploadChannelService.getUploadChannelsByCreateBy(loginUser);
         int idx = url.indexOf("/");
         String objectName = url.substring(idx);
         for (UploadChannel uploadChannel : uploadChannels) {
@@ -97,10 +97,4 @@ public class ConsoleServiceImpl implements ConsoleService {
 
         return 0;
     }
-
-    @Override
-    public int getChannelScope(int loginUser, int channelId) {
-        ObjectChannel objectChannel = uploadChannelService.getObjectChannelByChannelId(channelId, loginUser);
-        return objectChannel != null ? objectChannel.getScope() : -1;
-    }
 }

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

@@ -2,9 +2,7 @@ package cn.reghao.oss.console.app.service;
 
 import cn.reghao.jutil.jdk.converter.ByteConverter;
 import cn.reghao.jutil.jdk.converter.ByteType;
-import cn.reghao.oss.console.app.model.dto.ChannelProcessDto;
 import cn.reghao.oss.api.dto.ObjectChannel;
-import cn.reghao.oss.console.account.service.UserContext;
 import cn.reghao.oss.console.app.db.repository.UploadChannelRepository;
 import cn.reghao.oss.console.app.model.dto.ChannelScopeDto;
 import cn.reghao.oss.console.app.model.po.StoreNode;
@@ -44,21 +42,24 @@ public class UploadChannelService {
         }
     }
 
-    public List<UploadChannelVo> getUploadChannels() {
-        int loginUser = UserContext.getUserId();
-        List<UploadChannel> page = uploadChannelRepository.findByCreateBy(loginUser);
+    public List<UploadChannelVo> getUploadChannels(int createBy) {
+        List<UploadChannel> page = uploadChannelRepository.findByCreateBy(createBy);
         List<UploadChannelVo> list = page.stream().map(uploadChannel -> {
             long maxSize = uploadChannel.getMaxSize();
             String maxSizeStr = byteConverter.convert(ByteType.Bytes, maxSize);
-            UserNode userNode = userNodeService.getUserNode(uploadChannel.getNodeId(), loginUser);
+            int nodeId = uploadChannel.getNodeId();
+            UserNode userNode = userNodeService.getUserNode(nodeId, createBy);
             String bindDomain = userNode.getDomain();
             return new UploadChannelVo(uploadChannel, maxSizeStr, bindDomain);
         }).collect(Collectors.toList());
 
-        //return new PageImpl<>(list, pageRequest, 1000);
         return list;
     }
 
+    public List<UploadChannel> getUploadChannelsByCreateBy(int createBy) {
+        return uploadChannelRepository.findByCreateBy(createBy);
+    }
+
     public UploadChannel getUploadChannel(int id) {
         return uploadChannelRepository.findById(id);
     }
@@ -72,7 +73,7 @@ public class UploadChannelService {
         return getObjectChannel(uploadChannel);
     }
 
-    public ObjectChannel getObjectChannel(UploadChannel uploadChannel) {
+    private ObjectChannel getObjectChannel(UploadChannel uploadChannel) {
         int channelId = uploadChannel.getChannelId();
         //String name = uploadChannel.getName();
         String channelPrefix = uploadChannel.getPrefix();
@@ -108,10 +109,6 @@ public class UploadChannelService {
         return storeNode;
     }
 
-    public List<UploadChannel> getByCreateBy(int createBy) {
-        return uploadChannelRepository.findByCreateBy(createBy);
-    }
-
     public List<UploadChannel> getByDomainAndCreateBy(String domain, int createBy) {
         StoreNode storeNode = userNodeService.getByDomain(domain);
         int nodeId = storeNode.getId();

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

@@ -9,7 +9,6 @@ import cn.reghao.oss.console.app.model.dto.UserNodeDto;
 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;
-import cn.reghao.oss.console.app.model.vo.KeyValue;
 import cn.reghao.oss.console.app.model.vo.UserNodeVO;
 import org.springframework.stereotype.Service;
 
@@ -36,7 +35,7 @@ public class UserNodeService {
 
     public Result add(UserNodeDto userNodeDto) {
         int nodeId = userNodeDto.getNodeId();
-        Integer userId = UserContext.getUserId();
+        int userId = UserContext.getUserId();
         UserNode userNode = userNodeRepository.findByCreateByAndNodeId(userId, nodeId);
         if (userNode != null) {
             return Result.fail("UserNode exist");