From 0e8a8fca3133e15c5a3c8fbdadae9c678421356b 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: Wed, 4 Aug 2021 17:26:14 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=A7=BB=E5=8A=A8=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E4=B8=9A=E5=8A=A1=E5=88=B0=20system=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-oss/pom.xml                                           | 4 ----
 ruoyi-system/pom.xml                                        | 6 ++++++
 .../java/com/ruoyi/system/controller/SysOssController.java  | 4 ++--
 .../src/main/java/com/ruoyi/system/domain/SysOss.java       | 0
 .../src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java  | 0
 .../src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java  | 0
 .../src/main/java/com/ruoyi/system/mapper/SysOssMapper.java | 0
 .../main/java/com/ruoyi/system/service/ISysOssService.java  | 2 +-
 .../com/ruoyi/system/service/impl/SysOssServiceImpl.java    | 6 +++---
 .../src/main/resources/mapper/system/SysOssMapper.xml       | 0
 10 files changed, 12 insertions(+), 10 deletions(-)
 rename {ruoyi-oss => ruoyi-system}/src/main/java/com/ruoyi/system/controller/SysOssController.java (100%)
 rename {ruoyi-oss => ruoyi-system}/src/main/java/com/ruoyi/system/domain/SysOss.java (100%)
 rename {ruoyi-oss => ruoyi-system}/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java (100%)
 rename {ruoyi-oss => ruoyi-system}/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java (100%)
 rename {ruoyi-oss => ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java (100%)
 rename {ruoyi-oss => ruoyi-system}/src/main/java/com/ruoyi/system/service/ISysOssService.java (100%)
 rename {ruoyi-oss => ruoyi-system}/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java (100%)
 rename {ruoyi-oss => ruoyi-system}/src/main/resources/mapper/system/SysOssMapper.xml (100%)

diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml
index 6fd1bd7d0..68e6a8c45 100644
--- a/ruoyi-oss/pom.xml
+++ b/ruoyi-oss/pom.xml
@@ -22,10 +22,6 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-system</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.qiniu</groupId>
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 3665c8054..f95e293cc 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -23,6 +23,12 @@
             <artifactId>ruoyi-common</artifactId>
         </dependency>
 
+        <!-- OSS功能模块 -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-oss</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOssController.java
similarity index 100%
rename from ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java
rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOssController.java
index 8a84c42e3..02ec2e791 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOssController.java
@@ -11,10 +11,10 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.system.domain.bo.SysOssBo;
 import com.ruoyi.system.domain.SysOss;
-import com.ruoyi.system.service.ISysOssService;
+import com.ruoyi.system.domain.bo.SysOssBo;
 import com.ruoyi.system.domain.vo.SysOssVo;
+import com.ruoyi.system.service.ISysOssService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/domain/SysOss.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java
similarity index 100%
rename from ruoyi-oss/src/main/java/com/ruoyi/system/domain/SysOss.java
rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java
similarity index 100%
rename from ruoyi-oss/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java
rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java
similarity index 100%
rename from ruoyi-oss/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java
rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java
similarity index 100%
rename from ruoyi-oss/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java
rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java
similarity index 100%
rename from ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java
rename to ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java
index 4f998e0f5..b5dc0784f 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java
@@ -2,8 +2,8 @@ package com.ruoyi.system.service;
 
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.system.domain.bo.SysOssBo;
 import com.ruoyi.system.domain.SysOss;
+import com.ruoyi.system.domain.bo.SysOssBo;
 import com.ruoyi.system.domain.vo.SysOssVo;
 import org.springframework.web.multipart.MultipartFile;
 
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
similarity index 100%
rename from ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
rename to ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
index 0d7544323..771834aa8 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
@@ -1,6 +1,5 @@
 package com.ruoyi.system.service.impl;
 
-import com.ruoyi.common.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
@@ -8,14 +7,15 @@ import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.oss.entity.UploadResult;
 import com.ruoyi.oss.factory.OssFactory;
 import com.ruoyi.oss.service.ICloudStorageService;
-import com.ruoyi.system.domain.bo.SysOssBo;
 import com.ruoyi.system.domain.SysOss;
+import com.ruoyi.system.domain.bo.SysOssBo;
+import com.ruoyi.system.domain.vo.SysOssVo;
 import com.ruoyi.system.mapper.SysOssMapper;
 import com.ruoyi.system.service.ISysOssService;
-import com.ruoyi.system.domain.vo.SysOssVo;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
diff --git a/ruoyi-oss/src/main/resources/mapper/system/SysOssMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml
similarity index 100%
rename from ruoyi-oss/src/main/resources/mapper/system/SysOssMapper.xml
rename to ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml