diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageStaffController.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageStaffController.java index dff87cc..1dd96e6 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageStaffController.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageStaffController.java @@ -8,7 +8,7 @@ import com.cpop.oam.business.service.DeptService; import com.cpop.oam.business.service.RoleService; import com.cpop.oam.business.service.StaffService; import com.cpop.oam.business.vo.*; -import com.cpop.system.framework.enums.InitRoleEnum; +import com.cpop.oam.framework.enums.InitRoleEnum; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import io.swagger.v3.oas.annotations.Operation; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageSysCommonController.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageSysCommonController.java index 2dbc438..f6e7136 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageSysCommonController.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageSysCommonController.java @@ -4,7 +4,7 @@ import com.cpop.core.base.entity.R; import com.cpop.core.utils.file.FileUploadUtils; import com.cpop.core.utils.file.FileUtils; import com.cpop.system.business.vo.SysFileVo; -import com.cpop.system.framework.handler.TencentCosHandler; +import com.cpop.oam.framework.handler.tencentCos.TencentCosHandler; import com.qcloud.cos.model.UploadResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/dto/BizLicenseOcrDto.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/dto/BizLicenseOcrDto.java similarity index 95% rename from Cpop-System/src/main/java/com/cpop/system/business/dto/BizLicenseOcrDto.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/dto/BizLicenseOcrDto.java index 0035bc3..b865a62 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/dto/BizLicenseOcrDto.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/dto/BizLicenseOcrDto.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.dto; +package com.cpop.oam.business.dto; import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DataImportServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DataImportServiceImpl.java index c634865..4ce9dc8 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DataImportServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DataImportServiceImpl.java @@ -25,7 +25,7 @@ import com.cpop.oam.business.service.DataImportService; import com.cpop.oam.business.vo.DataImportPageVo; import com.cpop.oam.framework.constant.OamRedisConstant; import com.cpop.system.business.vo.SysFileVo; -import com.cpop.system.framework.handler.TencentCosHandler; +import com.cpop.oam.framework.handler.tencentCos.TencentCosHandler; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictDataServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictDataServiceImpl.java index bb52d33..d2a87f4 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictDataServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictDataServiceImpl.java @@ -10,7 +10,7 @@ import com.cpop.oam.business.bo.DictDataBo; import com.cpop.oam.business.bo.DictDataPageBo; import com.cpop.oam.business.vo.DictDataPageVo; import com.cpop.oam.business.vo.DictDataVo; -import com.cpop.system.framework.utils.DictUtils; +import com.cpop.oam.framework.utils.DictUtils; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictTypeServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictTypeServiceImpl.java index 5960d07..948108d 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictTypeServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictTypeServiceImpl.java @@ -10,7 +10,7 @@ import com.cpop.oam.business.bo.DictTypeBo; import com.cpop.oam.business.entity.DictData; import com.cpop.oam.business.service.DictDataService; import com.cpop.oam.business.vo.DictTypePageVo; -import com.cpop.system.framework.utils.DictUtils; +import com.cpop.oam.framework.utils.DictUtils; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java index 116147c..344abef 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java @@ -14,7 +14,7 @@ import com.cpop.oam.business.mapper.MenuMapper; import com.cpop.oam.business.service.MenuService; import com.cpop.system.business.vo.MenuRouteVo; import com.cpop.system.business.vo.MenuVo; -import com.cpop.system.framework.enums.InitRoleEnum; +import com.cpop.oam.framework.enums.InitRoleEnum; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/OamWxCpServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/OamWxCpServiceImpl.java index b3a9d28..2666fb0 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/OamWxCpServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/OamWxCpServiceImpl.java @@ -18,7 +18,7 @@ import com.cpop.oam.business.service.StaffMidDeptService; import com.cpop.oam.business.service.StaffService; import com.cpop.oam.business.vo.WxCpLoginVo; import com.cpop.oam.framework.config.wxCp.WxCpConfiguration; -import com.cpop.system.framework.enums.InitRoleEnum; +import com.cpop.oam.framework.enums.InitRoleEnum; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.row.Db; import com.mybatisflex.core.row.Row; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleServiceImpl.java index 4f74c79..845eeba 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleServiceImpl.java @@ -5,7 +5,7 @@ import com.cpop.core.base.entity.PageDomain; import com.cpop.core.base.enums.UserType; import com.cpop.core.utils.StringUtils; import com.cpop.core.utils.bean.BeanUtils; -import com.cpop.system.framework.enums.InitRoleEnum; +import com.cpop.oam.framework.enums.InitRoleEnum; import com.cpop.core.utils.SpringUtils; import com.cpop.core.utils.SqlUtils; import com.cpop.system.business.bo.RoleBo; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/TaskServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/TaskServiceImpl.java index 0286a9d..6fc683e 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/TaskServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/TaskServiceImpl.java @@ -26,7 +26,7 @@ import com.cpop.oam.framework.constant.OamConfigKey; import com.cpop.oam.framework.constant.OamRedisConstant; import com.cpop.oam.framework.constant.WebHookKeyConstant; import com.cpop.oam.framework.enums.OamConfigEnum; -import com.cpop.system.framework.utils.DictUtils; +import com.cpop.oam.framework.utils.DictUtils; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.row.Db; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/InitConfig.java b/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/InitConfig.java index 1378e50..65e194c 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/InitConfig.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/InitConfig.java @@ -3,7 +3,7 @@ package com.cpop.oam.framework.config; import com.cpop.core.utils.SpringUtils; import com.cpop.oam.business.entity.Role; import com.cpop.oam.business.service.RoleService; -import com.cpop.system.framework.enums.InitRoleEnum; +import com.cpop.oam.framework.enums.InitRoleEnum; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/Cpop-System/src/main/java/com/cpop/system/framework/config/SaTokenConfigure.java b/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/SaTokenConfigure.java similarity index 98% rename from Cpop-System/src/main/java/com/cpop/system/framework/config/SaTokenConfigure.java rename to Cpop-Oam/src/main/java/com/cpop/oam/framework/config/SaTokenConfigure.java index e6aa1d7..8b2158a 100644 --- a/Cpop-System/src/main/java/com/cpop/system/framework/config/SaTokenConfigure.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/SaTokenConfigure.java @@ -1,4 +1,4 @@ -package com.cpop.system.framework.config; +package com.cpop.oam.framework.config; import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.jwt.StpLogicJwtForSimple; diff --git a/Cpop-System/src/main/java/com/cpop/system/framework/config/tencentCos/TencentCosProperties.java b/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/tencentCos/TencentCosProperties.java similarity index 91% rename from Cpop-System/src/main/java/com/cpop/system/framework/config/tencentCos/TencentCosProperties.java rename to Cpop-Oam/src/main/java/com/cpop/oam/framework/config/tencentCos/TencentCosProperties.java index f6f9a81..4594946 100644 --- a/Cpop-System/src/main/java/com/cpop/system/framework/config/tencentCos/TencentCosProperties.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/tencentCos/TencentCosProperties.java @@ -1,4 +1,4 @@ -package com.cpop.system.framework.config.tencentCos; +package com.cpop.oam.framework.config.tencentCos; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/Cpop-System/src/main/java/com/cpop/system/framework/enums/InitRoleEnum.java b/Cpop-Oam/src/main/java/com/cpop/oam/framework/enums/InitRoleEnum.java similarity index 96% rename from Cpop-System/src/main/java/com/cpop/system/framework/enums/InitRoleEnum.java rename to Cpop-Oam/src/main/java/com/cpop/oam/framework/enums/InitRoleEnum.java index d98deb6..03d8431 100644 --- a/Cpop-System/src/main/java/com/cpop/system/framework/enums/InitRoleEnum.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/framework/enums/InitRoleEnum.java @@ -1,4 +1,4 @@ -package com.cpop.system.framework.enums; +package com.cpop.oam.framework.enums; import com.cpop.core.base.enums.UserType; import lombok.Getter; diff --git a/Cpop-System/src/main/java/com/cpop/system/framework/enums/OrderSource.java b/Cpop-Oam/src/main/java/com/cpop/oam/framework/enums/OrderSource.java similarity index 93% rename from Cpop-System/src/main/java/com/cpop/system/framework/enums/OrderSource.java rename to Cpop-Oam/src/main/java/com/cpop/oam/framework/enums/OrderSource.java index 748e851..cbb2de0 100644 --- a/Cpop-System/src/main/java/com/cpop/system/framework/enums/OrderSource.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/framework/enums/OrderSource.java @@ -1,4 +1,4 @@ -package com.cpop.system.framework.enums; +package com.cpop.oam.framework.enums; import lombok.Getter; diff --git a/Cpop-System/src/main/java/com/cpop/system/framework/handler/TencentCosHandler.java b/Cpop-Oam/src/main/java/com/cpop/oam/framework/handler/tencentCos/TencentCosHandler.java similarity index 98% rename from Cpop-System/src/main/java/com/cpop/system/framework/handler/TencentCosHandler.java rename to Cpop-Oam/src/main/java/com/cpop/oam/framework/handler/tencentCos/TencentCosHandler.java index f210dd4..40f2a28 100644 --- a/Cpop-System/src/main/java/com/cpop/system/framework/handler/TencentCosHandler.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/framework/handler/tencentCos/TencentCosHandler.java @@ -1,11 +1,11 @@ -package com.cpop.system.framework.handler; +package com.cpop.oam.framework.handler.tencentCos; import com.alibaba.fastjson2.JSONObject; import com.cpop.core.base.exception.UtilException; import com.cpop.core.utils.file.FileTypeUtils; import com.cpop.core.utils.uuid.IdUtils; -import com.cpop.system.business.dto.BizLicenseOcrDto; -import com.cpop.system.framework.config.tencentCos.TencentCosProperties; +import com.cpop.oam.business.dto.BizLicenseOcrDto; +import com.cpop.oam.framework.config.tencentCos.TencentCosProperties; import com.qcloud.cos.COSClient; import com.qcloud.cos.ClientConfig; import com.qcloud.cos.auth.BasicCOSCredentials; diff --git a/Cpop-System/src/main/java/com/cpop/system/framework/utils/DictUtils.java b/Cpop-Oam/src/main/java/com/cpop/oam/framework/utils/DictUtils.java similarity index 98% rename from Cpop-System/src/main/java/com/cpop/system/framework/utils/DictUtils.java rename to Cpop-Oam/src/main/java/com/cpop/oam/framework/utils/DictUtils.java index d9b4a25..fe82d52 100644 --- a/Cpop-System/src/main/java/com/cpop/system/framework/utils/DictUtils.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/framework/utils/DictUtils.java @@ -1,4 +1,4 @@ -package com.cpop.system.framework.utils; +package com.cpop.oam.framework.utils; import cn.dev33.satoken.stp.StpUtil; import com.alibaba.fastjson.JSONArray; @@ -7,7 +7,7 @@ import com.cpop.core.constant.Constants; import com.cpop.core.service.RedisService; import com.cpop.core.utils.SpringUtils; import com.cpop.core.utils.StringUtils; -import com.cpop.system.business.entity.DictData; +import com.cpop.oam.business.entity.DictData; import java.util.Collection; import java.util.Comparator; diff --git a/Cpop-System/src/main/java/com/cpop/system/framework/constant/SystemRedisKey.java b/Cpop-System/src/main/java/com/cpop/system/framework/constant/SystemRedisKey.java deleted file mode 100644 index 3bb5f2a..0000000 --- a/Cpop-System/src/main/java/com/cpop/system/framework/constant/SystemRedisKey.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.cpop.system.framework.constant; - -/** - * @author DB - * @version 1.0.0 - * @since 2024-01-11 15:33 - */ -public interface SystemRedisKey { - - /** - * 校区到期日期 - */ - String STORE_SIGN_EXPIRE_DATE = "oam:storeSign:expireDate:"; -}