wip: 重构临时提交

mall-member/member-api/pom.xml

@@ -12,27 +12,19 @@
     <artifactId>member-api</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>com.youlai</groupId>
-            <artifactId>common-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.youlai</groupId>
+            <artifactId>common-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.youlai</groupId>
             <artifactId>common-web</artifactId>
             <optional>true</optional>
         </dependency>
-
     </dependencies>
 </project>

mall-member/member-boot/pom.xml

@@ -48,11 +48,6 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.youlai</groupId>
-            <artifactId>common-mybatis</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.youlai</groupId>
             <artifactId>common-web</artifactId>
@@ -60,7 +55,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-redis</artifactId>
+            <artifactId>common-mybatis</artifactId>
         </dependency>
 
         <dependency>
@@ -70,12 +65,17 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-seata</artifactId>
+            <artifactId>common-middleware-redis</artifactId>
         </dependency>
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-rabbitmq</artifactId>
+            <artifactId>common-middleware-seata</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.youlai</groupId>
+            <artifactId>common-middleware-rabbitmq</artifactId>
         </dependency>
 
         <dependency>

mall-member/member-boot/src/main/java/com/youlai/mall/member/MemberApplication.java

@@ -6,9 +6,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
+/**
+ * 会员服务启动类
+ *
+ * @author ray
+ */
 @SpringBootApplication
 @EnableDiscoveryClient()
