wanggaokun vor 3 Wochen
Ursprung
Commit
18c34c6f49
71 geänderte Dateien mit 176 neuen und 201 gelöschten Zeilen
  1. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/constant/Constants.java
  2. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/enums/DeviceType.java
  3. 2 3
      eco-common/com-core/src/main/java/org/eco/vip/core/enums/MenuTypeEnum.java
  4. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/enums/UserStatus.java
  5. 2 3
      eco-common/com-core/src/main/java/org/eco/vip/core/enums/UserType.java
  6. 3 4
      eco-common/com-core/src/main/java/org/eco/vip/core/exception/BusinessException.java
  7. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/exception/ErrorCode.java
  8. 2 3
      eco-common/com-core/src/main/java/org/eco/vip/core/exception/ServerException.java
  9. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/exception/enums/BusinessErrorCode.java
  10. 2 3
      eco-common/com-core/src/main/java/org/eco/vip/core/exception/enums/GlobalErrorCode.java
  11. 2 3
      eco-common/com-core/src/main/java/org/eco/vip/core/factory/YmlPropertySourceFactory.java
  12. 5 6
      eco-common/com-core/src/main/java/org/eco/vip/core/pojo/CommonResult.java
  13. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/pojo/LoginUserStorage.java
  14. 3 3
      eco-common/com-core/src/main/java/org/eco/vip/core/pojo/OrderDomain.java
  15. 1 1
      eco-common/com-core/src/main/java/org/eco/vip/core/pojo/PageResult.java
  16. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/pojo/dto/RoleDTO.java
  17. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/pojo/dto/UserOnlineDTO.java
  18. 1 1
      eco-common/com-core/src/main/java/org/eco/vip/core/utils/BeanUtils.java
  19. 1 1
      eco-common/com-core/src/main/java/org/eco/vip/core/utils/CollUtils.java
  20. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/utils/IdUtils.java
  21. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/utils/JsonUtils.java
  22. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/utils/MapstructUtils.java
  23. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/utils/ObjUtils.java
  24. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/utils/RandomUtils.java
  25. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/utils/ServletUtils.java
  26. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/utils/SpringUtils.java
  27. 1 1
      eco-common/com-core/src/main/java/org/eco/vip/core/utils/SqlUtils.java
  28. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/utils/StrUtils.java
  29. 1 2
      eco-common/com-core/src/main/java/org/eco/vip/core/utils/TreeUtils.java
  30. 2 3
      eco-common/com-core/src/main/java/org/eco/vip/core/utils/ValidatorUtils.java
  31. 1 1
      eco-common/com-orm/src/main/java/org/eco/vip/orm/domain/PageQuery.java
  32. 1 1
      eco-common/com-orm/src/main/java/org/eco/vip/orm/listener/EntityInsertListener.java
  33. 1 1
      eco-common/com-orm/src/main/java/org/eco/vip/orm/listener/EntityUpdateListener.java
  34. 3 3
      eco-common/com-orm/src/main/java/org/eco/vip/orm/service/BaseService.java
  35. 1 1
      eco-common/com-security/src/main/java/org/eco/vip/security/config/SaTokenConfig.java
  36. 3 3
      eco-common/com-security/src/main/java/org/eco/vip/security/config/SecurityConfig.java
  37. 3 3
      eco-common/com-security/src/main/java/org/eco/vip/security/core/service/SaPermissionImpl.java
  38. 1 1
      eco-common/com-security/src/main/java/org/eco/vip/security/handler/AllUrlHandler.java
  39. 5 5
      eco-common/com-security/src/main/java/org/eco/vip/security/handler/GlobalExceptionHandler.java
  40. 4 4
      eco-common/com-security/src/main/java/org/eco/vip/security/handler/PermissionHandler.java
  41. 2 2
      eco-common/com-security/src/main/java/org/eco/vip/security/utils/LoginHelper.java
  42. 9 9
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/auth/AuthController.java
  43. 4 4
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/client/ClientController.java
  44. 4 4
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/config/ConfigController.java
  45. 4 4
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/dict/DictController.java
  46. 4 4
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/menu/MenuController.java
  47. 4 4
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/org/OrgController.java
  48. 2 2
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/permission/PermissionController.java
  49. 5 5
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/position/PositionController.java
  50. 4 4
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/role/RoleController.java
  51. 7 7
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/user/UserController.java
  52. 2 2
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/auth/IAuthStrategy.java
  53. 2 2
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/auth/LoginService.java
  54. 5 5
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/auth/PasswordAuthStrategy.java
  55. 3 3
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/client/ClientService.java
  56. 1 1
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/client/IClientService.java
  57. 3 3
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/config/ConfigService.java
  58. 1 1
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/config/IConfigService.java
  59. 9 9
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/dict/DictService.java
  60. 1 1
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/dict/IDictService.java
  61. 1 1
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/menu/IMenuService.java
  62. 7 7
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/menu/MenuService.java
  63. 1 1
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/org/IOrgService.java
  64. 10 10
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/org/OrgService.java
  65. 2 2
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/permission/PermissionService.java
  66. 1 1
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/position/IPositionService.java
  67. 4 4
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/position/PositionService.java
  68. 1 1
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/role/IRoleService.java
  69. 3 3
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/role/RoleService.java
  70. 1 1
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/user/IUserService.java
  71. 2 2
      eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/user/UserService.java

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/constant/Constants.java → eco-common/com-core/src/main/java/org/eco/vip/core/constant/Constants.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.constant;
+package org.eco.vip.core.constant;
 
 
 /**

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/enums/DeviceType.java → eco-common/com-core/src/main/java/org/eco/vip/core/enums/DeviceType.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.enums;
+package org.eco.vip.core.enums;
 
 
 /**

+ 2 - 3
eco-common/com-core/src/main/java/org/eco/vip/orm/enums/MenuTypeEnum.java → eco-common/com-core/src/main/java/org/eco/vip/core/enums/MenuTypeEnum.java

@@ -1,13 +1,12 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.enums;
+package org.eco.vip.core.enums;
 
 
 import lombok.Getter;
-import org.eco.vip.orm.exception.BusinessException;
+import org.eco.vip.core.exception.BusinessException;
 
 /**
  * @description MenuTypeEnum

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/enums/UserStatus.java → eco-common/com-core/src/main/java/org/eco/vip/core/enums/UserStatus.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.enums;
+package org.eco.vip.core.enums;
 
 
 import lombok.Getter;

+ 2 - 3
eco-common/com-core/src/main/java/org/eco/vip/orm/enums/UserType.java → eco-common/com-core/src/main/java/org/eco/vip/core/enums/UserType.java

@@ -1,13 +1,12 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.enums;
+package org.eco.vip.core.enums;
 
 
 import lombok.Getter;
-import org.eco.vip.orm.utils.StrUtils;
+import org.eco.vip.core.utils.StrUtils;
 
 /**
  * @description UserType

+ 3 - 4
eco-common/com-core/src/main/java/org/eco/vip/orm/exception/BusinessException.java → eco-common/com-core/src/main/java/org/eco/vip/core/exception/BusinessException.java

@@ -1,16 +1,15 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.exception;
+package org.eco.vip.core.exception;
 
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.eco.vip.orm.exception.enums.BusinessErrorCode;
-import org.eco.vip.orm.utils.StrUtils;
+import org.eco.vip.core.exception.enums.BusinessErrorCode;
+import org.eco.vip.core.utils.StrUtils;
 
 /**
  * @description 业务逻辑异常

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/exception/ErrorCode.java → eco-common/com-core/src/main/java/org/eco/vip/core/exception/ErrorCode.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.exception;
+package org.eco.vip.core.exception;
 
 
 import lombok.Data;

+ 2 - 3
eco-common/com-core/src/main/java/org/eco/vip/orm/exception/ServerException.java → eco-common/com-core/src/main/java/org/eco/vip/core/exception/ServerException.java

@@ -1,14 +1,13 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.exception;
+package org.eco.vip.core.exception;
 
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.eco.vip.orm.exception.enums.GlobalErrorCode;
+import org.eco.vip.core.exception.enums.GlobalErrorCode;
 
 /**
  * @description ServerException 服务器异常

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/exception/enums/BusinessErrorCode.java → eco-common/com-core/src/main/java/org/eco/vip/core/exception/enums/BusinessErrorCode.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.exception.enums;
+package org.eco.vip.core.exception.enums;
 
 
 /**

+ 2 - 3
eco-common/com-core/src/main/java/org/eco/vip/orm/exception/enums/GlobalErrorCode.java → eco-common/com-core/src/main/java/org/eco/vip/core/exception/enums/GlobalErrorCode.java

@@ -1,12 +1,11 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.exception.enums;
+package org.eco.vip.core.exception.enums;
 
 
-import org.eco.vip.orm.exception.ErrorCode;
+import org.eco.vip.core.exception.ErrorCode;
 
 /**
  * @description 全局错误码枚举

+ 2 - 3
eco-common/com-core/src/main/java/org/eco/vip/orm/factory/YmlPropertySourceFactory.java → eco-common/com-core/src/main/java/org/eco/vip/core/factory/YmlPropertySourceFactory.java

@@ -1,12 +1,11 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.factory;
+package org.eco.vip.core.factory;
 
 
-import org.eco.vip.orm.utils.StrUtils;
+import org.eco.vip.core.utils.StrUtils;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
 import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.core.env.PropertySource;

+ 5 - 6
eco-common/com-core/src/main/java/org/eco/vip/orm/pojo/CommonResult.java → eco-common/com-core/src/main/java/org/eco/vip/core/pojo/CommonResult.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.pojo;
+package org.eco.vip.core.pojo;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -11,10 +10,10 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.eco.vip.orm.exception.BusinessException;
-import org.eco.vip.orm.exception.ErrorCode;
-import org.eco.vip.orm.exception.enums.GlobalErrorCode;
-import org.eco.vip.orm.utils.StrUtils;
+import org.eco.vip.core.exception.BusinessException;
+import org.eco.vip.core.exception.ErrorCode;
+import org.eco.vip.core.exception.enums.GlobalErrorCode;
+import org.eco.vip.core.utils.StrUtils;
 import org.springframework.util.Assert;
 
 import java.io.Serializable;

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/pojo/LoginUserStorage.java → eco-common/com-core/src/main/java/org/eco/vip/core/pojo/LoginUserStorage.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.pojo;
+package org.eco.vip.core.pojo;
 
 
 import lombok.AllArgsConstructor;

+ 3 - 3
eco-common/com-core/src/main/java/org/eco/vip/orm/pojo/OrderDomain.java → eco-common/com-core/src/main/java/org/eco/vip/core/pojo/OrderDomain.java

@@ -2,13 +2,13 @@
  * Copyright (c) 2025 GaoKunW
  */
 
