Sfoglia il codice sorgente

update 抽取 ruoyi-api-file 模块 规范用法

疯狂的狮子li 4 anni fa
parent
commit
6673f7ae46

+ 7 - 0
pom.xml

@@ -294,6 +294,13 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
+            <!-- 文件服务接口 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-api-file</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

+ 1 - 0
ruoyi-api/pom.xml

@@ -10,6 +10,7 @@
 
     <modules>
         <module>ruoyi-api-system</module>
+        <module>ruoyi-api-file</module>
     </modules>
 
     <artifactId>ruoyi-api</artifactId>

+ 28 - 0
ruoyi-api/ruoyi-api-file/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-api</artifactId>
+        <version>0.2.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    
+    <artifactId>ruoyi-api-file</artifactId>
+
+    <description>
+        ruoyi-api-file文件服务接口模块
+    </description>
+
+    <dependencies>
+		
+        <!-- RuoYi Common Core-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+        
+    </dependencies>
+
+</project>

+ 20 - 20
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java → ruoyi-api/ruoyi-api-file/src/main/java/com/ruoyi/file/api/RemoteFileService.java

@@ -1,20 +1,20 @@
-package com.ruoyi.system.api;
-
-import com.ruoyi.system.api.domain.SysFile;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 文件服务
- *
- * @author Lion Li
- */
-public interface RemoteFileService {
-
-    /**
-     * 上传文件
-     *
-     * @param file 文件信息
-     * @return 结果
-     */
-    SysFile upload(MultipartFile file);
-}
+package com.ruoyi.file.api;
+
+import com.ruoyi.file.api.domain.SysFile;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 文件服务
+ *
+ * @author Lion Li
+ */
+public interface RemoteFileService {
+
+    /**
+     * 上传文件
+     *
+     * @param file 文件信息
+     * @return 结果
+     */
+    SysFile upload(MultipartFile file);
+}

+ 26 - 26
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java → ruoyi-api/ruoyi-api-file/src/main/java/com/ruoyi/file/api/domain/SysFile.java

@@ -1,26 +1,26 @@
-package com.ruoyi.system.api.domain;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-/**
- * 文件信息
- *
- * @author ruoyi
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-public class SysFile {
-    /**
-     * 文件名称
-     */
-    private String name;
-
-    /**
-     * 文件地址
-     */
-    private String url;
-
-}
+package com.ruoyi.file.api.domain;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * 文件信息
+ *
+ * @author ruoyi
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+public class SysFile {
+    /**
+     * 文件名称
+     */
+    private String name;
+
+    /**
+     * 文件地址
+     */
+    private String url;
+
+}

+ 0 - 1
ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring.factories

@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=

+ 1 - 0
ruoyi-common/ruoyi-common-log/pom.xml

@@ -26,6 +26,7 @@
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-dubbo</artifactId>
+            <scope>provided</scope>
         </dependency>
         
     </dependencies>

+ 1 - 1
ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class AsyncLogService {
 
-    @DubboReference
+    @DubboReference(async = true)
     private RemoteLogService remoteLogService;
 
     /**

+ 1 - 2
ruoyi-modules/ruoyi-file/pom.xml

@@ -54,10 +54,9 @@
             <version>${minio.version}</version>
         </dependency>
         
-        <!-- RuoYi Api System -->
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-api-system</artifactId>
+            <artifactId>ruoyi-api-file</artifactId>
         </dependency>
         
         <!-- RuoYi Common Swagger -->

+ 1 - 1
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java

@@ -2,8 +2,8 @@ package com.ruoyi.file.controller;
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.file.FileUtils;
+import com.ruoyi.file.api.domain.SysFile;
 import com.ruoyi.file.service.ISysFileService;
-import com.ruoyi.system.api.domain.SysFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

+ 2 - 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/dubbo/RemoteFileServiceImpl.java

@@ -2,9 +2,9 @@ package com.ruoyi.file.dubbo;
 
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.file.FileUtils;
+import com.ruoyi.file.api.RemoteFileService;
+import com.ruoyi.file.api.domain.SysFile;
 import com.ruoyi.file.service.ISysFileService;
-import com.ruoyi.system.api.RemoteFileService;
-import com.ruoyi.system.api.domain.SysFile;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;

+ 5 - 0
ruoyi-modules/ruoyi-gen/pom.xml

@@ -89,6 +89,11 @@
             <artifactId>ruoyi-common-datasource</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-dubbo</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

+ 11 - 0
ruoyi-modules/ruoyi-system/pom.xml

@@ -88,6 +88,17 @@
             <artifactId>ruoyi-common-dubbo</artifactId>
         </dependency>
 
+        <!-- RuoYi Api System -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-api-system</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-api-file</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java

@@ -8,8 +8,8 @@ import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.RemoteFileService;
-import com.ruoyi.system.api.domain.SysFile;
+import com.ruoyi.file.api.RemoteFileService;
+import com.ruoyi.file.api.domain.SysFile;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
 import com.ruoyi.system.service.ISysUserService;