瀏覽代碼

update 移动文件存储业务到 system 模块

疯狂的狮子li 3 年之前
父節點
當前提交
0e8a8fca31

+ 0 - 4
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>

+ 6 - 0
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>

+ 2 - 2
ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java → 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;

+ 0 - 0
ruoyi-oss/src/main/java/com/ruoyi/system/domain/SysOss.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java


+ 0 - 0
ruoyi-oss/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java


+ 0 - 0
ruoyi-oss/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java


+ 0 - 0
ruoyi-oss/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java


+ 1 - 1
ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java → 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;
 

+ 3 - 3
ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java → 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;
 

+ 0 - 0
ruoyi-oss/src/main/resources/mapper/system/SysOssMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml