diff --git a/ruoyi-front/pom.xml b/ruoyi-front/pom.xml deleted file mode 100644 index 4749b6e32..000000000 --- a/ruoyi-front/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - ruoyi-vue-plus - org.dromara - ${revision} - - 4.0.0 - ruoyi-front - pom - - - ruoyi-consumer - ruoyi-manager - - diff --git a/ruoyi-front/ruoyi-consumer/pom.xml b/ruoyi-front/ruoyi-consumer/pom.xml deleted file mode 100644 index 55838eb8e..000000000 --- a/ruoyi-front/ruoyi-consumer/pom.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - org.dromara - ruoyi-front - ${revision} - - 4.0.0 - - ruoyi-consumer - - - system系统模块 - - - - - - org.dromara - ruoyi-common-core - - - - org.dromara - ruoyi-common-doc - - - - org.dromara - ruoyi-common-mybatis - - - - org.dromara - ruoyi-common-translation - - - - - org.dromara - ruoyi-common-oss - - - - org.dromara - ruoyi-common-log - - - - - org.dromara - ruoyi-common-excel - - - - - org.dromara - ruoyi-common-sms - - - - org.dromara - ruoyi-common-tenant - - - - org.dromara - ruoyi-common-security - - - - org.dromara - ruoyi-common-web - - - - org.dromara - ruoyi-common-idempotent - - - - org.dromara - ruoyi-common-sensitive - - - - org.dromara - ruoyi-common-encrypt - - - - org.dromara - ruoyi-common-websocket - - - - org.dromara - ruoyi-common-sse - - - com.google.protobuf - protobuf-java - 3.25.3 - compile - - - - com.github.xiaoymin - knife4j-spring-boot-starter - - - com.github.xiaoymin - knife4j-springdoc-ui - - - org.dromara - ruoyi-content - 5.3.1 - compile - - - - diff --git a/ruoyi-front/ruoyi-manager/pom.xml b/ruoyi-front/ruoyi-manager/pom.xml deleted file mode 100644 index f3821866a..000000000 --- a/ruoyi-front/ruoyi-manager/pom.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - org.dromara - ruoyi-front - ${revision} - - 4.0.0 - - ruoyi-manager - - - system系统模块 - - - - - - org.dromara - ruoyi-common-core - - - - org.dromara - ruoyi-common-doc - - - - org.dromara - ruoyi-common-mybatis - - - - org.dromara - ruoyi-common-translation - - - - - org.dromara - ruoyi-common-oss - - - - org.dromara - ruoyi-common-log - - - - - org.dromara - ruoyi-common-excel - - - - - org.dromara - ruoyi-common-sms - - - - org.dromara - ruoyi-common-tenant - - - - org.dromara - ruoyi-common-security - - - - org.dromara - ruoyi-common-web - - - - org.dromara - ruoyi-common-idempotent - - - - org.dromara - ruoyi-common-sensitive - - - - org.dromara - ruoyi-common-encrypt - - - - org.dromara - ruoyi-common-websocket - - - - org.dromara - ruoyi-common-sse - - - org.dromara - ruoyi-system - - - com.github.xiaoymin - knife4j-spring-boot-starter - - - com.github.xiaoymin - knife4j-springdoc-ui - - - org.dromara - ruoyi-member - 5.3.1 - compile - - - org.dromara - ruoyi-goods - 5.3.1 - compile - - - org.dromara - ruoyi-order - - - diff --git a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/config/MinIOConfig.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/MinIOConfig.java similarity index 94% rename from ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/config/MinIOConfig.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/MinIOConfig.java index 8d853d74d..d7d0d924f 100644 --- a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/config/MinIOConfig.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/MinIOConfig.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.consumer.content.config; +package com.wzj.soopin.content.config; import com.wzj.soopin.content.utils.MinIOUtils; diff --git a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/config/RedisConfig.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/RedisConfig.java similarity index 97% rename from ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/config/RedisConfig.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/RedisConfig.java index 91281bbf6..55520f441 100644 --- a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/config/RedisConfig.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.consumer.content.config; +package com.wzj.soopin.content.config; import lombok.extern.slf4j.Slf4j; import org.redisson.api.RedissonClient; diff --git a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/config/knife4jConfig.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/knife4jConfig.java similarity index 96% rename from ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/config/knife4jConfig.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/knife4jConfig.java index 0415e4d9f..62609ae86 100644 --- a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/config/knife4jConfig.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/knife4jConfig.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.consumer.content.config; +package com.wzj.soopin.content.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/CommentController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/CommentController.java similarity index 98% rename from ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/CommentController.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/CommentController.java index 18b95b576..8b1a59981 100644 --- a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/CommentController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/CommentController.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.consumer.content.controller; +package com.wzj.soopin.content.controller; import com.wzj.soopin.content.domain.base.BaseInfoProperties; diff --git a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/FansController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/FansController.java similarity index 99% rename from ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/FansController.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/FansController.java index 4ea440dc6..16d8d9691 100644 --- a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/FansController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/FansController.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.consumer.content.controller; +package com.wzj.soopin.content.controller; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/FileController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/FileController.java similarity index 95% rename from ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/FileController.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/FileController.java index fa4b2c91c..1d9ccef3e 100644 --- a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/FileController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/FileController.java @@ -1,8 +1,8 @@ -package com.wzj.soopin.consumer.content.controller; +package com.wzj.soopin.content.controller; -import com.wzj.soopin.consumer.content.config.MinIOConfig; +import com.wzj.soopin.content.config.MinIOConfig; import com.wzj.soopin.content.result.GraceJSONResult; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/MsgController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/MsgController.java similarity index 96% rename from ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/MsgController.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/MsgController.java index 086d8a7f9..a8e78f308 100644 --- a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/MsgController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/MsgController.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.consumer.content.controller; +package com.wzj.soopin.content.controller; import com.wzj.soopin.content.domain.base.BaseInfoProperties; import com.wzj.soopin.content.domain.mo.MessageMO; diff --git a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/PassportController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/PassportController.java similarity index 99% rename from ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/PassportController.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/PassportController.java index b8a9062d1..569623eb1 100644 --- a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/PassportController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/PassportController.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.consumer.content.controller; +package com.wzj.soopin.content.controller; import com.wzj.soopin.content.domain.base.BaseInfoProperties; diff --git a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/RabbitMQConsumer.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/RabbitMQConsumer.java similarity index 98% rename from ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/RabbitMQConsumer.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/RabbitMQConsumer.java index 566462fef..5098d88b7 100644 --- a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/RabbitMQConsumer.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/RabbitMQConsumer.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.consumer.content.controller; +package com.wzj.soopin.content.controller; import com.wzj.soopin.content.domain.base.RabbitMQConfig; diff --git a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/UserInfoController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/UserInfoController.java similarity index 98% rename from ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/UserInfoController.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/UserInfoController.java index 317d9554f..b45c5ab6d 100644 --- a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/UserInfoController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/UserInfoController.java @@ -1,7 +1,7 @@ -package com.wzj.soopin.consumer.content.controller; +package com.wzj.soopin.content.controller; -import com.wzj.soopin.consumer.content.config.MinIOConfig; +import com.wzj.soopin.content.config.MinIOConfig; import com.wzj.soopin.content.domain.base.BaseInfoProperties; import com.wzj.soopin.content.domain.bo.UpdatedUserBO; import com.wzj.soopin.content.domain.po.Users; diff --git a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/VlogController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/VlogController.java similarity index 99% rename from ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/VlogController.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/VlogController.java index 2f817ef6f..fa46ce5e8 100644 --- a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/controller/VlogController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/VlogController.java @@ -1,8 +1,8 @@ -package com.wzj.soopin.consumer.content.controller; +package com.wzj.soopin.content.controller; -import com.wzj.soopin.consumer.content.config.MinIOConfig; +import com.wzj.soopin.content.config.MinIOConfig; import com.wzj.soopin.content.domain.base.BaseInfoProperties; import com.wzj.soopin.content.domain.bo.VlogBO; import com.wzj.soopin.content.enums.YesOrNo; diff --git a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/intercepter/PassportInterceptor.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/intercepter/PassportInterceptor.java similarity index 96% rename from ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/intercepter/PassportInterceptor.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/intercepter/PassportInterceptor.java index e37c05df8..afd098f52 100644 --- a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/intercepter/PassportInterceptor.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/intercepter/PassportInterceptor.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.consumer.content.intercepter; +package com.wzj.soopin.content.intercepter; import com.wzj.soopin.content.domain.base.BaseInfoProperties; diff --git a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/intercepter/UserTokenInterceptor.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/intercepter/UserTokenInterceptor.java similarity index 97% rename from ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/intercepter/UserTokenInterceptor.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/intercepter/UserTokenInterceptor.java index 34e29ad36..7a6ba6d97 100644 --- a/ruoyi-front/ruoyi-consumer/src/main/java/com/wzj/soopin/consumer/content/intercepter/UserTokenInterceptor.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/intercepter/UserTokenInterceptor.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.consumer.content.intercepter; +package com.wzj.soopin.content.intercepter; import com.wzj.soopin.content.domain.base.BaseInfoProperties; diff --git a/ruoyi-front/ruoyi-manager/src/main/java/com/wzj/soopin/manager/member/controller/FeedbackController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/FeedbackController.java similarity index 97% rename from ruoyi-front/ruoyi-manager/src/main/java/com/wzj/soopin/manager/member/controller/FeedbackController.java rename to ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/FeedbackController.java index b3f80fa2a..4318569d2 100644 --- a/ruoyi-front/ruoyi-manager/src/main/java/com/wzj/soopin/manager/member/controller/FeedbackController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/FeedbackController.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.manager.member.controller; +package com.wzj.soopin.member.controller; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/ruoyi-front/ruoyi-manager/src/main/java/com/wzj/soopin/manager/member/controller/MemberAccountController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java similarity index 98% rename from ruoyi-front/ruoyi-manager/src/main/java/com/wzj/soopin/manager/member/controller/MemberAccountController.java rename to ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java index 458e3fa5e..621de8482 100644 --- a/ruoyi-front/ruoyi-manager/src/main/java/com/wzj/soopin/manager/member/controller/MemberAccountController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.manager.member.controller; +package com.wzj.soopin.member.controller; import com.wzj.soopin.member.convert.MemberAccountConvert; import com.wzj.soopin.member.domain.po.MemberAccount; diff --git a/ruoyi-front/ruoyi-manager/src/main/java/com/wzj/soopin/manager/member/controller/MemberAddressController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAddressController.java similarity index 98% rename from ruoyi-front/ruoyi-manager/src/main/java/com/wzj/soopin/manager/member/controller/MemberAddressController.java rename to ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAddressController.java index 7865b6dc1..a5eb19470 100644 --- a/ruoyi-front/ruoyi-manager/src/main/java/com/wzj/soopin/manager/member/controller/MemberAddressController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAddressController.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.manager.member.controller; +package com.wzj.soopin.member.controller; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/ruoyi-front/ruoyi-manager/src/main/java/com/wzj/soopin/manager/member/controller/MemberCartController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberCartController.java similarity index 98% rename from ruoyi-front/ruoyi-manager/src/main/java/com/wzj/soopin/manager/member/controller/MemberCartController.java rename to ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberCartController.java index e8177c4f9..58ce5e37d 100644 --- a/ruoyi-front/ruoyi-manager/src/main/java/com/wzj/soopin/manager/member/controller/MemberCartController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberCartController.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.manager.member.controller; +package com.wzj.soopin.member.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/ruoyi-front/ruoyi-manager/src/main/java/com/wzj/soopin/manager/member/controller/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java similarity index 98% rename from ruoyi-front/ruoyi-manager/src/main/java/com/wzj/soopin/manager/member/controller/MemberController.java rename to ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java index 79dc7614d..48cc5a789 100644 --- a/ruoyi-front/ruoyi-manager/src/main/java/com/wzj/soopin/manager/member/controller/MemberController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.manager.member.controller; +package com.wzj.soopin.member.controller; import com.baomidou.mybatisplus.core.metadata.IPage;