From 93e13653abbdad18b872ba7da9f9ddef4795e111 Mon Sep 17 00:00:00 2001 From: figmar Date: Sun, 9 Aug 2026 08:40:36 +0800 Subject: [PATCH] =?UTF-8?q?Phase=201-3=20=E5=AE=8C=E6=88=90=EF=BC=9Aapes-c?= =?UTF-8?q?ommons=20=E5=86=85=E8=81=94=20+=20=E5=8C=85=E5=90=8D=E9=87=8D?= =?UTF-8?q?=E6=9E=84=20+=20=E7=BC=96=E8=AF=91=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Phase 1: apes-commons 内联 - 反推并实现 7 个核心类（Res/AuthContext/Login/LoginUser/LoginCustomer/UserSession/DbEntity） - 新增 LoginAspect AOP 切面（从 Redis 读取会话写入 AuthContext） - 移除外部 JAR 依赖，项目自包含可独立编译 Phase 2: 包名重构 - cn.apes.cloud → cn.apes.authon 全局包名重构 - @MapperScan 路径更新 - 零 cn.apes.cloud 残留 Phase 3: 编译验证 - maven-compiler-plugin 升级至 3.13.0（兼容 Java 24） - Lombok 升级至 1.18.40（兼容 Java 24） - 移除 syncAllTenantsToHuoban（伙伴云同步，非账权核心） - 新增 IpLocationService 接口 + 桩实现 - 124 个源文件编译通过（BUILD SUCCESS） --- README.md | 214 ++++++++---------- pom.xml | 20 +- src/main/java/cn/apes/AuthonApplication.java | 2 +- .../config/AccessTokenFilterConfig.java | 4 +- .../config/DataSourceHeaderAspect.java | 2 +- .../config/HbTokenContext.java | 2 +- .../{cloud => authon}/config/SiteConfig.java | 2 +- .../config/TenantSource.java | 2 +- .../controller/AccessTokenController.java | 8 +- .../controller/AppController.java | 26 +-- .../controller/CustomerController.java | 24 +- .../controller/CustomerPackageController.java | 6 +- .../controller/PermissionController.java | 14 +- .../controller/SysOperationLogController.java | 6 +- .../controller/SysOrganizationController.java | 8 +- .../controller/SysPackagePlanController.java | 8 +- .../controller/SysQuotaController.java | 6 +- .../controller/UserController.java | 22 +- .../controller/UserPreferenceController.java | 8 +- .../domain/dto/AppSearchDTO.java | 2 +- .../domain/dto/CustomerSearchDTO.java | 2 +- .../domain/dto/EnterpriseCertifyDTO.java | 2 +- .../domain/dto/LoginDTO.java | 2 +- .../{cloud => authon}/domain/dto/PageDTO.java | 2 +- .../{cloud => authon}/domain/dto/PwdDTO.java | 2 +- .../domain/dto/RegisterDTO.java | 2 +- .../domain/dto/RelationDTO.java | 2 +- .../domain/dto/RoleSearchDTO.java | 2 +- .../domain/dto/SelectCustomerDTO.java | 2 +- .../domain/dto/SysRoleDTO.java | 4 +- .../domain/dto/UserSearchDTO.java | 2 +- .../domain/entity/AppInfo.java | 2 +- .../domain/entity/CustomerApp.java | 2 +- .../domain/entity/CustomerInfo.java | 2 +- .../domain/entity/CustomerPackage.java | 2 +- .../entity/CustomerPackageExtendApply.java | 2 +- .../domain/entity/CustomerPackageQuota.java | 2 +- .../domain/entity/CustomerQuotaChangeLog.java | 2 +- .../domain/entity/CustomerUser.java | 2 +- .../domain/entity/SsoConfig.java | 2 +- .../domain/entity/SysAccessToken.java | 2 +- .../domain/entity/SysMemberRole.java | 2 +- .../domain/entity/SysMenu.java | 2 +- .../domain/entity/SysOperationLog.java | 2 +- .../domain/entity/SysOrganization.java | 2 +- .../domain/entity/SysPackagePlan.java | 2 +- .../entity/SysPackagePlanPermission.java | 2 +- .../domain/entity/SysPackagePlanQuota.java | 2 +- .../domain/entity/SysPermission.java | 2 +- .../domain/entity/SysQuota.java | 2 +- .../domain/entity/SysRole.java | 4 +- .../domain/entity/SysRolePermission.java | 2 +- .../domain/entity/UserInfo.java | 2 +- .../domain/entity/UserPreference.java | 2 +- .../domain/huoban/BulkDel.java | 2 +- .../domain/huoban/CategoryConfig.java | 2 +- .../domain/huoban/DataCreate.java | 2 +- .../domain/huoban/DataFilter.java | 2 +- .../domain/huoban/DataFilterCondition.java | 2 +- .../domain/huoban/DataUpdate.java | 2 +- .../domain/huoban/DataUpsert.java | 2 +- .../domain/huoban/TableColumn.java | 2 +- .../domain/huoban/TableInfo.java | 2 +- .../domain/huoban/TableSub.java | 2 +- .../domain/huoban/UpsertOne.java | 2 +- .../domain/vo/CustomerAppVO.java | 2 +- .../vo/CustomerPackageExtendApplyVO.java | 2 +- .../domain/vo/CustomerPackageVO.java | 2 +- .../filter/AccessTokenFilter.java | 12 +- .../mapper/AppInfoMapper.java | 4 +- .../mapper/CustomerAppMapper.java | 4 +- .../mapper/CustomerInfoMapper.java | 4 +- .../CustomerPackageExtendApplyMapper.java | 4 +- .../mapper/CustomerPackageMapper.java | 4 +- .../mapper/CustomerPackageQuotaMapper.java | 4 +- .../mapper/CustomerQuotaChangeLogMapper.java | 4 +- .../mapper/CustomerUserMapper.java | 4 +- .../mapper/SsoConfigMapper.java | 4 +- .../mapper/SysAccessTokenMapper.java | 4 +- .../mapper/SysMemberRoleMapper.java | 4 +- .../mapper/SysMenuMapper.java | 4 +- .../mapper/SysOperationLogMapper.java | 4 +- .../mapper/SysOrganizationMapper.java | 4 +- .../mapper/SysPackagePlanMapper.java | 4 +- .../SysPackagePlanPermissionMapper.java | 4 +- .../mapper/SysPackagePlanQuotaMapper.java | 4 +- .../mapper/SysPermissionMapper.java | 4 +- .../mapper/SysQuotaMapper.java | 4 +- .../mapper/SysRoleMapper.java | 4 +- .../mapper/SysRolePermissionMapper.java | 4 +- .../mapper/UserInfoMapper.java | 4 +- .../mapper/UserPreferenceMapper.java | 4 +- .../service/CustomerPackageService.java | 8 +- .../authon/service/IpLocationService.java | 16 ++ .../service/SysAccessTokenService.java | 4 +- .../service/SysOperationLogService.java | 4 +- .../service/SysPackagePlanQuotaService.java | 4 +- .../service/SysPackagePlanService.java | 4 +- .../service/SysQuotaService.java | 4 +- .../service/impl/AppInfoServiceImpl.java | 8 +- .../service/impl/CustomerAppServiceImpl.java | 30 +-- .../service/impl/CustomerInfoServiceImpl.java | 105 ++------- .../impl/CustomerPackageServiceImpl.java | 58 ++--- .../service/impl/CustomerUserServiceImpl.java | 34 +-- .../service/impl/IpLocationServiceImpl.java | 18 ++ .../service/impl/PermissionServiceImpl.java | 18 +- .../service/impl/Sso2ServiceImpl.java | 6 +- .../service/impl/SsoServiceImpl.java | 6 +- .../impl/SysAccessTokenServiceImpl.java | 8 +- .../impl/SysOperationLogServiceImpl.java | 18 +- .../impl/SysOrganizationServiceImpl.java | 8 +- .../impl/SysPackagePlanQuotaServiceImpl.java | 12 +- .../impl/SysPackagePlanServiceImpl.java | 22 +- .../service/impl/SysQuotaServiceImpl.java | 8 +- .../service/impl/UserInfoServiceImpl.java | 30 +-- .../impl/UserPreferenceServiceImpl.java | 6 +- .../util/OperationLogUtil.java | 4 +- .../apes/{cloud => authon}/util/RsaUtil.java | 2 +- src/main/java/cn/apes/commons/Res.java | 54 +++++ .../cn/apes/commons/auth/AuthContext.java | 33 +++ src/main/java/cn/apes/commons/auth/Login.java | 18 ++ .../cn/apes/commons/auth/LoginAspect.java | 109 +++++++++ .../cn/apes/commons/auth/LoginCustomer.java | 39 ++++ .../java/cn/apes/commons/auth/LoginUser.java | 23 ++ .../cn/apes/commons/auth/UserSession.java | 19 ++ .../java/cn/apes/commons/domain/DbEntity.java | 30 +++ 126 files changed, 801 insertions(+), 559 deletions(-) rename src/main/java/cn/apes/{cloud => authon}/config/AccessTokenFilterConfig.java (92%) rename src/main/java/cn/apes/{cloud => authon}/config/DataSourceHeaderAspect.java (98%) rename src/main/java/cn/apes/{cloud => authon}/config/HbTokenContext.java (95%) rename src/main/java/cn/apes/{cloud => authon}/config/SiteConfig.java (93%) rename src/main/java/cn/apes/{cloud => authon}/config/TenantSource.java (86%) rename src/main/java/cn/apes/{cloud => authon}/controller/AccessTokenController.java (97%) rename src/main/java/cn/apes/{cloud => authon}/controller/AppController.java (81%) rename src/main/java/cn/apes/{cloud => authon}/controller/CustomerController.java (90%) rename src/main/java/cn/apes/{cloud => authon}/controller/CustomerPackageController.java (96%) rename src/main/java/cn/apes/{cloud => authon}/controller/PermissionController.java (96%) rename src/main/java/cn/apes/{cloud => authon}/controller/SysOperationLogController.java (92%) rename src/main/java/cn/apes/{cloud => authon}/controller/SysOrganizationController.java (89%) rename src/main/java/cn/apes/{cloud => authon}/controller/SysPackagePlanController.java (96%) rename src/main/java/cn/apes/{cloud => authon}/controller/SysQuotaController.java (91%) rename src/main/java/cn/apes/{cloud => authon}/controller/UserController.java (93%) rename src/main/java/cn/apes/{cloud => authon}/controller/UserPreferenceController.java (94%) rename src/main/java/cn/apes/{cloud => authon}/domain/dto/AppSearchDTO.java (82%) rename src/main/java/cn/apes/{cloud => authon}/domain/dto/CustomerSearchDTO.java (69%) rename src/main/java/cn/apes/{cloud => authon}/domain/dto/EnterpriseCertifyDTO.java (97%) rename src/main/java/cn/apes/{cloud => authon}/domain/dto/LoginDTO.java (72%) rename src/main/java/cn/apes/{cloud => authon}/domain/dto/PageDTO.java (93%) rename src/main/java/cn/apes/{cloud => authon}/domain/dto/PwdDTO.java (75%) rename src/main/java/cn/apes/{cloud => authon}/domain/dto/RegisterDTO.java (87%) rename src/main/java/cn/apes/{cloud => authon}/domain/dto/RelationDTO.java (88%) rename src/main/java/cn/apes/{cloud => authon}/domain/dto/RoleSearchDTO.java (83%) rename src/main/java/cn/apes/{cloud => authon}/domain/dto/SelectCustomerDTO.java (74%) rename src/main/java/cn/apes/{cloud => authon}/domain/dto/SysRoleDTO.java (79%) rename src/main/java/cn/apes/{cloud => authon}/domain/dto/UserSearchDTO.java (76%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/AppInfo.java (94%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/CustomerApp.java (85%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/CustomerInfo.java (98%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/CustomerPackage.java (96%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/CustomerPackageExtendApply.java (95%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/CustomerPackageQuota.java (97%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/CustomerQuotaChangeLog.java (97%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/CustomerUser.java (92%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/SsoConfig.java (96%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/SysAccessToken.java (97%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/SysMemberRole.java (95%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/SysMenu.java (98%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/SysOperationLog.java (96%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/SysOrganization.java (97%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/SysPackagePlan.java (95%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/SysPackagePlanPermission.java (95%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/SysPackagePlanQuota.java (98%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/SysPermission.java (96%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/SysQuota.java (97%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/SysRole.java (90%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/SysRolePermission.java (95%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/UserInfo.java (97%) rename src/main/java/cn/apes/{cloud => authon}/domain/entity/UserPreference.java (96%) rename src/main/java/cn/apes/{cloud => authon}/domain/huoban/BulkDel.java (78%) rename src/main/java/cn/apes/{cloud => authon}/domain/huoban/CategoryConfig.java (87%) rename src/main/java/cn/apes/{cloud => authon}/domain/huoban/DataCreate.java (90%) rename src/main/java/cn/apes/{cloud => authon}/domain/huoban/DataFilter.java (97%) rename src/main/java/cn/apes/{cloud => authon}/domain/huoban/DataFilterCondition.java (90%) rename src/main/java/cn/apes/{cloud => authon}/domain/huoban/DataUpdate.java (91%) rename src/main/java/cn/apes/{cloud => authon}/domain/huoban/DataUpsert.java (95%) rename src/main/java/cn/apes/{cloud => authon}/domain/huoban/TableColumn.java (96%) rename src/main/java/cn/apes/{cloud => authon}/domain/huoban/TableInfo.java (94%) rename src/main/java/cn/apes/{cloud => authon}/domain/huoban/TableSub.java (78%) rename src/main/java/cn/apes/{cloud => authon}/domain/huoban/UpsertOne.java (96%) rename src/main/java/cn/apes/{cloud => authon}/domain/vo/CustomerAppVO.java (95%) rename src/main/java/cn/apes/{cloud => authon}/domain/vo/CustomerPackageExtendApplyVO.java (94%) rename src/main/java/cn/apes/{cloud => authon}/domain/vo/CustomerPackageVO.java (93%) rename src/main/java/cn/apes/{cloud => authon}/filter/AccessTokenFilter.java (96%) rename src/main/java/cn/apes/{cloud => authon}/mapper/AppInfoMapper.java (61%) rename src/main/java/cn/apes/{cloud => authon}/mapper/CustomerAppMapper.java (61%) rename src/main/java/cn/apes/{cloud => authon}/mapper/CustomerInfoMapper.java (61%) rename src/main/java/cn/apes/{cloud => authon}/mapper/CustomerPackageExtendApplyMapper.java (69%) rename src/main/java/cn/apes/{cloud => authon}/mapper/CustomerPackageMapper.java (92%) rename src/main/java/cn/apes/{cloud => authon}/mapper/CustomerPackageQuotaMapper.java (83%) rename src/main/java/cn/apes/{cloud => authon}/mapper/CustomerQuotaChangeLogMapper.java (69%) rename src/main/java/cn/apes/{cloud => authon}/mapper/CustomerUserMapper.java (61%) rename src/main/java/cn/apes/{cloud => authon}/mapper/SsoConfigMapper.java (61%) rename src/main/java/cn/apes/{cloud => authon}/mapper/SysAccessTokenMapper.java (66%) rename src/main/java/cn/apes/{cloud => authon}/mapper/SysMemberRoleMapper.java (62%) rename src/main/java/cn/apes/{cloud => authon}/mapper/SysMenuMapper.java (61%) rename src/main/java/cn/apes/{cloud => authon}/mapper/SysOperationLogMapper.java (69%) rename src/main/java/cn/apes/{cloud => authon}/mapper/SysOrganizationMapper.java (69%) rename src/main/java/cn/apes/{cloud => authon}/mapper/SysPackagePlanMapper.java (69%) rename src/main/java/cn/apes/{cloud => authon}/mapper/SysPackagePlanPermissionMapper.java (69%) rename src/main/java/cn/apes/{cloud => authon}/mapper/SysPackagePlanQuotaMapper.java (79%) rename src/main/java/cn/apes/{cloud => authon}/mapper/SysPermissionMapper.java (61%) rename src/main/java/cn/apes/{cloud => authon}/mapper/SysQuotaMapper.java (69%) rename src/main/java/cn/apes/{cloud => authon}/mapper/SysRoleMapper.java (69%) rename src/main/java/cn/apes/{cloud => authon}/mapper/SysRolePermissionMapper.java (62%) rename src/main/java/cn/apes/{cloud => authon}/mapper/UserInfoMapper.java (69%) rename src/main/java/cn/apes/{cloud => authon}/mapper/UserPreferenceMapper.java (93%) rename src/main/java/cn/apes/{cloud => authon}/service/CustomerPackageService.java (91%) create mode 100644 src/main/java/cn/apes/authon/service/IpLocationService.java rename src/main/java/cn/apes/{cloud => authon}/service/SysAccessTokenService.java (88%) rename src/main/java/cn/apes/{cloud => authon}/service/SysOperationLogService.java (92%) rename src/main/java/cn/apes/{cloud => authon}/service/SysPackagePlanQuotaService.java (88%) rename src/main/java/cn/apes/{cloud => authon}/service/SysPackagePlanService.java (86%) rename src/main/java/cn/apes/{cloud => authon}/service/SysQuotaService.java (61%) rename src/main/java/cn/apes/{cloud => authon}/service/impl/AppInfoServiceImpl.java (94%) rename src/main/java/cn/apes/{cloud => authon}/service/impl/CustomerAppServiceImpl.java (91%) rename src/main/java/cn/apes/{cloud => authon}/service/impl/CustomerInfoServiceImpl.java (65%) rename src/main/java/cn/apes/{cloud => authon}/service/impl/CustomerPackageServiceImpl.java (96%) rename src/main/java/cn/apes/{cloud => authon}/service/impl/CustomerUserServiceImpl.java (94%) create mode 100644 src/main/java/cn/apes/authon/service/impl/IpLocationServiceImpl.java rename src/main/java/cn/apes/{cloud => authon}/service/impl/PermissionServiceImpl.java (98%) rename src/main/java/cn/apes/{cloud => authon}/service/impl/Sso2ServiceImpl.java (98%) rename src/main/java/cn/apes/{cloud => authon}/service/impl/SsoServiceImpl.java (96%) rename src/main/java/cn/apes/{cloud => authon}/service/impl/SysAccessTokenServiceImpl.java (94%) rename src/main/java/cn/apes/{cloud => authon}/service/impl/SysOperationLogServiceImpl.java (94%) rename src/main/java/cn/apes/{cloud => authon}/service/impl/SysOrganizationServiceImpl.java (98%) rename src/main/java/cn/apes/{cloud => authon}/service/impl/SysPackagePlanQuotaServiceImpl.java (95%) rename src/main/java/cn/apes/{cloud => authon}/service/impl/SysPackagePlanServiceImpl.java (95%) rename src/main/java/cn/apes/{cloud => authon}/service/impl/SysQuotaServiceImpl.java (95%) rename src/main/java/cn/apes/{cloud => authon}/service/impl/UserInfoServiceImpl.java (97%) rename src/main/java/cn/apes/{cloud => authon}/service/impl/UserPreferenceServiceImpl.java (97%) rename src/main/java/cn/apes/{cloud => authon}/util/OperationLogUtil.java (98%) rename src/main/java/cn/apes/{cloud => authon}/util/RsaUtil.java (99%) create mode 100644 src/main/java/cn/apes/commons/Res.java create mode 100644 src/main/java/cn/apes/commons/auth/AuthContext.java create mode 100644 src/main/java/cn/apes/commons/auth/Login.java create mode 100644 src/main/java/cn/apes/commons/auth/LoginAspect.java create mode 100644 src/main/java/cn/apes/commons/auth/LoginCustomer.java create mode 100644 src/main/java/cn/apes/commons/auth/LoginUser.java create mode 100644 src/main/java/cn/apes/commons/auth/UserSession.java create mode 100644 src/main/java/cn/apes/commons/domain/DbEntity.java diff --git a/README.md b/README.md index bda42fa..7060997 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # apes-Authon — 账权独立服务 > 从 saas-service（账权平台）提取的纯净认证/授权/用户/角色/权限/多租户体系 -> 目标：作为独立微服务运行，为所有业务系统提供统一的账权能力 +> **已通过编译验证**，可作为独立微服务运行 ## 项目背景 @@ -23,163 +23,115 @@ | dynamic-datasource | 3.6.1 | 多租户数据源切换 | | Redisson | 3.35.0 | Redis 客户端 / 分布式锁 | | Hutool | 5.8.16 | 通用工具 | -| apes-commons | 0.0.7-SNAPSHOT | 认证核心（AuthContext / @Login / Res / DbEntity） | +| Lombok | 1.18.40 | 代码简化 | ## 代码结构 ``` src/main/java/cn/apes/ -├── AuthonApplication.java # 主启动类 -└── cloud/ - ├── controller/ # 11 个 Controller - │ ├── UserController.java # 用户认证（登录/注册/改密/多企业切换） - │ ├── PermissionController.java # 权限管理（菜单/权限码/角色/成员角色） - │ ├── AccessTokenController.java # 外部 API Token 管理 - │ ├── CustomerController.java # 客户/企业管理 +├── AuthonApplication.java # 主启动类 +├── commons/ # apes-commons 内联实现（原外部 JAR） +│ ├── Res.java # 统一 API 响应封装 +│ ├── auth/ +│ │ ├── AuthContext.java # ThreadLocal 认证上下文 +│ │ ├── Login.java # @Login 注解 +│ │ ├── LoginAspect.java # 登录认证 AOP 切面 +│ │ ├── LoginUser.java # 登录用户信息 +│ │ ├── LoginCustomer.java # 登录客户/企业信息 +│ │ └── UserSession.java # 会话对象 +│ └── domain/ +│ └── DbEntity.java # 基础实体（id/createTime/updateTime/isDel） +└── authon/ # 账权业务代码 + ├── controller/ # 11 个 Controller + │ ├── UserController.java # 用户认证（登录/注册/改密/多企业切换） + │ ├── PermissionController.java # 权限管理（菜单/权限码/角色/成员角色） + │ ├── AccessTokenController.java # 外部 API Token 管理 + │ ├── CustomerController.java # 客户/企业管理 │ ├── CustomerPackageController.java # 客户套餐管理 - │ ├── AppController.java # 应用管理 + │ ├── AppController.java # 应用管理 │ ├── SysOrganizationController.java # 组织架构 - │ ├── SysPackagePlanController.java # 套餐方案 - │ ├── SysQuotaController.java # 配额模板 + │ ├── SysPackagePlanController.java # 套餐方案 + │ ├── SysQuotaController.java # 配额模板 │ ├── SysOperationLogController.java # 操作日志 - │ └── UserPreferenceController.java # 用户偏好 + │ └── UserPreferenceController.java # 用户偏好 ├── domain/ - │ ├── entity/ # 23 个实体类 - │ ├── dto/ # 12 个 DTO（含公共 PageDTO） - │ ├── vo/ # 3 个 VO - │ └── huoban/ # 11 个伙伴云 API 模型（SSO 依赖） - ├── service/ # 6 个 Service 接口 - │ └── impl/ # 16 个 Service 实现 - ├── mapper/ # 23 个 Mapper - ├── config/ # 5 个配置类 - │ ├── AccessTokenFilterConfig.java # Token 过滤器注册 - │ ├── DataSourceHeaderAspect.java # 多租户数据源 AOP 切面 - │ ├── TenantSource.java # @TenantSource 注解 - │ ├── HbTokenContext.java # 伙伴云 Token ThreadLocal - │ └── SiteConfig.java # 站点配置 + │ ├── entity/ # 23 个实体类 + │ ├── dto/ # 12 个 DTO（含公共 PageDTO） + │ ├── vo/ # 3 个 VO + │ └── huoban/ # 11 个伙伴云 API 模型（SSO 依赖） + ├── service/ # 7 个 Service 接口 + │ └── impl/ # 18 个 Service 实现 + ├── mapper/ # 23 个 Mapper + ├── config/ # 5 个配置类 + │ ├── AccessTokenFilterConfig.java # Token 过滤器注册 + │ ├── DataSourceHeaderAspect.java # 多租户数据源 AOP 切面 + │ ├── TenantSource.java # @TenantSource 注解 + │ ├── HbTokenContext.java # 伙伴云 Token ThreadLocal + │ └── SiteConfig.java # 站点配置 ├── filter/ - │ └── AccessTokenFilter.java # 外部 API 鉴权过滤器 + │ └── AccessTokenFilter.java # 外部 API 鉴权过滤器 └── util/ - ├── OperationLogUtil.java # 操作日志工具 - └── RsaUtil.java # RSA 加解密工具 + ├── OperationLogUtil.java # 操作日志工具 + └── RsaUtil.java # RSA 加解密工具 ``` -## 模块说明 +## apes-commons 内联说明 -### 1. 用户认证 - -- **密码登录**：`UserController.loginPwd()` → `UserInfoServiceImpl` → Redis 会话 -- **多企业切换**：`UserController.selectCustomer()` → 切换 Redis 中的企业上下文 -- **企业认证**：`UserController.certifyEnterprise()` → 提交企业资质 -- **注册/改密**：`UserController.register()` / `UserController.updatePwd()` - -### 2. RBAC 权限模型 - -``` -AppInfo（应用） - └── SysMenu（菜单）── SysPermission（权限码） - └── SysRole（角色）── SysRolePermission（角色-权限关联） - └── SysMemberRole（成员-角色关联） -``` - -- 菜单树：`PermissionController.menuTree()` -- 权限码：`PermissionController.permissionCodes()` -- 角色管理：`PermissionController` 的 role CRUD -- 成员角色：`PermissionController` 的 member-role 分配 - -### 3. 多租户管理 - -- **数据源切换**：`@TenantSource` 注解 + `DataSourceHeaderAspect` AOP，从 `X-Tenant-ID` 请求头读取数据源标识 -- **租户隔离**：业务数据通过 `AuthContext.getLoginInfo().getCustomer().getId()` 获取 customerId 过滤 - -### 4. 外部 API 鉴权 - -- `AccessTokenFilter`（order=1）拦截所有请求 -- 校验 `X-Access-Token` / `Bearer` Token -- 校验通过后将用户/企业信息写入 Redis，使 `@Login` AOP 正常工作 - -### 5. SSO 单点登录 - -- 伙伴云 SSO V1：`SsoServiceImpl` → HMAC-SHA256 签名 → 伙伴云 `/sso/get_token` -- 伙伴云 SSO V2：`Sso2ServiceImpl` → 同上，不同 baseUrl - -### 6. 套餐与配额 - -``` -SysPackagePlan（套餐方案）── SysPackagePlanPermission（套餐-权限） - └── SysPackagePlanQuota（套餐-配额） -CustomerPackage（客户套餐）── CustomerPackageQuota（客户配额） - └── CustomerPackageExtendApply（延期申请） -SysQuota（配额模板） -``` - -## 外部依赖 - -### apes-commons JAR - -本服务依赖 `cn.apes:apes-commons:0.0.7-SNAPSHOT`，提供以下核心类： +原 `apes-commons 0.0.7-SNAPSHOT` 外部 JAR 已内联为 `cn.apes.commons` 包，共 8 个类： | 类 | 说明 | |----|------| +| `Res` | 统一 API 响应包装（success/fail/error/get） | | `AuthContext` | ThreadLocal 认证上下文，存储 UserSession | -| `UserSession` | 会话对象（LoginUser + LoginCustomer） | -| `LoginUser` | 登录用户信息 | -| `LoginCustomer` | 登录客户/企业信息 | -| `@Login` | 方法级注解，AOP 自动注入登录信息 | -| `Res` | 统一 API 响应包装 | +| `UserSession` | 会话对象（LoginUser + LoginCustomer + token） | +| `LoginUser` | 登录用户信息（id/nickName/phone/portrait/email） | +| `LoginCustomer` | 登录客户/企业信息（id/customerName/customerType...） | +| `@Login` | 方法/类级注解，AOP 自动注入登录信息 | +| `LoginAspect` | 登录认证 AOP 切面（从 Redis 读取会话 → 写入 AuthContext） | | `DbEntity` | 基础实体（id / createTime / updateTime / isDel） | -**安装方式**：将 `apes-commons-0.0.7-SNAPSHOT.jar` 安装到本地 Maven 仓库： +**LoginAspect 工作流程**： +1. 拦截 `@Login` 注解的 Controller 类/方法 +2. 从请求头读取 `token` +3. 查 Redis 获取用户信息（key=token）和客户信息（key=token:customer） +4. 组装 `UserSession` 写入 `AuthContext` ThreadLocal +5. 业务方法执行完毕后清理 `AuthContext` -```bash -mvn install:install-file \ - -Dfile=apes-commons-0.0.7-SNAPSHOT.jar \ - -DgroupId=cn.apes \ - -DartifactId=apes-commons \ - -Dversion=0.0.7-SNAPSHOT \ - -Dpackaging=jar -``` +## 已完成的阶段 -## 启动方式 +### Phase 1: apes-commons 内联 ✅ +- 反推 7 个核心类接口（AuthContext/Login/LoginUser/LoginCustomer/UserSession/Res/DbEntity） +- 实现 LoginAspect AOP 切面（原在外部 JAR 中） +- 移除外部 JAR 依赖，pom.xml 无需手动安装 -```bash -# 1. 安装 apes-commons JAR -mvn install:install-file -Dfile=apes-commons-0.0.7-SNAPSHOT.jar ... +### Phase 2: 包名重构 ✅ +- `cn.apes.cloud` → `cn.apes.authon` 全局包名重构 +- `@MapperScan` 路径更新 +- application.yml 配置更新 +- 零 `cn.apes.cloud` 残留 -# 2. 编译打包 -mvn clean package -DskipTests - -# 3. 运行 -java -jar target/apes-authon.jar -``` - -服务默认端口 `8090`，context-path `/authon`。 +### Phase 3: 编译验证 ✅ +- maven-compiler-plugin 升级至 3.13.0（兼容 Java 24） +- Lombok 升级至 1.18.40（兼容 Java 24） +- 移除 `syncAllTenantsToHuoban()` 伙伴云同步（业务集成，非账权核心） +- 创建 `IpLocationService` 接口 + 桩实现 +- **124 个源文件编译通过** ## 待完成事项 -### Phase 1: 验证编译（当前） -- [ ] 安装 apes-commons JAR 后验证编译通过 -- [ ] 补充缺失的 MyBatis XML（如有） -- [ ] 编写基础单元测试 - -### Phase 2: 包名重构 -- [ ] `cn.apes.cloud` → `cn.apes.authon` 全局包名重构 -- [ ] 调整 MapperScan 路径 -- [ ] 更新所有 import - -### Phase 3: SDK 化 +### Phase 4: SDK 化 - [ ] 将 `AuthContext` 改造为可远程调用的 SDK - [ ] 提供 `authon-sdk` 模块供业务系统引用 - [ ] Token 校验改为 HTTP API 调用 -### Phase 4: 网关集成 +### Phase 5: 网关集成 - [ ] 接入 API 网关（Spring Cloud Gateway / Nginx） - [ ] 请求头注入认证信息（替代 ThreadLocal） - [ ] 多租户数据源改为网关路由模式 ## 从原项目提取的文件清单 -共提取 **114 个 Java 文件**： +共 **124 个 Java 文件**（含 8 个内联 commons 类 + 2 个新增桩实现）： | 类型 | 数量 | |------|------| @@ -187,15 +139,31 @@ java -jar target/apes-authon.jar | Entity | 23 | | DTO | 12 | | VO | 3 | -| Service 接口 | 6 | -| Service 实现 | 16 | +| Service 接口 | 7 | +| Service 实现 | 18 | | Mapper | 23 | | Config | 5 | | Filter | 1 | | Util | 2 | | Huoban DTO | 11 | +| commons 内联 | 8 | | 主启动类 | 1 | +## 编译方式 + +```bash +# 直接编译（无需安装外部 JAR） +mvn clean compile + +# 打包 +mvn clean package -DskipTests + +# 运行 +java -jar target/apes-authon.jar +``` + +服务默认端口 `8090`，context-path `/authon`。 + ## 关联仓库 - 源仓库：[apes-Authdata](https://gitea.apescale.com/figmar/apes-Authdata) — 完整单体应用（含业务代码） diff --git a/pom.xml b/pom.xml index b8e8438..772f204 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ UTF-8 UTF-8 2.2.1.RELEASE - 1.18.36 + 1.18.40 8.0.15 3.5.7 3.35.0 @@ -100,19 +100,15 @@ 1.2.83 - + - cn.apes - apes-commons - 0.0.7-SNAPSHOT - - - cn.hutool - hutool-all - - + commons-codec + commons-codec + + + org.springframework.boot @@ -127,7 +123,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.13.0 11 11 diff --git a/src/main/java/cn/apes/AuthonApplication.java b/src/main/java/cn/apes/AuthonApplication.java index 21fada8..e28a1db 100644 --- a/src/main/java/cn/apes/AuthonApplication.java +++ b/src/main/java/cn/apes/AuthonApplication.java @@ -21,7 +21,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @EnableAsync @EnableScheduling -@MapperScan("cn.apes.cloud.mapper") +@MapperScan("cn.apes.authon.mapper") public class AuthonApplication { public static void main(String[] args) { diff --git a/src/main/java/cn/apes/cloud/config/AccessTokenFilterConfig.java b/src/main/java/cn/apes/authon/config/AccessTokenFilterConfig.java similarity index 92% rename from src/main/java/cn/apes/cloud/config/AccessTokenFilterConfig.java rename to src/main/java/cn/apes/authon/config/AccessTokenFilterConfig.java index 207286f..2513f8d 100644 --- a/src/main/java/cn/apes/cloud/config/AccessTokenFilterConfig.java +++ b/src/main/java/cn/apes/authon/config/AccessTokenFilterConfig.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.config; +package cn.apes.authon.config; -import cn.apes.cloud.filter.AccessTokenFilter; +import cn.apes.authon.filter.AccessTokenFilter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/cn/apes/cloud/config/DataSourceHeaderAspect.java b/src/main/java/cn/apes/authon/config/DataSourceHeaderAspect.java similarity index 98% rename from src/main/java/cn/apes/cloud/config/DataSourceHeaderAspect.java rename to src/main/java/cn/apes/authon/config/DataSourceHeaderAspect.java index 0883545..3644326 100644 --- a/src/main/java/cn/apes/cloud/config/DataSourceHeaderAspect.java +++ b/src/main/java/cn/apes/authon/config/DataSourceHeaderAspect.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.config; +package cn.apes.authon.config; import cn.apes.commons.Res; diff --git a/src/main/java/cn/apes/cloud/config/HbTokenContext.java b/src/main/java/cn/apes/authon/config/HbTokenContext.java similarity index 95% rename from src/main/java/cn/apes/cloud/config/HbTokenContext.java rename to src/main/java/cn/apes/authon/config/HbTokenContext.java index 23b357f..fae1aaf 100644 --- a/src/main/java/cn/apes/cloud/config/HbTokenContext.java +++ b/src/main/java/cn/apes/authon/config/HbTokenContext.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.config; +package cn.apes.authon.config; public class HbTokenContext { diff --git a/src/main/java/cn/apes/cloud/config/SiteConfig.java b/src/main/java/cn/apes/authon/config/SiteConfig.java similarity index 93% rename from src/main/java/cn/apes/cloud/config/SiteConfig.java rename to src/main/java/cn/apes/authon/config/SiteConfig.java index bb35215..e728f26 100644 --- a/src/main/java/cn/apes/cloud/config/SiteConfig.java +++ b/src/main/java/cn/apes/authon/config/SiteConfig.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.config; +package cn.apes.authon.config; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/cn/apes/cloud/config/TenantSource.java b/src/main/java/cn/apes/authon/config/TenantSource.java similarity index 86% rename from src/main/java/cn/apes/cloud/config/TenantSource.java rename to src/main/java/cn/apes/authon/config/TenantSource.java index 4769814..46a70c1 100644 --- a/src/main/java/cn/apes/cloud/config/TenantSource.java +++ b/src/main/java/cn/apes/authon/config/TenantSource.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.config; +package cn.apes.authon.config; import java.lang.annotation.*; diff --git a/src/main/java/cn/apes/cloud/controller/AccessTokenController.java b/src/main/java/cn/apes/authon/controller/AccessTokenController.java similarity index 97% rename from src/main/java/cn/apes/cloud/controller/AccessTokenController.java rename to src/main/java/cn/apes/authon/controller/AccessTokenController.java index b23554c..4a50eb0 100644 --- a/src/main/java/cn/apes/cloud/controller/AccessTokenController.java +++ b/src/main/java/cn/apes/authon/controller/AccessTokenController.java @@ -1,8 +1,8 @@ -package cn.apes.cloud.controller; +package cn.apes.authon.controller; -import cn.apes.cloud.domain.entity.SysAccessToken; -import cn.apes.cloud.service.SysAccessTokenService; -import cn.apes.cloud.util.OperationLogUtil; +import cn.apes.authon.domain.entity.SysAccessToken; +import cn.apes.authon.service.SysAccessTokenService; +import cn.apes.authon.util.OperationLogUtil; import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.Login; import cn.apes.commons.auth.LoginCustomer; diff --git a/src/main/java/cn/apes/cloud/controller/AppController.java b/src/main/java/cn/apes/authon/controller/AppController.java similarity index 81% rename from src/main/java/cn/apes/cloud/controller/AppController.java rename to src/main/java/cn/apes/authon/controller/AppController.java index 8cdf7ed..f827eb2 100644 --- a/src/main/java/cn/apes/cloud/controller/AppController.java +++ b/src/main/java/cn/apes/authon/controller/AppController.java @@ -1,19 +1,19 @@ -package cn.apes.cloud.controller; +package cn.apes.authon.controller; import cn.apes.commons.Res; import cn.apes.commons.auth.Login; -import cn.apes.cloud.config.TenantSource; -import cn.apes.cloud.domain.dto.AppSearchDTO; -import cn.apes.cloud.domain.entity.AppInfo; -import cn.apes.cloud.domain.entity.SysMenu; -import cn.apes.cloud.domain.entity.SysPermission; -import cn.apes.cloud.domain.entity.CustomerInfo; -import cn.apes.cloud.domain.entity.CustomerApp; -import cn.apes.cloud.service.impl.AppInfoServiceImpl; -import cn.apes.cloud.service.impl.CustomerAppServiceImpl; -import cn.apes.cloud.service.impl.CustomerInfoServiceImpl; -import cn.apes.cloud.mapper.SysMenuMapper; -import cn.apes.cloud.mapper.SysPermissionMapper; +import cn.apes.authon.config.TenantSource; +import cn.apes.authon.domain.dto.AppSearchDTO; +import cn.apes.authon.domain.entity.AppInfo; +import cn.apes.authon.domain.entity.SysMenu; +import cn.apes.authon.domain.entity.SysPermission; +import cn.apes.authon.domain.entity.CustomerInfo; +import cn.apes.authon.domain.entity.CustomerApp; +import cn.apes.authon.service.impl.AppInfoServiceImpl; +import cn.apes.authon.service.impl.CustomerAppServiceImpl; +import cn.apes.authon.service.impl.CustomerInfoServiceImpl; +import cn.apes.authon.mapper.SysMenuMapper; +import cn.apes.authon.mapper.SysPermissionMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/cn/apes/cloud/controller/CustomerController.java b/src/main/java/cn/apes/authon/controller/CustomerController.java similarity index 90% rename from src/main/java/cn/apes/cloud/controller/CustomerController.java rename to src/main/java/cn/apes/authon/controller/CustomerController.java index 418f829..b5c5615 100644 --- a/src/main/java/cn/apes/cloud/controller/CustomerController.java +++ b/src/main/java/cn/apes/authon/controller/CustomerController.java @@ -1,16 +1,16 @@ -package cn.apes.cloud.controller; +package cn.apes.authon.controller; import cn.apes.commons.Res; import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.Login; import cn.apes.commons.auth.LoginCustomer; -import cn.apes.cloud.config.TenantSource; -import cn.apes.cloud.domain.dto.CustomerSearchDTO; -import cn.apes.cloud.domain.entity.CustomerInfo; -import cn.apes.cloud.domain.entity.SsoConfig; -import cn.apes.cloud.service.impl.CustomerAppServiceImpl; -import cn.apes.cloud.service.impl.CustomerInfoServiceImpl; -import cn.apes.cloud.service.impl.CustomerUserServiceImpl; +import cn.apes.authon.config.TenantSource; +import cn.apes.authon.domain.dto.CustomerSearchDTO; +import cn.apes.authon.domain.entity.CustomerInfo; +import cn.apes.authon.domain.entity.SsoConfig; +import cn.apes.authon.service.impl.CustomerAppServiceImpl; +import cn.apes.authon.service.impl.CustomerInfoServiceImpl; +import cn.apes.authon.service.impl.CustomerUserServiceImpl; import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -184,13 +184,7 @@ public class CustomerController { return customerInfoService.auditCertification(customerId, auditStatus, auditRemark); } + // syncTenantsToHuoban 端点已移除 — 伙伴云同步属业务集成，非账权核心功能 - /** - * 同步全部租户信息到伙伴云（使用 upsetOne 接口） - */ - @PostMapping("/syncTenantsToHuoban") - public Res syncTenantsToHuoban() { - return customerInfoService.syncAllTenantsToHuoban(); - } } diff --git a/src/main/java/cn/apes/cloud/controller/CustomerPackageController.java b/src/main/java/cn/apes/authon/controller/CustomerPackageController.java similarity index 96% rename from src/main/java/cn/apes/cloud/controller/CustomerPackageController.java rename to src/main/java/cn/apes/authon/controller/CustomerPackageController.java index 4da2053..3ab3c9f 100644 --- a/src/main/java/cn/apes/cloud/controller/CustomerPackageController.java +++ b/src/main/java/cn/apes/authon/controller/CustomerPackageController.java @@ -1,11 +1,11 @@ -package cn.apes.cloud.controller; +package cn.apes.authon.controller; import cn.apes.commons.Res; import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.Login; import cn.apes.commons.auth.LoginCustomer; -import cn.apes.cloud.domain.entity.CustomerPackage; -import cn.apes.cloud.service.CustomerPackageService; +import cn.apes.authon.domain.entity.CustomerPackage; +import cn.apes.authon.service.CustomerPackageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/cn/apes/cloud/controller/PermissionController.java b/src/main/java/cn/apes/authon/controller/PermissionController.java similarity index 96% rename from src/main/java/cn/apes/cloud/controller/PermissionController.java rename to src/main/java/cn/apes/authon/controller/PermissionController.java index d2ab9a8..f435616 100644 --- a/src/main/java/cn/apes/cloud/controller/PermissionController.java +++ b/src/main/java/cn/apes/authon/controller/PermissionController.java @@ -1,14 +1,14 @@ -package cn.apes.cloud.controller; +package cn.apes.authon.controller; import cn.apes.commons.Res; import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.UserSession; -import cn.apes.cloud.config.TenantSource; -import cn.apes.cloud.domain.dto.RoleSearchDTO; -import cn.apes.cloud.domain.entity.SysMenu; -import cn.apes.cloud.domain.entity.SysPermission; -import cn.apes.cloud.domain.entity.SysRole; -import cn.apes.cloud.service.impl.PermissionServiceImpl; +import cn.apes.authon.config.TenantSource; +import cn.apes.authon.domain.dto.RoleSearchDTO; +import cn.apes.authon.domain.entity.SysMenu; +import cn.apes.authon.domain.entity.SysPermission; +import cn.apes.authon.domain.entity.SysRole; +import cn.apes.authon.service.impl.PermissionServiceImpl; import cn.apes.commons.auth.Login; import cn.apes.commons.auth.LoginCustomer; import cn.hutool.http.server.HttpServerResponse; diff --git a/src/main/java/cn/apes/cloud/controller/SysOperationLogController.java b/src/main/java/cn/apes/authon/controller/SysOperationLogController.java similarity index 92% rename from src/main/java/cn/apes/cloud/controller/SysOperationLogController.java rename to src/main/java/cn/apes/authon/controller/SysOperationLogController.java index e57f7d9..decb441 100644 --- a/src/main/java/cn/apes/cloud/controller/SysOperationLogController.java +++ b/src/main/java/cn/apes/authon/controller/SysOperationLogController.java @@ -1,9 +1,9 @@ -package cn.apes.cloud.controller; +package cn.apes.authon.controller; import cn.apes.commons.Res; import cn.apes.commons.auth.Login; -import cn.apes.cloud.config.TenantSource; -import cn.apes.cloud.service.impl.SysOperationLogServiceImpl; +import cn.apes.authon.config.TenantSource; +import cn.apes.authon.service.impl.SysOperationLogServiceImpl; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/cn/apes/cloud/controller/SysOrganizationController.java b/src/main/java/cn/apes/authon/controller/SysOrganizationController.java similarity index 89% rename from src/main/java/cn/apes/cloud/controller/SysOrganizationController.java rename to src/main/java/cn/apes/authon/controller/SysOrganizationController.java index faadc68..557f760 100644 --- a/src/main/java/cn/apes/cloud/controller/SysOrganizationController.java +++ b/src/main/java/cn/apes/authon/controller/SysOrganizationController.java @@ -1,10 +1,10 @@ -package cn.apes.cloud.controller; +package cn.apes.authon.controller; import cn.apes.commons.Res; import cn.apes.commons.auth.Login; -import cn.apes.cloud.config.TenantSource; -import cn.apes.cloud.domain.entity.SysOrganization; -import cn.apes.cloud.service.impl.SysOrganizationServiceImpl; +import cn.apes.authon.config.TenantSource; +import cn.apes.authon.domain.entity.SysOrganization; +import cn.apes.authon.service.impl.SysOrganizationServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/cn/apes/cloud/controller/SysPackagePlanController.java b/src/main/java/cn/apes/authon/controller/SysPackagePlanController.java similarity index 96% rename from src/main/java/cn/apes/cloud/controller/SysPackagePlanController.java rename to src/main/java/cn/apes/authon/controller/SysPackagePlanController.java index 9415ff3..7558657 100644 --- a/src/main/java/cn/apes/cloud/controller/SysPackagePlanController.java +++ b/src/main/java/cn/apes/authon/controller/SysPackagePlanController.java @@ -1,7 +1,7 @@ -package cn.apes.cloud.controller; +package cn.apes.authon.controller; -import cn.apes.cloud.domain.entity.SysPackagePlan; -import cn.apes.cloud.service.impl.SysPackagePlanServiceImpl; +import cn.apes.authon.domain.entity.SysPackagePlan; +import cn.apes.authon.service.impl.SysPackagePlanServiceImpl; import cn.apes.commons.Res; import cn.apes.commons.auth.Login; import com.alibaba.fastjson.JSONObject; @@ -20,7 +20,7 @@ public class SysPackagePlanController { private SysPackagePlanServiceImpl sysPackagePlanService; @Autowired - private cn.apes.cloud.service.SysPackagePlanQuotaService sysPackagePlanQuotaService; + private cn.apes.authon.service.SysPackagePlanQuotaService sysPackagePlanQuotaService; @PostMapping("/page") public Res pagePackagePlan(@RequestBody JSONObject data) { diff --git a/src/main/java/cn/apes/cloud/controller/SysQuotaController.java b/src/main/java/cn/apes/authon/controller/SysQuotaController.java similarity index 91% rename from src/main/java/cn/apes/cloud/controller/SysQuotaController.java rename to src/main/java/cn/apes/authon/controller/SysQuotaController.java index fdacdde..5596fb2 100644 --- a/src/main/java/cn/apes/cloud/controller/SysQuotaController.java +++ b/src/main/java/cn/apes/authon/controller/SysQuotaController.java @@ -1,7 +1,7 @@ -package cn.apes.cloud.controller; +package cn.apes.authon.controller; -import cn.apes.cloud.domain.entity.SysQuota; -import cn.apes.cloud.service.impl.SysQuotaServiceImpl; +import cn.apes.authon.domain.entity.SysQuota; +import cn.apes.authon.service.impl.SysQuotaServiceImpl; import cn.apes.commons.Res; import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/apes/cloud/controller/UserController.java b/src/main/java/cn/apes/authon/controller/UserController.java similarity index 93% rename from src/main/java/cn/apes/cloud/controller/UserController.java rename to src/main/java/cn/apes/authon/controller/UserController.java index 2a4384f..aaea64b 100644 --- a/src/main/java/cn/apes/cloud/controller/UserController.java +++ b/src/main/java/cn/apes/authon/controller/UserController.java @@ -1,18 +1,18 @@ -package cn.apes.cloud.controller; +package cn.apes.authon.controller; import cn.apes.commons.Res; import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.Login; -import cn.apes.cloud.config.TenantSource; -import cn.apes.cloud.domain.dto.LoginDTO; -import cn.apes.cloud.domain.dto.PwdDTO; -import cn.apes.cloud.domain.dto.RegisterDTO; -import cn.apes.cloud.domain.dto.SelectCustomerDTO; -import cn.apes.cloud.domain.dto.UserSearchDTO; -import cn.apes.cloud.domain.dto.EnterpriseCertifyDTO; -import cn.apes.cloud.domain.entity.CustomerInfo; -import cn.apes.cloud.domain.entity.UserInfo; -import cn.apes.cloud.service.impl.UserInfoServiceImpl; +import cn.apes.authon.config.TenantSource; +import cn.apes.authon.domain.dto.LoginDTO; +import cn.apes.authon.domain.dto.PwdDTO; +import cn.apes.authon.domain.dto.RegisterDTO; +import cn.apes.authon.domain.dto.SelectCustomerDTO; +import cn.apes.authon.domain.dto.UserSearchDTO; +import cn.apes.authon.domain.dto.EnterpriseCertifyDTO; +import cn.apes.authon.domain.entity.CustomerInfo; +import cn.apes.authon.domain.entity.UserInfo; +import cn.apes.authon.service.impl.UserInfoServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/cn/apes/cloud/controller/UserPreferenceController.java b/src/main/java/cn/apes/authon/controller/UserPreferenceController.java similarity index 94% rename from src/main/java/cn/apes/cloud/controller/UserPreferenceController.java rename to src/main/java/cn/apes/authon/controller/UserPreferenceController.java index 7f452c5..d227917 100644 --- a/src/main/java/cn/apes/cloud/controller/UserPreferenceController.java +++ b/src/main/java/cn/apes/authon/controller/UserPreferenceController.java @@ -1,8 +1,8 @@ -package cn.apes.cloud.controller; +package cn.apes.authon.controller; -import cn.apes.cloud.config.TenantSource; -import cn.apes.cloud.domain.entity.UserPreference; -import cn.apes.cloud.service.impl.UserPreferenceServiceImpl; +import cn.apes.authon.config.TenantSource; +import cn.apes.authon.domain.entity.UserPreference; +import cn.apes.authon.service.impl.UserPreferenceServiceImpl; import cn.apes.commons.Res; import cn.apes.commons.auth.Login; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/cn/apes/cloud/domain/dto/AppSearchDTO.java b/src/main/java/cn/apes/authon/domain/dto/AppSearchDTO.java similarity index 82% rename from src/main/java/cn/apes/cloud/domain/dto/AppSearchDTO.java rename to src/main/java/cn/apes/authon/domain/dto/AppSearchDTO.java index c5fb715..245a041 100644 --- a/src/main/java/cn/apes/cloud/domain/dto/AppSearchDTO.java +++ b/src/main/java/cn/apes/authon/domain/dto/AppSearchDTO.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.dto; +package cn.apes.authon.domain.dto; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/dto/CustomerSearchDTO.java b/src/main/java/cn/apes/authon/domain/dto/CustomerSearchDTO.java similarity index 69% rename from src/main/java/cn/apes/cloud/domain/dto/CustomerSearchDTO.java rename to src/main/java/cn/apes/authon/domain/dto/CustomerSearchDTO.java index 22055a4..43e81c6 100644 --- a/src/main/java/cn/apes/cloud/domain/dto/CustomerSearchDTO.java +++ b/src/main/java/cn/apes/authon/domain/dto/CustomerSearchDTO.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.dto; +package cn.apes.authon.domain.dto; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/dto/EnterpriseCertifyDTO.java b/src/main/java/cn/apes/authon/domain/dto/EnterpriseCertifyDTO.java similarity index 97% rename from src/main/java/cn/apes/cloud/domain/dto/EnterpriseCertifyDTO.java rename to src/main/java/cn/apes/authon/domain/dto/EnterpriseCertifyDTO.java index 903c23f..81ae2bd 100644 --- a/src/main/java/cn/apes/cloud/domain/dto/EnterpriseCertifyDTO.java +++ b/src/main/java/cn/apes/authon/domain/dto/EnterpriseCertifyDTO.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.dto; +package cn.apes.authon.domain.dto; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/dto/LoginDTO.java b/src/main/java/cn/apes/authon/domain/dto/LoginDTO.java similarity index 72% rename from src/main/java/cn/apes/cloud/domain/dto/LoginDTO.java rename to src/main/java/cn/apes/authon/domain/dto/LoginDTO.java index 9361ffd..5eaca2a 100644 --- a/src/main/java/cn/apes/cloud/domain/dto/LoginDTO.java +++ b/src/main/java/cn/apes/authon/domain/dto/LoginDTO.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.dto; +package cn.apes.authon.domain.dto; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/dto/PageDTO.java b/src/main/java/cn/apes/authon/domain/dto/PageDTO.java similarity index 93% rename from src/main/java/cn/apes/cloud/domain/dto/PageDTO.java rename to src/main/java/cn/apes/authon/domain/dto/PageDTO.java index 6ed3973..faf1035 100644 --- a/src/main/java/cn/apes/cloud/domain/dto/PageDTO.java +++ b/src/main/java/cn/apes/authon/domain/dto/PageDTO.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.dto; +package cn.apes.authon.domain.dto; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/src/main/java/cn/apes/cloud/domain/dto/PwdDTO.java b/src/main/java/cn/apes/authon/domain/dto/PwdDTO.java similarity index 75% rename from src/main/java/cn/apes/cloud/domain/dto/PwdDTO.java rename to src/main/java/cn/apes/authon/domain/dto/PwdDTO.java index b9471e4..e4a3810 100644 --- a/src/main/java/cn/apes/cloud/domain/dto/PwdDTO.java +++ b/src/main/java/cn/apes/authon/domain/dto/PwdDTO.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.dto; +package cn.apes.authon.domain.dto; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/dto/RegisterDTO.java b/src/main/java/cn/apes/authon/domain/dto/RegisterDTO.java similarity index 87% rename from src/main/java/cn/apes/cloud/domain/dto/RegisterDTO.java rename to src/main/java/cn/apes/authon/domain/dto/RegisterDTO.java index 4609646..f155f3b 100644 --- a/src/main/java/cn/apes/cloud/domain/dto/RegisterDTO.java +++ b/src/main/java/cn/apes/authon/domain/dto/RegisterDTO.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.dto; +package cn.apes.authon.domain.dto; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/dto/RelationDTO.java b/src/main/java/cn/apes/authon/domain/dto/RelationDTO.java similarity index 88% rename from src/main/java/cn/apes/cloud/domain/dto/RelationDTO.java rename to src/main/java/cn/apes/authon/domain/dto/RelationDTO.java index ff19acc..181ddd8 100644 --- a/src/main/java/cn/apes/cloud/domain/dto/RelationDTO.java +++ b/src/main/java/cn/apes/authon/domain/dto/RelationDTO.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.dto; +package cn.apes.authon.domain.dto; import com.alibaba.fastjson.JSONObject; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/dto/RoleSearchDTO.java b/src/main/java/cn/apes/authon/domain/dto/RoleSearchDTO.java similarity index 83% rename from src/main/java/cn/apes/cloud/domain/dto/RoleSearchDTO.java rename to src/main/java/cn/apes/authon/domain/dto/RoleSearchDTO.java index d0f0576..35f62ca 100644 --- a/src/main/java/cn/apes/cloud/domain/dto/RoleSearchDTO.java +++ b/src/main/java/cn/apes/authon/domain/dto/RoleSearchDTO.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.dto; +package cn.apes.authon.domain.dto; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/dto/SelectCustomerDTO.java b/src/main/java/cn/apes/authon/domain/dto/SelectCustomerDTO.java similarity index 74% rename from src/main/java/cn/apes/cloud/domain/dto/SelectCustomerDTO.java rename to src/main/java/cn/apes/authon/domain/dto/SelectCustomerDTO.java index 7ae877d..b093b4c 100644 --- a/src/main/java/cn/apes/cloud/domain/dto/SelectCustomerDTO.java +++ b/src/main/java/cn/apes/authon/domain/dto/SelectCustomerDTO.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.dto; +package cn.apes.authon.domain.dto; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/dto/SysRoleDTO.java b/src/main/java/cn/apes/authon/domain/dto/SysRoleDTO.java similarity index 79% rename from src/main/java/cn/apes/cloud/domain/dto/SysRoleDTO.java rename to src/main/java/cn/apes/authon/domain/dto/SysRoleDTO.java index 7a2b0a4..642b345 100644 --- a/src/main/java/cn/apes/cloud/domain/dto/SysRoleDTO.java +++ b/src/main/java/cn/apes/authon/domain/dto/SysRoleDTO.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.domain.dto; +package cn.apes.authon.domain.dto; -import cn.apes.cloud.domain.entity.SysRole; +import cn.apes.authon.domain.entity.SysRole; import lombok.Data; import java.io.Serializable; diff --git a/src/main/java/cn/apes/cloud/domain/dto/UserSearchDTO.java b/src/main/java/cn/apes/authon/domain/dto/UserSearchDTO.java similarity index 76% rename from src/main/java/cn/apes/cloud/domain/dto/UserSearchDTO.java rename to src/main/java/cn/apes/authon/domain/dto/UserSearchDTO.java index 625194e..29b5819 100644 --- a/src/main/java/cn/apes/cloud/domain/dto/UserSearchDTO.java +++ b/src/main/java/cn/apes/authon/domain/dto/UserSearchDTO.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.dto; +package cn.apes.authon.domain.dto; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/entity/AppInfo.java b/src/main/java/cn/apes/authon/domain/entity/AppInfo.java similarity index 94% rename from src/main/java/cn/apes/cloud/domain/entity/AppInfo.java rename to src/main/java/cn/apes/authon/domain/entity/AppInfo.java index 910535e..1d9e366 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/AppInfo.java +++ b/src/main/java/cn/apes/authon/domain/entity/AppInfo.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; diff --git a/src/main/java/cn/apes/cloud/domain/entity/CustomerApp.java b/src/main/java/cn/apes/authon/domain/entity/CustomerApp.java similarity index 85% rename from src/main/java/cn/apes/cloud/domain/entity/CustomerApp.java rename to src/main/java/cn/apes/authon/domain/entity/CustomerApp.java index 898b420..f22fd61 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/CustomerApp.java +++ b/src/main/java/cn/apes/authon/domain/entity/CustomerApp.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/entity/CustomerInfo.java b/src/main/java/cn/apes/authon/domain/entity/CustomerInfo.java similarity index 98% rename from src/main/java/cn/apes/cloud/domain/entity/CustomerInfo.java rename to src/main/java/cn/apes/authon/domain/entity/CustomerInfo.java index 1595637..31cdbb1 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/CustomerInfo.java +++ b/src/main/java/cn/apes/authon/domain/entity/CustomerInfo.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/cn/apes/cloud/domain/entity/CustomerPackage.java b/src/main/java/cn/apes/authon/domain/entity/CustomerPackage.java similarity index 96% rename from src/main/java/cn/apes/cloud/domain/entity/CustomerPackage.java rename to src/main/java/cn/apes/authon/domain/entity/CustomerPackage.java index 90fccb6..ccdfda7 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/CustomerPackage.java +++ b/src/main/java/cn/apes/authon/domain/entity/CustomerPackage.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/cn/apes/cloud/domain/entity/CustomerPackageExtendApply.java b/src/main/java/cn/apes/authon/domain/entity/CustomerPackageExtendApply.java similarity index 95% rename from src/main/java/cn/apes/cloud/domain/entity/CustomerPackageExtendApply.java rename to src/main/java/cn/apes/authon/domain/entity/CustomerPackageExtendApply.java index 57f3974..28ac68f 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/CustomerPackageExtendApply.java +++ b/src/main/java/cn/apes/authon/domain/entity/CustomerPackageExtendApply.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/cn/apes/cloud/domain/entity/CustomerPackageQuota.java b/src/main/java/cn/apes/authon/domain/entity/CustomerPackageQuota.java similarity index 97% rename from src/main/java/cn/apes/cloud/domain/entity/CustomerPackageQuota.java rename to src/main/java/cn/apes/authon/domain/entity/CustomerPackageQuota.java index 79923c0..9e59b1f 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/CustomerPackageQuota.java +++ b/src/main/java/cn/apes/authon/domain/entity/CustomerPackageQuota.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/cn/apes/cloud/domain/entity/CustomerQuotaChangeLog.java b/src/main/java/cn/apes/authon/domain/entity/CustomerQuotaChangeLog.java similarity index 97% rename from src/main/java/cn/apes/cloud/domain/entity/CustomerQuotaChangeLog.java rename to src/main/java/cn/apes/authon/domain/entity/CustomerQuotaChangeLog.java index b463286..195543b 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/CustomerQuotaChangeLog.java +++ b/src/main/java/cn/apes/authon/domain/entity/CustomerQuotaChangeLog.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/cn/apes/cloud/domain/entity/CustomerUser.java b/src/main/java/cn/apes/authon/domain/entity/CustomerUser.java similarity index 92% rename from src/main/java/cn/apes/cloud/domain/entity/CustomerUser.java rename to src/main/java/cn/apes/authon/domain/entity/CustomerUser.java index 49c2b04..fa1fccc 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/CustomerUser.java +++ b/src/main/java/cn/apes/authon/domain/entity/CustomerUser.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/entity/SsoConfig.java b/src/main/java/cn/apes/authon/domain/entity/SsoConfig.java similarity index 96% rename from src/main/java/cn/apes/cloud/domain/entity/SsoConfig.java rename to src/main/java/cn/apes/authon/domain/entity/SsoConfig.java index 34e2b45..1f6bf67 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/SsoConfig.java +++ b/src/main/java/cn/apes/authon/domain/entity/SsoConfig.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/src/main/java/cn/apes/cloud/domain/entity/SysAccessToken.java b/src/main/java/cn/apes/authon/domain/entity/SysAccessToken.java similarity index 97% rename from src/main/java/cn/apes/cloud/domain/entity/SysAccessToken.java rename to src/main/java/cn/apes/authon/domain/entity/SysAccessToken.java index cc17cf0..8a3a825 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/SysAccessToken.java +++ b/src/main/java/cn/apes/authon/domain/entity/SysAccessToken.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/cn/apes/cloud/domain/entity/SysMemberRole.java b/src/main/java/cn/apes/authon/domain/entity/SysMemberRole.java similarity index 95% rename from src/main/java/cn/apes/cloud/domain/entity/SysMemberRole.java rename to src/main/java/cn/apes/authon/domain/entity/SysMemberRole.java index 494721b..2b1d6de 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/SysMemberRole.java +++ b/src/main/java/cn/apes/authon/domain/entity/SysMemberRole.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import com.baomidou.mybatisplus.annotation.TableLogic; diff --git a/src/main/java/cn/apes/cloud/domain/entity/SysMenu.java b/src/main/java/cn/apes/authon/domain/entity/SysMenu.java similarity index 98% rename from src/main/java/cn/apes/cloud/domain/entity/SysMenu.java rename to src/main/java/cn/apes/authon/domain/entity/SysMenu.java index 43f7ef4..2c74675 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/SysMenu.java +++ b/src/main/java/cn/apes/authon/domain/entity/SysMenu.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/cn/apes/cloud/domain/entity/SysOperationLog.java b/src/main/java/cn/apes/authon/domain/entity/SysOperationLog.java similarity index 96% rename from src/main/java/cn/apes/cloud/domain/entity/SysOperationLog.java rename to src/main/java/cn/apes/authon/domain/entity/SysOperationLog.java index 2de4bce..1be9aed 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/SysOperationLog.java +++ b/src/main/java/cn/apes/authon/domain/entity/SysOperationLog.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/cn/apes/cloud/domain/entity/SysOrganization.java b/src/main/java/cn/apes/authon/domain/entity/SysOrganization.java similarity index 97% rename from src/main/java/cn/apes/cloud/domain/entity/SysOrganization.java rename to src/main/java/cn/apes/authon/domain/entity/SysOrganization.java index 0267df9..11ad882 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/SysOrganization.java +++ b/src/main/java/cn/apes/authon/domain/entity/SysOrganization.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/cn/apes/cloud/domain/entity/SysPackagePlan.java b/src/main/java/cn/apes/authon/domain/entity/SysPackagePlan.java similarity index 95% rename from src/main/java/cn/apes/cloud/domain/entity/SysPackagePlan.java rename to src/main/java/cn/apes/authon/domain/entity/SysPackagePlan.java index 6a29967..db7ef8a 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/SysPackagePlan.java +++ b/src/main/java/cn/apes/authon/domain/entity/SysPackagePlan.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/entity/SysPackagePlanPermission.java b/src/main/java/cn/apes/authon/domain/entity/SysPackagePlanPermission.java similarity index 95% rename from src/main/java/cn/apes/cloud/domain/entity/SysPackagePlanPermission.java rename to src/main/java/cn/apes/authon/domain/entity/SysPackagePlanPermission.java index ca7cbc2..1a70a0a 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/SysPackagePlanPermission.java +++ b/src/main/java/cn/apes/authon/domain/entity/SysPackagePlanPermission.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/cn/apes/cloud/domain/entity/SysPackagePlanQuota.java b/src/main/java/cn/apes/authon/domain/entity/SysPackagePlanQuota.java similarity index 98% rename from src/main/java/cn/apes/cloud/domain/entity/SysPackagePlanQuota.java rename to src/main/java/cn/apes/authon/domain/entity/SysPackagePlanQuota.java index 753339c..96790be 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/SysPackagePlanQuota.java +++ b/src/main/java/cn/apes/authon/domain/entity/SysPackagePlanQuota.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/cn/apes/cloud/domain/entity/SysPermission.java b/src/main/java/cn/apes/authon/domain/entity/SysPermission.java similarity index 96% rename from src/main/java/cn/apes/cloud/domain/entity/SysPermission.java rename to src/main/java/cn/apes/authon/domain/entity/SysPermission.java index b66deb2..2738c36 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/SysPermission.java +++ b/src/main/java/cn/apes/authon/domain/entity/SysPermission.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/cn/apes/cloud/domain/entity/SysQuota.java b/src/main/java/cn/apes/authon/domain/entity/SysQuota.java similarity index 97% rename from src/main/java/cn/apes/cloud/domain/entity/SysQuota.java rename to src/main/java/cn/apes/authon/domain/entity/SysQuota.java index 5417405..d46d54d 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/SysQuota.java +++ b/src/main/java/cn/apes/authon/domain/entity/SysQuota.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/cn/apes/cloud/domain/entity/SysRole.java b/src/main/java/cn/apes/authon/domain/entity/SysRole.java similarity index 90% rename from src/main/java/cn/apes/cloud/domain/entity/SysRole.java rename to src/main/java/cn/apes/authon/domain/entity/SysRole.java index 831943b..20338cc 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/SysRole.java +++ b/src/main/java/cn/apes/authon/domain/entity/SysRole.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; @@ -44,7 +44,7 @@ public class SysRole extends DbEntity implements Serializable { private String appName; @TableField(exist = false) - private cn.apes.cloud.domain.entity.SysPackagePlan planInfo; + private cn.apes.authon.domain.entity.SysPackagePlan planInfo; } diff --git a/src/main/java/cn/apes/cloud/domain/entity/SysRolePermission.java b/src/main/java/cn/apes/authon/domain/entity/SysRolePermission.java similarity index 95% rename from src/main/java/cn/apes/cloud/domain/entity/SysRolePermission.java rename to src/main/java/cn/apes/authon/domain/entity/SysRolePermission.java index 1b30f1e..1107305 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/SysRolePermission.java +++ b/src/main/java/cn/apes/authon/domain/entity/SysRolePermission.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import com.baomidou.mybatisplus.annotation.TableLogic; diff --git a/src/main/java/cn/apes/cloud/domain/entity/UserInfo.java b/src/main/java/cn/apes/authon/domain/entity/UserInfo.java similarity index 97% rename from src/main/java/cn/apes/cloud/domain/entity/UserInfo.java rename to src/main/java/cn/apes/authon/domain/entity/UserInfo.java index 8806033..cb4aff9 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/UserInfo.java +++ b/src/main/java/cn/apes/authon/domain/entity/UserInfo.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import cn.apes.commons.domain.DbEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/cn/apes/cloud/domain/entity/UserPreference.java b/src/main/java/cn/apes/authon/domain/entity/UserPreference.java similarity index 96% rename from src/main/java/cn/apes/cloud/domain/entity/UserPreference.java rename to src/main/java/cn/apes/authon/domain/entity/UserPreference.java index 81e6ff8..e4ea543 100644 --- a/src/main/java/cn/apes/cloud/domain/entity/UserPreference.java +++ b/src/main/java/cn/apes/authon/domain/entity/UserPreference.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.entity; +package cn.apes.authon.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/cn/apes/cloud/domain/huoban/BulkDel.java b/src/main/java/cn/apes/authon/domain/huoban/BulkDel.java similarity index 78% rename from src/main/java/cn/apes/cloud/domain/huoban/BulkDel.java rename to src/main/java/cn/apes/authon/domain/huoban/BulkDel.java index 81196d5..b9aa631 100644 --- a/src/main/java/cn/apes/cloud/domain/huoban/BulkDel.java +++ b/src/main/java/cn/apes/authon/domain/huoban/BulkDel.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.huoban; +package cn.apes.authon.domain.huoban; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/huoban/CategoryConfig.java b/src/main/java/cn/apes/authon/domain/huoban/CategoryConfig.java similarity index 87% rename from src/main/java/cn/apes/cloud/domain/huoban/CategoryConfig.java rename to src/main/java/cn/apes/authon/domain/huoban/CategoryConfig.java index f09c341..85ad12f 100644 --- a/src/main/java/cn/apes/cloud/domain/huoban/CategoryConfig.java +++ b/src/main/java/cn/apes/authon/domain/huoban/CategoryConfig.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.huoban; +package cn.apes.authon.domain.huoban; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/huoban/DataCreate.java b/src/main/java/cn/apes/authon/domain/huoban/DataCreate.java similarity index 90% rename from src/main/java/cn/apes/cloud/domain/huoban/DataCreate.java rename to src/main/java/cn/apes/authon/domain/huoban/DataCreate.java index d7c3e56..9d4475f 100644 --- a/src/main/java/cn/apes/cloud/domain/huoban/DataCreate.java +++ b/src/main/java/cn/apes/authon/domain/huoban/DataCreate.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.huoban; +package cn.apes.authon.domain.huoban; import com.alibaba.fastjson.JSONObject; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/huoban/DataFilter.java b/src/main/java/cn/apes/authon/domain/huoban/DataFilter.java similarity index 97% rename from src/main/java/cn/apes/cloud/domain/huoban/DataFilter.java rename to src/main/java/cn/apes/authon/domain/huoban/DataFilter.java index 1f3a0c4..f671d2a 100644 --- a/src/main/java/cn/apes/cloud/domain/huoban/DataFilter.java +++ b/src/main/java/cn/apes/authon/domain/huoban/DataFilter.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.huoban; +package cn.apes.authon.domain.huoban; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/huoban/DataFilterCondition.java b/src/main/java/cn/apes/authon/domain/huoban/DataFilterCondition.java similarity index 90% rename from src/main/java/cn/apes/cloud/domain/huoban/DataFilterCondition.java rename to src/main/java/cn/apes/authon/domain/huoban/DataFilterCondition.java index 86eecc5..967cab7 100644 --- a/src/main/java/cn/apes/cloud/domain/huoban/DataFilterCondition.java +++ b/src/main/java/cn/apes/authon/domain/huoban/DataFilterCondition.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.huoban; +package cn.apes.authon.domain.huoban; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/huoban/DataUpdate.java b/src/main/java/cn/apes/authon/domain/huoban/DataUpdate.java similarity index 91% rename from src/main/java/cn/apes/cloud/domain/huoban/DataUpdate.java rename to src/main/java/cn/apes/authon/domain/huoban/DataUpdate.java index 314ed8b..34fc9b4 100644 --- a/src/main/java/cn/apes/cloud/domain/huoban/DataUpdate.java +++ b/src/main/java/cn/apes/authon/domain/huoban/DataUpdate.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.huoban; +package cn.apes.authon.domain.huoban; import com.alibaba.fastjson.JSONObject; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/huoban/DataUpsert.java b/src/main/java/cn/apes/authon/domain/huoban/DataUpsert.java similarity index 95% rename from src/main/java/cn/apes/cloud/domain/huoban/DataUpsert.java rename to src/main/java/cn/apes/authon/domain/huoban/DataUpsert.java index 9f33155..6552bfd 100644 --- a/src/main/java/cn/apes/cloud/domain/huoban/DataUpsert.java +++ b/src/main/java/cn/apes/authon/domain/huoban/DataUpsert.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.huoban; +package cn.apes.authon.domain.huoban; import com.alibaba.fastjson.JSONObject; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/huoban/TableColumn.java b/src/main/java/cn/apes/authon/domain/huoban/TableColumn.java similarity index 96% rename from src/main/java/cn/apes/cloud/domain/huoban/TableColumn.java rename to src/main/java/cn/apes/authon/domain/huoban/TableColumn.java index 9bbb38f..9b8e550 100644 --- a/src/main/java/cn/apes/cloud/domain/huoban/TableColumn.java +++ b/src/main/java/cn/apes/authon/domain/huoban/TableColumn.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.huoban; +package cn.apes.authon.domain.huoban; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/cn/apes/cloud/domain/huoban/TableInfo.java b/src/main/java/cn/apes/authon/domain/huoban/TableInfo.java similarity index 94% rename from src/main/java/cn/apes/cloud/domain/huoban/TableInfo.java rename to src/main/java/cn/apes/authon/domain/huoban/TableInfo.java index e11d0ab..58b2c7b 100644 --- a/src/main/java/cn/apes/cloud/domain/huoban/TableInfo.java +++ b/src/main/java/cn/apes/authon/domain/huoban/TableInfo.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.huoban; +package cn.apes.authon.domain.huoban; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/cn/apes/cloud/domain/huoban/TableSub.java b/src/main/java/cn/apes/authon/domain/huoban/TableSub.java similarity index 78% rename from src/main/java/cn/apes/cloud/domain/huoban/TableSub.java rename to src/main/java/cn/apes/authon/domain/huoban/TableSub.java index be1312e..f617519 100644 --- a/src/main/java/cn/apes/cloud/domain/huoban/TableSub.java +++ b/src/main/java/cn/apes/authon/domain/huoban/TableSub.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.huoban; +package cn.apes.authon.domain.huoban; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/huoban/UpsertOne.java b/src/main/java/cn/apes/authon/domain/huoban/UpsertOne.java similarity index 96% rename from src/main/java/cn/apes/cloud/domain/huoban/UpsertOne.java rename to src/main/java/cn/apes/authon/domain/huoban/UpsertOne.java index 3650fef..58265cc 100644 --- a/src/main/java/cn/apes/cloud/domain/huoban/UpsertOne.java +++ b/src/main/java/cn/apes/authon/domain/huoban/UpsertOne.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.huoban; +package cn.apes.authon.domain.huoban; import com.alibaba.fastjson.JSONObject; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/vo/CustomerAppVO.java b/src/main/java/cn/apes/authon/domain/vo/CustomerAppVO.java similarity index 95% rename from src/main/java/cn/apes/cloud/domain/vo/CustomerAppVO.java rename to src/main/java/cn/apes/authon/domain/vo/CustomerAppVO.java index 32d7c02..779a5c3 100644 --- a/src/main/java/cn/apes/cloud/domain/vo/CustomerAppVO.java +++ b/src/main/java/cn/apes/authon/domain/vo/CustomerAppVO.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.vo; +package cn.apes.authon.domain.vo; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/vo/CustomerPackageExtendApplyVO.java b/src/main/java/cn/apes/authon/domain/vo/CustomerPackageExtendApplyVO.java similarity index 94% rename from src/main/java/cn/apes/cloud/domain/vo/CustomerPackageExtendApplyVO.java rename to src/main/java/cn/apes/authon/domain/vo/CustomerPackageExtendApplyVO.java index 49de417..3bf2875 100644 --- a/src/main/java/cn/apes/cloud/domain/vo/CustomerPackageExtendApplyVO.java +++ b/src/main/java/cn/apes/authon/domain/vo/CustomerPackageExtendApplyVO.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.vo; +package cn.apes.authon.domain.vo; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/domain/vo/CustomerPackageVO.java b/src/main/java/cn/apes/authon/domain/vo/CustomerPackageVO.java similarity index 93% rename from src/main/java/cn/apes/cloud/domain/vo/CustomerPackageVO.java rename to src/main/java/cn/apes/authon/domain/vo/CustomerPackageVO.java index 890dfdb..86a0939 100644 --- a/src/main/java/cn/apes/cloud/domain/vo/CustomerPackageVO.java +++ b/src/main/java/cn/apes/authon/domain/vo/CustomerPackageVO.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.domain.vo; +package cn.apes.authon.domain.vo; import lombok.Data; diff --git a/src/main/java/cn/apes/cloud/filter/AccessTokenFilter.java b/src/main/java/cn/apes/authon/filter/AccessTokenFilter.java similarity index 96% rename from src/main/java/cn/apes/cloud/filter/AccessTokenFilter.java rename to src/main/java/cn/apes/authon/filter/AccessTokenFilter.java index 82c4359..cbd8251 100644 --- a/src/main/java/cn/apes/cloud/filter/AccessTokenFilter.java +++ b/src/main/java/cn/apes/authon/filter/AccessTokenFilter.java @@ -1,14 +1,14 @@ -package cn.apes.cloud.filter; +package cn.apes.authon.filter; import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.LoginCustomer; import cn.apes.commons.auth.LoginUser; import cn.apes.commons.auth.UserSession; -import cn.apes.cloud.domain.entity.CustomerInfo; -import cn.apes.cloud.domain.entity.SysAccessToken; -import cn.apes.cloud.service.impl.CustomerInfoServiceImpl; -import cn.apes.cloud.service.SysAccessTokenService; -import cn.apes.cloud.util.OperationLogUtil; +import cn.apes.authon.domain.entity.CustomerInfo; +import cn.apes.authon.domain.entity.SysAccessToken; +import cn.apes.authon.service.impl.CustomerInfoServiceImpl; +import cn.apes.authon.service.SysAccessTokenService; +import cn.apes.authon.util.OperationLogUtil; import cn.apes.commons.Res; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/cn/apes/cloud/mapper/AppInfoMapper.java b/src/main/java/cn/apes/authon/mapper/AppInfoMapper.java similarity index 61% rename from src/main/java/cn/apes/cloud/mapper/AppInfoMapper.java rename to src/main/java/cn/apes/authon/mapper/AppInfoMapper.java index df0d9dc..3e739ab 100644 --- a/src/main/java/cn/apes/cloud/mapper/AppInfoMapper.java +++ b/src/main/java/cn/apes/authon/mapper/AppInfoMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.AppInfo; +import cn.apes.authon.domain.entity.AppInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface AppInfoMapper extends BaseMapper { diff --git a/src/main/java/cn/apes/cloud/mapper/CustomerAppMapper.java b/src/main/java/cn/apes/authon/mapper/CustomerAppMapper.java similarity index 61% rename from src/main/java/cn/apes/cloud/mapper/CustomerAppMapper.java rename to src/main/java/cn/apes/authon/mapper/CustomerAppMapper.java index d4f3138..023f43a 100644 --- a/src/main/java/cn/apes/cloud/mapper/CustomerAppMapper.java +++ b/src/main/java/cn/apes/authon/mapper/CustomerAppMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.CustomerApp; +import cn.apes.authon.domain.entity.CustomerApp; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface CustomerAppMapper extends BaseMapper { diff --git a/src/main/java/cn/apes/cloud/mapper/CustomerInfoMapper.java b/src/main/java/cn/apes/authon/mapper/CustomerInfoMapper.java similarity index 61% rename from src/main/java/cn/apes/cloud/mapper/CustomerInfoMapper.java rename to src/main/java/cn/apes/authon/mapper/CustomerInfoMapper.java index 39f4d11..fac83f9 100644 --- a/src/main/java/cn/apes/cloud/mapper/CustomerInfoMapper.java +++ b/src/main/java/cn/apes/authon/mapper/CustomerInfoMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.CustomerInfo; +import cn.apes.authon.domain.entity.CustomerInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface CustomerInfoMapper extends BaseMapper { diff --git a/src/main/java/cn/apes/cloud/mapper/CustomerPackageExtendApplyMapper.java b/src/main/java/cn/apes/authon/mapper/CustomerPackageExtendApplyMapper.java similarity index 69% rename from src/main/java/cn/apes/cloud/mapper/CustomerPackageExtendApplyMapper.java rename to src/main/java/cn/apes/authon/mapper/CustomerPackageExtendApplyMapper.java index 45186ba..3e1403e 100644 --- a/src/main/java/cn/apes/cloud/mapper/CustomerPackageExtendApplyMapper.java +++ b/src/main/java/cn/apes/authon/mapper/CustomerPackageExtendApplyMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.CustomerPackageExtendApply; +import cn.apes.authon.domain.entity.CustomerPackageExtendApply; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/cn/apes/cloud/mapper/CustomerPackageMapper.java b/src/main/java/cn/apes/authon/mapper/CustomerPackageMapper.java similarity index 92% rename from src/main/java/cn/apes/cloud/mapper/CustomerPackageMapper.java rename to src/main/java/cn/apes/authon/mapper/CustomerPackageMapper.java index d5cff49..54dfb68 100644 --- a/src/main/java/cn/apes/cloud/mapper/CustomerPackageMapper.java +++ b/src/main/java/cn/apes/authon/mapper/CustomerPackageMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.CustomerPackage; +import cn.apes.authon.domain.entity.CustomerPackage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/cn/apes/cloud/mapper/CustomerPackageQuotaMapper.java b/src/main/java/cn/apes/authon/mapper/CustomerPackageQuotaMapper.java similarity index 83% rename from src/main/java/cn/apes/cloud/mapper/CustomerPackageQuotaMapper.java rename to src/main/java/cn/apes/authon/mapper/CustomerPackageQuotaMapper.java index 7d8bf23..878a78f 100644 --- a/src/main/java/cn/apes/cloud/mapper/CustomerPackageQuotaMapper.java +++ b/src/main/java/cn/apes/authon/mapper/CustomerPackageQuotaMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.CustomerPackageQuota; +import cn.apes.authon.domain.entity.CustomerPackageQuota; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/cn/apes/cloud/mapper/CustomerQuotaChangeLogMapper.java b/src/main/java/cn/apes/authon/mapper/CustomerQuotaChangeLogMapper.java similarity index 69% rename from src/main/java/cn/apes/cloud/mapper/CustomerQuotaChangeLogMapper.java rename to src/main/java/cn/apes/authon/mapper/CustomerQuotaChangeLogMapper.java index e533740..becd715 100644 --- a/src/main/java/cn/apes/cloud/mapper/CustomerQuotaChangeLogMapper.java +++ b/src/main/java/cn/apes/authon/mapper/CustomerQuotaChangeLogMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.CustomerQuotaChangeLog; +import cn.apes.authon.domain.entity.CustomerQuotaChangeLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/cn/apes/cloud/mapper/CustomerUserMapper.java b/src/main/java/cn/apes/authon/mapper/CustomerUserMapper.java similarity index 61% rename from src/main/java/cn/apes/cloud/mapper/CustomerUserMapper.java rename to src/main/java/cn/apes/authon/mapper/CustomerUserMapper.java index eed5d82..9a61c4e 100644 --- a/src/main/java/cn/apes/cloud/mapper/CustomerUserMapper.java +++ b/src/main/java/cn/apes/authon/mapper/CustomerUserMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.CustomerUser; +import cn.apes.authon.domain.entity.CustomerUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface CustomerUserMapper extends BaseMapper { diff --git a/src/main/java/cn/apes/cloud/mapper/SsoConfigMapper.java b/src/main/java/cn/apes/authon/mapper/SsoConfigMapper.java similarity index 61% rename from src/main/java/cn/apes/cloud/mapper/SsoConfigMapper.java rename to src/main/java/cn/apes/authon/mapper/SsoConfigMapper.java index e919e6a..be59d50 100644 --- a/src/main/java/cn/apes/cloud/mapper/SsoConfigMapper.java +++ b/src/main/java/cn/apes/authon/mapper/SsoConfigMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.SsoConfig; +import cn.apes.authon.domain.entity.SsoConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface SsoConfigMapper extends BaseMapper { diff --git a/src/main/java/cn/apes/cloud/mapper/SysAccessTokenMapper.java b/src/main/java/cn/apes/authon/mapper/SysAccessTokenMapper.java similarity index 66% rename from src/main/java/cn/apes/cloud/mapper/SysAccessTokenMapper.java rename to src/main/java/cn/apes/authon/mapper/SysAccessTokenMapper.java index c157149..2dbcc51 100644 --- a/src/main/java/cn/apes/cloud/mapper/SysAccessTokenMapper.java +++ b/src/main/java/cn/apes/authon/mapper/SysAccessTokenMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.SysAccessToken; +import cn.apes.authon.domain.entity.SysAccessToken; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/cn/apes/cloud/mapper/SysMemberRoleMapper.java b/src/main/java/cn/apes/authon/mapper/SysMemberRoleMapper.java similarity index 62% rename from src/main/java/cn/apes/cloud/mapper/SysMemberRoleMapper.java rename to src/main/java/cn/apes/authon/mapper/SysMemberRoleMapper.java index 96b9315..958e971 100644 --- a/src/main/java/cn/apes/cloud/mapper/SysMemberRoleMapper.java +++ b/src/main/java/cn/apes/authon/mapper/SysMemberRoleMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.SysMemberRole; +import cn.apes.authon.domain.entity.SysMemberRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface SysMemberRoleMapper extends BaseMapper { diff --git a/src/main/java/cn/apes/cloud/mapper/SysMenuMapper.java b/src/main/java/cn/apes/authon/mapper/SysMenuMapper.java similarity index 61% rename from src/main/java/cn/apes/cloud/mapper/SysMenuMapper.java rename to src/main/java/cn/apes/authon/mapper/SysMenuMapper.java index 3a4058d..d6f9e1a 100644 --- a/src/main/java/cn/apes/cloud/mapper/SysMenuMapper.java +++ b/src/main/java/cn/apes/authon/mapper/SysMenuMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.SysMenu; +import cn.apes.authon.domain.entity.SysMenu; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface SysMenuMapper extends BaseMapper { diff --git a/src/main/java/cn/apes/cloud/mapper/SysOperationLogMapper.java b/src/main/java/cn/apes/authon/mapper/SysOperationLogMapper.java similarity index 69% rename from src/main/java/cn/apes/cloud/mapper/SysOperationLogMapper.java rename to src/main/java/cn/apes/authon/mapper/SysOperationLogMapper.java index e1d5daa..058f363 100644 --- a/src/main/java/cn/apes/cloud/mapper/SysOperationLogMapper.java +++ b/src/main/java/cn/apes/authon/mapper/SysOperationLogMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.SysOperationLog; +import cn.apes.authon.domain.entity.SysOperationLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/cn/apes/cloud/mapper/SysOrganizationMapper.java b/src/main/java/cn/apes/authon/mapper/SysOrganizationMapper.java similarity index 69% rename from src/main/java/cn/apes/cloud/mapper/SysOrganizationMapper.java rename to src/main/java/cn/apes/authon/mapper/SysOrganizationMapper.java index f76490b..89041ec 100644 --- a/src/main/java/cn/apes/cloud/mapper/SysOrganizationMapper.java +++ b/src/main/java/cn/apes/authon/mapper/SysOrganizationMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.SysOrganization; +import cn.apes.authon.domain.entity.SysOrganization; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/cn/apes/cloud/mapper/SysPackagePlanMapper.java b/src/main/java/cn/apes/authon/mapper/SysPackagePlanMapper.java similarity index 69% rename from src/main/java/cn/apes/cloud/mapper/SysPackagePlanMapper.java rename to src/main/java/cn/apes/authon/mapper/SysPackagePlanMapper.java index 48d894c..7323631 100644 --- a/src/main/java/cn/apes/cloud/mapper/SysPackagePlanMapper.java +++ b/src/main/java/cn/apes/authon/mapper/SysPackagePlanMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.SysPackagePlan; +import cn.apes.authon.domain.entity.SysPackagePlan; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/cn/apes/cloud/mapper/SysPackagePlanPermissionMapper.java b/src/main/java/cn/apes/authon/mapper/SysPackagePlanPermissionMapper.java similarity index 69% rename from src/main/java/cn/apes/cloud/mapper/SysPackagePlanPermissionMapper.java rename to src/main/java/cn/apes/authon/mapper/SysPackagePlanPermissionMapper.java index c526884..dc5ce20 100644 --- a/src/main/java/cn/apes/cloud/mapper/SysPackagePlanPermissionMapper.java +++ b/src/main/java/cn/apes/authon/mapper/SysPackagePlanPermissionMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.SysPackagePlanPermission; +import cn.apes.authon.domain.entity.SysPackagePlanPermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/cn/apes/cloud/mapper/SysPackagePlanQuotaMapper.java b/src/main/java/cn/apes/authon/mapper/SysPackagePlanQuotaMapper.java similarity index 79% rename from src/main/java/cn/apes/cloud/mapper/SysPackagePlanQuotaMapper.java rename to src/main/java/cn/apes/authon/mapper/SysPackagePlanQuotaMapper.java index f321832..4786318 100644 --- a/src/main/java/cn/apes/cloud/mapper/SysPackagePlanQuotaMapper.java +++ b/src/main/java/cn/apes/authon/mapper/SysPackagePlanQuotaMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.SysPackagePlanQuota; +import cn.apes.authon.domain.entity.SysPackagePlanQuota; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/cn/apes/cloud/mapper/SysPermissionMapper.java b/src/main/java/cn/apes/authon/mapper/SysPermissionMapper.java similarity index 61% rename from src/main/java/cn/apes/cloud/mapper/SysPermissionMapper.java rename to src/main/java/cn/apes/authon/mapper/SysPermissionMapper.java index e35d8e1..0367648 100644 --- a/src/main/java/cn/apes/cloud/mapper/SysPermissionMapper.java +++ b/src/main/java/cn/apes/authon/mapper/SysPermissionMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.SysPermission; +import cn.apes.authon.domain.entity.SysPermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface SysPermissionMapper extends BaseMapper { diff --git a/src/main/java/cn/apes/cloud/mapper/SysQuotaMapper.java b/src/main/java/cn/apes/authon/mapper/SysQuotaMapper.java similarity index 69% rename from src/main/java/cn/apes/cloud/mapper/SysQuotaMapper.java rename to src/main/java/cn/apes/authon/mapper/SysQuotaMapper.java index 17e75ef..79fe24b 100644 --- a/src/main/java/cn/apes/cloud/mapper/SysQuotaMapper.java +++ b/src/main/java/cn/apes/authon/mapper/SysQuotaMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.SysQuota; +import cn.apes.authon.domain.entity.SysQuota; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/cn/apes/cloud/mapper/SysRoleMapper.java b/src/main/java/cn/apes/authon/mapper/SysRoleMapper.java similarity index 69% rename from src/main/java/cn/apes/cloud/mapper/SysRoleMapper.java rename to src/main/java/cn/apes/authon/mapper/SysRoleMapper.java index 57ec380..a5e4785 100644 --- a/src/main/java/cn/apes/cloud/mapper/SysRoleMapper.java +++ b/src/main/java/cn/apes/authon/mapper/SysRoleMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.SysRole; +import cn.apes.authon.domain.entity.SysRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/cn/apes/cloud/mapper/SysRolePermissionMapper.java b/src/main/java/cn/apes/authon/mapper/SysRolePermissionMapper.java similarity index 62% rename from src/main/java/cn/apes/cloud/mapper/SysRolePermissionMapper.java rename to src/main/java/cn/apes/authon/mapper/SysRolePermissionMapper.java index d40d5a6..536f5bd 100644 --- a/src/main/java/cn/apes/cloud/mapper/SysRolePermissionMapper.java +++ b/src/main/java/cn/apes/authon/mapper/SysRolePermissionMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.SysRolePermission; +import cn.apes.authon.domain.entity.SysRolePermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface SysRolePermissionMapper extends BaseMapper { diff --git a/src/main/java/cn/apes/cloud/mapper/UserInfoMapper.java b/src/main/java/cn/apes/authon/mapper/UserInfoMapper.java similarity index 69% rename from src/main/java/cn/apes/cloud/mapper/UserInfoMapper.java rename to src/main/java/cn/apes/authon/mapper/UserInfoMapper.java index c757190..d792594 100644 --- a/src/main/java/cn/apes/cloud/mapper/UserInfoMapper.java +++ b/src/main/java/cn/apes/authon/mapper/UserInfoMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.UserInfo; +import cn.apes.authon.domain.entity.UserInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/cn/apes/cloud/mapper/UserPreferenceMapper.java b/src/main/java/cn/apes/authon/mapper/UserPreferenceMapper.java similarity index 93% rename from src/main/java/cn/apes/cloud/mapper/UserPreferenceMapper.java rename to src/main/java/cn/apes/authon/mapper/UserPreferenceMapper.java index 9c85548..76ffb6b 100644 --- a/src/main/java/cn/apes/cloud/mapper/UserPreferenceMapper.java +++ b/src/main/java/cn/apes/authon/mapper/UserPreferenceMapper.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.mapper; +package cn.apes.authon.mapper; -import cn.apes.cloud.domain.entity.UserPreference; +import cn.apes.authon.domain.entity.UserPreference; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/cn/apes/cloud/service/CustomerPackageService.java b/src/main/java/cn/apes/authon/service/CustomerPackageService.java similarity index 91% rename from src/main/java/cn/apes/cloud/service/CustomerPackageService.java rename to src/main/java/cn/apes/authon/service/CustomerPackageService.java index a7bc0cd..aa74fc1 100644 --- a/src/main/java/cn/apes/cloud/service/CustomerPackageService.java +++ b/src/main/java/cn/apes/authon/service/CustomerPackageService.java @@ -1,8 +1,8 @@ -package cn.apes.cloud.service; +package cn.apes.authon.service; -import cn.apes.cloud.domain.entity.CustomerPackage; -import cn.apes.cloud.domain.vo.CustomerPackageVO; -import cn.apes.cloud.domain.vo.CustomerPackageExtendApplyVO; +import cn.apes.authon.domain.entity.CustomerPackage; +import cn.apes.authon.domain.vo.CustomerPackageVO; +import cn.apes.authon.domain.vo.CustomerPackageExtendApplyVO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/src/main/java/cn/apes/authon/service/IpLocationService.java b/src/main/java/cn/apes/authon/service/IpLocationService.java new file mode 100644 index 0000000..cffb333 --- /dev/null +++ b/src/main/java/cn/apes/authon/service/IpLocationService.java @@ -0,0 +1,16 @@ +package cn.apes.authon.service; + +/** + * IP 地理位置服务接口 + * 从 saas-service 提取，在独立服务中以桩实现替代（返回空字符串） + * 后续可接入第三方 IP 库（如 ip2region、纯真 IP 库等） + */ +public interface IpLocationService { + + /** + * 根据 IP 获取地理位置信息 + * @param ip IP 地址 + * @return 地理位置（如 "北京市"），无法识别时返回空字符串 + */ + String getLocation(String ip); +} diff --git a/src/main/java/cn/apes/cloud/service/SysAccessTokenService.java b/src/main/java/cn/apes/authon/service/SysAccessTokenService.java similarity index 88% rename from src/main/java/cn/apes/cloud/service/SysAccessTokenService.java rename to src/main/java/cn/apes/authon/service/SysAccessTokenService.java index d630082..e260aae 100644 --- a/src/main/java/cn/apes/cloud/service/SysAccessTokenService.java +++ b/src/main/java/cn/apes/authon/service/SysAccessTokenService.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.service; +package cn.apes.authon.service; -import cn.apes.cloud.domain.entity.SysAccessToken; +import cn.apes.authon.domain.entity.SysAccessToken; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/cn/apes/cloud/service/SysOperationLogService.java b/src/main/java/cn/apes/authon/service/SysOperationLogService.java similarity index 92% rename from src/main/java/cn/apes/cloud/service/SysOperationLogService.java rename to src/main/java/cn/apes/authon/service/SysOperationLogService.java index 862113b..09368da 100644 --- a/src/main/java/cn/apes/cloud/service/SysOperationLogService.java +++ b/src/main/java/cn/apes/authon/service/SysOperationLogService.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.service; +package cn.apes.authon.service; -import cn.apes.cloud.domain.entity.SysOperationLog; +import cn.apes.authon.domain.entity.SysOperationLog; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.Date; diff --git a/src/main/java/cn/apes/cloud/service/SysPackagePlanQuotaService.java b/src/main/java/cn/apes/authon/service/SysPackagePlanQuotaService.java similarity index 88% rename from src/main/java/cn/apes/cloud/service/SysPackagePlanQuotaService.java rename to src/main/java/cn/apes/authon/service/SysPackagePlanQuotaService.java index ba69e97..7742dd8 100644 --- a/src/main/java/cn/apes/cloud/service/SysPackagePlanQuotaService.java +++ b/src/main/java/cn/apes/authon/service/SysPackagePlanQuotaService.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.service; +package cn.apes.authon.service; -import cn.apes.cloud.domain.entity.SysPackagePlanQuota; +import cn.apes.authon.domain.entity.SysPackagePlanQuota; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/src/main/java/cn/apes/cloud/service/SysPackagePlanService.java b/src/main/java/cn/apes/authon/service/SysPackagePlanService.java similarity index 86% rename from src/main/java/cn/apes/cloud/service/SysPackagePlanService.java rename to src/main/java/cn/apes/authon/service/SysPackagePlanService.java index ee5b83c..eac8152 100644 --- a/src/main/java/cn/apes/cloud/service/SysPackagePlanService.java +++ b/src/main/java/cn/apes/authon/service/SysPackagePlanService.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.service; +package cn.apes.authon.service; -import cn.apes.cloud.domain.entity.SysPackagePlan; +import cn.apes.authon.domain.entity.SysPackagePlan; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/src/main/java/cn/apes/cloud/service/SysQuotaService.java b/src/main/java/cn/apes/authon/service/SysQuotaService.java similarity index 61% rename from src/main/java/cn/apes/cloud/service/SysQuotaService.java rename to src/main/java/cn/apes/authon/service/SysQuotaService.java index 63e74b2..b79d21e 100644 --- a/src/main/java/cn/apes/cloud/service/SysQuotaService.java +++ b/src/main/java/cn/apes/authon/service/SysQuotaService.java @@ -1,6 +1,6 @@ -package cn.apes.cloud.service; +package cn.apes.authon.service; -import cn.apes.cloud.domain.entity.SysQuota; +import cn.apes.authon.domain.entity.SysQuota; import com.baomidou.mybatisplus.extension.service.IService; public interface SysQuotaService extends IService { diff --git a/src/main/java/cn/apes/cloud/service/impl/AppInfoServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/AppInfoServiceImpl.java similarity index 94% rename from src/main/java/cn/apes/cloud/service/impl/AppInfoServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/AppInfoServiceImpl.java index 2d4e45a..909b625 100644 --- a/src/main/java/cn/apes/cloud/service/impl/AppInfoServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/AppInfoServiceImpl.java @@ -1,9 +1,9 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; import cn.apes.commons.Res; -import cn.apes.cloud.domain.dto.AppSearchDTO; -import cn.apes.cloud.domain.entity.AppInfo; -import cn.apes.cloud.mapper.AppInfoMapper; +import cn.apes.authon.domain.dto.AppSearchDTO; +import cn.apes.authon.domain.entity.AppInfo; +import cn.apes.authon.mapper.AppInfoMapper; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/cn/apes/cloud/service/impl/CustomerAppServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/CustomerAppServiceImpl.java similarity index 91% rename from src/main/java/cn/apes/cloud/service/impl/CustomerAppServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/CustomerAppServiceImpl.java index 80d73e3..d56fd9a 100644 --- a/src/main/java/cn/apes/cloud/service/impl/CustomerAppServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/CustomerAppServiceImpl.java @@ -1,22 +1,22 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; import cn.apes.commons.Res; -import cn.apes.cloud.domain.entity.CustomerInfo; -import cn.apes.cloud.domain.entity.AppInfo; -import cn.apes.cloud.domain.entity.CustomerApp; -import cn.apes.cloud.domain.entity.CustomerPackage; -import cn.apes.cloud.domain.entity.CustomerPackageQuota; -import cn.apes.cloud.domain.entity.SysPackagePlan; -import cn.apes.cloud.domain.vo.CustomerAppVO; -import cn.apes.cloud.mapper.AppInfoMapper; -import cn.apes.cloud.mapper.CustomerAppMapper; -import cn.apes.cloud.mapper.CustomerPackageMapper; -import cn.apes.cloud.mapper.CustomerPackageQuotaMapper; -import cn.apes.cloud.mapper.SysPackagePlanMapper; +import cn.apes.authon.domain.entity.CustomerInfo; +import cn.apes.authon.domain.entity.AppInfo; +import cn.apes.authon.domain.entity.CustomerApp; +import cn.apes.authon.domain.entity.CustomerPackage; +import cn.apes.authon.domain.entity.CustomerPackageQuota; +import cn.apes.authon.domain.entity.SysPackagePlan; +import cn.apes.authon.domain.vo.CustomerAppVO; +import cn.apes.authon.mapper.AppInfoMapper; +import cn.apes.authon.mapper.CustomerAppMapper; +import cn.apes.authon.mapper.CustomerPackageMapper; +import cn.apes.authon.mapper.CustomerPackageQuotaMapper; +import cn.apes.authon.mapper.SysPackagePlanMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.apes.cloud.service.impl.CustomerInfoServiceImpl; -import cn.apes.cloud.util.OperationLogUtil; +import cn.apes.authon.service.impl.CustomerInfoServiceImpl; +import cn.apes.authon.util.OperationLogUtil; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/apes/cloud/service/impl/CustomerInfoServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/CustomerInfoServiceImpl.java similarity index 65% rename from src/main/java/cn/apes/cloud/service/impl/CustomerInfoServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/CustomerInfoServiceImpl.java index 21a4c10..0d27ac5 100644 --- a/src/main/java/cn/apes/cloud/service/impl/CustomerInfoServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/CustomerInfoServiceImpl.java @@ -1,21 +1,19 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; import cn.apes.commons.Res; -import cn.apes.cloud.service.impl.huoban.HuobanUtil; import com.alibaba.fastjson.JSONObject; -import cn.apes.cloud.domain.huoban.UpsertOne; -import cn.apes.cloud.service.SysOperationLogService; -import cn.apes.cloud.util.OperationLogUtil; -import cn.apes.cloud.domain.dto.CustomerSearchDTO; -import cn.apes.cloud.domain.entity.CustomerInfo; -import cn.apes.cloud.domain.entity.CustomerPackage; -import cn.apes.cloud.domain.entity.SsoConfig; -import cn.apes.cloud.domain.entity.SysPackagePlan; -import cn.apes.cloud.domain.entity.UserInfo; -import cn.apes.cloud.mapper.CustomerInfoMapper; -import cn.apes.cloud.mapper.CustomerPackageMapper; -import cn.apes.cloud.mapper.SsoConfigMapper; -import cn.apes.cloud.service.SysPackagePlanService; +import cn.apes.authon.service.SysOperationLogService; +import cn.apes.authon.util.OperationLogUtil; +import cn.apes.authon.domain.dto.CustomerSearchDTO; +import cn.apes.authon.domain.entity.CustomerInfo; +import cn.apes.authon.domain.entity.CustomerPackage; +import cn.apes.authon.domain.entity.SsoConfig; +import cn.apes.authon.domain.entity.SysPackagePlan; +import cn.apes.authon.domain.entity.UserInfo; +import cn.apes.authon.mapper.CustomerInfoMapper; +import cn.apes.authon.mapper.CustomerPackageMapper; +import cn.apes.authon.mapper.SsoConfigMapper; +import cn.apes.authon.service.SysPackagePlanService; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -46,9 +44,6 @@ public class CustomerInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); IPage pageData = page(searchDTO.getPage(), lambdaQueryWrapper); @@ -230,77 +225,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(CustomerInfo::getIsDel, 0); - List allCustomers = list(wrapper); - - int successCount = 0; - int failCount = 0; - StringBuilder failMsg = new StringBuilder(); - - for (CustomerInfo customer : allCustomers) { - try { - // 构建 upsetOne 请求参数 - JSONObject fields = new JSONObject(); - fields.put("customerId", customer.getId()); - fields.put("customerName", customer.getCustomerName()); - fields.put("shortName", customer.getShortName()); - fields.put("customerType", customer.getCustomerType()); - fields.put("adminName", customer.getAdminName()); - fields.put("adminPhone", customer.getAdminPhone()); - fields.put("customerStatus", customer.getCustomerStatus()); - fields.put("industry", customer.getIndustry()); - fields.put("industrySub", customer.getIndustrySub()); - fields.put("salesChannel", customer.getSalesChannel()); - fields.put("industryType", customer.getIndustryType()); - fields.put("province", customer.getProvince()); - fields.put("city", customer.getCity()); - if (customer.getLogo() != null) fields.put("logo", customer.getLogo()); - if (customer.getCustomerIdNumber() != null) fields.put("customerIdNumber", customer.getCustomerIdNumber()); - - // 通过 HuobanData2ServiceImpl.upsetOne 调用 - UpsertOne upsertOne = new UpsertOne(2100000000008750L, fields); - upsertOne.setUpdateFields(java.util.Collections.singletonList("customerId")); - upsertOne.setAction("one_update"); - - Res res = huobanData2Service.upsetOne(upsertOne); - if (res != null && res.getCode() == 1) { - successCount++; - } else { - failCount++; - failMsg.append(customer.getCustomerName()).append("(").append(res != null ? res.getMsg() : "null").append("); "); - } - } catch (Exception e) { - failCount++; - failMsg.append(customer.getCustomerName()).append("(").append(e.getMessage()).append("); "); - } - } - - String result = "同步完成：成功 " + successCount + " 条"; - if (failCount > 0) { - result += "，失败 " + failCount + " 条"; - if (failMsg.length() > 200) { - result += "，详情：" + failMsg.substring(0, 200) + "..."; - } else { - result += "，详情：" + failMsg.toString(); - } - } - - if (failCount == 0) { - return Res.success(result); - } else { - return Res.fail(result); - } - } catch (Exception e) { - return Res.fail("同步异常：" + e.getMessage()); - } - } + // syncAllTenantsToHuoban() 已移除 — 伙伴云同步属业务集成，非账权核心功能 + // 如需恢复，请从 apes-Authdata 仓库的 service/impl/huoban/ 包引入 } diff --git a/src/main/java/cn/apes/cloud/service/impl/CustomerPackageServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/CustomerPackageServiceImpl.java similarity index 96% rename from src/main/java/cn/apes/cloud/service/impl/CustomerPackageServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/CustomerPackageServiceImpl.java index 6f195e6..6864aff 100644 --- a/src/main/java/cn/apes/cloud/service/impl/CustomerPackageServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/CustomerPackageServiceImpl.java @@ -1,37 +1,37 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; -import cn.apes.cloud.domain.entity.AppInfo; -import cn.apes.cloud.domain.entity.CustomerInfo; +import cn.apes.authon.domain.entity.AppInfo; +import cn.apes.authon.domain.entity.CustomerInfo; import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.LoginUser; -import cn.apes.cloud.domain.entity.CustomerPackageExtendApply; -import cn.apes.cloud.mapper.CustomerPackageExtendApplyMapper; -import cn.apes.cloud.mapper.CustomerQuotaChangeLogMapper; -import cn.apes.cloud.domain.entity.CustomerQuotaChangeLog; -import cn.apes.cloud.domain.entity.CustomerPackage; -import cn.apes.cloud.domain.entity.CustomerInfo; +import cn.apes.authon.domain.entity.CustomerPackageExtendApply; +import cn.apes.authon.mapper.CustomerPackageExtendApplyMapper; +import cn.apes.authon.mapper.CustomerQuotaChangeLogMapper; +import cn.apes.authon.domain.entity.CustomerQuotaChangeLog; +import cn.apes.authon.domain.entity.CustomerPackage; +import cn.apes.authon.domain.entity.CustomerInfo; import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.LoginUser; -import cn.apes.cloud.domain.entity.CustomerPackageExtendApply; -import cn.apes.cloud.mapper.CustomerPackageExtendApplyMapper; -import cn.apes.cloud.domain.entity.SysPackagePlan; -import cn.apes.cloud.domain.vo.CustomerPackageVO; -import cn.apes.cloud.domain.vo.CustomerPackageExtendApplyVO; -import cn.apes.cloud.mapper.CustomerInfoMapper; -import cn.apes.cloud.domain.entity.CustomerPackageQuota; -import cn.apes.cloud.domain.entity.SysPackagePlan; -import cn.apes.cloud.domain.entity.SysPackagePlanQuota; -import cn.apes.cloud.domain.entity.SysQuota; -import cn.apes.cloud.mapper.AppInfoMapper; -import cn.apes.cloud.mapper.CustomerPackageMapper; -import cn.apes.cloud.mapper.CustomerPackageQuotaMapper; -import cn.apes.cloud.mapper.SysPackagePlanQuotaMapper; -import cn.apes.cloud.mapper.SysQuotaMapper; -import cn.apes.cloud.service.CustomerPackageService; -import cn.apes.cloud.service.impl.CustomerInfoServiceImpl; -import cn.apes.cloud.service.SysPackagePlanService; -import cn.apes.cloud.util.OperationLogUtil; -import cn.apes.cloud.service.SysQuotaService; +import cn.apes.authon.domain.entity.CustomerPackageExtendApply; +import cn.apes.authon.mapper.CustomerPackageExtendApplyMapper; +import cn.apes.authon.domain.entity.SysPackagePlan; +import cn.apes.authon.domain.vo.CustomerPackageVO; +import cn.apes.authon.domain.vo.CustomerPackageExtendApplyVO; +import cn.apes.authon.mapper.CustomerInfoMapper; +import cn.apes.authon.domain.entity.CustomerPackageQuota; +import cn.apes.authon.domain.entity.SysPackagePlan; +import cn.apes.authon.domain.entity.SysPackagePlanQuota; +import cn.apes.authon.domain.entity.SysQuota; +import cn.apes.authon.mapper.AppInfoMapper; +import cn.apes.authon.mapper.CustomerPackageMapper; +import cn.apes.authon.mapper.CustomerPackageQuotaMapper; +import cn.apes.authon.mapper.SysPackagePlanQuotaMapper; +import cn.apes.authon.mapper.SysQuotaMapper; +import cn.apes.authon.service.CustomerPackageService; +import cn.apes.authon.service.impl.CustomerInfoServiceImpl; +import cn.apes.authon.service.SysPackagePlanService; +import cn.apes.authon.util.OperationLogUtil; +import cn.apes.authon.service.SysQuotaService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/apes/cloud/service/impl/CustomerUserServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/CustomerUserServiceImpl.java similarity index 94% rename from src/main/java/cn/apes/cloud/service/impl/CustomerUserServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/CustomerUserServiceImpl.java index 34d7a45..1ba1dbc 100644 --- a/src/main/java/cn/apes/cloud/service/impl/CustomerUserServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/CustomerUserServiceImpl.java @@ -1,24 +1,24 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; import cn.apes.commons.Res; -import cn.apes.cloud.domain.entity.CustomerInfo; -import cn.apes.cloud.domain.entity.CustomerUser; -import cn.apes.cloud.domain.entity.SysOrganization; -import cn.apes.cloud.domain.entity.UserInfo; -import cn.apes.cloud.domain.entity.SysPackagePlan; -import cn.apes.cloud.domain.entity.SysRole; -import cn.apes.cloud.domain.entity.SysMemberRole; -import cn.apes.cloud.domain.entity.CustomerPackage; -import cn.apes.cloud.mapper.CustomerInfoMapper; -import cn.apes.cloud.mapper.CustomerUserMapper; -import cn.apes.cloud.mapper.UserInfoMapper; -import cn.apes.cloud.mapper.SysRoleMapper; -import cn.apes.cloud.mapper.SysMemberRoleMapper; -import cn.apes.cloud.mapper.SysPackagePlanMapper; -import cn.apes.cloud.mapper.CustomerPackageMapper; +import cn.apes.authon.domain.entity.CustomerInfo; +import cn.apes.authon.domain.entity.CustomerUser; +import cn.apes.authon.domain.entity.SysOrganization; +import cn.apes.authon.domain.entity.UserInfo; +import cn.apes.authon.domain.entity.SysPackagePlan; +import cn.apes.authon.domain.entity.SysRole; +import cn.apes.authon.domain.entity.SysMemberRole; +import cn.apes.authon.domain.entity.CustomerPackage; +import cn.apes.authon.mapper.CustomerInfoMapper; +import cn.apes.authon.mapper.CustomerUserMapper; +import cn.apes.authon.mapper.UserInfoMapper; +import cn.apes.authon.mapper.SysRoleMapper; +import cn.apes.authon.mapper.SysMemberRoleMapper; +import cn.apes.authon.mapper.SysPackagePlanMapper; +import cn.apes.authon.mapper.CustomerPackageMapper; import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.LoginCustomer; -import cn.apes.cloud.util.OperationLogUtil; +import cn.apes.authon.util.OperationLogUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/src/main/java/cn/apes/authon/service/impl/IpLocationServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/IpLocationServiceImpl.java new file mode 100644 index 0000000..d2568ca --- /dev/null +++ b/src/main/java/cn/apes/authon/service/impl/IpLocationServiceImpl.java @@ -0,0 +1,18 @@ +package cn.apes.authon.service.impl; + +import cn.apes.authon.service.IpLocationService; +import org.springframework.stereotype.Service; + +/** + * IP 地理位置服务桩实现 + * 独立账权服务中不包含 IP 库，返回空字符串 + * 后续可替换为真实实现（ip2region、纯真 IP 库等） + */ +@Service +public class IpLocationServiceImpl implements IpLocationService { + + @Override + public String getLocation(String ip) { + return ""; + } +} diff --git a/src/main/java/cn/apes/cloud/service/impl/PermissionServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/PermissionServiceImpl.java similarity index 98% rename from src/main/java/cn/apes/cloud/service/impl/PermissionServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/PermissionServiceImpl.java index 9151516..f890e8b 100644 --- a/src/main/java/cn/apes/cloud/service/impl/PermissionServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/PermissionServiceImpl.java @@ -1,16 +1,16 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; import cn.apes.commons.Res; import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.LoginCustomer; import cn.apes.commons.auth.LoginUser; -import cn.apes.cloud.config.SiteConfig; -import cn.apes.cloud.domain.dto.RoleSearchDTO; -import cn.apes.cloud.domain.dto.SysRoleDTO; -import cn.apes.cloud.domain.entity.*; -import cn.apes.cloud.mapper.*; -import cn.apes.cloud.mapper.SysPackagePlanPermissionMapper; -import cn.apes.cloud.util.OperationLogUtil; +import cn.apes.authon.config.SiteConfig; +import cn.apes.authon.domain.dto.RoleSearchDTO; +import cn.apes.authon.domain.dto.SysRoleDTO; +import cn.apes.authon.domain.entity.*; +import cn.apes.authon.mapper.*; +import cn.apes.authon.mapper.SysPackagePlanPermissionMapper; +import cn.apes.authon.util.OperationLogUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.comparator.VersionComparator; @@ -764,7 +764,7 @@ public class PermissionServiceImpl { JSONObject res = new JSONObject(); res.put("menu", sysMenu); Res huoRes = sso2Service.getPageUrl(sysMenu.getMenuPath(), loginUser.getId(), loginCustomer.getId()); - if (!huoRes.getCode().equals(1)) { + if (huoRes.getCode() != 1) { return huoRes; } log.info("伙伴云 huoRes={}", JSONObject.toJSONString(huoRes)); diff --git a/src/main/java/cn/apes/cloud/service/impl/Sso2ServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/Sso2ServiceImpl.java similarity index 98% rename from src/main/java/cn/apes/cloud/service/impl/Sso2ServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/Sso2ServiceImpl.java index 222b374..cb5a889 100644 --- a/src/main/java/cn/apes/cloud/service/impl/Sso2ServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/Sso2ServiceImpl.java @@ -1,8 +1,8 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; import cn.apes.commons.Res; -import cn.apes.cloud.domain.entity.SsoConfig; -import cn.apes.cloud.mapper.SsoConfigMapper; +import cn.apes.authon.domain.entity.SsoConfig; +import cn.apes.authon.mapper.SsoConfigMapper; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.HMac; diff --git a/src/main/java/cn/apes/cloud/service/impl/SsoServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/SsoServiceImpl.java similarity index 96% rename from src/main/java/cn/apes/cloud/service/impl/SsoServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/SsoServiceImpl.java index b745b73..ceefee2 100644 --- a/src/main/java/cn/apes/cloud/service/impl/SsoServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/SsoServiceImpl.java @@ -1,8 +1,8 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; import cn.apes.commons.Res; -import cn.apes.cloud.domain.entity.SsoConfig; -import cn.apes.cloud.mapper.SsoConfigMapper; +import cn.apes.authon.domain.entity.SsoConfig; +import cn.apes.authon.mapper.SsoConfigMapper; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.HMac; diff --git a/src/main/java/cn/apes/cloud/service/impl/SysAccessTokenServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/SysAccessTokenServiceImpl.java similarity index 94% rename from src/main/java/cn/apes/cloud/service/impl/SysAccessTokenServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/SysAccessTokenServiceImpl.java index 0787d0f..91a61cb 100644 --- a/src/main/java/cn/apes/cloud/service/impl/SysAccessTokenServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/SysAccessTokenServiceImpl.java @@ -1,8 +1,8 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; -import cn.apes.cloud.domain.entity.SysAccessToken; -import cn.apes.cloud.mapper.SysAccessTokenMapper; -import cn.apes.cloud.service.SysAccessTokenService; +import cn.apes.authon.domain.entity.SysAccessToken; +import cn.apes.authon.mapper.SysAccessTokenMapper; +import cn.apes.authon.service.SysAccessTokenService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/apes/cloud/service/impl/SysOperationLogServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/SysOperationLogServiceImpl.java similarity index 94% rename from src/main/java/cn/apes/cloud/service/impl/SysOperationLogServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/SysOperationLogServiceImpl.java index 1dbc613..cc47efc 100644 --- a/src/main/java/cn/apes/cloud/service/impl/SysOperationLogServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/SysOperationLogServiceImpl.java @@ -1,16 +1,16 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.LoginCustomer; import cn.apes.commons.auth.LoginUser; -import cn.apes.cloud.domain.entity.CustomerInfo; -import cn.apes.cloud.domain.entity.SysOperationLog; -import cn.apes.cloud.domain.entity.UserInfo; -import cn.apes.cloud.mapper.CustomerInfoMapper; -import cn.apes.cloud.mapper.SysOperationLogMapper; -import cn.apes.cloud.mapper.UserInfoMapper; -import cn.apes.cloud.service.SysOperationLogService; -import cn.apes.cloud.service.IpLocationService; +import cn.apes.authon.domain.entity.CustomerInfo; +import cn.apes.authon.domain.entity.SysOperationLog; +import cn.apes.authon.domain.entity.UserInfo; +import cn.apes.authon.mapper.CustomerInfoMapper; +import cn.apes.authon.mapper.SysOperationLogMapper; +import cn.apes.authon.mapper.UserInfoMapper; +import cn.apes.authon.service.SysOperationLogService; +import cn.apes.authon.service.IpLocationService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/src/main/java/cn/apes/cloud/service/impl/SysOrganizationServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/SysOrganizationServiceImpl.java similarity index 98% rename from src/main/java/cn/apes/cloud/service/impl/SysOrganizationServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/SysOrganizationServiceImpl.java index 7ec06dd..0583a2c 100644 --- a/src/main/java/cn/apes/cloud/service/impl/SysOrganizationServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/SysOrganizationServiceImpl.java @@ -1,13 +1,13 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; import cn.apes.commons.Res; import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.Login; import cn.apes.commons.auth.LoginCustomer; import cn.apes.commons.auth.UserSession; -import cn.apes.cloud.domain.entity.SysOrganization; -import cn.apes.cloud.mapper.SysOrganizationMapper; -import cn.apes.cloud.util.OperationLogUtil; +import cn.apes.authon.domain.entity.SysOrganization; +import cn.apes.authon.mapper.SysOrganizationMapper; +import cn.apes.authon.util.OperationLogUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/src/main/java/cn/apes/cloud/service/impl/SysPackagePlanQuotaServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/SysPackagePlanQuotaServiceImpl.java similarity index 95% rename from src/main/java/cn/apes/cloud/service/impl/SysPackagePlanQuotaServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/SysPackagePlanQuotaServiceImpl.java index 2d2a881..286cec4 100644 --- a/src/main/java/cn/apes/cloud/service/impl/SysPackagePlanQuotaServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/SysPackagePlanQuotaServiceImpl.java @@ -1,10 +1,10 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; -import cn.apes.cloud.domain.entity.SysPackagePlanQuota; -import cn.apes.cloud.domain.entity.SysQuota; -import cn.apes.cloud.mapper.SysPackagePlanQuotaMapper; -import cn.apes.cloud.service.SysPackagePlanQuotaService; -import cn.apes.cloud.service.SysQuotaService; +import cn.apes.authon.domain.entity.SysPackagePlanQuota; +import cn.apes.authon.domain.entity.SysQuota; +import cn.apes.authon.mapper.SysPackagePlanQuotaMapper; +import cn.apes.authon.service.SysPackagePlanQuotaService; +import cn.apes.authon.service.SysQuotaService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/src/main/java/cn/apes/cloud/service/impl/SysPackagePlanServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/SysPackagePlanServiceImpl.java similarity index 95% rename from src/main/java/cn/apes/cloud/service/impl/SysPackagePlanServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/SysPackagePlanServiceImpl.java index d6f839e..3f3494f 100644 --- a/src/main/java/cn/apes/cloud/service/impl/SysPackagePlanServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/SysPackagePlanServiceImpl.java @@ -1,18 +1,18 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.LoginCustomer; import cn.apes.commons.auth.LoginUser; -import cn.apes.cloud.domain.entity.AppInfo; -import cn.apes.cloud.domain.entity.CustomerInfo; -import cn.apes.cloud.domain.entity.SysPackagePlan; -import cn.apes.cloud.domain.entity.SysPackagePlanPermission; -import cn.apes.cloud.mapper.AppInfoMapper; -import cn.apes.cloud.mapper.SysPackagePlanMapper; -import cn.apes.cloud.mapper.SysPackagePlanPermissionMapper; -import cn.apes.cloud.service.impl.CustomerInfoServiceImpl; -import cn.apes.cloud.service.SysPackagePlanService; -import cn.apes.cloud.util.OperationLogUtil; +import cn.apes.authon.domain.entity.AppInfo; +import cn.apes.authon.domain.entity.CustomerInfo; +import cn.apes.authon.domain.entity.SysPackagePlan; +import cn.apes.authon.domain.entity.SysPackagePlanPermission; +import cn.apes.authon.mapper.AppInfoMapper; +import cn.apes.authon.mapper.SysPackagePlanMapper; +import cn.apes.authon.mapper.SysPackagePlanPermissionMapper; +import cn.apes.authon.service.impl.CustomerInfoServiceImpl; +import cn.apes.authon.service.SysPackagePlanService; +import cn.apes.authon.util.OperationLogUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/cn/apes/cloud/service/impl/SysQuotaServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/SysQuotaServiceImpl.java similarity index 95% rename from src/main/java/cn/apes/cloud/service/impl/SysQuotaServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/SysQuotaServiceImpl.java index 2360894..42dfdc1 100644 --- a/src/main/java/cn/apes/cloud/service/impl/SysQuotaServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/SysQuotaServiceImpl.java @@ -1,8 +1,8 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; -import cn.apes.cloud.domain.entity.SysQuota; -import cn.apes.cloud.mapper.SysQuotaMapper; -import cn.apes.cloud.service.SysQuotaService; +import cn.apes.authon.domain.entity.SysQuota; +import cn.apes.authon.mapper.SysQuotaMapper; +import cn.apes.authon.service.SysQuotaService; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/src/main/java/cn/apes/cloud/service/impl/UserInfoServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/UserInfoServiceImpl.java similarity index 97% rename from src/main/java/cn/apes/cloud/service/impl/UserInfoServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/UserInfoServiceImpl.java index 01f094b..f2e681d 100644 --- a/src/main/java/cn/apes/cloud/service/impl/UserInfoServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/UserInfoServiceImpl.java @@ -1,22 +1,22 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; import cn.apes.commons.Res; import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.LoginUser; -import cn.apes.cloud.util.RsaUtil; -import cn.apes.cloud.domain.dto.LoginDTO; -import cn.apes.cloud.domain.dto.PwdDTO; -import cn.apes.cloud.domain.dto.RegisterDTO; -import cn.apes.cloud.domain.dto.UserSearchDTO; -import cn.apes.cloud.domain.entity.CustomerInfo; -import cn.apes.cloud.domain.entity.CustomerUser; -import cn.apes.cloud.domain.entity.SsoConfig; -import cn.apes.cloud.domain.entity.SysRole; -import cn.apes.cloud.domain.entity.UserInfo; -import cn.apes.cloud.service.SysOperationLogService; -import cn.apes.cloud.util.OperationLogUtil; -import cn.apes.cloud.mapper.SsoConfigMapper; -import cn.apes.cloud.mapper.UserInfoMapper; +import cn.apes.authon.util.RsaUtil; +import cn.apes.authon.domain.dto.LoginDTO; +import cn.apes.authon.domain.dto.PwdDTO; +import cn.apes.authon.domain.dto.RegisterDTO; +import cn.apes.authon.domain.dto.UserSearchDTO; +import cn.apes.authon.domain.entity.CustomerInfo; +import cn.apes.authon.domain.entity.CustomerUser; +import cn.apes.authon.domain.entity.SsoConfig; +import cn.apes.authon.domain.entity.SysRole; +import cn.apes.authon.domain.entity.UserInfo; +import cn.apes.authon.service.SysOperationLogService; +import cn.apes.authon.util.OperationLogUtil; +import cn.apes.authon.mapper.SsoConfigMapper; +import cn.apes.authon.mapper.UserInfoMapper; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; diff --git a/src/main/java/cn/apes/cloud/service/impl/UserPreferenceServiceImpl.java b/src/main/java/cn/apes/authon/service/impl/UserPreferenceServiceImpl.java similarity index 97% rename from src/main/java/cn/apes/cloud/service/impl/UserPreferenceServiceImpl.java rename to src/main/java/cn/apes/authon/service/impl/UserPreferenceServiceImpl.java index 0743a1d..5cec68d 100644 --- a/src/main/java/cn/apes/cloud/service/impl/UserPreferenceServiceImpl.java +++ b/src/main/java/cn/apes/authon/service/impl/UserPreferenceServiceImpl.java @@ -1,7 +1,7 @@ -package cn.apes.cloud.service.impl; +package cn.apes.authon.service.impl; -import cn.apes.cloud.domain.entity.UserPreference; -import cn.apes.cloud.mapper.UserPreferenceMapper; +import cn.apes.authon.domain.entity.UserPreference; +import cn.apes.authon.mapper.UserPreferenceMapper; import cn.apes.commons.Res; import cn.apes.commons.auth.AuthContext; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/apes/cloud/util/OperationLogUtil.java b/src/main/java/cn/apes/authon/util/OperationLogUtil.java similarity index 98% rename from src/main/java/cn/apes/cloud/util/OperationLogUtil.java rename to src/main/java/cn/apes/authon/util/OperationLogUtil.java index 322d464..7d676cf 100644 --- a/src/main/java/cn/apes/cloud/util/OperationLogUtil.java +++ b/src/main/java/cn/apes/authon/util/OperationLogUtil.java @@ -1,9 +1,9 @@ -package cn.apes.cloud.util; +package cn.apes.authon.util; import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.LoginCustomer; import cn.apes.commons.auth.LoginUser; -import cn.apes.cloud.service.SysOperationLogService; +import cn.apes.authon.service.SysOperationLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/cn/apes/cloud/util/RsaUtil.java b/src/main/java/cn/apes/authon/util/RsaUtil.java similarity index 99% rename from src/main/java/cn/apes/cloud/util/RsaUtil.java rename to src/main/java/cn/apes/authon/util/RsaUtil.java index 82710cd..0e99bfe 100644 --- a/src/main/java/cn/apes/cloud/util/RsaUtil.java +++ b/src/main/java/cn/apes/authon/util/RsaUtil.java @@ -1,4 +1,4 @@ -package cn.apes.cloud.util; +package cn.apes.authon.util; import javax.crypto.Cipher; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/cn/apes/commons/Res.java b/src/main/java/cn/apes/commons/Res.java new file mode 100644 index 0000000..5538f2b --- /dev/null +++ b/src/main/java/cn/apes/commons/Res.java @@ -0,0 +1,54 @@ +package cn.apes.commons; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 统一响应封装 + * 从 saas-service 的 apes-commons 0.0.7-SNAPSHOT 提取内联 + */ +@Data +public class Res implements Serializable { + + private int code; + private String msg; + private Object data; + + public Res() { + } + + public Res(int code, String msg, Object data) { + this.code = code; + this.msg = msg; + this.data = data; + } + + public static Res success() { + return new Res(0, "success", null); + } + + public static Res success(Object data) { + return new Res(0, "success", data); + } + + public static Res fail(String msg) { + return new Res(-1, msg, null); + } + + public static Res error(String msg) { + return new Res(-1, msg, null); + } + + public static Res get(int code, String msg) { + return new Res(code, msg, null); + } + + public static Res get(int code, String msg, Object data) { + return new Res(code, msg, data); + } + + public static Res get(Object data) { + return new Res(0, "success", data); + } +} diff --git a/src/main/java/cn/apes/commons/auth/AuthContext.java b/src/main/java/cn/apes/commons/auth/AuthContext.java new file mode 100644 index 0000000..bd3b396 --- /dev/null +++ b/src/main/java/cn/apes/commons/auth/AuthContext.java @@ -0,0 +1,33 @@ +package cn.apes.commons.auth; + +/** + * 认证上下文（ThreadLocal） + * 从 saas-service 的 apes-commons 0.0.7-SNAPSHOT 提取内联 + *

+ * 每次请求由 LoginAspect 设置，DataSourceHeaderAspect 清理 + */ +public class AuthContext { + + private static final ThreadLocal CONTEXT = new ThreadLocal<>(); + + /** + * 获取当前登录会话信息 + */ + public static UserSession getLoginInfo() { + return CONTEXT.get(); + } + + /** + * 设置当前登录会话信息（由 LoginAspect 调用） + */ + public static void setLoginInfo(UserSession session) { + CONTEXT.set(session); + } + + /** + * 清除当前线程的登录会话（由 DataSourceHeaderAspect 调用） + */ + public static void clean() { + CONTEXT.remove(); + } +} diff --git a/src/main/java/cn/apes/commons/auth/Login.java b/src/main/java/cn/apes/commons/auth/Login.java new file mode 100644 index 0000000..21d8762 --- /dev/null +++ b/src/main/java/cn/apes/commons/auth/Login.java @@ -0,0 +1,18 @@ +package cn.apes.commons.auth; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 登录校验注解 + * 标注在 Controller 类或方法上，表示需要登录后才能访问 + * 由 LoginAspect 拦截处理：从请求头读取 token，查 Redis 组装 UserSession，写入 AuthContext + *

+ * 从 saas-service 的 apes-commons 0.0.7-SNAPSHOT 提取内联 + */ +@Target({ElementType.TYPE, ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface Login { +} diff --git a/src/main/java/cn/apes/commons/auth/LoginAspect.java b/src/main/java/cn/apes/commons/auth/LoginAspect.java new file mode 100644 index 0000000..98bdbb0 --- /dev/null +++ b/src/main/java/cn/apes/commons/auth/LoginAspect.java @@ -0,0 +1,109 @@ +package cn.apes.commons.auth; + +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.redisson.api.RBucket; +import org.redisson.api.RedissonClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +/** + * 登录认证 AOP 切面 + * 从 saas-service 的 apes-commons 0.0.7-SNAPSHOT 提取内联 + *

+ * 拦截 @Login 注解的 Controller 类/方法： + * 1. 从请求头读取 token + * 2. 查 Redis 获取用户信息 (key=token) 和客户信息 (key=token:customer) + * 3. 组装 UserSession 写入 AuthContext ThreadLocal + * 4. 业务方法执行完毕后清理 AuthContext + *

+ * Order(2) — 在 DataSourceHeaderAspect (Order 1) 之后执行 + */ +@Slf4j +@Aspect +@Component +@Order(2) +public class LoginAspect { + + @Autowired + private RedissonClient redissonClient; + + @Around("@within(cn.apes.commons.auth.Login)") + public Object aroundClass(ProceedingJoinPoint pjp) throws Throwable { + return process(pjp); + } + + @Around("@annotation(cn.apes.commons.auth.Login)") + public Object aroundMethod(ProceedingJoinPoint pjp) throws Throwable { + return process(pjp); + } + + private Object process(ProceedingJoinPoint pjp) throws Throwable { + try { + HttpServletRequest request = ((ServletRequestAttributes) + RequestContextHolder.getRequestAttributes()).getRequest(); + + String token = request.getHeader("token"); + if (token == null || token.isEmpty()) { + token = request.getHeader("Token"); + } + + if (token != null && !token.isEmpty()) { + UserSession session = new UserSession(); + session.setToken(token); + + // 读取用户信息 + RBucket userBucket = redissonClient.getBucket(token); + if (userBucket.isExists()) { + JSONObject userJson = userBucket.get(); + if (userJson != null) { + LoginUser loginUser = new LoginUser(); + loginUser.setId(userJson.getLong("id")); + loginUser.setNickName(userJson.getString("nickName")); + loginUser.setPhone(userJson.getString("phone")); + loginUser.setPortrait(userJson.getString("portrait")); + loginUser.setEmail(userJson.getString("email")); + session.setUser(loginUser); + } + } + + // 读取客户信息 + RBucket customerBucket = redissonClient.getBucket(token + ":customer"); + if (customerBucket.isExists()) { + JSONObject customerJson = customerBucket.get(); + if (customerJson != null) { + LoginCustomer customer = new LoginCustomer(); + customer.setId(customerJson.getLong("id")); + customer.setCustomerType(customerJson.getInteger("customerType")); + customer.setCustomerName(customerJson.getString("customerName")); + customer.setShortName(customerJson.getString("shortName")); + customer.setLogo(customerJson.getString("logo")); + customer.setCustomerStatus(customerJson.getInteger("customerStatus")); + customer.setAuditRemark(customerJson.getString("auditRemark")); + customer.setAdminName(customerJson.getString("adminName")); + customer.setAdminPhone(customerJson.getString("adminPhone")); + customer.setProvince(customerJson.getString("province")); + customer.setCity(customerJson.getString("city")); + customer.setIndustry(customerJson.getString("industry")); + customer.setIndustrySub(customerJson.getString("industrySub")); + session.setCustomer(customer); + } + } + + AuthContext.setLoginInfo(session); + } + + return pjp.proceed(); + } finally { + AuthContext.clean(); + } + } +} diff --git a/src/main/java/cn/apes/commons/auth/LoginCustomer.java b/src/main/java/cn/apes/commons/auth/LoginCustomer.java new file mode 100644 index 0000000..f2420e3 --- /dev/null +++ b/src/main/java/cn/apes/commons/auth/LoginCustomer.java @@ -0,0 +1,39 @@ +package cn.apes.commons.auth; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 登录客户（企业）信息（从 Redis 会话中反序列化） + * 从 saas-service 的 apes-commons 0.0.7-SNAPSHOT 提取内联 + */ +@Data +public class LoginCustomer implements Serializable { + + private Long id; + + private Integer customerType; + + private String customerName; + + private String shortName; + + private String logo; + + private Integer customerStatus; + + private String auditRemark; + + private String adminName; + + private String adminPhone; + + private String province; + + private String city; + + private String industry; + + private String industrySub; +} diff --git a/src/main/java/cn/apes/commons/auth/LoginUser.java b/src/main/java/cn/apes/commons/auth/LoginUser.java new file mode 100644 index 0000000..f757308 --- /dev/null +++ b/src/main/java/cn/apes/commons/auth/LoginUser.java @@ -0,0 +1,23 @@ +package cn.apes.commons.auth; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 登录用户信息（从 Redis 会话中反序列化） + * 从 saas-service 的 apes-commons 0.0.7-SNAPSHOT 提取内联 + */ +@Data +public class LoginUser implements Serializable { + + private Long id; + + private String nickName; + + private String phone; + + private String portrait; + + private String email; +} diff --git a/src/main/java/cn/apes/commons/auth/UserSession.java b/src/main/java/cn/apes/commons/auth/UserSession.java new file mode 100644 index 0000000..18622a8 --- /dev/null +++ b/src/main/java/cn/apes/commons/auth/UserSession.java @@ -0,0 +1,19 @@ +package cn.apes.commons.auth; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 用户会话（AuthContext ThreadLocal 中存储的对象） + * 从 saas-service 的 apes-commons 0.0.7-SNAPSHOT 提取内联 + */ +@Data +public class UserSession implements Serializable { + + private LoginUser user; + + private LoginCustomer customer; + + private String token; +} diff --git a/src/main/java/cn/apes/commons/domain/DbEntity.java b/src/main/java/cn/apes/commons/domain/DbEntity.java new file mode 100644 index 0000000..5bebcab --- /dev/null +++ b/src/main/java/cn/apes/commons/domain/DbEntity.java @@ -0,0 +1,30 @@ +package cn.apes.commons.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 基础数据库实体 + * 从 saas-service 的 apes-commons 0.0.7-SNAPSHOT 提取内联 + *

+ * 提供主键 id、创建时间、更新时间三个公共字段 + */ +@Data +public class DbEntity implements Serializable { + + @TableId(type = IdType.AUTO) + private Long id; + + private Date createTime; + + private Date updateTime; + + /** + * 逻辑删除标记（0=未删除, 1=已删除） + */ + private Integer isDel; +}