update oss-console

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

@@ -3,12 +3,8 @@ 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.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
@@ -48,22 +44,18 @@ public class StoreNodePageController {
             map.put("appName", appName);
             //List<AppConfig> list = appConfigQuery.query(map);
             List<String> list = Collections.emptyList();
-            Page<String> page = new PageImpl<>(list);
-
             model.addAttribute("env", env);
             model.addAttribute("type", type);
-            model.addAttribute("page", page);
-            model.addAttribute("list", page.getContent());
+            //model.addAttribute("page", page);
+            model.addAttribute("list", list);
             return "/node/index";
         }
 
-        PageRequest pageRequest = PageSort.pageRequest();
-        Page<StoreNode> page = storeNodeService.getByPage(pageRequest);
-
+        List<StoreNode> list = storeNodeService.getByPage();
         model.addAttribute("env", env);
         model.addAttribute("type", type);
-        model.addAttribute("page", page);
-        model.addAttribute("list", page.getContent());
+        //model.addAttribute("page", page);
+        model.addAttribute("list", list);
         return "/node/index";
     }
 

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

@@ -1,15 +1,11 @@
 package cn.reghao.oss.console.app.controller.page;
 
 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.db.PageSort;
 import cn.reghao.oss.api.dto.ServerInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
@@ -42,13 +38,13 @@ public class StoreObjectPageController {
             type = "test";
         }
 
-        PageRequest pageRequest = PageSort.pageRequest();
-        Page<DiskFile> page = Page.empty();
+        /*PageRequest pageRequest = PageSort.pageRequest();
+        Page<DiskFile> page = Page.empty();*/
 
         model.addAttribute("env", env);
         model.addAttribute("type", type);
-        model.addAttribute("page", page);
-        model.addAttribute("list", page.getContent());
+        /*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

@@ -8,11 +8,9 @@ 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.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.*;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
@@ -50,18 +48,18 @@ public class UploadChannelPageController {
             type = "test";
         }
 
-        PageRequest pageRequest = PageSort.pageRequest();
+        /*PageRequest pageRequest = PageSort.pageRequest();
         int pageNumber = pageRequest.getPageNumber();
-        int pageSize = pageRequest.getPageSize();
+        int pageSize = pageRequest.getPageSize();*/
 
-        Sort sort = Sort.by(Sort.Direction.ASC, "channelId");
-        PageRequest pageRequest1 = PageRequest.of(pageNumber, pageSize, sort);
-        Page<UploadChannelVo> page = uploadChannelService.getUploadChannels(pageRequest1);
+        /*Sort sort = Sort.by(Sort.Direction.ASC, "channelId");
+        PageRequest pageRequest1 = PageRequest.of(pageNumber, pageSize, sort);*/
+        List<UploadChannelVo> list = uploadChannelService.getUploadChannels();
 
         model.addAttribute("env", env);
         model.addAttribute("type", type);
-        model.addAttribute("page", page);
-        model.addAttribute("list", page.getContent());
+        //model.addAttribute("page", page);
+        model.addAttribute("list", list);
         return "/channel/index";
     }
 

oss-console/src/main/java/cn/reghao/oss/console/app/db/mapper/StoreNodeMapper.java → oss-console/src/main/java/cn/reghao/oss/console/app/db/mapper/StoreNodeRepository.java

@@ -7,5 +7,6 @@ import cn.reghao.oss.console.app.model.po.StoreNode;
  * @author reghao
  * @date 2024-07-02 18:15:11
  */