-package org.eco.vip.orm.pojo;
+package org.eco.vip.core.pojo;
 
 
 import lombok.Getter;
 import lombok.Setter;
-import org.eco.vip.orm.utils.ServletUtils;
-import org.eco.vip.orm.utils.StrUtils;
+import org.eco.vip.core.utils.ServletUtils;
+import org.eco.vip.core.utils.StrUtils;
 
 /**
  * @description OrderDomain

+ 1 - 1
eco-common/com-core/src/main/java/org/eco/vip/orm/pojo/PageResult.java → eco-common/com-core/src/main/java/org/eco/vip/core/pojo/PageResult.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2025 GaoKunW
  */
 
-package org.eco.vip.orm.pojo;
+package org.eco.vip.core.pojo;
 
 
 import com.mybatisflex.core.paginate.Page;

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/pojo/dto/RoleDTO.java → eco-common/com-core/src/main/java/org/eco/vip/core/pojo/dto/RoleDTO.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.pojo.dto;
+package org.eco.vip.core.pojo.dto;
 
 
 /**

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/pojo/dto/UserOnlineDTO.java → eco-common/com-core/src/main/java/org/eco/vip/core/pojo/dto/UserOnlineDTO.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.pojo.dto;
+package org.eco.vip.core.pojo.dto;
 
 
 /**

+ 1 - 1
eco-common/com-core/src/main/java/org/eco/vip/orm/utils/BeanUtils.java → eco-common/com-core/src/main/java/org/eco/vip/core/utils/BeanUtils.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2025 GaoKunW
  */
 
