feat: update

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

@@ -3,22 +3,15 @@ package com.schisandra.oss.application.controller;
 import cn.hutool.core.util.ZipUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
 import com.google.common.base.Preconditions;
-import com.google.gson.Gson;
-import com.mybatisflex.annotation.RelationOneToMany;
 import com.schisandra.oss.application.convert.SchisandraOssMinioDTOConverter;
-import com.schisandra.oss.application.convert.SchisandraOssQiniuDTOConverter;
 import com.schisandra.oss.application.dto.SchisandraOssMinioDTO;
-import com.schisandra.oss.application.dto.SchisandraOssQiniuDTO;
 import com.schisandra.oss.application.oss.constant.OssConstant;
 import com.schisandra.oss.application.oss.core.minio.MinioOssClient;
 import com.schisandra.oss.application.oss.core.minio.MinioOssConfiguration;
 import com.schisandra.oss.application.oss.model.OssInfo;
 import com.schisandra.oss.common.entity.Result;
 import com.schisandra.oss.common.utils.CaffeineUtil;
-import com.schisandra.oss.domain.bo.SchisandraOssAliBO;
 import com.schisandra.oss.domain.bo.SchisandraOssMinioBO;
 import com.schisandra.oss.domain.redis.RedisUtil;
 import com.schisandra.oss.domain.service.SchisandraOssMinioDomainService;
@@ -42,7 +35,6 @@ import java.net.URLEncoder;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -88,9 +80,9 @@ public class SchisandraOssMinioController {
     }
 
 
-
     /**
      * 返回当前用户minio表所有数据
+     *
      * @param userId
      * @return
      */
@@ -263,9 +255,8 @@ public class SchisandraOssMinioController {
      * @date: 2024/6/26 14:34
      */
     @PostMapping(value = "uploadFile", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public Result<Object> uploadMinioFile(SchisandraOssMinioDTO schisandraOssMinioDTO) throws IOException {
+    public Result<Object> uploadMinioFile(@RequestPart("file") MultipartFile file,SchisandraOssMinioDTO schisandraOssMinioDTO) throws IOException {
         String path = schisandraOssMinioDTO.getPath();
-        MultipartFile file=schisandraOssMinioDTO.getMultipartFile();
         String bucket = schisandraOssMinioDTO.getBucketName();
         String userId = schisandraOssMinioDTO.getUserId();
         Preconditions.checkNotNull(path, "path不能为空");
@@ -417,6 +408,7 @@ public class SchisandraOssMinioController {
         MinioOssClient bean = SpringUtil.getBean(OssConstant.OssType.MINIO + userId);
         return Result.ok(bean.selectAllBucket());
     }
+
     @Cacheable(value = "minioBucket", key = "#userId+#bucket", unless = "#result==null")
     @PostMapping("getBucketSize")
     public Result<String> getBucketSize(@RequestParam String userId, @RequestParam String bucket) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {

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

@@ -16,7 +16,6 @@ import java.util.Date;
 @Data
 public class SchisandraOssMinioDTO implements Serializable {
 
-    private MultipartFile multipartFile;
     private String path;
 
     /**

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/minio/MinioOssConfiguration.java

@@ -40,16 +40,6 @@ public class MinioOssConfiguration {
     @Resource
     private SchisandraOssMinioDomainService schisandraOssMinioDomainService;
 
-    public List<SchisandraOssMinioDTO> selectAll(){
-        List<SchisandraOssMinioBO> schisandraOssMinioBO_list = schisandraOssMinioDomainService.selectAll();
-        List<SchisandraOssMinioDTO> schisandraOssAliDTO_list = new ArrayList<>();
-        for (SchisandraOssMinioBO schisandraOssMinioBO : schisandraOssMinioBO_list ){
-            SchisandraOssMinioDTO schisandraOssMinioDTO = SchisandraOssMinioDTOConverter.INSTANCE.convertBOToDTO(schisandraOssMinioBO);
-            schisandraOssAliDTO_list.add(schisandraOssMinioDTO);
-        }
-        return schisandraOssAliDTO_list;
-    }
-
     public Result minioOssClient(String userId) {
         try {
             SchisandraOssMinioDTO minio = minioOssConfiguration.getSchisandraOssMinioDTO(userId);

schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCircleController.java

@@ -51,7 +51,7 @@ public class SchisandraShareCircleController {
     /**
      * 分享圈列表返回
      */
-    @Cacheable(value = "sharelist",key = "sharelist")
+    @Cacheable(value = "sharelist",key = "'sharelist'")
     @GetMapping("sharelist")
     public Result<List<SchisandraShareCircleDTO>> getShareList() {
         try {

schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailController.java

@@ -56,7 +56,6 @@ public class SchisandraShareDetailController {
      /**
       * 查询分享详细信息
       */
-
     @PostMapping("get_detail")
     public Result selectDetail(@RequestParam("Id") String Id){
         try{

schisandra-cloud-storage-share/schisandra-cloud-storage-share-common/src/main/java/com/schisandra/share/common/entity/Result.java

@@ -4,13 +4,15 @@ package com.schisandra.share.common.entity;
 import com.schisandra.share.common.enums.ResultCodeEnum;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @description: 返回结果泛型类
  * @author: schisandra
  * @date: 2024/3/22 13:09
  */
 @Data
-public class Result<T> {
+public class Result<T> implements Serializable {
 
     private Boolean success;
 

schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareDetailDomainServiceImpl.java

@@ -81,6 +81,7 @@ public class SchisandraShareDetailDomainServiceImpl implements SchisandraShareDe
             schisandraShareDetailBO.setViews(shareDetailBO.getViews());
             schisandraShareDetailBO.setAvatar(userInfo.getAvatar());
             schisandraShareDetailBO.setNickname(userInfo.getNickName());
+            schisandraShareDetailBO.setCommentCount(shareDetailBO.getCommentCount());
 
             List<SchisandraShareDetailTag> schisandraShareDetailTags = schisandraShareDetailTagService.queryTagIdsByDetailId(shareDetailBO.getId());
             List<SchisandraShareDetailTagBO> shareDetailTagBOList = SchisandraShareDetailTagBOConverter.INSTANCE.convertEntityToBOList(schisandraShareDetailTags);