From 8ef408037d299790ef39df74a9eecdf1005c9a68 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Tue, 23 Jul 2024 23:53:25 +0800 Subject: [PATCH] feat: update --- .../controller/SchisandraOssMinioController.java | 9 ++++++--- .../impl/SchisandraShareCommentReplyServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/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 b/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 index ef9c50d..3684eee 100644 --- a/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 +++ b/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 @@ -38,6 +38,8 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import static com.schisandra.oss.infra.basic.entity.table.SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP; + /** * controller * @@ -165,17 +167,18 @@ public class SchisandraOssMinioController { @GetMapping("listDir") public Result listMinioInfo(@RequestParam String userId, @RequestParam String dirName, @RequestParam String bucket) throws Exception { Preconditions.checkNotNull(userId, "不能为空"); + String path=dirName; if ((dirName==null)||(dirName.equals(""))){ - dirName = "/"; + path = "/"; } MinioOssClient bean = SpringUtil.getBean(OssConstant.OssType.MINIO + userId); bean.getMinioOssConfig().setBucketName(bucket); - List object = (List) caffeineUtil.caffeineBuild().getIfPresent("MinioListDir" + userId + bucket + dirName); + List object = (List) caffeineUtil.caffeineBuild().getIfPresent("MinioListDir" + userId + bucket + path); if (object != null) { return Result.ok(object); } else { List list = bean.listDir(bucket, dirName); - caffeineUtil.caffeineBuild().put("MinioListDir" + userId + bucket + dirName, list); + caffeineUtil.caffeineBuild().put("MinioListDir" + userId + bucket + path, list); return Result.ok(list); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareCommentReplyServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareCommentReplyServiceImpl.java index 1ccc411..6f1ff50 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareCommentReplyServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareCommentReplyServiceImpl.java @@ -121,7 +121,7 @@ public class SchisandraShareCommentReplyServiceImpl implements SchisandraShareCo .from(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY) .where(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY.DETAIL_ID.eq(detailId)) .where(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY.REPLY_TYPE.eq(0)) - .orderBy(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY.REPLY_COUNT.add(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY.LIKES) ,false); + .orderBy(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY.LIKES ,false); return this.schisandraShareCommentReplyDao.selectListByQuery(wrapper); }