Explorar o código

修改:<修改包名>

张旭锋 hai 5 días
pai
achega
f9ae99572a
Modificáronse 100 ficheiros con 380 adicións e 382 borrados
  1. 1 1
      src/main/java/com/jtzx/crm/JtzxCrmSysApplication.java
  2. 9 12
      src/main/java/com/jtzx/crm/aspect/SysLogAspect.java
  3. 5 5
      src/main/java/com/jtzx/crm/aspect/extension/SysLogAspectExtensionForSysUserLogin.java
  4. 2 2
      src/main/java/com/jtzx/crm/config/AdminSaTokenExtendConfiguration.java
  5. 7 4
      src/main/java/com/jtzx/crm/config/AsyncConfiguration.java
  6. 1 1
      src/main/java/com/jtzx/crm/config/AsyncVThreadConfiguration.java
  7. 1 1
      src/main/java/com/jtzx/crm/config/CorsConfiguration.java
  8. 5 6
      src/main/java/com/jtzx/crm/config/CustomInterceptorConfiguration.java
  9. 1 1
      src/main/java/com/jtzx/crm/config/CustomizationBean.java
  10. 1 1
      src/main/java/com/jtzx/crm/config/NotFoundConfiguration.java
  11. 1 1
      src/main/java/com/jtzx/crm/config/RedisConfig.java
  12. 3 3
      src/main/java/com/jtzx/crm/helper/CaptchaHelper.java
  13. 1 1
      src/main/java/com/jtzx/crm/helper/RolePermissionCacheHelper.java
  14. 2 3
      src/main/java/com/jtzx/crm/interceptor/AdminSaTokenParseInterceptor.java
  15. 1 1
      src/main/java/com/jtzx/crm/interceptor/DefaultSaTokenParseInterceptor.java
  16. 3 3
      src/main/java/com/jtzx/crm/module/api/constant/ApiConstant.java
  17. 1 1
      src/main/java/com/jtzx/crm/module/api/enums/AdminApiErrorEnum.java
  18. 1 1
      src/main/java/com/jtzx/crm/module/api/event/KickOutSysUsersEvent.java
  19. 3 3
      src/main/java/com/jtzx/crm/module/api/listener/AdminApiEventListener.java
  20. 1 1
      src/main/java/com/jtzx/crm/module/api/model/interior/AdminCaptchaContainer.java
  21. 2 2
      src/main/java/com/jtzx/crm/module/api/model/response/AdminCaptchaVO.java
  22. 1 1
      src/main/java/com/jtzx/crm/module/api/model/response/AdminSelectOptionItemVO.java
  23. 1 1
      src/main/java/com/jtzx/crm/module/api/util/CrmAdminStpUtil.java
  24. 14 14
      src/main/java/com/jtzx/crm/module/api/web/auth/AdminAuthController.java
  25. 9 9
      src/main/java/com/jtzx/crm/module/api/web/common/AdminSelectOptionsController.java
  26. 7 7
      src/main/java/com/jtzx/crm/module/api/web/oss/AdminOssFileInfoController.java
  27. 12 12
      src/main/java/com/jtzx/crm/module/api/web/oss/AdminOssUploadDownloadController.java
  28. 69 69
      src/main/java/com/jtzx/crm/module/api/web/sys/AdminCurrentSysUserController.java
  29. 12 12
      src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysDataDictController.java
  30. 8 8
      src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysDeptController.java
  31. 7 7
      src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysLogController.java
  32. 8 8
      src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysMenuController.java
  33. 9 9
      src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysParamController.java
  34. 11 11
      src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysRoleController.java
  35. 13 13
      src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysTenantController.java
  36. 12 12
      src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysUserController.java
  37. 1 1
      src/main/java/com/jtzx/crm/module/oss/config/FileStorageConfiguration.java
  38. 1 1
      src/main/java/com/jtzx/crm/module/oss/constant/OssConstant.java
  39. 1 1
      src/main/java/com/jtzx/crm/module/oss/entity/OssFileInfoEntity.java
  40. 1 1
      src/main/java/com/jtzx/crm/module/oss/enums/OssErrorEnum.java
  41. 1 1
      src/main/java/com/jtzx/crm/module/oss/enums/UploadFileCheckResultEnum.java
  42. 4 4
      src/main/java/com/jtzx/crm/module/oss/facade/OssUploadDownloadFacade.java
  43. 7 7
      src/main/java/com/jtzx/crm/module/oss/facade/impl/OssUploadDownloadFacadeImpl.java
  44. 2 2
      src/main/java/com/jtzx/crm/module/oss/mapper/OssFileInfoMapper.java
  45. 1 1
      src/main/java/com/jtzx/crm/module/oss/model/request/AdminListOssFileInfoDTO.java
  46. 1 1
      src/main/java/com/jtzx/crm/module/oss/model/request/UploadFileAttributeDTO.java
  47. 1 1
      src/main/java/com/jtzx/crm/module/oss/model/response/OssFileDownloadReplyBO.java
  48. 1 1
      src/main/java/com/jtzx/crm/module/oss/model/response/OssFileInfoBO.java
  49. 1 1
      src/main/java/com/jtzx/crm/module/oss/model/response/OssFileUploadResultVO.java
  50. 8 8
      src/main/java/com/jtzx/crm/module/oss/service/OssFileInfoService.java
  51. 2 2
      src/main/java/com/jtzx/crm/module/oss/util/UploadFileChecker.java
  52. 3 3
      src/main/java/com/jtzx/crm/module/sys/annotation/SysLog.java
  53. 1 1
      src/main/java/com/jtzx/crm/module/sys/constant/SysConstant.java
  54. 1 1
      src/main/java/com/jtzx/crm/module/sys/entity/SysDataDictClassifiedEntity.java
  55. 1 1
      src/main/java/com/jtzx/crm/module/sys/entity/SysDataDictItemEntity.java
  56. 1 1
      src/main/java/com/jtzx/crm/module/sys/entity/SysDeptEntity.java
  57. 2 2
      src/main/java/com/jtzx/crm/module/sys/entity/SysLogEntity.java
  58. 2 2
      src/main/java/com/jtzx/crm/module/sys/entity/SysMenuEntity.java
  59. 1 1
      src/main/java/com/jtzx/crm/module/sys/entity/SysParamEntity.java
  60. 2 2
      src/main/java/com/jtzx/crm/module/sys/entity/SysRoleEntity.java
  61. 1 1
      src/main/java/com/jtzx/crm/module/sys/entity/SysRoleMenuRelationEntity.java
  62. 1 1
      src/main/java/com/jtzx/crm/module/sys/entity/SysTenantEntity.java
  63. 1 1
      src/main/java/com/jtzx/crm/module/sys/entity/SysUserDeptRelationEntity.java
  64. 4 4
      src/main/java/com/jtzx/crm/module/sys/entity/SysUserEntity.java
  65. 1 1
      src/main/java/com/jtzx/crm/module/sys/entity/SysUserRoleRelationEntity.java
  66. 1 1
      src/main/java/com/jtzx/crm/module/sys/enums/SysErrorEnum.java
  67. 1 1
      src/main/java/com/jtzx/crm/module/sys/enums/SysLogStatusEnum.java
  68. 1 1
      src/main/java/com/jtzx/crm/module/sys/enums/SysMenuTypeEnum.java
  69. 1 1
      src/main/java/com/jtzx/crm/module/sys/enums/SysUserStatusEnum.java
  70. 4 4
      src/main/java/com/jtzx/crm/module/sys/extension/SysLogAspectExtension.java
  71. 3 3
      src/main/java/com/jtzx/crm/module/sys/extension/impl/DefaultSysLogAspectExtension.java
  72. 4 4
      src/main/java/com/jtzx/crm/module/sys/facade/SysTenantFacade.java
  73. 16 16
      src/main/java/com/jtzx/crm/module/sys/facade/impl/SysTenantFacadeImpl.java
  74. 2 2
      src/main/java/com/jtzx/crm/module/sys/mapper/SysDataDictClassifiedMapper.java
  75. 2 2
      src/main/java/com/jtzx/crm/module/sys/mapper/SysDataDictItemMapper.java
  76. 2 2
      src/main/java/com/jtzx/crm/module/sys/mapper/SysDeptMapper.java
  77. 2 2
      src/main/java/com/jtzx/crm/module/sys/mapper/SysLogMapper.java
  78. 2 2
      src/main/java/com/jtzx/crm/module/sys/mapper/SysMenuMapper.java
  79. 2 2
      src/main/java/com/jtzx/crm/module/sys/mapper/SysParamMapper.java
  80. 2 2
      src/main/java/com/jtzx/crm/module/sys/mapper/SysRoleMapper.java
  81. 2 2
      src/main/java/com/jtzx/crm/module/sys/mapper/SysRoleMenuRelationMapper.java
  82. 2 2
      src/main/java/com/jtzx/crm/module/sys/mapper/SysTenantMapper.java
  83. 2 2
      src/main/java/com/jtzx/crm/module/sys/mapper/SysUserDeptRelationMapper.java
  84. 3 3
      src/main/java/com/jtzx/crm/module/sys/mapper/SysUserMapper.java
  85. 2 2
      src/main/java/com/jtzx/crm/module/sys/mapper/SysUserRoleRelationMapper.java
  86. 3 3
      src/main/java/com/jtzx/crm/module/sys/mapper/xml/SysUserMapper.xml
  87. 2 2
      src/main/java/com/jtzx/crm/module/sys/model/interior/UserDeptContainer.java
  88. 2 2
      src/main/java/com/jtzx/crm/module/sys/model/interior/UserRoleContainer.java
  89. 1 1
      src/main/java/com/jtzx/crm/module/sys/model/request/AdminBindRoleMenuRelationDTO.java
  90. 1 1
      src/main/java/com/jtzx/crm/module/sys/model/request/AdminBindUserRoleRelationDTO.java
  91. 1 1
      src/main/java/com/jtzx/crm/module/sys/model/request/AdminInsertOrUpdateSysDeptDTO.java
  92. 2 2
      src/main/java/com/jtzx/crm/module/sys/model/request/AdminInsertOrUpdateSysMenuDTO.java
  93. 1 1
      src/main/java/com/jtzx/crm/module/sys/model/request/AdminInsertOrUpdateSysParamDTO.java
  94. 2 2
      src/main/java/com/jtzx/crm/module/sys/model/request/AdminInsertOrUpdateSysRoleDTO.java
  95. 2 2
      src/main/java/com/jtzx/crm/module/sys/model/request/AdminInsertOrUpdateSysUserDTO.java
  96. 2 2
      src/main/java/com/jtzx/crm/module/sys/model/request/AdminInsertSysLogDTO.java
  97. 1 1
      src/main/java/com/jtzx/crm/module/sys/model/request/AdminInsertSysTenantDTO.java
  98. 2 2
      src/main/java/com/jtzx/crm/module/sys/model/request/AdminListSysLogDTO.java
  99. 1 1
      src/main/java/com/jtzx/crm/module/sys/model/request/AdminListSysParamDTO.java
  100. 1 1
      src/main/java/com/jtzx/crm/module/sys/model/request/AdminListSysRoleDTO.java

+ 1 - 1
src/main/java/cc/uncarbon/JtzxCrmSysApplication.java → src/main/java/com/jtzx/crm/JtzxCrmSysApplication.java