-package org.eco.vip.orm.utils;
+package org.eco.vip.core.utils;
 
 
 import cn.hutool.core.bean.BeanUtil;

+ 1 - 1
eco-common/com-core/src/main/java/org/eco/vip/orm/utils/CollUtils.java → eco-common/com-core/src/main/java/org/eco/vip/core/utils/CollUtils.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2025 GaoKunW
  */
 
-package org.eco.vip.orm.utils;
+package org.eco.vip.core.utils;
 
 
 import cn.hutool.core.collection.CollUtil;

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/utils/IdUtils.java → eco-common/com-core/src/main/java/org/eco/vip/core/utils/IdUtils.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.utils;
+package org.eco.vip.core.utils;
 
 
 import cn.hutool.core.util.IdUtil;

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/utils/JsonUtils.java → eco-common/com-core/src/main/java/org/eco/vip/core/utils/JsonUtils.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.utils;
+package org.eco.vip.core.utils;
 
 
 import cn.hutool.core.lang.Dict;

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/utils/MapstructUtils.java → eco-common/com-core/src/main/java/org/eco/vip/core/utils/MapstructUtils.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.utils;
+package org.eco.vip.core.utils;
 
 
 import cn.hutool.core.util.ObjectUtil;

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/utils/ObjUtils.java → eco-common/com-core/src/main/java/org/eco/vip/core/utils/ObjUtils.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.utils;
+package org.eco.vip.core.utils;
 
 
 import cn.hutool.core.util.ObjUtil;

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/utils/RandomUtils.java → eco-common/com-core/src/main/java/org/eco/vip/core/utils/RandomUtils.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.utils;
+package org.eco.vip.core.utils;
 
 
 import cn.hutool.core.util.RandomUtil;

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/utils/ServletUtils.java → eco-common/com-core/src/main/java/org/eco/vip/core/utils/ServletUtils.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.utils;
+package org.eco.vip.core.utils;
 
 
 import cn.hutool.extra.servlet.JakartaServletUtil;

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/utils/SpringUtils.java → eco-common/com-core/src/main/java/org/eco/vip/core/utils/SpringUtils.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.utils;
+package org.eco.vip.core.utils;
 
 
 import cn.hutool.extra.spring.SpringUtil;

+ 1 - 1
eco-common/com-core/src/main/java/org/eco/vip/orm/utils/SqlUtils.java → eco-common/com-core/src/main/java/org/eco/vip/core/utils/SqlUtils.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2025 GaoKunW
  */
 
