mirror of
https://github.com/certd/certd.git
synced 2026-07-12 08:17:32 +08:00
Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 584b7b6f45 | |||
| 2312c444ef | |||
| 0373d019f8 | |||
| fe09e75b80 | |||
| 432c9c6cc1 | |||
| 5fc1d55879 | |||
| 268cd6cc9c | |||
| 20ffe31638 | |||
| 02d30067ea | |||
| 0ce7808e08 | |||
| d609ee2b7a | |||
| 083df61fcc | |||
| a524988be6 | |||
| 8517a0b564 | |||
| ec69b8f11b |
@@ -0,0 +1,412 @@
|
|||||||
|
# 插件依赖按需加载方案
|
||||||
|
|
||||||
|
## 背景与目标
|
||||||
|
|
||||||
|
### 当前问题
|
||||||
|
- `packages/ui/certd-server/node_modules` 包含 50+ 个插件的所有依赖,体积庞大
|
||||||
|
- 大量云厂商 SDK(AWS、阿里云、腾讯云、华为云等)只在特定插件中使用
|
||||||
|
- 用户通常只使用少数几个插件,但必须安装所有依赖
|
||||||
|
|
||||||
|
### 目标
|
||||||
|
实现依赖的按需下载和加载:
|
||||||
|
1. 插件依赖独立管理,不占用主 `node_modules` 空间
|
||||||
|
2. 只有当用户首次使用某插件时,才动态下载该插件需要的依赖
|
||||||
|
3. 依赖安装完成后,通过 `await import()` 从独立路径加载
|
||||||
|
4. 保持现有插件代码的最小改动
|
||||||
|
|
||||||
|
## 当前架构分析
|
||||||
|
|
||||||
|
### 插件加载机制
|
||||||
|
- 插件位于 `packages/ui/certd-server/src/plugins/` 下(50+ 个插件目录)
|
||||||
|
- `AutoLoadPlugins` 类在启动时扫描 `dist/plugins` 目录并动态导入
|
||||||
|
- 插件注册到不同的 registry:`accessRegistry`, `pluginRegistry`, `dnsProviderRegistry` 等
|
||||||
|
- 插件代码已经使用 `await import()` 进行懒加载(如 `await import("@aws-sdk/client-acm")`)
|
||||||
|
|
||||||
|
### 重型依赖分布
|
||||||
|
从 `packages/ui/certd-server/package.json` 分析,以下依赖体积大且仅特定插件使用:
|
||||||
|
|
||||||
|
**云厂商 SDK(按插件分组):**
|
||||||
|
- **AWS 插件**:`@aws-sdk/client-acm`, `@aws-sdk/client-cloudfront`, `@aws-sdk/client-iam`, `@aws-sdk/client-route-53`, `@aws-sdk/client-s3`, `@aws-sdk/client-sts`
|
||||||
|
- **阿里云插件**:`@alicloud/openapi-client`, `@alicloud/pop-core`, `@alicloud/tea-typescript`, `@alicloud/fc20230330` 等
|
||||||
|
- **腾讯云插件**:`tencentcloud-sdk-nodejs`, `cos-nodejs-sdk-v5`
|
||||||
|
- **华为云插件**:`@huaweicloud/huaweicloud-sdk-cdn`, `@huaweicloud/huaweicloud-sdk-core` 等
|
||||||
|
- **Azure 插件**:`@azure/arm-dns`, `@azure/identity`
|
||||||
|
- **Google Cloud 插件**:`@google-cloud/dns`, `@google-cloud/publicca`
|
||||||
|
- **火山引擎插件**:`@volcengine/openapi`, `@volcengine/tos-sdk`
|
||||||
|
|
||||||
|
**网络/工具库:**
|
||||||
|
- `ssh2`, `socks`, `socks-proxy-agent`(SSH 相关插件)
|
||||||
|
- `ali-oss`, `qiniu`, `basic-ftp`(存储/传输插件)
|
||||||
|
- `nodemailer`(邮件通知插件)
|
||||||
|
|
||||||
|
**通用依赖(保留在主 package.json):**
|
||||||
|
- `@midwayjs/*` 系列(框架核心)
|
||||||
|
- `@certd/*` 系列(项目内部包)
|
||||||
|
- `axios`, `lodash-es`, `dayjs`, `js-yaml` 等基础工具
|
||||||
|
|
||||||
|
## 设计方案
|
||||||
|
|
||||||
|
### 架构概览
|
||||||
|
|
||||||
|
```
|
||||||
|
packages/ui/certd-server/
|
||||||
|
├── package.json # 主依赖(框架、通用工具)
|
||||||
|
├── node_modules/ # 主依赖安装目录
|
||||||
|
├── optional-deps/ # 新增:可选依赖管理目录
|
||||||
|
│ ├── package.json # 可选依赖总配置(用于 pnpm install)
|
||||||
|
│ ├── pnpm-lock.yaml # 可选依赖锁文件
|
||||||
|
│ └── node_modules/ # 可选依赖安装目录
|
||||||
|
├── src/
|
||||||
|
│ └── modules/
|
||||||
|
│ └── dependency/ # 新增:依赖管理模块
|
||||||
|
│ ├── dependency-manager.ts # 核心:依赖管理器
|
||||||
|
│ ├── dependency-registry.ts # 依赖注册表(插件 -> 依赖映射)
|
||||||
|
│ └── types.ts # 类型定义
|
||||||
|
```
|
||||||
|
|
||||||
|
### 核心组件
|
||||||
|
|
||||||
|
#### 1. 依赖管理器(DependencyManager)
|
||||||
|
|
||||||
|
**职责:**
|
||||||
|
- 检查依赖是否已安装
|
||||||
|
- 动态执行 `pnpm install` 安装缺失依赖
|
||||||
|
- 提供从 `optional-deps/node_modules` 加载依赖的方法
|
||||||
|
- 并发控制:避免多个插件同时触发安装
|
||||||
|
|
||||||
|
**关键方法:**
|
||||||
|
```typescript
|
||||||
|
class DependencyManager {
|
||||||
|
// 确保依赖已安装,返回依赖模块
|
||||||
|
async ensureAndImport<T>(packageName: string): Promise<T>
|
||||||
|
|
||||||
|
// 检查依赖是否已安装
|
||||||
|
async isInstalled(packageName: string): Promise<boolean>
|
||||||
|
|
||||||
|
// 安装依赖(带锁,避免并发)
|
||||||
|
async installDependencies(packages: string[]): Promise<void>
|
||||||
|
|
||||||
|
// 从 optional-deps/node_modules 加载依赖
|
||||||
|
async loadModule<T>(packageName: string): Promise<T>
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**实现要点:**
|
||||||
|
- 使用文件锁(如 `proper-lockfile`)防止并发安装
|
||||||
|
- 安装前检查 `optional-deps/node_modules/{packageName}` 是否存在
|
||||||
|
- 安装命令:`pnpm install --dir optional-deps --ignore-workspace`
|
||||||
|
- 加载时使用绝对路径:`import('file:///absolute/path/to/optional-deps/node_modules/package')`
|
||||||
|
|
||||||
|
#### 2. 依赖注册表(DependencyRegistry)
|
||||||
|
|
||||||
|
**职责:**
|
||||||
|
- 维护插件名称到依赖列表的映射
|
||||||
|
- 提供依赖查询接口
|
||||||
|
|
||||||
|
**数据结构:**
|
||||||
|
```typescript
|
||||||
|
interface PluginDependencyConfig {
|
||||||
|
pluginName: string;
|
||||||
|
dependencies: {
|
||||||
|
packageName: string;
|
||||||
|
version: string;
|
||||||
|
optional?: boolean; // 是否可选(安装失败不阻塞)
|
||||||
|
}[];
|
||||||
|
}
|
||||||
|
|
||||||
|
// 示例注册
|
||||||
|
dependencyRegistry.register('plugin-aws', [
|
||||||
|
{ packageName: '@aws-sdk/client-acm', version: '^3.964.0' },
|
||||||
|
{ packageName: '@aws-sdk/client-cloudfront', version: '^3.964.0' },
|
||||||
|
{ packageName: '@aws-sdk/client-route-53', version: '^3.964.0' },
|
||||||
|
]);
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 3. 插件集成
|
||||||
|
|
||||||
|
**改造现有插件代码:**
|
||||||
|
|
||||||
|
改造前(`plugin-aws/libs/aws-client.ts`):
|
||||||
|
```typescript
|
||||||
|
const { ACMClient, ImportCertificateCommand } = await import("@aws-sdk/client-acm");
|
||||||
|
```
|
||||||
|
|
||||||
|
改造后:
|
||||||
|
```typescript
|
||||||
|
import { DependencyManager } from "../../../modules/dependency/dependency-manager.js";
|
||||||
|
|
||||||
|
const depManager = new DependencyManager();
|
||||||
|
const { ACMClient, ImportCertificateCommand } = await depManager.ensureAndImport("@aws-sdk/client-acm");
|
||||||
|
```
|
||||||
|
|
||||||
|
**简化方案(推荐):**
|
||||||
|
|
||||||
|
创建辅助函数,减少改动量:
|
||||||
|
```typescript
|
||||||
|
// src/modules/dependency/import-helper.ts
|
||||||
|
export async function importOptionalDep<T>(packageName: string): Promise<T> {
|
||||||
|
const depManager = new DependencyManager();
|
||||||
|
return await depManager.ensureAndImport<T>(packageName);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 插件中使用
|
||||||
|
import { importOptionalDep } from "../../../modules/dependency/import-helper.js";
|
||||||
|
const { ACMClient } = await importOptionalDep("@aws-sdk/client-acm");
|
||||||
|
```
|
||||||
|
|
||||||
|
### 实施步骤
|
||||||
|
|
||||||
|
#### 阶段一:基础设施搭建
|
||||||
|
1. 创建 `optional-deps/` 目录结构
|
||||||
|
2. 生成 `optional-deps/package.json`(包含所有可选依赖)
|
||||||
|
3. 实现 `DependencyManager` 核心逻辑
|
||||||
|
4. 实现依赖安装锁机制
|
||||||
|
5. 编写单元测试
|
||||||
|
|
||||||
|
#### 阶段二:依赖迁移
|
||||||
|
6. 从主 `package.json` 移除可选依赖
|
||||||
|
7. 将依赖添加到 `optional-deps/package.json`
|
||||||
|
8. 创建依赖注册表,映射插件到依赖
|
||||||
|
|
||||||
|
#### 阶段三:插件改造
|
||||||
|
9. 创建 `import-helper.ts` 辅助函数
|
||||||
|
10. 逐步改造插件代码,使用 `importOptionalDep` 加载依赖
|
||||||
|
11. 优先改造重型依赖(AWS、阿里云、腾讯云等)
|
||||||
|
|
||||||
|
#### 阶段四:测试与优化
|
||||||
|
12. 端到端测试:验证依赖按需安装和加载
|
||||||
|
13. 性能优化:缓存已加载的模块
|
||||||
|
14. 错误处理:安装失败时的降级策略
|
||||||
|
15. 文档:编写使用说明和迁移指南
|
||||||
|
|
||||||
|
## 关键技术决策
|
||||||
|
|
||||||
|
### 1. 依赖分组策略
|
||||||
|
**选择:按插件分组**
|
||||||
|
- 每个插件声明自己需要的依赖
|
||||||
|
- 优点:职责清晰,易于维护
|
||||||
|
- 缺点:可能有重复依赖(但 pnpm 会去重)
|
||||||
|
|
||||||
|
**备选:按功能分组**
|
||||||
|
- 将依赖按功能分组(如 "aws-deps", "aliyun-deps")
|
||||||
|
- 优点:更细粒度控制
|
||||||
|
- 缺点:增加复杂度
|
||||||
|
|
||||||
|
### 2. 安装触发时机
|
||||||
|
**选择:首次使用时触发**
|
||||||
|
- 在插件的 `execute()` 或 `getClient()` 方法中触发安装
|
||||||
|
- 优点:真正的按需加载
|
||||||
|
- 缺点:首次使用有延迟
|
||||||
|
|
||||||
|
**备选:启动时预检查**
|
||||||
|
- 启动时扫描启用的插件,预安装依赖
|
||||||
|
- 优点:避免运行时延迟
|
||||||
|
- 缺点:可能安装不需要的依赖
|
||||||
|
|
||||||
|
### 3. 依赖路径解析
|
||||||
|
**选择:使用绝对路径 + `file://` 协议**
|
||||||
|
```typescript
|
||||||
|
const modulePath = path.resolve(__dirname, '../../optional-deps/node_modules', packageName);
|
||||||
|
return await import(`file://${modulePath}/index.js`);
|
||||||
|
```
|
||||||
|
|
||||||
|
**原因:**
|
||||||
|
- Node.js ESM 要求明确的 URL 格式
|
||||||
|
- 避免模块解析冲突
|
||||||
|
|
||||||
|
### 4. 并发控制
|
||||||
|
**选择:文件锁 + 内存锁双重保护**
|
||||||
|
- 使用 `proper-lockfile` 锁定 `optional-deps/` 目录
|
||||||
|
- 内存中使用 `Map` 记录正在安装的依赖
|
||||||
|
- 避免多个插件同时触发安装
|
||||||
|
|
||||||
|
### 5. 错误处理
|
||||||
|
**策略:**
|
||||||
|
- 安装失败时记录日志,抛出明确的错误信息
|
||||||
|
- 提供手动安装命令提示:`请运行: cd optional-deps && pnpm install`
|
||||||
|
- 支持降级:某些非核心依赖安装失败时,插件可以部分功能可用
|
||||||
|
|
||||||
|
## 验证方案
|
||||||
|
|
||||||
|
### 单元测试
|
||||||
|
1. 测试 `DependencyManager.isInstalled()` 正确检测依赖状态
|
||||||
|
2. 测试 `DependencyManager.installDependencies()` 成功安装依赖
|
||||||
|
3. 测试并发安装时的锁机制
|
||||||
|
4. 测试从 `optional-deps/node_modules` 加载模块
|
||||||
|
|
||||||
|
### 集成测试
|
||||||
|
1. 清空 `optional-deps/node_modules`
|
||||||
|
2. 启动服务,验证不触发安装
|
||||||
|
3. 调用 AWS 插件,验证触发安装并成功加载
|
||||||
|
4. 再次调用,验证不重复安装
|
||||||
|
5. 验证主 `node_modules` 体积减少
|
||||||
|
|
||||||
|
### 性能测试
|
||||||
|
1. 测量首次安装依赖的耗时
|
||||||
|
2. 测量后续加载的耗时(应该与正常 import 相近)
|
||||||
|
3. 对比改造前后的 `node_modules` 大小
|
||||||
|
|
||||||
|
## 风险与挑战
|
||||||
|
|
||||||
|
### 1. 首次使用延迟
|
||||||
|
**风险:** 用户首次使用插件时需要等待依赖安装(可能几十秒)
|
||||||
|
**缓解:**
|
||||||
|
- 在 UI 上显示安装进度
|
||||||
|
- 提供预安装命令:`pnpm run install-optional-deps`
|
||||||
|
- 文档说明首次使用会有延迟
|
||||||
|
|
||||||
|
### 2. 离线环境
|
||||||
|
**风险:** 离线环境无法下载依赖
|
||||||
|
**缓解:**
|
||||||
|
- 提供完整安装包(包含所有可选依赖)
|
||||||
|
- 支持手动复制 `node_modules`
|
||||||
|
|
||||||
|
### 3. 版本冲突
|
||||||
|
**风险:** 可选依赖与主依赖版本冲突
|
||||||
|
**缓解:**
|
||||||
|
- 使用 `--ignore-workspace` 隔离安装
|
||||||
|
- 定期同步主依赖版本
|
||||||
|
|
||||||
|
### 4. TypeScript 类型
|
||||||
|
**风险:** 动态导入的类型推断
|
||||||
|
**缓解:**
|
||||||
|
- 保留 `@types/*` 在主 `devDependencies`
|
||||||
|
- 使用泛型和类型断言
|
||||||
|
|
||||||
|
## 预期收益
|
||||||
|
|
||||||
|
1. **空间节省:** 主 `node_modules` 体积减少 60-70%(估算)
|
||||||
|
2. **安装速度:** 初始 `pnpm install` 速度提升 3-5 倍
|
||||||
|
3. **用户体验:** 不使用的插件不占用空间,按需加载
|
||||||
|
4. **维护性:** 依赖分组清晰,易于管理
|
||||||
|
|
||||||
|
## 后续优化
|
||||||
|
|
||||||
|
1. **依赖预热:** 在后台预安装常用插件依赖
|
||||||
|
2. **依赖缓存:** 支持从 CDN 或本地缓存安装
|
||||||
|
3. **依赖更新:** 提供命令批量更新可选依赖
|
||||||
|
4. **插件市场:** 支持从远程下载插件及其依赖配置
|
||||||
|
|
||||||
|
## 附录:依赖分类清单
|
||||||
|
|
||||||
|
### 可选依赖(迁移到 optional-deps/package.json)
|
||||||
|
|
||||||
|
**AWS 相关(plugin-aws, plugin-aws-cn):**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"@aws-sdk/client-acm": "^3.964.0",
|
||||||
|
"@aws-sdk/client-cloudfront": "^3.964.0",
|
||||||
|
"@aws-sdk/client-iam": "^3.964.0",
|
||||||
|
"@aws-sdk/client-route-53": "^3.964.0",
|
||||||
|
"@aws-sdk/client-s3": "^3.964.0",
|
||||||
|
"@aws-sdk/client-sts": "^3.990.0"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**阿里云相关(plugin-aliyun, plugin-lib/aliyun):**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"@alicloud/fc20230330": "^4.1.7",
|
||||||
|
"@alicloud/openapi-client": "^0.4.12",
|
||||||
|
"@alicloud/openapi-util": "^0.3.2",
|
||||||
|
"@alicloud/pop-core": "^1.7.10",
|
||||||
|
"@alicloud/sts-sdk": "^1.0.2",
|
||||||
|
"@alicloud/tea-typescript": "^1.8.0",
|
||||||
|
"@alicloud/tea-util": "^1.4.10",
|
||||||
|
"ali-oss": "^6.21.0"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**腾讯云相关(plugin-tencent, plugin-lib/tencent):**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"tencentcloud-sdk-nodejs": "^4.1.112",
|
||||||
|
"cos-nodejs-sdk-v5": "^2.14.6"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**华为云相关(plugin-huawei):**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"@huaweicloud/huaweicloud-sdk-cdn": "3.1.185",
|
||||||
|
"@huaweicloud/huaweicloud-sdk-core": "3.1.185",
|
||||||
|
"@huaweicloud/huaweicloud-sdk-elb": "3.1.185",
|
||||||
|
"@huaweicloud/huaweicloud-sdk-iam": "3.1.185",
|
||||||
|
"esdk-obs-nodejs": "^3.25.6"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Azure 相关(plugin-azure):**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"@azure/arm-dns": "^5.1.0",
|
||||||
|
"@azure/identity": "^4.13.1"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Google Cloud 相关(plugin-google, plugin-cert/google):**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"@google-cloud/dns": "^5.3.1",
|
||||||
|
"@google-cloud/publicca": "^1.3.0"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**火山引擎相关(plugin-volcengine):**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"@volcengine/openapi": "^1.28.1",
|
||||||
|
"@volcengine/tos-sdk": "^2.9.1"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**SSH/网络相关(plugin-host, plugin-lib/ssh):**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"ssh2": "^1.17.0",
|
||||||
|
"socks": "^2.8.3",
|
||||||
|
"socks-proxy-agent": "^8.0.4",
|
||||||
|
"basic-ftp": "^5.0.5"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**其他存储/传输(plugin-qiniu, plugin-lib/qiniu):**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"qiniu": "^7.12.0"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**邮件通知(plugin-notification/email):**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"nodemailer": "^6.9.16"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 主依赖(保留在主 package.json)
|
||||||
|
|
||||||
|
**框架核心:**
|
||||||
|
- `@midwayjs/*` 系列
|
||||||
|
- `@koa/cors`
|
||||||
|
- `typeorm`, `better-sqlite3`, `mysql2`, `pg`
|
||||||
|
|
||||||
|
**项目内部包:**
|
||||||
|
- `@certd/*` 系列
|
||||||
|
|
||||||
|
**通用工具:**
|
||||||
|
- `axios`, `lodash-es`, `dayjs`, `js-yaml`
|
||||||
|
- `crypto-js`, `jsonwebtoken`, `bcryptjs`
|
||||||
|
- `reflect-metadata`, `uuid`, `nanoid`
|
||||||
|
- 等等
|
||||||
|
|
||||||
|
## 总结
|
||||||
|
|
||||||
|
本方案通过引入独立的可选依赖管理机制,实现了插件依赖的按需下载和加载。核心思路是:
|
||||||
|
|
||||||
|
1. **隔离管理:** 在 `optional-deps/` 目录下维护独立的 `package.json` 和 `node_modules`
|
||||||
|
2. **动态安装:** 通过 `DependencyManager` 在首次使用时触发 `pnpm install`
|
||||||
|
3. **路径加载:** 使用绝对路径从独立目录加载依赖模块
|
||||||
|
4. **最小改动:** 通过辅助函数 `importOptionalDep` 简化插件代码改造
|
||||||
|
|
||||||
|
该方案可以显著减少主 `node_modules` 体积,提升初始安装速度,同时保持现有架构的兼容性和可维护性。
|
||||||
@@ -215,17 +215,3 @@ Certd 是可私有化部署的 SSL/TLS 证书自动化管理平台,提供 Web
|
|||||||
### 旧版数据兼容
|
### 旧版数据兼容
|
||||||
|
|
||||||
- 新增插件参数时,必须要考虑旧版数据兼容,比如新增一个deployType参数,有两种值:`default`和`custom`,需要在使用时判空,走旧版逻辑。
|
- 新增插件参数时,必须要考虑旧版数据兼容,比如新增一个deployType参数,有两种值:`default`和`custom`,需要在使用时判空,走旧版逻辑。
|
||||||
|
|
||||||
## 前端路由与国际化
|
|
||||||
|
|
||||||
- 路由 `meta.title` 是 **i18n 国际化 key**,必须在 `src/locales/langs/zh-CN/` 和 `src/locales/langs/en-US/` 对应的模块文件中添加翻译。
|
|
||||||
- 示例:路由 `title: "certd.auditLog"` 需要在中英 locales 文件中有对应 key(`"certd.auditLog": "操作日志"` / `"certd.auditLog": "Audit Log"`)。
|
|
||||||
- 菜单通过路由自动生成,需设置 `meta.isMenu: true` 才会出现在左侧菜单。
|
|
||||||
- Plus 版功能菜单需设置 `meta.show: () => { const settingStore = useSettingStore(); return settingStore.isPlus; }`。
|
|
||||||
|
|
||||||
## 审计日志
|
|
||||||
|
|
||||||
- 审计日志是 Plus 版功能,非 Plus 版不会写入。
|
|
||||||
- Controller 继承 `BaseController`,通过 `this.auditLog({ content: "xxx" })` 记录日志。
|
|
||||||
- `getAuditType()` 返回类型常量,中间件自动从 ctx.path 判定 scope(`/api/sys/` → system,其他 → user)。
|
|
||||||
- 操作日志有系统级(scope=system)和用户级(scope=user)区分。
|
|
||||||
@@ -3,6 +3,14 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复火山引擎查不到自定义源站域名的问题 ([02dabe1](https://github.com/certd/certd/commit/02dabe11db3e9b13ca4621ce9ddd2b808bfca390))
|
||||||
|
* 修复火山引擎自定义源站域名查询不到的问题 ([e44bf9d](https://github.com/certd/certd/commit/e44bf9d77375d48ac7fd1582e69fae02dfd248fa))
|
||||||
|
* **pipeline:** 重构运行时依赖加载逻辑,修复火山引擎DNS解析报runtimeDepsService未初始化的bug ([ec69b8f](https://github.com/certd/certd/commit/ec69b8f11bfd4b20991aef74a72a47182ca79a9d))
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -3,6 +3,14 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复火山引擎查不到自定义源站域名的问题 ([02dabe1](https://github.com/certd/certd/commit/02dabe11db3e9b13ca4621ce9ddd2b808bfca390))
|
||||||
|
* 修复火山引擎自定义源站域名查询不到的问题 ([e44bf9d](https://github.com/certd/certd/commit/e44bf9d77375d48ac7fd1582e69fae02dfd248fa))
|
||||||
|
* **pipeline:** 重构运行时依赖加载逻辑,修复火山引擎DNS解析报runtimeDepsService未初始化的bug ([ec69b8f](https://github.com/certd/certd/commit/ec69b8f11bfd4b20991aef74a72a47182ca79a9d))
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
+1
-1
@@ -9,5 +9,5 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"npmClient": "pnpm",
|
"npmClient": "pnpm",
|
||||||
"version": "1.42.3"
|
"version": "1.42.4"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/publishlab/node-acme-client/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
## [1.42.3](https://github.com/publishlab/node-acme-client/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/publishlab/node-acme-client/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/acme-client
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"description": "Simple and unopinionated ACME client",
|
"description": "Simple and unopinionated ACME client",
|
||||||
"private": false,
|
"private": false,
|
||||||
"author": "nmorsman",
|
"author": "nmorsman",
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
"types"
|
"types"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/basic": "^1.42.3",
|
"@certd/basic": "^1.42.4",
|
||||||
"@peculiar/x509": "^1.11.0",
|
"@peculiar/x509": "^1.11.0",
|
||||||
"asn1js": "^3.0.5",
|
"asn1js": "^3.0.5",
|
||||||
"axios": "^1.9.0",
|
"axios": "^1.9.0",
|
||||||
@@ -75,5 +75,5 @@
|
|||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/publishlab/node-acme-client/issues"
|
"url": "https://github.com/publishlab/node-acme-client/issues"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/basic
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
23:45
|
02:45
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/basic",
|
"name": "@certd/basic",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -54,5 +54,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,12 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **pipeline:** 重构运行时依赖加载逻辑,修复火山引擎DNS解析报runtimeDepsService未初始化的bug ([ec69b8f](https://github.com/certd/certd/commit/ec69b8f11bfd4b20991aef74a72a47182ca79a9d))
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/pipeline
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/pipeline",
|
"name": "@certd/pipeline",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -21,8 +21,8 @@
|
|||||||
"lint": "eslint --fix"
|
"lint": "eslint --fix"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/basic": "^1.42.3",
|
"@certd/basic": "^1.42.4",
|
||||||
"@certd/plus-core": "^1.42.3",
|
"@certd/plus-core": "^1.42.4",
|
||||||
"dayjs": "^1.11.7",
|
"dayjs": "^1.11.7",
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
"reflect-metadata": "^0.2.2"
|
"reflect-metadata": "^0.2.2"
|
||||||
@@ -51,5 +51,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,9 +62,6 @@ export abstract class BaseAccess implements IAccess {
|
|||||||
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
||||||
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
||||||
}
|
}
|
||||||
if (this.runtimeDepsService && this.ctx.define?.name) {
|
|
||||||
await this.runtimeDepsService.ensureRuntimeDependencies({ pluginKeys: `access:${this.ctx.define.name}`, logger: this.ctx.logger });
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async onRequest(req: AccessRequestHandleReq) {
|
async onRequest(req: AccessRequestHandleReq) {
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ export function AccessInput(input?: AccessInputDefine): PropertyDecorator {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function newAccess(type: string, input: any, accessService: IAccessService, ctx?: AccessContext) {
|
export async function newAccess(type: string, input: any, accessService: IAccessService, ctx: AccessContext) {
|
||||||
const register = accessRegistry.get(type);
|
const register = accessRegistry.get(type);
|
||||||
if (register == null) {
|
if (register == null) {
|
||||||
throw new Error(`access ${type} not found`);
|
throw new Error(`access ${type} not found`);
|
||||||
|
|||||||
@@ -112,9 +112,6 @@ export abstract class BaseNotification implements INotification {
|
|||||||
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
||||||
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
||||||
}
|
}
|
||||||
if (this.runtimeDepsService && this.ctx.define?.name) {
|
|
||||||
await this.runtimeDepsService.ensureRuntimeDependencies({ pluginKeys: `notification:${this.ctx.define.name}`, logger: this.logger });
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
setDefine = (define: NotificationDefine) => {
|
setDefine = (define: NotificationDefine) => {
|
||||||
this.define = define;
|
this.define = define;
|
||||||
|
|||||||
@@ -181,9 +181,6 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
|
|||||||
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
||||||
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
||||||
}
|
}
|
||||||
if (this.runtimeDepsService && this.ctx.define?.name) {
|
|
||||||
await this.runtimeDepsService.ensureRuntimeDependencies({ pluginKeys: `plugin:${this.ctx.define.name}`, logger: this.logger });
|
|
||||||
}
|
|
||||||
// 将证书加入secret
|
// 将证书加入secret
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
if (this.cert && this.cert.crt && this.cert.key) {
|
if (this.cert && this.cert.crt && this.cert.key) {
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-huawei
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-huawei",
|
"name": "@certd/lib-huawei",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"main": "./dist/bundle.js",
|
"main": "./dist/bundle.js",
|
||||||
"module": "./dist/bundle.js",
|
"module": "./dist/bundle.js",
|
||||||
"types": "./dist/d/index.d.ts",
|
"types": "./dist/d/index.d.ts",
|
||||||
@@ -30,5 +30,5 @@
|
|||||||
"prettier": "3.3.3",
|
"prettier": "3.3.3",
|
||||||
"tslib": "^2.8.1"
|
"tslib": "^2.8.1"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-iframe
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-iframe",
|
"name": "@certd/lib-iframe",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -37,5 +37,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/jdcloud
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/jdcloud",
|
"name": "@certd/jdcloud",
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"description": "jdcloud openApi sdk",
|
"description": "jdcloud openApi sdk",
|
||||||
"main": "./dist/bundle.js",
|
"main": "./dist/bundle.js",
|
||||||
"module": "./dist/bundle.js",
|
"module": "./dist/bundle.js",
|
||||||
@@ -62,5 +62,5 @@
|
|||||||
"fetch"
|
"fetch"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-k8s
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-k8s",
|
"name": "@certd/lib-k8s",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
"lint": "eslint --fix"
|
"lint": "eslint --fix"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/basic": "^1.42.3",
|
"@certd/basic": "^1.42.4",
|
||||||
"@kubernetes/client-node": "0.21.0"
|
"@kubernetes/client-node": "0.21.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -38,5 +38,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,12 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **pipeline:** 重构运行时依赖加载逻辑,修复火山引擎DNS解析报runtimeDepsService未初始化的bug ([ec69b8f](https://github.com/certd/certd/commit/ec69b8f11bfd4b20991aef74a72a47182ca79a9d))
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-server
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-server",
|
"name": "@certd/lib-server",
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"description": "midway with flyway, sql upgrade way ",
|
"description": "midway with flyway, sql upgrade way ",
|
||||||
"private": false,
|
"private": false,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -29,11 +29,11 @@
|
|||||||
],
|
],
|
||||||
"license": "AGPL",
|
"license": "AGPL",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/acme-client": "^1.42.3",
|
"@certd/acme-client": "^1.42.4",
|
||||||
"@certd/basic": "^1.42.3",
|
"@certd/basic": "^1.42.4",
|
||||||
"@certd/pipeline": "^1.42.3",
|
"@certd/pipeline": "^1.42.4",
|
||||||
"@certd/plugin-lib": "^1.42.3",
|
"@certd/plugin-lib": "^1.42.4",
|
||||||
"@certd/plus-core": "^1.42.3",
|
"@certd/plus-core": "^1.42.4",
|
||||||
"@midwayjs/cache": "3.14.0",
|
"@midwayjs/cache": "3.14.0",
|
||||||
"@midwayjs/core": "3.20.11",
|
"@midwayjs/core": "3.20.11",
|
||||||
"@midwayjs/i18n": "3.20.13",
|
"@midwayjs/i18n": "3.20.13",
|
||||||
@@ -69,5 +69,5 @@
|
|||||||
"typeorm": "^0.3.20",
|
"typeorm": "^0.3.20",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,35 +0,0 @@
|
|||||||
/// <reference types="mocha" />
|
|
||||||
|
|
||||||
import assert from "node:assert/strict";
|
|
||||||
import { AuditLogContext } from "./audit.js";
|
|
||||||
|
|
||||||
// AuditLog decorator and getAuditLogOptions are removed since auditLog()
|
|
||||||
// now signals audit intent directly via ctx.auditLog.enabled
|
|
||||||
|
|
||||||
describe("AuditLogContext type", () => {
|
|
||||||
it("supports enabled flag", () => {
|
|
||||||
const ctx: AuditLogContext = {
|
|
||||||
type: "pipeline",
|
|
||||||
action: "删除流水线",
|
|
||||||
append: ["ID:5"],
|
|
||||||
content: "删除了流水线(ID:5)",
|
|
||||||
projectId: 3,
|
|
||||||
projectName: "默认项目",
|
|
||||||
enabled: true,
|
|
||||||
};
|
|
||||||
|
|
||||||
assert.equal(ctx.enabled, true);
|
|
||||||
assert.equal(ctx.type, "pipeline");
|
|
||||||
assert.equal(ctx.content, "删除了流水线(ID:5)");
|
|
||||||
assert.equal(ctx.projectId, 3);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("works with minimal fields", () => {
|
|
||||||
const ctx: AuditLogContext = {
|
|
||||||
enabled: true,
|
|
||||||
append: ["提交2条"],
|
|
||||||
};
|
|
||||||
|
|
||||||
assert.equal(ctx.enabled, true);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
export type AuditLogOptions = {
|
|
||||||
type?: string;
|
|
||||||
action?: string;
|
|
||||||
content?: string;
|
|
||||||
template?: string;
|
|
||||||
disabled?: boolean;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type AuditLogContext = {
|
|
||||||
type?: string;
|
|
||||||
action?: string;
|
|
||||||
append?: string | string[];
|
|
||||||
content?: string;
|
|
||||||
projectId?: number;
|
|
||||||
projectName?: string;
|
|
||||||
enabled?: boolean;
|
|
||||||
allowAnonymous?: boolean;
|
|
||||||
scope?: string;
|
|
||||||
userId?: number;
|
|
||||||
username?: string;
|
|
||||||
};
|
|
||||||
@@ -3,7 +3,6 @@ import type { IMidwayContainer } from "@midwayjs/core";
|
|||||||
import * as koa from "@midwayjs/koa";
|
import * as koa from "@midwayjs/koa";
|
||||||
import { Constants } from "./constants.js";
|
import { Constants } from "./constants.js";
|
||||||
import { isEnterprise } from "./mode.js";
|
import { isEnterprise } from "./mode.js";
|
||||||
import type { AuditLogContext } from "./audit.js";
|
|
||||||
|
|
||||||
export abstract class BaseController {
|
export abstract class BaseController {
|
||||||
@Inject()
|
@Inject()
|
||||||
@@ -128,43 +127,4 @@ export abstract class BaseController {
|
|||||||
}
|
}
|
||||||
return { projectId, userId };
|
return { projectId, userId };
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return "unknown";
|
|
||||||
}
|
|
||||||
|
|
||||||
auditLog(bean: { type?: string; action?: string; content?: string; append?: string | string[]; projectId?: number; userId?: number; username?: string } = {}) {
|
|
||||||
const auditLog = this.ensureAuditLogContext();
|
|
||||||
auditLog.enabled = true;
|
|
||||||
if (bean.userId != null) {
|
|
||||||
auditLog.userId = bean.userId;
|
|
||||||
}
|
|
||||||
if (bean.username != null) {
|
|
||||||
auditLog.username = bean.username;
|
|
||||||
}
|
|
||||||
if (bean.type != null) {
|
|
||||||
auditLog.type = bean.type;
|
|
||||||
}
|
|
||||||
if (bean.action != null) {
|
|
||||||
auditLog.action = bean.action;
|
|
||||||
}
|
|
||||||
if (bean.projectId != null) {
|
|
||||||
auditLog.projectId = bean.projectId;
|
|
||||||
}
|
|
||||||
if (bean.content) {
|
|
||||||
auditLog.content = bean.content;
|
|
||||||
}
|
|
||||||
if (bean.append) {
|
|
||||||
const items = Array.isArray(bean.append) ? bean.append : [bean.append];
|
|
||||||
const old = Array.isArray(auditLog.append) ? auditLog.append : auditLog.append ? [auditLog.append] : [];
|
|
||||||
auditLog.append = [...old, ...items].filter(item => item && String(item).trim());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private ensureAuditLogContext(): AuditLogContext {
|
|
||||||
if (!this.ctx.auditLog) {
|
|
||||||
this.ctx.auditLog = {};
|
|
||||||
}
|
|
||||||
return this.ctx.auditLog;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +1,21 @@
|
|||||||
export const Constants = {
|
export const Constants = {
|
||||||
dataDir: "./data",
|
dataDir: './data',
|
||||||
role: {
|
role: {
|
||||||
defaultUser: 3,
|
defaultUser: 3,
|
||||||
},
|
},
|
||||||
per: {
|
per: {
|
||||||
//无需登录
|
//无需登录
|
||||||
guest: "_guest_",
|
guest: '_guest_',
|
||||||
//无需登录
|
//无需登录
|
||||||
anonymous: "_guest_",
|
anonymous: '_guest_',
|
||||||
//无需登录,有 token 时解析当前用户
|
//无需登录,有 token 时解析当前用户
|
||||||
guestOptionalAuth: "_guestOptionalAuth_",
|
guestOptionalAuth: '_guestOptionalAuth_',
|
||||||
//仅需要登录
|
//仅需要登录
|
||||||
authOnly: "_authOnly_",
|
authOnly: '_authOnly_',
|
||||||
//仅需要登录
|
//仅需要登录
|
||||||
loginOnly: "_authOnly_",
|
loginOnly: '_authOnly_',
|
||||||
|
|
||||||
open: "_open_",
|
open: '_open_',
|
||||||
},
|
},
|
||||||
res: {
|
res: {
|
||||||
serverError(message: string) {
|
serverError(message: string) {
|
||||||
@@ -26,102 +26,102 @@ export const Constants = {
|
|||||||
},
|
},
|
||||||
error: {
|
error: {
|
||||||
code: 1,
|
code: 1,
|
||||||
message: "Internal server error",
|
message: 'Internal server error',
|
||||||
},
|
},
|
||||||
success: {
|
success: {
|
||||||
code: 0,
|
code: 0,
|
||||||
message: "success",
|
message: 'success',
|
||||||
},
|
},
|
||||||
validation: {
|
validation: {
|
||||||
code: 10,
|
code: 10,
|
||||||
message: "参数错误",
|
message: '参数错误',
|
||||||
},
|
},
|
||||||
needvip: {
|
needvip: {
|
||||||
code: 88,
|
code: 88,
|
||||||
message: "需要VIP",
|
message: '需要VIP',
|
||||||
},
|
},
|
||||||
needsuite: {
|
needsuite: {
|
||||||
code: 89,
|
code: 89,
|
||||||
message: "需要购买或升级套餐",
|
message: '需要购买或升级套餐',
|
||||||
},
|
},
|
||||||
loginError: {
|
loginError: {
|
||||||
code: 2,
|
code: 2,
|
||||||
message: "登录失败",
|
message: '登录失败',
|
||||||
},
|
},
|
||||||
codeError: {
|
codeError: {
|
||||||
code: 3,
|
code: 3,
|
||||||
message: "验证码错误",
|
message: '验证码错误',
|
||||||
},
|
},
|
||||||
auth: {
|
auth: {
|
||||||
code: 401,
|
code: 401,
|
||||||
message: "您还未登录或token已过期",
|
message: '您还未登录或token已过期',
|
||||||
},
|
},
|
||||||
permission: {
|
permission: {
|
||||||
code: 402,
|
code: 402,
|
||||||
message: "您没有权限",
|
message: '您没有权限',
|
||||||
},
|
},
|
||||||
param: {
|
param: {
|
||||||
code: 400,
|
code: 400,
|
||||||
message: "参数错误",
|
message: '参数错误',
|
||||||
},
|
},
|
||||||
notFound: {
|
notFound: {
|
||||||
code: 404,
|
code: 404,
|
||||||
message: "页面/文件/资源不存在",
|
message: '页面/文件/资源不存在',
|
||||||
},
|
},
|
||||||
|
|
||||||
preview: {
|
preview: {
|
||||||
code: 10001,
|
code: 10001,
|
||||||
message: "对不起,预览环境不允许修改此数据",
|
message: '对不起,预览环境不允许修改此数据',
|
||||||
},
|
},
|
||||||
siteOff:{
|
siteOff:{
|
||||||
code: 10010,
|
code: 10010,
|
||||||
message: "站点已关闭",
|
message: '站点已关闭',
|
||||||
},
|
},
|
||||||
need2fa:{
|
need2fa:{
|
||||||
code: 10020,
|
code: 10020,
|
||||||
message: "需要2FA认证",
|
message: '需要2FA认证',
|
||||||
},
|
},
|
||||||
openKeyError: {
|
openKeyError: {
|
||||||
code: 20000,
|
code: 20000,
|
||||||
message: "ApiToken错误",
|
message: 'ApiToken错误',
|
||||||
},
|
},
|
||||||
openKeySignError: {
|
openKeySignError: {
|
||||||
code: 20001,
|
code: 20001,
|
||||||
message: "ApiToken签名错误",
|
message: 'ApiToken签名错误',
|
||||||
},
|
},
|
||||||
openKeyExpiresError: {
|
openKeyExpiresError: {
|
||||||
code: 20002,
|
code: 20002,
|
||||||
message: "ApiToken时间戳错误",
|
message: 'ApiToken时间戳错误',
|
||||||
},
|
},
|
||||||
openKeySignTypeError: {
|
openKeySignTypeError: {
|
||||||
code: 20003,
|
code: 20003,
|
||||||
message: "ApiToken签名类型不支持",
|
message: 'ApiToken签名类型不支持',
|
||||||
},
|
},
|
||||||
openParamError: {
|
openParamError: {
|
||||||
code: 20010,
|
code: 20010,
|
||||||
message: "请求参数错误",
|
message: '请求参数错误',
|
||||||
},
|
},
|
||||||
openCertNotFound: {
|
openCertNotFound: {
|
||||||
code: 20011,
|
code: 20011,
|
||||||
message: "证书不存在",
|
message: '证书不存在',
|
||||||
},
|
},
|
||||||
openCertNotReady: {
|
openCertNotReady: {
|
||||||
code: 20012,
|
code: 20012,
|
||||||
message: "证书还未生成",
|
message: '证书还未生成',
|
||||||
},
|
},
|
||||||
openCertApplying: {
|
openCertApplying: {
|
||||||
code: 20013,
|
code: 20013,
|
||||||
message: "证书正在申请中,请稍后重新获取",
|
message: '证书正在申请中,请稍后重新获取',
|
||||||
},
|
},
|
||||||
openDomainNoVerifier:{
|
openDomainNoVerifier:{
|
||||||
code: 20014,
|
code: 20014,
|
||||||
message: "域名校验方式未配置",
|
message: '域名校验方式未配置',
|
||||||
},
|
},
|
||||||
openEmailNotFound: {
|
openEmailNotFound: {
|
||||||
code: 20021,
|
code: 20021,
|
||||||
message: "用户邮箱还未配置",
|
message: '用户邮箱还未配置',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
systemUserId: 0, // 系统级别userid固定为0
|
systemUserId: 0, // 系统级别userid固定为0
|
||||||
enterpriseUserId: -1, // 企业模式用户id固定为-1
|
enterpriseUserId: -1 // 企业模式用户id固定为-1
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
import { ALL, Body, Post, Query } from "@midwayjs/core";
|
import { ALL, Body, Post, Query } from '@midwayjs/core';
|
||||||
import { BaseController } from "./base-controller.js";
|
import { BaseController } from './base-controller.js';
|
||||||
|
|
||||||
export abstract class CrudController<T> extends BaseController {
|
export abstract class CrudController<T> extends BaseController {
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||||
abstract getService<T>();
|
abstract getService<T>();
|
||||||
|
|
||||||
@Post("/page")
|
@Post('/page')
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
const pageRet = await this.getService().page({
|
const pageRet = await this.getService().page({
|
||||||
query: body.query ?? {},
|
query: body.query ?? {},
|
||||||
@@ -16,7 +16,7 @@ export abstract class CrudController<T> extends BaseController {
|
|||||||
return this.ok(pageRet);
|
return this.ok(pageRet);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/list")
|
@Post('/list')
|
||||||
async list(@Body(ALL) body: any) {
|
async list(@Body(ALL) body: any) {
|
||||||
const listRet = await this.getService().list({
|
const listRet = await this.getService().list({
|
||||||
query: body.query ?? {},
|
query: body.query ?? {},
|
||||||
@@ -25,33 +25,33 @@ export abstract class CrudController<T> extends BaseController {
|
|||||||
return this.ok(listRet);
|
return this.ok(listRet);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/add")
|
@Post('/add')
|
||||||
async add(@Body(ALL) bean: any) {
|
async add(@Body(ALL) bean: any) {
|
||||||
delete bean.id;
|
delete bean.id;
|
||||||
const id = await this.getService().add(bean);
|
const id = await this.getService().add(bean);
|
||||||
return this.ok(id);
|
return this.ok(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/info")
|
@Post('/info')
|
||||||
async info(@Query("id") id: number) {
|
async info(@Query('id') id: number) {
|
||||||
const bean = await this.getService().info(id);
|
const bean = await this.getService().info(id);
|
||||||
return this.ok(bean);
|
return this.ok(bean);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update")
|
@Post('/update')
|
||||||
async update(@Body(ALL) bean: any) {
|
async update(@Body(ALL) bean: any) {
|
||||||
await this.getService().update(bean);
|
await this.getService().update(bean);
|
||||||
return this.ok(null);
|
return this.ok(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/delete")
|
@Post('/delete')
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query('id') id: number) {
|
||||||
await this.getService().delete([id]);
|
await this.getService().delete([id]);
|
||||||
return this.ok(null);
|
return this.ok(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/deleteByIds")
|
@Post('/deleteByIds')
|
||||||
async deleteByIds(@Body("ids") ids: number[]) {
|
async deleteByIds(@Body('ids') ids: number[]) {
|
||||||
await this.getService().delete(ids);
|
await this.getService().delete(ids);
|
||||||
return this.ok(null);
|
return this.ok(null);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,12 @@
|
|||||||
import { Constants } from "../constants.js";
|
import { Constants } from '../constants.js';
|
||||||
import { BaseException } from "./base-exception.js";
|
import { BaseException } from './base-exception.js';
|
||||||
/**
|
/**
|
||||||
* 通用异常
|
* 通用异常
|
||||||
*/
|
*/
|
||||||
export class LoginErrorException extends BaseException {
|
export class LoginErrorException extends BaseException {
|
||||||
leftCount: number;
|
leftCount: number;
|
||||||
userId?: number;
|
constructor(message, leftCount: number) {
|
||||||
constructor(message, leftCount: number, userId?: number) {
|
super('LoginErrorException', Constants.res.loginError.code, message ? message : Constants.res.loginError.message);
|
||||||
super("LoginErrorException", Constants.res.loginError.code, message ? message : Constants.res.loginError.message);
|
|
||||||
this.leftCount = leftCount;
|
this.leftCount = leftCount;
|
||||||
this.userId = userId;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
export * from "./base-controller.js";
|
export * from './base-controller.js';
|
||||||
export * from "./constants.js";
|
export * from './constants.js';
|
||||||
export * from "./crud-controller.js";
|
export * from './crud-controller.js';
|
||||||
export * from "./enum-item.js";
|
export * from './enum-item.js';
|
||||||
export * from "./exception/index.js";
|
export * from './exception/index.js';
|
||||||
export * from "./result.js";
|
export * from './result.js';
|
||||||
export * from "./base-service.js";
|
export * from './base-service.js';
|
||||||
export * from "./audit.js";
|
export * from "./mode.js"
|
||||||
export * from "./mode.js";
|
|
||||||
@@ -1,12 +1,12 @@
|
|||||||
let adminMode = "saas";
|
let adminMode = "saas"
|
||||||
|
|
||||||
export function setAdminMode(mode:string = "saas"){
|
export function setAdminMode(mode:string = "saas"){
|
||||||
adminMode = mode;
|
adminMode = mode
|
||||||
}
|
}
|
||||||
export function getAdminMode(){
|
export function getAdminMode(){
|
||||||
return adminMode;
|
return adminMode
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isEnterprise(){
|
export function isEnterprise(){
|
||||||
return adminMode === "enterprise";
|
return adminMode === "enterprise"
|
||||||
}
|
}
|
||||||
@@ -1,29 +1,20 @@
|
|||||||
import { IAccessService, IRuntimeDepsService } from "@certd/pipeline";
|
import { IAccessService } from "@certd/pipeline";
|
||||||
|
|
||||||
export type AccessRuntimeDepsService = IRuntimeDepsService;
|
|
||||||
|
|
||||||
export class AccessGetter implements IAccessService {
|
export class AccessGetter implements IAccessService {
|
||||||
userId: number;
|
userId: number;
|
||||||
projectId?: number;
|
projectId?: number;
|
||||||
runtimeDepsService?: AccessRuntimeDepsService;
|
getter: <T>(id: any, userId?: number, projectId?: number, ignorePermission?: boolean) => Promise<T>;
|
||||||
getter: <T>(id: any, userId?: number, projectId?: number, ignorePermission?: boolean, runtimeDepsService?: AccessRuntimeDepsService) => Promise<T>;
|
constructor(userId: number, projectId: number, getter: (id: any, userId: number, projectId?: number, ignorePermission?: boolean) => Promise<any>) {
|
||||||
constructor(
|
|
||||||
userId: number,
|
|
||||||
projectId: number,
|
|
||||||
getter: (id: any, userId: number, projectId?: number, ignorePermission?: boolean, runtimeDepsService?: AccessRuntimeDepsService) => Promise<any>,
|
|
||||||
runtimeDepsService?: AccessRuntimeDepsService
|
|
||||||
) {
|
|
||||||
this.userId = userId;
|
this.userId = userId;
|
||||||
this.projectId = projectId;
|
this.projectId = projectId;
|
||||||
this.getter = getter;
|
this.getter = getter;
|
||||||
this.runtimeDepsService = runtimeDepsService;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async getById<T = any>(id: any) {
|
async getById<T = any>(id: any) {
|
||||||
return await this.getter<T>(id, this.userId, this.projectId, false, this.runtimeDepsService);
|
return await this.getter<T>(id, this.userId, this.projectId, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getCommonById<T = any>(id: any) {
|
async getCommonById<T = any>(id: any) {
|
||||||
return await this.getter<T>(id, 0, null, false, this.runtimeDepsService);
|
return await this.getter<T>(id, 0, null, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
|
import { ApplicationContext, Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
|
||||||
|
import type { IMidwayContainer } from "@midwayjs/core";
|
||||||
import { InjectEntityModel } from "@midwayjs/typeorm";
|
import { InjectEntityModel } from "@midwayjs/typeorm";
|
||||||
import { In, Repository } from "typeorm";
|
import { In, Repository } from "typeorm";
|
||||||
import { AccessGetter, BaseService, PageReq, PermissionException, ValidateException } from "../../../index.js";
|
import { AccessGetter, BaseService, PageReq, PermissionException, ValidateException } from "../../../index.js";
|
||||||
import type { AccessRuntimeDepsService } from "./access-getter.js";
|
|
||||||
import { AccessEntity } from "../entity/access.js";
|
import { AccessEntity } from "../entity/access.js";
|
||||||
import { AccessDefine, accessRegistry, newAccess } from "@certd/pipeline";
|
import { AccessDefine, accessRegistry, newAccess } from "@certd/pipeline";
|
||||||
import { EncryptService } from "./encrypt-service.js";
|
import { EncryptService } from "./encrypt-service.js";
|
||||||
@@ -20,6 +20,9 @@ export class AccessService extends BaseService<AccessEntity> {
|
|||||||
@Inject()
|
@Inject()
|
||||||
encryptService: EncryptService;
|
encryptService: EncryptService;
|
||||||
|
|
||||||
|
@ApplicationContext()
|
||||||
|
applicationContext: IMidwayContainer;
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
getRepository() {
|
getRepository() {
|
||||||
@@ -161,7 +164,7 @@ export class AccessService extends BaseService<AccessEntity> {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
async getAccessById(id: any, checkUserId: boolean, userId?: number, projectId?: number, runtimeDepsService?: AccessRuntimeDepsService): Promise<any> {
|
async getAccessById(id: any, checkUserId: boolean, userId?: number, projectId?: number): Promise<any> {
|
||||||
const entity = await this.info(id);
|
const entity = await this.info(id);
|
||||||
if (entity == null) {
|
if (entity == null) {
|
||||||
throw new Error(`该授权配置不存在,请确认是否已被删除:id=${id}`);
|
throw new Error(`该授权配置不存在,请确认是否已被删除:id=${id}`);
|
||||||
@@ -184,20 +187,23 @@ export class AccessService extends BaseService<AccessEntity> {
|
|||||||
id: entity.id,
|
id: entity.id,
|
||||||
...setting,
|
...setting,
|
||||||
};
|
};
|
||||||
|
const taskServiceBuilder: any = await this.applicationContext.getAsync("taskServiceBuilder");
|
||||||
|
const serviceGetter = taskServiceBuilder.create({ userId: userId || 0, projectId });
|
||||||
const getAccessById = this.getById.bind(this);
|
const getAccessById = this.getById.bind(this);
|
||||||
const accessGetter = new AccessGetter(userId, projectId, getAccessById, runtimeDepsService);
|
const accessGetter = new AccessGetter(userId, projectId, getAccessById);
|
||||||
const accessContext = {
|
const accessContext = {
|
||||||
logger,
|
logger,
|
||||||
http,
|
http,
|
||||||
utils,
|
utils,
|
||||||
accessService: accessGetter,
|
accessService: accessGetter,
|
||||||
|
serviceGetter,
|
||||||
} as any;
|
} as any;
|
||||||
const access = await newAccess(entity.type, input, accessGetter, accessContext);
|
const access = await newAccess(entity.type, input, accessGetter, accessContext);
|
||||||
return access;
|
return access;
|
||||||
}
|
}
|
||||||
|
|
||||||
async getById(id: any, userId: number, projectId?: number, _ignorePermission?: boolean, runtimeDepsService?: AccessRuntimeDepsService): Promise<any> {
|
async getById(id: any, userId: number, projectId?: number, _ignorePermission?: boolean): Promise<any> {
|
||||||
return await this.getAccessById(id, true, userId, projectId, runtimeDepsService);
|
return await this.getAccessById(id, true, userId, projectId);
|
||||||
}
|
}
|
||||||
|
|
||||||
decryptAccessEntity(entity: AccessEntity): any {
|
decryptAccessEntity(entity: AccessEntity): any {
|
||||||
|
|||||||
@@ -121,9 +121,6 @@ export abstract class BaseAddon implements IAddon {
|
|||||||
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
||||||
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
||||||
}
|
}
|
||||||
if (this.runtimeDepsService && this.define?.addonType && this.define?.name) {
|
|
||||||
await this.runtimeDepsService.ensureRuntimeDependencies({ pluginKeys: `addon:${this.define.addonType}:${this.define.name}`, logger: this.logger });
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
setDefine = (define:AddonDefine) => {
|
setDefine = (define:AddonDefine) => {
|
||||||
this.define = define;
|
this.define = define;
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/midway-flyway-js
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/midway-flyway-js",
|
"name": "@certd/midway-flyway-js",
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"description": "midway with flyway, sql upgrade way ",
|
"description": "midway with flyway, sql upgrade way ",
|
||||||
"private": false,
|
"private": false,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -52,5 +52,5 @@
|
|||||||
"typeorm": "^0.3.20",
|
"typeorm": "^0.3.20",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/plugin-cert
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/plugin-cert",
|
"name": "@certd/plugin-cert",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
"lint": "eslint --fix"
|
"lint": "eslint --fix"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/plugin-lib": "^1.42.3"
|
"@certd/plugin-lib": "^1.42.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/chai": "^4.3.12",
|
"@types/chai": "^4.3.12",
|
||||||
@@ -38,5 +38,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,12 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **pipeline:** 重构运行时依赖加载逻辑,修复火山引擎DNS解析报runtimeDepsService未初始化的bug ([ec69b8f](https://github.com/certd/certd/commit/ec69b8f11bfd4b20991aef74a72a47182ca79a9d))
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/plugin-lib
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/plugin-lib",
|
"name": "@certd/plugin-lib",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
@@ -17,9 +17,9 @@
|
|||||||
"lint": "eslint --fix"
|
"lint": "eslint --fix"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/acme-client": "^1.42.3",
|
"@certd/acme-client": "^1.42.4",
|
||||||
"@certd/basic": "^1.42.3",
|
"@certd/basic": "^1.42.4",
|
||||||
"@certd/pipeline": "^1.42.3",
|
"@certd/pipeline": "^1.42.4",
|
||||||
"dayjs": "^1.11.7",
|
"dayjs": "^1.11.7",
|
||||||
"jszip": "^3.10.1",
|
"jszip": "^3.10.1",
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
@@ -45,5 +45,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,9 +45,6 @@ export abstract class AbstractDnsProvider<T = any> implements IDnsProvider<T> {
|
|||||||
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
||||||
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
||||||
}
|
}
|
||||||
if (this.runtimeDepsService && this.ctx.define?.name) {
|
|
||||||
await this.runtimeDepsService.ensureRuntimeDependencies({ pluginKeys: `dnsProvider:${this.ctx.define.name}`, logger: this.logger });
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async parseDomain(fullDomain: string) {
|
async parseDomain(fullDomain: string) {
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/ui-client
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/ui-client
|
**Note:** Version bump only for package @certd/ui-client
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/ui-client",
|
"name": "@certd/ui-client",
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite --open",
|
"dev": "vite --open",
|
||||||
@@ -105,8 +105,8 @@
|
|||||||
"zod-defaults": "^0.1.3"
|
"zod-defaults": "^0.1.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@certd/lib-iframe": "^1.42.3",
|
"@certd/lib-iframe": "^1.42.4",
|
||||||
"@certd/pipeline": "^1.42.3",
|
"@certd/pipeline": "^1.42.4",
|
||||||
"@rollup/plugin-commonjs": "^25.0.7",
|
"@rollup/plugin-commonjs": "^25.0.7",
|
||||||
"@rollup/plugin-node-resolve": "^15.2.3",
|
"@rollup/plugin-node-resolve": "^15.2.3",
|
||||||
"@types/chai": "^4.3.12",
|
"@types/chai": "^4.3.12",
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ export default {
|
|||||||
openKey: "Open API Key",
|
openKey: "Open API Key",
|
||||||
notification: "Notification Settings",
|
notification: "Notification Settings",
|
||||||
siteMonitorSetting: "Site Monitor Settings",
|
siteMonitorSetting: "Site Monitor Settings",
|
||||||
auditLog: "Audit Log",
|
|
||||||
userSecurity: "Security Settings",
|
userSecurity: "Security Settings",
|
||||||
userProfile: "Account Info",
|
userProfile: "Account Info",
|
||||||
userGrant: "Grant Delegation",
|
userGrant: "Grant Delegation",
|
||||||
@@ -68,7 +67,6 @@ export default {
|
|||||||
projectJoin: "Join Project",
|
projectJoin: "Join Project",
|
||||||
currentProject: "Current Project",
|
currentProject: "Current Project",
|
||||||
projectMemberManager: "Project Member",
|
projectMemberManager: "Project Member",
|
||||||
auditLog: "Audit Log",
|
|
||||||
domainMonitorSetting: "Domain Monitor Settings",
|
domainMonitorSetting: "Domain Monitor Settings",
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ export default {
|
|||||||
openKey: "开放接口密钥",
|
openKey: "开放接口密钥",
|
||||||
notification: "通知设置",
|
notification: "通知设置",
|
||||||
siteMonitorSetting: "站点监控设置",
|
siteMonitorSetting: "站点监控设置",
|
||||||
auditLog: "操作日志",
|
|
||||||
userSecurity: "认证安全设置",
|
userSecurity: "认证安全设置",
|
||||||
userProfile: "账号信息",
|
userProfile: "账号信息",
|
||||||
userGrant: "授权委托",
|
userGrant: "授权委托",
|
||||||
@@ -68,7 +67,6 @@ export default {
|
|||||||
projectJoin: "加入项目",
|
projectJoin: "加入项目",
|
||||||
currentProject: "当前项目",
|
currentProject: "当前项目",
|
||||||
projectMemberManager: "项目成员管理",
|
projectMemberManager: "项目成员管理",
|
||||||
auditLog: "审计日志",
|
|
||||||
domainMonitorSetting: "域名监控设置",
|
domainMonitorSetting: "域名监控设置",
|
||||||
jobHistory: "监控执行记录",
|
jobHistory: "监控执行记录",
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -287,22 +287,6 @@ export const certdResources = [
|
|||||||
isMenu: true,
|
isMenu: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: "certd.auditLog",
|
|
||||||
name: "AuditLog",
|
|
||||||
path: "/certd/audit",
|
|
||||||
component: "/certd/audit/index.vue",
|
|
||||||
meta: {
|
|
||||||
icon: "ion:document-text-outline",
|
|
||||||
auth: true,
|
|
||||||
keepAlive: true,
|
|
||||||
isMenu: true,
|
|
||||||
show: () => {
|
|
||||||
const settingStore = useSettingStore();
|
|
||||||
return settingStore.isPlus;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: "certd.userSecurity",
|
title: "certd.userSecurity",
|
||||||
name: "UserSecurity",
|
name: "UserSecurity",
|
||||||
|
|||||||
@@ -410,22 +410,6 @@ export const sysResources = [
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: "certd.sysResources.auditLog",
|
|
||||||
name: "SysAuditLog",
|
|
||||||
path: "/sys/audit",
|
|
||||||
component: "/sys/audit/index.vue",
|
|
||||||
meta: {
|
|
||||||
icon: "ion:document-text-outline",
|
|
||||||
keepAlive: true,
|
|
||||||
auth: true,
|
|
||||||
isMenu: true,
|
|
||||||
show: () => {
|
|
||||||
const settingStore = useSettingStore();
|
|
||||||
return settingStore.isPlus;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: "certd.sysResources.netTest",
|
title: "certd.sysResources.netTest",
|
||||||
name: "NetTest",
|
name: "NetTest",
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
import { request } from "/src/api/service";
|
|
||||||
|
|
||||||
const apiPrefix = "/pi/audit";
|
|
||||||
|
|
||||||
export function createAuditApi() {
|
|
||||||
return {
|
|
||||||
async GetList(query: any) {
|
|
||||||
return await request({
|
|
||||||
url: apiPrefix + "/page",
|
|
||||||
method: "post",
|
|
||||||
data: query,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
async DelObj(id: number) {
|
|
||||||
return await request({
|
|
||||||
url: apiPrefix + "/delete",
|
|
||||||
method: "post",
|
|
||||||
params: { id },
|
|
||||||
});
|
|
||||||
},
|
|
||||||
async GetDict() {
|
|
||||||
return await request({
|
|
||||||
url: apiPrefix + "/dict",
|
|
||||||
method: "post",
|
|
||||||
});
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,113 +0,0 @@
|
|||||||
import { CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, UserPageQuery, UserPageRes, dict } from "@fast-crud/fast-crud";
|
|
||||||
import { useI18n } from "/src/locales";
|
|
||||||
import { useDicts } from "../dicts";
|
|
||||||
|
|
||||||
const typeDict = dict({
|
|
||||||
url: "/pi/audit/dict",
|
|
||||||
getData: async () => {
|
|
||||||
const { createAuditApi } = await import("./api");
|
|
||||||
const api = createAuditApi();
|
|
||||||
const res = await api.GetDict();
|
|
||||||
return res.types || [];
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const actionDict = dict({
|
|
||||||
url: "/pi/audit/dict",
|
|
||||||
getData: async () => {
|
|
||||||
const { createAuditApi } = await import("./api");
|
|
||||||
const api = createAuditApi();
|
|
||||||
const res = await api.GetDict();
|
|
||||||
return res.actions || [];
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
|
|
||||||
const { t } = useI18n();
|
|
||||||
const { myProjectDict } = useDicts();
|
|
||||||
const api = context.api;
|
|
||||||
|
|
||||||
const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
|
|
||||||
return await api.GetList(query);
|
|
||||||
};
|
|
||||||
const delRequest = async (req: DelReq) => {
|
|
||||||
return await api.DelObj(req.row.id);
|
|
||||||
};
|
|
||||||
|
|
||||||
return {
|
|
||||||
crudOptions: {
|
|
||||||
request: { pageRequest, delRequest },
|
|
||||||
actionbar: {
|
|
||||||
buttons: {
|
|
||||||
add: { show: false },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
rowHandle: {
|
|
||||||
width: 120,
|
|
||||||
fixed: "right",
|
|
||||||
buttons: {
|
|
||||||
view: { show: false },
|
|
||||||
edit: { show: false },
|
|
||||||
remove: { show: true },
|
|
||||||
copy: { show: false },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
columns: {
|
|
||||||
id: {
|
|
||||||
title: "ID",
|
|
||||||
type: "number",
|
|
||||||
column: { width: 80 },
|
|
||||||
form: { show: false },
|
|
||||||
},
|
|
||||||
createTime: {
|
|
||||||
title: "操作时间",
|
|
||||||
type: "datetime",
|
|
||||||
search: {
|
|
||||||
show: true,
|
|
||||||
component: {
|
|
||||||
name: "a-range-picker",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
column: { width: 170, sorter: true },
|
|
||||||
form: { show: false },
|
|
||||||
},
|
|
||||||
type: {
|
|
||||||
title: "操作类型",
|
|
||||||
type: "dict-select",
|
|
||||||
dict: typeDict,
|
|
||||||
search: { show: true },
|
|
||||||
column: { width: 120 },
|
|
||||||
form: { show: false },
|
|
||||||
},
|
|
||||||
action: {
|
|
||||||
title: "操作动作",
|
|
||||||
type: "text",
|
|
||||||
search: { show: true },
|
|
||||||
column: { width: 200, tooltip: true },
|
|
||||||
form: { show: false },
|
|
||||||
},
|
|
||||||
content: {
|
|
||||||
title: "备注",
|
|
||||||
type: "text",
|
|
||||||
search: { show: true },
|
|
||||||
column: { width: 700, tooltip: true },
|
|
||||||
form: { show: false },
|
|
||||||
},
|
|
||||||
ipAddress: {
|
|
||||||
title: "IP地址",
|
|
||||||
type: "text",
|
|
||||||
column: { width: 140 },
|
|
||||||
form: { show: false },
|
|
||||||
},
|
|
||||||
projectId: {
|
|
||||||
title: t("certd.fields.projectName"),
|
|
||||||
type: "dict-select",
|
|
||||||
dict: myProjectDict,
|
|
||||||
form: {
|
|
||||||
show: false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
<template>
|
|
||||||
<fs-page>
|
|
||||||
<template #header>
|
|
||||||
<div class="title">
|
|
||||||
操作日志
|
|
||||||
<span class="sub">查看您的操作记录</span>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<fs-crud ref="crudRef" v-bind="crudBinding" />
|
|
||||||
</fs-page>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts" setup>
|
|
||||||
import { useFs } from "@fast-crud/fast-crud";
|
|
||||||
import createCrudOptions from "./crud";
|
|
||||||
import { createAuditApi } from "./api";
|
|
||||||
import { useMounted } from "/@/use/use-mounted";
|
|
||||||
|
|
||||||
defineOptions({ name: "AuditLog" });
|
|
||||||
|
|
||||||
const api = createAuditApi();
|
|
||||||
const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api } });
|
|
||||||
useMounted(() => crudExpose.doRefresh());
|
|
||||||
</script>
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
import { request } from "/src/api/service";
|
|
||||||
|
|
||||||
const apiPrefix = "/sys/audit";
|
|
||||||
|
|
||||||
export function createSysAuditApi() {
|
|
||||||
return {
|
|
||||||
async GetList(query: any) {
|
|
||||||
return await request({
|
|
||||||
url: apiPrefix + "/page",
|
|
||||||
method: "post",
|
|
||||||
data: query,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
async DelObj(id: number) {
|
|
||||||
return await request({
|
|
||||||
url: apiPrefix + "/delete",
|
|
||||||
method: "post",
|
|
||||||
params: { id },
|
|
||||||
});
|
|
||||||
},
|
|
||||||
async Clean(retentionDays: number) {
|
|
||||||
return await request({
|
|
||||||
url: apiPrefix + "/clean",
|
|
||||||
method: "post",
|
|
||||||
data: { retentionDays },
|
|
||||||
});
|
|
||||||
},
|
|
||||||
async GetDict() {
|
|
||||||
return await request({
|
|
||||||
url: apiPrefix + "/dict",
|
|
||||||
method: "post",
|
|
||||||
});
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,167 +0,0 @@
|
|||||||
import { CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, UserPageQuery, UserPageRes, dict } from "@fast-crud/fast-crud";
|
|
||||||
import { Modal } from "ant-design-vue";
|
|
||||||
import { useI18n } from "/src/locales";
|
|
||||||
import { useDicts } from "/@/views/certd/dicts";
|
|
||||||
|
|
||||||
const typeDict = dict({
|
|
||||||
url: "/sys/audit/dict",
|
|
||||||
getData: async () => {
|
|
||||||
const { createSysAuditApi } = await import("./api");
|
|
||||||
const api = createSysAuditApi();
|
|
||||||
const res = await api.GetDict();
|
|
||||||
return res.types || [];
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const actionDict = dict({
|
|
||||||
url: "/sys/audit/dict",
|
|
||||||
getData: async () => {
|
|
||||||
const { createSysAuditApi } = await import("./api");
|
|
||||||
const api = createSysAuditApi();
|
|
||||||
const res = await api.GetDict();
|
|
||||||
return res.actions || [];
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
|
|
||||||
const { t } = useI18n();
|
|
||||||
const { myProjectDict } = useDicts();
|
|
||||||
const api = context.api;
|
|
||||||
|
|
||||||
const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
|
|
||||||
return await api.GetList(query);
|
|
||||||
};
|
|
||||||
const delRequest = async (req: DelReq) => {
|
|
||||||
return await api.DelObj(req.row.id);
|
|
||||||
};
|
|
||||||
|
|
||||||
const cleanExpired = async () => {
|
|
||||||
Modal.confirm({
|
|
||||||
title: "确认清理",
|
|
||||||
content: "确定要清理90天前的审计日志吗?此操作不可撤销。",
|
|
||||||
okText: "确认清理",
|
|
||||||
okType: "danger",
|
|
||||||
cancelText: "取消",
|
|
||||||
async onOk() {
|
|
||||||
await api.Clean(90);
|
|
||||||
crudExpose.doRefresh();
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
return {
|
|
||||||
crudOptions: {
|
|
||||||
request: { pageRequest, delRequest },
|
|
||||||
tabs: {
|
|
||||||
name: "scope",
|
|
||||||
show: true,
|
|
||||||
dict: {
|
|
||||||
data: [
|
|
||||||
{ value: "system", label: "系统级", color: "red" },
|
|
||||||
{ value: "user", label: "用户级", color: "blue" },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
actionbar: {
|
|
||||||
buttons: {
|
|
||||||
add: { show: false },
|
|
||||||
clean: {
|
|
||||||
text: "清理过期日志(90天)",
|
|
||||||
type: "primary",
|
|
||||||
danger: true,
|
|
||||||
click: cleanExpired,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
rowHandle: {
|
|
||||||
width: 120,
|
|
||||||
fixed: "right",
|
|
||||||
buttons: {
|
|
||||||
view: { show: false },
|
|
||||||
edit: { show: false },
|
|
||||||
remove: { show: true },
|
|
||||||
copy: { show: false },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
search: {
|
|
||||||
initialForm: { scope: "system" },
|
|
||||||
},
|
|
||||||
columns: {
|
|
||||||
id: {
|
|
||||||
title: "ID",
|
|
||||||
type: "number",
|
|
||||||
column: { width: 80 },
|
|
||||||
form: { show: false },
|
|
||||||
},
|
|
||||||
createTime: {
|
|
||||||
title: "操作时间",
|
|
||||||
type: "datetime",
|
|
||||||
search: {
|
|
||||||
show: true,
|
|
||||||
component: {
|
|
||||||
name: "a-range-picker",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
column: { width: 170, sorter: true },
|
|
||||||
form: { show: false },
|
|
||||||
},
|
|
||||||
username: {
|
|
||||||
title: "操作人",
|
|
||||||
type: "text",
|
|
||||||
search: { show: true },
|
|
||||||
column: { width: 120 },
|
|
||||||
form: { show: false },
|
|
||||||
},
|
|
||||||
type: {
|
|
||||||
title: "类型",
|
|
||||||
type: "dict-select",
|
|
||||||
dict: typeDict,
|
|
||||||
search: { show: true },
|
|
||||||
column: { width: 120 },
|
|
||||||
form: { show: false },
|
|
||||||
},
|
|
||||||
action: {
|
|
||||||
title: "操作",
|
|
||||||
type: "text",
|
|
||||||
search: { show: true },
|
|
||||||
column: { width: 200, tooltip: true },
|
|
||||||
form: { show: false },
|
|
||||||
},
|
|
||||||
content: {
|
|
||||||
title: "备注",
|
|
||||||
type: "text",
|
|
||||||
search: { show: true },
|
|
||||||
column: { width: 500, tooltip: true },
|
|
||||||
form: { show: false },
|
|
||||||
},
|
|
||||||
ipAddress: {
|
|
||||||
title: "IP地址",
|
|
||||||
type: "text",
|
|
||||||
column: { width: 140 },
|
|
||||||
form: { show: false },
|
|
||||||
},
|
|
||||||
projectId: {
|
|
||||||
title: t("certd.fields.projectName"),
|
|
||||||
type: "dict-select",
|
|
||||||
dict: myProjectDict,
|
|
||||||
form: {
|
|
||||||
show: false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
scope: {
|
|
||||||
title: "范围",
|
|
||||||
type: "dict-select",
|
|
||||||
dict: dict({
|
|
||||||
data: [
|
|
||||||
{ value: "system", label: "系统级", color: "blue" },
|
|
||||||
{ value: "user", label: "用户级", color: "green" },
|
|
||||||
],
|
|
||||||
}),
|
|
||||||
search: { show: true },
|
|
||||||
column: { width: 100 },
|
|
||||||
form: { show: false },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
<template>
|
|
||||||
<fs-page>
|
|
||||||
<template #header>
|
|
||||||
<div class="title">
|
|
||||||
操作日志
|
|
||||||
<span class="sub">查看所有用户的操作记录</span>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<fs-crud ref="crudRef" v-bind="crudBinding" />
|
|
||||||
</fs-page>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts" setup>
|
|
||||||
import { useFs } from "@fast-crud/fast-crud";
|
|
||||||
import createCrudOptions from "./crud";
|
|
||||||
import { createSysAuditApi } from "./api";
|
|
||||||
import { useMounted } from "/@/use/use-mounted";
|
|
||||||
|
|
||||||
defineOptions({ name: "SysAuditLog" });
|
|
||||||
|
|
||||||
const api = createSysAuditApi();
|
|
||||||
const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api } });
|
|
||||||
useMounted(() => crudExpose.doRefresh());
|
|
||||||
</script>
|
|
||||||
@@ -3,6 +3,14 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复火山引擎查不到自定义源站域名的问题 ([02dabe1](https://github.com/certd/certd/commit/02dabe11db3e9b13ca4621ce9ddd2b808bfca390))
|
||||||
|
* 修复火山引擎自定义源站域名查询不到的问题 ([e44bf9d](https://github.com/certd/certd/commit/e44bf9d77375d48ac7fd1582e69fae02dfd248fa))
|
||||||
|
* **pipeline:** 重构运行时依赖加载逻辑,修复火山引擎DNS解析报runtimeDepsService未初始化的bug ([ec69b8f](https://github.com/certd/certd/commit/ec69b8f11bfd4b20991aef74a72a47182ca79a9d))
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
ALTER TABLE `cd_audit_log` ADD COLUMN `scope` varchar(32) NOT NULL DEFAULT 'user';
|
|
||||||
CREATE INDEX `index_audit_log_scope` ON `cd_audit_log` (`scope`);
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
ALTER TABLE "cd_audit_log" ADD COLUMN "scope" varchar(32) NOT NULL DEFAULT ('user');
|
|
||||||
CREATE INDEX "index_audit_log_scope" ON "cd_audit_log" ("scope");
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
ALTER TABLE "cd_audit_log" ADD COLUMN "scope" varchar(32) NOT NULL DEFAULT ('user');
|
|
||||||
CREATE INDEX "index_audit_log_scope" ON "cd_audit_log" ("scope");
|
|
||||||
@@ -96,24 +96,11 @@ input:
|
|||||||
label: 点播加速域名
|
label: 点播加速域名
|
||||||
- value: image
|
- value: image
|
||||||
label: 封面加速域名
|
label: 封面加速域名
|
||||||
|
- value: third
|
||||||
|
label: 自定义源站
|
||||||
value: play
|
value: play
|
||||||
required: true
|
required: true
|
||||||
order: 0
|
order: 0
|
||||||
sourceStationType:
|
|
||||||
title: 源站类型
|
|
||||||
helper: 选择源站类型
|
|
||||||
value: 1
|
|
||||||
component:
|
|
||||||
name: a-select
|
|
||||||
vModel: value
|
|
||||||
options:
|
|
||||||
- value: 1
|
|
||||||
label: 点播源站
|
|
||||||
- value: 2
|
|
||||||
label: 自定义源站
|
|
||||||
helper: 注意:封面加速域名不支持自定义源站
|
|
||||||
required: false
|
|
||||||
order: 0
|
|
||||||
domainList:
|
domainList:
|
||||||
title: 域名
|
title: 域名
|
||||||
component:
|
component:
|
||||||
@@ -132,7 +119,6 @@ input:
|
|||||||
- accessId
|
- accessId
|
||||||
- spaceName
|
- spaceName
|
||||||
- domainType
|
- domainType
|
||||||
- sourceStationType
|
|
||||||
required: true
|
required: true
|
||||||
mergeScript: |2-
|
mergeScript: |2-
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/ui-server",
|
"name": "@certd/ui-server",
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"description": "fast-server base midway",
|
"description": "fast-server base midway",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -41,20 +41,20 @@
|
|||||||
"lint1": "eslint --fix"
|
"lint1": "eslint --fix"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/acme-client": "^1.42.3",
|
"@certd/acme-client": "^1.42.4",
|
||||||
"@certd/basic": "^1.42.3",
|
"@certd/basic": "^1.42.4",
|
||||||
"@certd/commercial-core": "^1.42.3",
|
"@certd/commercial-core": "^1.42.4",
|
||||||
"@certd/cv4pve-api-javascript": "^8.4.2",
|
"@certd/cv4pve-api-javascript": "^8.4.2",
|
||||||
"@certd/jdcloud": "^1.42.3",
|
"@certd/jdcloud": "^1.42.4",
|
||||||
"@certd/lib-huawei": "^1.42.3",
|
"@certd/lib-huawei": "^1.42.4",
|
||||||
"@certd/lib-k8s": "^1.42.3",
|
"@certd/lib-k8s": "^1.42.4",
|
||||||
"@certd/lib-server": "^1.42.3",
|
"@certd/lib-server": "^1.42.4",
|
||||||
"@certd/midway-flyway-js": "^1.42.3",
|
"@certd/midway-flyway-js": "^1.42.4",
|
||||||
"@certd/pipeline": "^1.42.3",
|
"@certd/pipeline": "^1.42.4",
|
||||||
"@certd/plugin-cert": "^1.42.3",
|
"@certd/plugin-cert": "^1.42.4",
|
||||||
"@certd/plugin-lib": "^1.42.3",
|
"@certd/plugin-lib": "^1.42.4",
|
||||||
"@certd/plugin-plus": "^1.42.3",
|
"@certd/plugin-plus": "^1.42.4",
|
||||||
"@certd/plus-core": "^1.42.3",
|
"@certd/plus-core": "^1.42.4",
|
||||||
"@koa/cors": "^5.0.0",
|
"@koa/cors": "^5.0.0",
|
||||||
"@midwayjs/bootstrap": "3.20.11",
|
"@midwayjs/bootstrap": "3.20.11",
|
||||||
"@midwayjs/cache": "3.14.0",
|
"@midwayjs/cache": "3.14.0",
|
||||||
@@ -71,7 +71,6 @@
|
|||||||
"@peculiar/x509": "^1.11.0",
|
"@peculiar/x509": "^1.11.0",
|
||||||
"@simplewebauthn/browser": "^13.2.2",
|
"@simplewebauthn/browser": "^13.2.2",
|
||||||
"@simplewebauthn/server": "^13.2.3",
|
"@simplewebauthn/server": "^13.2.3",
|
||||||
"alipay-sdk": "^4.13.0",
|
|
||||||
"axios": "^1.9.0",
|
"axios": "^1.9.0",
|
||||||
"bcryptjs": "^2.4.3",
|
"bcryptjs": "^2.4.3",
|
||||||
"better-sqlite3": "^11.1.2",
|
"better-sqlite3": "^11.1.2",
|
||||||
@@ -96,8 +95,6 @@
|
|||||||
"nanoid": "^5.0.7",
|
"nanoid": "^5.0.7",
|
||||||
"node-forge": "^1.3.1",
|
"node-forge": "^1.3.1",
|
||||||
"nodemailer": "^6.9.16",
|
"nodemailer": "^6.9.16",
|
||||||
"openid-client": "^6.8.1",
|
|
||||||
"otplib": "^12.0.1",
|
|
||||||
"pg": "^8.12.0",
|
"pg": "^8.12.0",
|
||||||
"psl": "^1.15.0",
|
"psl": "^1.15.0",
|
||||||
"punycode.js": "^2.3.1",
|
"punycode.js": "^2.3.1",
|
||||||
@@ -113,7 +110,6 @@
|
|||||||
"svg-captcha": "^1.4.0",
|
"svg-captcha": "^1.4.0",
|
||||||
"typeorm": "^0.3.20",
|
"typeorm": "^0.3.20",
|
||||||
"uuid": "^10.0.0",
|
"uuid": "^10.0.0",
|
||||||
"wechatpay-node-v3": "^2.2.1",
|
|
||||||
"whoiser": "2.0.0-beta.10",
|
"whoiser": "2.0.0-beta.10",
|
||||||
"xml2js": "^0.6.2"
|
"xml2js": "^0.6.2"
|
||||||
},
|
},
|
||||||
@@ -170,7 +166,11 @@
|
|||||||
"@google-cloud/publicca": "^1.3.0",
|
"@google-cloud/publicca": "^1.3.0",
|
||||||
"basic-ftp": "^5.0.5",
|
"basic-ftp": "^5.0.5",
|
||||||
"esdk-obs-nodejs": "^3.25.6",
|
"esdk-obs-nodejs": "^3.25.6",
|
||||||
"qiniu": "^7.12.0"
|
"qiniu": "^7.12.0",
|
||||||
|
"alipay-sdk": "^4.13.0",
|
||||||
|
"wechatpay-node-v3": "^2.2.1",
|
||||||
|
"openid-client": "^6.8.1",
|
||||||
|
"otplib": "^12.0.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=20.0.0"
|
"node": ">=20.0.0"
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import cors from "@koa/cors";
|
|||||||
import { GlobalExceptionMiddleware } from "./middleware/global-exception.js";
|
import { GlobalExceptionMiddleware } from "./middleware/global-exception.js";
|
||||||
import { PreviewMiddleware } from "./middleware/preview.js";
|
import { PreviewMiddleware } from "./middleware/preview.js";
|
||||||
import { AuthorityMiddleware } from "./middleware/authority.js";
|
import { AuthorityMiddleware } from "./middleware/authority.js";
|
||||||
import { AuditLogMiddleware } from "./middleware/audit-log.js";
|
|
||||||
import { logger } from "@certd/basic";
|
import { logger } from "@certd/basic";
|
||||||
import { ResetPasswdMiddleware } from "./middleware/reset-passwd/middleware.js";
|
import { ResetPasswdMiddleware } from "./middleware/reset-passwd/middleware.js";
|
||||||
import DefaultConfig from "./config/config.default.js";
|
import DefaultConfig from "./config/config.default.js";
|
||||||
@@ -114,7 +113,6 @@ export class MainConfiguration {
|
|||||||
PreviewMiddleware,
|
PreviewMiddleware,
|
||||||
//授权处理
|
//授权处理
|
||||||
AuthorityMiddleware,
|
AuthorityMiddleware,
|
||||||
AuditLogMiddleware,
|
|
||||||
|
|
||||||
//resetPasswd,重置密码模式下不提供服务
|
//resetPasswd,重置密码模式下不提供服务
|
||||||
ResetPasswdMiddleware,
|
ResetPasswdMiddleware,
|
||||||
@@ -134,6 +132,5 @@ export class MainConfiguration {
|
|||||||
logger.info(text);
|
logger.info(text);
|
||||||
});
|
});
|
||||||
logger.info("当前环境:", this.app.getEnv()); // prod
|
logger.info("当前环境:", this.app.getEnv()); // prod
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
import { ALL, Body, Controller, Inject, Post, Provide } from "@midwayjs/core";
|
import { ALL, Body, Controller, Inject, Post, Provide } from "@midwayjs/core";
|
||||||
import { BaseController, CommonException, Constants, SysSettingsService } from "@certd/lib-server";
|
import { BaseController, CommonException, Constants, SysSettingsService } from "@certd/lib-server";
|
||||||
import { CodeService } from "../../../modules/basic/service/code-service.js";
|
import { CodeService } from "../../../modules/basic/service/code-service.js";
|
||||||
import { UserService } from "../../../modules/sys/authority/service/user-service.js";
|
import { UserService } from "../../../modules/sys/authority/service/user-service.js";
|
||||||
import { LoginService } from "../../../modules/login/service/login-service.js";
|
import { LoginService } from "../../../modules/login/service/login-service.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -20,11 +19,7 @@ export class ForgotPasswordController extends BaseController {
|
|||||||
@Inject()
|
@Inject()
|
||||||
sysSettingsService: SysSettingsService;
|
sysSettingsService: SysSettingsService;
|
||||||
|
|
||||||
getAuditType(): string {
|
@Post("/forgotPassword", { description: Constants.per.guest })
|
||||||
return AuditType.login;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/forgotPassword", { description: Constants.per.guest, summary: "找回密码" })
|
|
||||||
public async forgotPassword(
|
public async forgotPassword(
|
||||||
@Body(ALL)
|
@Body(ALL)
|
||||||
body: any
|
body: any
|
||||||
@@ -33,13 +28,15 @@ export class ForgotPasswordController extends BaseController {
|
|||||||
if (!sysSettings.selfServicePasswordRetrievalEnabled) {
|
if (!sysSettings.selfServicePasswordRetrievalEnabled) {
|
||||||
throw new CommonException("暂未开启自助找回");
|
throw new CommonException("暂未开启自助找回");
|
||||||
}
|
}
|
||||||
|
// 找回密码的验证码允许错误次数
|
||||||
|
const maxErrorCount = 5;
|
||||||
|
|
||||||
if (body.type === "email") {
|
if (body.type === "email") {
|
||||||
this.codeService.checkEmailCode({
|
this.codeService.checkEmailCode({
|
||||||
verificationType: "forgotPassword",
|
verificationType: "forgotPassword",
|
||||||
email: body.input,
|
email: body.input,
|
||||||
validateCode: body.validateCode,
|
validateCode: body.validateCode,
|
||||||
maxErrorCount: 5,
|
maxErrorCount: maxErrorCount,
|
||||||
throwError: true,
|
throwError: true,
|
||||||
});
|
});
|
||||||
} else if (body.type === "mobile") {
|
} else if (body.type === "mobile") {
|
||||||
@@ -48,15 +45,14 @@ export class ForgotPasswordController extends BaseController {
|
|||||||
mobile: body.input,
|
mobile: body.input,
|
||||||
phoneCode: body.phoneCode,
|
phoneCode: body.phoneCode,
|
||||||
smsCode: body.validateCode,
|
smsCode: body.validateCode,
|
||||||
maxErrorCount: 5,
|
maxErrorCount: maxErrorCount,
|
||||||
throwError: true,
|
throwError: true,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
throw new CommonException("暂不支持的找回类型,请联系管理员找回");
|
throw new CommonException("暂不支持的找回类型,请联系管理员找回");
|
||||||
}
|
}
|
||||||
const {id,username} = await this.userService.forgotPassword(body);
|
const username = await this.userService.forgotPassword(body);
|
||||||
username && this.loginService.clearCacheOnSuccess(username);
|
username && this.loginService.clearCacheOnSuccess(username);
|
||||||
this.auditLog({ userId: id, content: "用户请求找回密码" });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
import { ALL, Body, Controller, Inject, Post, Provide, RequestIP } from "@midwayjs/core";
|
import { ALL, Body, Controller, Inject, Post, Provide, RequestIP } from "@midwayjs/core";
|
||||||
import { LoginService } from "../../../modules/login/service/login-service.js";
|
import { LoginService } from "../../../modules/login/service/login-service.js";
|
||||||
import { AddonService, BaseController, Constants, SysPublicSettings, SysSettingsService } from "@certd/lib-server";
|
import { AddonService, BaseController, Constants, SysPublicSettings, SysSettingsService } from "@certd/lib-server";
|
||||||
import { CodeService } from "../../../modules/basic/service/code-service.js";
|
import { CodeService } from "../../../modules/basic/service/code-service.js";
|
||||||
import { checkComm } from "@certd/plus-core";
|
import { checkComm } from "@certd/plus-core";
|
||||||
import { CaptchaService } from "../../../modules/basic/service/captcha-service.js";
|
import { CaptchaService } from "../../../modules/basic/service/captcha-service.js";
|
||||||
import { PasskeyService } from "../../../modules/login/service/passkey-service.js";
|
import { PasskeyService } from "../../../modules/login/service/passkey-service.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -28,11 +27,7 @@ export class LoginController extends BaseController {
|
|||||||
@Inject()
|
@Inject()
|
||||||
passkeyService: PasskeyService;
|
passkeyService: PasskeyService;
|
||||||
|
|
||||||
getAuditType(): string {
|
@Post("/login", { description: Constants.per.guest })
|
||||||
return AuditType.login;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/login", { description: Constants.per.guest, summary: "用户名密码登录" })
|
|
||||||
public async login(
|
public async login(
|
||||||
@Body(ALL)
|
@Body(ALL)
|
||||||
body: any,
|
body: any,
|
||||||
@@ -43,22 +38,16 @@ export class LoginController extends BaseController {
|
|||||||
if (settings.captchaEnabled === true) {
|
if (settings.captchaEnabled === true) {
|
||||||
await this.captchaService.doValidate({ form: body.captcha, must: false, captchaAddonId: settings.captchaAddonId, req: { remoteIp } });
|
await this.captchaService.doValidate({ form: body.captcha, must: false, captchaAddonId: settings.captchaAddonId, req: { remoteIp } });
|
||||||
}
|
}
|
||||||
try {
|
|
||||||
const token = await this.loginService.loginByPassword(body);
|
const token = await this.loginService.loginByPassword(body);
|
||||||
this.writeTokenCookie(token);
|
this.writeTokenCookie(token);
|
||||||
this.auditLog({ userId: token.userId, username: body.username, content: `用户「${body.username}」登录成功` });
|
|
||||||
return this.ok(token);
|
return this.ok(token);
|
||||||
} catch (err:any) {
|
|
||||||
this.auditLog({userId:err.userId, username: body.username, content: `用户「${body.username}」登录失败` });
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private writeTokenCookie(token: { expire: any; token: any }) {
|
private writeTokenCookie(token: { expire: any; token: any }) {
|
||||||
// this.loginService.writeTokenCookie(this.ctx,token);
|
// this.loginService.writeTokenCookie(this.ctx,token);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/loginBySms", { description: Constants.per.guest, summary: "短信验证码登录" })
|
@Post("/loginBySms", { description: Constants.per.guest })
|
||||||
public async loginBySms(
|
public async loginBySms(
|
||||||
@Body(ALL)
|
@Body(ALL)
|
||||||
body: any
|
body: any
|
||||||
@@ -69,7 +58,6 @@ export class LoginController extends BaseController {
|
|||||||
}
|
}
|
||||||
checkComm();
|
checkComm();
|
||||||
|
|
||||||
try {
|
|
||||||
const token = await this.loginService.loginBySmsCode({
|
const token = await this.loginService.loginBySmsCode({
|
||||||
phoneCode: body.phoneCode,
|
phoneCode: body.phoneCode,
|
||||||
mobile: body.mobile,
|
mobile: body.mobile,
|
||||||
@@ -79,32 +67,22 @@ export class LoginController extends BaseController {
|
|||||||
});
|
});
|
||||||
|
|
||||||
this.writeTokenCookie(token);
|
this.writeTokenCookie(token);
|
||||||
this.auditLog({ userId: token.userId, username: body.mobile, content: `用户「${body.mobile}」短信登录成功` });
|
|
||||||
return this.ok(token);
|
return this.ok(token);
|
||||||
} catch (err) {
|
|
||||||
this.auditLog({ userId: err.userId, username: body.mobile, content: `用户「${body.mobile}」短信登录失败` });
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/loginByTwoFactor", { description: Constants.per.guest, summary: "两步验证登录" })
|
@Post("/loginByTwoFactor", { description: Constants.per.guest })
|
||||||
public async loginByTwoFactor(
|
public async loginByTwoFactor(
|
||||||
@Body(ALL)
|
@Body(ALL)
|
||||||
body: any
|
body: any
|
||||||
) {
|
) {
|
||||||
try {
|
|
||||||
const token = await this.loginService.loginByTwoFactor({
|
const token = await this.loginService.loginByTwoFactor({
|
||||||
loginId: body.loginId,
|
loginId: body.loginId,
|
||||||
verifyCode: body.verifyCode,
|
verifyCode: body.verifyCode,
|
||||||
});
|
});
|
||||||
|
|
||||||
this.writeTokenCookie(token);
|
this.writeTokenCookie(token);
|
||||||
this.auditLog({ userId: token.userId, username: body.loginId, content: `用户「${body.loginId}」两步验证登录成功` });
|
|
||||||
return this.ok(token);
|
return this.ok(token);
|
||||||
} catch (err) {
|
|
||||||
this.auditLog({ userId: err.userId, username: body.loginId, content: `用户「${body.loginId}」两步验证登录失败` });
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/passkey/generateAuthentication", { description: Constants.per.guest })
|
@Post("/passkey/generateAuthentication", { description: Constants.per.guest })
|
||||||
@@ -114,12 +92,11 @@ export class LoginController extends BaseController {
|
|||||||
return this.ok(options);
|
return this.ok(options);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/loginByPasskey", { description: Constants.per.guest, summary: "Passkey登录" })
|
@Post("/loginByPasskey", { description: Constants.per.guest })
|
||||||
public async loginByPasskey(
|
public async loginByPasskey(
|
||||||
@Body(ALL)
|
@Body(ALL)
|
||||||
body: any
|
body: any
|
||||||
) {
|
) {
|
||||||
try {
|
|
||||||
const credential = body.credential;
|
const credential = body.credential;
|
||||||
const challenge = body.challenge;
|
const challenge = body.challenge;
|
||||||
|
|
||||||
@@ -131,13 +108,8 @@ export class LoginController extends BaseController {
|
|||||||
this.ctx
|
this.ctx
|
||||||
);
|
);
|
||||||
|
|
||||||
this.writeTokenCookie(token);
|
// this.writeTokenCookie(token);
|
||||||
this.auditLog({ userId: token.userId, content: "用户Passkey登录成功" });
|
|
||||||
return this.ok(token);
|
return this.ok(token);
|
||||||
} catch (err) {
|
|
||||||
this.auditLog({ userId: err.userId, content: "用户Passkey登录失败" });
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/logout", { description: Constants.per.authOnly })
|
@Post("/logout", { description: Constants.per.authOnly })
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { logger, simpleNanoId, utils } from "@certd/basic";
|
import { logger, simpleNanoId, utils } from "@certd/basic";
|
||||||
import { addonRegistry, AddonService, BaseController, Constants, SysInstallInfo, SysSettingsService } from "@certd/lib-server";
|
import { addonRegistry, AddonService, BaseController, Constants, SysInstallInfo, SysSettingsService } from "@certd/lib-server";
|
||||||
import { checkPlus } from "@certd/plus-core";
|
import { checkPlus } from "@certd/plus-core";
|
||||||
import { ALL, Body, Controller, Get, Inject, Param, Post, Provide, Query } from "@midwayjs/core";
|
import { ALL, Body, Controller, Get, Inject, Param, Post, Provide, Query } from "@midwayjs/core";
|
||||||
@@ -8,7 +8,6 @@ import { LoginService } from "../../../modules/login/service/login-service.js";
|
|||||||
import { OauthBoundService } from "../../../modules/login/service/oauth-bound-service.js";
|
import { OauthBoundService } from "../../../modules/login/service/oauth-bound-service.js";
|
||||||
import { AddonGetterService } from "../../../modules/pipeline/service/addon-getter-service.js";
|
import { AddonGetterService } from "../../../modules/pipeline/service/addon-getter-service.js";
|
||||||
import { UserEntity } from "../../../modules/sys/authority/entity/user.js";
|
import { UserEntity } from "../../../modules/sys/authority/entity/user.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
import { IOauthProvider } from "../../../plugins/plugin-oauth/api.js";
|
import { IOauthProvider } from "../../../plugins/plugin-oauth/api.js";
|
||||||
|
|
||||||
type OauthProviderSetting = {
|
type OauthProviderSetting = {
|
||||||
@@ -49,10 +48,6 @@ export class ConnectController extends BaseController {
|
|||||||
@Inject()
|
@Inject()
|
||||||
addonService: AddonService;
|
addonService: AddonService;
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.login;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async getOauthProvider(type: string) {
|
private async getOauthProvider(type: string) {
|
||||||
const publicSettings = await this.sysSettingsService.getPublicSettings();
|
const publicSettings = await this.sysSettingsService.getPublicSettings();
|
||||||
if (!publicSettings?.oauthEnabled) {
|
if (!publicSettings?.oauthEnabled) {
|
||||||
@@ -73,11 +68,12 @@ export class ConnectController extends BaseController {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/login", { description: Constants.per.guest, summary: "第三方登录" })
|
@Post("/login", { description: Constants.per.guest })
|
||||||
public async login(@Body(ALL) body: { type: string; subtype?: string; forType?: string; from?: string }) {
|
public async login(@Body(ALL) body: { type: string; subtype?: string; forType?: string; from?: string }) {
|
||||||
const oauthProvider = await this.getOauthProvider(body.type);
|
const oauthProvider = await this.getOauthProvider(body.type);
|
||||||
const installInfo = await this.sysSettingsService.getSetting<SysInstallInfo>(SysInstallInfo);
|
const installInfo = await this.sysSettingsService.getSetting<SysInstallInfo>(SysInstallInfo);
|
||||||
const bindUrl = installInfo?.bindUrl || "";
|
const bindUrl = installInfo?.bindUrl || "";
|
||||||
|
//构造登录url
|
||||||
const redirectUrl = `${bindUrl}api/oauth/callback/${body.type}`;
|
const redirectUrl = `${bindUrl}api/oauth/callback/${body.type}`;
|
||||||
|
|
||||||
const stateObj = {
|
const stateObj = {
|
||||||
@@ -99,6 +95,8 @@ export class ConnectController extends BaseController {
|
|||||||
});
|
});
|
||||||
this.ctx.cookies.set("oauth_ticket", ticket, {
|
this.ctx.cookies.set("oauth_ticket", ticket, {
|
||||||
httpOnly: true,
|
httpOnly: true,
|
||||||
|
// secure: true,
|
||||||
|
// sameSite: "strict",
|
||||||
});
|
});
|
||||||
return this.ok({ loginUrl, ticket });
|
return this.ok({ loginUrl, ticket });
|
||||||
}
|
}
|
||||||
@@ -155,7 +153,7 @@ export class ConnectController extends BaseController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/getLogoutUrl", { description: Constants.per.guest, summary: "第三方登出" })
|
@Post("/getLogoutUrl", { description: Constants.per.guest })
|
||||||
public async logout(@Body(ALL) body: any) {
|
public async logout(@Body(ALL) body: any) {
|
||||||
checkPlus();
|
checkPlus();
|
||||||
const oauthProvider = await this.getOauthProvider(body.type);
|
const oauthProvider = await this.getOauthProvider(body.type);
|
||||||
@@ -197,7 +195,7 @@ export class ConnectController extends BaseController {
|
|||||||
// this.loginService.writeTokenCookie(this.ctx,token);
|
// this.loginService.writeTokenCookie(this.ctx,token);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/autoRegister", { description: Constants.per.guest, summary: "第三方自动注册" })
|
@Post("/autoRegister", { description: Constants.per.guest })
|
||||||
public async autoRegister(@Body(ALL) body: { validationCode: string; type: string; inviteCode?: string }) {
|
public async autoRegister(@Body(ALL) body: { validationCode: string; type: string; inviteCode?: string }) {
|
||||||
const validationValue = this.codeService.getValidationValue(body.validationCode);
|
const validationValue = this.codeService.getValidationValue(body.validationCode);
|
||||||
if (!validationValue) {
|
if (!validationValue) {
|
||||||
@@ -221,12 +219,12 @@ export class ConnectController extends BaseController {
|
|||||||
|
|
||||||
const loginRes = await this.loginService.generateToken(newUser);
|
const loginRes = await this.loginService.generateToken(newUser);
|
||||||
this.writeTokenCookie(loginRes);
|
this.writeTokenCookie(loginRes);
|
||||||
this.auditLog({ userId: newUser.id, content: `第三方账号自动注册,类型: ${body.type}` });
|
|
||||||
return this.ok(loginRes);
|
return this.ok(loginRes);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/bind", { description: Constants.per.loginOnly, summary: "绑定第三方账号" })
|
@Post("/bind", { description: Constants.per.loginOnly })
|
||||||
public async bind(@Body(ALL) body: any) {
|
public async bind(@Body(ALL) body: any) {
|
||||||
|
//需要已登录
|
||||||
const userId = this.getUserId();
|
const userId = this.getUserId();
|
||||||
const validationValue = this.codeService.getValidationValue(body.validationCode);
|
const validationValue = this.codeService.getValidationValue(body.validationCode);
|
||||||
if (!validationValue) {
|
if (!validationValue) {
|
||||||
@@ -240,18 +238,17 @@ export class ConnectController extends BaseController {
|
|||||||
type,
|
type,
|
||||||
openId,
|
openId,
|
||||||
});
|
});
|
||||||
this.auditLog({ userId, content: `第三方账号绑定,类型: ${body.type}` });
|
|
||||||
return this.ok(1);
|
return this.ok(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/unbind", { description: Constants.per.loginOnly, summary: "解绑第三方账号" })
|
@Post("/unbind", { description: Constants.per.loginOnly })
|
||||||
public async unbind(@Body(ALL) body: any) {
|
public async unbind(@Body(ALL) body: any) {
|
||||||
|
//需要已登录
|
||||||
const userId = this.getUserId();
|
const userId = this.getUserId();
|
||||||
await this.oauthBoundService.unbind({
|
await this.oauthBoundService.unbind({
|
||||||
userId,
|
userId,
|
||||||
type: body.type,
|
type: body.type,
|
||||||
});
|
});
|
||||||
this.auditLog({ userId, content: `第三方账号解绑,类型: ${body.type}` });
|
|
||||||
return this.ok(1);
|
return this.ok(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
import { ALL, Body, Controller, Inject, Post, Provide, RequestIP } from "@midwayjs/core";
|
import { ALL, Body, Controller, Inject, Post, Provide, RequestIP } from "@midwayjs/core";
|
||||||
import { BaseController, Constants, SysSettingsService } from "@certd/lib-server";
|
import { BaseController, Constants, SysSettingsService } from "@certd/lib-server";
|
||||||
import { RegisterType } from "../../../modules/sys/authority/service/user-service.js";
|
import { RegisterType } from "../../../modules/sys/authority/service/user-service.js";
|
||||||
import { CodeService } from "../../../modules/basic/service/code-service.js";
|
import { CodeService } from "../../../modules/basic/service/code-service.js";
|
||||||
import { checkComm, checkPlus } from "@certd/plus-core";
|
import { checkComm, checkPlus } from "@certd/plus-core";
|
||||||
import { LoginService } from "../../../modules/login/service/login-service.js";
|
import { LoginService } from "../../../modules/login/service/login-service.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
export type RegisterReq = {
|
export type RegisterReq = {
|
||||||
type: RegisterType;
|
type: RegisterType;
|
||||||
@@ -32,11 +31,7 @@ export class RegisterController extends BaseController {
|
|||||||
@Inject()
|
@Inject()
|
||||||
sysSettingsService: SysSettingsService;
|
sysSettingsService: SysSettingsService;
|
||||||
|
|
||||||
getAuditType(): string {
|
@Post("/register", { description: Constants.per.guest })
|
||||||
return AuditType.login;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/register", { description: Constants.per.guest, summary: "用户注册" })
|
|
||||||
public async register(
|
public async register(
|
||||||
@Body(ALL)
|
@Body(ALL)
|
||||||
body: RegisterReq,
|
body: RegisterReq,
|
||||||
@@ -65,7 +60,6 @@ export class RegisterController extends BaseController {
|
|||||||
password: body.password,
|
password: body.password,
|
||||||
} as any;
|
} as any;
|
||||||
const newUser = await this.loginService.register(body.type, registerUser, body.inviteCode);
|
const newUser = await this.loginService.register(body.type, registerUser, body.inviteCode);
|
||||||
this.auditLog({ userId: newUser.id, username: body.username, content: `用户「${body.username}」注册成功` });
|
|
||||||
return this.ok(newUser);
|
return this.ok(newUser);
|
||||||
} else if (body.type === "mobile") {
|
} else if (body.type === "mobile") {
|
||||||
if (sysPublicSettings.mobileRegisterEnabled === false) {
|
if (sysPublicSettings.mobileRegisterEnabled === false) {
|
||||||
@@ -86,7 +80,6 @@ export class RegisterController extends BaseController {
|
|||||||
password: body.password,
|
password: body.password,
|
||||||
} as any;
|
} as any;
|
||||||
const newUser = await this.loginService.register(body.type, registerUser, body.inviteCode);
|
const newUser = await this.loginService.register(body.type, registerUser, body.inviteCode);
|
||||||
this.auditLog({ userId: newUser.id, username: body.mobile, content: `用户「${body.mobile}」注册成功` });
|
|
||||||
return this.ok(newUser);
|
return this.ok(newUser);
|
||||||
} else if (body.type === "email") {
|
} else if (body.type === "email") {
|
||||||
if (sysPublicSettings.emailRegisterEnabled === false) {
|
if (sysPublicSettings.emailRegisterEnabled === false) {
|
||||||
@@ -104,7 +97,6 @@ export class RegisterController extends BaseController {
|
|||||||
password: body.password,
|
password: body.password,
|
||||||
} as any;
|
} as any;
|
||||||
const newUser = await this.loginService.register(body.type, registerUser, body.inviteCode);
|
const newUser = await this.loginService.register(body.type, registerUser, body.inviteCode);
|
||||||
this.auditLog({ userId: newUser.id, username: body.email, content: `用户「${body.email}」注册成功` });
|
|
||||||
return this.ok(newUser);
|
return this.ok(newUser);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import { ALL, Body, Controller, Inject, Post, Provide } from "@midwayjs/core";
|
import { ALL, Body, Controller, Inject, Post, Provide } from "@midwayjs/core";
|
||||||
import { BaseController, PlusService, SysInstallInfo, SysSettingsService } from "@certd/lib-server";
|
import { BaseController, PlusService, SysInstallInfo, SysSettingsService } from "@certd/lib-server";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
export type PreBindUserReq = {
|
export type PreBindUserReq = {
|
||||||
userId: number;
|
userId: number;
|
||||||
@@ -19,21 +18,17 @@ export class BasicController extends BaseController {
|
|||||||
@Inject()
|
@Inject()
|
||||||
sysSettingsService: SysSettingsService;
|
sysSettingsService: SysSettingsService;
|
||||||
|
|
||||||
getAuditType(): string {
|
@Post("/preBindUser", { description: "sys:settings:edit" })
|
||||||
return AuditType.account;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/preBindUser", { description: "sys:settings:edit", summary: "预绑定用户" })
|
|
||||||
public async preBindUser(@Body(ALL) body: PreBindUserReq) {
|
public async preBindUser(@Body(ALL) body: PreBindUserReq) {
|
||||||
|
// 设置缓存内容
|
||||||
if (body.userId == null || body.userId <= 0) {
|
if (body.userId == null || body.userId <= 0) {
|
||||||
throw new Error("用户ID不能为空");
|
throw new Error("用户ID不能为空");
|
||||||
}
|
}
|
||||||
await this.plusService.userPreBind(body.userId);
|
await this.plusService.userPreBind(body.userId);
|
||||||
await this.auditLog({ content: `预绑定了用户(ID:${body.userId})` });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/bindUser", { description: "sys:settings:edit", summary: "绑定用户" })
|
@Post("/bindUser", { description: "sys:settings:edit" })
|
||||||
public async bindUser(@Body(ALL) body: BindUserReq) {
|
public async bindUser(@Body(ALL) body: BindUserReq) {
|
||||||
if (body.userId == null || body.userId <= 0) {
|
if (body.userId == null || body.userId <= 0) {
|
||||||
throw new Error("用户ID不能为空");
|
throw new Error("用户ID不能为空");
|
||||||
@@ -41,23 +36,20 @@ export class BasicController extends BaseController {
|
|||||||
const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
|
const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
|
||||||
installInfo.bindUserId = body.userId;
|
installInfo.bindUserId = body.userId;
|
||||||
await this.sysSettingsService.saveSetting(installInfo);
|
await this.sysSettingsService.saveSetting(installInfo);
|
||||||
await this.auditLog({ content: `绑定了用户(ID:${body.userId})` });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/unbindUser", { description: "sys:settings:edit", summary: "解绑用户" })
|
@Post("/unbindUser", { description: "sys:settings:edit" })
|
||||||
public async unbindUser() {
|
public async unbindUser() {
|
||||||
const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
|
const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
|
||||||
installInfo.bindUserId = null;
|
installInfo.bindUserId = null;
|
||||||
await this.sysSettingsService.saveSetting(installInfo);
|
await this.sysSettingsService.saveSetting(installInfo);
|
||||||
await this.auditLog({ content: "解绑了用户" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/updateLicense", { description: "sys:settings:edit", summary: "更新许可证" })
|
@Post("/updateLicense", { description: "sys:settings:edit" })
|
||||||
public async updateLicense(@Body(ALL) body: { license: string }) {
|
public async updateLicense(@Body(ALL) body: { license: string }) {
|
||||||
await this.plusService.updateLicense(body.license);
|
await this.plusService.updateLicense(body.license);
|
||||||
await this.auditLog({ content: "更新了许可证" });
|
|
||||||
return this.ok(true);
|
return this.ok(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,42 +0,0 @@
|
|||||||
import { BaseController, Constants } from "@certd/lib-server";
|
|
||||||
import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
|
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
|
||||||
import { AuditService } from "../../../modules/sys/enterprise/service/audit-service.js";
|
|
||||||
import { buildAuditTypeDict, buildAuditActionDict } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
@Provide()
|
|
||||||
@ApiTags(["audit"])
|
|
||||||
@Controller("/api/sys/audit")
|
|
||||||
export class SysAuditLogController extends BaseController {
|
|
||||||
@Inject()
|
|
||||||
auditService: AuditService;
|
|
||||||
|
|
||||||
@Post("/page", { description: Constants.per.authOnly, summary: "分页查询审计日志" })
|
|
||||||
async page(@Body(ALL) body: any) {
|
|
||||||
if (body.query?.scope) {
|
|
||||||
delete body.query.userId;
|
|
||||||
}
|
|
||||||
const pageRet = await this.auditService.page(body);
|
|
||||||
return this.ok(pageRet);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/delete", { description: Constants.per.authOnly, summary: "删除审计日志" })
|
|
||||||
async delete(@Query("id") id: number) {
|
|
||||||
await this.auditService.delete([id]);
|
|
||||||
return this.ok({});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/clean", { description: Constants.per.authOnly, summary: "清理过期审计日志" })
|
|
||||||
async clean(@Body("retentionDays") retentionDays: number) {
|
|
||||||
const count = await this.auditService.cleanExpired(retentionDays || 90);
|
|
||||||
return this.ok({ deletedCount: count });
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/dict", { description: Constants.per.authOnly, summary: "获取审计类型和动作字典" })
|
|
||||||
async getDict() {
|
|
||||||
return this.ok({
|
|
||||||
types: buildAuditTypeDict(),
|
|
||||||
actions: buildAuditActionDict(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
|
import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
|
||||||
import { CrudController } from "@certd/lib-server";
|
import { CrudController } from "@certd/lib-server";
|
||||||
import { PermissionService } from "../../../modules/sys/authority/service/permission-service.js";
|
import { PermissionService } from "../../../modules/sys/authority/service/permission-service.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 权限资源
|
* 权限资源
|
||||||
@@ -15,11 +14,8 @@ export class PermissionController extends CrudController<PermissionService> {
|
|||||||
getService() {
|
getService() {
|
||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.permission;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: "sys:auth:per:view", summary: "查询权限分页列表" })
|
@Post("/page", { description: "sys:auth:per:view" })
|
||||||
async page(
|
async page(
|
||||||
@Body(ALL)
|
@Body(ALL)
|
||||||
body
|
body
|
||||||
@@ -27,42 +23,30 @@ export class PermissionController extends CrudController<PermissionService> {
|
|||||||
return await super.page(body);
|
return await super.page(body);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/add", { description: "sys:auth:per:add", summary: "添加权限" })
|
@Post("/add", { description: "sys:auth:per:add" })
|
||||||
async add(
|
async add(
|
||||||
@Body(ALL)
|
@Body(ALL)
|
||||||
bean
|
bean
|
||||||
) {
|
) {
|
||||||
const res = await super.add(bean);
|
return await super.add(bean);
|
||||||
await this.auditLog({
|
|
||||||
content: `新增了权限「${bean.name}」(ID:${res.data})`,
|
|
||||||
});
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: "sys:auth:per:edit", summary: "更新权限" })
|
@Post("/update", { description: "sys:auth:per:edit" })
|
||||||
async update(
|
async update(
|
||||||
@Body(ALL)
|
@Body(ALL)
|
||||||
bean
|
bean
|
||||||
) {
|
) {
|
||||||
const res = await super.update(bean);
|
return await super.update(bean);
|
||||||
await this.auditLog({
|
|
||||||
content: `修改了权限「${bean.name}」(ID:${bean.id})`,
|
|
||||||
});
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
@Post("/delete", { description: "sys:auth:per:remove", summary: "删除权限" })
|
@Post("/delete", { description: "sys:auth:per:remove" })
|
||||||
async delete(
|
async delete(
|
||||||
@Query("id")
|
@Query("id")
|
||||||
id: number
|
id: number
|
||||||
) {
|
) {
|
||||||
const res = await super.delete(id);
|
return await super.delete(id);
|
||||||
await this.auditLog({
|
|
||||||
content: `删除了权限(ID:${id})`,
|
|
||||||
});
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/tree", { description: "sys:auth:per:view", summary: "查询权限树" })
|
@Post("/tree", { description: "sys:auth:per:view" })
|
||||||
async tree() {
|
async tree() {
|
||||||
const tree = await this.service.tree({});
|
const tree = await this.service.tree({});
|
||||||
return this.ok(tree);
|
return this.ok(tree);
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
|
import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
|
||||||
import { CrudController } from "@certd/lib-server";
|
import { CrudController } from "@certd/lib-server";
|
||||||
import { RoleService } from "../../../modules/sys/authority/service/role-service.js";
|
import { RoleService } from "../../../modules/sys/authority/service/role-service.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 系统用户
|
* 系统用户
|
||||||
@@ -16,10 +15,6 @@ export class RoleController extends CrudController<RoleService> {
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.role;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: "sys:auth:role:view" })
|
@Post("/page", { description: "sys:auth:role:view" })
|
||||||
async page(
|
async page(
|
||||||
@Body(ALL)
|
@Body(ALL)
|
||||||
@@ -34,30 +29,22 @@ export class RoleController extends CrudController<RoleService> {
|
|||||||
return this.ok(ret);
|
return this.ok(ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/add", { description: "sys:auth:role:add", summary: "新增角色" })
|
@Post("/add", { description: "sys:auth:role:add" })
|
||||||
async add(
|
async add(
|
||||||
@Body(ALL)
|
@Body(ALL)
|
||||||
bean
|
bean
|
||||||
) {
|
) {
|
||||||
const res = await super.add(bean);
|
return await super.add(bean);
|
||||||
await this.auditLog({
|
|
||||||
content: `新增了角色「${bean.name}」(ID:${res.data})`,
|
|
||||||
});
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: "sys:auth:role:edit", summary: "修改角色" })
|
@Post("/update", { description: "sys:auth:role:edit" })
|
||||||
async update(
|
async update(
|
||||||
@Body(ALL)
|
@Body(ALL)
|
||||||
bean
|
bean
|
||||||
) {
|
) {
|
||||||
const res = await super.update(bean);
|
return await super.update(bean);
|
||||||
await this.auditLog({
|
|
||||||
content: `修改了角色「${bean.name}」(ID:${bean.id})`,
|
|
||||||
});
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
@Post("/delete", { description: "sys:auth:role:remove", summary: "删除角色" })
|
@Post("/delete", { description: "sys:auth:role:remove" })
|
||||||
async delete(
|
async delete(
|
||||||
@Query("id")
|
@Query("id")
|
||||||
id: number
|
id: number
|
||||||
@@ -65,11 +52,7 @@ export class RoleController extends CrudController<RoleService> {
|
|||||||
if (id === 1) {
|
if (id === 1) {
|
||||||
throw new Error("不能删除默认的管理员角色");
|
throw new Error("不能删除默认的管理员角色");
|
||||||
}
|
}
|
||||||
const res = await super.delete(id);
|
return await super.delete(id);
|
||||||
await this.auditLog({
|
|
||||||
content: `删除了角色(ID:${id})`,
|
|
||||||
});
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/getPermissionTree", { description: "sys:auth:role:view" })
|
@Post("/getPermissionTree", { description: "sys:auth:role:view" })
|
||||||
@@ -95,10 +78,9 @@ export class RoleController extends CrudController<RoleService> {
|
|||||||
* @param roleId
|
* @param roleId
|
||||||
* @param permissionIds
|
* @param permissionIds
|
||||||
*/
|
*/
|
||||||
@Post("/authz", { description: "sys:auth:role:edit", summary: "角色授权" })
|
@Post("/authz", { description: "sys:auth:role:edit" })
|
||||||
async authz(@Body("roleId") roleId, @Body("permissionIds") permissionIds) {
|
async authz(@Body("roleId") roleId, @Body("permissionIds") permissionIds) {
|
||||||
await this.service.authz(roleId, permissionIds);
|
await this.service.authz(roleId, permissionIds);
|
||||||
await this.auditLog({ content: `为角色(ID:${roleId})进行了授权` });
|
|
||||||
return this.ok(null);
|
return this.ok(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import { PermissionService } from "../../../modules/sys/authority/service/permis
|
|||||||
import { Constants } from "@certd/lib-server";
|
import { Constants } from "@certd/lib-server";
|
||||||
import { In } from "typeorm";
|
import { In } from "typeorm";
|
||||||
import { LoginService } from "../../../modules/login/service/login-service.js";
|
import { LoginService } from "../../../modules/login/service/login-service.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 系统用户
|
* 系统用户
|
||||||
@@ -25,10 +24,6 @@ export class UserController extends CrudController<UserService> {
|
|||||||
@Inject()
|
@Inject()
|
||||||
loginService: LoginService;
|
loginService: LoginService;
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.user;
|
|
||||||
}
|
|
||||||
|
|
||||||
getService() {
|
getService() {
|
||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
@@ -97,31 +92,23 @@ export class UserController extends CrudController<UserService> {
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/add", { description: "sys:auth:user:add", summary: "新增用户" })
|
@Post("/add", { description: "sys:auth:user:add" })
|
||||||
async add(
|
async add(
|
||||||
@Body(ALL)
|
@Body(ALL)
|
||||||
bean
|
bean
|
||||||
) {
|
) {
|
||||||
const res = await super.add(bean);
|
return await super.add(bean);
|
||||||
await this.auditLog({
|
|
||||||
content: `新增了用户「${bean.username}」(ID:${res.data})`,
|
|
||||||
});
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: "sys:auth:user:edit", summary: "修改用户" })
|
@Post("/update", { description: "sys:auth:user:edit" })
|
||||||
async update(
|
async update(
|
||||||
@Body(ALL)
|
@Body(ALL)
|
||||||
bean
|
bean
|
||||||
) {
|
) {
|
||||||
const res = await super.update(bean);
|
return await super.update(bean);
|
||||||
await this.auditLog({
|
|
||||||
content: `修改了用户「${bean.username}」(ID:${bean.id})`,
|
|
||||||
});
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/delete", { description: "sys:auth:user:remove", summary: "删除用户" })
|
@Post("/delete", { description: "sys:auth:user:remove" })
|
||||||
async delete(
|
async delete(
|
||||||
@Query("id")
|
@Query("id")
|
||||||
id: number
|
id: number
|
||||||
@@ -132,24 +119,19 @@ export class UserController extends CrudController<UserService> {
|
|||||||
if (id === 3) {
|
if (id === 3) {
|
||||||
throw new Error("不能删除默认的普通用户角色");
|
throw new Error("不能删除默认的普通用户角色");
|
||||||
}
|
}
|
||||||
const res = await super.delete(id);
|
return await super.delete(id);
|
||||||
await this.auditLog({
|
|
||||||
content: `删除了用户(ID:${id})`,
|
|
||||||
});
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 解除登录锁定
|
* 解除登录锁定
|
||||||
*/
|
*/
|
||||||
@Post("/unlockBlock", { description: "sys:auth:user:edit", summary: "解锁登录锁定" })
|
@Post("/unlockBlock", { description: "sys:auth:user:edit" })
|
||||||
public async unlockBlock(@Body("id") id: number) {
|
public async unlockBlock(@Body("id") id: number) {
|
||||||
const info = await this.service.info(id, ["password"]);
|
const info = await this.service.info(id, ["password"]);
|
||||||
this.loginService.clearCacheOnSuccess(info.username);
|
this.loginService.clearCacheOnSuccess(info.username);
|
||||||
if (info.mobile) {
|
if (info.mobile) {
|
||||||
this.loginService.clearCacheOnSuccess(info.mobile);
|
this.loginService.clearCacheOnSuccess(info.mobile);
|
||||||
}
|
}
|
||||||
await this.auditLog({ content: `解锁了用户登录锁定(ID:${id})` });
|
|
||||||
return this.ok(info);
|
return this.ok(info);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/c
|
|||||||
import { CrudController } from "@certd/lib-server";
|
import { CrudController } from "@certd/lib-server";
|
||||||
import { merge } from "lodash-es";
|
import { merge } from "lodash-es";
|
||||||
import { CnameProviderService } from "../../../modules/cname/service/cname-provider-service.js";
|
import { CnameProviderService } from "../../../modules/cname/service/cname-provider-service.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 授权
|
* 授权
|
||||||
@@ -17,10 +16,6 @@ export class CnameRecordController extends CrudController<CnameProviderService>
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.cname;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: "sys:settings:view" })
|
@Post("/page", { description: "sys:settings:view" })
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
body.query = body.query ?? {};
|
body.query = body.query ?? {};
|
||||||
@@ -32,7 +27,7 @@ export class CnameRecordController extends CrudController<CnameProviderService>
|
|||||||
return super.list(body);
|
return super.list(body);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/add", { description: "sys:settings:edit", summary: "添加CNAME服务" })
|
@Post("/add", { description: "sys:settings:edit" })
|
||||||
async add(@Body(ALL) bean: any) {
|
async add(@Body(ALL) bean: any) {
|
||||||
const def: any = {
|
const def: any = {
|
||||||
isDefault: false,
|
isDefault: false,
|
||||||
@@ -40,17 +35,13 @@ export class CnameRecordController extends CrudController<CnameProviderService>
|
|||||||
};
|
};
|
||||||
merge(bean, def);
|
merge(bean, def);
|
||||||
bean.userId = this.getUserId();
|
bean.userId = this.getUserId();
|
||||||
const res = await super.add(bean);
|
return super.add(bean);
|
||||||
await this.auditLog({ content: `添加了CNAME服务(ID:${res.data})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: "sys:settings:edit", summary: "更新CNAME服务" })
|
@Post("/update", { description: "sys:settings:edit" })
|
||||||
async update(@Body(ALL) bean: any) {
|
async update(@Body(ALL) bean: any) {
|
||||||
bean.userId = this.getUserId();
|
bean.userId = this.getUserId();
|
||||||
const res = await super.update(bean);
|
return super.update(bean);
|
||||||
await this.auditLog({ content: `更新了CNAME服务(ID:${bean.id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/info", { description: "sys:settings:view" })
|
@Post("/info", { description: "sys:settings:view" })
|
||||||
@@ -58,31 +49,26 @@ export class CnameRecordController extends CrudController<CnameProviderService>
|
|||||||
return super.info(id);
|
return super.info(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/delete", { description: "sys:settings:edit", summary: "删除CNAME服务" })
|
@Post("/delete", { description: "sys:settings:edit" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
const res = await super.delete(id);
|
return super.delete(id);
|
||||||
await this.auditLog({ content: `删除了CNAME服务(ID:${id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/deleteByIds", { description: "sys:settings:edit", summary: "批量删除CNAME服务" })
|
@Post("/deleteByIds", { description: "sys:settings:edit" })
|
||||||
async deleteByIds(@Body("ids") ids: number[]) {
|
async deleteByIds(@Body("ids") ids: number[]) {
|
||||||
const res = await this.service.delete(ids);
|
const res = await this.service.delete(ids);
|
||||||
await this.auditLog({ content: `批量删除了${ids.length}条CNAME服务` });
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/setDefault", { description: "sys:settings:edit", summary: "设置默认CNAME服务" })
|
@Post("/setDefault", { description: "sys:settings:edit" })
|
||||||
async setDefault(@Body("id") id: number) {
|
async setDefault(@Body("id") id: number) {
|
||||||
await this.service.setDefault(id);
|
await this.service.setDefault(id);
|
||||||
await this.auditLog({ content: `设置了默认CNAME服务(ID:${id})` });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/setDisabled", { description: "sys:settings:edit", summary: "禁用/启用CNAME服务" })
|
@Post("/setDisabled", { description: "sys:settings:edit" })
|
||||||
async setDisabled(@Body("id") id: number, @Body("disabled") disabled: boolean) {
|
async setDisabled(@Body("id") id: number, @Body("disabled") disabled: boolean) {
|
||||||
await this.service.setDisabled(id, disabled);
|
await this.service.setDisabled(id, disabled);
|
||||||
await this.auditLog({ content: `${disabled ? "禁用" : "启用"}了CNAME服务(ID:${id})` });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/c
|
|||||||
import { ProjectService } from "../../../modules/sys/enterprise/service/project-service.js";
|
import { ProjectService } from "../../../modules/sys/enterprise/service/project-service.js";
|
||||||
import { ProjectEntity } from "../../../modules/sys/enterprise/entity/project.js";
|
import { ProjectEntity } from "../../../modules/sys/enterprise/entity/project.js";
|
||||||
import { merge } from "lodash-es";
|
import { merge } from "lodash-es";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -16,26 +15,22 @@ export class SysProjectController extends CrudController<ProjectEntity> {
|
|||||||
@Inject()
|
@Inject()
|
||||||
sysSettingsService: SysSettingsService;
|
sysSettingsService: SysSettingsService;
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.project;
|
|
||||||
}
|
|
||||||
|
|
||||||
getService<T>() {
|
getService<T>() {
|
||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/page", { description: "sys:settings:view", summary: "查询项目分页列表" })
|
@Post("/page", { description: "sys:settings:view" })
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
body.query = body.query ?? {};
|
body.query = body.query ?? {};
|
||||||
return await super.page(body);
|
return await super.page(body);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/list", { description: "sys:settings:view", summary: "查询项目列表" })
|
@Post("/list", { description: "sys:settings:view" })
|
||||||
async list(@Body(ALL) body: any) {
|
async list(@Body(ALL) body: any) {
|
||||||
return super.list(body);
|
return super.list(body);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/add", { description: "sys:settings:edit", summary: "添加项目" })
|
@Post("/add", { description: "sys:settings:edit" })
|
||||||
async add(@Body(ALL) bean: any) {
|
async add(@Body(ALL) bean: any) {
|
||||||
const def: any = {
|
const def: any = {
|
||||||
isDefault: false,
|
isDefault: false,
|
||||||
@@ -43,57 +38,37 @@ export class SysProjectController extends CrudController<ProjectEntity> {
|
|||||||
};
|
};
|
||||||
merge(bean, def);
|
merge(bean, def);
|
||||||
bean.userId = this.getUserId();
|
bean.userId = this.getUserId();
|
||||||
const res = await super.add({
|
return super.add({
|
||||||
...bean,
|
...bean,
|
||||||
userId: -1, //企业用户id固定为-1
|
userId: -1, //企业用户id固定为-1
|
||||||
adminId: bean.userId,
|
adminId: bean.userId,
|
||||||
});
|
});
|
||||||
await this.auditLog({
|
|
||||||
content: `新增了项目「${bean.name}」(ID:${res.data})`,
|
|
||||||
});
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: "sys:settings:edit", summary: "更新项目" })
|
@Post("/update", { description: "sys:settings:edit" })
|
||||||
async update(@Body(ALL) bean: any) {
|
async update(@Body(ALL) bean: any) {
|
||||||
bean.userId = this.getUserId();
|
bean.userId = this.getUserId();
|
||||||
const res = await super.update(bean);
|
return super.update(bean);
|
||||||
await this.auditLog({
|
|
||||||
content: `修改了项目「${bean.name}」(ID:${bean.id})`,
|
|
||||||
});
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/info", { description: "sys:settings:view", summary: "查询项目详情" })
|
@Post("/info", { description: "sys:settings:view" })
|
||||||
async info(@Query("id") id: number) {
|
async info(@Query("id") id: number) {
|
||||||
return super.info(id);
|
return super.info(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/delete", { description: "sys:settings:edit", summary: "删除项目" })
|
@Post("/delete", { description: "sys:settings:edit" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
const res = await super.delete(id);
|
return super.delete(id);
|
||||||
await this.auditLog({
|
|
||||||
content: `删除了项目(ID:${id})`,
|
|
||||||
});
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/deleteByIds", { description: "sys:settings:edit", summary: "批量删除项目" })
|
@Post("/deleteByIds", { description: "sys:settings:edit" })
|
||||||
async deleteByIds(@Body("ids") ids: number[]) {
|
async deleteByIds(@Body("ids") ids: number[]) {
|
||||||
const res = await this.service.delete(ids);
|
const res = await this.service.delete(ids);
|
||||||
await this.auditLog({
|
|
||||||
content: `批量删除了${ids.length}个项目`,
|
|
||||||
});
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
@Post("/setDisabled", { description: "sys:settings:edit", summary: "禁用/启用项目" })
|
@Post("/setDisabled", { description: "sys:settings:edit" })
|
||||||
async setDisabled(@Body("id") id: number, @Body("disabled") disabled: boolean) {
|
async setDisabled(@Body("id") id: number, @Body("disabled") disabled: boolean) {
|
||||||
await this.service.setDisabled(id, disabled);
|
await this.service.setDisabled(id, disabled);
|
||||||
const project = await this.service.info(id);
|
|
||||||
const actionText = disabled ? "禁用了" : "启用了";
|
|
||||||
await this.auditLog({
|
|
||||||
content: `${actionText}项目「${project.name}」(ID:${id})`,
|
|
||||||
});
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+10
-20
@@ -4,7 +4,6 @@ import { ProjectMemberEntity } from "../../../modules/sys/enterprise/entity/proj
|
|||||||
import { ProjectMemberService } from "../../../modules/sys/enterprise/service/project-member-service.js";
|
import { ProjectMemberService } from "../../../modules/sys/enterprise/service/project-member-service.js";
|
||||||
import { merge } from "lodash-es";
|
import { merge } from "lodash-es";
|
||||||
import { ProjectService } from "../../../modules/sys/enterprise/service/project-service.js";
|
import { ProjectService } from "../../../modules/sys/enterprise/service/project-service.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -16,6 +15,7 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
|
|||||||
|
|
||||||
@Inject()
|
@Inject()
|
||||||
sysSettingsService: SysSettingsService;
|
sysSettingsService: SysSettingsService;
|
||||||
|
|
||||||
@Inject()
|
@Inject()
|
||||||
projectService: ProjectService;
|
projectService: ProjectService;
|
||||||
|
|
||||||
@@ -23,22 +23,18 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
@Post("/page", { description: "sys:settings:view" })
|
||||||
return AuditType.enterprise;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: "sys:settings:view", summary: "查询项目成员分页列表" })
|
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
body.query = body.query ?? {};
|
body.query = body.query ?? {};
|
||||||
return await super.page(body);
|
return await super.page(body);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/list", { description: "sys:settings:view", summary: "查询项目成员列表" })
|
@Post("/list", { description: "sys:settings:view" })
|
||||||
async list(@Body(ALL) body: any) {
|
async list(@Body(ALL) body: any) {
|
||||||
return super.list(body);
|
return super.list(body);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/add", { description: "sys:settings:edit", summary: "添加项目成员" })
|
@Post("/add", { description: "sys:settings:edit" })
|
||||||
async add(@Body(ALL) bean: any) {
|
async add(@Body(ALL) bean: any) {
|
||||||
const def: any = {
|
const def: any = {
|
||||||
isDefault: false,
|
isDefault: false,
|
||||||
@@ -51,12 +47,10 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
|
|||||||
projectId: bean.projectId,
|
projectId: bean.projectId,
|
||||||
});
|
});
|
||||||
|
|
||||||
const res = await super.add(bean);
|
return super.add(bean);
|
||||||
await this.auditLog({ content: `添加了项目成员(ID:${res.data})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: "sys:settings:edit", summary: "更新项目成员" })
|
@Post("/update", { description: "sys:settings:edit" })
|
||||||
async update(@Body(ALL) bean: any) {
|
async update(@Body(ALL) bean: any) {
|
||||||
if (!bean.id) {
|
if (!bean.id) {
|
||||||
throw new Error("id is required");
|
throw new Error("id is required");
|
||||||
@@ -71,11 +65,10 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
|
|||||||
permission: bean.permission,
|
permission: bean.permission,
|
||||||
status: bean.status,
|
status: bean.status,
|
||||||
});
|
});
|
||||||
await this.auditLog({ content: `更新了项目成员(ID:${bean.id})` });
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/info", { description: "sys:settings:view", summary: "查询项目成员详情" })
|
@Post("/info", { description: "sys:settings:view" })
|
||||||
async info(@Query("id") id: number) {
|
async info(@Query("id") id: number) {
|
||||||
if (!id) {
|
if (!id) {
|
||||||
throw new Error("id is required");
|
throw new Error("id is required");
|
||||||
@@ -88,7 +81,7 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
|
|||||||
return super.info(id);
|
return super.info(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/delete", { description: "sys:settings:edit", summary: "删除项目成员" })
|
@Post("/delete", { description: "sys:settings:edit" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
if (!id) {
|
if (!id) {
|
||||||
throw new Error("id is required");
|
throw new Error("id is required");
|
||||||
@@ -98,12 +91,10 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
|
|||||||
userId: this.getUserId(),
|
userId: this.getUserId(),
|
||||||
projectId: projectId,
|
projectId: projectId,
|
||||||
});
|
});
|
||||||
const res = await super.delete(id);
|
return super.delete(id);
|
||||||
await this.auditLog({ content: `删除了项目成员(ID:${id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/deleteByIds", { description: "sys:settings:edit", summary: "批量删除项目成员" })
|
@Post("/deleteByIds", { description: "sys:settings:edit" })
|
||||||
async deleteByIds(@Body("ids") ids: number[]) {
|
async deleteByIds(@Body("ids") ids: number[]) {
|
||||||
for (const id of ids) {
|
for (const id of ids) {
|
||||||
if (!id) {
|
if (!id) {
|
||||||
@@ -117,7 +108,6 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
|
|||||||
await this.service.delete(id as any);
|
await this.service.delete(id as any);
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.auditLog({ content: `批量删除了${ids.length}个项目成员` });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/c
|
|||||||
import { CrudController } from "@certd/lib-server";
|
import { CrudController } from "@certd/lib-server";
|
||||||
import { SiteInfoService } from "../../../modules/monitor/service/site-info-service.js";
|
import { SiteInfoService } from "../../../modules/monitor/service/site-info-service.js";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
@Provide()
|
@Provide()
|
||||||
@Controller("/api/sys/monitor/site")
|
@Controller("/api/sys/monitor/site")
|
||||||
@@ -15,10 +14,6 @@ export class SysSiteInfoController extends CrudController<SiteInfoService> {
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.monitor;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: "sys:settings:view", summary: "管理员查询站点监控分页列表" })
|
@Post("/page", { description: "sys:settings:view", summary: "管理员查询站点监控分页列表" })
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
body.query = body.query ?? {};
|
body.query = body.query ?? {};
|
||||||
@@ -49,16 +44,12 @@ export class SysSiteInfoController extends CrudController<SiteInfoService> {
|
|||||||
|
|
||||||
@Post("/delete", { description: "sys:settings:edit", summary: "管理员删除站点监控" })
|
@Post("/delete", { description: "sys:settings:edit", summary: "管理员删除站点监控" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
await super.delete(id);
|
return await super.delete(id);
|
||||||
await this.auditLog({ content: `管理员删除了站点监控(ID:${id})` });
|
|
||||||
return this.ok();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/batchDelete", { description: "sys:settings:edit", summary: "管理员批量删除站点监控" })
|
@Post("/batchDelete", { description: "sys:settings:edit", summary: "管理员批量删除站点监控" })
|
||||||
async batchDelete(@Body("ids") ids: number[]) {
|
async batchDelete(@Body("ids") ids: number[]) {
|
||||||
const count = ids.length;
|
|
||||||
await this.service.delete(ids);
|
await this.service.delete(ids);
|
||||||
await this.auditLog({ content: `管理员批量删除了${count}条站点监控` });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { CrudController } from "@certd/lib-server";
|
|||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { PipelineService } from "../../../modules/pipeline/service/pipeline-service.js";
|
import { PipelineService } from "../../../modules/pipeline/service/pipeline-service.js";
|
||||||
import { checkPlus } from "@certd/plus-core";
|
import { checkPlus } from "@certd/plus-core";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
@Provide()
|
@Provide()
|
||||||
@Controller("/api/sys/pipeline")
|
@Controller("/api/sys/pipeline")
|
||||||
@@ -16,10 +15,6 @@ export class SysPipelineController extends CrudController<PipelineService> {
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.pipeline;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: "sys:settings:view", summary: "管理员查询用户流水线分页列表" })
|
@Post("/page", { description: "sys:settings:view", summary: "管理员查询用户流水线分页列表" })
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
body.query = body.query ?? {};
|
body.query = body.query ?? {};
|
||||||
@@ -46,16 +41,13 @@ export class SysPipelineController extends CrudController<PipelineService> {
|
|||||||
@Post("/delete", { description: "sys:settings:edit", summary: "管理员删除用户流水线" })
|
@Post("/delete", { description: "sys:settings:edit", summary: "管理员删除用户流水线" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
await this.service.delete(id);
|
await this.service.delete(id);
|
||||||
await this.auditLog({ content: `管理员删除了用户流水线(ID:${id})` });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/batchDelete", { description: "sys:settings:edit", summary: "管理员批量删除用户流水线" })
|
@Post("/batchDelete", { description: "sys:settings:edit", summary: "管理员批量删除用户流水线" })
|
||||||
async batchDelete(@Body("ids") ids: number[]) {
|
async batchDelete(@Body("ids") ids: number[]) {
|
||||||
checkPlus();
|
checkPlus();
|
||||||
const count = ids.length;
|
|
||||||
await this.service.batchDelete(ids);
|
await this.service.batchDelete(ids);
|
||||||
await this.auditLog({ content: `管理员批量删除了${count}条用户流水线` });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { merge } from "lodash-es";
|
|||||||
import { CrudController } from "@certd/lib-server";
|
import { CrudController } from "@certd/lib-server";
|
||||||
import { PluginImportReq, PluginService } from "../../../modules/plugin/service/plugin-service.js";
|
import { PluginImportReq, PluginService } from "../../../modules/plugin/service/plugin-service.js";
|
||||||
import { CommPluginConfig, PluginConfig, PluginConfigService } from "../../../modules/plugin/service/plugin-config-service.js";
|
import { CommPluginConfig, PluginConfig, PluginConfigService } from "../../../modules/plugin/service/plugin-config-service.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
/**
|
/**
|
||||||
* 插件
|
* 插件
|
||||||
*/
|
*/
|
||||||
@@ -20,10 +19,6 @@ export class PluginController extends CrudController<PluginService> {
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.plugin;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: "sys:settings:view" })
|
@Post("/page", { description: "sys:settings:view" })
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
body.query = body.query ?? {};
|
body.query = body.query ?? {};
|
||||||
@@ -35,22 +30,19 @@ export class PluginController extends CrudController<PluginService> {
|
|||||||
return super.list(body);
|
return super.list(body);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/add", { description: "sys:settings:edit", summary: "添加插件" })
|
@Post("/add", { description: "sys:settings:edit" })
|
||||||
async add(@Body(ALL) bean: any) {
|
async add(@Body(ALL) bean: any) {
|
||||||
const def: any = {
|
const def: any = {
|
||||||
isDefault: false,
|
isDefault: false,
|
||||||
disabled: false,
|
disabled: false,
|
||||||
};
|
};
|
||||||
merge(bean, def);
|
merge(bean, def);
|
||||||
const res = await super.add(bean);
|
return super.add(bean);
|
||||||
await this.auditLog({ content: `新增了插件「${bean.name}」(ID:${res.data}, 类型:${bean.type})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: "sys:settings:edit", summary: "更新插件" })
|
@Post("/update", { description: "sys:settings:edit" })
|
||||||
async update(@Body(ALL) bean: any) {
|
async update(@Body(ALL) bean: any) {
|
||||||
const res = await super.update(bean);
|
const res = await super.update(bean);
|
||||||
await this.auditLog({ content: `修改了插件「${bean.name}」(ID:${bean.id})` });
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -59,25 +51,21 @@ export class PluginController extends CrudController<PluginService> {
|
|||||||
return super.info(id);
|
return super.info(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/delete", { description: "sys:settings:edit", summary: "删除插件" })
|
@Post("/delete", { description: "sys:settings:edit" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
const res = await this.service.deleteByIds([id]);
|
const res = await this.service.deleteByIds([id]);
|
||||||
await this.auditLog({ content: `删除了插件(ID:${id})` });
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/deleteByIds", { description: "sys:settings:edit", summary: "批量删除插件" })
|
@Post("/deleteByIds", { description: "sys:settings:edit" })
|
||||||
async deleteByIds(@Body("ids") ids: number[]) {
|
async deleteByIds(@Body("ids") ids: number[]) {
|
||||||
const res = await this.service.deleteByIds(ids);
|
const res = await this.service.deleteByIds(ids);
|
||||||
await this.auditLog({ content: `批量删除了${ids.length}条插件` });
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/setDisabled", { description: "sys:settings:edit", summary: "禁用/启用插件" })
|
@Post("/setDisabled", { description: "sys:settings:edit" })
|
||||||
async setDisabled(@Body(ALL) body: { id: number; name: string; type: string; disabled: boolean }) {
|
async setDisabled(@Body(ALL) body: { id: number; name: string; type: string; disabled: boolean }) {
|
||||||
await this.service.setDisabled(body);
|
await this.service.setDisabled(body);
|
||||||
const { id, disabled } = body;
|
|
||||||
await this.auditLog({ content: `${disabled ? "禁用" : "启用"}了插件(ID:${id})` });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
@Post("/getCommPluginConfigs", { description: "sys:settings:view" })
|
@Post("/getCommPluginConfigs", { description: "sys:settings:view" })
|
||||||
@@ -86,10 +74,9 @@ export class PluginController extends CrudController<PluginService> {
|
|||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/saveCommPluginConfigs", { description: "sys:settings:edit", summary: "保存公共插件配置" })
|
@Post("/saveCommPluginConfigs", { description: "sys:settings:edit" })
|
||||||
async saveCommPluginConfigs(@Body(ALL) body: CommPluginConfig) {
|
async saveCommPluginConfigs(@Body(ALL) body: CommPluginConfig) {
|
||||||
const res = await this.pluginConfigService.saveCommPluginConfig(body);
|
const res = await this.pluginConfigService.saveCommPluginConfig(body);
|
||||||
await this.auditLog({ content: "保存了公共插件配置" });
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
@Post("/getPluginByName", { description: "sys:settings:view" })
|
@Post("/getPluginByName", { description: "sys:settings:view" })
|
||||||
@@ -101,21 +88,19 @@ export class PluginController extends CrudController<PluginService> {
|
|||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/saveSetting", { description: "sys:settings:edit", summary: "保存插件设置" })
|
@Post("/saveSetting", { description: "sys:settings:edit" })
|
||||||
async saveSetting(@Body(ALL) body: PluginConfig) {
|
async saveSetting(@Body(ALL) body: PluginConfig) {
|
||||||
const res = await this.pluginConfigService.savePluginConfig(body);
|
const res = await this.pluginConfigService.savePluginConfig(body);
|
||||||
await this.auditLog({ content: "保存了插件设置" });
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/import", { description: "sys:settings:edit", summary: "导入插件" })
|
@Post("/import", { description: "sys:settings:edit" })
|
||||||
async import(@Body(ALL) body: PluginImportReq) {
|
async import(@Body(ALL) body: PluginImportReq) {
|
||||||
const res = await this.service.importPlugin(body);
|
const res = await this.service.importPlugin(body);
|
||||||
await this.auditLog({ content: "导入了插件配置" });
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/export", { description: "sys:settings:edit", summary: "导出插件" })
|
@Post("/export", { description: "sys:settings:edit" })
|
||||||
async export(@Body("id") id: number) {
|
async export(@Body("id") id: number) {
|
||||||
const res = await this.service.exportPlugin(id);
|
const res = await this.service.exportPlugin(id);
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
|
|||||||
+1
-10
@@ -2,7 +2,6 @@ import { ALL, Body, Controller, Inject, Post, Provide } from "@midwayjs/core";
|
|||||||
import { BaseController, SysSafeSetting } from "@certd/lib-server";
|
import { BaseController, SysSafeSetting } from "@certd/lib-server";
|
||||||
import { cloneDeep } from "lodash-es";
|
import { cloneDeep } from "lodash-es";
|
||||||
import { SafeService } from "../../../modules/sys/settings/safe-service.js";
|
import { SafeService } from "../../../modules/sys/settings/safe-service.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -12,10 +11,6 @@ export class SysSettingsController extends BaseController {
|
|||||||
@Inject()
|
@Inject()
|
||||||
safeService: SafeService;
|
safeService: SafeService;
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.settings;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/get", { description: "sys:settings:view" })
|
@Post("/get", { description: "sys:settings:view" })
|
||||||
async safeGet() {
|
async safeGet() {
|
||||||
const res = await this.safeService.getSafeSetting();
|
const res = await this.safeService.getSafeSetting();
|
||||||
@@ -27,19 +22,15 @@ export class SysSettingsController extends BaseController {
|
|||||||
@Post("/save", { description: "sys:settings:edit" })
|
@Post("/save", { description: "sys:settings:edit" })
|
||||||
async safeSave(@Body(ALL) body: any) {
|
async safeSave(@Body(ALL) body: any) {
|
||||||
await this.safeService.saveSafeSetting(body);
|
await this.safeService.saveSafeSetting(body);
|
||||||
await this.auditLog({
|
|
||||||
content: "修改了安全设置",
|
|
||||||
});
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 立即隐藏
|
* 立即隐藏
|
||||||
*/
|
*/
|
||||||
@Post("/hidden", { description: "sys:settings:edit", summary: "立刻隐藏系统" })
|
@Post("/hidden", { description: "sys:settings:edit" })
|
||||||
async hiddenImmediate() {
|
async hiddenImmediate() {
|
||||||
await this.safeService.hiddenImmediately();
|
await this.safeService.hiddenImmediately();
|
||||||
await this.auditLog({ content: "立刻隐藏了系统" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import { http, logger, utils } from "@certd/basic";
|
|||||||
import { CodeService } from "../../../modules/basic/service/code-service.js";
|
import { CodeService } from "../../../modules/basic/service/code-service.js";
|
||||||
import { SmsServiceFactory } from "../../../modules/basic/sms/factory.js";
|
import { SmsServiceFactory } from "../../../modules/basic/sms/factory.js";
|
||||||
import { RuntimeDepsService } from "../../../modules/runtime-deps/runtime-deps-service.js";
|
import { RuntimeDepsService } from "../../../modules/runtime-deps/runtime-deps-service.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -32,71 +31,58 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
@Post("/page", { description: "sys:settings:view" })
|
||||||
return AuditType.settings;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: "sys:settings:view", summary: "查询系统设置分页列表" })
|
|
||||||
async page(@Body(ALL) body) {
|
async page(@Body(ALL) body) {
|
||||||
return super.page(body);
|
return super.page(body);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/list", { description: "sys:settings:view", summary: "查询系统设置列表" })
|
@Post("/list", { description: "sys:settings:view" })
|
||||||
async list(@Body(ALL) body) {
|
async list(@Body(ALL) body) {
|
||||||
return super.list(body);
|
return super.list(body);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/add", { description: "sys:settings:edit", summary: "添加系统设置" })
|
@Post("/add", { description: "sys:settings:edit" })
|
||||||
async add(@Body(ALL) bean) {
|
async add(@Body(ALL) bean) {
|
||||||
const res = await super.add(bean);
|
return super.add(bean);
|
||||||
await this.auditLog({ content: "添加了系统设置" });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: "sys:settings:edit", summary: "更新系统设置" })
|
@Post("/update", { description: "sys:settings:edit" })
|
||||||
async update(@Body(ALL) bean) {
|
async update(@Body(ALL) bean) {
|
||||||
await this.service.checkUserId(bean.id, this.getUserId());
|
await this.service.checkUserId(bean.id, this.getUserId());
|
||||||
const res = await super.update(bean);
|
return super.update(bean);
|
||||||
await this.auditLog({ content: "更新了系统设置" });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
@Post("/info", { description: "sys:settings:view", summary: "查询系统设置详情" })
|
@Post("/info", { description: "sys:settings:view" })
|
||||||
async info(@Query("id") id: number) {
|
async info(@Query("id") id: number) {
|
||||||
await this.service.checkUserId(id, this.getUserId());
|
await this.service.checkUserId(id, this.getUserId());
|
||||||
return super.info(id);
|
return super.info(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/delete", { description: "sys:settings:edit", summary: "删除系统设置" })
|
@Post("/delete", { description: "sys:settings:edit" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
await this.service.checkUserId(id, this.getUserId());
|
await this.service.checkUserId(id, this.getUserId());
|
||||||
const res = await super.delete(id);
|
return super.delete(id);
|
||||||
await this.auditLog({ content: "删除了系统设置" });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/save", { description: "sys:settings:edit", summary: "保存系统设置" })
|
@Post("/save", { description: "sys:settings:edit" })
|
||||||
async save(@Body(ALL) bean: SysSettingsEntity) {
|
async save(@Body(ALL) bean: SysSettingsEntity) {
|
||||||
await this.service.save(bean);
|
await this.service.save(bean);
|
||||||
await this.auditLog({
|
|
||||||
content: "修改了系统设置",
|
|
||||||
});
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/get", { description: "sys:settings:view", summary: "查询系统设置" })
|
@Post("/get", { description: "sys:settings:view" })
|
||||||
async get(@Query("key") key: string) {
|
async get(@Query("key") key: string) {
|
||||||
const entity = await this.service.getByKey(key);
|
const entity = await this.service.getByKey(key);
|
||||||
return this.ok(entity);
|
return this.ok(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
// savePublicSettings
|
// savePublicSettings
|
||||||
@Post("/getEmailSettings", { description: "sys:settings:view", summary: "查询邮件服务器设置" })
|
@Post("/getEmailSettings", { description: "sys:settings:view" })
|
||||||
async getEmailSettings(@Body(ALL) body) {
|
async getEmailSettings(@Body(ALL) body) {
|
||||||
const conf = await getEmailSettings(this.service, this.userSettingsService);
|
const conf = await getEmailSettings(this.service, this.userSettingsService);
|
||||||
return this.ok(conf);
|
return this.ok(conf);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/getEmailTemplates", { description: "sys:settings:view", summary: "查询邮件模板列表" })
|
@Post("/getEmailTemplates", { description: "sys:settings:view" })
|
||||||
async getEmailTemplates(@Body(ALL) body) {
|
async getEmailTemplates(@Body(ALL) body) {
|
||||||
const conf = await getEmailSettings(this.service, this.userSettingsService);
|
const conf = await getEmailSettings(this.service, this.userSettingsService);
|
||||||
const templates = conf.templates || {};
|
const templates = conf.templates || {};
|
||||||
@@ -115,16 +101,15 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
|
|||||||
return this.ok(proviers);
|
return this.ok(proviers);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/saveEmailSettings", { description: "sys:settings:edit", summary: "保存邮件服务器设置" })
|
@Post("/saveEmailSettings", { description: "sys:settings:edit" })
|
||||||
async saveEmailSettings(@Body(ALL) body) {
|
async saveEmailSettings(@Body(ALL) body) {
|
||||||
const conf = await getEmailSettings(this.service, this.userSettingsService);
|
const conf = await getEmailSettings(this.service, this.userSettingsService);
|
||||||
merge(conf, body);
|
merge(conf, body);
|
||||||
await this.service.saveSetting(conf);
|
await this.service.saveSetting(conf);
|
||||||
await this.auditLog({ content: "保存了邮件服务器设置" });
|
|
||||||
return this.ok(conf);
|
return this.ok(conf);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/getSysSettings", { description: "sys:settings:view", summary: "查询系统配置" })
|
@Post("/getSysSettings", { description: "sys:settings:view" })
|
||||||
async getSysSettings() {
|
async getSysSettings() {
|
||||||
const publicSettings = await this.service.getPublicSettings();
|
const publicSettings = await this.service.getPublicSettings();
|
||||||
let privateSettings = await this.service.getPrivateSettings();
|
let privateSettings = await this.service.getPrivateSettings();
|
||||||
@@ -133,7 +118,7 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// savePublicSettings
|
// savePublicSettings
|
||||||
@Post("/saveSysSettings", { description: "sys:settings:edit", summary: "保存系统设置" })
|
@Post("/saveSysSettings", { description: "sys:settings:edit" })
|
||||||
async saveSysSettings(@Body(ALL) body: { public: SysPublicSettings; private: SysPrivateSettings }) {
|
async saveSysSettings(@Body(ALL) body: { public: SysPublicSettings; private: SysPrivateSettings }) {
|
||||||
const publicSettings = await this.service.getPublicSettings();
|
const publicSettings = await this.service.getPublicSettings();
|
||||||
const privateSettings = await this.service.getPrivateSettings();
|
const privateSettings = await this.service.getPrivateSettings();
|
||||||
@@ -141,18 +126,16 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
|
|||||||
merge(privateSettings, body.private);
|
merge(privateSettings, body.private);
|
||||||
await this.service.savePublicSettings(publicSettings);
|
await this.service.savePublicSettings(publicSettings);
|
||||||
await this.service.savePrivateSettings(privateSettings);
|
await this.service.savePrivateSettings(privateSettings);
|
||||||
await this.auditLog({ content: "保存了系统设置" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/stopOtherUserTimer", { description: "sys:settings:edit", summary: "停止其他用户定时任务" })
|
@Post("/stopOtherUserTimer", { description: "sys:settings:edit" })
|
||||||
async stopOtherUserTimer(@Body(ALL) body) {
|
async stopOtherUserTimer(@Body(ALL) body) {
|
||||||
await this.pipelineService.stopOtherUserPipeline(1);
|
await this.pipelineService.stopOtherUserPipeline(1);
|
||||||
await this.auditLog({ content: "停止了其他用户定时任务" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/testProxy", { description: "sys:settings:edit", summary: "测试代理" })
|
@Post("/testProxy", { description: "sys:settings:edit" })
|
||||||
async testProxy(@Body(ALL) body) {
|
async testProxy(@Body(ALL) body) {
|
||||||
const google = "https://www.google.com/";
|
const google = "https://www.google.com/";
|
||||||
const baidu = "https://www.baidu.com/";
|
const baidu = "https://www.baidu.com/";
|
||||||
@@ -190,19 +173,19 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/testSms", { description: "sys:settings:edit", summary: "测试短信" })
|
@Post("/testSms", { description: "sys:settings:edit" })
|
||||||
async testSms(@Body(ALL) body) {
|
async testSms(@Body(ALL) body) {
|
||||||
await this.codeService.sendSmsCode(body.phoneCode, body.mobile);
|
await this.codeService.sendSmsCode(body.phoneCode, body.mobile);
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/getSmsTypeDefine", { description: "sys:settings:view", summary: "查询短信类型定义" })
|
@Post("/getSmsTypeDefine", { description: "sys:settings:view" })
|
||||||
async getSmsTypeDefine(@Body("type") type: string) {
|
async getSmsTypeDefine(@Body("type") type: string) {
|
||||||
const define = await SmsServiceFactory.getDefine(type);
|
const define = await SmsServiceFactory.getDefine(type);
|
||||||
return this.ok(define);
|
return this.ok(define);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/safe/get", { description: "sys:settings:view", summary: "查询安全设置" })
|
@Post("/safe/get", { description: "sys:settings:view" })
|
||||||
async safeGet() {
|
async safeGet() {
|
||||||
const res = await this.service.getSetting<SysSafeSetting>(SysSafeSetting);
|
const res = await this.service.getSetting<SysSafeSetting>(SysSafeSetting);
|
||||||
const clone: SysSafeSetting = cloneDeep(res);
|
const clone: SysSafeSetting = cloneDeep(res);
|
||||||
@@ -210,7 +193,7 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
|
|||||||
return this.ok(clone);
|
return this.ok(clone);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/safe/save", { description: "sys:settings:edit", summary: "保存安全设置" })
|
@Post("/safe/save", { description: "sys:settings:edit" })
|
||||||
async safeSave(@Body(ALL) body: any) {
|
async safeSave(@Body(ALL) body: any) {
|
||||||
if (body.hidden.openPassword) {
|
if (body.hidden.openPassword) {
|
||||||
body.hidden.openPassword = utils.hash.md5(body.hidden.openPassword);
|
body.hidden.openPassword = utils.hash.md5(body.hidden.openPassword);
|
||||||
@@ -222,26 +205,24 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
|
|||||||
throw new Error("首次设置需要填写解锁密码");
|
throw new Error("首次设置需要填写解锁密码");
|
||||||
}
|
}
|
||||||
await this.service.saveSetting(blankSetting);
|
await this.service.saveSetting(blankSetting);
|
||||||
await this.auditLog({ content: "保存了安全设置" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/captchaTest", { description: "sys:settings:edit", summary: "测试验证码" })
|
@Post("/captchaTest", { description: "sys:settings:edit" })
|
||||||
async captchaTest(@Body(ALL) body: any, @RequestIP() remoteIp: string) {
|
async captchaTest(@Body(ALL) body: any, @RequestIP() remoteIp: string) {
|
||||||
await this.codeService.checkCaptcha(body, { remoteIp });
|
await this.codeService.checkCaptcha(body, { remoteIp });
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/oauth/providers", { description: "sys:settings:view", summary: "查询OAuth提供商列表" })
|
@Post("/oauth/providers", { description: "sys:settings:view" })
|
||||||
async oauthProviders() {
|
async oauthProviders() {
|
||||||
const list = await addonRegistry.getDefineList("oauth");
|
const list = await addonRegistry.getDefineList("oauth");
|
||||||
return this.ok(list);
|
return this.ok(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/clearRuntimeDeps", { description: "sys:settings:edit", summary: "清除运行时依赖" })
|
@Post("/clearRuntimeDeps", { description: "sys:settings:edit" })
|
||||||
async clearRuntimeDeps() {
|
async clearRuntimeDeps() {
|
||||||
await this.runtimeDepsService.clearRuntimeDeps();
|
await this.runtimeDepsService.clearRuntimeDeps();
|
||||||
await this.auditLog({ content: "清除了运行时依赖" });
|
|
||||||
return this.ok(true);
|
return this.ok(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import { checkPlus } from "@certd/plus-core";
|
|||||||
import { http, logger, utils } from "@certd/basic";
|
import { http, logger, utils } from "@certd/basic";
|
||||||
import { TaskServiceBuilder } from "../../../modules/pipeline/service/getter/task-service-getter.js";
|
import { TaskServiceBuilder } from "../../../modules/pipeline/service/getter/task-service-getter.js";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Addon
|
* Addon
|
||||||
@@ -25,10 +24,6 @@ export class AddonController extends CrudController<AddonService> {
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.addon;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: Constants.per.authOnly, summary: "查询Addon分页列表" })
|
@Post("/page", { description: Constants.per.authOnly, summary: "查询Addon分页列表" })
|
||||||
async page(@Body(ALL) body) {
|
async page(@Body(ALL) body) {
|
||||||
const { projectId, userId } = await this.getProjectUserIdRead();
|
const { projectId, userId } = await this.getProjectUserIdRead();
|
||||||
@@ -73,9 +68,7 @@ export class AddonController extends CrudController<AddonService> {
|
|||||||
if (define.needPlus) {
|
if (define.needPlus) {
|
||||||
checkPlus();
|
checkPlus();
|
||||||
}
|
}
|
||||||
const res = await super.add(bean);
|
return super.add(bean);
|
||||||
this.auditLog({ content: `新增了Addon「${bean.name}」(ID:${res.data}, 类型:${bean.type})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: Constants.per.authOnly, summary: "更新Addon" })
|
@Post("/update", { description: Constants.per.authOnly, summary: "更新Addon" })
|
||||||
@@ -98,9 +91,7 @@ export class AddonController extends CrudController<AddonService> {
|
|||||||
}
|
}
|
||||||
delete bean.userId;
|
delete bean.userId;
|
||||||
delete bean.projectId;
|
delete bean.projectId;
|
||||||
const res = await super.update(bean);
|
return super.update(bean);
|
||||||
this.auditLog({ content: `修改了Addon「${bean.name}」(ID:${bean.id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/info", { description: Constants.per.authOnly, summary: "查询Addon详情" })
|
@Post("/info", { description: Constants.per.authOnly, summary: "查询Addon详情" })
|
||||||
@@ -112,9 +103,7 @@ export class AddonController extends CrudController<AddonService> {
|
|||||||
@Post("/delete", { description: Constants.per.authOnly, summary: "删除Addon" })
|
@Post("/delete", { description: Constants.per.authOnly, summary: "删除Addon" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
await this.checkOwner(this.getService(), id, "write");
|
await this.checkOwner(this.getService(), id, "write");
|
||||||
const res = await super.delete(id);
|
return super.delete(id);
|
||||||
this.auditLog({ content: `删除了Addon(ID:${id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/define", { description: Constants.per.authOnly, summary: "查询Addon插件定义" })
|
@Post("/define", { description: Constants.per.authOnly, summary: "查询Addon插件定义" })
|
||||||
@@ -169,7 +158,6 @@ export class AddonController extends CrudController<AddonService> {
|
|||||||
async setDefault(@Query("addonType") addonType: string, @Query("id") id: number) {
|
async setDefault(@Query("addonType") addonType: string, @Query("id") id: number) {
|
||||||
const { projectId, userId } = await this.checkOwner(this.getService(), id, "write", true);
|
const { projectId, userId } = await this.checkOwner(this.getService(), id, "write", true);
|
||||||
const res = await this.service.setDefault(id, userId, addonType, projectId);
|
const res = await this.service.setDefault(id, userId, addonType, projectId);
|
||||||
this.auditLog({ content: `设置了默认Addon(ID:${id})` });
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,41 +0,0 @@
|
|||||||
import { BaseController, Constants } from "@certd/lib-server";
|
|
||||||
import { ALL, Body, Controller, Inject, Post, Provide } from "@midwayjs/core";
|
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
|
||||||
import { AuditService } from "../../../modules/sys/enterprise/service/audit-service.js";
|
|
||||||
import { buildAuditTypeDict, buildAuditActionDict } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
@Provide()
|
|
||||||
@ApiTags(["audit"])
|
|
||||||
@Controller("/api/pi/audit")
|
|
||||||
export class AuditLogController extends BaseController {
|
|
||||||
@Inject()
|
|
||||||
auditService: AuditService;
|
|
||||||
|
|
||||||
@Post("/page", { description: Constants.per.authOnly, summary: "分页查询当前用户操作日志" })
|
|
||||||
async page(@Body(ALL) body: any) {
|
|
||||||
const { projectId, userId } = await this.getProjectUserIdRead();
|
|
||||||
const query: any = { }
|
|
||||||
if (projectId) {
|
|
||||||
//如果是项目级别,排除userId参数,因为日志这里userId不是-1 ,而是实际的用户
|
|
||||||
query.projectId = projectId;
|
|
||||||
}else{
|
|
||||||
query.userId = userId;
|
|
||||||
}
|
|
||||||
body.query = {
|
|
||||||
...body.query || {},
|
|
||||||
...query,
|
|
||||||
scope: "user"
|
|
||||||
}
|
|
||||||
|
|
||||||
const pageRet = await this.auditService.page(body);
|
|
||||||
return this.ok(pageRet);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/dict", { description: Constants.per.authOnly, summary: "获取审计类型和动作字典" })
|
|
||||||
async getDict() {
|
|
||||||
return this.ok({
|
|
||||||
types: buildAuditTypeDict(),
|
|
||||||
actions: buildAuditActionDict(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -3,7 +3,6 @@ import { Constants, CrudController } from "@certd/lib-server";
|
|||||||
import { AuthService } from "../../../modules/sys/authority/service/auth-service.js";
|
import { AuthService } from "../../../modules/sys/authority/service/auth-service.js";
|
||||||
import { GroupService } from "../../../modules/basic/service/group-service.js";
|
import { GroupService } from "../../../modules/basic/service/group-service.js";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通知
|
* 通知
|
||||||
@@ -21,10 +20,6 @@ export class GroupController extends CrudController<GroupService> {
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.pipelineGroup;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: Constants.per.authOnly, summary: "查询分组分页列表" })
|
@Post("/page", { description: Constants.per.authOnly, summary: "查询分组分页列表" })
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
const { projectId, userId } = await this.getProjectUserIdRead();
|
const { projectId, userId } = await this.getProjectUserIdRead();
|
||||||
@@ -57,9 +52,7 @@ export class GroupController extends CrudController<GroupService> {
|
|||||||
const { projectId, userId } = await this.getProjectUserIdRead();
|
const { projectId, userId } = await this.getProjectUserIdRead();
|
||||||
bean.projectId = projectId;
|
bean.projectId = projectId;
|
||||||
bean.userId = userId;
|
bean.userId = userId;
|
||||||
const res = await super.add(bean);
|
return await super.add(bean);
|
||||||
this.auditLog({ content: `新增了分组「${bean.name}」(ID:${res.data})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: Constants.per.authOnly, summary: "更新分组" })
|
@Post("/update", { description: Constants.per.authOnly, summary: "更新分组" })
|
||||||
@@ -67,9 +60,7 @@ export class GroupController extends CrudController<GroupService> {
|
|||||||
await this.checkOwner(this.getService(), bean.id, "write");
|
await this.checkOwner(this.getService(), bean.id, "write");
|
||||||
delete bean.userId;
|
delete bean.userId;
|
||||||
delete bean.projectId;
|
delete bean.projectId;
|
||||||
const res = await super.update(bean);
|
return await super.update(bean);
|
||||||
this.auditLog({ content: `修改了分组「${bean.name}」(ID:${bean.id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
@Post("/info", { description: Constants.per.authOnly, summary: "查询分组详情" })
|
@Post("/info", { description: Constants.per.authOnly, summary: "查询分组详情" })
|
||||||
async info(@Query("id") id: number) {
|
async info(@Query("id") id: number) {
|
||||||
@@ -80,9 +71,7 @@ export class GroupController extends CrudController<GroupService> {
|
|||||||
@Post("/delete", { description: Constants.per.authOnly, summary: "删除分组" })
|
@Post("/delete", { description: Constants.per.authOnly, summary: "删除分组" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
await this.checkOwner(this.getService(), id, "write");
|
await this.checkOwner(this.getService(), id, "write");
|
||||||
const res = await super.delete(id);
|
return await super.delete(id);
|
||||||
this.auditLog({ content: `删除了分组(ID:${id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/all", { description: Constants.per.authOnly, summary: "查询所有分组" })
|
@Post("/all", { description: Constants.per.authOnly, summary: "查询所有分组" })
|
||||||
|
|||||||
+4
-17
@@ -2,7 +2,6 @@ import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/c
|
|||||||
import { Constants, CrudController } from "@certd/lib-server";
|
import { Constants, CrudController } from "@certd/lib-server";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { CertApplyTemplateService } from "../../../modules/cert/service/cert-apply-template-service.js";
|
import { CertApplyTemplateService } from "../../../modules/cert/service/cert-apply-template-service.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
@Provide()
|
@Provide()
|
||||||
@Controller("/api/cert/apply-template")
|
@Controller("/api/cert/apply-template")
|
||||||
@@ -15,10 +14,6 @@ export class CertApplyTemplateController extends CrudController<CertApplyTemplat
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.certTemplate;
|
|
||||||
}
|
|
||||||
|
|
||||||
private removeContent(data: any) {
|
private removeContent(data: any) {
|
||||||
const records = Array.isArray(data) ? data : data?.records;
|
const records = Array.isArray(data) ? data : data?.records;
|
||||||
if (!records) {
|
if (!records) {
|
||||||
@@ -58,9 +53,7 @@ export class CertApplyTemplateController extends CrudController<CertApplyTemplat
|
|||||||
const { projectId, userId } = await this.getProjectUserIdWrite();
|
const { projectId, userId } = await this.getProjectUserIdWrite();
|
||||||
bean.projectId = projectId;
|
bean.projectId = projectId;
|
||||||
bean.userId = userId;
|
bean.userId = userId;
|
||||||
const res = await super.add(bean);
|
return super.add(bean);
|
||||||
this.auditLog({ content: `新增了证书参数模版(ID:${res.data})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: Constants.per.authOnly, summary: "更新证书申请参数模版" })
|
@Post("/update", { description: Constants.per.authOnly, summary: "更新证书申请参数模版" })
|
||||||
@@ -68,9 +61,7 @@ export class CertApplyTemplateController extends CrudController<CertApplyTemplat
|
|||||||
await this.checkOwner(this.getService(), bean.id, "write");
|
await this.checkOwner(this.getService(), bean.id, "write");
|
||||||
delete bean.userId;
|
delete bean.userId;
|
||||||
delete bean.projectId;
|
delete bean.projectId;
|
||||||
const res = await super.update(bean);
|
return super.update(bean);
|
||||||
this.auditLog({ content: `修改了证书参数模版(ID:${bean.id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/info", { description: Constants.per.authOnly, summary: "查询证书申请参数模版详情" })
|
@Post("/info", { description: Constants.per.authOnly, summary: "查询证书申请参数模版详情" })
|
||||||
@@ -82,17 +73,13 @@ export class CertApplyTemplateController extends CrudController<CertApplyTemplat
|
|||||||
@Post("/delete", { description: Constants.per.authOnly, summary: "删除证书申请参数模版" })
|
@Post("/delete", { description: Constants.per.authOnly, summary: "删除证书申请参数模版" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
await this.checkOwner(this.getService(), id, "write");
|
await this.checkOwner(this.getService(), id, "write");
|
||||||
const res = await super.delete(id);
|
return super.delete(id);
|
||||||
this.auditLog({ content: `删除了证书参数模版(ID:${id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/setDefault", { description: Constants.per.authOnly, summary: "设置默认证书申请参数模版" })
|
@Post("/setDefault", { description: Constants.per.authOnly, summary: "设置默认证书申请参数模版" })
|
||||||
async setDefault(@Body("id") id: number) {
|
async setDefault(@Body("id") id: number) {
|
||||||
const { projectId, userId } = await this.getProjectUserIdWrite();
|
const { projectId, userId } = await this.getProjectUserIdWrite();
|
||||||
const defaultId = await this.service.setDefault(id, userId, projectId);
|
return this.ok(await this.service.setDefault(id, userId, projectId));
|
||||||
this.auditLog({ content: `设置了默认证书参数模版(ID:${id})` });
|
|
||||||
return this.ok(defaultId);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/default", { description: Constants.per.authOnly, summary: "查询默认证书申请参数模版" })
|
@Post("/default", { description: Constants.per.authOnly, summary: "查询默认证书申请参数模版" })
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/c
|
|||||||
import { Constants, CrudController } from "@certd/lib-server";
|
import { Constants, CrudController } from "@certd/lib-server";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { DnsPersistRecordService } from "../../../modules/cert/service/dns-persist-record-service.js";
|
import { DnsPersistRecordService } from "../../../modules/cert/service/dns-persist-record-service.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
@Provide()
|
@Provide()
|
||||||
@Controller("/api/cert/dns-persist")
|
@Controller("/api/cert/dns-persist")
|
||||||
@@ -15,10 +14,6 @@ export class DnsPersistRecordController extends CrudController<DnsPersistRecordS
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.dnsPersist;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: Constants.per.authOnly, summary: "查询DNS持久验证记录分页列表" })
|
@Post("/page", { description: Constants.per.authOnly, summary: "查询DNS持久验证记录分页列表" })
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
const { projectId, userId } = await this.getProjectUserIdRead();
|
const { projectId, userId } = await this.getProjectUserIdRead();
|
||||||
@@ -33,9 +28,7 @@ export class DnsPersistRecordController extends CrudController<DnsPersistRecordS
|
|||||||
const { projectId, userId } = await this.getProjectUserIdWrite();
|
const { projectId, userId } = await this.getProjectUserIdWrite();
|
||||||
bean.projectId = projectId;
|
bean.projectId = projectId;
|
||||||
bean.userId = userId;
|
bean.userId = userId;
|
||||||
const res = await this.getService().add(bean);
|
return super.add(bean);
|
||||||
this.auditLog({ content: `新增了DNS持久验证记录(ID:${res.id})` });
|
|
||||||
return this.ok(res);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: Constants.per.authOnly, summary: "更新DNS持久验证记录" })
|
@Post("/update", { description: Constants.per.authOnly, summary: "更新DNS持久验证记录" })
|
||||||
@@ -43,9 +36,7 @@ export class DnsPersistRecordController extends CrudController<DnsPersistRecordS
|
|||||||
await this.checkOwner(this.getService(), bean.id, "write");
|
await this.checkOwner(this.getService(), bean.id, "write");
|
||||||
delete bean.userId;
|
delete bean.userId;
|
||||||
delete bean.projectId;
|
delete bean.projectId;
|
||||||
const res = await super.update(bean);
|
return super.update(bean);
|
||||||
this.auditLog({ content: `修改了DNS持久验证记录(ID:${bean.id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/info", { description: Constants.per.authOnly, summary: "查询DNS持久验证记录详情" })
|
@Post("/info", { description: Constants.per.authOnly, summary: "查询DNS持久验证记录详情" })
|
||||||
@@ -58,7 +49,6 @@ export class DnsPersistRecordController extends CrudController<DnsPersistRecordS
|
|||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
await this.checkOwner(this.getService(), id, "write");
|
await this.checkOwner(this.getService(), id, "write");
|
||||||
await this.service.delete(id as any);
|
await this.service.delete(id as any);
|
||||||
this.auditLog({ content: `删除了DNS持久验证记录(ID:${id})` });
|
|
||||||
return this.ok({
|
return this.ok({
|
||||||
message: this.service.lastDeleteMessage,
|
message: this.service.lastDeleteMessage,
|
||||||
});
|
});
|
||||||
@@ -90,16 +80,12 @@ export class DnsPersistRecordController extends CrudController<DnsPersistRecordS
|
|||||||
@Post("/triggerVerify", { description: Constants.per.authOnly, summary: "后台验证DNS持久验证记录" })
|
@Post("/triggerVerify", { description: Constants.per.authOnly, summary: "后台验证DNS持久验证记录" })
|
||||||
async triggerVerify(@Body(ALL) body: { id: number }) {
|
async triggerVerify(@Body(ALL) body: { id: number }) {
|
||||||
await this.checkOwner(this.getService(), body.id, "write");
|
await this.checkOwner(this.getService(), body.id, "write");
|
||||||
const res = await this.service.triggerVerify(body.id);
|
return this.ok(await this.service.triggerVerify(body.id));
|
||||||
this.auditLog({ content: `触发了DNS持久验证(ID:${body.id})` });
|
|
||||||
return this.ok(res);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/createTxt", { description: Constants.per.authOnly, summary: "一键创建DNS持久验证TXT记录" })
|
@Post("/createTxt", { description: Constants.per.authOnly, summary: "一键创建DNS持久验证TXT记录" })
|
||||||
async createTxt(@Body(ALL) body: { id: number; dnsProviderType?: string; dnsProviderAccess?: number }) {
|
async createTxt(@Body(ALL) body: { id: number; dnsProviderType?: string; dnsProviderAccess?: number }) {
|
||||||
await this.checkOwner(this.getService(), body.id, "write");
|
await this.checkOwner(this.getService(), body.id, "write");
|
||||||
const res = await this.service.createDnsTxt(body);
|
return this.ok(await this.service.createDnsTxt(body));
|
||||||
this.auditLog({ content: `一键创建了DNS持久验证TXT记录(ID:${body.id})` });
|
|
||||||
return this.ok(res);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { DomainService } from "../../../modules/cert/service/domain-service.js";
|
|||||||
import { checkPlus } from "@certd/plus-core";
|
import { checkPlus } from "@certd/plus-core";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { parseDomainByPsl } from "@certd/plugin-lib";
|
import { parseDomainByPsl } from "@certd/plugin-lib";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 授权
|
* 授权
|
||||||
@@ -20,10 +19,6 @@ export class DomainController extends CrudController<DomainService> {
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.domain;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: Constants.per.authOnly, summary: "查询域名分页列表" })
|
@Post("/page", { description: Constants.per.authOnly, summary: "查询域名分页列表" })
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
const { projectId, userId } = await this.getProjectUserIdRead();
|
const { projectId, userId } = await this.getProjectUserIdRead();
|
||||||
@@ -63,9 +58,7 @@ export class DomainController extends CrudController<DomainService> {
|
|||||||
const { projectId, userId } = await this.getProjectUserIdRead();
|
const { projectId, userId } = await this.getProjectUserIdRead();
|
||||||
bean.projectId = projectId;
|
bean.projectId = projectId;
|
||||||
bean.userId = userId;
|
bean.userId = userId;
|
||||||
const res = await super.add(bean);
|
return super.add(bean);
|
||||||
this.auditLog({ content: `新增了域名「${bean.domain}」` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: Constants.per.authOnly, summary: "更新域名" })
|
@Post("/update", { description: Constants.per.authOnly, summary: "更新域名" })
|
||||||
@@ -73,9 +66,7 @@ export class DomainController extends CrudController<DomainService> {
|
|||||||
await this.checkOwner(this.getService(), bean.id, "write");
|
await this.checkOwner(this.getService(), bean.id, "write");
|
||||||
delete bean.userId;
|
delete bean.userId;
|
||||||
delete bean.projectId;
|
delete bean.projectId;
|
||||||
const res = await super.update(bean);
|
return super.update(bean);
|
||||||
this.auditLog({ content: `修改了域名「${bean.domain}」` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/info", { description: Constants.per.authOnly, summary: "查询域名详情" })
|
@Post("/info", { description: Constants.per.authOnly, summary: "查询域名详情" })
|
||||||
@@ -87,16 +78,13 @@ export class DomainController extends CrudController<DomainService> {
|
|||||||
@Post("/delete", { description: Constants.per.authOnly, summary: "删除域名" })
|
@Post("/delete", { description: Constants.per.authOnly, summary: "删除域名" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
await this.checkOwner(this.getService(), id, "write");
|
await this.checkOwner(this.getService(), id, "write");
|
||||||
const res = await super.delete(id);
|
return super.delete(id);
|
||||||
this.auditLog({ content: `删除了域名(ID:${id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/deleteByIds", { description: Constants.per.authOnly, summary: "批量删除域名" })
|
@Post("/deleteByIds", { description: Constants.per.authOnly, summary: "批量删除域名" })
|
||||||
async deleteByIds(@Body(ALL) body: any) {
|
async deleteByIds(@Body(ALL) body: any) {
|
||||||
const { projectId, userId } = await this.getProjectUserIdRead();
|
const { projectId, userId } = await this.getProjectUserIdRead();
|
||||||
await this.service.batchDelete(body.ids, userId, projectId);
|
await this.service.batchDelete(body.ids, userId, projectId);
|
||||||
this.auditLog({ content: `批量删除了${body.ids.length}条域名` });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,7 +99,6 @@ export class DomainController extends CrudController<DomainService> {
|
|||||||
projectId: projectId,
|
projectId: projectId,
|
||||||
};
|
};
|
||||||
await this.service.startDomainImportTask(req);
|
await this.service.startDomainImportTask(req);
|
||||||
this.auditLog({ content: "开始了域名导入任务" });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -136,7 +123,6 @@ export class DomainController extends CrudController<DomainService> {
|
|||||||
key,
|
key,
|
||||||
};
|
};
|
||||||
await this.service.deleteDomainImportTask(req);
|
await this.service.deleteDomainImportTask(req);
|
||||||
this.auditLog({ content: "删除了域名导入任务" });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -153,7 +139,6 @@ export class DomainController extends CrudController<DomainService> {
|
|||||||
key,
|
key,
|
||||||
};
|
};
|
||||||
const item = await this.service.saveDomainImportTask(req);
|
const item = await this.service.saveDomainImportTask(req);
|
||||||
this.auditLog({ content: "保存了域名导入任务" });
|
|
||||||
return this.ok(item);
|
return this.ok(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -164,7 +149,6 @@ export class DomainController extends CrudController<DomainService> {
|
|||||||
userId: userId,
|
userId: userId,
|
||||||
projectId: projectId,
|
projectId: projectId,
|
||||||
});
|
});
|
||||||
this.auditLog({ content: "开始了同步域名过期时间任务" });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
@Post("/sync/expiration/status", { description: Constants.per.authOnly, summary: "查询同步域名过期时间任务状态" })
|
@Post("/sync/expiration/status", { description: Constants.per.authOnly, summary: "查询同步域名过期时间任务状态" })
|
||||||
@@ -185,7 +169,6 @@ export class DomainController extends CrudController<DomainService> {
|
|||||||
projectId: projectId,
|
projectId: projectId,
|
||||||
setting: { ...body },
|
setting: { ...body },
|
||||||
});
|
});
|
||||||
this.auditLog({ content: "保存了域名监控设置" });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/c
|
|||||||
import { Constants, CrudController } from "@certd/lib-server";
|
import { Constants, CrudController } from "@certd/lib-server";
|
||||||
import { CnameRecordService } from "../../../modules/cname/service/cname-record-service.js";
|
import { CnameRecordService } from "../../../modules/cname/service/cname-record-service.js";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 授权
|
* 授权
|
||||||
@@ -18,10 +17,6 @@ export class CnameRecordController extends CrudController<CnameRecordService> {
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.cname;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: Constants.per.authOnly, summary: "查询CNAME记录分页列表" })
|
@Post("/page", { description: Constants.per.authOnly, summary: "查询CNAME记录分页列表" })
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
const { userId, projectId } = await this.getProjectUserIdRead();
|
const { userId, projectId } = await this.getProjectUserIdRead();
|
||||||
@@ -61,9 +56,7 @@ export class CnameRecordController extends CrudController<CnameRecordService> {
|
|||||||
const { userId, projectId } = await this.getProjectUserIdWrite();
|
const { userId, projectId } = await this.getProjectUserIdWrite();
|
||||||
bean.userId = userId;
|
bean.userId = userId;
|
||||||
bean.projectId = projectId;
|
bean.projectId = projectId;
|
||||||
const res = await super.add(bean);
|
return super.add(bean);
|
||||||
this.auditLog({ content: `新增了CNAME记录「${bean.domain}」` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: Constants.per.authOnly, summary: "更新CNAME记录" })
|
@Post("/update", { description: Constants.per.authOnly, summary: "更新CNAME记录" })
|
||||||
@@ -71,9 +64,7 @@ export class CnameRecordController extends CrudController<CnameRecordService> {
|
|||||||
await this.checkOwner(this.getService(), bean.id, "write");
|
await this.checkOwner(this.getService(), bean.id, "write");
|
||||||
delete bean.userId;
|
delete bean.userId;
|
||||||
delete bean.projectId;
|
delete bean.projectId;
|
||||||
const res = await super.update(bean);
|
return super.update(bean);
|
||||||
this.auditLog({ content: `修改了CNAME记录(ID:${bean.id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/info", { description: Constants.per.authOnly, summary: "查询CNAME记录详情" })
|
@Post("/info", { description: Constants.per.authOnly, summary: "查询CNAME记录详情" })
|
||||||
@@ -85,16 +76,13 @@ export class CnameRecordController extends CrudController<CnameRecordService> {
|
|||||||
@Post("/delete", { description: Constants.per.authOnly, summary: "删除CNAME记录" })
|
@Post("/delete", { description: Constants.per.authOnly, summary: "删除CNAME记录" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
await this.checkOwner(this.getService(), id, "write");
|
await this.checkOwner(this.getService(), id, "write");
|
||||||
const res = await super.delete(id);
|
return super.delete(id);
|
||||||
this.auditLog({ content: `删除了CNAME记录(ID:${id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/deleteByIds", { description: Constants.per.authOnly, summary: "批量删除CNAME记录" })
|
@Post("/deleteByIds", { description: Constants.per.authOnly, summary: "批量删除CNAME记录" })
|
||||||
async deleteByIds(@Body(ALL) body: any) {
|
async deleteByIds(@Body(ALL) body: any) {
|
||||||
const { userId, projectId } = await this.getProjectUserIdWrite();
|
const { userId, projectId } = await this.getProjectUserIdWrite();
|
||||||
await this.service.batchDelete(body.ids, userId, projectId);
|
await this.service.batchDelete(body.ids, userId, projectId);
|
||||||
this.auditLog({ content: `批量删除了${body.ids.length}条CNAME记录` });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
@Post("/getByDomain", { description: Constants.per.authOnly, summary: "根据域名获取CNAME记录" })
|
@Post("/getByDomain", { description: Constants.per.authOnly, summary: "根据域名获取CNAME记录" })
|
||||||
@@ -115,7 +103,6 @@ export class CnameRecordController extends CrudController<CnameRecordService> {
|
|||||||
async resetStatus(@Body(ALL) body: { id: number }) {
|
async resetStatus(@Body(ALL) body: { id: number }) {
|
||||||
await this.checkOwner(this.getService(), body.id, "read");
|
await this.checkOwner(this.getService(), body.id, "read");
|
||||||
const res = await this.service.resetStatus(body.id);
|
const res = await this.service.resetStatus(body.id);
|
||||||
this.auditLog({ content: `重置了CNAME记录状态(ID:${body.id})` });
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
@Post("/import", { description: Constants.per.authOnly, summary: "导入CNAME记录" })
|
@Post("/import", { description: Constants.per.authOnly, summary: "导入CNAME记录" })
|
||||||
@@ -127,7 +114,6 @@ export class CnameRecordController extends CrudController<CnameRecordService> {
|
|||||||
domainList: body.domainList,
|
domainList: body.domainList,
|
||||||
cnameProviderId: body.cnameProviderId,
|
cnameProviderId: body.cnameProviderId,
|
||||||
});
|
});
|
||||||
this.auditLog({ append: `提交${res.count}条` });
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { AuthService } from "../../../modules/sys/authority/service/auth-service
|
|||||||
import { ProjectService } from "../../../modules/sys/enterprise/service/project-service.js";
|
import { ProjectService } from "../../../modules/sys/enterprise/service/project-service.js";
|
||||||
import { ProjectMemberService } from "../../../modules/sys/enterprise/service/project-member-service.js";
|
import { ProjectMemberService } from "../../../modules/sys/enterprise/service/project-member-service.js";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -25,10 +24,6 @@ export class UserProjectController extends BaseController {
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.enterprise;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param body
|
* @param body
|
||||||
* @returns
|
* @returns
|
||||||
@@ -68,7 +63,6 @@ export class UserProjectController extends BaseController {
|
|||||||
async applyJoin(@Body(ALL) body: any) {
|
async applyJoin(@Body(ALL) body: any) {
|
||||||
const userId = this.getUserId();
|
const userId = this.getUserId();
|
||||||
const res = await this.service.applyJoin({ userId, projectId: body.projectId });
|
const res = await this.service.applyJoin({ userId, projectId: body.projectId });
|
||||||
this.auditLog({ content: "申请了加入项目" });
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,7 +84,6 @@ export class UserProjectController extends BaseController {
|
|||||||
status,
|
status,
|
||||||
permission,
|
permission,
|
||||||
});
|
});
|
||||||
this.auditLog({ content: "更新了项目成员" });
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -99,7 +92,6 @@ export class UserProjectController extends BaseController {
|
|||||||
const { projectId } = await this.getProjectUserIdAdmin();
|
const { projectId } = await this.getProjectUserIdAdmin();
|
||||||
const { status, permission, userId } = body;
|
const { status, permission, userId } = body;
|
||||||
const res = await this.service.approveJoin({ userId, projectId: projectId, status, permission });
|
const res = await this.service.approveJoin({ userId, projectId: projectId, status, permission });
|
||||||
this.auditLog({ content: "审批了加入项目申请" });
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -108,9 +100,8 @@ export class UserProjectController extends BaseController {
|
|||||||
const { projectId } = await this.getProjectUserIdAdmin();
|
const { projectId } = await this.getProjectUserIdAdmin();
|
||||||
await this.projectMemberService.deleteWhere({
|
await this.projectMemberService.deleteWhere({
|
||||||
projectId,
|
projectId,
|
||||||
userId: body.userId,
|
userId: this.getUserId(),
|
||||||
});
|
});
|
||||||
this.auditLog({ content: "删除了项目成员" });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,7 +113,6 @@ export class UserProjectController extends BaseController {
|
|||||||
projectId,
|
projectId,
|
||||||
userId,
|
userId,
|
||||||
});
|
});
|
||||||
this.auditLog({ content: "离开了项目" });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-13
@@ -5,7 +5,6 @@ import { ProjectMemberService } from "../../../modules/sys/enterprise/service/pr
|
|||||||
import { merge } from "lodash-es";
|
import { merge } from "lodash-es";
|
||||||
import { ProjectService } from "../../../modules/sys/enterprise/service/project-service.js";
|
import { ProjectService } from "../../../modules/sys/enterprise/service/project-service.js";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@Provide()
|
@Provide()
|
||||||
@@ -25,10 +24,6 @@ export class ProjectMemberController extends CrudController<ProjectMemberEntity>
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.enterprise;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: Constants.per.authOnly, summary: "查询项目成员分页列表" })
|
@Post("/page", { description: Constants.per.authOnly, summary: "查询项目成员分页列表" })
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
const { projectId } = await this.getProjectUserIdRead();
|
const { projectId } = await this.getProjectUserIdRead();
|
||||||
@@ -58,9 +53,7 @@ export class ProjectMemberController extends CrudController<ProjectMemberEntity>
|
|||||||
projectId: bean.projectId,
|
projectId: bean.projectId,
|
||||||
});
|
});
|
||||||
|
|
||||||
const res = await super.add(bean);
|
return super.add(bean);
|
||||||
this.auditLog({ content: `新增了项目成员(ID:${res.data})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: Constants.per.authOnly, summary: "更新项目成员" })
|
@Post("/update", { description: Constants.per.authOnly, summary: "更新项目成员" })
|
||||||
@@ -78,7 +71,7 @@ export class ProjectMemberController extends CrudController<ProjectMemberEntity>
|
|||||||
permission: bean.permission,
|
permission: bean.permission,
|
||||||
status: bean.status,
|
status: bean.status,
|
||||||
});
|
});
|
||||||
this.auditLog({ content: `修改了项目成员(ID:${bean.id})` });
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,9 +98,7 @@ export class ProjectMemberController extends CrudController<ProjectMemberEntity>
|
|||||||
userId: this.getUserId(),
|
userId: this.getUserId(),
|
||||||
projectId: projectId,
|
projectId: projectId,
|
||||||
});
|
});
|
||||||
const res = await super.delete(id);
|
return super.delete(id);
|
||||||
this.auditLog({ content: `删除了项目成员(ID:${id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/deleteByIds", { description: Constants.per.authOnly, summary: "批量删除项目成员" })
|
@Post("/deleteByIds", { description: Constants.per.authOnly, summary: "批量删除项目成员" })
|
||||||
@@ -124,7 +115,6 @@ export class ProjectMemberController extends CrudController<ProjectMemberEntity>
|
|||||||
await this.service.delete(id as any);
|
await this.service.delete(id as any);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.auditLog({ content: `批量删除了${ids.length}条项目成员` });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import { BaseController, Constants } from "@certd/lib-server";
|
|||||||
import { Controller, Inject, Post, Provide } from "@midwayjs/core";
|
import { Controller, Inject, Post, Provide } from "@midwayjs/core";
|
||||||
import { TransferService } from "../../../modules/sys/enterprise/service/transfer-service.js";
|
import { TransferService } from "../../../modules/sys/enterprise/service/transfer-service.js";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -17,10 +16,6 @@ export class TransferController extends BaseController {
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.enterprise;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 我自己的资源
|
* 我自己的资源
|
||||||
* @param body
|
* @param body
|
||||||
@@ -43,7 +38,6 @@ export class TransferController extends BaseController {
|
|||||||
const { projectId } = await this.getProjectUserIdRead();
|
const { projectId } = await this.getProjectUserIdRead();
|
||||||
const userId = this.getUserId();
|
const userId = this.getUserId();
|
||||||
await this.service.transferAll(userId, projectId);
|
await this.service.transferAll(userId, projectId);
|
||||||
this.auditLog({ content: "迁移了项目资源" });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { BaseController } from "@certd/lib-server";
|
|||||||
import { Constants } from "@certd/lib-server";
|
import { Constants } from "@certd/lib-server";
|
||||||
import { EmailService } from "../../../modules/basic/service/email-service.js";
|
import { EmailService } from "../../../modules/basic/service/email-service.js";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -14,15 +13,10 @@ export class EmailController extends BaseController {
|
|||||||
@Inject()
|
@Inject()
|
||||||
emailService: EmailService;
|
emailService: EmailService;
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.mine;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/test", { description: Constants.per.authOnly, summary: "测试邮件发送" })
|
@Post("/test", { description: Constants.per.authOnly, summary: "测试邮件发送" })
|
||||||
public async test(@Body("receiver") receiver) {
|
public async test(@Body("receiver") receiver) {
|
||||||
const userId = super.getUserId();
|
const userId = super.getUserId();
|
||||||
await this.emailService.test(userId, receiver);
|
await this.emailService.test(userId, receiver);
|
||||||
this.auditLog({ content: "测试了邮件发送" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,7 +31,6 @@ export class EmailController extends BaseController {
|
|||||||
public async add(@Body("email") email) {
|
public async add(@Body("email") email) {
|
||||||
const userId = super.getUserId();
|
const userId = super.getUserId();
|
||||||
await this.emailService.add(userId, email);
|
await this.emailService.add(userId, email);
|
||||||
this.auditLog({ content: "添加了邮件" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,7 +38,6 @@ export class EmailController extends BaseController {
|
|||||||
public async delete(@Body("email") email) {
|
public async delete(@Body("email") email) {
|
||||||
const userId = super.getUserId();
|
const userId = super.getUserId();
|
||||||
await this.emailService.delete(userId, email);
|
await this.emailService.delete(userId, email);
|
||||||
this.auditLog({ content: "删除了邮件" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { http, logger, utils } from "@certd/basic";
|
|||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { CodeService } from "../../../modules/basic/service/code-service.js";
|
import { CodeService } from "../../../modules/basic/service/code-service.js";
|
||||||
import { EmailService } from "../../../modules/basic/service/email-service.js";
|
import { EmailService } from "../../../modules/basic/service/email-service.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
import { TaskServiceBuilder } from "../../../modules/pipeline/service/getter/task-service-getter.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -41,9 +41,8 @@ export class MineController extends BaseController {
|
|||||||
@Inject()
|
@Inject()
|
||||||
emailService: EmailService;
|
emailService: EmailService;
|
||||||
|
|
||||||
getAuditType(): string {
|
@Inject()
|
||||||
return AuditType.mine;
|
taskServiceBuilder: TaskServiceBuilder;
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/info", { description: Constants.per.authOnly, summary: "查询用户信息" })
|
@Post("/info", { description: Constants.per.authOnly, summary: "查询用户信息" })
|
||||||
public async info() {
|
public async info() {
|
||||||
@@ -78,7 +77,6 @@ export class MineController extends BaseController {
|
|||||||
public async changePassword(@Body(ALL) body: any) {
|
public async changePassword(@Body(ALL) body: any) {
|
||||||
const userId = this.getUserId();
|
const userId = this.getUserId();
|
||||||
await this.userService.changePassword(userId, body);
|
await this.userService.changePassword(userId, body);
|
||||||
this.auditLog({ content: "修改了密码" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -86,7 +84,6 @@ export class MineController extends BaseController {
|
|||||||
public async initPassword(@Body(ALL) body: any) {
|
public async initPassword(@Body(ALL) body: any) {
|
||||||
const userId = this.getUserId();
|
const userId = this.getUserId();
|
||||||
await this.userService.initPassword(userId, body);
|
await this.userService.initPassword(userId, body);
|
||||||
this.auditLog({ content: "初始化了密码" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,7 +95,6 @@ export class MineController extends BaseController {
|
|||||||
avatar: body.avatar,
|
avatar: body.avatar,
|
||||||
nickName: body.nickName,
|
nickName: body.nickName,
|
||||||
});
|
});
|
||||||
this.auditLog({ content: "更新了个人资料" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,7 +133,6 @@ export class MineController extends BaseController {
|
|||||||
phoneCode: body.phoneCode,
|
phoneCode: body.phoneCode,
|
||||||
mobile: body.mobile,
|
mobile: body.mobile,
|
||||||
});
|
});
|
||||||
this.auditLog({ content: "修改了手机号" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -154,7 +149,6 @@ export class MineController extends BaseController {
|
|||||||
await this.userService.updateEmail(userId, {
|
await this.userService.updateEmail(userId, {
|
||||||
email: body.email,
|
email: body.email,
|
||||||
});
|
});
|
||||||
this.auditLog({ content: "修改了邮箱" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -186,11 +180,13 @@ export class MineController extends BaseController {
|
|||||||
|
|
||||||
const getAccessById = this.accessService.getById.bind(this.accessService);
|
const getAccessById = this.accessService.getById.bind(this.accessService);
|
||||||
const accessGetter = new AccessGetter(userId, undefined, getAccessById);
|
const accessGetter = new AccessGetter(userId, undefined, getAccessById);
|
||||||
|
const serviceGetter = this.taskServiceBuilder.create({ userId });
|
||||||
const accessContext = {
|
const accessContext = {
|
||||||
http,
|
http,
|
||||||
logger,
|
logger,
|
||||||
utils,
|
utils,
|
||||||
accessService: accessGetter,
|
accessService: accessGetter,
|
||||||
|
serviceGetter,
|
||||||
define: undefined,
|
define: undefined,
|
||||||
} as any;
|
} as any;
|
||||||
const access = await newAccess("acmeAccount", { caType: "letsencrypt", email: userEmail }, accessGetter, accessContext);
|
const access = await newAccess("acmeAccount", { caType: "letsencrypt", email: userEmail }, accessGetter, accessContext);
|
||||||
@@ -208,7 +204,6 @@ export class MineController extends BaseController {
|
|||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
|
||||||
this.auditLog({ content: "初始化了Let's Encrypt ACME账号和邮件通知" });
|
|
||||||
return this.ok({ success: true });
|
return this.ok({ success: true });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { PasskeyService } from "../../../modules/login/service/passkey-service.j
|
|||||||
import { BaseController, Constants } from "@certd/lib-server";
|
import { BaseController, Constants } from "@certd/lib-server";
|
||||||
import { UserService } from "../../../modules/sys/authority/service/user-service.js";
|
import { UserService } from "../../../modules/sys/authority/service/user-service.js";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
@Provide()
|
@Provide()
|
||||||
@Controller("/api/mine/passkey")
|
@Controller("/api/mine/passkey")
|
||||||
@@ -15,10 +14,6 @@ export class MinePasskeyController extends BaseController {
|
|||||||
@Inject()
|
@Inject()
|
||||||
userService: UserService;
|
userService: UserService;
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.mine;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/generateRegistration", { description: Constants.per.authOnly, summary: "生成Passkey注册选项" })
|
@Post("/generateRegistration", { description: Constants.per.authOnly, summary: "生成Passkey注册选项" })
|
||||||
public async generateRegistration(
|
public async generateRegistration(
|
||||||
@Body(ALL)
|
@Body(ALL)
|
||||||
@@ -51,7 +46,7 @@ export class MinePasskeyController extends BaseController {
|
|||||||
const deviceName = body.deviceName;
|
const deviceName = body.deviceName;
|
||||||
|
|
||||||
const result = await this.passkeyService.registerPasskey(userId, response, challenge, deviceName, this.ctx);
|
const result = await this.passkeyService.registerPasskey(userId, response, challenge, deviceName, this.ctx);
|
||||||
this.auditLog({ content: "验证注册了Passkey" });
|
|
||||||
return this.ok(result);
|
return this.ok(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -67,7 +62,6 @@ export class MinePasskeyController extends BaseController {
|
|||||||
|
|
||||||
const result = await this.passkeyService.registerPasskey(userId, response, challenge, deviceName, this.ctx);
|
const result = await this.passkeyService.registerPasskey(userId, response, challenge, deviceName, this.ctx);
|
||||||
|
|
||||||
this.auditLog({ content: "注册了Passkey" });
|
|
||||||
return this.ok(result);
|
return this.ok(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -96,7 +90,6 @@ export class MinePasskeyController extends BaseController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await this.passkeyService.delete([passkey.id]);
|
await this.passkeyService.delete([passkey.id]);
|
||||||
this.auditLog({ content: "解绑了Passkey" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import { merge } from "lodash-es";
|
|||||||
import { TwoFactorService } from "../../../modules/mine/service/two-factor-service.js";
|
import { TwoFactorService } from "../../../modules/mine/service/two-factor-service.js";
|
||||||
import { isPlus } from "@certd/plus-core";
|
import { isPlus } from "@certd/plus-core";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -20,10 +19,6 @@ export class UserTwoFactorSettingController extends BaseController {
|
|||||||
@Inject()
|
@Inject()
|
||||||
twoFactorService: TwoFactorService;
|
twoFactorService: TwoFactorService;
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.mine;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/get", { description: Constants.per.authOnly, summary: "获取双因子认证设置" })
|
@Post("/get", { description: Constants.per.authOnly, summary: "获取双因子认证设置" })
|
||||||
async get() {
|
async get() {
|
||||||
const userId = this.getUserId();
|
const userId = this.getUserId();
|
||||||
@@ -47,7 +42,6 @@ export class UserTwoFactorSettingController extends BaseController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await this.service.saveSetting(userId, null, setting);
|
await this.service.saveSetting(userId, null, setting);
|
||||||
this.auditLog({ content: "保存了双因子认证设置" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,7 +62,6 @@ export class UserTwoFactorSettingController extends BaseController {
|
|||||||
userId,
|
userId,
|
||||||
verifyCode: bean.verifyCode,
|
verifyCode: bean.verifyCode,
|
||||||
});
|
});
|
||||||
this.auditLog({ content: "保存了验证器设置" });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,7 +69,6 @@ export class UserTwoFactorSettingController extends BaseController {
|
|||||||
async authenticatorOff() {
|
async authenticatorOff() {
|
||||||
const userId = this.getUserId();
|
const userId = this.getUserId();
|
||||||
await this.twoFactorService.offAuthenticator(userId);
|
await this.twoFactorService.offAuthenticator(userId);
|
||||||
this.auditLog({ content: "关闭了验证器" });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import { UserGrantSetting } from "../../../modules/mine/service/models.js";
|
|||||||
import { isPlus } from "@certd/plus-core";
|
import { isPlus } from "@certd/plus-core";
|
||||||
import { merge } from "lodash-es";
|
import { merge } from "lodash-es";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -21,10 +20,6 @@ export class UserSettingsController extends CrudController<UserSettingsService>
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.mine;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: Constants.per.authOnly, summary: "查询用户设置分页列表" })
|
@Post("/page", { description: Constants.per.authOnly, summary: "查询用户设置分页列表" })
|
||||||
async page(@Body(ALL) body) {
|
async page(@Body(ALL) body) {
|
||||||
body.query = body.query ?? {};
|
body.query = body.query ?? {};
|
||||||
@@ -67,7 +62,6 @@ export class UserSettingsController extends CrudController<UserSettingsService>
|
|||||||
async save(@Body(ALL) bean: UserSettingsEntity) {
|
async save(@Body(ALL) bean: UserSettingsEntity) {
|
||||||
bean.userId = this.getUserId();
|
bean.userId = this.getUserId();
|
||||||
await this.service.save(bean);
|
await this.service.save(bean);
|
||||||
this.auditLog({ content: "保存了用户设置" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -94,7 +88,6 @@ export class UserSettingsController extends CrudController<UserSettingsService>
|
|||||||
merge(setting, bean);
|
merge(setting, bean);
|
||||||
|
|
||||||
await this.service.saveSetting(userId, null, setting);
|
await this.service.saveSetting(userId, null, setting);
|
||||||
this.auditLog({ content: "保存了授权设置" });
|
|
||||||
return this.ok({});
|
return this.ok({});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import { logger } from "@certd/basic";
|
|||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { CertReader } from "@certd/plugin-lib";
|
import { CertReader } from "@certd/plugin-lib";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -30,10 +29,6 @@ export class CertInfoController extends CrudController<CertInfoService> {
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.monitor;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: Constants.per.authOnly, summary: "查询证书分页列表" })
|
@Post("/page", { description: Constants.per.authOnly, summary: "查询证书分页列表" })
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
body.query = body.query ?? {};
|
body.query = body.query ?? {};
|
||||||
@@ -122,9 +117,7 @@ export class CertInfoController extends CrudController<CertInfoService> {
|
|||||||
const { projectId, userId } = await this.getProjectUserIdWrite();
|
const { projectId, userId } = await this.getProjectUserIdWrite();
|
||||||
bean.projectId = projectId;
|
bean.projectId = projectId;
|
||||||
bean.userId = userId;
|
bean.userId = userId;
|
||||||
const res = await super.add(bean);
|
return await super.add(bean);
|
||||||
this.auditLog({ content: `新增了证书(ID:${res.data})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/update", { description: Constants.per.authOnly, summary: "更新证书" })
|
@Post("/update", { description: Constants.per.authOnly, summary: "更新证书" })
|
||||||
@@ -132,9 +125,7 @@ export class CertInfoController extends CrudController<CertInfoService> {
|
|||||||
await this.checkOwner(this.service, bean.id, "write");
|
await this.checkOwner(this.service, bean.id, "write");
|
||||||
delete bean.userId;
|
delete bean.userId;
|
||||||
delete bean.projectId;
|
delete bean.projectId;
|
||||||
const res = await super.update(bean);
|
return await super.update(bean);
|
||||||
this.auditLog({ content: `修改了证书(ID:${bean.id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
@Post("/info", { description: Constants.per.authOnly, summary: "查询证书详情" })
|
@Post("/info", { description: Constants.per.authOnly, summary: "查询证书详情" })
|
||||||
async info(@Query("id") id: number) {
|
async info(@Query("id") id: number) {
|
||||||
@@ -145,9 +136,7 @@ export class CertInfoController extends CrudController<CertInfoService> {
|
|||||||
@Post("/delete", { description: Constants.per.authOnly, summary: "删除证书" })
|
@Post("/delete", { description: Constants.per.authOnly, summary: "删除证书" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
await this.checkOwner(this.service, id, "write");
|
await this.checkOwner(this.service, id, "write");
|
||||||
const res = await super.delete(id);
|
return await super.delete(id);
|
||||||
this.auditLog({ content: `删除了证书(ID:${id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/all", { description: Constants.per.authOnly, summary: "查询所有证书" })
|
@Post("/all", { description: Constants.per.authOnly, summary: "查询所有证书" })
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { ApiTags } from "@midwayjs/swagger";
|
|||||||
import { SiteInfoService } from "../../../modules/monitor/index.js";
|
import { SiteInfoService } from "../../../modules/monitor/index.js";
|
||||||
import { JobHistoryService } from "../../../modules/monitor/service/job-history-service.js";
|
import { JobHistoryService } from "../../../modules/monitor/service/job-history-service.js";
|
||||||
import { AuthService } from "../../../modules/sys/authority/service/auth-service.js";
|
import { AuthService } from "../../../modules/sys/authority/service/auth-service.js";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -23,10 +22,6 @@ export class JobHistoryController extends CrudController<JobHistoryService> {
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.jobHistory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: Constants.per.authOnly, summary: "查询监控运行历史分页列表" })
|
@Post("/page", { description: Constants.per.authOnly, summary: "查询监控运行历史分页列表" })
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
const { projectId, userId } = await this.getProjectUserIdRead();
|
const { projectId, userId } = await this.getProjectUserIdRead();
|
||||||
@@ -59,15 +54,12 @@ export class JobHistoryController extends CrudController<JobHistoryService> {
|
|||||||
@Post("/delete", { description: Constants.per.authOnly, summary: "删除监控运行历史" })
|
@Post("/delete", { description: Constants.per.authOnly, summary: "删除监控运行历史" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
await this.checkOwner(this.service, id, "write");
|
await this.checkOwner(this.service, id, "write");
|
||||||
const res = await super.delete(id);
|
return await super.delete(id);
|
||||||
this.auditLog({ content: `删除了监控运行历史(ID:${id})` });
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
@Post("/batchDelete", { description: Constants.per.authOnly, summary: "批量删除监控运行历史" })
|
@Post("/batchDelete", { description: Constants.per.authOnly, summary: "批量删除监控运行历史" })
|
||||||
async batchDelete(@Body("ids") ids: number[]) {
|
async batchDelete(@Body("ids") ids: number[]) {
|
||||||
const { projectId, userId } = await this.getProjectUserIdWrite();
|
const { projectId, userId } = await this.getProjectUserIdWrite();
|
||||||
await this.service.batchDelete(ids, userId, projectId);
|
await this.service.batchDelete(ids, userId, projectId);
|
||||||
this.auditLog({ content: `批量删除了${ids.length}条监控运行历史` });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import { merge } from "lodash-es";
|
|||||||
import { SiteIpService } from "../../../modules/monitor/service/site-ip-service.js";
|
import { SiteIpService } from "../../../modules/monitor/service/site-ip-service.js";
|
||||||
import { utils } from "@certd/basic";
|
import { utils } from "@certd/basic";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -21,14 +20,11 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
|
|||||||
authService: AuthService;
|
authService: AuthService;
|
||||||
@Inject()
|
@Inject()
|
||||||
siteIpService: SiteIpService;
|
siteIpService: SiteIpService;
|
||||||
|
|
||||||
getService(): SiteInfoService {
|
getService(): SiteInfoService {
|
||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.monitor;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: Constants.per.authOnly, summary: "查询站点监控分页列表" })
|
@Post("/page", { description: Constants.per.authOnly, summary: "查询站点监控分页列表" })
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
body.query = body.query ?? {};
|
body.query = body.query ?? {};
|
||||||
@@ -79,9 +75,6 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
|
|||||||
if (entity.disabled) {
|
if (entity.disabled) {
|
||||||
this.service.check(entity.id, true, 0);
|
this.service.check(entity.id, true, 0);
|
||||||
}
|
}
|
||||||
this.auditLog({
|
|
||||||
content: `新增了站点监控「${bean.name}」(ID:${res.id}, 域名:${bean.domain})`,
|
|
||||||
});
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -95,9 +88,6 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
|
|||||||
if (entity.disabled) {
|
if (entity.disabled) {
|
||||||
this.service.check(entity.id, true, 0);
|
this.service.check(entity.id, true, 0);
|
||||||
}
|
}
|
||||||
this.auditLog({
|
|
||||||
content: `修改了站点监控「${bean.name}」(ID:${bean.id})`,
|
|
||||||
});
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
@Post("/info", { description: Constants.per.authOnly, summary: "查询站点监控详情" })
|
@Post("/info", { description: Constants.per.authOnly, summary: "查询站点监控详情" })
|
||||||
@@ -109,20 +99,13 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
|
|||||||
@Post("/delete", { description: Constants.per.authOnly, summary: "删除站点监控" })
|
@Post("/delete", { description: Constants.per.authOnly, summary: "删除站点监控" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
await this.checkOwner(this.service, id, "write");
|
await this.checkOwner(this.service, id, "write");
|
||||||
const res = await super.delete(id);
|
return await super.delete(id);
|
||||||
this.auditLog({
|
|
||||||
content: `删除了站点监控(ID:${id})`,
|
|
||||||
});
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/batchDelete", { description: Constants.per.authOnly, summary: "批量删除站点监控" })
|
@Post("/batchDelete", { description: Constants.per.authOnly, summary: "批量删除站点监控" })
|
||||||
async batchDelete(@Body(ALL) body: any) {
|
async batchDelete(@Body(ALL) body: any) {
|
||||||
const { projectId, userId } = await this.getProjectUserIdWrite();
|
const { projectId, userId } = await this.getProjectUserIdWrite();
|
||||||
const count = await this.service.batchDelete(body.ids, userId, projectId);
|
await this.service.batchDelete(body.ids, userId, projectId);
|
||||||
this.auditLog({
|
|
||||||
content: `批量删除了${count}条站点监控`,
|
|
||||||
});
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -150,7 +133,6 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
|
|||||||
userId,
|
userId,
|
||||||
projectId,
|
projectId,
|
||||||
});
|
});
|
||||||
this.auditLog({ content: "导入了站点监控" });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,7 +170,6 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
|
|||||||
projectId: projectId,
|
projectId: projectId,
|
||||||
key,
|
key,
|
||||||
});
|
});
|
||||||
this.auditLog({ content: "删除了站点监控导入任务" });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -201,7 +182,6 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
|
|||||||
userId: userId,
|
userId: userId,
|
||||||
projectId: projectId,
|
projectId: projectId,
|
||||||
});
|
});
|
||||||
this.auditLog({ content: "开始了站点监控导入任务" });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { AuthService } from "../../../modules/sys/authority/service/auth-service
|
|||||||
import { SiteIpService } from "../../../modules/monitor/service/site-ip-service.js";
|
import { SiteIpService } from "../../../modules/monitor/service/site-ip-service.js";
|
||||||
import { SiteInfoService } from "../../../modules/monitor/index.js";
|
import { SiteInfoService } from "../../../modules/monitor/index.js";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -23,10 +22,6 @@ export class SiteInfoController extends CrudController<SiteIpService> {
|
|||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.siteIp;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: Constants.per.authOnly, summary: "查询站点IP分页列表" })
|
@Post("/page", { description: Constants.per.authOnly, summary: "查询站点IP分页列表" })
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
const { projectId, userId } = await this.getProjectUserIdRead();
|
const { projectId, userId } = await this.getProjectUserIdRead();
|
||||||
@@ -62,7 +57,6 @@ export class SiteInfoController extends CrudController<SiteIpService> {
|
|||||||
const { domain, httpsPort } = siteEntity;
|
const { domain, httpsPort } = siteEntity;
|
||||||
this.service.check(res.id, domain, httpsPort);
|
this.service.check(res.id, domain, httpsPort);
|
||||||
}
|
}
|
||||||
this.auditLog({ content: `新增了站点IP(ID:${res.id})` });
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,7 +71,6 @@ export class SiteInfoController extends CrudController<SiteIpService> {
|
|||||||
const { domain, httpsPort } = siteEntity;
|
const { domain, httpsPort } = siteEntity;
|
||||||
this.service.check(siteEntity.id, domain, httpsPort);
|
this.service.check(siteEntity.id, domain, httpsPort);
|
||||||
}
|
}
|
||||||
this.auditLog({ content: `修改了站点IP(ID:${bean.id})` });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
@Post("/info", { description: Constants.per.authOnly, summary: "查询站点IP详情" })
|
@Post("/info", { description: Constants.per.authOnly, summary: "查询站点IP详情" })
|
||||||
@@ -92,7 +85,6 @@ export class SiteInfoController extends CrudController<SiteIpService> {
|
|||||||
const entity = await this.service.info(id);
|
const entity = await this.service.info(id);
|
||||||
const res = await super.delete(id);
|
const res = await super.delete(id);
|
||||||
await this.service.updateIpCount(entity.siteId);
|
await this.service.updateIpCount(entity.siteId);
|
||||||
this.auditLog({ content: `删除了站点IP(ID:${id})` });
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -132,7 +124,6 @@ export class SiteInfoController extends CrudController<SiteIpService> {
|
|||||||
siteId: body.siteId,
|
siteId: body.siteId,
|
||||||
projectId,
|
projectId,
|
||||||
});
|
});
|
||||||
this.auditLog({ content: "导入了站点IP" });
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { Constants, CrudController } from "@certd/lib-server";
|
|||||||
import { AuthService } from "../../../modules/sys/authority/service/auth-service.js";
|
import { AuthService } from "../../../modules/sys/authority/service/auth-service.js";
|
||||||
import { OpenKeyService } from "../../../modules/open/service/open-key-service.js";
|
import { OpenKeyService } from "../../../modules/open/service/open-key-service.js";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -15,14 +14,11 @@ export class OpenKeyController extends CrudController<OpenKeyService> {
|
|||||||
service: OpenKeyService;
|
service: OpenKeyService;
|
||||||
@Inject()
|
@Inject()
|
||||||
authService: AuthService;
|
authService: AuthService;
|
||||||
|
|
||||||
getService(): OpenKeyService {
|
getService(): OpenKeyService {
|
||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuditType(): string {
|
|
||||||
return AuditType.openKey;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("/page", { description: Constants.per.authOnly, summary: "查询开放API密钥分页列表" })
|
@Post("/page", { description: Constants.per.authOnly, summary: "查询开放API密钥分页列表" })
|
||||||
async page(@Body(ALL) body: any) {
|
async page(@Body(ALL) body: any) {
|
||||||
const { projectId, userId } = await this.getProjectUserIdRead();
|
const { projectId, userId } = await this.getProjectUserIdRead();
|
||||||
@@ -61,9 +57,6 @@ export class OpenKeyController extends CrudController<OpenKeyService> {
|
|||||||
body.projectId = projectId;
|
body.projectId = projectId;
|
||||||
body.userId = userId;
|
body.userId = userId;
|
||||||
const res = await this.service.add(body);
|
const res = await this.service.add(body);
|
||||||
this.auditLog({
|
|
||||||
content: `新增了API密钥(ID:${res.id}, scope:${body.scope})`,
|
|
||||||
});
|
|
||||||
return this.ok(res);
|
return this.ok(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,9 +66,6 @@ export class OpenKeyController extends CrudController<OpenKeyService> {
|
|||||||
delete bean.userId;
|
delete bean.userId;
|
||||||
delete bean.projectId;
|
delete bean.projectId;
|
||||||
await this.service.update(bean);
|
await this.service.update(bean);
|
||||||
this.auditLog({
|
|
||||||
content: `修改了API密钥(ID:${bean.id})`,
|
|
||||||
});
|
|
||||||
return this.ok();
|
return this.ok();
|
||||||
}
|
}
|
||||||
@Post("/info", { description: Constants.per.authOnly, summary: "查询开放API密钥详情" })
|
@Post("/info", { description: Constants.per.authOnly, summary: "查询开放API密钥详情" })
|
||||||
@@ -100,11 +90,7 @@ export class OpenKeyController extends CrudController<OpenKeyService> {
|
|||||||
@Post("/delete", { description: Constants.per.authOnly, summary: "删除开放API密钥" })
|
@Post("/delete", { description: Constants.per.authOnly, summary: "删除开放API密钥" })
|
||||||
async delete(@Query("id") id: number) {
|
async delete(@Query("id") id: number) {
|
||||||
await this.checkOwner(this.getService(), id, "write");
|
await this.checkOwner(this.getService(), id, "write");
|
||||||
const res = await super.delete(id);
|
return await super.delete(id);
|
||||||
this.auditLog({
|
|
||||||
content: `删除了API密钥(ID:${id})`,
|
|
||||||
});
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("/getApiToken", { description: Constants.per.authOnly, summary: "获取API测试令牌" })
|
@Post("/getApiToken", { description: Constants.per.authOnly, summary: "获取API测试令牌" })
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user