Phase 1-3 完成:apes-commons 内联 + 包名重构 + 编译验证

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)
This commit is contained in:
figmar
2026-08-09 08:40:36 +08:00
parent d863fa0550
commit 93e13653ab
126 changed files with 801 additions and 559 deletions
+91 -123
View File
@@ -1,7 +1,7 @@
# apes-Authon — 账权独立服务 # apes-Authon — 账权独立服务
> 从 saas-service(账权平台)提取的纯净认证/授权/用户/角色/权限/多租户体系 > 从 saas-service(账权平台)提取的纯净认证/授权/用户/角色/权限/多租户体系
> 目标:作为独立微服务运行,为所有业务系统提供统一的账权能力 > **已通过编译验证**,可作为独立微服务运行
## 项目背景 ## 项目背景
@@ -23,163 +23,115 @@
| dynamic-datasource | 3.6.1 | 多租户数据源切换 | | dynamic-datasource | 3.6.1 | 多租户数据源切换 |
| Redisson | 3.35.0 | Redis 客户端 / 分布式锁 | | Redisson | 3.35.0 | Redis 客户端 / 分布式锁 |
| Hutool | 5.8.16 | 通用工具 | | Hutool | 5.8.16 | 通用工具 |
| apes-commons | 0.0.7-SNAPSHOT | 认证核心(AuthContext / @Login / Res / DbEntity | | Lombok | 1.18.40 | 代码简化 |
## 代码结构 ## 代码结构
``` ```
src/main/java/cn/apes/ src/main/java/cn/apes/
├── AuthonApplication.java # 主启动类 ├── AuthonApplication.java # 主启动类
── cloud/ ── commons/ # apes-commons 内联实现(原外部 JAR
├── controller/ # 11 个 Controller ├── Res.java # 统一 API 响应封装
│ ├── UserController.java # 用户认证(登录/注册/改密/多企业切换) │ ├── auth/
│ ├── PermissionController.java # 权限管理(菜单/权限码/角色/成员角色) │ ├── AuthContext.java # ThreadLocal 认证上下文
│ ├── AccessTokenController.java # 外部 API Token 管理 │ ├── Login.java # @Login 注解
│ ├── CustomerController.java # 客户/企业管理 │ ├── 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 # 客户套餐管理 │ ├── CustomerPackageController.java # 客户套餐管理
│ ├── AppController.java # 应用管理 │ ├── AppController.java # 应用管理
│ ├── SysOrganizationController.java # 组织架构 │ ├── SysOrganizationController.java # 组织架构
│ ├── SysPackagePlanController.java # 套餐方案 │ ├── SysPackagePlanController.java # 套餐方案
│ ├── SysQuotaController.java # 配额模板 │ ├── SysQuotaController.java # 配额模板
│ ├── SysOperationLogController.java # 操作日志 │ ├── SysOperationLogController.java # 操作日志
│ └── UserPreferenceController.java # 用户偏好 │ └── UserPreferenceController.java # 用户偏好
├── domain/ ├── domain/
│ ├── entity/ # 23 个实体类 │ ├── entity/ # 23 个实体类
│ ├── dto/ # 12 个 DTO(含公共 PageDTO │ ├── dto/ # 12 个 DTO(含公共 PageDTO
│ ├── vo/ # 3 个 VO │ ├── vo/ # 3 个 VO
│ └── huoban/ # 11 个伙伴云 API 模型(SSO 依赖) │ └── huoban/ # 11 个伙伴云 API 模型(SSO 依赖)
├── service/ # 6 个 Service 接口 ├── service/ # 7 个 Service 接口
│ └── impl/ # 16 个 Service 实现 │ └── impl/ # 18 个 Service 实现
├── mapper/ # 23 个 Mapper ├── mapper/ # 23 个 Mapper
├── config/ # 5 个配置类 ├── config/ # 5 个配置类
│ ├── AccessTokenFilterConfig.java # Token 过滤器注册 │ ├── AccessTokenFilterConfig.java # Token 过滤器注册
│ ├── DataSourceHeaderAspect.java # 多租户数据源 AOP 切面 │ ├── DataSourceHeaderAspect.java # 多租户数据源 AOP 切面
│ ├── TenantSource.java # @TenantSource 注解 │ ├── TenantSource.java # @TenantSource 注解
│ ├── HbTokenContext.java # 伙伴云 Token ThreadLocal │ ├── HbTokenContext.java # 伙伴云 Token ThreadLocal
│ └── SiteConfig.java # 站点配置 │ └── SiteConfig.java # 站点配置
├── filter/ ├── filter/
│ └── AccessTokenFilter.java # 外部 API 鉴权过滤器 │ └── AccessTokenFilter.java # 外部 API 鉴权过滤器
└── util/ └── util/
├── OperationLogUtil.java # 操作日志工具 ├── OperationLogUtil.java # 操作日志工具
└── RsaUtil.java # RSA 加解密工具 └── RsaUtil.java # RSA 加解密工具
``` ```
## 模块说明 ## apes-commons 内联说明
### 1. 用户认证 `apes-commons 0.0.7-SNAPSHOT` 外部 JAR 已内联为 `cn.apes.commons` 包,共 8 个类:
- **密码登录**`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`,提供以下核心类:
| 类 | 说明 | | 类 | 说明 |
|----|------| |----|------|
| `Res` | 统一 API 响应包装(success/fail/error/get |
| `AuthContext` | ThreadLocal 认证上下文,存储 UserSession | | `AuthContext` | ThreadLocal 认证上下文,存储 UserSession |
| `UserSession` | 会话对象(LoginUser + LoginCustomer | | `UserSession` | 会话对象(LoginUser + LoginCustomer + token |
| `LoginUser` | 登录用户信息 | | `LoginUser` | 登录用户信息id/nickName/phone/portrait/email |
| `LoginCustomer` | 登录客户/企业信息 | | `LoginCustomer` | 登录客户/企业信息id/customerName/customerType... |
| `@Login` | 方法级注解,AOP 自动注入登录信息 | | `@Login` | 方法/类级注解,AOP 自动注入登录信息 |
| `Res` | 统一 API 响应包装 | | `LoginAspect` | 登录认证 AOP 切面(从 Redis 读取会话 → 写入 AuthContext |
| `DbEntity` | 基础实体(id / createTime / updateTime / isDel | | `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 ### Phase 2: 包名重构 ✅
# 1. 安装 apes-commons JAR - `cn.apes.cloud``cn.apes.authon` 全局包名重构
mvn install:install-file -Dfile=apes-commons-0.0.7-SNAPSHOT.jar ... - `@MapperScan` 路径更新
- application.yml 配置更新
-`cn.apes.cloud` 残留
# 2. 编译打包 ### Phase 3: 编译验证 ✅
mvn clean package -DskipTests - maven-compiler-plugin 升级至 3.13.0(兼容 Java 24
- Lombok 升级至 1.18.40(兼容 Java 24
# 3. 运行 - 移除 `syncAllTenantsToHuoban()` 伙伴云同步(业务集成,非账权核心)
java -jar target/apes-authon.jar - 创建 `IpLocationService` 接口 + 桩实现
``` - **124 个源文件编译通过**
服务默认端口 `8090`context-path `/authon`
## 待完成事项 ## 待完成事项
### Phase 1: 验证编译(当前) ### Phase 4: SDK 化
- [ ] 安装 apes-commons JAR 后验证编译通过
- [ ] 补充缺失的 MyBatis XML(如有)
- [ ] 编写基础单元测试
### Phase 2: 包名重构
- [ ] `cn.apes.cloud``cn.apes.authon` 全局包名重构
- [ ] 调整 MapperScan 路径
- [ ] 更新所有 import
### Phase 3: SDK 化
- [ ]`AuthContext` 改造为可远程调用的 SDK - [ ]`AuthContext` 改造为可远程调用的 SDK
- [ ] 提供 `authon-sdk` 模块供业务系统引用 - [ ] 提供 `authon-sdk` 模块供业务系统引用
- [ ] Token 校验改为 HTTP API 调用 - [ ] Token 校验改为 HTTP API 调用
### Phase 4: 网关集成 ### Phase 5: 网关集成
- [ ] 接入 API 网关(Spring Cloud Gateway / Nginx - [ ] 接入 API 网关(Spring Cloud Gateway / Nginx
- [ ] 请求头注入认证信息(替代 ThreadLocal - [ ] 请求头注入认证信息(替代 ThreadLocal
- [ ] 多租户数据源改为网关路由模式 - [ ] 多租户数据源改为网关路由模式
## 从原项目提取的文件清单 ## 从原项目提取的文件清单
提取 **114 个 Java 文件** **124 个 Java 文件**(含 8 个内联 commons 类 + 2 个新增桩实现)
| 类型 | 数量 | | 类型 | 数量 |
|------|------| |------|------|
@@ -187,15 +139,31 @@ java -jar target/apes-authon.jar
| Entity | 23 | | Entity | 23 |
| DTO | 12 | | DTO | 12 |
| VO | 3 | | VO | 3 |
| Service 接口 | 6 | | Service 接口 | 7 |
| Service 实现 | 16 | | Service 实现 | 18 |
| Mapper | 23 | | Mapper | 23 |
| Config | 5 | | Config | 5 |
| Filter | 1 | | Filter | 1 |
| Util | 2 | | Util | 2 |
| Huoban DTO | 11 | | Huoban DTO | 11 |
| commons 内联 | 8 |
| 主启动类 | 1 | | 主启动类 | 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) — 完整单体应用(含业务代码) - 源仓库:[apes-Authdata](https://gitea.apescale.com/figmar/apes-Authdata) — 完整单体应用(含业务代码)
+8 -12
View File
@@ -16,7 +16,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding> <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<spring-boot.version>2.2.1.RELEASE</spring-boot.version> <spring-boot.version>2.2.1.RELEASE</spring-boot.version>
<lombok.version>1.18.36</lombok.version> <lombok.version>1.18.40</lombok.version>
<mysql-connector-java.version>8.0.15</mysql-connector-java.version> <mysql-connector-java.version>8.0.15</mysql-connector-java.version>
<mybatis-plus-boot-starter.version>3.5.7</mybatis-plus-boot-starter.version> <mybatis-plus-boot-starter.version>3.5.7</mybatis-plus-boot-starter.version>
<redisson.version>3.35.0</redisson.version> <redisson.version>3.35.0</redisson.version>
@@ -100,19 +100,15 @@
<version>1.2.83</version> <version>1.2.83</version>
</dependency> </dependency>
<!-- apes-commons (外部 JAR,需手动安装到本地 Maven 仓库) --> <!-- Commons Codec (HmacUtils for SSO) -->
<dependency> <dependency>
<groupId>cn.apes</groupId> <groupId>commons-codec</groupId>
<artifactId>apes-commons</artifactId> <artifactId>commons-codec</artifactId>
<version>0.0.7-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- apes-commons 已内联到本项目中 (cn.apes.commons.* 包) -->
<!-- 包含: Res, AuthContext, Login, LoginUser, LoginCustomer, UserSession, DbEntity, LoginAspect -->
<!-- Test --> <!-- Test -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@@ -127,7 +123,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version> <version>3.13.0</version>
<configuration> <configuration>
<source>11</source> <source>11</source>
<target>11</target> <target>11</target>
+1 -1
View File
@@ -21,7 +21,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication @SpringBootApplication
@EnableAsync @EnableAsync
@EnableScheduling @EnableScheduling
@MapperScan("cn.apes.cloud.mapper") @MapperScan("cn.apes.authon.mapper")
public class AuthonApplication { public class AuthonApplication {
public static void main(String[] args) { public static void main(String[] args) {
@@ -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.beans.factory.annotation.Autowired;
import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@@ -1,4 +1,4 @@
package cn.apes.cloud.config; package cn.apes.authon.config;
import cn.apes.commons.Res; import cn.apes.commons.Res;
@@ -1,4 +1,4 @@
package cn.apes.cloud.config; package cn.apes.authon.config;
public class HbTokenContext { public class HbTokenContext {
@@ -1,4 +1,4 @@
package cn.apes.cloud.config; package cn.apes.authon.config;
import lombok.Data; import lombok.Data;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@@ -1,4 +1,4 @@
package cn.apes.cloud.config; package cn.apes.authon.config;
import java.lang.annotation.*; import java.lang.annotation.*;
@@ -1,8 +1,8 @@
package cn.apes.cloud.controller; package cn.apes.authon.controller;
import cn.apes.cloud.domain.entity.SysAccessToken; import cn.apes.authon.domain.entity.SysAccessToken;
import cn.apes.cloud.service.SysAccessTokenService; import cn.apes.authon.service.SysAccessTokenService;
import cn.apes.cloud.util.OperationLogUtil; import cn.apes.authon.util.OperationLogUtil;
import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.AuthContext;
import cn.apes.commons.auth.Login; import cn.apes.commons.auth.Login;
import cn.apes.commons.auth.LoginCustomer; import cn.apes.commons.auth.LoginCustomer;
@@ -1,19 +1,19 @@
package cn.apes.cloud.controller; package cn.apes.authon.controller;
import cn.apes.commons.Res; import cn.apes.commons.Res;
import cn.apes.commons.auth.Login; import cn.apes.commons.auth.Login;
import cn.apes.cloud.config.TenantSource; import cn.apes.authon.config.TenantSource;
import cn.apes.cloud.domain.dto.AppSearchDTO; import cn.apes.authon.domain.dto.AppSearchDTO;
import cn.apes.cloud.domain.entity.AppInfo; import cn.apes.authon.domain.entity.AppInfo;
import cn.apes.cloud.domain.entity.SysMenu; import cn.apes.authon.domain.entity.SysMenu;
import cn.apes.cloud.domain.entity.SysPermission; import cn.apes.authon.domain.entity.SysPermission;
import cn.apes.cloud.domain.entity.CustomerInfo; import cn.apes.authon.domain.entity.CustomerInfo;
import cn.apes.cloud.domain.entity.CustomerApp; import cn.apes.authon.domain.entity.CustomerApp;
import cn.apes.cloud.service.impl.AppInfoServiceImpl; import cn.apes.authon.service.impl.AppInfoServiceImpl;
import cn.apes.cloud.service.impl.CustomerAppServiceImpl; import cn.apes.authon.service.impl.CustomerAppServiceImpl;
import cn.apes.cloud.service.impl.CustomerInfoServiceImpl; import cn.apes.authon.service.impl.CustomerInfoServiceImpl;
import cn.apes.cloud.mapper.SysMenuMapper; import cn.apes.authon.mapper.SysMenuMapper;
import cn.apes.cloud.mapper.SysPermissionMapper; import cn.apes.authon.mapper.SysPermissionMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -1,16 +1,16 @@
package cn.apes.cloud.controller; package cn.apes.authon.controller;
import cn.apes.commons.Res; import cn.apes.commons.Res;
import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.AuthContext;
import cn.apes.commons.auth.Login; import cn.apes.commons.auth.Login;
import cn.apes.commons.auth.LoginCustomer; import cn.apes.commons.auth.LoginCustomer;
import cn.apes.cloud.config.TenantSource; import cn.apes.authon.config.TenantSource;
import cn.apes.cloud.domain.dto.CustomerSearchDTO; import cn.apes.authon.domain.dto.CustomerSearchDTO;
import cn.apes.cloud.domain.entity.CustomerInfo; import cn.apes.authon.domain.entity.CustomerInfo;
import cn.apes.cloud.domain.entity.SsoConfig; import cn.apes.authon.domain.entity.SsoConfig;
import cn.apes.cloud.service.impl.CustomerAppServiceImpl; import cn.apes.authon.service.impl.CustomerAppServiceImpl;
import cn.apes.cloud.service.impl.CustomerInfoServiceImpl; import cn.apes.authon.service.impl.CustomerInfoServiceImpl;
import cn.apes.cloud.service.impl.CustomerUserServiceImpl; import cn.apes.authon.service.impl.CustomerUserServiceImpl;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -184,13 +184,7 @@ public class CustomerController {
return customerInfoService.auditCertification(customerId, auditStatus, auditRemark); return customerInfoService.auditCertification(customerId, auditStatus, auditRemark);
} }
// syncTenantsToHuoban 端点已移除 伙伴云同步属业务集成非账权核心功能
/**
* 同步全部租户信息到伙伴云使用 upsetOne 接口
*/
@PostMapping("/syncTenantsToHuoban")
public Res syncTenantsToHuoban() {
return customerInfoService.syncAllTenantsToHuoban();
}
} }
@@ -1,11 +1,11 @@
package cn.apes.cloud.controller; package cn.apes.authon.controller;
import cn.apes.commons.Res; import cn.apes.commons.Res;
import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.AuthContext;
import cn.apes.commons.auth.Login; import cn.apes.commons.auth.Login;
import cn.apes.commons.auth.LoginCustomer; import cn.apes.commons.auth.LoginCustomer;
import cn.apes.cloud.domain.entity.CustomerPackage; import cn.apes.authon.domain.entity.CustomerPackage;
import cn.apes.cloud.service.CustomerPackageService; import cn.apes.authon.service.CustomerPackageService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -1,14 +1,14 @@
package cn.apes.cloud.controller; package cn.apes.authon.controller;
import cn.apes.commons.Res; import cn.apes.commons.Res;
import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.AuthContext;
import cn.apes.commons.auth.UserSession; import cn.apes.commons.auth.UserSession;
import cn.apes.cloud.config.TenantSource; import cn.apes.authon.config.TenantSource;
import cn.apes.cloud.domain.dto.RoleSearchDTO; import cn.apes.authon.domain.dto.RoleSearchDTO;
import cn.apes.cloud.domain.entity.SysMenu; import cn.apes.authon.domain.entity.SysMenu;
import cn.apes.cloud.domain.entity.SysPermission; import cn.apes.authon.domain.entity.SysPermission;
import cn.apes.cloud.domain.entity.SysRole; import cn.apes.authon.domain.entity.SysRole;
import cn.apes.cloud.service.impl.PermissionServiceImpl; import cn.apes.authon.service.impl.PermissionServiceImpl;
import cn.apes.commons.auth.Login; import cn.apes.commons.auth.Login;
import cn.apes.commons.auth.LoginCustomer; import cn.apes.commons.auth.LoginCustomer;
import cn.hutool.http.server.HttpServerResponse; import cn.hutool.http.server.HttpServerResponse;
@@ -1,9 +1,9 @@
package cn.apes.cloud.controller; package cn.apes.authon.controller;
import cn.apes.commons.Res; import cn.apes.commons.Res;
import cn.apes.commons.auth.Login; import cn.apes.commons.auth.Login;
import cn.apes.cloud.config.TenantSource; import cn.apes.authon.config.TenantSource;
import cn.apes.cloud.service.impl.SysOperationLogServiceImpl; import cn.apes.authon.service.impl.SysOperationLogServiceImpl;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -1,10 +1,10 @@
package cn.apes.cloud.controller; package cn.apes.authon.controller;
import cn.apes.commons.Res; import cn.apes.commons.Res;
import cn.apes.commons.auth.Login; import cn.apes.commons.auth.Login;
import cn.apes.cloud.config.TenantSource; import cn.apes.authon.config.TenantSource;
import cn.apes.cloud.domain.entity.SysOrganization; import cn.apes.authon.domain.entity.SysOrganization;
import cn.apes.cloud.service.impl.SysOrganizationServiceImpl; import cn.apes.authon.service.impl.SysOrganizationServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -1,7 +1,7 @@
package cn.apes.cloud.controller; package cn.apes.authon.controller;
import cn.apes.cloud.domain.entity.SysPackagePlan; import cn.apes.authon.domain.entity.SysPackagePlan;
import cn.apes.cloud.service.impl.SysPackagePlanServiceImpl; import cn.apes.authon.service.impl.SysPackagePlanServiceImpl;
import cn.apes.commons.Res; import cn.apes.commons.Res;
import cn.apes.commons.auth.Login; import cn.apes.commons.auth.Login;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@@ -20,7 +20,7 @@ public class SysPackagePlanController {
private SysPackagePlanServiceImpl sysPackagePlanService; private SysPackagePlanServiceImpl sysPackagePlanService;
@Autowired @Autowired
private cn.apes.cloud.service.SysPackagePlanQuotaService sysPackagePlanQuotaService; private cn.apes.authon.service.SysPackagePlanQuotaService sysPackagePlanQuotaService;
@PostMapping("/page") @PostMapping("/page")
public Res pagePackagePlan(@RequestBody JSONObject data) { public Res pagePackagePlan(@RequestBody JSONObject data) {
@@ -1,7 +1,7 @@
package cn.apes.cloud.controller; package cn.apes.authon.controller;
import cn.apes.cloud.domain.entity.SysQuota; import cn.apes.authon.domain.entity.SysQuota;
import cn.apes.cloud.service.impl.SysQuotaServiceImpl; import cn.apes.authon.service.impl.SysQuotaServiceImpl;
import cn.apes.commons.Res; import cn.apes.commons.Res;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -1,18 +1,18 @@
package cn.apes.cloud.controller; package cn.apes.authon.controller;
import cn.apes.commons.Res; import cn.apes.commons.Res;
import cn.apes.commons.auth.AuthContext; import cn.apes.commons.auth.AuthContext;
import cn.apes.commons.auth.Login; import cn.apes.commons.auth.Login;
import cn.apes.cloud.config.TenantSource; import cn.apes.authon.config.TenantSource;
import cn.apes.cloud.domain.dto.LoginDTO; import cn.apes.authon.domain.dto.LoginDTO;
import cn.apes.cloud.domain.dto.PwdDTO; import cn.apes.authon.domain.dto.PwdDTO;
import cn.apes.cloud.domain.dto.RegisterDTO; import cn.apes.authon.domain.dto.RegisterDTO;
import cn.apes.cloud.domain.dto.SelectCustomerDTO; import cn.apes.authon.domain.dto.SelectCustomerDTO;
import cn.apes.cloud.domain.dto.UserSearchDTO; import cn.apes.authon.domain.dto.UserSearchDTO;
import cn.apes.cloud.domain.dto.EnterpriseCertifyDTO; import cn.apes.authon.domain.dto.EnterpriseCertifyDTO;
import cn.apes.cloud.domain.entity.CustomerInfo; import cn.apes.authon.domain.entity.CustomerInfo;
import cn.apes.cloud.domain.entity.UserInfo; import cn.apes.authon.domain.entity.UserInfo;
import cn.apes.cloud.service.impl.UserInfoServiceImpl; import cn.apes.authon.service.impl.UserInfoServiceImpl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -1,8 +1,8 @@
package cn.apes.cloud.controller; package cn.apes.authon.controller;
import cn.apes.cloud.config.TenantSource; import cn.apes.authon.config.TenantSource;
import cn.apes.cloud.domain.entity.UserPreference; import cn.apes.authon.domain.entity.UserPreference;
import cn.apes.cloud.service.impl.UserPreferenceServiceImpl; import cn.apes.authon.service.impl.UserPreferenceServiceImpl;
import cn.apes.commons.Res; import cn.apes.commons.Res;
import cn.apes.commons.auth.Login; import cn.apes.commons.auth.Login;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.dto; package cn.apes.authon.domain.dto;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.dto; package cn.apes.authon.domain.dto;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.dto; package cn.apes.authon.domain.dto;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.dto; package cn.apes.authon.domain.dto;
import lombok.Data; import lombok.Data;
@@ -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.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.dto; package cn.apes.authon.domain.dto;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.dto; package cn.apes.authon.domain.dto;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.dto; package cn.apes.authon.domain.dto;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.dto; package cn.apes.authon.domain.dto;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.dto; package cn.apes.authon.domain.dto;
import lombok.Data; import lombok.Data;
@@ -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 lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.dto; package cn.apes.authon.domain.dto;
import lombok.Data; import lombok.Data;
@@ -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.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
@@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
@@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import lombok.Data; import lombok.Data;
@@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
@@ -44,7 +44,7 @@ public class SysRole extends DbEntity implements Serializable {
private String appName; private String appName;
@TableField(exist = false) @TableField(exist = false)
private cn.apes.cloud.domain.entity.SysPackagePlan planInfo; private cn.apes.authon.domain.entity.SysPackagePlan planInfo;
} }
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.entity; package cn.apes.authon.domain.entity;
import cn.apes.commons.domain.DbEntity; import cn.apes.commons.domain.DbEntity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
@@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.huoban; package cn.apes.authon.domain.huoban;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.huoban; package cn.apes.authon.domain.huoban;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.huoban; package cn.apes.authon.domain.huoban;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.huoban; package cn.apes.authon.domain.huoban;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.huoban; package cn.apes.authon.domain.huoban;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.huoban; package cn.apes.authon.domain.huoban;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.huoban; package cn.apes.authon.domain.huoban;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.huoban; package cn.apes.authon.domain.huoban;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.huoban; package cn.apes.authon.domain.huoban;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.huoban; package cn.apes.authon.domain.huoban;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.huoban; package cn.apes.authon.domain.huoban;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.vo; package cn.apes.authon.domain.vo;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.vo; package cn.apes.authon.domain.vo;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package cn.apes.cloud.domain.vo; package cn.apes.authon.domain.vo;
import lombok.Data; import lombok.Data;
@@ -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.AuthContext;
import cn.apes.commons.auth.LoginCustomer; import cn.apes.commons.auth.LoginCustomer;
import cn.apes.commons.auth.LoginUser; import cn.apes.commons.auth.LoginUser;
import cn.apes.commons.auth.UserSession; import cn.apes.commons.auth.UserSession;
import cn.apes.cloud.domain.entity.CustomerInfo; import cn.apes.authon.domain.entity.CustomerInfo;
import cn.apes.cloud.domain.entity.SysAccessToken; import cn.apes.authon.domain.entity.SysAccessToken;
import cn.apes.cloud.service.impl.CustomerInfoServiceImpl; import cn.apes.authon.service.impl.CustomerInfoServiceImpl;
import cn.apes.cloud.service.SysAccessTokenService; import cn.apes.authon.service.SysAccessTokenService;
import cn.apes.cloud.util.OperationLogUtil; import cn.apes.authon.util.OperationLogUtil;
import cn.apes.commons.Res; import cn.apes.commons.Res;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@@ -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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface AppInfoMapper extends BaseMapper<AppInfo> { public interface AppInfoMapper extends BaseMapper<AppInfo> {
@@ -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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface CustomerAppMapper extends BaseMapper<CustomerApp> { public interface CustomerAppMapper extends BaseMapper<CustomerApp> {
@@ -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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface CustomerInfoMapper extends BaseMapper<CustomerInfo> { public interface CustomerInfoMapper extends BaseMapper<CustomerInfo> {
@@ -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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@@ -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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@@ -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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@@ -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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@@ -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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface CustomerUserMapper extends BaseMapper<CustomerUser> { public interface CustomerUserMapper extends BaseMapper<CustomerUser> {
@@ -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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface SsoConfigMapper extends BaseMapper<SsoConfig> { public interface SsoConfigMapper extends BaseMapper<SsoConfig> {
@@ -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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
@@ -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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface SysMemberRoleMapper extends BaseMapper<SysMemberRole> { public interface SysMemberRoleMapper extends BaseMapper<SysMemberRole> {
@@ -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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface SysMenuMapper extends BaseMapper<SysMenu> { public interface SysMenuMapper extends BaseMapper<SysMenu> {
@@ -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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@@ -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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@@ -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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@@ -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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@@ -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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@@ -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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface SysPermissionMapper extends BaseMapper<SysPermission> { public interface SysPermissionMapper extends BaseMapper<SysPermission> {
@@ -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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@@ -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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@@ -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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface SysRolePermissionMapper extends BaseMapper<SysRolePermission> { public interface SysRolePermissionMapper extends BaseMapper<SysRolePermission> {
@@ -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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@@ -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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
@@ -1,8 +1,8 @@
package cn.apes.cloud.service; package cn.apes.authon.service;
import cn.apes.cloud.domain.entity.CustomerPackage; import cn.apes.authon.domain.entity.CustomerPackage;
import cn.apes.cloud.domain.vo.CustomerPackageVO; import cn.apes.authon.domain.vo.CustomerPackageVO;
import cn.apes.cloud.domain.vo.CustomerPackageExtendApplyVO; import cn.apes.authon.domain.vo.CustomerPackageExtendApplyVO;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List; import java.util.List;
@@ -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);
}
@@ -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; import com.baomidou.mybatisplus.extension.service.IService;
/** /**
@@ -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 com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.Date; import java.util.Date;
@@ -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 com.baomidou.mybatisplus.extension.service.IService;
import java.util.List; import java.util.List;
@@ -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 com.baomidou.mybatisplus.extension.service.IService;
import java.util.List; import java.util.List;
@@ -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; import com.baomidou.mybatisplus.extension.service.IService;
public interface SysQuotaService extends IService<SysQuota> { public interface SysQuotaService extends IService<SysQuota> {
@@ -1,9 +1,9 @@
package cn.apes.cloud.service.impl; package cn.apes.authon.service.impl;
import cn.apes.commons.Res; import cn.apes.commons.Res;
import cn.apes.cloud.domain.dto.AppSearchDTO; import cn.apes.authon.domain.dto.AppSearchDTO;
import cn.apes.cloud.domain.entity.AppInfo; import cn.apes.authon.domain.entity.AppInfo;
import cn.apes.cloud.mapper.AppInfoMapper; import cn.apes.authon.mapper.AppInfoMapper;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;

Some files were not shown because too many files have changed in this diff Show More