feat: update

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/TreeUtils.java

@@ -2,11 +2,33 @@ package com.schisandra.auth.common.utils;
 
 import java.lang.reflect.Field;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import java.util.function.Function;
+
+/**
+ * @ClassName: Tree
+ * @Author: landaiqing
+ * @Description:
+ * @CreateTime: 2024/01/05 15:32
+ */
+
 public class TreeUtils {
+
+    /**
+     * @param nodesList         数据
+     * @param pid               父ID
+     * @param idFieldName       ID字段名称
+     * @param parentIdFieldName 父ID字段名称
+     * @param childrenFieldName 子集字段名称
+     * @param function          操作子集函数 通常可以做排序 如：stream -> stream.sorted(Comparator.comparing(TreeNode::getId, Comparator.reverseOrder())) 根据ID倒序
+     *                          如果不想排序直接 stream -> stream
+     * @param <T>
+     * @param <R>
+     * @return
+     */
     public static <T, R> List<T> buildTree(List<T> nodesList, R pid, String idFieldName, String parentIdFieldName, String childrenFieldName, Function<Stream<T>, Stream<T>> function) {
+
         Map<Object, List<T>> map = nodesList.stream().collect(Collectors.groupingBy(a -> {
             try {
                 Field field = a.getClass().getDeclaredField(parentIdFieldName);
@@ -18,6 +40,7 @@ public class TreeUtils {
         }));
 
         List<T> roots = new ArrayList<>();
+
         // 逐层构建树结构
         roots.addAll(function.apply(Optional.ofNullable(map.get(pid)).orElse(new ArrayList<>()).stream()).collect(Collectors.toList()));
         Queue<T> queue = new LinkedList<>(roots);
@@ -41,6 +64,7 @@ public class TreeUtils {
                 throw new RuntimeException("Error reading id field: " + e.getMessage());
             }
         }
+
         return roots;
     }
 

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java

@@ -87,45 +87,48 @@ public class SchisandraAuthPermissionDomainServiceImpl implements SchisandraAuth
         SchisandraAuthPermission schisandraAuthPermission = SchisandraAuthPermissionBOConverter.INSTANCE.convertBOToEntity(schisandraAuthPermissionBO);
         return schisandraAuthPermissionService.update(schisandraAuthPermission);
     }
-/** 
+
- * @description:  删除
+    /**
- * @param: [schisandraAuthPermissionBO] 
+     * @description: 删除
- * @return: java.lang.Object 
+     * @param: [schisandraAuthPermissionBO]
- * @author zhang
+     * @return: java.lang.Object
- * @date: 2024/4/17 17:06
+     * @author zhang
- */ 
+     * @date: 2024/4/17 17:06
+     */
     @Override
     public Object delete(SchisandraAuthPermissionBO schisandraAuthPermissionBO) {
         SchisandraAuthPermission schisandraAuthPermission = SchisandraAuthPermissionBOConverter.INSTANCE.convertBOToEntity(schisandraAuthPermissionBO);
-        boolean schisandraAuthPermission1 =schisandraAuthPermissionService.deleteById(schisandraAuthPermission.getId());
+        boolean schisandraAuthPermission1 = schisandraAuthPermissionService.deleteById(schisandraAuthPermission.getId());
         return schisandraAuthPermission1;
     }
-/** 
+
- * @description: 插入
+    /**
- * @param: [schisandraAuthPermissionBO] 
+     * @description: 插入
- * @return: java.lang.Object 
+     * @param: [schisandraAuthPermissionBO]
- * @author zhang
+     * @return: java.lang.Object
- * @date: 2024/4/17 17:06
+     * @author zhang
- */ 
+     * @date: 2024/4/17 17:06
+     */
     @Override
     public Object insert(SchisandraAuthPermissionBO schisandraAuthPermissionBO) {
         SchisandraAuthPermission schisandraAuthPermission = SchisandraAuthPermissionBOConverter.INSTANCE.convertBOToEntity(schisandraAuthPermissionBO);
-        SchisandraAuthPermission schisandraAuthPermission1 =schisandraAuthPermissionService.insert(schisandraAuthPermission);
+        SchisandraAuthPermission schisandraAuthPermission1 = schisandraAuthPermissionService.insert(schisandraAuthPermission);
         return schisandraAuthPermission1;
     }
-/** 
+
- * @description: 查询 
+    /**
- * @param: [schisandraAuthPermissionBO] 
+     * @description: 查询
- * @return: java.lang.Object 
+     * @param: [schisandraAuthPermissionBO]
- * @author zhang
+     * @return: java.lang.Object
- * @date: 2024/4/17 17:07
+     * @author zhang
- */ 
+     * @date: 2024/4/17 17:07
+     */
     @Override
     public SchisandraAuthPermissionBO select(SchisandraAuthPermissionBO schisandraAuthPermissionBO) {
 
         SchisandraAuthPermission schisandraAuthPermission = SchisandraAuthPermissionBOConverter.INSTANCE.convertBOToEntity(schisandraAuthPermissionBO);
 
-        SchisandraAuthPermission schisandraAuthPermission1 =schisandraAuthPermissionService.queryById(schisandraAuthPermission.getId());
+        SchisandraAuthPermission schisandraAuthPermission1 = schisandraAuthPermissionService.queryById(schisandraAuthPermission.getId());
         SchisandraAuthPermissionBO schisandraAuthPermissionBO1 = SchisandraAuthPermissionBOConverter.INSTANCE.convertEntityToBO(schisandraAuthPermission1);
         return schisandraAuthPermissionBO1;
     }

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSocialUserServiceImpl.java

@@ -102,7 +102,7 @@ public class SchisandraSocialUserServiceImpl implements SchisandraSocialUserServ
     }
 
     /**
-     * @description: 根据appId和openId查询用户
+     * @description: 根据openId查询用户
      * @param: [appId, openId]
      * @return: com.schisandra.auth.infra.basic.entity.SchisandraSocialUser
      * @author: landaiqing

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java

@@ -29,7 +29,6 @@ import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * controller
@@ -82,12 +81,12 @@ public class SchisandraOssMinioController {
      * @date: 2024/6/26 13:55
      */
     @GetMapping("listMinioDir")
-    public Result<String> listMinioInfo(@RequestParam String target, @RequestParam String userId, @RequestParam String dirName,@RequestParam String bucket) throws Exception {
+    public Result<String> listMinioInfo( @RequestParam String userId, @RequestParam String dirName,@RequestParam String bucket) throws Exception {
-        Preconditions.checkNotNull(target, "不能为空");
+        Preconditions.checkNotNull(bucket, "不能为空");
         Preconditions.checkNotNull(userId, "不能为空");
         MinioOssClient bean = SpringUtil.getBean(userId);
         bean.getMinioOssConfig().setBucketName(bucket);
-        return Result.ok(bean.listDir(target, dirName));
+        return Result.ok(bean.listDir(bucket, dirName));
     }
 
     /**