From 6673f7ae464d35ce07e8d3aa9a0a1f8cd4165781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Thu, 6 Jan 2022 11:53:46 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=8A=BD=E5=8F=96=20ruoyi-api-file=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=20=E8=A7=84=E8=8C=83=E7=94=A8=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 +++ ruoyi-api/pom.xml | 1 + ruoyi-api/ruoyi-api-file/pom.xml | 28 ++++++++++ .../ruoyi/file}/api/RemoteFileService.java | 40 +++++++------- .../com/ruoyi/file}/api/domain/SysFile.java | 52 +++++++++---------- .../main/resources/META-INF/spring.factories | 1 - ruoyi-common/ruoyi-common-log/pom.xml | 1 + .../common/log/service/AsyncLogService.java | 2 +- ruoyi-modules/ruoyi-file/pom.xml | 3 +- .../file/controller/SysFileController.java | 2 +- .../file/dubbo/RemoteFileServiceImpl.java | 4 +- ruoyi-modules/ruoyi-gen/pom.xml | 5 ++ ruoyi-modules/ruoyi-system/pom.xml | 11 ++++ .../controller/SysProfileController.java | 4 +- 14 files changed, 106 insertions(+), 55 deletions(-) create mode 100644 ruoyi-api/ruoyi-api-file/pom.xml rename ruoyi-api/{ruoyi-api-system/src/main/java/com/ruoyi/system => ruoyi-api-file/src/main/java/com/ruoyi/file}/api/RemoteFileService.java (74%) rename ruoyi-api/{ruoyi-api-system/src/main/java/com/ruoyi/system => ruoyi-api-file/src/main/java/com/ruoyi/file}/api/domain/SysFile.java (84%) delete mode 100644 ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring.factories diff --git a/pom.xml b/pom.xml index ea143e19..9ba2ff3f 100644 --- a/pom.xml +++ b/pom.xml @@ -294,6 +294,13 @@ ${ruoyi.version} + + + com.ruoyi + ruoyi-api-file + ${ruoyi.version} + + diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index 3fd8274f..d79eda80 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -10,6 +10,7 @@ ruoyi-api-system + ruoyi-api-file ruoyi-api diff --git a/ruoyi-api/ruoyi-api-file/pom.xml b/ruoyi-api/ruoyi-api-file/pom.xml new file mode 100644 index 00000000..c584a064 --- /dev/null +++ b/ruoyi-api/ruoyi-api-file/pom.xml @@ -0,0 +1,28 @@ + + + + com.ruoyi + ruoyi-api + 0.2.0 + + 4.0.0 + + ruoyi-api-file + + + ruoyi-api-file文件服务接口模块 + + + + + + + com.ruoyi + ruoyi-common-core + + + + + \ No newline at end of file diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java b/ruoyi-api/ruoyi-api-file/src/main/java/com/ruoyi/file/api/RemoteFileService.java similarity index 74% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java rename to ruoyi-api/ruoyi-api-file/src/main/java/com/ruoyi/file/api/RemoteFileService.java index 69ff5efc..50c35ecc 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java +++ b/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); +} diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java b/ruoyi-api/ruoyi-api-file/src/main/java/com/ruoyi/file/api/domain/SysFile.java similarity index 84% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java rename to ruoyi-api/ruoyi-api-file/src/main/java/com/ruoyi/file/api/domain/SysFile.java index 0b1149a9..ee5c8d6f 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java +++ b/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; + +} diff --git a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring.factories b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 61102dd3..00000000 --- a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration= diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index b4340b72..54845ea4 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -26,6 +26,7 @@ com.ruoyi ruoyi-common-dubbo + provided diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java index 771eb2f4..608377ff 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java +++ b/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; /** diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index fdc92faa..6a32381b 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -54,10 +54,9 @@ ${minio.version} - com.ruoyi - ruoyi-api-system + ruoyi-api-file diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java index 6cab5dc5..45bd3c01 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/dubbo/RemoteFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/dubbo/RemoteFileServiceImpl.java index a5748202..1f733cd6 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/dubbo/RemoteFileServiceImpl.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index 9a0fdf58..168cfb28 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -89,6 +89,11 @@ ruoyi-common-datasource + + com.ruoyi + ruoyi-common-dubbo + + diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 849d49e8..78e75d3b 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -88,6 +88,17 @@ ruoyi-common-dubbo + + + com.ruoyi + ruoyi-api-system + + + + com.ruoyi + ruoyi-api-file + + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java index 5e021bbb..4f7a7c27 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java +++ b/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;