From 639e1cb9f3cf7077fcf62b9240e3b753d382d642 Mon Sep 17 00:00:00 2001
From: D <3066417822@qq.com>
Date: Sat, 20 Apr 2024 02:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86minio=E7=A7=BB=E5=8A=A8=E8=87=B3?=
 =?UTF-8?q?=E4=B8=AD=E9=97=B4=E4=BB=B6=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BAstarter=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 17 +++---
 ruoyi-admin/pom.xml                           |  2 +-
 ruoyi-middleware/pom.xml                      | 57 +++++++++++++++++++
 .../ruoyi-middleware-minio}/pom.xml           |  6 +-
 .../middleware}/minio/config/MinioConfig.java |  2 +-
 .../minio/controller/MinioController.java     |  4 +-
 .../minio/utils/FileUploadMinioUtils.java     |  5 +-
 .../middleware}/minio/utils/MinioUtil.java    |  2 +-
 .../ruoyi-middleware-starter/pom.xml          | 32 +++++++++++
 9 files changed, 108 insertions(+), 19 deletions(-)
 create mode 100644 ruoyi-middleware/pom.xml
 rename {ruoyi-minio => ruoyi-middleware/ruoyi-middleware-minio}/pom.xml (87%)
 rename {ruoyi-minio/src/main/java/com/ruoyi => ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware}/minio/config/MinioConfig.java (97%)
 rename {ruoyi-minio/src/main/java/com/ruoyi => ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware}/minio/controller/MinioController.java (91%)
 rename {ruoyi-minio/src/main/java/com/ruoyi => ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware}/minio/utils/FileUploadMinioUtils.java (94%)
 rename {ruoyi-minio/src/main/java/com/ruoyi => ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware}/minio/utils/MinioUtil.java (97%)
 create mode 100644 ruoyi-middleware/ruoyi-middleware-starter/pom.xml

diff --git a/pom.xml b/pom.xml
index e2bebbb..ae3899b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,6 @@
         <jaxb.version>2.3.1</jaxb.version>
         <springdoc.version>2.1.0</springdoc.version>
         <jakarta.version>6.0.0</jakarta.version>
-        <minio.version>8.2.1</minio.version>
     </properties>
 
 
@@ -199,13 +198,6 @@
                 <version>${jakarta.version}</version>
             </dependency>
 
-            <!-- Minio 文件存储 -->
-            <dependency>
-                <groupId>io.minio</groupId>
-                <artifactId>minio</artifactId>
-                <version>${minio.version}</version>
-            </dependency>
-
             <!-- 定时任务-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -255,6 +247,13 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
+            <!-- 集成中间件 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-middleware-starter</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
             <!-- 在线接口 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -289,7 +288,7 @@
         <module>ruoyi-pay</module>
         <module>ruoyi-online</module>
         <module>ruoyi-mybatis-jpa</module>
-        <module>ruoyi-minio</module>
+        <module>ruoyi-middleware</module>
     </modules>
     <packaging>pom</packaging>
 
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index a86aa3d..f06c417 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -78,7 +78,7 @@
         <!-- minio -->
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-minio</artifactId>
+            <artifactId>ruoyi-middleware-starter</artifactId>
         </dependency>
 
         <!-- knife4j -->