-package org.eco.vip.orm.utils;
+package org.eco.vip.core.utils;
 
 
 /**

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/utils/StrUtils.java → eco-common/com-core/src/main/java/org/eco/vip/core/utils/StrUtils.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.utils;
+package org.eco.vip.core.utils;
 
 
 import cn.hutool.core.util.StrUtil;

+ 1 - 2
eco-common/com-core/src/main/java/org/eco/vip/orm/utils/TreeUtils.java → eco-common/com-core/src/main/java/org/eco/vip/core/utils/TreeUtils.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.utils;
+package org.eco.vip.core.utils;
 
 
 import cn.hutool.core.lang.tree.TreeUtil;

+ 2 - 3
eco-common/com-core/src/main/java/org/eco/vip/orm/utils/ValidatorUtils.java → eco-common/com-core/src/main/java/org/eco/vip/core/utils/ValidatorUtils.java

@@ -1,9 +1,8 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
-package org.eco.vip.orm.utils;
+package org.eco.vip.core.utils;
 
 
 import jakarta.validation.ConstraintViolation;
@@ -11,7 +10,7 @@ import jakarta.validation.Validator;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.eco.vip.orm.exception.BusinessException;
+import org.eco.vip.core.exception.BusinessException;
 
 import java.util.Set;
 import java.util.stream.Collectors;

+ 1 - 1
eco-common/com-orm/src/main/java/org/eco/vip/orm/domain/PageQuery.java

@@ -7,7 +7,7 @@ package org.eco.vip.orm.domain;
 
 import cn.hutool.core.convert.Convert;
 import com.mybatisflex.core.paginate.Page;
-import org.eco.vip.orm.utils.ServletUtils;
+import org.eco.vip.core.utils.ServletUtils;
 
 /**
  * @description PageQuery

+ 1 - 1
eco-common/com-orm/src/main/java/org/eco/vip/orm/listener/EntityInsertListener.java

@@ -10,7 +10,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpStatus;
 import com.mybatisflex.annotation.InsertListener;
 import org.eco.vip.orm.domain.BaseEntity;
-import org.eco.vip.orm.exception.BusinessException;
+import org.eco.vip.core.exception.BusinessException;
 import org.eco.vip.security.utils.LoginHelper;
 
 import java.util.Date;

+ 1 - 1
eco-common/com-orm/src/main/java/org/eco/vip/orm/listener/EntityUpdateListener.java

@@ -10,7 +10,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpStatus;
 import com.mybatisflex.annotation.UpdateListener;
 import org.eco.vip.orm.domain.BaseEntity;
-import org.eco.vip.orm.exception.BusinessException;
+import org.eco.vip.core.exception.BusinessException;
 import org.eco.vip.security.utils.LoginHelper;
 
 import java.util.Date;

+ 3 - 3
eco-common/com-orm/src/main/java/org/eco/vip/orm/service/BaseService.java

@@ -9,9 +9,9 @@ package org.eco.vip.orm.service;
 import com.mybatisflex.core.BaseMapper;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
-import org.eco.vip.orm.pojo.OrderDomain;
-import org.eco.vip.orm.utils.SqlUtils;
-import org.eco.vip.orm.utils.StrUtils;
+import org.eco.vip.core.pojo.OrderDomain;
+import org.eco.vip.core.utils.SqlUtils;
+import org.eco.vip.core.utils.StrUtils;
 
 /**
  * @description BaseService

+ 1 - 1
eco-common/com-security/src/main/java/org/eco/vip/security/config/SaTokenConfig.java

@@ -10,7 +10,7 @@ import cn.dev33.satoken.dao.SaTokenDao;
 import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
 import cn.dev33.satoken.stp.StpInterface;
 import cn.dev33.satoken.stp.StpLogic;
-import org.eco.vip.orm.factory.YmlPropertySourceFactory;
+import org.eco.vip.core.factory.YmlPropertySourceFactory;
 import org.eco.vip.security.core.service.SaPermissionImpl;
 import org.eco.vip.security.core.dao.SaTokenDaoForCaffeine;
 import org.springframework.boot.autoconfigure.AutoConfiguration;

+ 3 - 3
eco-common/com-security/src/main/java/org/eco/vip/security/config/SecurityConfig.java

@@ -12,9 +12,9 @@ import cn.dev33.satoken.router.SaRouter;
 import cn.dev33.satoken.stp.StpUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.eco.vip.orm.utils.ServletUtils;
-import org.eco.vip.orm.utils.SpringUtils;
-import org.eco.vip.orm.utils.StrUtils;
+import org.eco.vip.core.utils.ServletUtils;
+import org.eco.vip.core.utils.SpringUtils;
+import org.eco.vip.core.utils.StrUtils;
 import org.eco.vip.security.config.properties.SecurityProperties;
 import org.eco.vip.security.handler.AllUrlHandler;
 import org.eco.vip.security.utils.LoginHelper;

+ 3 - 3
eco-common/com-security/src/main/java/org/eco/vip/security/core/service/SaPermissionImpl.java

@@ -6,9 +6,9 @@ package org.eco.vip.security.core.service;
 
 
 import cn.dev33.satoken.stp.StpInterface;
-import org.eco.vip.orm.enums.UserType;
-import org.eco.vip.orm.pojo.LoginUserStorage;
-import org.eco.vip.orm.utils.ObjUtils;
+import org.eco.vip.core.enums.UserType;
+import org.eco.vip.core.pojo.LoginUserStorage;
+import org.eco.vip.core.utils.ObjUtils;
 import org.eco.vip.security.utils.LoginHelper;
 
 import java.util.ArrayList;

+ 1 - 1
eco-common/com-security/src/main/java/org/eco/vip/security/handler/AllUrlHandler.java

@@ -8,7 +8,7 @@ package org.eco.vip.security.handler;
 
 import cn.hutool.core.util.ReUtil;
 import lombok.Data;
-import org.eco.vip.orm.utils.SpringUtils;
+import org.eco.vip.core.utils.SpringUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;

+ 5 - 5
eco-common/com-security/src/main/java/org/eco/vip/security/handler/GlobalExceptionHandler.java

@@ -16,9 +16,9 @@ import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
 import jakarta.validation.ValidationException;
 import lombok.extern.slf4j.Slf4j;
-import org.eco.vip.orm.exception.BusinessException;
-import org.eco.vip.orm.pojo.CommonResult;
-import org.eco.vip.orm.utils.StrUtils;
+import org.eco.vip.core.exception.BusinessException;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.utils.StrUtils;
 import org.mybatis.spring.MyBatisSystemException;
 import org.springframework.validation.FieldError;
 import org.springframework.validation.ObjectError;
@@ -29,8 +29,8 @@ import org.springframework.web.servlet.resource.NoResourceFoundException;
 
 import java.util.List;
 
-import static org.eco.vip.orm.exception.enums.GlobalErrorCode.BAD_REQUEST;
-import static org.eco.vip.orm.exception.enums.GlobalErrorCode.NOT_FOUND;
+import static org.eco.vip.core.exception.enums.GlobalErrorCode.BAD_REQUEST;
+import static org.eco.vip.core.exception.enums.GlobalErrorCode.NOT_FOUND;
 
 /**
  * @description GlobalExceptionHandler 全局异常处理器

+ 4 - 4
eco-common/com-security/src/main/java/org/eco/vip/security/handler/PermissionHandler.java

@@ -7,10 +7,10 @@ package org.eco.vip.security.handler;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
-import org.eco.vip.orm.utils.BeanUtils;
-import org.eco.vip.orm.utils.CollUtils;
-import org.eco.vip.orm.utils.ObjUtils;
-import org.eco.vip.orm.utils.StrUtils;
+import org.eco.vip.core.utils.BeanUtils;
+import org.eco.vip.core.utils.CollUtils;
+import org.eco.vip.core.utils.ObjUtils;
+import org.eco.vip.core.utils.StrUtils;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.eco.vip.security.core.domain.SecurityPermissionBO;
 import org.eco.vip.security.core.domain.SecurityPermissionVO;

+ 2 - 2
eco-common/com-security/src/main/java/org/eco/vip/security/utils/LoginHelper.java

@@ -15,8 +15,8 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.eco.vip.orm.pojo.LoginUserStorage;
-import org.eco.vip.orm.utils.ServletUtils;
+import org.eco.vip.core.pojo.LoginUserStorage;
+import org.eco.vip.core.utils.ServletUtils;
 
 /**
  * @description LoginHelper

+ 9 - 9
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/auth/AuthController.java

@@ -14,13 +14,13 @@ import org.eco.vip.nexus.core.domain.auth.pojo.LoginVO;
 import org.eco.vip.nexus.core.domain.client.pojo.ClientVO;
 import org.eco.vip.nexus.core.service.auth.IAuthService;
 import org.eco.vip.nexus.core.service.client.IClientService;
-import org.eco.vip.orm.constant.Constants;
-import org.eco.vip.orm.exception.BusinessException;
-import org.eco.vip.orm.pojo.CommonResult;
-import org.eco.vip.orm.utils.JsonUtils;
-import org.eco.vip.orm.utils.ObjUtils;
-import org.eco.vip.orm.utils.StrUtils;
-import org.eco.vip.orm.utils.ValidatorUtils;
+import org.eco.vip.core.constant.Constants;
+import org.eco.vip.core.exception.BusinessException;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.utils.JsonUtils;
+import org.eco.vip.core.utils.ObjUtils;
+import org.eco.vip.core.utils.StrUtils;
+import org.eco.vip.core.utils.ValidatorUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,8 +28,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import static org.eco.vip.orm.pojo.CommonResult.fail;
-import static org.eco.vip.orm.pojo.CommonResult.success;
+import static org.eco.vip.core.pojo.CommonResult.fail;
+import static org.eco.vip.core.pojo.CommonResult.success;
 
 /**
  * @description AuthController

+ 4 - 4
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/client/ClientController.java

@@ -13,8 +13,8 @@ import jakarta.validation.constraints.NotEmpty;
 import org.eco.vip.nexus.core.domain.client.pojo.ClientBO;
 import org.eco.vip.nexus.core.domain.client.pojo.ClientVO;
 import org.eco.vip.nexus.core.service.client.IClientService;
-import org.eco.vip.orm.pojo.CommonResult;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -26,8 +26,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static org.eco.vip.orm.pojo.CommonResult.fail;
-import static org.eco.vip.orm.pojo.CommonResult.success;
+import static org.eco.vip.core.pojo.CommonResult.fail;
+import static org.eco.vip.core.pojo.CommonResult.success;
 
 /**
  * @description ClientController

+ 4 - 4
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/config/ConfigController.java

@@ -13,8 +13,8 @@ import jakarta.validation.constraints.NotEmpty;
 import org.eco.vip.nexus.core.domain.config.pojo.ConfigBO;
 import org.eco.vip.nexus.core.domain.config.pojo.ConfigVO;
 import org.eco.vip.nexus.core.service.config.IConfigService;
-import org.eco.vip.orm.pojo.CommonResult;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -26,8 +26,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static org.eco.vip.orm.pojo.CommonResult.fail;
-import static org.eco.vip.orm.pojo.CommonResult.success;
+import static org.eco.vip.core.pojo.CommonResult.fail;
+import static org.eco.vip.core.pojo.CommonResult.success;
 
 /**
  * @description ConfigController

+ 4 - 4
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/dict/DictController.java

@@ -14,8 +14,8 @@ import jakarta.validation.constraints.NotEmpty;
 import org.eco.vip.nexus.core.domain.dict.pojo.DictBO;
 import org.eco.vip.nexus.core.domain.dict.pojo.DictVO;
 import org.eco.vip.nexus.core.service.dict.IDictService;
-import org.eco.vip.orm.pojo.CommonResult;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -28,8 +28,8 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 import java.util.Map;
 
-import static org.eco.vip.orm.pojo.CommonResult.fail;
-import static org.eco.vip.orm.pojo.CommonResult.success;
+import static org.eco.vip.core.pojo.CommonResult.fail;
+import static org.eco.vip.core.pojo.CommonResult.success;
 
 /**
  * @description DictController

+ 4 - 4
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/menu/MenuController.java

@@ -14,8 +14,8 @@ import jakarta.validation.constraints.NotEmpty;
 import org.eco.vip.nexus.core.domain.menu.pojo.MenuBO;
 import org.eco.vip.nexus.core.domain.menu.pojo.MenuVO;
 import org.eco.vip.nexus.core.service.menu.IMenuService;
-import org.eco.vip.orm.pojo.CommonResult;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -27,8 +27,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static org.eco.vip.orm.pojo.CommonResult.fail;
-import static org.eco.vip.orm.pojo.CommonResult.success;
+import static org.eco.vip.core.pojo.CommonResult.fail;
+import static org.eco.vip.core.pojo.CommonResult.success;
 
 /**
  * @description MenuController

+ 4 - 4
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/org/OrgController.java

@@ -14,16 +14,16 @@ import jakarta.validation.constraints.NotEmpty;
 import org.eco.vip.nexus.core.domain.org.pojo.OrgBO;
 import org.eco.vip.nexus.core.domain.org.pojo.OrgVO;
 import org.eco.vip.nexus.core.service.org.IOrgService;
-import org.eco.vip.orm.pojo.CommonResult;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-import static org.eco.vip.orm.pojo.CommonResult.fail;
-import static org.eco.vip.orm.pojo.CommonResult.success;
+import static org.eco.vip.core.pojo.CommonResult.fail;
+import static org.eco.vip.core.pojo.CommonResult.success;
 
 /**
  * @author GaoKunW

+ 2 - 2
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/permission/PermissionController.java

@@ -9,7 +9,7 @@ package org.eco.vip.nexus.core.controller.permission;
 import jakarta.annotation.Resource;
 import org.eco.vip.nexus.core.domain.permission.pojo.PermissionVO;
 import org.eco.vip.nexus.core.service.permission.IPermissionService;
-import org.eco.vip.orm.pojo.CommonResult;
+import org.eco.vip.core.pojo.CommonResult;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static org.eco.vip.orm.pojo.CommonResult.success;
+import static org.eco.vip.core.pojo.CommonResult.success;
 
 /**
  * @description PermissionController

+ 5 - 5
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/position/PositionController.java

@@ -13,9 +13,9 @@ import jakarta.validation.constraints.NotEmpty;
 import org.eco.vip.nexus.core.domain.position.pojo.PositionBO;
 import org.eco.vip.nexus.core.domain.position.pojo.PositionVO;
 import org.eco.vip.nexus.core.service.position.IPositionService;
-import org.eco.vip.orm.pojo.CommonResult;
-import org.eco.vip.orm.pojo.PageResult;
-import org.eco.vip.orm.utils.StrUtils;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.PageResult;
+import org.eco.vip.core.utils.StrUtils;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -27,8 +27,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static org.eco.vip.orm.pojo.CommonResult.fail;
-import static org.eco.vip.orm.pojo.CommonResult.success;
+import static org.eco.vip.core.pojo.CommonResult.fail;
+import static org.eco.vip.core.pojo.CommonResult.success;
 
 /**
  * @description PositionController

+ 4 - 4
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/role/RoleController.java

@@ -13,8 +13,8 @@ import jakarta.validation.constraints.NotEmpty;
 import org.eco.vip.nexus.core.domain.role.pojo.RoleBO;
 import org.eco.vip.nexus.core.domain.role.pojo.RoleVO;
 import org.eco.vip.nexus.core.service.role.IRoleService;
-import org.eco.vip.orm.pojo.CommonResult;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -26,8 +26,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static org.eco.vip.orm.pojo.CommonResult.fail;
-import static org.eco.vip.orm.pojo.CommonResult.success;
+import static org.eco.vip.core.pojo.CommonResult.fail;
+import static org.eco.vip.core.pojo.CommonResult.success;
 
 /**
  * @description RoleController

+ 7 - 7
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/user/UserController.java

@@ -15,11 +15,11 @@ import org.eco.vip.nexus.core.domain.auth.pojo.LoginUserVO;
 import org.eco.vip.nexus.core.domain.user.pojo.UserBO;
 import org.eco.vip.nexus.core.domain.user.pojo.UserVO;
 import org.eco.vip.nexus.core.service.user.IUserService;
-import org.eco.vip.orm.pojo.CommonResult;
-import org.eco.vip.orm.pojo.LoginUserStorage;
-import org.eco.vip.orm.pojo.PageResult;
-import org.eco.vip.orm.utils.ObjUtils;
-import org.eco.vip.orm.utils.StrUtils;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.LoginUserStorage;
+import org.eco.vip.core.pojo.PageResult;
+import org.eco.vip.core.utils.ObjUtils;
+import org.eco.vip.core.utils.StrUtils;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.eco.vip.security.utils.LoginHelper;
 import org.springframework.validation.annotation.Validated;
@@ -32,8 +32,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static org.eco.vip.orm.pojo.CommonResult.fail;
-import static org.eco.vip.orm.pojo.CommonResult.success;
+import static org.eco.vip.core.pojo.CommonResult.fail;
+import static org.eco.vip.core.pojo.CommonResult.success;
 
 /**
  * @description UserController

+ 2 - 2
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/auth/IAuthStrategy.java

@@ -9,8 +9,8 @@ package org.eco.vip.nexus.core.service.auth;
 import org.eco.vip.nexus.core.domain.auth.pojo.AuthQuery;
 import org.eco.vip.nexus.core.domain.auth.pojo.LoginVO;
 import org.eco.vip.nexus.core.domain.client.pojo.ClientVO;
-import org.eco.vip.orm.exception.BusinessException;
-import org.eco.vip.orm.utils.SpringUtils;
+import org.eco.vip.core.exception.BusinessException;
+import org.eco.vip.core.utils.SpringUtils;
 
 /**
  * @description IAuthStrategy 授权类型

+ 2 - 2
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/auth/LoginService.java

@@ -11,8 +11,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eco.vip.nexus.core.domain.user.pojo.UserVO;
 import org.eco.vip.nexus.core.service.permission.IPermissionService;
-import org.eco.vip.orm.exception.BusinessException;
-import org.eco.vip.orm.pojo.LoginUserStorage;
+import org.eco.vip.core.exception.BusinessException;
+import org.eco.vip.core.pojo.LoginUserStorage;
 import org.springframework.stereotype.Service;
 
 import java.util.function.Supplier;

+ 5 - 5
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/auth/PasswordAuthStrategy.java

@@ -17,11 +17,11 @@ import org.eco.vip.nexus.core.domain.auth.pojo.LoginVO;
 import org.eco.vip.nexus.core.domain.client.pojo.ClientVO;
 import org.eco.vip.nexus.core.domain.user.pojo.UserVO;
 import org.eco.vip.nexus.core.service.user.IUserService;
-import org.eco.vip.orm.enums.UserStatus;
-import org.eco.vip.orm.exception.BusinessException;
-import org.eco.vip.orm.pojo.LoginUserStorage;
-import org.eco.vip.orm.utils.ObjUtils;
-import org.eco.vip.orm.utils.StrUtils;
+import org.eco.vip.core.enums.UserStatus;
+import org.eco.vip.core.exception.BusinessException;
+import org.eco.vip.core.pojo.LoginUserStorage;
+import org.eco.vip.core.utils.ObjUtils;
+import org.eco.vip.core.utils.StrUtils;
 import org.eco.vip.security.utils.LoginHelper;
 import org.springframework.stereotype.Service;
 

+ 3 - 3
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/client/ClientService.java

@@ -15,10 +15,10 @@ import org.eco.vip.nexus.core.domain.client.pojo.ClientBO;
 import org.eco.vip.nexus.core.domain.client.pojo.ClientVO;
 import org.eco.vip.nexus.core.mapper.ClientMapper;
 import org.eco.vip.orm.domain.PageQuery;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
-import org.eco.vip.orm.utils.IdUtils;
-import org.eco.vip.orm.utils.MapstructUtils;
+import org.eco.vip.core.utils.IdUtils;
+import org.eco.vip.core.utils.MapstructUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

+ 1 - 1
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/client/IClientService.java

@@ -9,7 +9,7 @@ package org.eco.vip.nexus.core.service.client;
 import org.eco.vip.nexus.core.domain.client.Client;
 import org.eco.vip.nexus.core.domain.client.pojo.ClientBO;
 import org.eco.vip.nexus.core.domain.client.pojo.ClientVO;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.orm.service.IBaseService;
 
 import java.util.List;

+ 3 - 3
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/config/ConfigService.java

@@ -14,10 +14,10 @@ import org.eco.vip.nexus.core.domain.config.pojo.ConfigBO;
 import org.eco.vip.nexus.core.domain.config.pojo.ConfigVO;
 import org.eco.vip.nexus.core.mapper.ConfigMapper;
 import org.eco.vip.orm.domain.PageQuery;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
-import org.eco.vip.orm.utils.CollUtils;
-import org.eco.vip.orm.utils.MapstructUtils;
+import org.eco.vip.core.utils.CollUtils;
+import org.eco.vip.core.utils.MapstructUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

+ 1 - 1
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/config/IConfigService.java

@@ -8,7 +8,7 @@ package org.eco.vip.nexus.core.service.config;
 
 import org.eco.vip.nexus.core.domain.config.pojo.ConfigBO;
 import org.eco.vip.nexus.core.domain.config.pojo.ConfigVO;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.PageResult;
 
 import java.util.List;
 

+ 9 - 9
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/dict/DictService.java

@@ -15,17 +15,17 @@ import org.eco.vip.nexus.core.domain.dict.Dict;
 import org.eco.vip.nexus.core.domain.dict.pojo.DictBO;
 import org.eco.vip.nexus.core.domain.dict.pojo.DictVO;
 import org.eco.vip.nexus.core.mapper.DictMapper;
-import org.eco.vip.orm.constant.Constants;
+import org.eco.vip.core.constant.Constants;
 import org.eco.vip.orm.domain.PageQuery;
-import org.eco.vip.orm.exception.BusinessException;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.exception.BusinessException;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
-import org.eco.vip.orm.utils.CollUtils;
-import org.eco.vip.orm.utils.JsonUtils;
-import org.eco.vip.orm.utils.MapstructUtils;
-import org.eco.vip.orm.utils.ObjUtils;
-import org.eco.vip.orm.utils.StrUtils;
-import org.eco.vip.orm.utils.TreeUtils;
+import org.eco.vip.core.utils.CollUtils;
+import org.eco.vip.core.utils.JsonUtils;
+import org.eco.vip.core.utils.MapstructUtils;
+import org.eco.vip.core.utils.ObjUtils;
+import org.eco.vip.core.utils.StrUtils;
+import org.eco.vip.core.utils.TreeUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

+ 1 - 1
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/dict/IDictService.java

@@ -10,7 +10,7 @@ import cn.hutool.core.lang.tree.Tree;
 import org.eco.vip.nexus.core.domain.dict.Dict;
 import org.eco.vip.nexus.core.domain.dict.pojo.DictBO;
 import org.eco.vip.nexus.core.domain.dict.pojo.DictVO;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.orm.service.IBaseService;
 
 import java.util.List;

+ 1 - 1
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/menu/IMenuService.java

@@ -10,7 +10,7 @@ import cn.hutool.core.lang.tree.Tree;
 import org.eco.vip.nexus.core.domain.menu.Menu;
 import org.eco.vip.nexus.core.domain.menu.pojo.MenuBO;
 import org.eco.vip.nexus.core.domain.menu.pojo.MenuVO;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.orm.service.IBaseService;
 
 import java.util.List;

+ 7 - 7
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/menu/MenuService.java

@@ -21,14 +21,14 @@ import org.eco.vip.nexus.core.mapper.MenuMapper;
 import org.eco.vip.nexus.core.mapper.RoleMenuMapper;
 import org.eco.vip.nexus.core.service.role.IRoleService;
 import org.eco.vip.nexus.core.service.user.IUserService;
-import org.eco.vip.orm.constant.Constants;
-import org.eco.vip.orm.enums.MenuTypeEnum;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.constant.Constants;
+import org.eco.vip.core.enums.MenuTypeEnum;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
-import org.eco.vip.orm.utils.JsonUtils;
-import org.eco.vip.orm.utils.MapstructUtils;
-import org.eco.vip.orm.utils.StrUtils;
-import org.eco.vip.orm.utils.TreeUtils;
+import org.eco.vip.core.utils.JsonUtils;
+import org.eco.vip.core.utils.MapstructUtils;
+import org.eco.vip.core.utils.StrUtils;
+import org.eco.vip.core.utils.TreeUtils;
 import org.eco.vip.security.utils.LoginHelper;
 import org.springframework.stereotype.Service;
 

+ 1 - 1
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/org/IOrgService.java

@@ -10,7 +10,7 @@ import cn.hutool.core.lang.tree.Tree;
 import org.eco.vip.nexus.core.domain.org.Org;
 import org.eco.vip.nexus.core.domain.org.pojo.OrgBO;
 import org.eco.vip.nexus.core.domain.org.pojo.OrgVO;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.orm.service.IBaseService;
 
 import java.util.List;

+ 10 - 10
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/org/OrgService.java

@@ -15,18 +15,18 @@ import org.eco.vip.nexus.core.domain.org.Org;
 import org.eco.vip.nexus.core.domain.org.pojo.OrgBO;
 import org.eco.vip.nexus.core.domain.org.pojo.OrgVO;
 import org.eco.vip.nexus.core.mapper.OrgMapper;
-import org.eco.vip.orm.constant.Constants;
+import org.eco.vip.core.constant.Constants;
 import org.eco.vip.orm.domain.PageQuery;
-import org.eco.vip.orm.exception.BusinessException;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.exception.BusinessException;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
-import org.eco.vip.orm.utils.CollUtils;
-import org.eco.vip.orm.utils.JsonUtils;
-import org.eco.vip.orm.utils.MapstructUtils;
-import org.eco.vip.orm.utils.ObjUtils;
-import org.eco.vip.orm.utils.RandomUtils;
-import org.eco.vip.orm.utils.StrUtils;
-import org.eco.vip.orm.utils.TreeUtils;
+import org.eco.vip.core.utils.CollUtils;
+import org.eco.vip.core.utils.JsonUtils;
+import org.eco.vip.core.utils.MapstructUtils;
+import org.eco.vip.core.utils.ObjUtils;
+import org.eco.vip.core.utils.RandomUtils;
+import org.eco.vip.core.utils.StrUtils;
+import org.eco.vip.core.utils.TreeUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

+ 2 - 2
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/permission/PermissionService.java

@@ -12,9 +12,9 @@ import org.eco.vip.nexus.core.domain.permission.Permission;
 import org.eco.vip.nexus.core.domain.permission.pojo.PermissionVO;
 import org.eco.vip.nexus.core.mapper.PermissionMapper;
 import org.eco.vip.nexus.core.service.role.IRoleService;
-import org.eco.vip.orm.constant.Constants;
+import org.eco.vip.core.constant.Constants;
 import org.eco.vip.orm.service.BaseService;
-import org.eco.vip.orm.utils.BeanUtils;
+import org.eco.vip.core.utils.BeanUtils;
 import org.eco.vip.security.core.domain.SecurityPermissionBO;
 import org.eco.vip.security.core.domain.SecurityPermissionVO;
 import org.eco.vip.security.core.service.ISecurityPermissionService;

+ 1 - 1
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/position/IPositionService.java

@@ -9,7 +9,7 @@ package org.eco.vip.nexus.core.service.position;
 import org.eco.vip.nexus.core.domain.position.Position;
 import org.eco.vip.nexus.core.domain.position.pojo.PositionBO;
 import org.eco.vip.nexus.core.domain.position.pojo.PositionVO;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.orm.service.IBaseService;
 
 import java.util.List;

+ 4 - 4
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/position/PositionService.java

@@ -14,11 +14,11 @@ import org.eco.vip.nexus.core.domain.position.pojo.PositionBO;
 import org.eco.vip.nexus.core.domain.position.pojo.PositionVO;
 import org.eco.vip.nexus.core.mapper.PositionMapper;
 import org.eco.vip.orm.domain.PageQuery;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
-import org.eco.vip.orm.utils.MapstructUtils;
-import org.eco.vip.orm.utils.ObjUtils;
-import org.eco.vip.orm.utils.RandomUtils;
+import org.eco.vip.core.utils.MapstructUtils;
+import org.eco.vip.core.utils.ObjUtils;
+import org.eco.vip.core.utils.RandomUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

+ 1 - 1
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/role/IRoleService.java

@@ -11,7 +11,7 @@ import org.eco.vip.nexus.core.domain.role.RoleMenu;
 import org.eco.vip.nexus.core.domain.role.RolePerm;
 import org.eco.vip.nexus.core.domain.role.pojo.RoleBO;
 import org.eco.vip.nexus.core.domain.role.pojo.RoleVO;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.orm.service.IBaseService;
 
 import java.util.List;

+ 3 - 3
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/role/RoleService.java

@@ -20,10 +20,10 @@ import org.eco.vip.nexus.core.mapper.RoleMapper;
 import org.eco.vip.nexus.core.mapper.RoleMenuMapper;
 import org.eco.vip.nexus.core.mapper.RolePermMapper;
 import org.eco.vip.orm.domain.PageQuery;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
-import org.eco.vip.orm.utils.CollUtils;
-import org.eco.vip.orm.utils.MapstructUtils;
+import org.eco.vip.core.utils.CollUtils;
+import org.eco.vip.core.utils.MapstructUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

+ 1 - 1
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/user/IUserService.java

@@ -10,7 +10,7 @@ import org.eco.vip.nexus.core.domain.user.User;
 import org.eco.vip.nexus.core.domain.user.UserRole;
 import org.eco.vip.nexus.core.domain.user.pojo.UserBO;
 import org.eco.vip.nexus.core.domain.user.pojo.UserVO;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.orm.service.IBaseService;
 
 import java.util.List;

+ 2 - 2
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/user/UserService.java

@@ -17,9 +17,9 @@ import org.eco.vip.nexus.core.domain.user.pojo.UserVO;
 import org.eco.vip.nexus.core.mapper.UserMapper;
 import org.eco.vip.nexus.core.mapper.UserRoleMapper;
 import org.eco.vip.orm.domain.PageQuery;
-import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
-import org.eco.vip.orm.utils.MapstructUtils;
+import org.eco.vip.core.utils.MapstructUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;