-@EnableFeignClients(basePackageClasses = {  SkuFeignClient.class})
+@EnableFeignClients(basePackageClasses = {SkuFeignClient.class})
 public class MemberApplication {
     public static void main(String[] args) {
         SpringApplication.run(MemberApplication.class, args);

mall-order/order-boot/pom.xml

@@ -73,16 +73,6 @@
             <artifactId>common-web</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.youlai</groupId>
-            <artifactId>common-redis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.youlai</groupId>
-            <artifactId>common-rabbitmq</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.youlai</groupId>
             <artifactId>common-security</artifactId>
@@ -90,7 +80,12 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-seata</artifactId>
+            <artifactId>common-middleware-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.youlai</groupId>
+            <artifactId>common-middleware-seata</artifactId>
         </dependency>
 
     </dependencies>

mall-order/order-boot/src/main/java/com/youlai/mall/order/OrderApplication.java

@@ -7,9 +7,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
+/**
+ * 订单服务启动类
+ *
+ * @author ray
+ */
 @SpringBootApplication
 @EnableDiscoveryClient
-@EnableFeignClients(basePackageClasses = { MemberFeignClient.class, SkuFeignClient.class})
+@EnableFeignClients(basePackageClasses = {MemberFeignClient.class, SkuFeignClient.class})
 public class OrderApplication {
 
     public static void main(String[] args) {

mall-product/product-api/pom.xml

@@ -24,12 +24,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>

mall-product/product-boot/pom.xml

@@ -62,11 +62,6 @@
             <artifactId>member-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.youlai</groupId>
-            <artifactId>common-mybatis</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.youlai</groupId>
             <artifactId>common-web</artifactId>
@@ -74,12 +69,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-redis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.youlai</groupId>
-            <artifactId>common-rabbitmq</artifactId>
+            <artifactId>common-mybatis</artifactId>
         </dependency>
 
         <dependency>
@@ -89,7 +79,17 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-seata</artifactId>
+            <artifactId>common-middleware-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.youlai</groupId>
+            <artifactId>common-middleware-rabbitmq</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.youlai</groupId>
+            <artifactId>common-middleware-seata</artifactId>
         </dependency>
 
     </dependencies>

mall-sales/sales-boot/pom.xml

@@ -68,11 +68,6 @@
             <artifactId>common-web</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.youlai</groupId>
-            <artifactId>common-redis</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.youlai</groupId>
             <artifactId>common-security</artifactId>

mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/SalesApplication.java

@@ -7,10 +7,9 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
- * 优惠营销系统
- * 秒杀功能开发
- * 1、管理员端开发秒杀活动管理界面（创建秒杀活动场次，建立秒杀活动场次与商品关联）
- * 2、秒杀预热。采用 异步+定时 将秒杀数据提前同步到redis中
+ * 营销服务启动类
+ *
+ * @author ray
  */
 @SpringBootApplication
 @EnableDiscoveryClient

pom.xml

@@ -164,24 +164,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.youlai</groupId>
-                <artifactId>common-mybatis</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.youlai</groupId>
-                <artifactId>common-rabbitmq</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.youlai</groupId>
-                <artifactId>common-redis</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.youlai</groupId>
                 <artifactId>common-web</artifactId>
@@ -196,13 +178,37 @@
 
             <dependency>
                 <groupId>com.youlai</groupId>
-                <artifactId>common-seata</artifactId>
+                <artifactId>common-mybatis</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.youlai</groupId>
-                <artifactId>common-sms</artifactId>
+                <artifactId>common-middleware-rabbitmq</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.youlai</groupId>
+                <artifactId>common-middleware-redis</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.youlai</groupId>
+                <artifactId>common-middleware-seata</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.youlai</groupId>
+                <artifactId>common-thirdparty-sms</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.youlai</groupId>
+                <artifactId>common-thirdparty-oss</artifactId>
                 <version>${project.version}</version>
             </dependency>
 

youlai-auth/pom.xml

@@ -48,6 +48,17 @@
             <artifactId>spring-cloud-starter-loadbalancer</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-miniapp</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.youlai</groupId>
             <artifactId>member-api</artifactId>
@@ -58,11 +69,6 @@
             <artifactId>system-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.youlai</groupId>
-            <artifactId>common-web</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.youlai</groupId>
             <artifactId>common-core</artifactId>
@@ -70,12 +76,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-redis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-miniapp</artifactId>
+            <artifactId>common-web</artifactId>
         </dependency>
 
         <dependency>
@@ -85,13 +86,12 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-sms</artifactId>
+            <artifactId>common-middleware-redis</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
+            <groupId>com.youlai</groupId>
+            <artifactId>common-thirdparty-sms</artifactId>
         </dependency>
 
     </dependencies>

youlai-auth/src/main/java/com/youlai/auth/AuthApplication.java

@@ -7,6 +7,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
+/**
+ * 认证服务启动类
+ *
+ * @author ray
+ */
 @EnableFeignClients(basePackageClasses = {UserFeignClient.class, MemberFeignClient.class})
 @SpringBootApplication
 @EnableDiscoveryClient

youlai-common/common-middleware/common-middleware-rabbitmq/pom.xml

@@ -2,14 +2,20 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>youlai-common</artifactId>
         <groupId>com.youlai</groupId>
+        <artifactId>common-middleware</artifactId>
         <version>3.2.1</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>common-rabbitmq</artifactId>
+    <artifactId>common-middleware-rabbitmq</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
 
     <dependencies>
         <dependency>

youlai-common/common-middleware/common-middleware-redis/pom.xml

@@ -2,14 +2,20 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>youlai-common</artifactId>
         <groupId>com.youlai</groupId>
+        <artifactId>common-middleware</artifactId>
         <version>3.2.1</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>common-redis</artifactId>
+    <artifactId>common-middleware-redis</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -50,4 +56,5 @@
         </dependency>
 
     </dependencies>
+
 </project>

youlai-common/common-middleware/common-middleware-redis/src/main/java/com/youlai/common/redis/config/RedisCacheConfig.java

@@ -1,4 +1,4 @@
-package com.youlai.common.redis;
+package com.youlai.common.redis.config;
 
 import org.springframework.boot.autoconfigure.cache.CacheProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

youlai-common/common-middleware/common-middleware-redis/src/main/java/com/youlai/common/redis/config/RedisConfig.java

@@ -1,4 +1,4 @@
-package com.youlai.common.redis;
+package com.youlai.common.redis.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

youlai-common/common-middleware/common-middleware-redis/src/main/resources/META-INF.spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,2 @@
+com.youlai.common.redis.config.RedisCacheConfig
+com.youlai.common.redis.config.RedisConfig

youlai-common/common-middleware/common-middleware-seata/pom.xml

@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>youlai-common</artifactId>
         <groupId>com.youlai</groupId>
+        <artifactId>common-middleware</artifactId>
         <version>3.2.1</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>common-seata</artifactId>
+    <artifactId>common-middleware-seata</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -29,4 +29,5 @@
             </exclusions>
         </dependency>
     </dependencies>
+
 </project>

youlai-common/common-middleware/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.youlai</groupId>
+        <artifactId>youlai-common</artifactId>
+        <version>3.2.1</version>
+    </parent>
+
+    <artifactId>common-middleware</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>common-middleware-redis</module>
+        <module>common-middleware-seata</module>
+        <module>common-middleware-rabbitmq</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

youlai-common/common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +0,0 @@
-com.youlai.common.redis.RedisCacheConfig
-com.youlai.common.redis.RedisConfig

youlai-common/common-security/pom.xml

@@ -30,7 +30,8 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-redis</artifactId>
+            <artifactId>common-middleware-redis</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>

youlai-common/common-thirdparty/common-thirdparty-oss/pom.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.youlai</groupId>
+        <artifactId>common-thirdparty</artifactId>
+        <version>3.2.1</version>
+    </parent>
+
+    <artifactId>common-thirdparty-oss</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- 分布式对象存储 -->
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

youlai-common/common-thirdparty/common-thirdparty-oss/src/main/java/com/youlai/common/oss/model/FileInfo.java

@@ -1,8 +1,15 @@
-package com.youlai.system.model.vo;
+package com.youlai.common.oss.model;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+
+/**
+ * 文件对象
+ *
+ * @author ray
+ * @since 1.0.0
+ */
 @Schema(description = "文件对象")
 @Data
 public class FileInfo {

youlai-common/common-thirdparty/common-thirdparty-oss/src/main/java/com/youlai/common/oss/service/OssService.java

@@ -1,6 +1,7 @@
-package com.youlai.system.service;
+package com.youlai.common.oss.service;
 
-import com.youlai.system.model.vo.FileInfo;
+
+import com.youlai.common.oss.model.FileInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 /**

youlai-common/common-thirdparty/common-thirdparty-oss/src/main/java/com/youlai/common/oss/service/impl/AliyunOssService.java

@@ -1,4 +1,4 @@
-package com.youlai.system.service.impl.oss;
+package com.youlai.common.oss.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
@@ -8,8 +8,8 @@ import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.ObjectMetadata;
 import com.aliyun.oss.model.PutObjectRequest;
-import com.youlai.system.model.vo.FileInfo;
-import com.youlai.system.service.OssService;
+import com.youlai.common.oss.model.FileInfo;
+import com.youlai.common.oss.service.OssService;
 import jakarta.annotation.PostConstruct;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
@@ -90,8 +90,10 @@ public class AliyunOssService implements OssService {
     @Override
     public boolean deleteFile(String filePath) {
         Assert.notBlank(filePath, "删除文件路径不能为空");
-        String fileHost = "https://" + bucketName + "." + endpoint; // 文件主机域名
-        String fileName = filePath.substring(fileHost.length() + 1); // +1 是/占一个字符，截断左闭右开
+        // 文件主机域名
+        String fileHost = "https://" + bucketName + "." + endpoint;
+        // +1 是/占一个字符，截断左闭右开
+        String fileName = filePath.substring(fileHost.length() + 1);
         aliyunOssClient.deleteObject(bucketName, fileName);
         return true;
     }

youlai-common/common-thirdparty/common-thirdparty-oss/src/main/java/com/youlai/common/oss/service/impl/MinioOssService.java

@@ -1,12 +1,12 @@
-package com.youlai.system.service.impl.oss;
+package com.youlai.common.oss.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import com.youlai.system.model.vo.FileInfo;
-import com.youlai.system.service.OssService;
+import com.youlai.common.oss.model.FileInfo;
+import com.youlai.common.oss.service.OssService;
 import io.minio.*;
 import io.minio.errors.*;
 import io.minio.http.Method;
@@ -132,8 +132,8 @@ public class MinioOssService implements OssService {
         try {
             String fileName;
             if (StrUtil.isNotBlank(customDomain)) {
-                // https://oss.youlai.tech/default/20221120/test.jpg → 20221120/test.jpg
-                fileName = filePath.substring(customDomain.length() + 1 + bucketName.length() + 1); // 两个/占了2个字符长度
+                // https://oss.youlai.tech/default/20221120/test.jpg → 20221120/test.jpg  // 两个/占了2个字符长度
+                fileName = filePath.substring(customDomain.length() + 1 + bucketName.length() + 1);
             } else {
                 // http://localhost:9000/default/20221120/test.jpg → 20221120/test.jpg
                 fileName = filePath.substring(endpoint.length() + 1 + bucketName.length() + 1);
@@ -156,17 +156,15 @@ public class MinioOssService implements OssService {
     /**
      * PUBLIC桶策略
      * 如果不配置，则新建的存储桶默认是PRIVATE，则存储桶文件会拒绝访问 Access Denied
+     * AWS的S3存储桶策略
+     * Principal: 生效用户对象
+     * Resource:  指定存储桶
+     * Action: 操作行为
      *
      * @param bucketName
      * @return
      */
     private static String publicBucketPolicy(String bucketName) {
-        /**
-         * AWS的S3存储桶策略
-         * Principal: 生效用户对象
-         * Resource:  指定存储桶
-         * Action: 操作行为
-         */
 
         return "{\"Version\":\"2012-10-17\","
                 + "\"Statement\":[{\"Effect\":\"Allow\","
@@ -181,7 +179,7 @@ public class MinioOssService implements OssService {
     /**
      * 创建存储桶(存储桶不存在)
      *
-     * @param bucketName
+     * @param bucketName 存储桶名称
      */
     @SneakyThrows
     private void createBucketIfAbsent(String bucketName) {

youlai-common/common-thirdparty/common-thirdparty-oss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,2 @@
+  com.youlai.common.oss.service.impl.AliyunOssService
+  com.youlai.common.oss.service.impl.MinioOssService

youlai-common/common-thirdparty/common-thirdparty-sms/pom.xml

@@ -2,20 +2,21 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>youlai-common</artifactId>
         <groupId>com.youlai</groupId>
+        <artifactId>common-thirdparty</artifactId>
         <version>3.2.1</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>common-sms</artifactId>
+    <artifactId>common-thirdparty-sms</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.youlai</groupId>
@@ -25,7 +26,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-redis</artifactId>
+            <artifactId>common-middleware-redis</artifactId>
             <optional>true</optional>
         </dependency>
 
@@ -42,5 +43,4 @@
         </dependency>
 
     </dependencies>
-
 </project>

youlai-common/common-thirdparty/common-thirdparty-sms/src/main/java/com/youlai/common/sms/config/AliyunSmsProperties.java

@@ -1,4 +1,4 @@
-package com.youlai.common.sms.property;
+package com.youlai.common.sms.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

youlai-common/common-thirdparty/common-thirdparty-sms/src/main/java/com/youlai/common/sms/service/impl/AliyunSmsService.java

@@ -8,7 +8,7 @@ import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.exceptions.ServerException;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
-import com.youlai.common.sms.property.AliyunSmsProperties;
+import com.youlai.common.sms.config.AliyunSmsProperties;
 import com.youlai.common.sms.service.SmsService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

youlai-common/common-thirdparty/common-thirdparty-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +1,2 @@
-com.youlai.common.sms.property.AliyunSmsProperties
+com.youlai.common.sms.config.AliyunSmsProperties
 com.youlai.common.sms.service.impl.AliyunSmsService

youlai-common/common-thirdparty/pom.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.youlai</groupId>
+        <artifactId>youlai-common</artifactId>
+        <version>3.2.1</version>
+    </parent>
+
+    <artifactId>common-thirdparty</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>common-thirdparty-sms</module>
+        <module>common-thirdparty-oss</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

youlai-common/common-web/pom.xml

@@ -13,16 +13,6 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>com.youlai</groupId>
-            <artifactId>common-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.youlai</groupId>
-            <artifactId>common-redis</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -59,6 +49,16 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.youlai</groupId>
+            <artifactId>common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.youlai</groupId>
+            <artifactId>common-middleware-redis</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.youlai</groupId>
             <artifactId>common-security</artifactId>

youlai-common/pom.xml

@@ -15,12 +15,10 @@
 
     <modules>
         <module>common-core</module>
-        <module>common-redis</module>
         <module>common-web</module>
         <module>common-mybatis</module>
-        <module>common-rabbitmq</module>
         <module>common-security</module>
-        <module>common-seata</module>
-        <module>common-sms</module>
+        <module>common-thirdparty</module>
+        <module>common-middleware</module>
     </modules>
 </project>

youlai-gateway/pom.xml

@@ -80,7 +80,6 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
         </dependency>
 
-        <!-- 公共依赖 -->
         <dependency>
             <groupId>com.youlai</groupId>
             <artifactId>common-core</artifactId>
@@ -88,7 +87,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-redis</artifactId>
+            <artifactId>common-middleware-redis</artifactId>
         </dependency>
 
     </dependencies>

youlai-gateway/src/main/java/com/youlai/gateway/GatewayApplication.java

@@ -4,6 +4,11 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
+/**
+ * 网关服务启动类
+ *
+ * @author ray
+ */
 @SpringBootApplication
 @EnableDiscoveryClient
 public class GatewayApplication {

youlai-system/system-boot/pom.xml

@@ -18,6 +18,13 @@
 
     <dependencies>
 
+        <!-- 单元测试 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <!-- Spring Cloud & Alibaba -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -59,17 +66,6 @@
             <artifactId>sentinel-datasource-nacos</artifactId>
         </dependency>
 
-        <!-- 分布式对象存储 -->
-        <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
@@ -80,21 +76,11 @@
             <artifactId>system-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.youlai</groupId>
-            <artifactId>common-redis</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.youlai</groupId>
             <artifactId>common-mybatis</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.youlai</groupId>
-            <artifactId>common-rabbitmq</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.youlai</groupId>
             <artifactId>common-security</artifactId>
@@ -102,14 +88,17 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-sms</artifactId>
+            <artifactId>common-middleware-redis</artifactId>
         </dependency>
 
-        <!-- 单元测试 -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
+            <groupId>com.youlai</groupId>
+            <artifactId>common-middleware-rabbitmq</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.youlai</groupId>
+            <artifactId>common-thirdparty-sms</artifactId>
         </dependency>
 
     </dependencies>

youlai-system/system-boot/src/main/java/com/youlai/system/SystemApplication.java

@@ -4,6 +4,11 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
+/**
+ * 系统服务启动类
+ *
+ * @author ray
+ */
 @SpringBootApplication
 @EnableDiscoveryClient
 public class SystemApplication {