diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml index 6fd1bd7d..68e6a8c4 100644 --- a/ruoyi-oss/pom.xml +++ b/ruoyi-oss/pom.xml @@ -22,10 +22,6 @@ com.ruoyi ruoyi-common - - com.ruoyi - ruoyi-system - com.qiniu diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index 3665c805..f95e293c 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -23,6 +23,12 @@ ruoyi-common + + + com.ruoyi + ruoyi-oss + + 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 8a84c42e..02ec2e79 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 4f998e0f..b5dc0784 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 0d754432..771834aa 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