-public interface StoreNodeMapper extends BaseMapper<StoreNode> {
+public interface StoreNodeRepository extends BaseMapper<StoreNode> {
+    StoreNode findByNodeAddr(String nodeAddr);
 }

oss-console/src/main/java/cn/reghao/oss/console/app/db/mapper/UploadChannelMapper.java

@@ -1,11 +0,0 @@
-package cn.reghao.oss.console.app.db.mapper;
-
-import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.oss.console.app.model.po.UploadChannel;
-
-/**
- * @author reghao
- * @date 2024-07-02 18:15:27
- */
-public interface UploadChannelMapper extends BaseMapper<UploadChannel> {
-}

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

@@ -0,0 +1,19 @@
+package cn.reghao.oss.console.app.db.mapper;
+
+import cn.reghao.jutil.jdk.db.BaseMapper;
+import cn.reghao.oss.console.app.model.po.UploadChannel;
+
+import java.util.List;
+
+/**
+ * @author reghao
+ * @date 2024-07-02 18:15:27
+ */
+public interface UploadChannelRepository extends BaseMapper<UploadChannel> {
+    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);
+    UploadChannel findByPrefixAndNodeId(String prefix, int nodeId);
+    List<UploadChannel> findByCreateBy(int createBy);
+}

oss-console/src/main/java/cn/reghao/oss/console/app/db/mapper/UserKeyMapper.java → oss-console/src/main/java/cn/reghao/oss/console/app/db/mapper/UserKeyRepository.java

@@ -7,5 +7,7 @@ import cn.reghao.oss.console.app.model.po.UserKey;
  * @author reghao
  * @date 2024-07-02 18:15:35
  */
-public interface UserKeyMapper extends BaseMapper<UserKey> {
+public interface UserKeyRepository extends BaseMapper<UserKey> {
+    UserKey findByCreateBy(int createBy);
+    UserKey findByAccessKeyId(String accessKeyId);
 }

oss-console/src/main/java/cn/reghao/oss/console/app/db/mapper/UserNodeMapper.java

@@ -1,11 +0,0 @@
-package cn.reghao.oss.console.app.db.mapper;
-
-import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.oss.console.app.model.po.UserNode;
-
-/**
- * @author reghao
- * @date 2024-07-02 18:15:42
- */
-public interface UserNodeMapper extends BaseMapper<UserNode> {
-}

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

@@ -0,0 +1,14 @@
+package cn.reghao.oss.console.app.db.mapper;
+
+import cn.reghao.jutil.jdk.db.BaseMapper;
+import cn.reghao.oss.console.app.model.po.UserNode;
+
+/**
+ * @author reghao
+ * @date 2024-07-02 18:15:42
+ */
+public interface UserNodeRepository extends BaseMapper<UserNode> {
+    int countByNodeId(int nodeId);
+    UserNode findByNodeIdAndUserId(int nodeId, int userId);
+    UserNode findByDomain(String domain);
+}

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

@@ -1,8 +1,6 @@
 package cn.reghao.oss.console.app.db.repository;
 
 import cn.reghao.oss.console.app.model.po.UploadChannel;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
@@ -17,5 +15,5 @@ public interface UploadChannelRepository extends JpaRepository<UploadChannel, In
     UploadChannel findByChannelIdAndCreateBy(int channelId, int createBy);
     UploadChannel findByPrefixAndCreateByAndNodeId(String prefix, int createBy, int nodeId);
     UploadChannel findByPrefixAndNodeId(String prefix, int nodeId);
-    Page<UploadChannel> findByCreateBy(int createBy, Pageable pageable);
+    List<UploadChannel> findByCreateBy(int createBy);
 }

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

@@ -1,11 +1,10 @@
 package cn.reghao.oss.console.app.db.repository;
 
 import cn.reghao.oss.console.app.model.po.UserNode;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 /**
  * @author reghao
  * @date 2024-02-27 09:49:12
@@ -14,5 +13,5 @@ public interface UserNodeRepository extends JpaRepository<UserNode, Integer> {
     int countByNodeId(int nodeId);
     UserNode findByNodeIdAndUserId(int nodeId, int userId);
     UserNode findByDomain(String domain);
-    Page<UserNode> findByUserId(int userId, Pageable pageable);
+    List<UserNode> findByUserId(int userId);
 }

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

@@ -17,8 +17,6 @@ import cn.reghao.oss.api.dto.StoreDiskDto;
 import cn.reghao.oss.api.dto.StoreInfo;
 import cn.reghao.oss.api.dto.StoreNodeDto;
 import cn.reghao.oss.console.store.rpc.StoreRpcService;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -93,8 +91,8 @@ public class StoreNodeService {
         return Result.success();
     }
 
-    public Page<StoreNode> getByPage(PageRequest pageRequest) {
-        return storeNodeRepository.findAll(pageRequest);
+    public List<StoreNode> getByPage() {
+        return storeNodeRepository.findAll();
     }
 
     public List<StoreNode> getByIds(List<Integer> list) {

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

@@ -14,9 +14,6 @@ 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.UploadChannelVo;
 import cn.reghao.oss.console.store.rpc.StoreRpcService;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -114,9 +111,9 @@ public class UploadChannelService {
         }
     }
 
-    public Page<UploadChannelVo> getUploadChannels(PageRequest pageRequest) {
+    public List<UploadChannelVo> getUploadChannels() {
         int loginUser = UserContext.getUser().getId();
-        Page<UploadChannel> page = uploadChannelRepository.findByCreateBy(loginUser, pageRequest);
+        List<UploadChannel> page = uploadChannelRepository.findByCreateBy(loginUser);
         List<UploadChannelVo> list = page.stream().map(uploadChannel -> {
             long maxSize = uploadChannel.getMaxSize();
             String maxSizeStr = byteConverter.convert(ByteType.Bytes, maxSize);
@@ -125,7 +122,8 @@ public class UploadChannelService {
             return new UploadChannelVo(uploadChannel, maxSizeStr, bindDomain);
         }).collect(Collectors.toList());
 
-        return new PageImpl<>(list, pageRequest, page.getTotalElements());
+        //return new PageImpl<>(list, pageRequest, 1000);
+        return list;
     }
 
     public UploadChannel getUploadChannel(int id) {

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

@@ -9,7 +9,6 @@ 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.UserNodeVO;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;
@@ -70,14 +69,12 @@ public class UserNodeService {
     }
 
     public List<UserNode> getByUserId(int userId) {
-        PageRequest pageRequest = PageRequest.of(0, 100);
-        return userNodeRepository.findByUserId(userId, pageRequest).getContent();
+        return userNodeRepository.findByUserId(userId);
     }
 
     public List<StoreNode> getUserStoreNodes() {
         int loginUser = UserContext.getUser().getId();
-        PageRequest pageRequest = PageRequest.of(0, 100);
-        List<UserNode> list = userNodeRepository.findByUserId(loginUser, pageRequest).getContent();
+        List<UserNode> list = userNodeRepository.findByUserId(loginUser);
         if (list.isEmpty()) {
             return Collections.emptyList();
         }
@@ -88,8 +85,7 @@ public class UserNodeService {
 
     public List<UserNodeVO> getUserStoreNodes1() {
         int loginUser = UserContext.getUser().getId();
-        PageRequest pageRequest = PageRequest.of(0, 100);
-        List<UserNode> list = userNodeRepository.findByUserId(loginUser, pageRequest).getContent();
+        List<UserNode> list = userNodeRepository.findByUserId(loginUser);
         if (list.isEmpty()) {
             return Collections.emptyList();
         }

oss-console/src/main/resources/templates/channel/index.html

@@ -69,7 +69,7 @@
                 </tbody>
             </table>
         </div>
-        <div th:replace="/common/fragment :: page"></div>
+        <!--<div th:replace="/common/fragment :: page"></div>-->
     </div>
 </div>
 

oss-console/src/main/resources/templates/node/index.html

@@ -54,7 +54,7 @@
                 </tbody>
             </table>
         </div>
-        <div th:replace="/common/fragment :: page"></div>
+        <!--<div th:replace="/common/fragment :: page"></div>-->
     </div>
 </div>
 

oss-console/src/main/resources/templates/object/index.html

@@ -78,7 +78,7 @@
                 </tbody>
             </table>
         </div>
-        <div th:replace="/common/fragment :: page"></div>
+        <!--<div th:replace="/common/fragment :: page"></div>-->
     </div>
 </div>