@@ -1,4 +1,4 @@
-package cc.uncarbon;
+package com.jtzx.crm;
 
 import cc.uncarbon.framework.crud.annotation.EnableInitHikariPoolAtStartup;
 import org.springframework.boot.SpringApplication;

+ 9 - 12
src/main/java/cc/uncarbon/aspect/SysLogAspect.java → src/main/java/com/jtzx/crm/aspect/SysLogAspect.java

@@ -1,15 +1,15 @@
-package cc.uncarbon.aspect;
+package com.jtzx.crm.aspect;
 
 import cc.uncarbon.framework.core.context.UserContext;
 import cc.uncarbon.framework.core.context.UserContextHolder;
 import cc.uncarbon.framework.web.util.IPUtil;
-import cc.uncarbon.module.sys.annotation.SysLog;
-import cc.uncarbon.module.sys.enums.SysLogStatusEnum;
-import cc.uncarbon.module.sys.extension.SysLogAspectExtension;
-import cc.uncarbon.module.sys.extension.impl.DefaultSysLogAspectExtension;
-import cc.uncarbon.module.sys.model.request.AdminInsertSysLogDTO;
-import cc.uncarbon.module.sys.model.response.IPLocationBO;
-import cc.uncarbon.module.sys.service.SysLogService;
+import com.jtzx.crm.module.sys.annotation.SysLog;
+import com.jtzx.crm.module.sys.enums.SysLogStatusEnum;
+import com.jtzx.crm.module.sys.extension.SysLogAspectExtension;
+import com.jtzx.crm.module.sys.extension.impl.DefaultSysLogAspectExtension;
+import com.jtzx.crm.module.sys.model.request.AdminInsertSysLogDTO;
+import com.jtzx.crm.module.sys.model.response.IPLocationBO;
+import com.jtzx.crm.module.sys.service.SysLogService;
 import cn.dev33.satoken.spring.SpringMVCUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