diff --git a/ruoyi-middleware/pom.xml b/ruoyi-middleware/pom.xml
new file mode 100644
index 0000000..f9aef1c
--- /dev/null
+++ b/ruoyi-middleware/pom.xml
@@ -0,0 +1,57 @@
+<?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">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.8.7.3.2</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-middleware</artifactId>
+
+    <properties>
+        <ruoyi.version>3.8.7.3.2</ruoyi.version>
+        <minio.version>8.2.1</minio.version>
+    </properties>
+
+    <description>
+        支付模块
+    </description>
+    <dependencyManagement>
+        <dependencies>
+            <!-- 通用工具-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- Minio 文件存储 -->
+            <dependency>
+                <groupId>io.minio</groupId>
+                <artifactId>minio</artifactId>
+                <version>${minio.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-middleware-minio</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-middleware-starter</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+
+    <modules>
+        <module>ruoyi-middleware-minio</module>
+        <module>ruoyi-middleware-starter</module>
+    </modules>
+    <packaging>pom</packaging>
+</project>
\ No newline at end of file
diff --git a/ruoyi-minio/pom.xml b/ruoyi-middleware/ruoyi-middleware-minio/pom.xml
similarity index 87%
rename from ruoyi-minio/pom.xml
rename to ruoyi-middleware/ruoyi-middleware-minio/pom.xml
index fa8567d..470f9a7 100644
--- a/ruoyi-minio/pom.xml
+++ b/ruoyi-middleware/ruoyi-middleware-minio/pom.xml
@@ -2,16 +2,16 @@
 <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">
     <parent>
-        <artifactId>ruoyi</artifactId>
+        <artifactId>ruoyi-middleware</artifactId>
         <groupId>com.ruoyi</groupId>
         <version>3.8.7.3.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-minio</artifactId>
+    <artifactId>ruoyi-middleware-minio</artifactId>
 
     <description>
-        minio文件上传模块
+        中间件
     </description>
 
     <dependencies>
diff --git a/ruoyi-minio/src/main/java/com/ruoyi/minio/config/MinioConfig.java b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/config/MinioConfig.java
similarity index 97%
rename from ruoyi-minio/src/main/java/com/ruoyi/minio/config/MinioConfig.java
rename to ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/config/MinioConfig.java
index bb0ec0c..d339c05 100644
--- a/ruoyi-minio/src/main/java/com/ruoyi/minio/config/MinioConfig.java
+++ b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/config/MinioConfig.java
@@ -1,4 +1,4 @@
-package com.ruoyi.minio.config;
+package com.ruoyi.middleware.minio.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
diff --git a/ruoyi-minio/src/main/java/com/ruoyi/minio/controller/MinioController.java b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/controller/MinioController.java
similarity index 91%
rename from ruoyi-minio/src/main/java/com/ruoyi/minio/controller/MinioController.java
rename to ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/controller/MinioController.java
index f66092c..48159c8 100644
--- a/ruoyi-minio/src/main/java/com/ruoyi/minio/controller/MinioController.java
+++ b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/controller/MinioController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.minio.controller;
+package com.ruoyi.middleware.minio.controller;
 
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -8,7 +8,7 @@ import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.minio.utils.FileUploadMinioUtils;
+import com.ruoyi.middleware.minio.utils.FileUploadMinioUtils;
 
 @RestController
 @RequestMapping("/minio")
diff --git a/ruoyi-minio/src/main/java/com/ruoyi/minio/utils/FileUploadMinioUtils.java b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/FileUploadMinioUtils.java
similarity index 94%
rename from ruoyi-minio/src/main/java/com/ruoyi/minio/utils/FileUploadMinioUtils.java
rename to ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/FileUploadMinioUtils.java
index 792eada..c68294b 100644
--- a/ruoyi-minio/src/main/java/com/ruoyi/minio/utils/FileUploadMinioUtils.java
+++ b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/FileUploadMinioUtils.java
@@ -1,4 +1,4 @@
-package com.ruoyi.minio.utils;
+package com.ruoyi.middleware.minio.utils;
 
 import java.io.IOException;
 
@@ -9,7 +9,8 @@ import com.ruoyi.common.exception.file.FileSizeLimitExceededException;
 import com.ruoyi.common.exception.file.InvalidExtensionException;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
-import com.ruoyi.minio.config.MinioConfig;
+import com.ruoyi.middleware.minio.config.MinioConfig;
+import com.ruoyi.middleware.minio.utils.MinioUtil;
 
 public class FileUploadMinioUtils extends FileUploadUtils {
      /**
diff --git a/ruoyi-minio/src/main/java/com/ruoyi/minio/utils/MinioUtil.java b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/MinioUtil.java
similarity index 97%
rename from ruoyi-minio/src/main/java/com/ruoyi/minio/utils/MinioUtil.java
rename to ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/MinioUtil.java
index a756a70..46783c0 100644
--- a/ruoyi-minio/src/main/java/com/ruoyi/minio/utils/MinioUtil.java
+++ b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/MinioUtil.java
@@ -1,4 +1,4 @@
-package com.ruoyi.minio.utils;
+package com.ruoyi.middleware.minio.utils;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/ruoyi-middleware/ruoyi-middleware-starter/pom.xml b/ruoyi-middleware/ruoyi-middleware-starter/pom.xml
new file mode 100644
index 0000000..2adf51f
--- /dev/null
+++ b/ruoyi-middleware/ruoyi-middleware-starter/pom.xml
@@ -0,0 +1,32 @@
+<?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">
+    <parent>
+        <artifactId>ruoyi-middleware</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.8.7.3.2</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-middleware-starter</artifactId>
+
+    <description>
+        中间件
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-middleware-minio</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>