From 283e7cad9857b3c77b98aa52519b1ed317f5beba Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Tue, 25 Jun 2024 15:21:24 +0800 Subject: [PATCH] style: update --- README.md | 11 +++++++- .../application/config/SmsInitConfig.java | 2 +- .../ReactRotateCaptchaController.java | 2 +- .../SchisandraAuthUserController.java | 2 +- .../controller/SchisandraSmsController.java | 26 +++++++++++++++---- .../application/utils/CheckRouteCaptcha.java | 3 +-- .../pom.xml | 6 ++++- .../auth/application/mq/TestConsumer.java | 25 ++++++++++++++++++ .../pom.xml | 7 ----- .../pom.xml | 5 ++++ .../auth/domain}/redis/RedisConfig.java | 2 +- .../auth/domain}/redis/RedisUtil.java | 2 +- .../SchisandraAuthUserDomainServiceImpl.java | 2 +- ...java => AuthMyBatisFlexConfiguration.java} | 4 +-- .../com/schisandra/auth/AuthApplication.java | 1 - .../src/main/resources/application.yml | 5 ++++ .../SchisandraOssMinioController.java | 2 +- .../oss/domain}/redis/RedisConfig.java | 2 +- .../oss/domain}/redis/RedisUtil.java | 2 +- ....java => OssMyBatisFlexConfiguration.java} | 4 +-- .../system/domain}/redis/RedisConfig.java | 3 ++- .../system/domain}/redis/RedisUtil.java | 3 ++- ...va => SystemMyBatisFlexConfiguration.java} | 4 +-- .../pom.xml | 5 ++++ .../src/main/resources/application.yml | 2 -- 25 files changed, 96 insertions(+), 36 deletions(-) create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/src/main/java/com/schisandra/auth/application/mq/TestConsumer.java rename schisandra-cloud-storage-auth/{schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common => schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain}/redis/RedisConfig.java (98%) rename schisandra-cloud-storage-auth/{schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common => schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain}/redis/RedisUtil.java (98%) rename schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/config/{MyBatisFlexConfiguration.java => AuthMyBatisFlexConfiguration.java} (91%) rename schisandra-cloud-storage-oss/{schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common => schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain}/redis/RedisConfig.java (98%) rename schisandra-cloud-storage-oss/{schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common => schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain}/redis/RedisUtil.java (98%) rename schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/config/{MyBatisFlexConfiguration.java => OssMyBatisFlexConfiguration.java} (91%) rename schisandra-cloud-storage-system/{schisandra-cloud-storage-system-common/src/main/java/com/schisandra/system/common => schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain}/redis/RedisConfig.java (97%) rename schisandra-cloud-storage-system/{schisandra-cloud-storage-system-common/src/main/java/com/schisandra/system/common => schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain}/redis/RedisUtil.java (98%) rename schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/config/{MyBatisFlexConfiguration.java => SystemMyBatisFlexConfiguration.java} (90%) diff --git a/README.md b/README.md index caaa991..a563a69 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,12 @@ # schisandra-cloud-storage -五味子云存储 \ No newline at end of file +五味子云存储 + +## 功能需求 +1. 登录注册: 手机号登录/注册，账户密码登录，微信公众号扫码登录，第三方登录（github,gitee...） +2. 用户: 添加对象存储密钥，获取用户对象存储商品，获取用户对象存储使用情况，获取用户对象存储使用明细，获取用户对象存储使用明细图表 +3. 文件管理: 文件上传，文件下载，文件删除，文件重命名，文件移动，文件搜索，文件预览，文件分享二维码，回收站。 +4. 文件分享圈: 分享文件，评论。 +## 技术选型 + +## 部署 diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/SmsInitConfig.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/SmsInitConfig.java index e68f280..ffa2092 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/SmsInitConfig.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/SmsInitConfig.java @@ -2,7 +2,7 @@ package com.schisandra.auth.application.config; import cn.hutool.core.util.ObjectUtil; import com.schisandra.auth.application.context.SmsConfigContext; -import com.schisandra.auth.common.redis.RedisUtil; +import com.schisandra.auth.domain.redis.RedisUtil; import com.schisandra.auth.infra.entity.ConfigInfo; import com.schisandra.auth.infra.rpc.ConfigRpc; import lombok.extern.slf4j.Slf4j; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/ReactRotateCaptchaController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/ReactRotateCaptchaController.java index fb786b6..41666e1 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/ReactRotateCaptchaController.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/ReactRotateCaptchaController.java @@ -3,7 +3,7 @@ package com.schisandra.auth.application.controller; import cn.hutool.core.lang.UUID; import com.schisandra.auth.application.dto.SchisandraCaptchaDTO; import com.schisandra.auth.common.entity.CaptchaResult; -import com.schisandra.auth.common.redis.RedisUtil; +import com.schisandra.auth.domain.redis.RedisUtil; import com.schisandra.auth.common.utils.RotateImageUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java index 20d170e..81271a4 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java @@ -12,7 +12,7 @@ import com.schisandra.auth.application.utils.CheckRouteCaptcha; import com.schisandra.auth.common.entity.CaptchaResult; import com.schisandra.auth.common.entity.Result; import com.schisandra.auth.common.enums.UserRoleEnum; -import com.schisandra.auth.common.redis.RedisUtil; +import com.schisandra.auth.domain.redis.RedisUtil; import com.schisandra.auth.domain.bo.SchisandraAuthRolePermissionBO; import com.schisandra.auth.domain.bo.SchisandraAuthUserBO; import com.schisandra.auth.domain.service.SchisandraAuthPermissionDomainService; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java index ce3fd30..f58c734 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java @@ -5,19 +5,19 @@ import com.schisandra.auth.application.context.SmsConfigContext; import com.schisandra.auth.application.dto.SchisandraCaptchaDTO; import com.schisandra.auth.application.utils.CheckRouteCaptcha; import com.schisandra.auth.common.entity.CaptchaResult; -import com.schisandra.auth.common.redis.RedisUtil; +import com.schisandra.auth.common.entity.Result; +import com.schisandra.auth.domain.redis.RedisUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.comm.utils.SmsUtils; import org.dromara.sms4j.core.factory.SmsFactory; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import static java.util.concurrent.TimeUnit.SECONDS; + /** * @description: 短信发送controller * @author: landaiqing @@ -36,6 +36,9 @@ public class SchisandraSmsController { @Resource CheckRouteCaptcha checkRouteCaptcha; + @Resource + private RocketMQTemplate rocketMQTemplate; + /** * @description: 发送短信验证码 * @param: [phone] @@ -79,4 +82,17 @@ public class SchisandraSmsController { } + /** + * @description: 测试mq发送 + * @param: [id] + * @return: com.schisandra.auth.common.entity.Result + * @author: landaiqing + * @date: 2024/6/25 下午2:35 + */ + @PostMapping("postMessage") + public Result pushMessage(@RequestParam("id") int id) { + rocketMQTemplate.convertAndSend("first-topic", "landaiqing666" + id); + return Result.ok(true); + } + } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/utils/CheckRouteCaptcha.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/utils/CheckRouteCaptcha.java index 3e2debf..7370884 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/utils/CheckRouteCaptcha.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/utils/CheckRouteCaptcha.java @@ -1,8 +1,7 @@ package com.schisandra.auth.application.utils; -import com.cxytiandi.encrypt.springboot.annotation.Decrypt; import com.schisandra.auth.common.entity.CaptchaResult; -import com.schisandra.auth.common.redis.RedisUtil; +import com.schisandra.auth.domain.redis.RedisUtil; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/pom.xml index ca95ae7..993ce0c 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/pom.xml @@ -19,6 +19,10 @@ - + + com.schisandra + schisandra-cloud-storage-auth-domain + 1.0-SNAPSHOT + diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/src/main/java/com/schisandra/auth/application/mq/TestConsumer.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/src/main/java/com/schisandra/auth/application/mq/TestConsumer.java new file mode 100644 index 0000000..b670518 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/src/main/java/com/schisandra/auth/application/mq/TestConsumer.java @@ -0,0 +1,25 @@ +package com.schisandra.auth.application.mq; + +import lombok.extern.slf4j.Slf4j; +import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; +import org.apache.rocketmq.spring.core.RocketMQListener; +import org.springframework.stereotype.Component; + +/** + * @Classname TestConsumer + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.auth.application.mq + * @Author: landaiqing + * @CreateTime: 2024-06-25 14:39 + * @Description: TODO + * @Version: 1.0 + */ +@Component +@RocketMQMessageListener(topic = "first-topic", consumerGroup = "schisandra-cloud-storage-auth-producer") +@Slf4j +public class TestConsumer implements RocketMQListener { + @Override + public void onMessage(String s) { + log.info("接收到ma消息：{}", s); + } +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/pom.xml index 0b2b450..99d758a 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/pom.xml @@ -128,13 +128,6 @@ 0.4.20 - - - com.cxytiandi - monkey-api-encrypt-core - 1.2.2.RELEASE - - diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml index 096d9ce..2ef7753 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml @@ -67,5 +67,10 @@ schisandra-cloud-storage-auth-common 1.0-SNAPSHOT + + org.apache.rocketmq + rocketmq-spring-boot-starter + 2.1.1 + diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/redis/RedisConfig.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/redis/RedisConfig.java similarity index 98% rename from schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/redis/RedisConfig.java rename to schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/redis/RedisConfig.java index d49ed49..a90308a 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/redis/RedisConfig.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/redis/RedisConfig.java @@ -1,4 +1,4 @@ -package com.schisandra.auth.common.redis; +package com.schisandra.auth.domain.redis; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/redis/RedisUtil.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/redis/RedisUtil.java similarity index 98% rename from schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/redis/RedisUtil.java rename to schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/redis/RedisUtil.java index 9a90064..c5893b5 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/redis/RedisUtil.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/redis/RedisUtil.java @@ -1,4 +1,4 @@ -package com.schisandra.auth.common.redis; +package com.schisandra.auth.domain.redis; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java index 303c53d..32289e9 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java @@ -8,7 +8,7 @@ import com.google.gson.Gson; import com.schisandra.auth.common.entity.Result; import com.schisandra.auth.common.enums.IsDeletedFlagEnum; import com.schisandra.auth.common.enums.UserRoleEnum; -import com.schisandra.auth.common.redis.RedisUtil; +import com.schisandra.auth.domain.redis.RedisUtil; import com.schisandra.auth.domain.bo.SchisandraAuthUserBO; import com.schisandra.auth.domain.bo.SchisandraAuthUserRoleBO; import com.schisandra.auth.domain.bo.SchisandraSocialUserAuthBO; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/config/MyBatisFlexConfiguration.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/config/AuthMyBatisFlexConfiguration.java similarity index 91% rename from schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/config/MyBatisFlexConfiguration.java rename to schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/config/AuthMyBatisFlexConfiguration.java index b876be7..ff304e9 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/config/MyBatisFlexConfiguration.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/config/AuthMyBatisFlexConfiguration.java @@ -15,12 +15,12 @@ import org.springframework.context.annotation.Configuration; * @Version: 1.0 */ @Configuration -public class MyBatisFlexConfiguration { +public class AuthMyBatisFlexConfiguration { private static final Logger logger = LoggerFactory .getLogger("mybatis-flex-sql"); - public MyBatisFlexConfiguration() { + public AuthMyBatisFlexConfiguration() { //开启审计功能 AuditManager.setAuditEnable(true); diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/java/com/schisandra/auth/AuthApplication.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/java/com/schisandra/auth/AuthApplication.java index 4820945..e52fdd4 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/java/com/schisandra/auth/AuthApplication.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/java/com/schisandra/auth/AuthApplication.java @@ -1,6 +1,5 @@ package com.schisandra.auth; -import com.cxytiandi.encrypt.springboot.annotation.EnableEncrypt; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml index 783e5ca..84e064f 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml @@ -102,3 +102,8 @@ web: # MD5加密salt cipher: salt: E2754BC007CA407190E85DFF6E566003 + +rocketmq: + name-server: 1.95.0.111:9876 + producer: + group: schisandra-cloud-storage-auth-producer 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 b360824..1654c75 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 @@ -8,7 +8,7 @@ import com.schisandra.oss.application.dto.SchisandraOssMinioDTO; import com.schisandra.oss.application.oss.core.minio.MinioOssClient; import com.schisandra.oss.application.oss.core.minio.MinioOssConfiguration; import com.schisandra.oss.common.entity.Result; -import com.schisandra.oss.common.redis.RedisUtil; +import com.schisandra.oss.domain.redis.RedisUtil; import com.schisandra.oss.domain.bo.SchisandraOssMinioBO; import com.schisandra.oss.domain.service.SchisandraOssMinioDomainService; import lombok.extern.slf4j.Slf4j; diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/redis/RedisConfig.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/redis/RedisConfig.java similarity index 98% rename from schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/redis/RedisConfig.java rename to schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/redis/RedisConfig.java index 7474b24..8c0bccb 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/redis/RedisConfig.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/redis/RedisConfig.java @@ -1,4 +1,4 @@ -package com.schisandra.oss.common.redis; +package com.schisandra.oss.domain.redis; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/redis/RedisUtil.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/redis/RedisUtil.java similarity index 98% rename from schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/redis/RedisUtil.java rename to schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/redis/RedisUtil.java index f8b46cb..425b6c5 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/redis/RedisUtil.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/redis/RedisUtil.java @@ -1,4 +1,4 @@ -package com.schisandra.oss.common.redis; +package com.schisandra.oss.domain.redis; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/config/MyBatisFlexConfiguration.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/config/OssMyBatisFlexConfiguration.java similarity index 91% rename from schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/config/MyBatisFlexConfiguration.java rename to schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/config/OssMyBatisFlexConfiguration.java index 532109e..bf99cd0 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/config/MyBatisFlexConfiguration.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/config/OssMyBatisFlexConfiguration.java @@ -15,12 +15,12 @@ import org.springframework.context.annotation.Configuration; * @Version: 1.0 */ @Configuration -public class MyBatisFlexConfiguration { +public class OssMyBatisFlexConfiguration { private static final Logger logger = LoggerFactory .getLogger("mybatis-flex-sql"); - public MyBatisFlexConfiguration() { + public OssMyBatisFlexConfiguration() { //开启审计功能 AuditManager.setAuditEnable(true); diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-common/src/main/java/com/schisandra/system/common/redis/RedisConfig.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisConfig.java similarity index 97% rename from schisandra-cloud-storage-system/schisandra-cloud-storage-system-common/src/main/java/com/schisandra/system/common/redis/RedisConfig.java rename to schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisConfig.java index 99277e0..f3827fe 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-common/src/main/java/com/schisandra/system/common/redis/RedisConfig.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisConfig.java @@ -1,4 +1,5 @@ -package com.schisandra.system.common.redis; +package com.schisandra.system.domain.redis; + import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-common/src/main/java/com/schisandra/system/common/redis/RedisUtil.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisUtil.java similarity index 98% rename from schisandra-cloud-storage-system/schisandra-cloud-storage-system-common/src/main/java/com/schisandra/system/common/redis/RedisUtil.java rename to schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisUtil.java index ddadde7..5f3f32a 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-common/src/main/java/com/schisandra/system/common/redis/RedisUtil.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisUtil.java @@ -1,4 +1,5 @@ -package com.schisandra.system.common.redis; +package com.schisandra.system.domain.redis; + import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/config/MyBatisFlexConfiguration.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/config/SystemMyBatisFlexConfiguration.java similarity index 90% rename from schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/config/MyBatisFlexConfiguration.java rename to schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/config/SystemMyBatisFlexConfiguration.java index ab923b1..9a17ca8 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/config/MyBatisFlexConfiguration.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/config/SystemMyBatisFlexConfiguration.java @@ -15,12 +15,12 @@ import org.springframework.context.annotation.Configuration; * @Version: 1.0 */ @Configuration -public class MyBatisFlexConfiguration { +public class SystemMyBatisFlexConfiguration { private static final Logger logger = LoggerFactory .getLogger("mybatis-flex-sql"); - public MyBatisFlexConfiguration() { + public SystemMyBatisFlexConfiguration() { //开启审计功能 AuditManager.setAuditEnable(true); diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/pom.xml b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/pom.xml index e11bbd4..113d16d 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/pom.xml +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/pom.xml @@ -58,6 +58,11 @@ schisandra-cloud-storage-system-infra 1.0-SNAPSHOT + + com.schisandra + schisandra-cloud-storage-auth-application-mq + 1.0-SNAPSHOT + diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/application.yml b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/application.yml index ecbe9bb..30d4b01 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/application.yml +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/application.yml @@ -83,5 +83,3 @@ mybatis-flex: - "classpath*:/mapper/**/*.xml" - -