From 5f15e1f5aadea6e294ff1fbddf069504cf9b2c36 Mon Sep 17 00:00:00 2001 From: zhongzb <972627721@qq.com> Date: Wed, 4 Oct 2023 21:49:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:oss=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallchat-chat-server/pom.xml | 4 ++++ .../common/user/controller/OssController.java | 2 +- .../common/user/service/OssService.java | 2 +- .../user/service/impl/OssServiceImpl.java | 6 ++--- .../src/main/resources/application.yml | 2 +- .../mallchat-common-starter/pom.xml | 4 ---- mallchat-tools/mallchat-oss-starter/pom.xml | 24 +++++++++++++++++++ .../mallchat/oss}/MinIOConfiguration.java | 4 +--- .../com/abin/mallchat}/oss/MinIOTemplate.java | 6 ++--- .../java/com/abin/mallchat}/oss/OssFile.java | 2 +- .../com/abin/mallchat}/oss/OssProperties.java | 2 +- .../java/com/abin/mallchat}/oss/OssType.java | 2 +- .../com/abin/mallchat}/oss/domain/OssReq.java | 2 +- .../abin/mallchat}/oss/domain/OssResp.java | 2 +- .../main/resources/META-INF/spring.factories | 3 +++ .../service/SecureInvokeService.java | 2 +- mallchat-tools/pom.xml | 1 + pom.xml | 5 ++++ 18 files changed, 53 insertions(+), 22 deletions(-) create mode 100644 mallchat-tools/mallchat-oss-starter/pom.xml rename {mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config => mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss}/MinIOConfiguration.java (87%) rename {mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils => mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat}/oss/MinIOTemplate.java (96%) rename {mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils => mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat}/oss/OssFile.java (82%) rename {mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils => mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat}/oss/OssProperties.java (91%) rename {mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils => mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat}/oss/OssType.java (90%) rename {mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils => mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat}/oss/domain/OssReq.java (92%) rename {mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils => mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat}/oss/domain/OssResp.java (90%) create mode 100644 mallchat-tools/mallchat-oss-starter/src/main/resources/META-INF/spring.factories diff --git a/mallchat-chat-server/pom.xml b/mallchat-chat-server/pom.xml index b62edd9..aa4620d 100644 --- a/mallchat-chat-server/pom.xml +++ b/mallchat-chat-server/pom.xml @@ -20,6 +20,10 @@ com.abin.mallchat mallchat-transaction + + com.abin.mallchat + mallchat-oss-starter + com.knuddels jtokkit diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/OssController.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/OssController.java index 813e9c5..0da3ca0 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/OssController.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/OssController.java @@ -2,9 +2,9 @@ package com.abin.mallchat.common.user.controller; import com.abin.mallchat.common.common.domain.vo.response.ApiResult; import com.abin.mallchat.common.common.utils.RequestHolder; -import com.abin.mallchat.common.common.utils.oss.domain.OssResp; import com.abin.mallchat.common.user.domain.vo.request.oss.UploadUrlReq; import com.abin.mallchat.common.user.service.OssService; +import com.abin.mallchat.oss.domain.OssResp; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/OssService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/OssService.java index 63c2cca..de17432 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/OssService.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/OssService.java @@ -1,7 +1,7 @@ package com.abin.mallchat.common.user.service; -import com.abin.mallchat.common.common.utils.oss.domain.OssResp; import com.abin.mallchat.common.user.domain.vo.request.oss.UploadUrlReq; +import com.abin.mallchat.oss.domain.OssResp; /** *

diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/OssServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/OssServiceImpl.java index 10dc2e2..db3e054 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/OssServiceImpl.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/OssServiceImpl.java @@ -1,12 +1,12 @@ package com.abin.mallchat.common.user.service.impl; import com.abin.mallchat.common.common.utils.AssertUtil; -import com.abin.mallchat.common.common.utils.oss.MinIOTemplate; -import com.abin.mallchat.common.common.utils.oss.domain.OssReq; -import com.abin.mallchat.common.common.utils.oss.domain.OssResp; import com.abin.mallchat.common.user.domain.enums.OssSceneEnum; import com.abin.mallchat.common.user.domain.vo.request.oss.UploadUrlReq; import com.abin.mallchat.common.user.service.OssService; +import com.abin.mallchat.oss.MinIOTemplate; +import com.abin.mallchat.oss.domain.OssReq; +import com.abin.mallchat.oss.domain.OssResp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mallchat-chat-server/src/main/resources/application.yml b/mallchat-chat-server/src/main/resources/application.yml index 88a3e29..ee78bd5 100644 --- a/mallchat-chat-server/src/main/resources/application.yml +++ b/mallchat-chat-server/src/main/resources/application.yml @@ -11,7 +11,7 @@ mybatis-plus: spring: profiles: #运行的环境 - active: my-test + active: my-prod application: name: mallchat datasource: diff --git a/mallchat-tools/mallchat-common-starter/pom.xml b/mallchat-tools/mallchat-common-starter/pom.xml index b57ccbb..4681d7c 100644 --- a/mallchat-tools/mallchat-common-starter/pom.xml +++ b/mallchat-tools/mallchat-common-starter/pom.xml @@ -104,10 +104,6 @@ org.redisson redisson-spring-boot-starter - - io.minio - minio - junit diff --git a/mallchat-tools/mallchat-oss-starter/pom.xml b/mallchat-tools/mallchat-oss-starter/pom.xml new file mode 100644 index 0000000..b44a662 --- /dev/null +++ b/mallchat-tools/mallchat-oss-starter/pom.xml @@ -0,0 +1,24 @@ + + + + mallchat-tools + com.abin.mallchat + 1.0-SNAPSHOT + + 4.0.0 + + mallchat-oss-starter + + + + com.abin.mallchat + mallchat-common-starter + + + io.minio + minio + + + \ No newline at end of file diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/MinIOConfiguration.java b/mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/MinIOConfiguration.java similarity index 87% rename from mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/MinIOConfiguration.java rename to mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/MinIOConfiguration.java index 00bb615..2508799 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/MinIOConfiguration.java +++ b/mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/MinIOConfiguration.java @@ -1,7 +1,5 @@ -package com.abin.mallchat.common.common.config; +package com.abin.mallchat.oss; -import com.abin.mallchat.common.common.utils.oss.MinIOTemplate; -import com.abin.mallchat.common.common.utils.oss.OssProperties; import io.minio.MinioClient; import lombok.SneakyThrows; import org.springframework.boot.autoconfigure.condition.*; diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/MinIOTemplate.java b/mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/MinIOTemplate.java similarity index 96% rename from mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/MinIOTemplate.java rename to mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/MinIOTemplate.java index 99e6e6a..370cfa9 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/MinIOTemplate.java +++ b/mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/MinIOTemplate.java @@ -1,11 +1,11 @@ -package com.abin.mallchat.common.common.utils.oss; +package com.abin.mallchat.oss; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.file.FileNameUtil; import cn.hutool.core.util.StrUtil; -import com.abin.mallchat.common.common.utils.oss.domain.OssReq; -import com.abin.mallchat.common.common.utils.oss.domain.OssResp; +import com.abin.mallchat.oss.domain.OssReq; +import com.abin.mallchat.oss.domain.OssResp; import io.minio.*; import io.minio.http.Method; import io.minio.messages.Bucket; diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/OssFile.java b/mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/OssFile.java similarity index 82% rename from mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/OssFile.java rename to mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/OssFile.java index 469de40..08acf45 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/OssFile.java +++ b/mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/OssFile.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.common.common.utils.oss; +package com.abin.mallchat.oss; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/OssProperties.java b/mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/OssProperties.java similarity index 91% rename from mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/OssProperties.java rename to mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/OssProperties.java index 50d521e..d10c297 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/OssProperties.java +++ b/mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/OssProperties.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.common.common.utils.oss; +package com.abin.mallchat.oss; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/OssType.java b/mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/OssType.java similarity index 90% rename from mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/OssType.java rename to mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/OssType.java index f424fcb..373a050 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/OssType.java +++ b/mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/OssType.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.common.common.utils.oss; +package com.abin.mallchat.oss; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssReq.java b/mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/domain/OssReq.java similarity index 92% rename from mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssReq.java rename to mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/domain/OssReq.java index 8c9f49b..d74cd73 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssReq.java +++ b/mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/domain/OssReq.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.common.common.utils.oss.domain; +package com.abin.mallchat.oss.domain; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssResp.java b/mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/domain/OssResp.java similarity index 90% rename from mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssResp.java rename to mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/domain/OssResp.java index 41c4f58..9932250 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssResp.java +++ b/mallchat-tools/mallchat-oss-starter/src/main/java/com/abin/mallchat/oss/domain/OssResp.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.common.common.utils.oss.domain; +package com.abin.mallchat.oss.domain; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-tools/mallchat-oss-starter/src/main/resources/META-INF/spring.factories b/mallchat-tools/mallchat-oss-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..79909f9 --- /dev/null +++ b/mallchat-tools/mallchat-oss-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +# Auto Configure +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.abin.mallchat.oss.MinIOConfiguration diff --git a/mallchat-tools/mallchat-transaction/src/main/java/com/abin/mallchat/transaction/service/SecureInvokeService.java b/mallchat-tools/mallchat-transaction/src/main/java/com/abin/mallchat/transaction/service/SecureInvokeService.java index b28530e..5ffee94 100644 --- a/mallchat-tools/mallchat-transaction/src/main/java/com/abin/mallchat/transaction/service/SecureInvokeService.java +++ b/mallchat-tools/mallchat-transaction/src/main/java/com/abin/mallchat/transaction/service/SecureInvokeService.java @@ -11,11 +11,11 @@ import com.fasterxml.jackson.databind.JsonNode; import lombok.AllArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; +import javax.validation.constraints.NotNull; import java.lang.reflect.Method; import java.util.Date; import java.util.List; diff --git a/mallchat-tools/pom.xml b/mallchat-tools/pom.xml index 0094600..5ac364f 100644 --- a/mallchat-tools/pom.xml +++ b/mallchat-tools/pom.xml @@ -16,6 +16,7 @@ mallchat-transaction mallchat-common-starter mallchat-frequency-control + mallchat-oss-starter diff --git a/pom.xml b/pom.xml index 882baa0..36f8bef 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,11 @@ mallchat-common-starter ${version} + + com.abin.mallchat + mallchat-oss-starter + ${version} + com.abin.mallchat mallchat-transaction