@@ -217,10 +217,7 @@ public class SysLogAspect {
          */
         AspectContext(HttpServletRequest request) {
             this.userContext = UserContextHolder.getUserContext();
-            /*
-            记录IP地址
-            https://gitee.com/uncarbon97/helio-boot/issues/I5KN1X
-             */
+            //记录IP地址
             String ip = UserContextHolder.getClientIP();
             if (CharSequenceUtil.isEmpty(ip)) {
                 // 兜底处理,直接从request中拿

+ 5 - 5
src/main/java/cc/uncarbon/aspect/extension/SysLogAspectExtensionForSysUserLogin.java → src/main/java/com/jtzx/crm/aspect/extension/SysLogAspectExtensionForSysUserLogin.java

@@ -1,9 +1,9 @@
-package cc.uncarbon.aspect.extension;
+package com.jtzx.crm.aspect.extension;
 
-import cc.uncarbon.module.sys.annotation.SysLog;
-import cc.uncarbon.module.sys.extension.impl.DefaultSysLogAspectExtension;
-import cc.uncarbon.module.sys.model.request.AdminInsertSysLogDTO;
-import cc.uncarbon.module.sys.model.request.SysUserLoginDTO;
+import com.jtzx.crm.module.sys.annotation.SysLog;
+import com.jtzx.crm.module.sys.extension.impl.DefaultSysLogAspectExtension;
+import com.jtzx.crm.module.sys.model.request.AdminInsertSysLogDTO;
+import com.jtzx.crm.module.sys.model.request.SysUserLoginDTO;
 import lombok.NoArgsConstructor;
 import org.aspectj.lang.JoinPoint;
 

+ 2 - 2
src/main/java/cc/uncarbon/config/AdminSaTokenExtendConfiguration.java → src/main/java/com/jtzx/crm/config/AdminSaTokenExtendConfiguration.java

@@ -1,7 +1,7 @@
-package cc.uncarbon.config;
+package com.jtzx.crm.config;
 
 import cc.uncarbon.framework.core.context.UserContextHolder;
-import cc.uncarbon.helper.RolePermissionCacheHelper;
+import com.jtzx.crm.helper.RolePermissionCacheHelper;
 import cn.dev33.satoken.stp.StpInterface;
 import java.util.List;
 import lombok.RequiredArgsConstructor;

+ 7 - 4
src/main/java/cc/uncarbon/config/AsyncConfiguration.java → src/main/java/com/jtzx/crm/config/AsyncConfiguration.java

@@ -1,7 +1,8 @@
-package cc.uncarbon.config;
+package com.jtzx.crm.config;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.jspecify.annotations.NonNull;
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.boot.autoconfigure.task.TaskExecutionProperties;
 import org.springframework.context.annotation.Bean;
@@ -34,8 +35,6 @@ public class AsyncConfiguration implements AsyncConfigurer {
     @Primary
     @Bean(name = "taskExecutor")
     public ThreadPoolTaskExecutor taskExecutor() {
-        final String threadNamePrefix = "taskExecutor-";
-
         if (log.isDebugEnabled()) {
             log.debug("[异步任务线程池] 创建默认线程池【taskExecutor】,该线程池参数可通过 spring.task.execution 调节 >> "
                             + "corePoolSize核心线程池大小={}, maxPoolSize最大线程数={}, queueCapacity队列容量={}"
@@ -47,6 +46,10 @@ public class AsyncConfiguration implements AsyncConfigurer {
             );
         }
 
+        return createExecutor();
+    }
+
+    private @NonNull ThreadPoolTaskExecutor createExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         // 核心线程池大小,默认 8
         executor.setCorePoolSize(taskExecutionProperties.getPool().getCoreSize());
@@ -57,7 +60,7 @@ public class AsyncConfiguration implements AsyncConfigurer {
         // 拒绝策略
         executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
         // 线程名前缀
-        executor.setThreadNamePrefix(threadNamePrefix);
+        executor.setThreadNamePrefix("taskExecutor-");
         // 这个配置是为了graceful shutdown?
         executor.setWaitForTasksToCompleteOnShutdown(true);
 

+ 1 - 1
src/main/java/cc/uncarbon/config/AsyncVThreadConfiguration.java → src/main/java/com/jtzx/crm/config/AsyncVThreadConfiguration.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.config;
+package com.jtzx.crm.config;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
src/main/java/cc/uncarbon/config/CorsConfiguration.java → src/main/java/com/jtzx/crm/config/CorsConfiguration.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.config;
+package com.jtzx.crm.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;

+ 5 - 6
src/main/java/cc/uncarbon/config/CustomInterceptorConfiguration.java → src/main/java/com/jtzx/crm/config/CustomInterceptorConfiguration.java

@@ -1,11 +1,10 @@
-package cc.uncarbon.config;
+package com.jtzx.crm.config;
 
 import cc.uncarbon.framework.core.props.HelioProperties;
-import cc.uncarbon.interceptor.AdminSaTokenParseInterceptor;
-import cc.uncarbon.interceptor.DefaultSaTokenParseInterceptor;
-import cc.uncarbon.module.api.constant.AdminApiConstant;
+import com.jtzx.crm.interceptor.AdminSaTokenParseInterceptor;
+import com.jtzx.crm.interceptor.DefaultSaTokenParseInterceptor;
+import com.jtzx.crm.module.api.constant.ApiConstant;
 import cn.dev33.satoken.interceptor.SaInterceptor;
-import cn.dev33.satoken.stp.StpUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -37,7 +36,7 @@ public class CustomInterceptorConfiguration implements WebMvcConfigurer {
 
         registry
                 .addInterceptor(new AdminSaTokenParseInterceptor())
-                .addPathPatterns(AdminApiConstant.HTTP_API_URL_PREFIX + "/**")
+                .addPathPatterns(ApiConstant.HTTP_API_URL_PREFIX + "/**")
                 .excludePathPatterns(helioProperties.getSecurity().getExcludeRoutes());
 
         /*

+ 1 - 1
src/main/java/cc/uncarbon/config/CustomizationBean.java → src/main/java/com/jtzx/crm/config/CustomizationBean.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.config;
+package com.jtzx.crm.config;
 
 import io.undertow.server.DefaultByteBufferPool;
 import io.undertow.websockets.jsr.WebSocketDeploymentInfo;

+ 1 - 1
src/main/java/cc/uncarbon/config/NotFoundConfiguration.java → src/main/java/com/jtzx/crm/config/NotFoundConfiguration.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.config;
+package com.jtzx.crm.config;
 
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.boot.web.servlet.error.ErrorController;

+ 1 - 1
src/main/java/cc/uncarbon/config/RedisConfig.java → src/main/java/com/jtzx/crm/config/RedisConfig.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.config;
+package com.jtzx.crm.config;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.ObjectMapper;

+ 3 - 3
src/main/java/cc/uncarbon/helper/CaptchaHelper.java → src/main/java/com/jtzx/crm/helper/CaptchaHelper.java

@@ -1,8 +1,8 @@
-package cc.uncarbon.helper;
+package com.jtzx.crm.helper;
 
 import cc.uncarbon.framework.core.exception.BusinessException;
-import cc.uncarbon.module.api.enums.AdminApiErrorEnum;
-import cc.uncarbon.module.api.model.interior.AdminCaptchaContainer;
+import com.jtzx.crm.module.api.enums.AdminApiErrorEnum;
+import com.jtzx.crm.module.api.model.interior.AdminCaptchaContainer;
 import cn.hutool.captcha.CaptchaUtil;
 import cn.hutool.captcha.ShearCaptcha;
 import cn.hutool.core.date.LocalDateTimeUtil;

+ 1 - 1
src/main/java/cc/uncarbon/helper/RolePermissionCacheHelper.java → src/main/java/com/jtzx/crm/helper/RolePermissionCacheHelper.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.helper;
+package com.jtzx.crm.helper;
 
 import cc.uncarbon.framework.core.context.UserContextHolder;
 import cn.hutool.core.collection.CollUtil;

+ 2 - 3
src/main/java/cc/uncarbon/interceptor/AdminSaTokenParseInterceptor.java → src/main/java/com/jtzx/crm/interceptor/AdminSaTokenParseInterceptor.java

@@ -1,11 +1,10 @@
-package cc.uncarbon.interceptor;
+package com.jtzx.crm.interceptor;
 
-import cc.uncarbon.framework.core.context.TenantContext;
 import cc.uncarbon.framework.core.context.TenantContextHolder;
 import cc.uncarbon.framework.core.context.UserContext;
 import cc.uncarbon.framework.core.context.UserContextHolder;
 import cc.uncarbon.framework.web.util.IPUtil;
-import cc.uncarbon.module.api.util.CrmAdminStpUtil;
+import com.jtzx.crm.module.api.util.CrmAdminStpUtil;
 import cn.dev33.satoken.session.SaSession;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
src/main/java/cc/uncarbon/interceptor/DefaultSaTokenParseInterceptor.java → src/main/java/com/jtzx/crm/interceptor/DefaultSaTokenParseInterceptor.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.interceptor;
+package com.jtzx.crm.interceptor;
 
 import cc.uncarbon.framework.core.context.TenantContext;
 import cc.uncarbon.framework.core.context.TenantContextHolder;

+ 3 - 3
src/main/java/cc/uncarbon/module/api/constant/AdminApiConstant.java → src/main/java/com/jtzx/crm/module/api/constant/ApiConstant.java

@@ -1,11 +1,11 @@
-package cc.uncarbon.module.api.constant;
+package com.jtzx.crm.module.api.constant;
 
 
 /**
  * 后台管理接口常量
  */
-public final class AdminApiConstant {
-    private AdminApiConstant() {
+public final class ApiConstant {
+    private ApiConstant() {
     }
 
     /**

+ 1 - 1
src/main/java/cc/uncarbon/module/api/enums/AdminApiErrorEnum.java → src/main/java/com/jtzx/crm/module/api/enums/AdminApiErrorEnum.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.api.enums;
+package com.jtzx.crm.module.api.enums;
 
 import cc.uncarbon.framework.core.enums.HelioBaseEnum;
 import lombok.AllArgsConstructor;

+ 1 - 1
src/main/java/cc/uncarbon/module/api/event/KickOutSysUsersEvent.java → src/main/java/com/jtzx/crm/module/api/event/KickOutSysUsersEvent.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.api.event;
+package com.jtzx.crm.module.api.event;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

+ 3 - 3
src/main/java/cc/uncarbon/module/api/listener/AdminApiEventListener.java → src/main/java/com/jtzx/crm/module/api/listener/AdminApiEventListener.java

@@ -1,7 +1,7 @@
-package cc.uncarbon.module.api.listener;
+package com.jtzx.crm.module.api.listener;
 
-import cc.uncarbon.module.api.event.KickOutSysUsersEvent;
-import cc.uncarbon.module.api.util.CrmAdminStpUtil;
+import com.jtzx.crm.module.api.event.KickOutSysUsersEvent;
+import com.jtzx.crm.module.api.util.CrmAdminStpUtil;
 import cn.hutool.core.collection.CollUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;

+ 1 - 1
src/main/java/cc/uncarbon/module/api/model/interior/AdminCaptchaContainer.java → src/main/java/com/jtzx/crm/module/api/model/interior/AdminCaptchaContainer.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.api.model.interior;
+package com.jtzx.crm.module.api.model.interior;
 
 import cn.hutool.captcha.AbstractCaptcha;
 

+ 2 - 2
src/main/java/cc/uncarbon/module/api/model/response/AdminCaptchaVO.java → src/main/java/com/jtzx/crm/module/api/model/response/AdminCaptchaVO.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.api.model.response;
+package com.jtzx.crm.module.api.model.response;
 
-import cc.uncarbon.module.api.model.interior.AdminCaptchaContainer;
+import com.jtzx.crm.module.api.model.interior.AdminCaptchaContainer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 

+ 1 - 1
src/main/java/cc/uncarbon/module/api/model/response/AdminSelectOptionItemVO.java → src/main/java/com/jtzx/crm/module/api/model/response/AdminSelectOptionItemVO.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.api.model.response;
+package com.jtzx.crm.module.api.model.response;
 
 import cc.uncarbon.framework.core.enums.HelioBaseEnum;
 import cn.hutool.core.collection.CollUtil;

+ 1 - 1
src/main/java/cc/uncarbon/module/api/util/CrmAdminStpUtil.java → src/main/java/com/jtzx/crm/module/api/util/CrmAdminStpUtil.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.api.util;
+package com.jtzx.crm.module.api.util;
 
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.fun.SaFunction;

+ 14 - 14
src/main/java/cc/uncarbon/module/api/web/auth/AdminAuthController.java → src/main/java/com/jtzx/crm/module/api/web/auth/AdminAuthController.java

@@ -1,22 +1,22 @@
-package cc.uncarbon.module.api.web.auth;
+package com.jtzx.crm.module.api.web.auth;
 
 
-import cc.uncarbon.aspect.extension.SysLogAspectExtensionForSysUserLogin;
+import com.jtzx.crm.aspect.extension.SysLogAspectExtensionForSysUserLogin;
 import cc.uncarbon.framework.core.context.TenantContextHolder;
 import cc.uncarbon.framework.core.context.UserContext;
 import cc.uncarbon.framework.core.context.UserContextHolder;
 import cc.uncarbon.framework.web.model.response.ApiResult;
-import cc.uncarbon.helper.CaptchaHelper;
-import cc.uncarbon.helper.RolePermissionCacheHelper;
-import cc.uncarbon.module.api.constant.AdminApiConstant;
-import cc.uncarbon.module.api.model.interior.AdminCaptchaContainer;
-import cc.uncarbon.module.api.model.response.AdminCaptchaVO;
-import cc.uncarbon.module.api.util.CrmAdminStpUtil;
-import cc.uncarbon.module.sys.annotation.SysLog;
-import cc.uncarbon.module.sys.model.request.SysUserLoginDTO;
-import cc.uncarbon.module.sys.model.response.SysUserLoginBO;
-import cc.uncarbon.module.sys.model.response.SysUserLoginVO;
-import cc.uncarbon.module.sys.service.SysUserService;
+import com.jtzx.crm.helper.CaptchaHelper;
+import com.jtzx.crm.helper.RolePermissionCacheHelper;
+import com.jtzx.crm.module.api.constant.ApiConstant;
+import com.jtzx.crm.module.api.model.interior.AdminCaptchaContainer;
+import com.jtzx.crm.module.api.model.response.AdminCaptchaVO;
+import com.jtzx.crm.module.api.util.CrmAdminStpUtil;
+import com.jtzx.crm.module.sys.annotation.SysLog;
+import com.jtzx.crm.module.sys.model.request.SysUserLoginDTO;
+import com.jtzx.crm.module.sys.model.response.SysUserLoginBO;
+import com.jtzx.crm.module.sys.model.response.SysUserLoginVO;
+import com.jtzx.crm.module.sys.service.SysUserService;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.*;
 
 
 @Tag(name = "后台管理-鉴权接口")
-@RequestMapping(value = AdminApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
+@RequestMapping(value = ApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
 @RequiredArgsConstructor
 @RestController
 @Slf4j

+ 9 - 9
src/main/java/cc/uncarbon/module/api/web/common/AdminSelectOptionsController.java → src/main/java/com/jtzx/crm/module/api/web/common/AdminSelectOptionsController.java

@@ -1,14 +1,14 @@
-package cc.uncarbon.module.api.web.common;
+package com.jtzx.crm.module.api.web.common;
 
 
 import cc.uncarbon.framework.web.model.response.ApiResult;
-import cc.uncarbon.module.api.constant.AdminApiConstant;
-import cc.uncarbon.module.api.model.response.AdminSelectOptionItemVO;
-import cc.uncarbon.module.api.util.CrmAdminStpUtil;
-import cc.uncarbon.module.sys.model.response.SysDeptBO;
-import cc.uncarbon.module.sys.model.response.SysRoleBO;
-import cc.uncarbon.module.sys.service.SysDeptService;
-import cc.uncarbon.module.sys.service.SysRoleService;
+import com.jtzx.crm.module.api.constant.ApiConstant;
+import com.jtzx.crm.module.api.model.response.AdminSelectOptionItemVO;
+import com.jtzx.crm.module.api.util.CrmAdminStpUtil;
+import com.jtzx.crm.module.sys.model.response.SysDeptBO;
+import com.jtzx.crm.module.sys.model.response.SysRoleBO;
+import com.jtzx.crm.module.sys.service.SysDeptService;
+import com.jtzx.crm.module.sys.service.SysRoleService;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
@@ -23,7 +23,7 @@ import java.util.List;
 // 约束:登录后才能使用   👇 后台管理对应的鉴权工具类
 @SaCheckLogin(type = CrmAdminStpUtil.TYPE)
 @Tag(name = "后台管理-下拉框数据源接口")
-@RequestMapping(AdminApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
+@RequestMapping(ApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
 @RequiredArgsConstructor
 @RestController
 @Slf4j

+ 7 - 7
src/main/java/cc/uncarbon/module/api/web/oss/AdminOssFileInfoController.java → src/main/java/com/jtzx/crm/module/api/web/oss/AdminOssFileInfoController.java

@@ -1,15 +1,15 @@
-package cc.uncarbon.module.api.web.oss;
+package com.jtzx.crm.module.api.web.oss;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import cc.uncarbon.framework.core.page.PageParam;
 import cc.uncarbon.framework.core.page.PageResult;
 import cc.uncarbon.framework.web.model.request.IdsDTO;
 import cc.uncarbon.framework.web.model.response.ApiResult;
-import cc.uncarbon.module.api.constant.AdminApiConstant;
-import cc.uncarbon.module.oss.model.request.AdminListOssFileInfoDTO;
-import cc.uncarbon.module.oss.model.response.OssFileInfoBO;
-import cc.uncarbon.module.oss.service.OssFileInfoService;
-import cc.uncarbon.module.api.util.CrmAdminStpUtil;
+import com.jtzx.crm.module.api.constant.ApiConstant;
+import com.jtzx.crm.module.oss.model.request.AdminListOssFileInfoDTO;
+import com.jtzx.crm.module.oss.model.response.OssFileInfoBO;
+import com.jtzx.crm.module.oss.service.OssFileInfoService;
+import com.jtzx.crm.module.api.util.CrmAdminStpUtil;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,7 +23,7 @@ import jakarta.validation.Valid;
 
 @SaCheckLogin(type = CrmAdminStpUtil.TYPE)
 @Tag(name = "后台管理-上传文件信息管理接口")
-@RequestMapping(value = AdminApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
+@RequestMapping(value = ApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
 @RequiredArgsConstructor
 @RestController
 @Slf4j

+ 12 - 12
src/main/java/cc/uncarbon/module/api/web/oss/AdminOssUploadDownloadController.java → src/main/java/com/jtzx/crm/module/api/web/oss/AdminOssUploadDownloadController.java

@@ -1,17 +1,17 @@
-package cc.uncarbon.module.api.web.oss;
+package com.jtzx.crm.module.api.web.oss;
 
 import cc.uncarbon.framework.core.exception.BusinessException;
 import cc.uncarbon.framework.web.model.response.ApiResult;
-import cc.uncarbon.module.api.constant.AdminApiConstant;
-import cc.uncarbon.module.api.enums.AdminApiErrorEnum;
-import cc.uncarbon.module.api.util.CrmAdminStpUtil;
-import cc.uncarbon.module.oss.enums.UploadFileCheckResultEnum;
-import cc.uncarbon.module.oss.facade.OssUploadDownloadFacade;
-import cc.uncarbon.module.oss.model.request.UploadFileAttributeDTO;
-import cc.uncarbon.module.oss.model.response.OssFileDownloadReplyBO;
-import cc.uncarbon.module.oss.model.response.OssFileInfoBO;
-import cc.uncarbon.module.oss.model.response.OssFileUploadResultVO;
-import cc.uncarbon.module.oss.util.UploadFileChecker;
+import com.jtzx.crm.module.api.constant.ApiConstant;
+import com.jtzx.crm.module.api.enums.AdminApiErrorEnum;
+import com.jtzx.crm.module.api.util.CrmAdminStpUtil;
+import com.jtzx.crm.module.oss.enums.UploadFileCheckResultEnum;
+import com.jtzx.crm.module.oss.facade.OssUploadDownloadFacade;
+import com.jtzx.crm.module.oss.model.request.UploadFileAttributeDTO;
+import com.jtzx.crm.module.oss.model.response.OssFileDownloadReplyBO;
+import com.jtzx.crm.module.oss.model.response.OssFileInfoBO;
+import com.jtzx.crm.module.oss.model.response.OssFileUploadResultVO;
+import com.jtzx.crm.module.oss.util.UploadFileChecker;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.text.CharSequenceUtil;
@@ -35,7 +35,7 @@ import java.nio.charset.StandardCharsets;
 
 
 @Tag(name = "后台管理-上传、下载文件接口")
-@RequestMapping(value = AdminApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
+@RequestMapping(value = ApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
 @RequiredArgsConstructor
 @RestController
 @Slf4j

+ 69 - 69
src/main/java/cc/uncarbon/module/api/web/sys/AdminCurrentSysUserController.java → src/main/java/com/jtzx/crm/module/api/web/sys/AdminCurrentSysUserController.java

@@ -1,69 +1,69 @@
-package cc.uncarbon.module.api.web.sys;
-
-import cc.uncarbon.framework.core.exception.BusinessException;
-import cc.uncarbon.framework.web.model.response.ApiResult;
-import cc.uncarbon.module.api.constant.AdminApiConstant;
-import cc.uncarbon.module.api.util.CrmAdminStpUtil;
-import cc.uncarbon.module.sys.annotation.SysLog;
-import cc.uncarbon.module.sys.model.request.AdminUpdateCurrentSysUserAvatarDTO;
-import cc.uncarbon.module.sys.model.request.AdminUpdateCurrentSysUserInfoDTO;
-import cc.uncarbon.module.sys.model.request.AdminUpdateCurrentSysUserPasswordDTO;
-import cc.uncarbon.module.sys.model.response.VbenAdminUserInfoVO;
-import cc.uncarbon.module.sys.service.SysUserService;
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-
-@SaCheckLogin(type = CrmAdminStpUtil.TYPE)
-@Tag(name = "当前后台用户信息接口")
-@RequestMapping(value = AdminApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
-@RequiredArgsConstructor
-@RestController
-@Slf4j
-public class AdminCurrentSysUserController {
-
-    private final SysUserService sysUserService;
-
-
-    @Operation(summary = "取当前用户信息资料")
-    // 新路由与旧路由并行
-    @GetMapping(value = {"/sys/users/me/info", "/sys/users/info"})
-    public ApiResult<VbenAdminUserInfoVO> getMyInfo() {
-        return ApiResult.data(sysUserService.adminGetCurrentUserInfo());
-    }
-
-    @SysLog(value = "修改当前用户密码")
-    @Operation(summary = "修改当前用户密码")
-    @PostMapping(value = "/sys/users/me/password:update")
-    public ApiResult<Void> updatePassword(@RequestBody @Valid AdminUpdateCurrentSysUserPasswordDTO dto) {
-        if (!dto.getConfirmNewPassword().equals(dto.getNewPassword())) {
-            throw new BusinessException(400, "密码与确认密码不同,请检查");
-        }
-        sysUserService.adminUpdateCurrentUserPassword(dto);
-
-        // 用户更改密码后使其当前会话直接过期
-        CrmAdminStpUtil.logout();
-
-        return ApiResult.success();
-    }
-
-    @Operation(summary = "更新当前用户信息资料")
-    @PutMapping(value = "/sys/users/me/info")
-    public ApiResult<Void> updateMyInfo(@RequestBody @Valid AdminUpdateCurrentSysUserInfoDTO dto) {
-        sysUserService.adminUpdateCurrentUserInfo(dto);
-        return ApiResult.success();
-    }
-
-    @Operation(summary = "更新当前用户头像")
-    @PutMapping(value = "/sys/users/me/avatar")
-    public ApiResult<Void> updateMyAvatar(@RequestBody @Valid AdminUpdateCurrentSysUserAvatarDTO dto) {
-        sysUserService.adminUpdateCurrentUserAvatar(dto);
-        return ApiResult.success();
-    }
-
-}
+package com.jtzx.crm.module.api.web.sys;
+
+import cc.uncarbon.framework.core.exception.BusinessException;
+import cc.uncarbon.framework.web.model.response.ApiResult;
+import com.jtzx.crm.module.api.constant.ApiConstant;
+import com.jtzx.crm.module.api.util.CrmAdminStpUtil;
+import com.jtzx.crm.module.sys.annotation.SysLog;
+import com.jtzx.crm.module.sys.model.request.AdminUpdateCurrentSysUserAvatarDTO;
+import com.jtzx.crm.module.sys.model.request.AdminUpdateCurrentSysUserInfoDTO;
+import com.jtzx.crm.module.sys.model.request.AdminUpdateCurrentSysUserPasswordDTO;
+import com.jtzx.crm.module.sys.model.response.VbenAdminUserInfoVO;
+import com.jtzx.crm.module.sys.service.SysUserService;
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+
+@SaCheckLogin(type = CrmAdminStpUtil.TYPE)
+@Tag(name = "当前后台用户信息接口")
+@RequestMapping(value = ApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
+@RequiredArgsConstructor
+@RestController
+@Slf4j
+public class AdminCurrentSysUserController {
+
+    private final SysUserService sysUserService;
+
+
+    @Operation(summary = "取当前用户信息资料")
+    // 新路由与旧路由并行
+    @GetMapping(value = {"/sys/users/me/info", "/sys/users/info"})
+    public ApiResult<VbenAdminUserInfoVO> getMyInfo() {
+        return ApiResult.data(sysUserService.adminGetCurrentUserInfo());
+    }
+
+    @SysLog(value = "修改当前用户密码")
+    @Operation(summary = "修改当前用户密码")
+    @PostMapping(value = "/sys/users/me/password:update")
+    public ApiResult<Void> updatePassword(@RequestBody @Valid AdminUpdateCurrentSysUserPasswordDTO dto) {
+        if (!dto.getConfirmNewPassword().equals(dto.getNewPassword())) {
+            throw new BusinessException(400, "密码与确认密码不同,请检查");
+        }
+        sysUserService.adminUpdateCurrentUserPassword(dto);
+
+        // 用户更改密码后使其当前会话直接过期
+        CrmAdminStpUtil.logout();
+
+        return ApiResult.success();
+    }
+
+    @Operation(summary = "更新当前用户信息资料")
+    @PutMapping(value = "/sys/users/me/info")
+    public ApiResult<Void> updateMyInfo(@RequestBody @Valid AdminUpdateCurrentSysUserInfoDTO dto) {
+        sysUserService.adminUpdateCurrentUserInfo(dto);
+        return ApiResult.success();
+    }
+
+    @Operation(summary = "更新当前用户头像")
+    @PutMapping(value = "/sys/users/me/avatar")
+    public ApiResult<Void> updateMyAvatar(@RequestBody @Valid AdminUpdateCurrentSysUserAvatarDTO dto) {
+        sysUserService.adminUpdateCurrentUserAvatar(dto);
+        return ApiResult.success();
+    }
+
+}

+ 12 - 12
src/main/java/cc/uncarbon/module/api/web/sys/AdminSysDataDictController.java → src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysDataDictController.java

@@ -1,20 +1,20 @@
-package cc.uncarbon.module.api.web.sys;
+package com.jtzx.crm.module.api.web.sys;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import cc.uncarbon.framework.core.page.PageParam;
 import cc.uncarbon.framework.core.page.PageResult;
 import cc.uncarbon.framework.web.model.request.IdsDTO;
 import cc.uncarbon.framework.web.model.response.ApiResult;
-import cc.uncarbon.module.api.constant.AdminApiConstant;
-import cc.uncarbon.module.api.util.CrmAdminStpUtil;
-import cc.uncarbon.module.sys.annotation.SysLog;
-import cc.uncarbon.module.sys.model.request.AdminSysDataDictClassifiedInsertOrUpdateDTO;
-import cc.uncarbon.module.sys.model.request.AdminSysDataDictClassifiedListDTO;
-import cc.uncarbon.module.sys.model.request.AdminSysDataDictItemInsertOrUpdateDTO;
-import cc.uncarbon.module.sys.model.request.AdminSysDataDictItemListDTO;
-import cc.uncarbon.module.sys.model.response.SysDataDictClassifiedBO;
-import cc.uncarbon.module.sys.model.response.SysDataDictItemBO;
-import cc.uncarbon.module.sys.service.SysDataDictService;
+import com.jtzx.crm.module.api.constant.ApiConstant;
+import com.jtzx.crm.module.api.util.CrmAdminStpUtil;
+import com.jtzx.crm.module.sys.annotation.SysLog;
+import com.jtzx.crm.module.sys.model.request.AdminSysDataDictClassifiedInsertOrUpdateDTO;
+import com.jtzx.crm.module.sys.model.request.AdminSysDataDictClassifiedListDTO;
+import com.jtzx.crm.module.sys.model.request.AdminSysDataDictItemInsertOrUpdateDTO;
+import com.jtzx.crm.module.sys.model.request.AdminSysDataDictItemListDTO;
+import com.jtzx.crm.module.sys.model.response.SysDataDictClassifiedBO;
+import com.jtzx.crm.module.sys.model.response.SysDataDictItemBO;
+import com.jtzx.crm.module.sys.service.SysDataDictService;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.*;
 
 @SaCheckLogin(type = CrmAdminStpUtil.TYPE)
 @Tag(name = "数据字典管理接口")
-@RequestMapping(value = AdminApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
+@RequestMapping(value = ApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
 @RequiredArgsConstructor
 @RestController
 @Slf4j

+ 8 - 8
src/main/java/cc/uncarbon/module/api/web/sys/AdminSysDeptController.java → src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysDeptController.java

@@ -1,15 +1,15 @@
-package cc.uncarbon.module.api.web.sys;
+package com.jtzx.crm.module.api.web.sys;
 
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import cc.uncarbon.framework.web.model.request.IdsDTO;
 import cc.uncarbon.framework.web.model.response.ApiResult;
-import cc.uncarbon.module.api.constant.AdminApiConstant;
-import cc.uncarbon.module.sys.annotation.SysLog;
-import cc.uncarbon.module.sys.model.request.AdminInsertOrUpdateSysDeptDTO;
-import cc.uncarbon.module.sys.model.response.SysDeptBO;
-import cc.uncarbon.module.sys.service.SysDeptService;
-import cc.uncarbon.module.api.util.CrmAdminStpUtil;
+import com.jtzx.crm.module.api.constant.ApiConstant;
+import com.jtzx.crm.module.sys.annotation.SysLog;
+import com.jtzx.crm.module.sys.model.request.AdminInsertOrUpdateSysDeptDTO;
+import com.jtzx.crm.module.sys.model.response.SysDeptBO;
+import com.jtzx.crm.module.sys.service.SysDeptService;
+import com.jtzx.crm.module.api.util.CrmAdminStpUtil;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -24,7 +24,7 @@ import java.util.List;
 
 @SaCheckLogin(type = CrmAdminStpUtil.TYPE)
 @Tag(name = "部门管理接口")
-@RequestMapping(value = AdminApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
+@RequestMapping(value = ApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
 @RequiredArgsConstructor
 @RestController
 @Slf4j

+ 7 - 7
src/main/java/cc/uncarbon/module/api/web/sys/AdminSysLogController.java → src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysLogController.java

@@ -1,14 +1,14 @@
-package cc.uncarbon.module.api.web.sys;
+package com.jtzx.crm.module.api.web.sys;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import cc.uncarbon.framework.core.page.PageParam;
 import cc.uncarbon.framework.core.page.PageResult;
 import cc.uncarbon.framework.web.model.response.ApiResult;
-import cc.uncarbon.module.api.constant.AdminApiConstant;
-import cc.uncarbon.module.api.util.CrmAdminStpUtil;
-import cc.uncarbon.module.sys.model.request.AdminListSysLogDTO;
-import cc.uncarbon.module.sys.model.response.SysLogBO;
-import cc.uncarbon.module.sys.service.SysLogService;
+import com.jtzx.crm.module.api.constant.ApiConstant;
+import com.jtzx.crm.module.api.util.CrmAdminStpUtil;
+import com.jtzx.crm.module.sys.model.request.AdminListSysLogDTO;
+import com.jtzx.crm.module.sys.model.response.SysLogBO;
+import com.jtzx.crm.module.sys.service.SysLogService;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @SaCheckLogin(type = CrmAdminStpUtil.TYPE)
 @Tag(name = "系统日志管理接口")
-@RequestMapping(value = AdminApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
+@RequestMapping(value = ApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
 @RequiredArgsConstructor
 @RestController
 @Slf4j

+ 8 - 8
src/main/java/cc/uncarbon/module/api/web/sys/AdminSysMenuController.java → src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysMenuController.java

@@ -1,14 +1,14 @@
-package cc.uncarbon.module.api.web.sys;
+package com.jtzx.crm.module.api.web.sys;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import cc.uncarbon.framework.web.model.request.IdsDTO;
 import cc.uncarbon.framework.web.model.response.ApiResult;
-import cc.uncarbon.module.api.constant.AdminApiConstant;
-import cc.uncarbon.module.sys.annotation.SysLog;
-import cc.uncarbon.module.sys.model.request.AdminInsertOrUpdateSysMenuDTO;
-import cc.uncarbon.module.sys.model.response.SysMenuBO;
-import cc.uncarbon.module.sys.service.SysMenuService;
-import cc.uncarbon.module.api.util.CrmAdminStpUtil;
+import com.jtzx.crm.module.api.constant.ApiConstant;
+import com.jtzx.crm.module.sys.annotation.SysLog;
+import com.jtzx.crm.module.sys.model.request.AdminInsertOrUpdateSysMenuDTO;
+import com.jtzx.crm.module.sys.model.response.SysMenuBO;
+import com.jtzx.crm.module.sys.service.SysMenuService;
+import com.jtzx.crm.module.api.util.CrmAdminStpUtil;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,7 +23,7 @@ import java.util.List;
 
 @SaCheckLogin(type = CrmAdminStpUtil.TYPE)
 @Tag(name = "后台菜单管理接口")
-@RequestMapping(value = AdminApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
+@RequestMapping(value = ApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
 @RequiredArgsConstructor
 @RestController
 @Slf4j

+ 9 - 9
src/main/java/cc/uncarbon/module/api/web/sys/AdminSysParamController.java → src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysParamController.java

@@ -1,17 +1,17 @@
-package cc.uncarbon.module.api.web.sys;
+package com.jtzx.crm.module.api.web.sys;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import cc.uncarbon.framework.core.page.PageParam;
 import cc.uncarbon.framework.core.page.PageResult;
 import cc.uncarbon.framework.web.model.request.IdsDTO;
 import cc.uncarbon.framework.web.model.response.ApiResult;
-import cc.uncarbon.module.api.constant.AdminApiConstant;
-import cc.uncarbon.module.sys.annotation.SysLog;
-import cc.uncarbon.module.sys.model.request.AdminInsertOrUpdateSysParamDTO;
-import cc.uncarbon.module.sys.model.request.AdminListSysParamDTO;
-import cc.uncarbon.module.sys.model.response.SysParamBO;
-import cc.uncarbon.module.sys.service.SysParamService;
-import cc.uncarbon.module.api.util.CrmAdminStpUtil;
+import com.jtzx.crm.module.api.constant.ApiConstant;
+import com.jtzx.crm.module.sys.annotation.SysLog;
+import com.jtzx.crm.module.sys.model.request.AdminInsertOrUpdateSysParamDTO;
+import com.jtzx.crm.module.sys.model.request.AdminListSysParamDTO;
+import com.jtzx.crm.module.sys.model.response.SysParamBO;
+import com.jtzx.crm.module.sys.service.SysParamService;
+import com.jtzx.crm.module.api.util.CrmAdminStpUtil;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,7 +25,7 @@ import jakarta.validation.Valid;
 
 @SaCheckLogin(type = CrmAdminStpUtil.TYPE)
 @Tag(name = "系统参数管理接口")
-@RequestMapping(value = AdminApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
+@RequestMapping(value = ApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
 @RequiredArgsConstructor
 @RestController
 @Slf4j

+ 11 - 11
src/main/java/cc/uncarbon/module/api/web/sys/AdminSysRoleController.java → src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysRoleController.java

@@ -1,19 +1,19 @@
-package cc.uncarbon.module.api.web.sys;
+package com.jtzx.crm.module.api.web.sys;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import cc.uncarbon.framework.core.page.PageParam;
 import cc.uncarbon.framework.core.page.PageResult;
 import cc.uncarbon.framework.web.model.request.IdsDTO;
 import cc.uncarbon.framework.web.model.response.ApiResult;
-import cc.uncarbon.helper.RolePermissionCacheHelper;
-import cc.uncarbon.module.api.constant.AdminApiConstant;
-import cc.uncarbon.module.sys.annotation.SysLog;
-import cc.uncarbon.module.sys.model.request.AdminBindRoleMenuRelationDTO;
-import cc.uncarbon.module.sys.model.request.AdminInsertOrUpdateSysRoleDTO;
-import cc.uncarbon.module.sys.model.request.AdminListSysRoleDTO;
-import cc.uncarbon.module.sys.model.response.SysRoleBO;
-import cc.uncarbon.module.sys.service.SysRoleService;
-import cc.uncarbon.module.api.util.CrmAdminStpUtil;
+import com.jtzx.crm.helper.RolePermissionCacheHelper;
+import com.jtzx.crm.module.api.constant.ApiConstant;
+import com.jtzx.crm.module.sys.annotation.SysLog;
+import com.jtzx.crm.module.sys.model.request.AdminBindRoleMenuRelationDTO;
+import com.jtzx.crm.module.sys.model.request.AdminInsertOrUpdateSysRoleDTO;
+import com.jtzx.crm.module.sys.model.request.AdminListSysRoleDTO;
+import com.jtzx.crm.module.sys.model.response.SysRoleBO;
+import com.jtzx.crm.module.sys.service.SysRoleService;
+import com.jtzx.crm.module.api.util.CrmAdminStpUtil;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,7 +28,7 @@ import java.util.Set;
 
 @SaCheckLogin(type = CrmAdminStpUtil.TYPE)
 @Tag(name = "后台角色管理接口")
-@RequestMapping(value = AdminApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
+@RequestMapping(value = ApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
 @RequiredArgsConstructor
 @RestController
 @Slf4j

+ 13 - 13
src/main/java/cc/uncarbon/module/api/web/sys/AdminSysTenantController.java → src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysTenantController.java

@@ -1,21 +1,21 @@
-package cc.uncarbon.module.api.web.sys;
+package com.jtzx.crm.module.api.web.sys;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import cc.uncarbon.framework.core.page.PageParam;
 import cc.uncarbon.framework.core.page.PageResult;
 import cc.uncarbon.framework.web.model.request.IdsDTO;
 import cc.uncarbon.framework.web.model.response.ApiResult;
-import cc.uncarbon.module.api.constant.AdminApiConstant;
-import cc.uncarbon.module.api.event.KickOutSysUsersEvent;
-import cc.uncarbon.module.api.util.CrmAdminStpUtil;
-import cc.uncarbon.module.sys.annotation.SysLog;
-import cc.uncarbon.module.sys.facade.SysTenantFacade;
-import cc.uncarbon.module.sys.model.request.AdminInsertSysTenantDTO;
-import cc.uncarbon.module.sys.model.request.AdminListSysTenantDTO;
-import cc.uncarbon.module.sys.model.request.AdminUpdateSysTenantDTO;
-import cc.uncarbon.module.sys.model.response.SysTenantBO;
-import cc.uncarbon.module.sys.model.response.SysTenantKickOutUsersBO;
-import cc.uncarbon.module.sys.service.SysTenantService;
+import com.jtzx.crm.module.api.constant.ApiConstant;
+import com.jtzx.crm.module.api.event.KickOutSysUsersEvent;
+import com.jtzx.crm.module.api.util.CrmAdminStpUtil;
+import com.jtzx.crm.module.sys.annotation.SysLog;
+import com.jtzx.crm.module.sys.facade.SysTenantFacade;
+import com.jtzx.crm.module.sys.model.request.AdminInsertSysTenantDTO;
+import com.jtzx.crm.module.sys.model.request.AdminListSysTenantDTO;
+import com.jtzx.crm.module.sys.model.request.AdminUpdateSysTenantDTO;
+import com.jtzx.crm.module.sys.model.response.SysTenantBO;
+import com.jtzx.crm.module.sys.model.response.SysTenantKickOutUsersBO;
+import com.jtzx.crm.module.sys.service.SysTenantService;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.extra.spring.SpringUtil;
@@ -30,7 +30,7 @@ import jakarta.validation.Valid;
 
 @SaCheckLogin(type = CrmAdminStpUtil.TYPE)
 @Tag(name = "系统租户管理接口")
-@RequestMapping(value = AdminApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
+@RequestMapping(value = ApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
 @RequiredArgsConstructor
 @RestController
 @Slf4j

+ 12 - 12
src/main/java/cc/uncarbon/module/api/web/sys/AdminSysUserController.java → src/main/java/com/jtzx/crm/module/api/web/sys/AdminSysUserController.java

@@ -1,20 +1,20 @@
-package cc.uncarbon.module.api.web.sys;
+package com.jtzx.crm.module.api.web.sys;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import cc.uncarbon.framework.core.page.PageParam;
 import cc.uncarbon.framework.core.page.PageResult;
 import cc.uncarbon.framework.web.model.request.IdsDTO;
 import cc.uncarbon.framework.web.model.response.ApiResult;
-import cc.uncarbon.module.api.constant.AdminApiConstant;
-import cc.uncarbon.module.sys.annotation.SysLog;
-import cc.uncarbon.module.sys.enums.SysUserStatusEnum;
-import cc.uncarbon.module.sys.model.request.AdminBindUserRoleRelationDTO;
-import cc.uncarbon.module.sys.model.request.AdminInsertOrUpdateSysUserDTO;
-import cc.uncarbon.module.sys.model.request.AdminListSysUserDTO;
-import cc.uncarbon.module.sys.model.request.AdminResetSysUserPasswordDTO;
-import cc.uncarbon.module.sys.model.response.SysUserBO;
-import cc.uncarbon.module.sys.service.SysUserService;
-import cc.uncarbon.module.api.util.CrmAdminStpUtil;
+import com.jtzx.crm.module.api.constant.ApiConstant;
+import com.jtzx.crm.module.sys.annotation.SysLog;
+import com.jtzx.crm.module.sys.enums.SysUserStatusEnum;
+import com.jtzx.crm.module.sys.model.request.AdminBindUserRoleRelationDTO;
+import com.jtzx.crm.module.sys.model.request.AdminInsertOrUpdateSysUserDTO;
+import com.jtzx.crm.module.sys.model.request.AdminListSysUserDTO;
+import com.jtzx.crm.module.sys.model.request.AdminResetSysUserPasswordDTO;
+import com.jtzx.crm.module.sys.model.response.SysUserBO;
+import com.jtzx.crm.module.sys.service.SysUserService;
+import com.jtzx.crm.module.api.util.CrmAdminStpUtil;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -29,7 +29,7 @@ import java.util.Set;
 
 @SaCheckLogin(type = CrmAdminStpUtil.TYPE)
 @Tag(name = "后台用户管理接口")
-@RequestMapping(value = AdminApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
+@RequestMapping(value = ApiConstant.HTTP_API_URL_PREFIX + "/api/v1")
 @RequiredArgsConstructor
 @RestController
 @Slf4j

+ 1 - 1
src/main/java/cc/uncarbon/module/oss/config/FileStorageConfiguration.java → src/main/java/com/jtzx/crm/module/oss/config/FileStorageConfiguration.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.oss.config;
+package com.jtzx.crm.module.oss.config;
 
 import org.dromara.x.file.storage.spring.EnableFileStorage;
 import org.springframework.context.annotation.Configuration;

+ 1 - 1
src/main/java/cc/uncarbon/module/oss/constant/OssConstant.java → src/main/java/com/jtzx/crm/module/oss/constant/OssConstant.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.oss.constant;
+package com.jtzx.crm.module.oss.constant;
 
 public final class OssConstant {
     private OssConstant() {

+ 1 - 1
src/main/java/cc/uncarbon/module/oss/entity/OssFileInfoEntity.java → src/main/java/com/jtzx/crm/module/oss/entity/OssFileInfoEntity.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.oss.entity;
+package com.jtzx.crm.module.oss.entity;
 
 import cc.uncarbon.framework.crud.entity.HelioBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
src/main/java/cc/uncarbon/module/oss/enums/OssErrorEnum.java → src/main/java/com/jtzx/crm/module/oss/enums/OssErrorEnum.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.oss.enums;
+package com.jtzx.crm.module.oss.enums;
 
 import cc.uncarbon.framework.core.enums.HelioBaseEnum;
 import com.baomidou.mybatisplus.annotation.EnumValue;

+ 1 - 1
src/main/java/cc/uncarbon/module/oss/enums/UploadFileCheckResultEnum.java → src/main/java/com/jtzx/crm/module/oss/enums/UploadFileCheckResultEnum.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.oss.enums;
+package com.jtzx.crm.module.oss.enums;
 
 import cc.uncarbon.framework.core.enums.HelioBaseEnum;
 import com.baomidou.mybatisplus.annotation.EnumValue;

+ 4 - 4
src/main/java/cc/uncarbon/module/oss/facade/OssUploadDownloadFacade.java → src/main/java/com/jtzx/crm/module/oss/facade/OssUploadDownloadFacade.java

@@ -1,9 +1,9 @@
-package cc.uncarbon.module.oss.facade;
+package com.jtzx.crm.module.oss.facade;
 
 import cc.uncarbon.framework.core.exception.BusinessException;
-import cc.uncarbon.module.oss.model.request.UploadFileAttributeDTO;
-import cc.uncarbon.module.oss.model.response.OssFileDownloadReplyBO;
-import cc.uncarbon.module.oss.model.response.OssFileInfoBO;
+import com.jtzx.crm.module.oss.model.request.UploadFileAttributeDTO;
+import com.jtzx.crm.module.oss.model.response.OssFileDownloadReplyBO;
+import com.jtzx.crm.module.oss.model.response.OssFileInfoBO;
 import lombok.NonNull;
 
 /**

+ 7 - 7
src/main/java/cc/uncarbon/module/oss/facade/impl/OssUploadDownloadFacadeImpl.java → src/main/java/com/jtzx/crm/module/oss/facade/impl/OssUploadDownloadFacadeImpl.java

@@ -1,12 +1,12 @@
-package cc.uncarbon.module.oss.facade.impl;
+package com.jtzx.crm.module.oss.facade.impl;
 
 import cc.uncarbon.framework.core.exception.BusinessException;
-import cc.uncarbon.module.oss.enums.OssErrorEnum;
-import cc.uncarbon.module.oss.facade.OssUploadDownloadFacade;
-import cc.uncarbon.module.oss.model.request.UploadFileAttributeDTO;
-import cc.uncarbon.module.oss.model.response.OssFileDownloadReplyBO;
-import cc.uncarbon.module.oss.model.response.OssFileInfoBO;
-import cc.uncarbon.module.oss.service.OssFileInfoService;
+import com.jtzx.crm.module.oss.enums.OssErrorEnum;
+import com.jtzx.crm.module.oss.facade.OssUploadDownloadFacade;
+import com.jtzx.crm.module.oss.model.request.UploadFileAttributeDTO;
+import com.jtzx.crm.module.oss.model.response.OssFileDownloadReplyBO;
+import com.jtzx.crm.module.oss.model.response.OssFileInfoBO;
+import com.jtzx.crm.module.oss.service.OssFileInfoService;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import lombok.NonNull;

+ 2 - 2
src/main/java/cc/uncarbon/module/oss/mapper/OssFileInfoMapper.java → src/main/java/com/jtzx/crm/module/oss/mapper/OssFileInfoMapper.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.oss.mapper;
+package com.jtzx.crm.module.oss.mapper;
 
-import cc.uncarbon.module.oss.entity.OssFileInfoEntity;
+import com.jtzx.crm.module.oss.entity.OssFileInfoEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 1 - 1
src/main/java/cc/uncarbon/module/oss/model/request/AdminListOssFileInfoDTO.java → src/main/java/com/jtzx/crm/module/oss/model/request/AdminListOssFileInfoDTO.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.oss.model.request;
+package com.jtzx.crm.module.oss.model.request;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import com.fasterxml.jackson.annotation.JsonFormat;

+ 1 - 1
src/main/java/cc/uncarbon/module/oss/model/request/UploadFileAttributeDTO.java → src/main/java/com/jtzx/crm/module/oss/model/request/UploadFileAttributeDTO.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.oss.model.request;
+package com.jtzx.crm.module.oss.model.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

+ 1 - 1
src/main/java/cc/uncarbon/module/oss/model/response/OssFileDownloadReplyBO.java → src/main/java/com/jtzx/crm/module/oss/model/response/OssFileDownloadReplyBO.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.oss.model.response;
+package com.jtzx.crm.module.oss.model.response;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

+ 1 - 1
src/main/java/cc/uncarbon/module/oss/model/response/OssFileInfoBO.java → src/main/java/com/jtzx/crm/module/oss/model/response/OssFileInfoBO.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.oss.model.response;
+package com.jtzx.crm.module.oss.model.response;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import com.fasterxml.jackson.annotation.JsonFormat;

+ 1 - 1
src/main/java/cc/uncarbon/module/oss/model/response/OssFileUploadResultVO.java → src/main/java/com/jtzx/crm/module/oss/model/response/OssFileUploadResultVO.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.oss.model.response;
+package com.jtzx.crm.module.oss.model.response;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

+ 8 - 8
src/main/java/cc/uncarbon/module/oss/service/OssFileInfoService.java → src/main/java/com/jtzx/crm/module/oss/service/OssFileInfoService.java

@@ -1,16 +1,16 @@
-package cc.uncarbon.module.oss.service;
+package com.jtzx.crm.module.oss.service;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import cc.uncarbon.framework.core.exception.BusinessException;
 import cc.uncarbon.framework.core.page.PageParam;
 import cc.uncarbon.framework.core.page.PageResult;
-import cc.uncarbon.module.oss.constant.OssConstant;
-import cc.uncarbon.module.oss.entity.OssFileInfoEntity;
-import cc.uncarbon.module.oss.enums.OssErrorEnum;
-import cc.uncarbon.module.oss.mapper.OssFileInfoMapper;
-import cc.uncarbon.module.oss.model.request.AdminListOssFileInfoDTO;
-import cc.uncarbon.module.oss.model.request.UploadFileAttributeDTO;
-import cc.uncarbon.module.oss.model.response.OssFileInfoBO;
+import com.jtzx.crm.module.oss.constant.OssConstant;
+import com.jtzx.crm.module.oss.entity.OssFileInfoEntity;
+import com.jtzx.crm.module.oss.enums.OssErrorEnum;
+import com.jtzx.crm.module.oss.mapper.OssFileInfoMapper;
+import com.jtzx.crm.module.oss.model.request.AdminListOssFileInfoDTO;
+import com.jtzx.crm.module.oss.model.request.UploadFileAttributeDTO;
+import com.jtzx.crm.module.oss.model.response.OssFileInfoBO;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;

+ 2 - 2
src/main/java/cc/uncarbon/module/oss/util/UploadFileChecker.java → src/main/java/com/jtzx/crm/module/oss/util/UploadFileChecker.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.oss.util;
+package com.jtzx.crm.module.oss.util;
 
-import cc.uncarbon.module.oss.enums.UploadFileCheckResultEnum;
+import com.jtzx.crm.module.oss.enums.UploadFileCheckResultEnum;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.file.FileNameUtil;
 import cn.hutool.core.text.CharSequenceUtil;

+ 3 - 3
src/main/java/cc/uncarbon/module/sys/annotation/SysLog.java → src/main/java/com/jtzx/crm/module/sys/annotation/SysLog.java

@@ -1,7 +1,7 @@
-package cc.uncarbon.module.sys.annotation;
+package com.jtzx.crm.module.sys.annotation;
 
-import cc.uncarbon.module.sys.extension.SysLogAspectExtension;
-import cc.uncarbon.module.sys.extension.impl.DefaultSysLogAspectExtension;
+import com.jtzx.crm.module.sys.extension.SysLogAspectExtension;
+import com.jtzx.crm.module.sys.extension.impl.DefaultSysLogAspectExtension;
 
 import java.lang.annotation.*;
 

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/constant/SysConstant.java → src/main/java/com/jtzx/crm/module/sys/constant/SysConstant.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.constant;
+package com.jtzx.crm.module.sys.constant;
 
 
 /**

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/entity/SysDataDictClassifiedEntity.java → src/main/java/com/jtzx/crm/module/sys/entity/SysDataDictClassifiedEntity.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.entity;
+package com.jtzx.crm.module.sys.entity;
 
 import cc.uncarbon.framework.core.enums.EnabledStatusEnum;
 import cc.uncarbon.framework.crud.entity.HelioBaseEntity;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/entity/SysDataDictItemEntity.java → src/main/java/com/jtzx/crm/module/sys/entity/SysDataDictItemEntity.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.entity;
+package com.jtzx.crm.module.sys.entity;
 
 import cc.uncarbon.framework.core.enums.EnabledStatusEnum;
 import cc.uncarbon.framework.crud.entity.HelioBaseEntity;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/entity/SysDeptEntity.java → src/main/java/com/jtzx/crm/module/sys/entity/SysDeptEntity.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.entity;
+package com.jtzx.crm.module.sys.entity;
 
 import cc.uncarbon.framework.core.enums.EnabledStatusEnum;
 import cc.uncarbon.framework.crud.entity.HelioBaseEntity;

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/entity/SysLogEntity.java → src/main/java/com/jtzx/crm/module/sys/entity/SysLogEntity.java

@@ -1,7 +1,7 @@
-package cc.uncarbon.module.sys.entity;
+package com.jtzx.crm.module.sys.entity;
 
 import cc.uncarbon.framework.crud.entity.HelioBaseEntity;
-import cc.uncarbon.module.sys.enums.SysLogStatusEnum;
+import com.jtzx.crm.module.sys.enums.SysLogStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/entity/SysMenuEntity.java → src/main/java/com/jtzx/crm/module/sys/entity/SysMenuEntity.java

@@ -1,8 +1,8 @@
-package cc.uncarbon.module.sys.entity;
+package com.jtzx.crm.module.sys.entity;
 
 import cc.uncarbon.framework.core.enums.EnabledStatusEnum;
 import cc.uncarbon.framework.crud.entity.HelioBaseEntity;
-import cc.uncarbon.module.sys.enums.SysMenuTypeEnum;
+import com.jtzx.crm.module.sys.enums.SysMenuTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/entity/SysParamEntity.java → src/main/java/com/jtzx/crm/module/sys/entity/SysParamEntity.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.entity;
+package com.jtzx.crm.module.sys.entity;
 
 import cc.uncarbon.framework.crud.entity.HelioBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/entity/SysRoleEntity.java → src/main/java/com/jtzx/crm/module/sys/entity/SysRoleEntity.java

@@ -1,7 +1,7 @@
-package cc.uncarbon.module.sys.entity;
+package com.jtzx.crm.module.sys.entity;
 
 import cc.uncarbon.framework.crud.entity.HelioBaseEntity;
-import cc.uncarbon.module.sys.constant.SysConstant;
+import com.jtzx.crm.module.sys.constant.SysConstant;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/entity/SysRoleMenuRelationEntity.java → src/main/java/com/jtzx/crm/module/sys/entity/SysRoleMenuRelationEntity.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.entity;
+package com.jtzx.crm.module.sys.entity;
 
 import cc.uncarbon.framework.crud.entity.HelioNoTenantBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/entity/SysTenantEntity.java → src/main/java/com/jtzx/crm/module/sys/entity/SysTenantEntity.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.entity;
+package com.jtzx.crm.module.sys.entity;
 
 import cc.uncarbon.framework.core.enums.EnabledStatusEnum;
 import cc.uncarbon.framework.crud.entity.HelioBaseEntity;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/entity/SysUserDeptRelationEntity.java → src/main/java/com/jtzx/crm/module/sys/entity/SysUserDeptRelationEntity.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.entity;
+package com.jtzx.crm.module.sys.entity;
 
 import cc.uncarbon.framework.crud.entity.HelioNoTenantBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 4 - 4
src/main/java/cc/uncarbon/module/sys/entity/SysUserEntity.java → src/main/java/com/jtzx/crm/module/sys/entity/SysUserEntity.java

@@ -1,10 +1,10 @@
-package cc.uncarbon.module.sys.entity;
+package com.jtzx.crm.module.sys.entity;
 
 import cc.uncarbon.framework.core.enums.GenderEnum;
 import cc.uncarbon.framework.crud.entity.HelioBaseEntity;
-import cc.uncarbon.module.sys.enums.SysUserStatusEnum;
-import cc.uncarbon.module.sys.model.request.AdminUpdateCurrentSysUserAvatarDTO;
-import cc.uncarbon.module.sys.model.request.AdminUpdateCurrentSysUserInfoDTO;
+import com.jtzx.crm.module.sys.enums.SysUserStatusEnum;
+import com.jtzx.crm.module.sys.model.request.AdminUpdateCurrentSysUserAvatarDTO;
+import com.jtzx.crm.module.sys.model.request.AdminUpdateCurrentSysUserInfoDTO;
 import cn.hutool.core.annotation.Alias;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/entity/SysUserRoleRelationEntity.java → src/main/java/com/jtzx/crm/module/sys/entity/SysUserRoleRelationEntity.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.entity;
+package com.jtzx.crm.module.sys.entity;
 
 import cc.uncarbon.framework.crud.entity.HelioNoTenantBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/enums/SysErrorEnum.java → src/main/java/com/jtzx/crm/module/sys/enums/SysErrorEnum.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.enums;
+package com.jtzx.crm.module.sys.enums;
 
 import cc.uncarbon.framework.core.enums.HelioBaseEnum;
 import lombok.AllArgsConstructor;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/enums/SysLogStatusEnum.java → src/main/java/com/jtzx/crm/module/sys/enums/SysLogStatusEnum.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.enums;
+package com.jtzx.crm.module.sys.enums;
 
 import cc.uncarbon.framework.core.enums.HelioBaseEnum;
 import com.baomidou.mybatisplus.annotation.EnumValue;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/enums/SysMenuTypeEnum.java → src/main/java/com/jtzx/crm/module/sys/enums/SysMenuTypeEnum.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.enums;
+package com.jtzx.crm.module.sys.enums;
 
 import cc.uncarbon.framework.core.enums.HelioBaseEnum;
 import com.baomidou.mybatisplus.annotation.EnumValue;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/enums/SysUserStatusEnum.java → src/main/java/com/jtzx/crm/module/sys/enums/SysUserStatusEnum.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.enums;
+package com.jtzx.crm.module.sys.enums;
 
 import cc.uncarbon.framework.core.enums.HelioBaseEnum;
 import com.baomidou.mybatisplus.annotation.EnumValue;

+ 4 - 4
src/main/java/cc/uncarbon/module/sys/extension/SysLogAspectExtension.java → src/main/java/com/jtzx/crm/module/sys/extension/SysLogAspectExtension.java

@@ -1,8 +1,8 @@
-package cc.uncarbon.module.sys.extension;
+package com.jtzx.crm.module.sys.extension;
 
-import cc.uncarbon.module.sys.annotation.SysLog;
-import cc.uncarbon.module.sys.model.request.AdminInsertSysLogDTO;
-import cc.uncarbon.module.sys.model.response.IPLocationBO;
+import com.jtzx.crm.module.sys.annotation.SysLog;
+import com.jtzx.crm.module.sys.model.request.AdminInsertSysLogDTO;
+import com.jtzx.crm.module.sys.model.response.IPLocationBO;
 import org.aspectj.lang.JoinPoint;
 
 /**

+ 3 - 3
src/main/java/cc/uncarbon/module/sys/extension/impl/DefaultSysLogAspectExtension.java → src/main/java/com/jtzx/crm/module/sys/extension/impl/DefaultSysLogAspectExtension.java

@@ -1,7 +1,7 @@
-package cc.uncarbon.module.sys.extension.impl;
+package com.jtzx.crm.module.sys.extension.impl;
 
-import cc.uncarbon.module.sys.extension.SysLogAspectExtension;
-import cc.uncarbon.module.sys.model.response.IPLocationBO;
+import com.jtzx.crm.module.sys.extension.SysLogAspectExtension;
+import com.jtzx.crm.module.sys.model.response.IPLocationBO;
 import cn.hutool.core.net.NetUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.text.StrPool;

+ 4 - 4
src/main/java/cc/uncarbon/module/sys/facade/SysTenantFacade.java → src/main/java/com/jtzx/crm/module/sys/facade/SysTenantFacade.java

@@ -1,8 +1,8 @@
-package cc.uncarbon.module.sys.facade;
+package com.jtzx.crm.module.sys.facade;
 
-import cc.uncarbon.module.sys.model.request.AdminInsertSysTenantDTO;
-import cc.uncarbon.module.sys.model.request.AdminUpdateSysTenantDTO;
-import cc.uncarbon.module.sys.model.response.SysTenantKickOutUsersBO;
+import com.jtzx.crm.module.sys.model.request.AdminInsertSysTenantDTO;
+import com.jtzx.crm.module.sys.model.request.AdminUpdateSysTenantDTO;
+import com.jtzx.crm.module.sys.model.response.SysTenantKickOutUsersBO;
 
 import java.util.Collection;
 

+ 16 - 16
src/main/java/cc/uncarbon/module/sys/facade/impl/SysTenantFacadeImpl.java → src/main/java/com/jtzx/crm/module/sys/facade/impl/SysTenantFacadeImpl.java

@@ -1,23 +1,23 @@
-package cc.uncarbon.module.sys.facade.impl;
+package com.jtzx.crm.module.sys.facade.impl;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import cc.uncarbon.framework.core.enums.EnabledStatusEnum;
 import cc.uncarbon.framework.core.function.StreamFunction;
-import cc.uncarbon.module.sys.constant.SysConstant;
-import cc.uncarbon.module.sys.entity.SysTenantEntity;
-import cc.uncarbon.module.sys.enums.SysErrorEnum;
-import cc.uncarbon.module.sys.enums.SysUserStatusEnum;
-import cc.uncarbon.module.sys.facade.SysTenantFacade;
-import cc.uncarbon.module.sys.model.request.AdminInsertOrUpdateSysRoleDTO;
-import cc.uncarbon.module.sys.model.request.AdminInsertOrUpdateSysUserDTO;
-import cc.uncarbon.module.sys.model.request.AdminInsertSysTenantDTO;
-import cc.uncarbon.module.sys.model.request.AdminUpdateSysTenantDTO;
-import cc.uncarbon.module.sys.model.response.SysTenantBO;
-import cc.uncarbon.module.sys.model.response.SysTenantKickOutUsersBO;
-import cc.uncarbon.module.sys.service.SysRoleService;
-import cc.uncarbon.module.sys.service.SysTenantService;
-import cc.uncarbon.module.sys.service.SysUserRoleRelationService;
-import cc.uncarbon.module.sys.service.SysUserService;
+import com.jtzx.crm.module.sys.constant.SysConstant;
+import com.jtzx.crm.module.sys.entity.SysTenantEntity;
+import com.jtzx.crm.module.sys.enums.SysErrorEnum;
+import com.jtzx.crm.module.sys.enums.SysUserStatusEnum;
+import com.jtzx.crm.module.sys.facade.SysTenantFacade;
+import com.jtzx.crm.module.sys.model.request.AdminInsertOrUpdateSysRoleDTO;
+import com.jtzx.crm.module.sys.model.request.AdminInsertOrUpdateSysUserDTO;
+import com.jtzx.crm.module.sys.model.request.AdminInsertSysTenantDTO;
+import com.jtzx.crm.module.sys.model.request.AdminUpdateSysTenantDTO;
+import com.jtzx.crm.module.sys.model.response.SysTenantBO;
+import com.jtzx.crm.module.sys.model.response.SysTenantKickOutUsersBO;
+import com.jtzx.crm.module.sys.service.SysRoleService;
+import com.jtzx.crm.module.sys.service.SysTenantService;
+import com.jtzx.crm.module.sys.service.SysUserRoleRelationService;
+import com.jtzx.crm.module.sys.service.SysUserService;
 import cn.hutool.core.collection.CollUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/mapper/SysDataDictClassifiedMapper.java → src/main/java/com/jtzx/crm/module/sys/mapper/SysDataDictClassifiedMapper.java

@@ -1,8 +1,8 @@
-package cc.uncarbon.module.sys.mapper;
+package com.jtzx.crm.module.sys.mapper;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import cc.uncarbon.framework.core.enums.EnabledStatusEnum;
-import cc.uncarbon.module.sys.entity.SysDataDictClassifiedEntity;
+import com.jtzx.crm.module.sys.entity.SysDataDictClassifiedEntity;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jakarta.annotation.Nonnull;

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/mapper/SysDataDictItemMapper.java → src/main/java/com/jtzx/crm/module/sys/mapper/SysDataDictItemMapper.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.sys.mapper;
+package com.jtzx.crm.module.sys.mapper;
 
-import cc.uncarbon.module.sys.entity.SysDataDictItemEntity;
+import com.jtzx.crm.module.sys.entity.SysDataDictItemEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/mapper/SysDeptMapper.java → src/main/java/com/jtzx/crm/module/sys/mapper/SysDeptMapper.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.sys.mapper;
+package com.jtzx.crm.module.sys.mapper;
 
-import cc.uncarbon.module.sys.entity.SysDeptEntity;
+import com.jtzx.crm.module.sys.entity.SysDeptEntity;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/mapper/SysLogMapper.java → src/main/java/com/jtzx/crm/module/sys/mapper/SysLogMapper.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.sys.mapper;
+package com.jtzx.crm.module.sys.mapper;
 
-import cc.uncarbon.module.sys.entity.SysLogEntity;
+import com.jtzx.crm.module.sys.entity.SysLogEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/mapper/SysMenuMapper.java → src/main/java/com/jtzx/crm/module/sys/mapper/SysMenuMapper.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.sys.mapper;
+package com.jtzx.crm.module.sys.mapper;
 
-import cc.uncarbon.module.sys.entity.SysMenuEntity;
+import com.jtzx.crm.module.sys.entity.SysMenuEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/mapper/SysParamMapper.java → src/main/java/com/jtzx/crm/module/sys/mapper/SysParamMapper.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.sys.mapper;
+package com.jtzx.crm.module.sys.mapper;
 
-import cc.uncarbon.module.sys.entity.SysParamEntity;
+import com.jtzx.crm.module.sys.entity.SysParamEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/mapper/SysRoleMapper.java → src/main/java/com/jtzx/crm/module/sys/mapper/SysRoleMapper.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.sys.mapper;
+package com.jtzx.crm.module.sys.mapper;
 
-import cc.uncarbon.module.sys.entity.SysRoleEntity;
+import com.jtzx.crm.module.sys.entity.SysRoleEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/mapper/SysRoleMenuRelationMapper.java → src/main/java/com/jtzx/crm/module/sys/mapper/SysRoleMenuRelationMapper.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.sys.mapper;
+package com.jtzx.crm.module.sys.mapper;
 
-import cc.uncarbon.module.sys.entity.SysRoleMenuRelationEntity;
+import com.jtzx.crm.module.sys.entity.SysRoleMenuRelationEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/mapper/SysTenantMapper.java → src/main/java/com/jtzx/crm/module/sys/mapper/SysTenantMapper.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.sys.mapper;
+package com.jtzx.crm.module.sys.mapper;
 
-import cc.uncarbon.module.sys.entity.SysTenantEntity;
+import com.jtzx.crm.module.sys.entity.SysTenantEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/mapper/SysUserDeptRelationMapper.java → src/main/java/com/jtzx/crm/module/sys/mapper/SysUserDeptRelationMapper.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.sys.mapper;
+package com.jtzx.crm.module.sys.mapper;
 
-import cc.uncarbon.module.sys.entity.SysUserDeptRelationEntity;
+import com.jtzx.crm.module.sys.entity.SysUserDeptRelationEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 3 - 3
src/main/java/cc/uncarbon/module/sys/mapper/SysUserMapper.java → src/main/java/com/jtzx/crm/module/sys/mapper/SysUserMapper.java

@@ -1,8 +1,8 @@
-package cc.uncarbon.module.sys.mapper;
+package com.jtzx.crm.module.sys.mapper;
 
 import cc.uncarbon.framework.core.enums.EnabledStatusEnum;
-import cc.uncarbon.module.sys.entity.SysUserEntity;
-import cc.uncarbon.module.sys.model.response.SysUserBaseInfoBO;
+import com.jtzx.crm.module.sys.entity.SysUserEntity;
+import com.jtzx.crm.module.sys.model.response.SysUserBaseInfoBO;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/mapper/SysUserRoleRelationMapper.java → src/main/java/com/jtzx/crm/module/sys/mapper/SysUserRoleRelationMapper.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.sys.mapper;
+package com.jtzx.crm.module.sys.mapper;
 
-import cc.uncarbon.module.sys.entity.SysUserRoleRelationEntity;
+import com.jtzx.crm.module.sys.entity.SysUserRoleRelationEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 3 - 3
src/main/java/cc/uncarbon/module/sys/mapper/xml/SysUserMapper.xml → src/main/java/com/jtzx/crm/module/sys/mapper/xml/SysUserMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cc.uncarbon.module.sys.mapper.SysUserMapper">
+<mapper namespace="com.jtzx.crm.module.sys.mapper.SysUserMapper">
 
-    <select id="getUserByPin" resultType="cc.uncarbon.module.sys.entity.SysUserEntity">
+    <select id="getUserByPin" resultType="com.jtzx.crm.module.sys.entity.SysUserEntity">
         SELECT *
         FROM sys_user
         WHERE del_flag = 0
@@ -10,7 +10,7 @@
         LIMIT 1
     </select>
 
-    <select id="getBaseInfoByUserId" resultType="cc.uncarbon.module.sys.model.response.SysUserBaseInfoBO">
+    <select id="getBaseInfoByUserId" resultType="com.jtzx.crm.module.sys.model.response.SysUserBaseInfoBO">
         SELECT pin AS username
                , nickname
                , status

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/model/interior/UserDeptContainer.java → src/main/java/com/jtzx/crm/module/sys/model/interior/UserDeptContainer.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.sys.model.interior;
+package com.jtzx.crm.module.sys.model.interior;
 
-import cc.uncarbon.module.sys.entity.SysDeptEntity;
+import com.jtzx.crm.module.sys.entity.SysDeptEntity;
 import cn.hutool.core.collection.CollUtil;
 import lombok.Getter;
 

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/model/interior/UserRoleContainer.java → src/main/java/com/jtzx/crm/module/sys/model/interior/UserRoleContainer.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.sys.model.interior;
+package com.jtzx.crm.module.sys.model.interior;
 
-import cc.uncarbon.module.sys.entity.SysRoleEntity;
+import com.jtzx.crm.module.sys.entity.SysRoleEntity;
 import lombok.Getter;
 
 import java.util.List;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/model/request/AdminBindRoleMenuRelationDTO.java → src/main/java/com/jtzx/crm/module/sys/model/request/AdminBindRoleMenuRelationDTO.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.model.request;
+package com.jtzx.crm.module.sys.model.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/model/request/AdminBindUserRoleRelationDTO.java → src/main/java/com/jtzx/crm/module/sys/model/request/AdminBindUserRoleRelationDTO.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.model.request;
+package com.jtzx.crm.module.sys.model.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/model/request/AdminInsertOrUpdateSysDeptDTO.java → src/main/java/com/jtzx/crm/module/sys/model/request/AdminInsertOrUpdateSysDeptDTO.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.model.request;
+package com.jtzx.crm.module.sys.model.request;
 
 import cc.uncarbon.framework.core.enums.EnabledStatusEnum;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/model/request/AdminInsertOrUpdateSysMenuDTO.java → src/main/java/com/jtzx/crm/module/sys/model/request/AdminInsertOrUpdateSysMenuDTO.java

@@ -1,7 +1,7 @@
-package cc.uncarbon.module.sys.model.request;
+package com.jtzx.crm.module.sys.model.request;
 
 import cc.uncarbon.framework.core.enums.EnabledStatusEnum;
-import cc.uncarbon.module.sys.enums.SysMenuTypeEnum;
+import com.jtzx.crm.module.sys.enums.SysMenuTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/model/request/AdminInsertOrUpdateSysParamDTO.java → src/main/java/com/jtzx/crm/module/sys/model/request/AdminInsertOrUpdateSysParamDTO.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.model.request;
+package com.jtzx.crm.module.sys.model.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/model/request/AdminInsertOrUpdateSysRoleDTO.java → src/main/java/com/jtzx/crm/module/sys/model/request/AdminInsertOrUpdateSysRoleDTO.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.sys.model.request;
+package com.jtzx.crm.module.sys.model.request;
 
-import cc.uncarbon.module.sys.constant.SysConstant;
+import com.jtzx.crm.module.sys.constant.SysConstant;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/model/request/AdminInsertOrUpdateSysUserDTO.java → src/main/java/com/jtzx/crm/module/sys/model/request/AdminInsertOrUpdateSysUserDTO.java

@@ -1,9 +1,9 @@
-package cc.uncarbon.module.sys.model.request;
+package com.jtzx.crm.module.sys.model.request;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import cc.uncarbon.framework.core.enums.GenderEnum;
 import cc.uncarbon.framework.core.exception.BusinessException;
-import cc.uncarbon.module.sys.enums.SysUserStatusEnum;
+import com.jtzx.crm.module.sys.enums.SysUserStatusEnum;
 import cn.hutool.core.text.CharSequenceUtil;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/model/request/AdminInsertSysLogDTO.java → src/main/java/com/jtzx/crm/module/sys/model/request/AdminInsertSysLogDTO.java

@@ -1,6 +1,6 @@
-package cc.uncarbon.module.sys.model.request;
+package com.jtzx.crm.module.sys.model.request;
 
-import cc.uncarbon.module.sys.enums.SysLogStatusEnum;
+import com.jtzx.crm.module.sys.enums.SysLogStatusEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/model/request/AdminInsertSysTenantDTO.java → src/main/java/com/jtzx/crm/module/sys/model/request/AdminInsertSysTenantDTO.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.model.request;
+package com.jtzx.crm.module.sys.model.request;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 2 - 2
src/main/java/cc/uncarbon/module/sys/model/request/AdminListSysLogDTO.java → src/main/java/com/jtzx/crm/module/sys/model/request/AdminListSysLogDTO.java

@@ -1,7 +1,7 @@
-package cc.uncarbon.module.sys.model.request;
+package com.jtzx.crm.module.sys.model.request;
 
 import cc.uncarbon.framework.core.constant.HelioConstant;
-import cc.uncarbon.module.sys.enums.SysLogStatusEnum;
+import com.jtzx.crm.module.sys.enums.SysLogStatusEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/model/request/AdminListSysParamDTO.java → src/main/java/com/jtzx/crm/module/sys/model/request/AdminListSysParamDTO.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.model.request;
+package com.jtzx.crm.module.sys.model.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

+ 1 - 1
src/main/java/cc/uncarbon/module/sys/model/request/AdminListSysRoleDTO.java → src/main/java/com/jtzx/crm/module/sys/model/request/AdminListSysRoleDTO.java

@@ -1,4 +1,4 @@
-package cc.uncarbon.module.sys.model.request;
+package com.jtzx.crm.module.sys.model.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio