mirror of
https://github.com/certd/certd.git
synced 2026-07-19 21:27:35 +08:00
Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ce4839bd80 | |||
| eee22154e3 | |||
| 49007d3915 | |||
| f9b453ca8c | |||
| 9d83adaac8 | |||
| 15740904e5 | |||
| 85e9ff7a96 | |||
| 947fe729cb | |||
| bfb3ee4c43 | |||
| bab1df2c78 | |||
| 00eabec771 | |||
| f2855d6dac | |||
| 4250d0e266 |
@@ -105,8 +105,10 @@ jobs:
|
||||
tags: |
|
||||
registry.cn-shenzhen.aliyuncs.com/handsfree/certd:slim
|
||||
registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}-slim
|
||||
greper/certd:slim
|
||||
greper/certd:${{steps.get_certd_version.outputs.result}}-slim
|
||||
registry.cn-shenzhen.aliyuncs.com/certd/certd:slim
|
||||
registry.cn-shenzhen.aliyuncs.com/certd/certd:${{steps.get_certd_version.outputs.result}}-slim
|
||||
certd/certd:slim
|
||||
certd/certd:${{steps.get_certd_version.outputs.result}}-slim
|
||||
ghcr.io/${{ github.repository }}:slim
|
||||
ghcr.io/${{ github.repository }}:${{steps.get_certd_version.outputs.result}}-slim
|
||||
|
||||
@@ -119,8 +121,10 @@ jobs:
|
||||
tags: |
|
||||
registry.cn-shenzhen.aliyuncs.com/handsfree/certd:armv7
|
||||
registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}-armv7
|
||||
greper/certd:armv7
|
||||
greper/certd:${{steps.get_certd_version.outputs.result}}-armv7
|
||||
registry.cn-shenzhen.aliyuncs.com/certd/certd:armv7
|
||||
registry.cn-shenzhen.aliyuncs.com/certd/certd:${{steps.get_certd_version.outputs.result}}-armv7
|
||||
certd/certd:armv7
|
||||
certd/certd:${{steps.get_certd_version.outputs.result}}-armv7
|
||||
ghcr.io/${{ github.repository }}:armv7
|
||||
ghcr.io/${{ github.repository }}:${{steps.get_certd_version.outputs.result}}-armv7
|
||||
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
name: stable-release
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: "版本号(如 v1.42.5)"
|
||||
required: true
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
packages: write
|
||||
|
||||
jobs:
|
||||
make-stable:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v3
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Login to aliyun container Registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: registry.cn-shenzhen.aliyuncs.com
|
||||
username: ${{ secrets.aliyun_cs_username }}
|
||||
password: ${{ secrets.aliyun_cs_password }}
|
||||
|
||||
- name: Login to GitHub Packages
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Login to Docker Hub
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
username: ${{ secrets.dockerhub_username }}
|
||||
password: ${{ secrets.dockerhub_password }}
|
||||
|
||||
# stable 镜像:叠加 ENV 层
|
||||
- name: Build and push stable images
|
||||
run: |
|
||||
echo "FROM greper/certd:${{ inputs.version }}
|
||||
ENV certd_release_mode=stable" > Dockerfile.stable
|
||||
docker buildx build \
|
||||
--platform linux/amd64,linux/arm64 \
|
||||
--push \
|
||||
-f Dockerfile.stable \
|
||||
-t registry.cn-shenzhen.aliyuncs.com/handsfree/certd:stable \
|
||||
-t registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{ inputs.version }}-stable \
|
||||
-t registry.cn-shenzhen.aliyuncs.com/certd/certd:stable \
|
||||
-t registry.cn-shenzhen.aliyuncs.com/certd/certd:${{ inputs.version }}-stable \
|
||||
-t certd/certd:stable \
|
||||
-t certd/certd:${{ inputs.version }}-stable \
|
||||
-t ghcr.io/${{ github.repository }}:stable \
|
||||
-t ghcr.io/${{ github.repository }}:${{ inputs.version }}-stable \
|
||||
.
|
||||
|
||||
# slim-stable 镜像
|
||||
- name: Build and push slim-stable images
|
||||
run: |
|
||||
echo "FROM greper/certd:${{ inputs.version }}-slim
|
||||
ENV certd_release_mode=stable" > Dockerfile.slim-stable
|
||||
docker buildx build \
|
||||
--platform linux/amd64,linux/arm64 \
|
||||
--push \
|
||||
-f Dockerfile.slim-stable \
|
||||
-t registry.cn-shenzhen.aliyuncs.com/handsfree/certd:slim-stable \
|
||||
-t registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{ inputs.version }}-slim-stable \
|
||||
-t registry.cn-shenzhen.aliyuncs.com/certd/certd:slim-stable \
|
||||
-t registry.cn-shenzhen.aliyuncs.com/certd/certd:${{ inputs.version }}-slim-stable \
|
||||
-t certd/certd:slim-stable \
|
||||
-t certd/certd:${{ inputs.version }}-slim-stable \
|
||||
-t ghcr.io/${{ github.repository }}:slim-stable \
|
||||
-t ghcr.io/${{ github.repository }}:${{ inputs.version }}-slim-stable \
|
||||
.
|
||||
|
||||
- name: Set AtomGit release as stable
|
||||
run: |
|
||||
export ATOMGIT_TOKEN=${{ secrets.ATOMGIT_TOKEN }}
|
||||
export VERSION=${{ inputs.version }}
|
||||
npm run set-release-stable
|
||||
@@ -1,412 +0,0 @@
|
||||
# 插件依赖按需加载方案
|
||||
|
||||
## 背景与目标
|
||||
|
||||
### 当前问题
|
||||
- `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` 体积,提升初始安装速度,同时保持现有架构的兼容性和可维护性。
|
||||
@@ -217,3 +217,18 @@ Certd 是可私有化部署的 SSL/TLS 证书自动化管理平台,提供 Web
|
||||
### 旧版数据兼容
|
||||
|
||||
- 新增插件参数时,必须要考虑旧版数据兼容,比如新增一个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" })` 记录日志。
|
||||
- Controller 中的 `@Post("/add", { summary: "xxxx" })`, 这个summary是必须要的,他是日志action字段的来源
|
||||
- `getAuditType()` 返回类型常量,中间件自动从 ctx.path 判定 scope(`/api/sys/` → system,其他 → user)。
|
||||
- 操作日志有系统级(scope=system)和用户级(scope=user)区分。
|
||||
|
||||
@@ -3,16 +3,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.42.6](https://github.com/certd/certd/compare/v1.42.5...v1.42.6) (2026-07-18)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* 修复正常批量删除流水线报权限不足的bug ([5b50083](https://github.com/certd/certd/commit/5b500830a122c6c42dab054e57fed509050f94da))
|
||||
|
||||
### Performance Improvements
|
||||
|
||||
* 优化动态加载依赖镜像地址,多次重试 ([5f53b81](https://github.com/certd/certd/commit/5f53b81c75dd242b4260ac08cae14c6d1a08a883))
|
||||
|
||||
## [1.42.5](https://github.com/certd/certd/compare/v1.42.4...v1.42.5) (2026-07-15)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Certd
|
||||
# Certd
|
||||
|
||||
中文 | [English](./README_en.md)
|
||||
|
||||
@@ -105,33 +105,56 @@ https://certd.handfree.work/
|
||||
|
||||
#### Docker镜像说明:
|
||||
|
||||
**镜像版本:**
|
||||
##### 1. 镜像地址格式:
|
||||
|
||||
```
|
||||
registry.cn-shenzhen.aliyuncs.com/certd/certd:[version-][system-][latest/stable]
|
||||
------------ ↑ 镜像地址 ------------- ↑ 镜像名 -- ↑指定版本- ↑基础系统- ↑最新版本类型
|
||||
```
|
||||
##### 2. 版本标签:
|
||||
|
||||
**最新版本标签:**
|
||||
|
||||
| 版本 | 标签 | 说明 |
|
||||
| --- | --- | --- |
|
||||
| 最新预览版【默认】 | `certd:latest` | 指向最新开发版本,包含最新功能,但稳定性不如稳定版 |
|
||||
| 最新稳定版 | `certd:stable` | 指向经过充分测试的生产就绪版本,推荐生产环境使用 |
|
||||
|
||||
**系统分支版本:**
|
||||
|
||||
> 根据基础镜像不同,分为如下三个分支版本,没有特殊需求选择默认的即可(他们功能是一样的)
|
||||
|
||||
| 系统版本 | 版本标签 | 基础系统 | 说明 | 稳定版标签 |
|
||||
| --- | --- | --- | --- | --- |
|
||||
| alpine【默认】 | `certd:latest` | Alpine Linux | 默认版本,镜像体积小 | `certd:stable` |
|
||||
| slim | `certd:slim` | Debian slim | 基于glibc,dns解析兼容性好 | `certd:slim-stable` |
|
||||
| armv7 | `certd:armv7` | Alpine Linux | ARMv7 架构专用版本 | `certd:armv7-stable` |
|
||||
|
||||
##### 2. 镜像地址:
|
||||
|
||||
| 镜像仓库 | 最新预览版 | slim | armv7 |
|
||||
| --- | --- | --- | --- |
|
||||
| 阿里云【默认】 | `registry.cn-shenzhen.aliyuncs.com/certd/certd:latest` | `certd:slim` | `certd:armv7` |
|
||||
| Docker Hub | `greper/certd:latest` | `certd:slim` |
|
||||
| GitHub Packages | `ghcr.io/certd/certd:latest` | `certd:slim` | `certd:armv7` |
|
||||
|
||||
|
||||
| 标签 | 指定版本 | 基础系统 | 说明 |
|
||||
| --- | --- | --- | --- |
|
||||
| `latest` | `[version]` | Alpine Linux | 默认版本,镜像体积小 |
|
||||
| `slim` | `[version]-slim` | Debian slim | 基于glibc,dns解析兼容性好(可能需要配置security_opt -seccomp=unconfined) |
|
||||
| `armv7` | `[version]-armv7` | Alpine Linux | ARMv7 架构专用版本 |
|
||||
> 注意:
|
||||
> 1. 后面的各个版本省略了镜像地址,使用时需要将镜像地址拼接完整。
|
||||
> 2. 稳定版在后面加 `-stable` 即可。
|
||||
> 3. 如需指定具体的版本号,在冒号后面加 `version-`即可,例如 `certd:1.42.1-stable`。
|
||||
|
||||
|
||||
**镜像地址:**
|
||||
|
||||
| 镜像仓库 | latest | slim | armv7 |
|
||||
| --- | --- | --- | --- |
|
||||
| 阿里云 | `registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest` | `registry.cn-shenzhen.aliyuncs.com/handsfree/certd:slim` | `registry.cn-shenzhen.aliyuncs.com/handsfree/certd:armv7` |
|
||||
| Docker Hub | `greper/certd:latest` | `greper/certd:slim` | `greper/certd:armv7` |
|
||||
| GitHub Packages | `ghcr.io/certd/certd:latest` | `ghcr.io/certd/certd:slim` | `ghcr.io/certd/certd:armv7` |
|
||||
|
||||
> 带版本号的标签请将 `latest` / `slim` / `armv7` 替换为 `[version]` / `[version]-slim` / `[version]-armv7`
|
||||
##### 3. 镜像构建说明:
|
||||
|
||||
- 镜像构建通过`Actions`自动执行,过程公开透明,请放心使用
|
||||
- [点我查看镜像构建日志](https://github.com/certd/certd/actions/workflows/build-image.yml)
|
||||
- [点我查看预览版构建日志](https://github.com/certd/certd/actions/workflows/release-image.yml)
|
||||
- [点我查看稳定版发布日志](https://github.com/certd/certd/actions/workflows/stable-release.yml)
|
||||
|
||||

|
||||
|
||||
> 注意:
|
||||
>
|
||||
##### 4. 安全注意事项:
|
||||
|
||||
> - 本应用存储的证书、授权信息等属于高度敏感数据,请做好安全防护
|
||||
> - 请务必使用HTTPS协议访问本应用,避免被中间人攻击
|
||||
> - 请务必使用web应用防火墙防护本应用,防止XSS、SQL注入等攻击
|
||||
|
||||
+36
-13
@@ -1,4 +1,4 @@
|
||||
# Certd
|
||||
# Certd
|
||||
|
||||
[中文](./README.md) | English
|
||||
|
||||
@@ -95,21 +95,44 @@ You can choose one of the following deployment methods based on your needs:
|
||||
|
||||
#### Docker Image Information:
|
||||
|
||||
- Domestic Image Addresses:
|
||||
- `registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest`
|
||||
- `registry.cn-shenzhen.aliyuncs.com/handsfree/certd:armv7`, `[version]-armv7`
|
||||
- DockerHub Addresses:
|
||||
- `https://hub.docker.com/r/greper/certd`
|
||||
- `greper/certd:latest`
|
||||
- `greper/certd:armv7`, `greper/certd:[version]-armv7`
|
||||
- GitHub Packages Addresses:
|
||||
**Release channels:**
|
||||
|
||||
- `ghcr.io/certd/certd:latest`
|
||||
- `ghcr.io/certd/certd:armv7`, `ghcr.io/certd/certd:[version]-armv7`
|
||||
| Channel | Description |
|
||||
| --- | --- |
|
||||
| `stable` / `slim-stable` | **Stable version**, production-ready and fully tested, recommended for production environments |
|
||||
| `latest` / `slim` / `armv7` | **Preview version**, latest development build with newest features but potentially less stable |
|
||||
|
||||
**Image tags:**
|
||||
|
||||
| Channel | Tag | Versioned Tag | Base System | Description |
|
||||
| --- | --- | --- | --- | --- |
|
||||
| **Stable** | `stable` | `[version]-stable` | Alpine Linux | Recommended for production |
|
||||
| | `slim-stable` | `[version]-slim-stable` | Debian slim | Better DNS resolution compatibility |
|
||||
| **Preview** | `latest` | `[version]` | Alpine Linux | Default, small image size |
|
||||
| | `slim` | `[version]-slim` | Debian slim | Better DNS resolution compatibility |
|
||||
| | `armv7` | `[version]-armv7` | Alpine Linux | ARMv7 architecture |
|
||||
|
||||
**Stable version image addresses:**
|
||||
|
||||
| Registry | `stable` | `slim-stable` |
|
||||
| --- | --- | --- |
|
||||
| Aliyun | `registry.cn-shenzhen.aliyuncs.com/handsfree/certd:stable` | `registry.cn-shenzhen.aliyuncs.com/handsfree/certd:slim-stable` |
|
||||
| Docker Hub | `greper/certd:stable` | `greper/certd:slim-stable` |
|
||||
| GitHub Packages | `ghcr.io/certd/certd:stable` | `ghcr.io/certd/certd:slim-stable` |
|
||||
|
||||
**Preview version image addresses:**
|
||||
|
||||
| Registry | `latest` | `slim` | `armv7` |
|
||||
| --- | --- | --- | --- |
|
||||
| Aliyun | `registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest` | `registry.cn-shenzhen.aliyuncs.com/handsfree/certd:slim` | `registry.cn-shenzhen.aliyuncs.com/handsfree/certd:armv7` |
|
||||
| Docker Hub | `greper/certd:latest` | `greper/certd:slim` | `greper/certd:armv7` |
|
||||
| GitHub Packages | `ghcr.io/certd/certd:latest` | `ghcr.io/certd/certd:slim` | `ghcr.io/certd/certd:armv7` |
|
||||
|
||||
> For versioned tags, replace tag name with `[version]-tag`, e.g. replace `stable` with `[version]-stable`
|
||||
|
||||
- Images are built automatically by `Actions`, with a transparent process. Please use them with confidence.
|
||||
- [Click here to view image build logs](https://github.com/certd/certd/actions/workflows/build-image.yml)
|
||||
|
||||
- [Click here to view preview version build logs](https://github.com/certd/certd/actions/workflows/release-image.yml)
|
||||
- [Click here to view stable version release logs](https://github.com/certd/certd/actions/workflows/stable-release.yml)
|
||||

|
||||
|
||||
> Note:
|
||||
|
||||
@@ -2,9 +2,13 @@ version: '3.3' # 兼容旧版docker-compose
|
||||
services:
|
||||
certd:
|
||||
# 镜像 # ↓↓↓↓↓ ---- 镜像版本号,建议改成固定版本号,例如:certd:1.29.0
|
||||
image: registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
|
||||
image: registry.cn-shenzhen.aliyuncs.com/certd/certd:latest
|
||||
# image: ghcr.io/certd/certd:latest # --------- 如果 报镜像not found,可以尝试其他镜像源
|
||||
# image: greper/certd:latest
|
||||
# --------- 生产建议使用稳定版, latest改成stable即可
|
||||
# image: registry.cn-shenzhen.aliyuncs.com/certd/certd:stable
|
||||
|
||||
|
||||
# security_opt: # --------- 如果slim镜像下启动报错,尝试去掉这两行注释
|
||||
# - seccomp=unconfined # 解决slim镜像下WorkerThreadsTaskRunner::DelayedTaskScheduler::Start() 报错问题
|
||||
container_name: certd # 容器名
|
||||
|
||||
@@ -6,13 +6,22 @@
|
||||
|
||||
Certd 提供多种 Docker 镜像版本,您可以根据需要选择:
|
||||
|
||||
| 版本标签 | 基础系统 | 说明 |
|
||||
| --- | --- | --- | --- |
|
||||
| `latest` / `[version]` | Alpine Linux | 默认版本,镜像体积小 |
|
||||
| `slim` / `[version]-slim` | Debian slim | glibc版本,dns解析兼容性更好(可能需要配置security_opt -seccomp=unconfined)|
|
||||
| `armv7` / `[version]-armv7` | Alpine Linux | ARMv7 架构专用版本 |
|
||||
**最新版本:**
|
||||
|
||||
> 如果您不确定使用哪个版本,请使用默认的 `latest` 版本。
|
||||
| 版本 | 标签 | 说明 |
|
||||
| --- | --- | --- |
|
||||
| 预览版【默认】 | `certd:latest` | 指向最新开发版本,包含最新功能,但稳定性不如稳定版 |
|
||||
| 稳定版 | `certd:stable` | 指向经过充分测试的生产就绪版本,推荐生产环境使用 |
|
||||
|
||||
**系统版本分支:**
|
||||
|
||||
| 分支版本标签 | 基础系统 | 说明 | 指定版本 | 稳定版 |
|
||||
| --- | --- | --- | --- | --- |
|
||||
| `certd:latest` 【默认】 | Alpine Linux | 默认版本,镜像体积小 | `certd:[version]` | `certd:[version-]stable` |
|
||||
| `certd:slim` | Debian slim | glibc版本,dns解析兼容性更好(可能需要配置security_opt -seccomp=unconfined)| `certd:[version-]slim` | `certd:[version-]slim-stable` |
|
||||
| `certd:armv7` | Alpine Linux | ARMv7 架构专用版本 | `certd:[version]-armv7` | `certd:[version-]armv7-ststable` |
|
||||
|
||||
> 如果您不确定使用哪个版本,请使用默认的 `certd:latest` 版本。
|
||||
|
||||
### 一键脚本安装(推荐)
|
||||
|
||||
|
||||
+1
-1
@@ -9,5 +9,5 @@
|
||||
}
|
||||
},
|
||||
"npmClient": "pnpm",
|
||||
"version": "1.42.6"
|
||||
"version": "1.42.5"
|
||||
}
|
||||
|
||||
+4
-2
@@ -19,7 +19,7 @@
|
||||
"devb": "lerna run dev-build",
|
||||
"i-all": "lerna link && lerna exec npm install ",
|
||||
"publish": "pnpm run prepublishOnly2 && lerna publish --force-publish=pro/plus-core --conventional-commits && pnpm run afterpublishOnly ",
|
||||
"publish2":" npm run pub_all && pnpm run afterpublishOnly",
|
||||
"publish2": " npm run pub_all && pnpm run afterpublishOnly",
|
||||
"afterpublishOnly": "pnpm run copylogs && time /t >trigger/build.trigger && git add ./trigger/build.trigger && git commit -m \"build: trigger build image\" && TIMEOUT /T 10 && pnpm run commitAll",
|
||||
"transform-sql": "cd ./packages/ui/certd-server/db/ && node --experimental-json-modules transform.js",
|
||||
"plugin-doc-gen": "cd ./packages/ui/certd-server/ && pnpm run export-metadata",
|
||||
@@ -45,7 +45,9 @@
|
||||
"publish_to_atomgit": "node --experimental-json-modules ./scripts/publish-atomgit.js",
|
||||
"publish_to_gitee": "node --experimental-json-modules ./scripts/publish-gitee.js",
|
||||
"publish_to_github": "node --experimental-json-modules ./scripts/publish-github.js",
|
||||
"get_version": "node --experimental-json-modules ./scripts/version.js"
|
||||
"get_version": "node --experimental-json-modules ./scripts/version.js",
|
||||
"stable": "node ./scripts/stable.js",
|
||||
"set-release-stable": "node ./scripts/set-release-stable.js"
|
||||
},
|
||||
"license": "AGPL-3.0",
|
||||
"dependencies": {
|
||||
|
||||
@@ -3,10 +3,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.42.6](https://github.com/publishlab/node-acme-client/compare/v1.42.5...v1.42.6) (2026-07-18)
|
||||
|
||||
**Note:** Version bump only for package @certd/acme-client
|
||||
|
||||
## [1.42.5](https://github.com/publishlab/node-acme-client/compare/v1.42.4...v1.42.5) (2026-07-15)
|
||||
|
||||
**Note:** Version bump only for package @certd/acme-client
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"description": "Simple and unopinionated ACME client",
|
||||
"private": false,
|
||||
"author": "nmorsman",
|
||||
"version": "1.42.6",
|
||||
"version": "1.42.5",
|
||||
"type": "module",
|
||||
"module": "./dist/index.js",
|
||||
"main": "./dist/index.js",
|
||||
@@ -18,7 +18,7 @@
|
||||
"types"
|
||||
],
|
||||
"dependencies": {
|
||||
"@certd/basic": "^1.42.6",
|
||||
"@certd/basic": "^1.42.5",
|
||||
"@peculiar/x509": "^1.11.0",
|
||||
"asn1js": "^3.0.5",
|
||||
"axios": "^1.9.0",
|
||||
|
||||
@@ -3,10 +3,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.42.6](https://github.com/certd/certd/compare/v1.42.5...v1.42.6) (2026-07-18)
|
||||
|
||||
**Note:** Version bump only for package @certd/basic
|
||||
|
||||
## [1.42.5](https://github.com/certd/certd/compare/v1.42.4...v1.42.5) (2026-07-15)
|
||||
|
||||
**Note:** Version bump only for package @certd/basic
|
||||
|
||||
@@ -1 +1 @@
|
||||
01:12
|
||||
23:31
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@certd/basic",
|
||||
"private": false,
|
||||
"version": "1.42.6",
|
||||
"version": "1.42.5",
|
||||
"type": "module",
|
||||
"main": "./dist/index.js",
|
||||
"module": "./dist/index.js",
|
||||
|
||||
@@ -3,12 +3,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.42.6](https://github.com/certd/certd/compare/v1.42.5...v1.42.6) (2026-07-18)
|
||||
|
||||
### Performance Improvements
|
||||
|
||||
* 优化动态加载依赖镜像地址,多次重试 ([5f53b81](https://github.com/certd/certd/commit/5f53b81c75dd242b4260ac08cae14c6d1a08a883))
|
||||
|
||||
## [1.42.5](https://github.com/certd/certd/compare/v1.42.4...v1.42.5) (2026-07-15)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@certd/pipeline",
|
||||
"private": false,
|
||||
"version": "1.42.6",
|
||||
"version": "1.42.5",
|
||||
"type": "module",
|
||||
"main": "./dist/index.js",
|
||||
"module": "./dist/index.js",
|
||||
@@ -21,8 +21,8 @@
|
||||
"lint": "eslint --fix"
|
||||
},
|
||||
"dependencies": {
|
||||
"@certd/basic": "^1.42.6",
|
||||
"@certd/plus-core": "^1.42.6",
|
||||
"@certd/basic": "^1.42.5",
|
||||
"@certd/plus-core": "^1.42.5",
|
||||
"dayjs": "^1.11.7",
|
||||
"lodash-es": "^4.17.21",
|
||||
"reflect-metadata": "^0.2.2"
|
||||
|
||||
@@ -3,10 +3,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.42.6](https://github.com/certd/certd/compare/v1.42.5...v1.42.6) (2026-07-18)
|
||||
|
||||
**Note:** Version bump only for package @certd/lib-huawei
|
||||
|
||||
## [1.42.5](https://github.com/certd/certd/compare/v1.42.4...v1.42.5) (2026-07-15)
|
||||
|
||||
**Note:** Version bump only for package @certd/lib-huawei
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@certd/lib-huawei",
|
||||
"private": false,
|
||||
"version": "1.42.6",
|
||||
"version": "1.42.5",
|
||||
"main": "./dist/bundle.js",
|
||||
"module": "./dist/bundle.js",
|
||||
"types": "./dist/d/index.d.ts",
|
||||
|
||||
@@ -3,10 +3,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.42.6](https://github.com/certd/certd/compare/v1.42.5...v1.42.6) (2026-07-18)
|
||||
|
||||
**Note:** Version bump only for package @certd/lib-iframe
|
||||
|
||||
## [1.42.5](https://github.com/certd/certd/compare/v1.42.4...v1.42.5) (2026-07-15)
|
||||
|
||||
**Note:** Version bump only for package @certd/lib-iframe
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@certd/lib-iframe",
|
||||
"private": false,
|
||||
"version": "1.42.6",
|
||||
"version": "1.42.5",
|
||||
"type": "module",
|
||||
"main": "./dist/index.js",
|
||||
"module": "./dist/index.js",
|
||||
|
||||
@@ -3,10 +3,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.42.6](https://github.com/certd/certd/compare/v1.42.5...v1.42.6) (2026-07-18)
|
||||
|
||||
**Note:** Version bump only for package @certd/jdcloud
|
||||
|
||||
## [1.42.5](https://github.com/certd/certd/compare/v1.42.4...v1.42.5) (2026-07-15)
|
||||
|
||||
**Note:** Version bump only for package @certd/jdcloud
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@certd/jdcloud",
|
||||
"version": "1.42.6",
|
||||
"version": "1.42.5",
|
||||
"description": "jdcloud openApi sdk",
|
||||
"main": "./dist/bundle.js",
|
||||
"module": "./dist/bundle.js",
|
||||
|
||||
@@ -3,10 +3,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.42.6](https://github.com/certd/certd/compare/v1.42.5...v1.42.6) (2026-07-18)
|
||||
|
||||
**Note:** Version bump only for package @certd/lib-k8s
|
||||
|
||||
## [1.42.5](https://github.com/certd/certd/compare/v1.42.4...v1.42.5) (2026-07-15)
|
||||
|
||||
**Note:** Version bump only for package @certd/lib-k8s
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@certd/lib-k8s",
|
||||
"private": false,
|
||||
"version": "1.42.6",
|
||||
"version": "1.42.5",
|
||||
"type": "module",
|
||||
"main": "./dist/index.js",
|
||||
"module": "./dist/index.js",
|
||||
@@ -21,7 +21,7 @@
|
||||
"lint": "eslint --fix"
|
||||
},
|
||||
"dependencies": {
|
||||
"@certd/basic": "^1.42.6",
|
||||
"@certd/basic": "^1.42.5",
|
||||
"@kubernetes/client-node": "0.21.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -3,12 +3,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.42.6](https://github.com/certd/certd/compare/v1.42.5...v1.42.6) (2026-07-18)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* 修复正常批量删除流水线报权限不足的bug ([5b50083](https://github.com/certd/certd/commit/5b500830a122c6c42dab054e57fed509050f94da))
|
||||
|
||||
## [1.42.5](https://github.com/certd/certd/compare/v1.42.4...v1.42.5) (2026-07-15)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@certd/lib-server",
|
||||
"version": "1.42.6",
|
||||
"version": "1.42.5",
|
||||
"description": "midway with flyway, sql upgrade way ",
|
||||
"private": false,
|
||||
"type": "module",
|
||||
@@ -29,11 +29,11 @@
|
||||
],
|
||||
"license": "AGPL",
|
||||
"dependencies": {
|
||||
"@certd/acme-client": "^1.42.6",
|
||||
"@certd/basic": "^1.42.6",
|
||||
"@certd/pipeline": "^1.42.6",
|
||||
"@certd/plugin-lib": "^1.42.6",
|
||||
"@certd/plus-core": "^1.42.6",
|
||||
"@certd/acme-client": "^1.42.5",
|
||||
"@certd/basic": "^1.42.5",
|
||||
"@certd/pipeline": "^1.42.5",
|
||||
"@certd/plugin-lib": "^1.42.5",
|
||||
"@certd/plus-core": "^1.42.5",
|
||||
"@midwayjs/cache": "3.14.0",
|
||||
"@midwayjs/core": "3.20.11",
|
||||
"@midwayjs/i18n": "3.20.13",
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
/// <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,
|
||||
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);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,44 @@
|
||||
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;
|
||||
enabled?: boolean;
|
||||
scope?: string;
|
||||
userId?: number;
|
||||
username?: string;
|
||||
success?: boolean;
|
||||
};
|
||||
|
||||
/** 审计日志方法的参数类型 */
|
||||
export type AuditLogParam = {
|
||||
type?: string;
|
||||
action?: string;
|
||||
content?: string;
|
||||
append?: string | string[];
|
||||
projectId?: number;
|
||||
userId?: number;
|
||||
username?: string;
|
||||
};
|
||||
|
||||
/** AuditService.log() 参数类型 */
|
||||
export type AuditLogWriteParam = {
|
||||
userId: number;
|
||||
type: string;
|
||||
action: string;
|
||||
content: string;
|
||||
username?: string;
|
||||
projectId?: number;
|
||||
ipAddress?: string;
|
||||
scope?: string;
|
||||
success?: boolean;
|
||||
};
|
||||
@@ -3,6 +3,7 @@ import type { IMidwayContainer } from "@midwayjs/core";
|
||||
import * as koa from "@midwayjs/koa";
|
||||
import { Constants } from "./constants.js";
|
||||
import { isEnterprise } from "./mode.js";
|
||||
import type { AuditLogContext, AuditLogParam } from "./audit.js";
|
||||
|
||||
export abstract class BaseController {
|
||||
@Inject()
|
||||
@@ -127,4 +128,43 @@ export abstract class BaseController {
|
||||
}
|
||||
return { projectId, userId };
|
||||
}
|
||||
|
||||
getAuditType(): string {
|
||||
return "unknown";
|
||||
}
|
||||
|
||||
auditLog(bean: AuditLogParam = {}) {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -253,6 +253,7 @@ export abstract class BaseService<T> {
|
||||
if (!Array.isArray(ids)) {
|
||||
ids = [ids];
|
||||
}
|
||||
ids = this.filterIds(ids);
|
||||
const res = await this.getRepository().find({
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-ignore
|
||||
@@ -265,7 +266,7 @@ export abstract class BaseService<T> {
|
||||
},
|
||||
});
|
||||
if (!res || res.length === ids.length) {
|
||||
return ids;
|
||||
return;
|
||||
}
|
||||
throw new PermissionException("权限不足");
|
||||
}
|
||||
@@ -279,12 +280,6 @@ export abstract class BaseService<T> {
|
||||
});
|
||||
}
|
||||
async batchDelete(ids: number[], userId: number, projectId?: number): Promise<number> {
|
||||
if (!ids || ids.length === 0) {
|
||||
throw new ValidateException("ids不能为空");
|
||||
}
|
||||
if (!Array.isArray(ids)) {
|
||||
ids = [ids];
|
||||
}
|
||||
ids = this.filterIds(ids);
|
||||
if (userId != null) {
|
||||
const userProjectQuery = this.buildUserProjectQuery(userId, projectId);
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
export const Constants = {
|
||||
dataDir: './data',
|
||||
dataDir: "./data",
|
||||
role: {
|
||||
defaultUser: 3,
|
||||
},
|
||||
per: {
|
||||
//无需登录
|
||||
guest: '_guest_',
|
||||
guest: "_guest_",
|
||||
//无需登录
|
||||
anonymous: '_guest_',
|
||||
anonymous: "_guest_",
|
||||
//无需登录,有 token 时解析当前用户
|
||||
guestOptionalAuth: '_guestOptionalAuth_',
|
||||
guestOptionalAuth: "_guestOptionalAuth_",
|
||||
//仅需要登录
|
||||
authOnly: '_authOnly_',
|
||||
authOnly: "_authOnly_",
|
||||
//仅需要登录
|
||||
loginOnly: '_authOnly_',
|
||||
loginOnly: "_authOnly_",
|
||||
|
||||
open: '_open_',
|
||||
open: "_open_",
|
||||
},
|
||||
res: {
|
||||
serverError(message: string) {
|
||||
@@ -26,102 +26,102 @@ export const Constants = {
|
||||
},
|
||||
error: {
|
||||
code: 1,
|
||||
message: 'Internal server error',
|
||||
message: "Internal server error",
|
||||
},
|
||||
success: {
|
||||
code: 0,
|
||||
message: 'success',
|
||||
message: "success",
|
||||
},
|
||||
validation: {
|
||||
code: 10,
|
||||
message: '参数错误',
|
||||
message: "参数错误",
|
||||
},
|
||||
needvip: {
|
||||
code: 88,
|
||||
message: '需要VIP',
|
||||
message: "需要VIP",
|
||||
},
|
||||
needsuite: {
|
||||
code: 89,
|
||||
message: '需要购买或升级套餐',
|
||||
message: "需要购买或升级套餐",
|
||||
},
|
||||
loginError: {
|
||||
code: 2,
|
||||
message: '登录失败',
|
||||
message: "登录失败",
|
||||
},
|
||||
codeError: {
|
||||
code: 3,
|
||||
message: '验证码错误',
|
||||
message: "验证码错误",
|
||||
},
|
||||
auth: {
|
||||
code: 401,
|
||||
message: '您还未登录或token已过期',
|
||||
message: "您还未登录或token已过期",
|
||||
},
|
||||
permission: {
|
||||
code: 402,
|
||||
message: '您没有权限',
|
||||
message: "您没有权限",
|
||||
},
|
||||
param: {
|
||||
code: 400,
|
||||
message: '参数错误',
|
||||
message: "参数错误",
|
||||
},
|
||||
notFound: {
|
||||
code: 404,
|
||||
message: '页面/文件/资源不存在',
|
||||
message: "页面/文件/资源不存在",
|
||||
},
|
||||
|
||||
preview: {
|
||||
code: 10001,
|
||||
message: '对不起,预览环境不允许修改此数据',
|
||||
message: "对不起,预览环境不允许修改此数据",
|
||||
},
|
||||
siteOff:{
|
||||
siteOff: {
|
||||
code: 10010,
|
||||
message: '站点已关闭',
|
||||
message: "站点已关闭",
|
||||
},
|
||||
need2fa:{
|
||||
need2fa: {
|
||||
code: 10020,
|
||||
message: '需要2FA认证',
|
||||
message: "需要2FA认证",
|
||||
},
|
||||
openKeyError: {
|
||||
code: 20000,
|
||||
message: 'ApiToken错误',
|
||||
message: "ApiToken错误",
|
||||
},
|
||||
openKeySignError: {
|
||||
code: 20001,
|
||||
message: 'ApiToken签名错误',
|
||||
message: "ApiToken签名错误",
|
||||
},
|
||||
openKeyExpiresError: {
|
||||
code: 20002,
|
||||
message: 'ApiToken时间戳错误',
|
||||
message: "ApiToken时间戳错误",
|
||||
},
|
||||
openKeySignTypeError: {
|
||||
code: 20003,
|
||||
message: 'ApiToken签名类型不支持',
|
||||
message: "ApiToken签名类型不支持",
|
||||
},
|
||||
openParamError: {
|
||||
code: 20010,
|
||||
message: '请求参数错误',
|
||||
message: "请求参数错误",
|
||||
},
|
||||
openCertNotFound: {
|
||||
code: 20011,
|
||||
message: '证书不存在',
|
||||
message: "证书不存在",
|
||||
},
|
||||
openCertNotReady: {
|
||||
code: 20012,
|
||||
message: '证书还未生成',
|
||||
message: "证书还未生成",
|
||||
},
|
||||
openCertApplying: {
|
||||
code: 20013,
|
||||
message: '证书正在申请中,请稍后重新获取',
|
||||
message: "证书正在申请中,请稍后重新获取",
|
||||
},
|
||||
openDomainNoVerifier:{
|
||||
openDomainNoVerifier: {
|
||||
code: 20014,
|
||||
message: '域名校验方式未配置',
|
||||
message: "域名校验方式未配置",
|
||||
},
|
||||
openEmailNotFound: {
|
||||
code: 20021,
|
||||
message: '用户邮箱还未配置',
|
||||
message: "用户邮箱还未配置",
|
||||
},
|
||||
},
|
||||
systemUserId: 0, // 系统级别userid固定为0
|
||||
enterpriseUserId: -1 // 企业模式用户id固定为-1
|
||||
enterpriseUserId: -1, // 企业模式用户id固定为-1
|
||||
};
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
import { createRequestParamDecorator } from "@midwayjs/core";
|
||||
|
||||
export const AuditLog = (opts: { type?: string; action?: string; content?: string; enabled?: boolean } = {}) => {
|
||||
return createRequestParamDecorator(ctx => {
|
||||
if (!ctx.auditLog) {
|
||||
ctx.auditLog = {};
|
||||
}
|
||||
ctx.auditLog.enabled = opts.enabled !== false;
|
||||
if (opts.type != null) {
|
||||
ctx.auditLog.type = opts.type;
|
||||
}
|
||||
if (opts.action != null) {
|
||||
ctx.auditLog.action = opts.action;
|
||||
}
|
||||
if (opts.content != null) {
|
||||
ctx.auditLog.content = opts.content;
|
||||
}
|
||||
return ctx.auditLog;
|
||||
});
|
||||
};
|
||||
@@ -0,0 +1 @@
|
||||
export * from "./decoractor.js";
|
||||
@@ -1,11 +1,11 @@
|
||||
import { ALL, Body, Post, Query } from '@midwayjs/core';
|
||||
import { BaseController } from './base-controller.js';
|
||||
import { ALL, Body, Post, Query } from "@midwayjs/core";
|
||||
import { BaseController } from "./base-controller.js";
|
||||
|
||||
export abstract class CrudController<T> extends BaseController {
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
abstract getService<T>();
|
||||
|
||||
@Post('/page')
|
||||
@Post("/page")
|
||||
async page(@Body(ALL) body: any) {
|
||||
const pageRet = await this.getService().page({
|
||||
query: body.query ?? {},
|
||||
@@ -16,7 +16,7 @@ export abstract class CrudController<T> extends BaseController {
|
||||
return this.ok(pageRet);
|
||||
}
|
||||
|
||||
@Post('/list')
|
||||
@Post("/list")
|
||||
async list(@Body(ALL) body: any) {
|
||||
const listRet = await this.getService().list({
|
||||
query: body.query ?? {},
|
||||
@@ -25,33 +25,33 @@ export abstract class CrudController<T> extends BaseController {
|
||||
return this.ok(listRet);
|
||||
}
|
||||
|
||||
@Post('/add')
|
||||
@Post("/add")
|
||||
async add(@Body(ALL) bean: any) {
|
||||
delete bean.id;
|
||||
const id = await this.getService().add(bean);
|
||||
return this.ok(id);
|
||||
}
|
||||
|
||||
@Post('/info')
|
||||
async info(@Query('id') id: number) {
|
||||
@Post("/info")
|
||||
async info(@Query("id") id: number) {
|
||||
const bean = await this.getService().info(id);
|
||||
return this.ok(bean);
|
||||
}
|
||||
|
||||
@Post('/update')
|
||||
@Post("/update")
|
||||
async update(@Body(ALL) bean: any) {
|
||||
await this.getService().update(bean);
|
||||
return this.ok(null);
|
||||
}
|
||||
|
||||
@Post('/delete')
|
||||
async delete(@Query('id') id: number) {
|
||||
@Post("/delete")
|
||||
async delete(@Query("id") id: number) {
|
||||
await this.getService().delete([id]);
|
||||
return this.ok(null);
|
||||
}
|
||||
|
||||
@Post('/deleteByIds')
|
||||
async deleteByIds(@Body('ids') ids: number[]) {
|
||||
@Post("/deleteByIds")
|
||||
async deleteByIds(@Body("ids") ids: number[]) {
|
||||
await this.getService().delete(ids);
|
||||
return this.ok(null);
|
||||
}
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
import { Constants } from '../constants.js';
|
||||
import { BaseException } from './base-exception.js';
|
||||
import { Constants } from "../constants.js";
|
||||
import { BaseException } from "./base-exception.js";
|
||||
/**
|
||||
* 通用异常
|
||||
*/
|
||||
export class LoginErrorException extends BaseException {
|
||||
leftCount: number;
|
||||
constructor(message, leftCount: number) {
|
||||
super('LoginErrorException', Constants.res.loginError.code, message ? message : Constants.res.loginError.message);
|
||||
userId?: number;
|
||||
constructor(message, leftCount: number, userId?: number) {
|
||||
super("LoginErrorException", Constants.res.loginError.code, message ? message : Constants.res.loginError.message);
|
||||
this.leftCount = leftCount;
|
||||
this.userId = userId;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
export * from './base-controller.js';
|
||||
export * from './constants.js';
|
||||
export * from './crud-controller.js';
|
||||
export * from './enum-item.js';
|
||||
export * from './exception/index.js';
|
||||
export * from './result.js';
|
||||
export * from './base-service.js';
|
||||
export * from "./mode.js"
|
||||
export * from "./base-controller.js";
|
||||
export * from "./constants.js";
|
||||
export * from "./crud-controller.js";
|
||||
export * from "./enum-item.js";
|
||||
export * from "./exception/index.js";
|
||||
export * from "./result.js";
|
||||
export * from "./base-service.js";
|
||||
export * from "./audit.js";
|
||||
export * from "./mode.js";
|
||||
export * from "./core/index.js";
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
let adminMode = "saas"
|
||||
let adminMode = "saas";
|
||||
|
||||
export function setAdminMode(mode:string = "saas"){
|
||||
adminMode = mode
|
||||
export function setAdminMode(mode: string = "saas") {
|
||||
adminMode = mode;
|
||||
}
|
||||
export function getAdminMode(){
|
||||
return adminMode
|
||||
export function getAdminMode() {
|
||||
return adminMode;
|
||||
}
|
||||
|
||||
export function isEnterprise(){
|
||||
return adminMode === "enterprise"
|
||||
}
|
||||
export function isEnterprise() {
|
||||
return adminMode === "enterprise";
|
||||
}
|
||||
|
||||
@@ -3,10 +3,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.42.6](https://github.com/certd/certd/compare/v1.42.5...v1.42.6) (2026-07-18)
|
||||
|
||||
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||
|
||||
## [1.42.5](https://github.com/certd/certd/compare/v1.42.4...v1.42.5) (2026-07-15)
|
||||
|
||||
### Performance Improvements
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@certd/midway-flyway-js",
|
||||
"version": "1.42.6",
|
||||
"version": "1.42.5",
|
||||
"description": "midway with flyway, sql upgrade way ",
|
||||
"private": false,
|
||||
"type": "module",
|
||||
|
||||
@@ -3,10 +3,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.42.6](https://github.com/certd/certd/compare/v1.42.5...v1.42.6) (2026-07-18)
|
||||
|
||||
**Note:** Version bump only for package @certd/plugin-cert
|
||||
|
||||
## [1.42.5](https://github.com/certd/certd/compare/v1.42.4...v1.42.5) (2026-07-15)
|
||||
|
||||
**Note:** Version bump only for package @certd/plugin-cert
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@certd/plugin-cert",
|
||||
"private": false,
|
||||
"version": "1.42.6",
|
||||
"version": "1.42.5",
|
||||
"type": "module",
|
||||
"main": "./dist/index.js",
|
||||
"types": "./dist/index.d.ts",
|
||||
@@ -20,7 +20,7 @@
|
||||
"lint": "eslint --fix"
|
||||
},
|
||||
"dependencies": {
|
||||
"@certd/plugin-lib": "^1.42.6"
|
||||
"@certd/plugin-lib": "^1.42.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/chai": "^4.3.12",
|
||||
|
||||
@@ -3,10 +3,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.42.6](https://github.com/certd/certd/compare/v1.42.5...v1.42.6) (2026-07-18)
|
||||
|
||||
**Note:** Version bump only for package @certd/plugin-lib
|
||||
|
||||
## [1.42.5](https://github.com/certd/certd/compare/v1.42.4...v1.42.5) (2026-07-15)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@certd/plugin-lib",
|
||||
"private": false,
|
||||
"version": "1.42.6",
|
||||
"version": "1.42.5",
|
||||
"type": "module",
|
||||
"main": "./dist/index.js",
|
||||
"types": "./dist/index.d.ts",
|
||||
@@ -17,9 +17,9 @@
|
||||
"lint": "eslint --fix"
|
||||
},
|
||||
"dependencies": {
|
||||
"@certd/acme-client": "^1.42.6",
|
||||
"@certd/basic": "^1.42.6",
|
||||
"@certd/pipeline": "^1.42.6",
|
||||
"@certd/acme-client": "^1.42.5",
|
||||
"@certd/basic": "^1.42.5",
|
||||
"@certd/pipeline": "^1.42.5",
|
||||
"dayjs": "^1.11.7",
|
||||
"jszip": "^3.10.1",
|
||||
"lodash-es": "^4.17.21",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
ARG base_type=alpine
|
||||
ARG base_type=alpine
|
||||
|
||||
# 根据 base_type 参数选择基础镜像系列
|
||||
FROM --platform=linux/amd64 node:22-alpine AS base-amd64-alpine
|
||||
@@ -99,6 +99,7 @@ RUN ARCH=$(uname -m) && \
|
||||
|
||||
ENV TZ=Asia/Shanghai
|
||||
ENV NODE_ENV=production
|
||||
ENV certd_release_mode=latest
|
||||
ENV MIDWAY_SERVER_ENV=production
|
||||
|
||||
RUN npm install -g pnpm@10.33.4
|
||||
|
||||
@@ -3,10 +3,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.42.6](https://github.com/certd/certd/compare/v1.42.5...v1.42.6) (2026-07-18)
|
||||
|
||||
**Note:** Version bump only for package @certd/ui-client
|
||||
|
||||
## [1.42.5](https://github.com/certd/certd/compare/v1.42.4...v1.42.5) (2026-07-15)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@certd/ui-client",
|
||||
"version": "1.42.6",
|
||||
"version": "1.42.5",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "vite --open",
|
||||
@@ -104,8 +104,8 @@
|
||||
"zod-defaults": "^0.1.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@certd/lib-iframe": "^1.42.6",
|
||||
"@certd/pipeline": "^1.42.6",
|
||||
"@certd/lib-iframe": "^1.42.5",
|
||||
"@certd/pipeline": "^1.42.5",
|
||||
"@rollup/plugin-commonjs": "^25.0.7",
|
||||
"@rollup/plugin-node-resolve": "^15.2.3",
|
||||
"@types/chai": "^4.3.12",
|
||||
|
||||
@@ -139,7 +139,7 @@ async function doActive() {
|
||||
title: t("vip.successTitle"),
|
||||
content: t("vip.successContent", {
|
||||
vipLabel,
|
||||
expireDate: dayjs(settingStore.plusInfo.expireTime).format("YYYY-MM-DD"),
|
||||
expireDate: settingStore.plusInfo.expireTime === -1 ? t("vip.permanent") : dayjs(settingStore.plusInfo.expireTime).format("YYYY-MM-DD"),
|
||||
}),
|
||||
onOk() {
|
||||
if (!(settingStore.installInfo.bindUserId > 0)) {
|
||||
|
||||
@@ -25,5 +25,7 @@ export default {
|
||||
expiringCerts: "Soon-to-Expire Certificates",
|
||||
supportedTasks: "Overview of Supported Deployment Tasks",
|
||||
changeLog: "Change Log",
|
||||
stableRelease: "Stable",
|
||||
latestRelease: "Preview",
|
||||
},
|
||||
};
|
||||
|
||||
@@ -18,6 +18,7 @@ export default {
|
||||
openKey: "Open API Key",
|
||||
notification: "Notification Settings",
|
||||
siteMonitorSetting: "Site Monitor Settings",
|
||||
auditLog: "Audit Log",
|
||||
userSecurity: "Security Settings",
|
||||
userProfile: "Account Info",
|
||||
userGrant: "Grant Delegation",
|
||||
@@ -67,6 +68,7 @@ export default {
|
||||
projectJoin: "Join Project",
|
||||
currentProject: "Current Project",
|
||||
projectMemberManager: "Project Member",
|
||||
auditLog: "Audit Log",
|
||||
domainMonitorSetting: "Domain Monitor Settings",
|
||||
},
|
||||
};
|
||||
|
||||
@@ -104,4 +104,5 @@ export default {
|
||||
not_effective: "Not effective or duration not sync?",
|
||||
learn_more: "More privileges",
|
||||
question: "More VIP related questions",
|
||||
permanent: "Permanent",
|
||||
};
|
||||
|
||||
@@ -26,5 +26,7 @@ export default {
|
||||
expiringCerts: "最快到期证书",
|
||||
supportedTasks: "已支持的部署任务总览",
|
||||
changeLog: "更新日志",
|
||||
stableRelease: "稳定版",
|
||||
latestRelease: "预览版",
|
||||
},
|
||||
};
|
||||
|
||||
@@ -18,6 +18,7 @@ export default {
|
||||
openKey: "开放接口密钥",
|
||||
notification: "通知设置",
|
||||
siteMonitorSetting: "站点监控设置",
|
||||
auditLog: "操作日志",
|
||||
userSecurity: "认证安全设置",
|
||||
userProfile: "账号信息",
|
||||
userGrant: "授权委托",
|
||||
@@ -67,6 +68,7 @@ export default {
|
||||
projectJoin: "加入项目",
|
||||
currentProject: "当前项目",
|
||||
projectMemberManager: "项目成员管理",
|
||||
auditLog: "审计日志",
|
||||
domainMonitorSetting: "域名监控设置",
|
||||
jobHistory: "监控执行记录",
|
||||
},
|
||||
|
||||
@@ -103,4 +103,5 @@ export default {
|
||||
not_effective: "VIP没有生效/时长未同步?",
|
||||
learn_more: "更多特权(加VIP群等)",
|
||||
question: "更多VIP相关问题",
|
||||
permanent: "永久",
|
||||
};
|
||||
|
||||
@@ -287,6 +287,22 @@ export const certdResources = [
|
||||
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",
|
||||
name: "UserSecurity",
|
||||
|
||||
@@ -410,6 +410,22 @@ export const sysResources = [
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
title: "certd.sysResources.auditLog",
|
||||
name: "SysAuditLog",
|
||||
path: "/sys/enterprise/audit",
|
||||
component: "/sys/enterprise/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",
|
||||
name: "NetTest",
|
||||
|
||||
@@ -11,6 +11,7 @@ export type AppInfo = {
|
||||
version?: string;
|
||||
time?: number;
|
||||
deltaTime?: number;
|
||||
releaseMode?: string;
|
||||
};
|
||||
export type SiteInfo = {
|
||||
title?: string;
|
||||
|
||||
@@ -35,6 +35,7 @@ export interface SettingState {
|
||||
version?: string;
|
||||
time?: number;
|
||||
deltaTime?: number;
|
||||
releaseMode?: string;
|
||||
};
|
||||
productInfo: {
|
||||
notice?: string;
|
||||
@@ -109,6 +110,7 @@ export const useSettingStore = defineStore({
|
||||
version: "",
|
||||
time: 0,
|
||||
deltaTime: 0,
|
||||
releaseMode: "latest",
|
||||
},
|
||||
productInfo: {
|
||||
notice: "",
|
||||
@@ -229,6 +231,9 @@ export const useSettingStore = defineStore({
|
||||
this.app.time = appInfo.time;
|
||||
this.app.version = appInfo.version;
|
||||
this.app.deltaTime = new Date().getTime() - this.app.time;
|
||||
if (appInfo.releaseMode) {
|
||||
this.app.releaseMode = appInfo.releaseMode;
|
||||
}
|
||||
},
|
||||
initSiteInfo(siteInfo: SiteInfo) {
|
||||
//@ts-ignore
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
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",
|
||||
});
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
import { ColumnProps, DataFormatterContext, 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 || [];
|
||||
},
|
||||
});
|
||||
|
||||
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 },
|
||||
toolbar: {
|
||||
buttons: {
|
||||
export: { show: true },
|
||||
},
|
||||
export: {
|
||||
dataFrom: "search",
|
||||
columnFilter: (col: ColumnProps) => col.show === true,
|
||||
dataFormatter: (opts: DataFormatterContext) => {
|
||||
const { row, originalRow, col } = opts;
|
||||
const key = col.key;
|
||||
if (key === "createTime" && originalRow[key]) {
|
||||
row[key] = new Date(originalRow[key]).toLocaleString();
|
||||
}
|
||||
},
|
||||
},
|
||||
},
|
||||
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 },
|
||||
},
|
||||
success: {
|
||||
title: "结果",
|
||||
type: "dict-switch",
|
||||
dict: dict({
|
||||
data: [
|
||||
{ value: true, label: "成功", color: "success" },
|
||||
{ value: false, label: "失败", color: "error" },
|
||||
],
|
||||
}),
|
||||
column: { width: 100, align: "center" },
|
||||
form: { show: false },
|
||||
search: { show: true },
|
||||
},
|
||||
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,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<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,4 +1,4 @@
|
||||
<template>
|
||||
<template>
|
||||
<div class="dashboard-user">
|
||||
<div class="header-profile flex-wrap bg-white dark:bg-black">
|
||||
<div class="flex flex-1">
|
||||
@@ -23,9 +23,9 @@
|
||||
<template v-if="userStore.isAdmin">
|
||||
<a-divider type="vertical" />
|
||||
<a-badge :dot="hasNewVersion">
|
||||
<a-tag color="blue" class="flex-inline pointer mr-0" :title="t('certd.dashboard.latestVersion', { version: latestVersion })" @click="openUpgradeUrl()">
|
||||
<a-tag color="blue" class="flex-inline pointer mr-0" :title="'v' + version + ' ' + (settingsStore.app.releaseMode === 'stable' ? '稳定版' : '')" @click="openUpgradeUrl()">
|
||||
<fs-icon icon="ion:rocket-outline" class="mr-5"></fs-icon>
|
||||
v{{ version }}
|
||||
v{{ version }} {{ settingsStore.app.releaseMode === "stable" ? "stable" : "" }}
|
||||
</a-tag>
|
||||
</a-badge>
|
||||
<a-divider type="vertical" />
|
||||
@@ -179,7 +179,6 @@ defineOptions({
|
||||
|
||||
const version = ref(import.meta.env.VITE_APP_VERSION);
|
||||
const latestVersion = ref("");
|
||||
|
||||
function isNewVersion(version: string, latestVersion: string) {
|
||||
if (!latestVersion) {
|
||||
return false;
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
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",
|
||||
});
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,180 @@
|
||||
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 },
|
||||
},
|
||||
success: {
|
||||
title: "结果",
|
||||
type: "dict-switch",
|
||||
dict: dict({
|
||||
data: [
|
||||
{ value: true, label: "成功", color: "success" },
|
||||
{ value: false, label: "失败", color: "error" },
|
||||
],
|
||||
}),
|
||||
column: { width: 100, align: "center" },
|
||||
form: { show: false },
|
||||
search: { show: true },
|
||||
},
|
||||
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 },
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<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>
|
||||
@@ -1,75 +1,35 @@
|
||||
import { request } from "/src/api/service";
|
||||
|
||||
const apiPrefix = "/sys/project/provider";
|
||||
const apiPrefix = "/sys/audit";
|
||||
|
||||
export async function GetList(query: any) {
|
||||
return await request({
|
||||
url: apiPrefix + "/page",
|
||||
method: "post",
|
||||
data: query,
|
||||
});
|
||||
}
|
||||
|
||||
export async function AddObj(obj: any) {
|
||||
return await request({
|
||||
url: apiPrefix + "/add",
|
||||
method: "post",
|
||||
data: obj,
|
||||
});
|
||||
}
|
||||
|
||||
export async function UpdateObj(obj: any) {
|
||||
return await request({
|
||||
url: apiPrefix + "/update",
|
||||
method: "post",
|
||||
data: obj,
|
||||
});
|
||||
}
|
||||
|
||||
export async function DelObj(id: any) {
|
||||
return await request({
|
||||
url: apiPrefix + "/delete",
|
||||
method: "post",
|
||||
params: { id },
|
||||
});
|
||||
}
|
||||
|
||||
export async function GetObj(id: any) {
|
||||
return await request({
|
||||
url: apiPrefix + "/info",
|
||||
method: "post",
|
||||
params: { id },
|
||||
});
|
||||
}
|
||||
|
||||
export async function GetDetail(id: any) {
|
||||
return await request({
|
||||
url: apiPrefix + "/detail",
|
||||
method: "post",
|
||||
params: { id },
|
||||
});
|
||||
}
|
||||
|
||||
export async function DeleteBatch(ids: any[]) {
|
||||
return await request({
|
||||
url: apiPrefix + "/deleteByIds",
|
||||
method: "post",
|
||||
data: { ids },
|
||||
});
|
||||
}
|
||||
|
||||
export async function SetDefault(id: any) {
|
||||
return await request({
|
||||
url: apiPrefix + "/setDefault",
|
||||
method: "post",
|
||||
data: { id },
|
||||
});
|
||||
}
|
||||
|
||||
export async function SetDisabled(id: any, disabled: boolean) {
|
||||
return await request({
|
||||
url: apiPrefix + "/setDisabled",
|
||||
method: "post",
|
||||
data: { id, disabled },
|
||||
});
|
||||
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,252 +1,194 @@
|
||||
import * as api from "./api";
|
||||
import { useI18n } from "/src/locales";
|
||||
import { computed, Ref, ref } from "vue";
|
||||
import { useRouter } from "vue-router";
|
||||
import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes, utils } from "@fast-crud/fast-crud";
|
||||
import { useUserStore } from "/@/store/user";
|
||||
import { useSettingStore } from "/@/store/settings";
|
||||
import { ColumnProps, DataFormatterContext, 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 router = useRouter();
|
||||
const { t } = useI18n();
|
||||
const { myProjectDict } = useDicts();
|
||||
const api = context.api;
|
||||
|
||||
const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
|
||||
return await api.GetList(query);
|
||||
};
|
||||
const editRequest = async ({ form, row }: EditReq) => {
|
||||
form.id = row.id;
|
||||
const res = await api.UpdateObj(form);
|
||||
return res;
|
||||
};
|
||||
const delRequest = async ({ row }: DelReq) => {
|
||||
return await api.DelObj(row.id);
|
||||
const delRequest = async (req: DelReq) => {
|
||||
return await api.DelObj(req.row.id);
|
||||
};
|
||||
|
||||
const addRequest = async ({ form }: AddReq) => {
|
||||
const res = await api.AddObj(form);
|
||||
return res;
|
||||
const cleanExpired = async () => {
|
||||
Modal.confirm({
|
||||
title: "确认清理",
|
||||
content: "确定要清理90天前的审计日志吗?此操作不可撤销。",
|
||||
okText: "确认清理",
|
||||
okType: "danger",
|
||||
cancelText: "取消",
|
||||
async onOk() {
|
||||
await api.Clean(90);
|
||||
crudExpose.doRefresh();
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
const userStore = useUserStore();
|
||||
const settingStore = useSettingStore();
|
||||
const selectedRowKeys: Ref<any[]> = ref([]);
|
||||
context.selectedRowKeys = selectedRowKeys;
|
||||
|
||||
return {
|
||||
crudOptions: {
|
||||
settings: {
|
||||
plugins: {
|
||||
//这里使用行选择插件,生成行选择crudOptions配置,最终会与crudOptions合并
|
||||
rowSelection: {
|
||||
enabled: true,
|
||||
order: -2,
|
||||
before: true,
|
||||
// handle: (pluginProps,useCrudProps)=>CrudOptions,
|
||||
props: {
|
||||
multiple: true,
|
||||
crossPage: true,
|
||||
selectedRowKeys,
|
||||
},
|
||||
request: { pageRequest, delRequest },
|
||||
tabs: {
|
||||
name: "scope",
|
||||
show: true,
|
||||
dict: {
|
||||
data: [
|
||||
{ value: "system", label: "系统级", color: "red" },
|
||||
{ value: "user", label: "用户级", color: "blue" },
|
||||
],
|
||||
},
|
||||
},
|
||||
toolbar: {
|
||||
buttons: {
|
||||
export: { show: true },
|
||||
},
|
||||
export: {
|
||||
dataFrom: "search",
|
||||
columnFilter: (col: ColumnProps) => col.show === true,
|
||||
dataFormatter: (opts: DataFormatterContext) => {
|
||||
const { row, originalRow, col } = opts;
|
||||
const key = col.key;
|
||||
if (key === "createTime" && originalRow[key]) {
|
||||
row[key] = new Date(originalRow[key]).toLocaleString();
|
||||
}
|
||||
},
|
||||
},
|
||||
},
|
||||
request: {
|
||||
pageRequest,
|
||||
addRequest,
|
||||
editRequest,
|
||||
delRequest,
|
||||
actionbar: {
|
||||
buttons: {
|
||||
add: { show: false },
|
||||
clean: {
|
||||
text: "清理过期日志(90天)",
|
||||
type: "primary",
|
||||
danger: true,
|
||||
click: cleanExpired,
|
||||
},
|
||||
},
|
||||
},
|
||||
rowHandle: {
|
||||
minWidth: 200,
|
||||
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",
|
||||
key: "id",
|
||||
type: "number",
|
||||
column: {
|
||||
width: 100,
|
||||
},
|
||||
form: {
|
||||
show: false,
|
||||
},
|
||||
},
|
||||
domain: {
|
||||
title: t("certd.cnameDomain"),
|
||||
type: "text",
|
||||
editForm: {
|
||||
component: {
|
||||
disabled: true,
|
||||
},
|
||||
},
|
||||
search: {
|
||||
show: true,
|
||||
},
|
||||
form: {
|
||||
component: {
|
||||
placeholder: t("certd.cnameDomainPlaceholder"),
|
||||
},
|
||||
helper: t("certd.cnameDomainHelper"),
|
||||
rules: [
|
||||
{ required: true, message: t("certd.requiredField") },
|
||||
{ pattern: /^[^*]+$/, message: t("certd.cnameDomainPattern") },
|
||||
],
|
||||
},
|
||||
column: {
|
||||
width: 200,
|
||||
},
|
||||
},
|
||||
dnsProviderType: {
|
||||
title: t("certd.dnsProvider"),
|
||||
type: "dict-select",
|
||||
search: {
|
||||
show: true,
|
||||
},
|
||||
dict: dict({
|
||||
url: "pi/dnsProvider/list",
|
||||
value: "key",
|
||||
label: "title",
|
||||
}),
|
||||
form: {
|
||||
rules: [{ required: true, message: t("certd.requiredField") }],
|
||||
},
|
||||
column: {
|
||||
width: 150,
|
||||
component: {
|
||||
color: "auto",
|
||||
},
|
||||
},
|
||||
},
|
||||
accessId: {
|
||||
title: t("certd.dnsProviderAuthorization"),
|
||||
type: "dict-select",
|
||||
dict: dict({
|
||||
url: "/pi/access/list",
|
||||
value: "id",
|
||||
label: "name",
|
||||
}),
|
||||
form: {
|
||||
component: {
|
||||
name: "access-selector",
|
||||
vModel: "modelValue",
|
||||
type: compute(({ form }) => {
|
||||
return form.dnsProviderType;
|
||||
}),
|
||||
},
|
||||
rules: [{ required: true, message: t("certd.requiredField") }],
|
||||
},
|
||||
column: {
|
||||
width: 150,
|
||||
component: {
|
||||
color: "auto",
|
||||
},
|
||||
},
|
||||
},
|
||||
isDefault: {
|
||||
title: t("certd.isDefault"),
|
||||
type: "dict-switch",
|
||||
dict: dict({
|
||||
data: [
|
||||
{ label: t("certd.yes"), value: true, color: "success" },
|
||||
{ label: t("certd.no"), value: false, color: "default" },
|
||||
],
|
||||
}),
|
||||
form: {
|
||||
value: false,
|
||||
rules: [{ required: true, message: t("certd.selectIsDefault") }],
|
||||
},
|
||||
column: {
|
||||
align: "center",
|
||||
width: 100,
|
||||
},
|
||||
},
|
||||
setDefault: {
|
||||
title: t("certd.setDefault"),
|
||||
type: "text",
|
||||
form: {
|
||||
show: false,
|
||||
},
|
||||
column: {
|
||||
width: 100,
|
||||
align: "center",
|
||||
conditionalRenderDisabled: true,
|
||||
cellRender: ({ row }) => {
|
||||
if (row.isDefault) {
|
||||
return;
|
||||
}
|
||||
const onClick = async () => {
|
||||
Modal.confirm({
|
||||
title: t("certd.prompt"),
|
||||
content: t("certd.confirmSetDefault"),
|
||||
onOk: async () => {
|
||||
await api.SetDefault(row.id);
|
||||
await crudExpose.doRefresh();
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
return (
|
||||
<a-button type={"link"} size={"small"} onClick={onClick}>
|
||||
{t("certd.setAsDefault")}
|
||||
</a-button>
|
||||
);
|
||||
},
|
||||
},
|
||||
},
|
||||
disabled: {
|
||||
title: t("certd.disabled"),
|
||||
type: "dict-switch",
|
||||
dict: dict({
|
||||
data: [
|
||||
{ label: t("certd.enabled"), value: false, color: "success" },
|
||||
{ label: t("certd.disabledLabel"), value: true, color: "error" },
|
||||
],
|
||||
}),
|
||||
form: {
|
||||
value: false,
|
||||
},
|
||||
column: {
|
||||
width: 100,
|
||||
component: {
|
||||
title: t("certd.clickToToggle"),
|
||||
on: {
|
||||
async click({ value, row }) {
|
||||
Modal.confirm({
|
||||
title: t("certd.prompt"),
|
||||
content: t("certd.confirmToggleStatus", { action: !value ? t("certd.disable") : t("certd.enable") }),
|
||||
onOk: async () => {
|
||||
await api.SetDisabled(row.id, !value);
|
||||
await crudExpose.doRefresh();
|
||||
},
|
||||
});
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
column: { width: 80 },
|
||||
form: { show: false },
|
||||
},
|
||||
createTime: {
|
||||
title: t("certd.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 },
|
||||
},
|
||||
success: {
|
||||
title: "结果",
|
||||
type: "dict-switch",
|
||||
dict: dict({
|
||||
data: [
|
||||
{ value: true, label: "成功", color: "success" },
|
||||
{ value: false, label: "失败", color: "error" },
|
||||
],
|
||||
}),
|
||||
column: { width: 100, align: "center" },
|
||||
form: { show: false },
|
||||
search: { show: true },
|
||||
},
|
||||
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,
|
||||
},
|
||||
column: {
|
||||
sorter: true,
|
||||
width: 160,
|
||||
align: "center",
|
||||
},
|
||||
},
|
||||
updateTime: {
|
||||
title: t("certd.updateTime"),
|
||||
type: "datetime",
|
||||
form: {
|
||||
show: false,
|
||||
},
|
||||
column: {
|
||||
show: true,
|
||||
width: 160,
|
||||
},
|
||||
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,63 +1,24 @@
|
||||
<template>
|
||||
<fs-page class="page-cert">
|
||||
<fs-page>
|
||||
<template #header>
|
||||
<div class="title">
|
||||
{{ t("certd.cnameTitle") }}
|
||||
<span class="sub">
|
||||
{{ t("certd.cnameDescription") }}
|
||||
<a href="https://certd.docmirror.cn/guide/feature/cname/" target="_blank">
|
||||
{{ t("certd.cnameLinkText") }}
|
||||
</a>
|
||||
</span>
|
||||
操作日志
|
||||
<span class="sub">查看所有用户的操作记录</span>
|
||||
</div>
|
||||
</template>
|
||||
<fs-crud ref="crudRef" v-bind="crudBinding">
|
||||
<template #pagination-left>
|
||||
<a-tooltip :title="t('certd.batchDelete')">
|
||||
<fs-button icon="DeleteOutlined" @click="handleBatchDelete"></fs-button>
|
||||
</a-tooltip>
|
||||
</template>
|
||||
</fs-crud>
|
||||
<fs-crud ref="crudRef" v-bind="crudBinding" />
|
||||
</fs-page>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { useMounted } from "/@/use/use-mounted";
|
||||
import { useFs } from "@fast-crud/fast-crud";
|
||||
import createCrudOptions from "./crud";
|
||||
import { message, Modal } from "ant-design-vue";
|
||||
import { DeleteBatch } from "./api";
|
||||
import { useI18n } from "/src/locales";
|
||||
import { useCrudPermission } from "/@/plugin/permission";
|
||||
import { createSysAuditApi } from "./api";
|
||||
import { useMounted } from "/@/use/use-mounted";
|
||||
|
||||
const { t } = useI18n();
|
||||
defineOptions({ name: "SysAuditLog" });
|
||||
|
||||
defineOptions({
|
||||
name: "CnameProvider",
|
||||
});
|
||||
const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
|
||||
|
||||
const selectedRowKeys = context.selectedRowKeys;
|
||||
const handleBatchDelete = () => {
|
||||
if (selectedRowKeys.value?.length > 0) {
|
||||
Modal.confirm({
|
||||
title: t("certd.confirmTitle"),
|
||||
content: t("certd.confirmDeleteBatch", { count: selectedRowKeys.value.length }),
|
||||
async onOk() {
|
||||
await DeleteBatch(selectedRowKeys.value);
|
||||
message.info(t("certd.deleteSuccess"));
|
||||
crudExpose.doRefresh();
|
||||
selectedRowKeys.value = [];
|
||||
},
|
||||
});
|
||||
} else {
|
||||
message.error(t("certd.selectRecordsFirst"));
|
||||
}
|
||||
};
|
||||
|
||||
// 页面打开后获取列表数据
|
||||
useMounted(async () => {
|
||||
await crudExpose.doRefresh();
|
||||
});
|
||||
const api = createSysAuditApi();
|
||||
const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api } });
|
||||
useMounted(() => crudExpose.doRefresh());
|
||||
</script>
|
||||
<style lang="less"></style>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
LEGO_VERSION=4.30.1
|
||||
JKS_GO_VERSION=1.0.3
|
||||
certd_plugin_loadmode=dev
|
||||
certd_plugin_loadmode=dev
|
||||
# certd_release_mode=stable
|
||||
@@ -3,12 +3,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.42.6](https://github.com/certd/certd/compare/v1.42.5...v1.42.6) (2026-07-18)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* 修复正常批量删除流水线报权限不足的bug ([5b50083](https://github.com/certd/certd/commit/5b500830a122c6c42dab054e57fed509050f94da))
|
||||
|
||||
## [1.42.5](https://github.com/certd/certd/compare/v1.42.4...v1.42.5) (2026-07-15)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
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`);
|
||||
|
||||
ALTER TABLE `cd_audit_log` ADD COLUMN `success` tinyint(1) NOT NULL DEFAULT 1;
|
||||
|
||||
-- 审计日志表索引
|
||||
CREATE INDEX `index_audit_log_type` ON `cd_audit_log` (`type`);
|
||||
CREATE INDEX `index_audit_log_create_time` ON `cd_audit_log` (`create_time`);
|
||||
@@ -0,0 +1,8 @@
|
||||
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");
|
||||
|
||||
ALTER TABLE "cd_audit_log" ADD COLUMN "success" boolean NOT NULL DEFAULT true;
|
||||
|
||||
-- 审计日志表索引
|
||||
CREATE INDEX "index_audit_log_type" ON "cd_audit_log" ("type");
|
||||
CREATE INDEX "index_audit_log_create_time" ON "cd_audit_log" ("create_time");
|
||||
@@ -0,0 +1,8 @@
|
||||
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");
|
||||
|
||||
ALTER TABLE "cd_audit_log" ADD COLUMN "success" boolean NOT NULL DEFAULT (1);
|
||||
|
||||
-- 审计日志表索引
|
||||
CREATE INDEX "index_audit_log_type" ON "cd_audit_log" ("type");
|
||||
CREATE INDEX "index_audit_log_create_time" ON "cd_audit_log" ("create_time");
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@certd/ui-server",
|
||||
"version": "1.42.6",
|
||||
"version": "1.42.5",
|
||||
"description": "fast-server base midway",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
@@ -42,20 +42,20 @@
|
||||
"lint1": "eslint --fix"
|
||||
},
|
||||
"dependencies": {
|
||||
"@certd/acme-client": "^1.42.6",
|
||||
"@certd/basic": "^1.42.6",
|
||||
"@certd/commercial-core": "^1.42.6",
|
||||
"@certd/acme-client": "^1.42.5",
|
||||
"@certd/basic": "^1.42.5",
|
||||
"@certd/commercial-core": "^1.42.5",
|
||||
"@certd/cv4pve-api-javascript": "^8.4.2",
|
||||
"@certd/jdcloud": "^1.42.6",
|
||||
"@certd/lib-huawei": "^1.42.6",
|
||||
"@certd/lib-k8s": "^1.42.6",
|
||||
"@certd/lib-server": "^1.42.6",
|
||||
"@certd/midway-flyway-js": "^1.42.6",
|
||||
"@certd/pipeline": "^1.42.6",
|
||||
"@certd/plugin-cert": "^1.42.6",
|
||||
"@certd/plugin-lib": "^1.42.6",
|
||||
"@certd/plugin-plus": "^1.42.6",
|
||||
"@certd/plus-core": "^1.42.6",
|
||||
"@certd/jdcloud": "^1.42.5",
|
||||
"@certd/lib-huawei": "^1.42.5",
|
||||
"@certd/lib-k8s": "^1.42.5",
|
||||
"@certd/lib-server": "^1.42.5",
|
||||
"@certd/midway-flyway-js": "^1.42.5",
|
||||
"@certd/pipeline": "^1.42.5",
|
||||
"@certd/plugin-cert": "^1.42.5",
|
||||
"@certd/plugin-lib": "^1.42.5",
|
||||
"@certd/plugin-plus": "^1.42.5",
|
||||
"@certd/plus-core": "^1.42.5",
|
||||
"@koa/cors": "^5.0.0",
|
||||
"@midwayjs/bootstrap": "3.20.11",
|
||||
"@midwayjs/cache": "3.14.0",
|
||||
|
||||
@@ -12,6 +12,7 @@ import cors from "@koa/cors";
|
||||
import { GlobalExceptionMiddleware } from "./middleware/global-exception.js";
|
||||
import { PreviewMiddleware } from "./middleware/preview.js";
|
||||
import { AuthorityMiddleware } from "./middleware/authority.js";
|
||||
import { AuditLogMiddleware } from "./middleware/audit-log.js";
|
||||
import { logger } from "@certd/basic";
|
||||
import { ResetPasswdMiddleware } from "./middleware/reset-passwd/middleware.js";
|
||||
import DefaultConfig from "./config/config.default.js";
|
||||
@@ -113,6 +114,7 @@ export class MainConfiguration {
|
||||
PreviewMiddleware,
|
||||
//授权处理
|
||||
AuthorityMiddleware,
|
||||
AuditLogMiddleware,
|
||||
|
||||
//resetPasswd,重置密码模式下不提供服务
|
||||
ResetPasswdMiddleware,
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
|
||||
import { normalizeReleaseVersion } from "./app-controller.js";
|
||||
import { getReleaseMode, normalizeReleaseVersion } from "./app-controller.js";
|
||||
|
||||
describe("AppController.normalizeReleaseVersion", () => {
|
||||
it("normalizes AtomGit release tag names", () => {
|
||||
@@ -15,3 +15,29 @@ describe("AppController.normalizeReleaseVersion", () => {
|
||||
assert.equal(normalizeReleaseVersion({ name: "v1.40.0" }), "1.40.0");
|
||||
});
|
||||
});
|
||||
|
||||
describe("AppController.getReleaseMode", () => {
|
||||
it("returns 'latest' when env var is not set", () => {
|
||||
delete process.env.certd_release_mode;
|
||||
assert.equal(getReleaseMode(), "latest");
|
||||
});
|
||||
|
||||
it("returns 'latest' when env var is empty", () => {
|
||||
process.env.certd_release_mode = "";
|
||||
assert.equal(getReleaseMode(), "latest");
|
||||
});
|
||||
|
||||
it("returns 'stable' when env var is 'stable'", () => {
|
||||
process.env.certd_release_mode = "stable";
|
||||
assert.equal(getReleaseMode(), "stable");
|
||||
});
|
||||
|
||||
it("returns 'latest' when env var is an unknown value", () => {
|
||||
process.env.certd_release_mode = "unknown";
|
||||
assert.equal(getReleaseMode(), "latest");
|
||||
});
|
||||
|
||||
after(() => {
|
||||
delete process.env.certd_release_mode;
|
||||
});
|
||||
});
|
||||
|
||||
@@ -8,6 +8,10 @@ export function normalizeReleaseVersion(release: { tag_name?: string; name?: str
|
||||
return version.replace(/^v/i, "");
|
||||
}
|
||||
|
||||
export function getReleaseMode(): "stable" | "latest" {
|
||||
return process.env.certd_release_mode === "stable" ? "stable" : "latest";
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
@Provide()
|
||||
@@ -20,14 +24,30 @@ export class AppController extends BaseController {
|
||||
|
||||
@Get("/latest", { description: Constants.per.authOnly })
|
||||
async latest(): Promise<any> {
|
||||
const mode = getReleaseMode();
|
||||
try {
|
||||
const res = await http.request({
|
||||
url: "https://api.atomgit.com/api/v5/repos/certd/certd/releases/latest",
|
||||
method: "get",
|
||||
logRes: false,
|
||||
timeout: 5000,
|
||||
});
|
||||
const latest = normalizeReleaseVersion(res);
|
||||
let latest = "";
|
||||
if (mode === "stable") {
|
||||
// 稳定版: 查询被设为 latest 的正式版本
|
||||
const res = await http.request({
|
||||
url: "https://api.atomgit.com/api/v5/repos/certd/certd/releases/latest?type=latest",
|
||||
method: "get",
|
||||
logRes: false,
|
||||
timeout: 5000,
|
||||
});
|
||||
latest = normalizeReleaseVersion(res);
|
||||
} else {
|
||||
// 预览版: 获取最新一条 release(可能包含 pre-release)
|
||||
const list = await http.request({
|
||||
url: "https://api.atomgit.com/api/v5/repos/certd/certd/releases/?direction=desc&per_page=1",
|
||||
method: "get",
|
||||
logRes: false,
|
||||
timeout: 5000,
|
||||
});
|
||||
if (Array.isArray(list) && list.length > 0) {
|
||||
latest = normalizeReleaseVersion(list[0]);
|
||||
}
|
||||
}
|
||||
return this.ok(latest);
|
||||
} catch (e: any) {
|
||||
logger.error(e);
|
||||
|
||||
@@ -3,6 +3,7 @@ import { BaseController, CommonException, Constants, SysSettingsService } from "
|
||||
import { CodeService } from "../../../modules/basic/service/code-service.js";
|
||||
import { UserService } from "../../../modules/sys/authority/service/user-service.js";
|
||||
import { LoginService } from "../../../modules/login/service/login-service.js";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
/**
|
||||
*/
|
||||
@@ -19,7 +20,11 @@ export class ForgotPasswordController extends BaseController {
|
||||
@Inject()
|
||||
sysSettingsService: SysSettingsService;
|
||||
|
||||
@Post("/forgotPassword", { description: Constants.per.guest })
|
||||
getAuditType(): string {
|
||||
return AuditType.login.value;
|
||||
}
|
||||
|
||||
@Post("/forgotPassword", { description: Constants.per.guest, summary: "找回密码" })
|
||||
public async forgotPassword(
|
||||
@Body(ALL)
|
||||
body: any
|
||||
@@ -28,15 +33,13 @@ export class ForgotPasswordController extends BaseController {
|
||||
if (!sysSettings.selfServicePasswordRetrievalEnabled) {
|
||||
throw new CommonException("暂未开启自助找回");
|
||||
}
|
||||
// 找回密码的验证码允许错误次数
|
||||
const maxErrorCount = 5;
|
||||
|
||||
if (body.type === "email") {
|
||||
this.codeService.checkEmailCode({
|
||||
verificationType: "forgotPassword",
|
||||
email: body.input,
|
||||
validateCode: body.validateCode,
|
||||
maxErrorCount: maxErrorCount,
|
||||
maxErrorCount: 5,
|
||||
throwError: true,
|
||||
});
|
||||
} else if (body.type === "mobile") {
|
||||
@@ -45,14 +48,15 @@ export class ForgotPasswordController extends BaseController {
|
||||
mobile: body.input,
|
||||
phoneCode: body.phoneCode,
|
||||
smsCode: body.validateCode,
|
||||
maxErrorCount: maxErrorCount,
|
||||
maxErrorCount: 5,
|
||||
throwError: true,
|
||||
});
|
||||
} else {
|
||||
throw new CommonException("暂不支持的找回类型,请联系管理员找回");
|
||||
}
|
||||
const username = await this.userService.forgotPassword(body);
|
||||
const { id, username } = await this.userService.forgotPassword(body);
|
||||
username && this.loginService.clearCacheOnSuccess(username);
|
||||
this.auditLog({ userId: id, content: "用户请求找回密码" });
|
||||
return this.ok();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,9 +5,8 @@ import { CodeService } from "../../../modules/basic/service/code-service.js";
|
||||
import { checkComm } from "@certd/plus-core";
|
||||
import { CaptchaService } from "../../../modules/basic/service/captcha-service.js";
|
||||
import { PasskeyService } from "../../../modules/login/service/passkey-service.js";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
/**
|
||||
*/
|
||||
@Provide()
|
||||
@Controller("/api/")
|
||||
export class LoginController extends BaseController {
|
||||
@@ -27,7 +26,11 @@ export class LoginController extends BaseController {
|
||||
@Inject()
|
||||
passkeyService: PasskeyService;
|
||||
|
||||
@Post("/login", { description: Constants.per.guest })
|
||||
getAuditType(): string {
|
||||
return AuditType.login.value;
|
||||
}
|
||||
|
||||
@Post("/login", { description: Constants.per.guest, summary: "用户名密码登录" })
|
||||
public async login(
|
||||
@Body(ALL)
|
||||
body: any,
|
||||
@@ -38,16 +41,22 @@ export class LoginController extends BaseController {
|
||||
if (settings.captchaEnabled === true) {
|
||||
await this.captchaService.doValidate({ form: body.captcha, must: false, captchaAddonId: settings.captchaAddonId, req: { remoteIp } });
|
||||
}
|
||||
const token = await this.loginService.loginByPassword(body);
|
||||
this.writeTokenCookie(token);
|
||||
return this.ok(token);
|
||||
try {
|
||||
const token = await this.loginService.loginByPassword(body);
|
||||
this.writeTokenCookie(token);
|
||||
this.auditLog({ userId: token.userId, username: token.username, content: `用户「${body.username}」登录成功` });
|
||||
return this.ok(token);
|
||||
} catch (err: any) {
|
||||
this.auditLog({ userId: err.userId, username: body.username, content: `用户「${body.username}」登录失败:${err.message}` });
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
private writeTokenCookie(token: { expire: any; token: any }) {
|
||||
// this.loginService.writeTokenCookie(this.ctx,token);
|
||||
}
|
||||
|
||||
@Post("/loginBySms", { description: Constants.per.guest })
|
||||
@Post("/loginBySms", { description: Constants.per.guest, summary: "短信验证码登录" })
|
||||
public async loginBySms(
|
||||
@Body(ALL)
|
||||
body: any
|
||||
@@ -58,31 +67,42 @@ export class LoginController extends BaseController {
|
||||
}
|
||||
checkComm();
|
||||
|
||||
const token = await this.loginService.loginBySmsCode({
|
||||
phoneCode: body.phoneCode,
|
||||
mobile: body.mobile,
|
||||
smsCode: body.smsCode,
|
||||
randomStr: body.randomStr,
|
||||
inviteCode: body.inviteCode,
|
||||
});
|
||||
try {
|
||||
const token = await this.loginService.loginBySmsCode({
|
||||
phoneCode: body.phoneCode,
|
||||
mobile: body.mobile,
|
||||
smsCode: body.smsCode,
|
||||
randomStr: body.randomStr,
|
||||
inviteCode: body.inviteCode,
|
||||
});
|
||||
|
||||
this.writeTokenCookie(token);
|
||||
|
||||
return this.ok(token);
|
||||
this.writeTokenCookie(token);
|
||||
this.auditLog({ userId: token.userId, username: token.username, content: `用户「${body.mobile}」短信登录成功` });
|
||||
return this.ok(token);
|
||||
} catch (err: any) {
|
||||
this.auditLog({ userId: err.userId, username: body.mobile, content: `用户「${body.mobile}」短信登录失败:${err.message}` });
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
@Post("/loginByTwoFactor", { description: Constants.per.guest })
|
||||
@Post("/loginByTwoFactor", { description: Constants.per.guest, summary: "两步验证登录" })
|
||||
public async loginByTwoFactor(
|
||||
@Body(ALL)
|
||||
body: any
|
||||
) {
|
||||
const token = await this.loginService.loginByTwoFactor({
|
||||
loginId: body.loginId,
|
||||
verifyCode: body.verifyCode,
|
||||
});
|
||||
try {
|
||||
const token = await this.loginService.loginByTwoFactor({
|
||||
loginId: body.loginId,
|
||||
verifyCode: body.verifyCode,
|
||||
});
|
||||
|
||||
this.writeTokenCookie(token);
|
||||
return this.ok(token);
|
||||
this.writeTokenCookie(token);
|
||||
this.auditLog({ userId: token.userId, username: token.username, content: `用户「${body.loginId}」两步验证登录成功` });
|
||||
return this.ok(token);
|
||||
} catch (err: any) {
|
||||
this.auditLog({ userId: err.userId, username: body.loginId, content: `用户「${body.loginId}」两步验证登录失败:${err.message}` });
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
@Post("/passkey/generateAuthentication", { description: Constants.per.guest })
|
||||
@@ -92,24 +112,30 @@ export class LoginController extends BaseController {
|
||||
return this.ok(options);
|
||||
}
|
||||
|
||||
@Post("/loginByPasskey", { description: Constants.per.guest })
|
||||
@Post("/loginByPasskey", { description: Constants.per.guest, summary: "Passkey登录" })
|
||||
public async loginByPasskey(
|
||||
@Body(ALL)
|
||||
body: any
|
||||
) {
|
||||
const credential = body.credential;
|
||||
const challenge = body.challenge;
|
||||
try {
|
||||
const credential = body.credential;
|
||||
const challenge = body.challenge;
|
||||
|
||||
const token = await this.loginService.loginByPasskey(
|
||||
{
|
||||
credential,
|
||||
challenge,
|
||||
},
|
||||
this.ctx
|
||||
);
|
||||
const token = await this.loginService.loginByPasskey(
|
||||
{
|
||||
credential,
|
||||
challenge,
|
||||
},
|
||||
this.ctx
|
||||
);
|
||||
|
||||
// this.writeTokenCookie(token);
|
||||
return this.ok(token);
|
||||
this.writeTokenCookie(token);
|
||||
this.auditLog({ userId: token.userId, username: token.username, content: "用户Passkey登录成功" });
|
||||
return this.ok(token);
|
||||
} catch (err: any) {
|
||||
this.auditLog({ userId: err.userId, username: body.credential, content: `用户Passkey登录失败:${err.message}` });
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
@Post("/logout", { description: Constants.per.authOnly })
|
||||
|
||||
@@ -8,6 +8,7 @@ import { LoginService } from "../../../modules/login/service/login-service.js";
|
||||
import { OauthBoundService } from "../../../modules/login/service/oauth-bound-service.js";
|
||||
import { AddonGetterService } from "../../../modules/pipeline/service/addon-getter-service.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";
|
||||
|
||||
type OauthProviderSetting = {
|
||||
@@ -48,6 +49,10 @@ export class ConnectController extends BaseController {
|
||||
@Inject()
|
||||
addonService: AddonService;
|
||||
|
||||
getAuditType(): string {
|
||||
return AuditType.login.value;
|
||||
}
|
||||
|
||||
private async getOauthProvider(type: string) {
|
||||
const publicSettings = await this.sysSettingsService.getPublicSettings();
|
||||
if (!publicSettings?.oauthEnabled) {
|
||||
@@ -68,12 +73,11 @@ export class ConnectController extends BaseController {
|
||||
};
|
||||
}
|
||||
|
||||
@Post("/login", { description: Constants.per.guest })
|
||||
@Post("/login", { description: Constants.per.guest, summary: "第三方登录" })
|
||||
public async login(@Body(ALL) body: { type: string; subtype?: string; forType?: string; from?: string }) {
|
||||
const oauthProvider = await this.getOauthProvider(body.type);
|
||||
const installInfo = await this.sysSettingsService.getSetting<SysInstallInfo>(SysInstallInfo);
|
||||
const bindUrl = installInfo?.bindUrl || "";
|
||||
//构造登录url
|
||||
const redirectUrl = `${bindUrl}api/oauth/callback/${body.type}`;
|
||||
|
||||
const stateObj = {
|
||||
@@ -95,8 +99,6 @@ export class ConnectController extends BaseController {
|
||||
});
|
||||
this.ctx.cookies.set("oauth_ticket", ticket, {
|
||||
httpOnly: true,
|
||||
// secure: true,
|
||||
// sameSite: "strict",
|
||||
});
|
||||
return this.ok({ loginUrl, ticket });
|
||||
}
|
||||
@@ -153,7 +155,7 @@ export class ConnectController extends BaseController {
|
||||
}
|
||||
}
|
||||
|
||||
@Post("/getLogoutUrl", { description: Constants.per.guest })
|
||||
@Post("/getLogoutUrl", { description: Constants.per.guest, summary: "第三方登出" })
|
||||
public async logout(@Body(ALL) body: any) {
|
||||
checkPlus();
|
||||
const oauthProvider = await this.getOauthProvider(body.type);
|
||||
@@ -195,7 +197,7 @@ export class ConnectController extends BaseController {
|
||||
// this.loginService.writeTokenCookie(this.ctx,token);
|
||||
}
|
||||
|
||||
@Post("/autoRegister", { description: Constants.per.guest })
|
||||
@Post("/autoRegister", { description: Constants.per.guest, summary: "第三方自动注册" })
|
||||
public async autoRegister(@Body(ALL) body: { validationCode: string; type: string; inviteCode?: string }) {
|
||||
const validationValue = this.codeService.getValidationValue(body.validationCode);
|
||||
if (!validationValue) {
|
||||
@@ -219,12 +221,12 @@ export class ConnectController extends BaseController {
|
||||
|
||||
const loginRes = await this.loginService.generateToken(newUser);
|
||||
this.writeTokenCookie(loginRes);
|
||||
this.auditLog({ userId: newUser.id, content: `第三方账号自动注册,类型: ${body.type}` });
|
||||
return this.ok(loginRes);
|
||||
}
|
||||
|
||||
@Post("/bind", { description: Constants.per.loginOnly })
|
||||
@Post("/bind", { description: Constants.per.loginOnly, summary: "绑定第三方账号" })
|
||||
public async bind(@Body(ALL) body: any) {
|
||||
//需要已登录
|
||||
const userId = this.getUserId();
|
||||
const validationValue = this.codeService.getValidationValue(body.validationCode);
|
||||
if (!validationValue) {
|
||||
@@ -238,17 +240,18 @@ export class ConnectController extends BaseController {
|
||||
type,
|
||||
openId,
|
||||
});
|
||||
this.auditLog({ userId, content: `第三方账号绑定,类型: ${body.type}` });
|
||||
return this.ok(1);
|
||||
}
|
||||
|
||||
@Post("/unbind", { description: Constants.per.loginOnly })
|
||||
@Post("/unbind", { description: Constants.per.loginOnly, summary: "解绑第三方账号" })
|
||||
public async unbind(@Body(ALL) body: any) {
|
||||
//需要已登录
|
||||
const userId = this.getUserId();
|
||||
await this.oauthBoundService.unbind({
|
||||
userId,
|
||||
type: body.type,
|
||||
});
|
||||
this.auditLog({ userId, content: `第三方账号解绑,类型: ${body.type}` });
|
||||
return this.ok(1);
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import { RegisterType } from "../../../modules/sys/authority/service/user-servic
|
||||
import { CodeService } from "../../../modules/basic/service/code-service.js";
|
||||
import { checkComm, checkPlus } from "@certd/plus-core";
|
||||
import { LoginService } from "../../../modules/login/service/login-service.js";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
export type RegisterReq = {
|
||||
type: RegisterType;
|
||||
@@ -31,7 +32,11 @@ export class RegisterController extends BaseController {
|
||||
@Inject()
|
||||
sysSettingsService: SysSettingsService;
|
||||
|
||||
@Post("/register", { description: Constants.per.guest })
|
||||
getAuditType(): string {
|
||||
return AuditType.login.value;
|
||||
}
|
||||
|
||||
@Post("/register", { description: Constants.per.guest, summary: "用户注册" })
|
||||
public async register(
|
||||
@Body(ALL)
|
||||
body: RegisterReq,
|
||||
@@ -60,6 +65,7 @@ export class RegisterController extends BaseController {
|
||||
password: body.password,
|
||||
} as any;
|
||||
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);
|
||||
} else if (body.type === "mobile") {
|
||||
if (sysPublicSettings.mobileRegisterEnabled === false) {
|
||||
@@ -80,6 +86,7 @@ export class RegisterController extends BaseController {
|
||||
password: body.password,
|
||||
} as any;
|
||||
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);
|
||||
} else if (body.type === "email") {
|
||||
if (sysPublicSettings.emailRegisterEnabled === false) {
|
||||
@@ -97,6 +104,7 @@ export class RegisterController extends BaseController {
|
||||
password: body.password,
|
||||
} as any;
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import { SysInviteCommissionSetting } from "@certd/commercial-core";
|
||||
import { cloneDeep } from "lodash-es";
|
||||
import { getVersion } from "../../utils/version.js";
|
||||
import { http } from "@certd/basic";
|
||||
import { getReleaseMode } from "./app-controller.js";
|
||||
|
||||
/**
|
||||
*/
|
||||
@@ -108,6 +109,7 @@ export class BasicSettingsController extends BaseController {
|
||||
app: {
|
||||
time: new Date().getTime(),
|
||||
version,
|
||||
releaseMode: getReleaseMode(),
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
@@ -37,12 +37,12 @@ export class SysAccessController extends AccessController {
|
||||
return await super.list(body);
|
||||
}
|
||||
|
||||
@Post("/add", { description: "sys:settings:edit" })
|
||||
@Post("/add", { description: "sys:settings:edit", summary: "添加系统授权配置" })
|
||||
async add(@Body(ALL) bean: any) {
|
||||
return await super.add(bean);
|
||||
}
|
||||
|
||||
@Post("/update", { description: "sys:settings:edit" })
|
||||
@Post("/update", { description: "sys:settings:edit", summary: "更新系统授权配置" })
|
||||
async update(@Body(ALL) bean: any) {
|
||||
return await super.update(bean);
|
||||
}
|
||||
@@ -51,7 +51,7 @@ export class SysAccessController extends AccessController {
|
||||
return await super.info(id);
|
||||
}
|
||||
|
||||
@Post("/delete", { description: "sys:settings:edit" })
|
||||
@Post("/delete", { description: "sys:settings:edit", summary: "删除系统授权配置" })
|
||||
async delete(@Query("id") id: number) {
|
||||
return await super.delete(id);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { ALL, Body, Controller, Inject, Post, Provide } from "@midwayjs/core";
|
||||
import { BaseController, PlusService, SysInstallInfo, SysSettingsService } from "@certd/lib-server";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
export type PreBindUserReq = {
|
||||
userId: number;
|
||||
@@ -18,9 +19,12 @@ export class BasicController extends BaseController {
|
||||
@Inject()
|
||||
sysSettingsService: SysSettingsService;
|
||||
|
||||
@Post("/preBindUser", { description: "sys:settings:edit" })
|
||||
getAuditType(): string {
|
||||
return AuditType.account.value;
|
||||
}
|
||||
|
||||
@Post("/preBindUser", { description: "sys:settings:edit", summary: "预绑定用户" })
|
||||
public async preBindUser(@Body(ALL) body: PreBindUserReq) {
|
||||
// 设置缓存内容
|
||||
if (body.userId == null || body.userId <= 0) {
|
||||
throw new Error("用户ID不能为空");
|
||||
}
|
||||
@@ -28,7 +32,7 @@ export class BasicController extends BaseController {
|
||||
return this.ok({});
|
||||
}
|
||||
|
||||
@Post("/bindUser", { description: "sys:settings:edit" })
|
||||
@Post("/bindUser", { description: "sys:settings:edit", summary: "绑定用户" })
|
||||
public async bindUser(@Body(ALL) body: BindUserReq) {
|
||||
if (body.userId == null || body.userId <= 0) {
|
||||
throw new Error("用户ID不能为空");
|
||||
@@ -36,18 +40,20 @@ export class BasicController extends BaseController {
|
||||
const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
|
||||
installInfo.bindUserId = body.userId;
|
||||
await this.sysSettingsService.saveSetting(installInfo);
|
||||
await this.auditLog({ content: `绑定了袖手科技用户(ID:${body.userId})` });
|
||||
return this.ok({});
|
||||
}
|
||||
|
||||
@Post("/unbindUser", { description: "sys:settings:edit" })
|
||||
@Post("/unbindUser", { description: "sys:settings:edit", summary: "解绑用户" })
|
||||
public async unbindUser() {
|
||||
const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
|
||||
installInfo.bindUserId = null;
|
||||
await this.sysSettingsService.saveSetting(installInfo);
|
||||
await this.auditLog({ content: "解绑了袖手科技用户" });
|
||||
return this.ok({});
|
||||
}
|
||||
|
||||
@Post("/updateLicense", { description: "sys:settings:edit" })
|
||||
@Post("/updateLicense", { description: "sys:settings:edit", summary: "更新许可证" })
|
||||
public async updateLicense(@Body(ALL) body: { license: string }) {
|
||||
await this.plusService.updateLicense(body.license);
|
||||
return this.ok(true);
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
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,6 +1,7 @@
|
||||
import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
|
||||
import { CrudController } from "@certd/lib-server";
|
||||
import { PermissionService } from "../../../modules/sys/authority/service/permission-service.js";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
/**
|
||||
* 权限资源
|
||||
@@ -14,8 +15,11 @@ export class PermissionController extends CrudController<PermissionService> {
|
||||
getService() {
|
||||
return this.service;
|
||||
}
|
||||
getAuditType(): string {
|
||||
return AuditType.permission.value;
|
||||
}
|
||||
|
||||
@Post("/page", { description: "sys:auth:per:view" })
|
||||
@Post("/page", { description: "sys:auth:per:view", summary: "查询权限分页列表" })
|
||||
async page(
|
||||
@Body(ALL)
|
||||
body
|
||||
@@ -23,30 +27,42 @@ export class PermissionController extends CrudController<PermissionService> {
|
||||
return await super.page(body);
|
||||
}
|
||||
|
||||
@Post("/add", { description: "sys:auth:per:add" })
|
||||
@Post("/add", { description: "sys:auth:per:add", summary: "添加权限" })
|
||||
async add(
|
||||
@Body(ALL)
|
||||
bean
|
||||
) {
|
||||
return await super.add(bean);
|
||||
const res = await super.add(bean);
|
||||
await this.auditLog({
|
||||
content: `新增了权限「${bean.name}」(ID:${res.data})`,
|
||||
});
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/update", { description: "sys:auth:per:edit" })
|
||||
@Post("/update", { description: "sys:auth:per:edit", summary: "更新权限" })
|
||||
async update(
|
||||
@Body(ALL)
|
||||
bean
|
||||
) {
|
||||
return await super.update(bean);
|
||||
const res = await super.update(bean);
|
||||
await this.auditLog({
|
||||
content: `修改了权限「${bean.name}」(ID:${bean.id})`,
|
||||
});
|
||||
return res;
|
||||
}
|
||||
@Post("/delete", { description: "sys:auth:per:remove" })
|
||||
@Post("/delete", { description: "sys:auth:per:remove", summary: "删除权限" })
|
||||
async delete(
|
||||
@Query("id")
|
||||
id: number
|
||||
) {
|
||||
return await super.delete(id);
|
||||
const res = await super.delete(id);
|
||||
await this.auditLog({
|
||||
content: `删除了权限(ID:${id})`,
|
||||
});
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/tree", { description: "sys:auth:per:view" })
|
||||
@Post("/tree", { description: "sys:auth:per:view", summary: "查询权限树" })
|
||||
async tree() {
|
||||
const tree = await this.service.tree({});
|
||||
return this.ok(tree);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
|
||||
import { CrudController } from "@certd/lib-server";
|
||||
import { RoleService } from "../../../modules/sys/authority/service/role-service.js";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
/**
|
||||
* 系统用户
|
||||
@@ -15,6 +16,10 @@ export class RoleController extends CrudController<RoleService> {
|
||||
return this.service;
|
||||
}
|
||||
|
||||
getAuditType(): string {
|
||||
return AuditType.role.value;
|
||||
}
|
||||
|
||||
@Post("/page", { description: "sys:auth:role:view" })
|
||||
async page(
|
||||
@Body(ALL)
|
||||
@@ -29,22 +34,30 @@ export class RoleController extends CrudController<RoleService> {
|
||||
return this.ok(ret);
|
||||
}
|
||||
|
||||
@Post("/add", { description: "sys:auth:role:add" })
|
||||
@Post("/add", { description: "sys:auth:role:add", summary: "新增角色" })
|
||||
async add(
|
||||
@Body(ALL)
|
||||
bean
|
||||
) {
|
||||
return await super.add(bean);
|
||||
const res = await super.add(bean);
|
||||
await this.auditLog({
|
||||
content: `新增了角色「${bean.name}」(ID:${res.data})`,
|
||||
});
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/update", { description: "sys:auth:role:edit" })
|
||||
@Post("/update", { description: "sys:auth:role:edit", summary: "修改角色" })
|
||||
async update(
|
||||
@Body(ALL)
|
||||
bean
|
||||
) {
|
||||
return await super.update(bean);
|
||||
const res = await super.update(bean);
|
||||
await this.auditLog({
|
||||
content: `修改了角色「${bean.name}」(ID:${bean.id})`,
|
||||
});
|
||||
return res;
|
||||
}
|
||||
@Post("/delete", { description: "sys:auth:role:remove" })
|
||||
@Post("/delete", { description: "sys:auth:role:remove", summary: "删除角色" })
|
||||
async delete(
|
||||
@Query("id")
|
||||
id: number
|
||||
@@ -52,7 +65,11 @@ export class RoleController extends CrudController<RoleService> {
|
||||
if (id === 1) {
|
||||
throw new Error("不能删除默认的管理员角色");
|
||||
}
|
||||
return await super.delete(id);
|
||||
const res = await super.delete(id);
|
||||
await this.auditLog({
|
||||
content: `删除了角色(ID:${id})`,
|
||||
});
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/getPermissionTree", { description: "sys:auth:role:view" })
|
||||
@@ -78,9 +95,10 @@ export class RoleController extends CrudController<RoleService> {
|
||||
* @param roleId
|
||||
* @param permissionIds
|
||||
*/
|
||||
@Post("/authz", { description: "sys:auth:role:edit" })
|
||||
@Post("/authz", { description: "sys:auth:role:edit", summary: "角色授权" })
|
||||
async authz(@Body("roleId") roleId, @Body("permissionIds") permissionIds) {
|
||||
await this.service.authz(roleId, permissionIds);
|
||||
await this.auditLog({ content: `为角色(ID:${roleId})进行了授权` });
|
||||
return this.ok(null);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import { PermissionService } from "../../../modules/sys/authority/service/permis
|
||||
import { Constants } from "@certd/lib-server";
|
||||
import { In } from "typeorm";
|
||||
import { LoginService } from "../../../modules/login/service/login-service.js";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
/**
|
||||
* 系统用户
|
||||
@@ -24,6 +25,10 @@ export class UserController extends CrudController<UserService> {
|
||||
@Inject()
|
||||
loginService: LoginService;
|
||||
|
||||
getAuditType(): string {
|
||||
return AuditType.user.value;
|
||||
}
|
||||
|
||||
getService() {
|
||||
return this.service;
|
||||
}
|
||||
@@ -92,23 +97,31 @@ export class UserController extends CrudController<UserService> {
|
||||
return ret;
|
||||
}
|
||||
|
||||
@Post("/add", { description: "sys:auth:user:add" })
|
||||
@Post("/add", { description: "sys:auth:user:add", summary: "新增用户" })
|
||||
async add(
|
||||
@Body(ALL)
|
||||
bean
|
||||
) {
|
||||
return await super.add(bean);
|
||||
const res = await super.add(bean);
|
||||
await this.auditLog({
|
||||
content: `新增了用户「${bean.username}」(ID:${res.data})`,
|
||||
});
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/update", { description: "sys:auth:user:edit" })
|
||||
@Post("/update", { description: "sys:auth:user:edit", summary: "修改用户" })
|
||||
async update(
|
||||
@Body(ALL)
|
||||
bean
|
||||
) {
|
||||
return await super.update(bean);
|
||||
const res = await super.update(bean);
|
||||
await this.auditLog({
|
||||
content: `修改了用户「${bean.username}」(ID:${bean.id})`,
|
||||
});
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/delete", { description: "sys:auth:user:remove" })
|
||||
@Post("/delete", { description: "sys:auth:user:remove", summary: "删除用户" })
|
||||
async delete(
|
||||
@Query("id")
|
||||
id: number
|
||||
@@ -119,19 +132,24 @@ export class UserController extends CrudController<UserService> {
|
||||
if (id === 3) {
|
||||
throw new Error("不能删除默认的普通用户角色");
|
||||
}
|
||||
return await super.delete(id);
|
||||
const res = await super.delete(id);
|
||||
await this.auditLog({
|
||||
content: `删除了用户(ID:${id})`,
|
||||
});
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* 解除登录锁定
|
||||
*/
|
||||
@Post("/unlockBlock", { description: "sys:auth:user:edit" })
|
||||
@Post("/unlockBlock", { description: "sys:auth:user:edit", summary: "解锁登录锁定" })
|
||||
public async unlockBlock(@Body("id") id: number) {
|
||||
const info = await this.service.info(id, ["password"]);
|
||||
this.loginService.clearCacheOnSuccess(info.username);
|
||||
if (info.mobile) {
|
||||
this.loginService.clearCacheOnSuccess(info.mobile);
|
||||
}
|
||||
await this.auditLog({ content: `解锁了用户登录锁定(ID:${id})` });
|
||||
return this.ok(info);
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/c
|
||||
import { CrudController } from "@certd/lib-server";
|
||||
import { merge } from "lodash-es";
|
||||
import { CnameProviderService } from "../../../modules/cname/service/cname-provider-service.js";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
/**
|
||||
* 授权
|
||||
@@ -16,6 +17,10 @@ export class CnameRecordController extends CrudController<CnameProviderService>
|
||||
return this.service;
|
||||
}
|
||||
|
||||
getAuditType(): string {
|
||||
return AuditType.cname.value;
|
||||
}
|
||||
|
||||
@Post("/page", { description: "sys:settings:view" })
|
||||
async page(@Body(ALL) body: any) {
|
||||
body.query = body.query ?? {};
|
||||
@@ -27,7 +32,7 @@ export class CnameRecordController extends CrudController<CnameProviderService>
|
||||
return super.list(body);
|
||||
}
|
||||
|
||||
@Post("/add", { description: "sys:settings:edit" })
|
||||
@Post("/add", { description: "sys:settings:edit", summary: "添加CNAME服务" })
|
||||
async add(@Body(ALL) bean: any) {
|
||||
const def: any = {
|
||||
isDefault: false,
|
||||
@@ -35,13 +40,17 @@ export class CnameRecordController extends CrudController<CnameProviderService>
|
||||
};
|
||||
merge(bean, def);
|
||||
bean.userId = this.getUserId();
|
||||
return super.add(bean);
|
||||
const res = await super.add(bean);
|
||||
await this.auditLog({ content: `添加了CNAME服务(ID:${res.data})` });
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/update", { description: "sys:settings:edit" })
|
||||
@Post("/update", { description: "sys:settings:edit", summary: "更新CNAME服务" })
|
||||
async update(@Body(ALL) bean: any) {
|
||||
bean.userId = this.getUserId();
|
||||
return super.update(bean);
|
||||
const res = await super.update(bean);
|
||||
await this.auditLog({ content: `更新了CNAME服务(ID:${bean.id})` });
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/info", { description: "sys:settings:view" })
|
||||
@@ -49,26 +58,31 @@ export class CnameRecordController extends CrudController<CnameProviderService>
|
||||
return super.info(id);
|
||||
}
|
||||
|
||||
@Post("/delete", { description: "sys:settings:edit" })
|
||||
@Post("/delete", { description: "sys:settings:edit", summary: "删除CNAME服务" })
|
||||
async delete(@Query("id") id: number) {
|
||||
return super.delete(id);
|
||||
const res = await super.delete(id);
|
||||
await this.auditLog({ content: `删除了CNAME服务(ID:${id})` });
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/deleteByIds", { description: "sys:settings:edit" })
|
||||
@Post("/deleteByIds", { description: "sys:settings:edit", summary: "批量删除CNAME服务" })
|
||||
async deleteByIds(@Body("ids") ids: number[]) {
|
||||
const res = await this.service.delete(ids);
|
||||
await this.auditLog({ content: `批量删除了${ids.length}条CNAME服务` });
|
||||
return this.ok(res);
|
||||
}
|
||||
|
||||
@Post("/setDefault", { description: "sys:settings:edit" })
|
||||
@Post("/setDefault", { description: "sys:settings:edit", summary: "设置默认CNAME服务" })
|
||||
async setDefault(@Body("id") id: number) {
|
||||
await this.service.setDefault(id);
|
||||
await this.auditLog({ content: `设置了默认CNAME服务(ID:${id})` });
|
||||
return this.ok();
|
||||
}
|
||||
|
||||
@Post("/setDisabled", { description: "sys:settings:edit" })
|
||||
@Post("/setDisabled", { description: "sys:settings:edit", summary: "禁用/启用CNAME服务" })
|
||||
async setDisabled(@Body("id") id: number, @Body("disabled") disabled: boolean) {
|
||||
await this.service.setDisabled(id, disabled);
|
||||
await this.auditLog({ content: `${disabled ? "禁用" : "启用"}了CNAME服务(ID:${id})` });
|
||||
return this.ok();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/c
|
||||
import { ProjectService } from "../../../modules/sys/enterprise/service/project-service.js";
|
||||
import { ProjectEntity } from "../../../modules/sys/enterprise/entity/project.js";
|
||||
import { merge } from "lodash-es";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
/**
|
||||
*/
|
||||
@@ -15,22 +16,26 @@ export class SysProjectController extends CrudController<ProjectEntity> {
|
||||
@Inject()
|
||||
sysSettingsService: SysSettingsService;
|
||||
|
||||
getAuditType(): string {
|
||||
return AuditType.project.value;
|
||||
}
|
||||
|
||||
getService<T>() {
|
||||
return this.service;
|
||||
}
|
||||
|
||||
@Post("/page", { description: "sys:settings:view" })
|
||||
@Post("/page", { description: "sys:settings:view", summary: "查询项目分页列表" })
|
||||
async page(@Body(ALL) body: any) {
|
||||
body.query = body.query ?? {};
|
||||
return await super.page(body);
|
||||
}
|
||||
|
||||
@Post("/list", { description: "sys:settings:view" })
|
||||
@Post("/list", { description: "sys:settings:view", summary: "查询项目列表" })
|
||||
async list(@Body(ALL) body: any) {
|
||||
return super.list(body);
|
||||
}
|
||||
|
||||
@Post("/add", { description: "sys:settings:edit" })
|
||||
@Post("/add", { description: "sys:settings:edit", summary: "添加项目" })
|
||||
async add(@Body(ALL) bean: any) {
|
||||
const def: any = {
|
||||
isDefault: false,
|
||||
@@ -38,37 +43,57 @@ export class SysProjectController extends CrudController<ProjectEntity> {
|
||||
};
|
||||
merge(bean, def);
|
||||
bean.userId = this.getUserId();
|
||||
return super.add({
|
||||
const res = await super.add({
|
||||
...bean,
|
||||
userId: -1, //企业用户id固定为-1
|
||||
adminId: bean.userId,
|
||||
});
|
||||
await this.auditLog({
|
||||
content: `新增了项目「${bean.name}」(ID:${res.data})`,
|
||||
});
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/update", { description: "sys:settings:edit" })
|
||||
@Post("/update", { description: "sys:settings:edit", summary: "更新项目" })
|
||||
async update(@Body(ALL) bean: any) {
|
||||
bean.userId = this.getUserId();
|
||||
return super.update(bean);
|
||||
const res = await super.update(bean);
|
||||
await this.auditLog({
|
||||
content: `修改了项目「${bean.name}」(ID:${bean.id})`,
|
||||
});
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/info", { description: "sys:settings:view" })
|
||||
@Post("/info", { description: "sys:settings:view", summary: "查询项目详情" })
|
||||
async info(@Query("id") id: number) {
|
||||
return super.info(id);
|
||||
}
|
||||
|
||||
@Post("/delete", { description: "sys:settings:edit" })
|
||||
@Post("/delete", { description: "sys:settings:edit", summary: "删除项目" })
|
||||
async delete(@Query("id") id: number) {
|
||||
return super.delete(id);
|
||||
const res = await super.delete(id);
|
||||
await this.auditLog({
|
||||
content: `删除了项目(ID:${id})`,
|
||||
});
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/deleteByIds", { description: "sys:settings:edit" })
|
||||
@Post("/deleteByIds", { description: "sys:settings:edit", summary: "批量删除项目" })
|
||||
async deleteByIds(@Body("ids") ids: number[]) {
|
||||
const res = await this.service.delete(ids);
|
||||
await this.auditLog({
|
||||
content: `批量删除了${ids.length}个项目`,
|
||||
});
|
||||
return this.ok(res);
|
||||
}
|
||||
@Post("/setDisabled", { description: "sys:settings:edit" })
|
||||
@Post("/setDisabled", { description: "sys:settings:edit", summary: "禁用/启用项目" })
|
||||
async setDisabled(@Body("id") id: number, @Body("disabled") disabled: boolean) {
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
+20
-10
@@ -4,6 +4,7 @@ import { ProjectMemberEntity } from "../../../modules/sys/enterprise/entity/proj
|
||||
import { ProjectMemberService } from "../../../modules/sys/enterprise/service/project-member-service.js";
|
||||
import { merge } from "lodash-es";
|
||||
import { ProjectService } from "../../../modules/sys/enterprise/service/project-service.js";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
/**
|
||||
*/
|
||||
@@ -15,7 +16,6 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
|
||||
|
||||
@Inject()
|
||||
sysSettingsService: SysSettingsService;
|
||||
|
||||
@Inject()
|
||||
projectService: ProjectService;
|
||||
|
||||
@@ -23,18 +23,22 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
|
||||
return this.service;
|
||||
}
|
||||
|
||||
@Post("/page", { description: "sys:settings:view" })
|
||||
getAuditType(): string {
|
||||
return AuditType.enterprise.value;
|
||||
}
|
||||
|
||||
@Post("/page", { description: "sys:settings:view", summary: "查询项目成员分页列表" })
|
||||
async page(@Body(ALL) body: any) {
|
||||
body.query = body.query ?? {};
|
||||
return await super.page(body);
|
||||
}
|
||||
|
||||
@Post("/list", { description: "sys:settings:view" })
|
||||
@Post("/list", { description: "sys:settings:view", summary: "查询项目成员列表" })
|
||||
async list(@Body(ALL) body: any) {
|
||||
return super.list(body);
|
||||
}
|
||||
|
||||
@Post("/add", { description: "sys:settings:edit" })
|
||||
@Post("/add", { description: "sys:settings:edit", summary: "添加项目成员" })
|
||||
async add(@Body(ALL) bean: any) {
|
||||
const def: any = {
|
||||
isDefault: false,
|
||||
@@ -47,10 +51,12 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
|
||||
projectId: bean.projectId,
|
||||
});
|
||||
|
||||
return super.add(bean);
|
||||
const res = await super.add(bean);
|
||||
await this.auditLog({ content: `添加了项目成员(ID:${res.data})` });
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/update", { description: "sys:settings:edit" })
|
||||
@Post("/update", { description: "sys:settings:edit", summary: "更新项目成员" })
|
||||
async update(@Body(ALL) bean: any) {
|
||||
if (!bean.id) {
|
||||
throw new Error("id is required");
|
||||
@@ -65,10 +71,11 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
|
||||
permission: bean.permission,
|
||||
status: bean.status,
|
||||
});
|
||||
await this.auditLog({ content: `更新了项目成员(ID:${bean.id})` });
|
||||
return this.ok(res);
|
||||
}
|
||||
|
||||
@Post("/info", { description: "sys:settings:view" })
|
||||
@Post("/info", { description: "sys:settings:view", summary: "查询项目成员详情" })
|
||||
async info(@Query("id") id: number) {
|
||||
if (!id) {
|
||||
throw new Error("id is required");
|
||||
@@ -81,7 +88,7 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
|
||||
return super.info(id);
|
||||
}
|
||||
|
||||
@Post("/delete", { description: "sys:settings:edit" })
|
||||
@Post("/delete", { description: "sys:settings:edit", summary: "删除项目成员" })
|
||||
async delete(@Query("id") id: number) {
|
||||
if (!id) {
|
||||
throw new Error("id is required");
|
||||
@@ -91,10 +98,12 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
|
||||
userId: this.getUserId(),
|
||||
projectId: projectId,
|
||||
});
|
||||
return super.delete(id);
|
||||
const res = await super.delete(id);
|
||||
await this.auditLog({ content: `删除了项目成员(ID:${id})` });
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/deleteByIds", { description: "sys:settings:edit" })
|
||||
@Post("/deleteByIds", { description: "sys:settings:edit", summary: "批量删除项目成员" })
|
||||
async deleteByIds(@Body("ids") ids: number[]) {
|
||||
for (const id of ids) {
|
||||
if (!id) {
|
||||
@@ -108,6 +117,7 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
|
||||
await this.service.delete(id as any);
|
||||
}
|
||||
|
||||
await this.auditLog({ content: `批量删除了${ids.length}个项目成员` });
|
||||
return this.ok({});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/c
|
||||
import { CrudController } from "@certd/lib-server";
|
||||
import { SiteInfoService } from "../../../modules/monitor/service/site-info-service.js";
|
||||
import { ApiTags } from "@midwayjs/swagger";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
@Provide()
|
||||
@Controller("/api/sys/monitor/site")
|
||||
@@ -14,6 +15,10 @@ export class SysSiteInfoController extends CrudController<SiteInfoService> {
|
||||
return this.service;
|
||||
}
|
||||
|
||||
getAuditType(): string {
|
||||
return AuditType.monitor.value;
|
||||
}
|
||||
|
||||
@Post("/page", { description: "sys:settings:view", summary: "管理员查询站点监控分页列表" })
|
||||
async page(@Body(ALL) body: any) {
|
||||
body.query = body.query ?? {};
|
||||
@@ -44,12 +49,16 @@ export class SysSiteInfoController extends CrudController<SiteInfoService> {
|
||||
|
||||
@Post("/delete", { description: "sys:settings:edit", summary: "管理员删除站点监控" })
|
||||
async delete(@Query("id") id: number) {
|
||||
return await super.delete(id);
|
||||
await super.delete(id);
|
||||
await this.auditLog({ content: `管理员删除了站点监控(ID:${id})` });
|
||||
return this.ok();
|
||||
}
|
||||
|
||||
@Post("/batchDelete", { description: "sys:settings:edit", summary: "管理员批量删除站点监控" })
|
||||
async batchDelete(@Body("ids") ids: number[]) {
|
||||
const count = ids.length;
|
||||
await this.service.delete(ids);
|
||||
await this.auditLog({ content: `管理员批量删除了${count}条站点监控` });
|
||||
return this.ok();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ import { CrudController } from "@certd/lib-server";
|
||||
import { ApiTags } from "@midwayjs/swagger";
|
||||
import { PipelineService } from "../../../modules/pipeline/service/pipeline-service.js";
|
||||
import { checkPlus } from "@certd/plus-core";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
@Provide()
|
||||
@Controller("/api/sys/pipeline")
|
||||
@@ -15,6 +16,10 @@ export class SysPipelineController extends CrudController<PipelineService> {
|
||||
return this.service;
|
||||
}
|
||||
|
||||
getAuditType(): string {
|
||||
return AuditType.pipeline.value;
|
||||
}
|
||||
|
||||
@Post("/page", { description: "sys:settings:view", summary: "管理员查询用户流水线分页列表" })
|
||||
async page(@Body(ALL) body: any) {
|
||||
body.query = body.query ?? {};
|
||||
@@ -41,13 +46,16 @@ export class SysPipelineController extends CrudController<PipelineService> {
|
||||
@Post("/delete", { description: "sys:settings:edit", summary: "管理员删除用户流水线" })
|
||||
async delete(@Query("id") id: number) {
|
||||
await this.service.delete(id);
|
||||
await this.auditLog({ content: `管理员删除了用户流水线(ID:${id})` });
|
||||
return this.ok();
|
||||
}
|
||||
|
||||
@Post("/batchDelete", { description: "sys:settings:edit", summary: "管理员批量删除用户流水线" })
|
||||
async batchDelete(@Body("ids") ids: number[]) {
|
||||
checkPlus();
|
||||
const count = ids.length;
|
||||
await this.service.batchDelete(ids);
|
||||
await this.auditLog({ content: `管理员批量删除了${count}条用户流水线` });
|
||||
return this.ok();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ import { merge } from "lodash-es";
|
||||
import { CrudController } from "@certd/lib-server";
|
||||
import { PluginImportReq, PluginService } from "../../../modules/plugin/service/plugin-service.js";
|
||||
import { CommPluginConfig, PluginConfig, PluginConfigService } from "../../../modules/plugin/service/plugin-config-service.js";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
/**
|
||||
* 插件
|
||||
*/
|
||||
@@ -19,6 +20,10 @@ export class PluginController extends CrudController<PluginService> {
|
||||
return this.service;
|
||||
}
|
||||
|
||||
getAuditType(): string {
|
||||
return AuditType.plugin.value;
|
||||
}
|
||||
|
||||
@Post("/page", { description: "sys:settings:view" })
|
||||
async page(@Body(ALL) body: any) {
|
||||
body.query = body.query ?? {};
|
||||
@@ -30,19 +35,22 @@ export class PluginController extends CrudController<PluginService> {
|
||||
return super.list(body);
|
||||
}
|
||||
|
||||
@Post("/add", { description: "sys:settings:edit" })
|
||||
@Post("/add", { description: "sys:settings:edit", summary: "添加插件" })
|
||||
async add(@Body(ALL) bean: any) {
|
||||
const def: any = {
|
||||
isDefault: false,
|
||||
disabled: false,
|
||||
};
|
||||
merge(bean, def);
|
||||
return super.add(bean);
|
||||
const res = await super.add(bean);
|
||||
await this.auditLog({ content: `新增了插件「${bean.name}」(ID:${res.data}, 类型:${bean.type})` });
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/update", { description: "sys:settings:edit" })
|
||||
@Post("/update", { description: "sys:settings:edit", summary: "更新插件" })
|
||||
async update(@Body(ALL) bean: any) {
|
||||
const res = await super.update(bean);
|
||||
await this.auditLog({ content: `修改了插件「${bean.name}」(ID:${bean.id})` });
|
||||
return res;
|
||||
}
|
||||
|
||||
@@ -51,21 +59,25 @@ export class PluginController extends CrudController<PluginService> {
|
||||
return super.info(id);
|
||||
}
|
||||
|
||||
@Post("/delete", { description: "sys:settings:edit" })
|
||||
@Post("/delete", { description: "sys:settings:edit", summary: "删除插件" })
|
||||
async delete(@Query("id") id: number) {
|
||||
const res = await this.service.deleteByIds([id]);
|
||||
await this.auditLog({ content: `删除了插件(ID:${id})` });
|
||||
return this.ok(res);
|
||||
}
|
||||
|
||||
@Post("/deleteByIds", { description: "sys:settings:edit" })
|
||||
@Post("/deleteByIds", { description: "sys:settings:edit", summary: "批量删除插件" })
|
||||
async deleteByIds(@Body("ids") ids: number[]) {
|
||||
const res = await this.service.deleteByIds(ids);
|
||||
await this.auditLog({ content: `批量删除了${ids.length}条插件` });
|
||||
return this.ok(res);
|
||||
}
|
||||
|
||||
@Post("/setDisabled", { description: "sys:settings:edit" })
|
||||
@Post("/setDisabled", { description: "sys:settings:edit", summary: "禁用/启用插件" })
|
||||
async setDisabled(@Body(ALL) body: { id: number; name: string; type: string; disabled: boolean }) {
|
||||
await this.service.setDisabled(body);
|
||||
const { id, disabled } = body;
|
||||
await this.auditLog({ content: `${disabled ? "禁用" : "启用"}了插件(ID:${id})` });
|
||||
return this.ok();
|
||||
}
|
||||
@Post("/getCommPluginConfigs", { description: "sys:settings:view" })
|
||||
@@ -74,9 +86,10 @@ export class PluginController extends CrudController<PluginService> {
|
||||
return this.ok(res);
|
||||
}
|
||||
|
||||
@Post("/saveCommPluginConfigs", { description: "sys:settings:edit" })
|
||||
@Post("/saveCommPluginConfigs", { description: "sys:settings:edit", summary: "保存公共插件配置" })
|
||||
async saveCommPluginConfigs(@Body(ALL) body: CommPluginConfig) {
|
||||
const res = await this.pluginConfigService.saveCommPluginConfig(body);
|
||||
await this.auditLog({ content: "保存了公共插件配置" });
|
||||
return this.ok(res);
|
||||
}
|
||||
@Post("/getPluginByName", { description: "sys:settings:view" })
|
||||
@@ -88,19 +101,21 @@ export class PluginController extends CrudController<PluginService> {
|
||||
return this.ok(res);
|
||||
}
|
||||
|
||||
@Post("/saveSetting", { description: "sys:settings:edit" })
|
||||
@Post("/saveSetting", { description: "sys:settings:edit", summary: "保存插件设置" })
|
||||
async saveSetting(@Body(ALL) body: PluginConfig) {
|
||||
const res = await this.pluginConfigService.savePluginConfig(body);
|
||||
await this.auditLog({ content: "保存了插件设置" });
|
||||
return this.ok(res);
|
||||
}
|
||||
|
||||
@Post("/import", { description: "sys:settings:edit" })
|
||||
@Post("/import", { description: "sys:settings:edit", summary: "导入插件" })
|
||||
async import(@Body(ALL) body: PluginImportReq) {
|
||||
const res = await this.service.importPlugin(body);
|
||||
await this.auditLog({ content: "导入了插件配置" });
|
||||
return this.ok(res);
|
||||
}
|
||||
|
||||
@Post("/export", { description: "sys:settings:edit" })
|
||||
@Post("/export", { description: "sys:settings:edit", summary: "导出插件" })
|
||||
async export(@Body("id") id: number) {
|
||||
const res = await this.service.exportPlugin(id);
|
||||
return this.ok(res);
|
||||
|
||||
+10
-1
@@ -2,6 +2,7 @@ import { ALL, Body, Controller, Inject, Post, Provide } from "@midwayjs/core";
|
||||
import { BaseController, SysSafeSetting } from "@certd/lib-server";
|
||||
import { cloneDeep } from "lodash-es";
|
||||
import { SafeService } from "../../../modules/sys/settings/safe-service.js";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
/**
|
||||
*/
|
||||
@@ -11,6 +12,10 @@ export class SysSettingsController extends BaseController {
|
||||
@Inject()
|
||||
safeService: SafeService;
|
||||
|
||||
getAuditType(): string {
|
||||
return AuditType.settings.value;
|
||||
}
|
||||
|
||||
@Post("/get", { description: "sys:settings:view" })
|
||||
async safeGet() {
|
||||
const res = await this.safeService.getSafeSetting();
|
||||
@@ -22,15 +27,19 @@ export class SysSettingsController extends BaseController {
|
||||
@Post("/save", { description: "sys:settings:edit" })
|
||||
async safeSave(@Body(ALL) body: any) {
|
||||
await this.safeService.saveSafeSetting(body);
|
||||
await this.auditLog({
|
||||
content: "修改了安全设置",
|
||||
});
|
||||
return this.ok({});
|
||||
}
|
||||
|
||||
/**
|
||||
* 立即隐藏
|
||||
*/
|
||||
@Post("/hidden", { description: "sys:settings:edit" })
|
||||
@Post("/hidden", { description: "sys:settings:edit", summary: "隐藏系统" })
|
||||
async hiddenImmediate() {
|
||||
await this.safeService.hiddenImmediately();
|
||||
await this.auditLog({ content: "隐藏了系统" });
|
||||
return this.ok({});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ import { getEmailSettings } from "../../../modules/sys/settings/fix.js";
|
||||
import { http, logger, utils } from "@certd/basic";
|
||||
import { CodeService } from "../../../modules/basic/service/code-service.js";
|
||||
import { SmsServiceFactory } from "../../../modules/basic/sms/factory.js";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
/**
|
||||
*/
|
||||
@@ -28,58 +29,71 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
|
||||
return this.service;
|
||||
}
|
||||
|
||||
@Post("/page", { description: "sys:settings:view" })
|
||||
getAuditType(): string {
|
||||
return AuditType.settings.value;
|
||||
}
|
||||
|
||||
@Post("/page", { description: "sys:settings:view", summary: "查询系统设置分页列表" })
|
||||
async page(@Body(ALL) body) {
|
||||
return super.page(body);
|
||||
}
|
||||
|
||||
@Post("/list", { description: "sys:settings:view" })
|
||||
@Post("/list", { description: "sys:settings:view", summary: "查询系统设置列表" })
|
||||
async list(@Body(ALL) body) {
|
||||
return super.list(body);
|
||||
}
|
||||
|
||||
@Post("/add", { description: "sys:settings:edit" })
|
||||
@Post("/add", { description: "sys:settings:edit", summary: "添加系统设置" })
|
||||
async add(@Body(ALL) bean) {
|
||||
return super.add(bean);
|
||||
const res = await super.add(bean);
|
||||
await this.auditLog({ content: "添加了系统设置" });
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/update", { description: "sys:settings:edit" })
|
||||
@Post("/update", { description: "sys:settings:edit", summary: "更新系统设置" })
|
||||
async update(@Body(ALL) bean) {
|
||||
await this.service.checkUserId(bean.id, this.getUserId());
|
||||
return super.update(bean);
|
||||
const res = await super.update(bean);
|
||||
await this.auditLog({ content: "更新了系统设置" });
|
||||
return res;
|
||||
}
|
||||
@Post("/info", { description: "sys:settings:view" })
|
||||
@Post("/info", { description: "sys:settings:view", summary: "查询系统设置详情" })
|
||||
async info(@Query("id") id: number) {
|
||||
await this.service.checkUserId(id, this.getUserId());
|
||||
return super.info(id);
|
||||
}
|
||||
|
||||
@Post("/delete", { description: "sys:settings:edit" })
|
||||
@Post("/delete", { description: "sys:settings:edit", summary: "删除系统设置" })
|
||||
async delete(@Query("id") id: number) {
|
||||
await this.service.checkUserId(id, this.getUserId());
|
||||
return super.delete(id);
|
||||
const res = await super.delete(id);
|
||||
await this.auditLog({ content: "删除了系统设置" });
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/save", { description: "sys:settings:edit" })
|
||||
@Post("/save", { description: "sys:settings:edit", summary: "保存系统设置" })
|
||||
async save(@Body(ALL) bean: SysSettingsEntity) {
|
||||
await this.service.save(bean);
|
||||
await this.auditLog({
|
||||
content: "修改了系统设置",
|
||||
});
|
||||
return this.ok({});
|
||||
}
|
||||
|
||||
@Post("/get", { description: "sys:settings:view" })
|
||||
@Post("/get", { description: "sys:settings:view", summary: "查询系统设置" })
|
||||
async get(@Query("key") key: string) {
|
||||
const entity = await this.service.getByKey(key);
|
||||
return this.ok(entity);
|
||||
}
|
||||
|
||||
// savePublicSettings
|
||||
@Post("/getEmailSettings", { description: "sys:settings:view" })
|
||||
@Post("/getEmailSettings", { description: "sys:settings:view", summary: "查询邮件服务器设置" })
|
||||
async getEmailSettings(@Body(ALL) body) {
|
||||
const conf = await getEmailSettings(this.service, this.userSettingsService);
|
||||
return this.ok(conf);
|
||||
}
|
||||
|
||||
@Post("/getEmailTemplates", { description: "sys:settings:view" })
|
||||
@Post("/getEmailTemplates", { description: "sys:settings:view", summary: "查询邮件模板列表" })
|
||||
async getEmailTemplates(@Body(ALL) body) {
|
||||
const conf = await getEmailSettings(this.service, this.userSettingsService);
|
||||
const templates = conf.templates || {};
|
||||
@@ -98,15 +112,16 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
|
||||
return this.ok(proviers);
|
||||
}
|
||||
|
||||
@Post("/saveEmailSettings", { description: "sys:settings:edit" })
|
||||
@Post("/saveEmailSettings", { description: "sys:settings:edit", summary: "保存邮件服务器设置" })
|
||||
async saveEmailSettings(@Body(ALL) body) {
|
||||
const conf = await getEmailSettings(this.service, this.userSettingsService);
|
||||
merge(conf, body);
|
||||
await this.service.saveSetting(conf);
|
||||
await this.auditLog({ content: "保存了邮件服务器设置" });
|
||||
return this.ok(conf);
|
||||
}
|
||||
|
||||
@Post("/getSysSettings", { description: "sys:settings:view" })
|
||||
@Post("/getSysSettings", { description: "sys:settings:view", summary: "查询系统配置" })
|
||||
async getSysSettings() {
|
||||
const publicSettings = await this.service.getPublicSettings();
|
||||
let privateSettings = await this.service.getPrivateSettings();
|
||||
@@ -115,7 +130,7 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
|
||||
}
|
||||
|
||||
// savePublicSettings
|
||||
@Post("/saveSysSettings", { description: "sys:settings:edit" })
|
||||
@Post("/saveSysSettings", { description: "sys:settings:edit", summary: "保存系统设置" })
|
||||
async saveSysSettings(@Body(ALL) body: { public: SysPublicSettings; private: SysPrivateSettings }) {
|
||||
const publicSettings = await this.service.getPublicSettings();
|
||||
const privateSettings = await this.service.getPrivateSettings();
|
||||
@@ -123,16 +138,18 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
|
||||
merge(privateSettings, body.private);
|
||||
await this.service.savePublicSettings(publicSettings);
|
||||
await this.service.savePrivateSettings(privateSettings);
|
||||
await this.auditLog({ content: "保存了系统设置" });
|
||||
return this.ok({});
|
||||
}
|
||||
|
||||
@Post("/stopOtherUserTimer", { description: "sys:settings:edit" })
|
||||
@Post("/stopOtherUserTimer", { description: "sys:settings:edit", summary: "停止其他用户定时任务" })
|
||||
async stopOtherUserTimer(@Body(ALL) body) {
|
||||
await this.pipelineService.stopOtherUserPipeline(1);
|
||||
await this.auditLog({ content: "停止了其他用户定时任务" });
|
||||
return this.ok({});
|
||||
}
|
||||
|
||||
@Post("/testProxy", { description: "sys:settings:edit" })
|
||||
@Post("/testProxy", { description: "sys:settings:edit", summary: "测试代理" })
|
||||
async testProxy(@Body(ALL) body) {
|
||||
const google = "https://www.google.com/";
|
||||
const baidu = "https://www.baidu.com/";
|
||||
@@ -170,19 +187,19 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
|
||||
});
|
||||
}
|
||||
|
||||
@Post("/testSms", { description: "sys:settings:edit" })
|
||||
@Post("/testSms", { description: "sys:settings:edit", summary: "测试短信" })
|
||||
async testSms(@Body(ALL) body) {
|
||||
await this.codeService.sendSmsCode(body.phoneCode, body.mobile);
|
||||
return this.ok({});
|
||||
}
|
||||
|
||||
@Post("/getSmsTypeDefine", { description: "sys:settings:view" })
|
||||
@Post("/getSmsTypeDefine", { description: "sys:settings:view", summary: "查询短信类型定义" })
|
||||
async getSmsTypeDefine(@Body("type") type: string) {
|
||||
const define = await SmsServiceFactory.getDefine(type);
|
||||
return this.ok(define);
|
||||
}
|
||||
|
||||
@Post("/safe/get", { description: "sys:settings:view" })
|
||||
@Post("/safe/get", { description: "sys:settings:view", summary: "查询安全设置" })
|
||||
async safeGet() {
|
||||
const res = await this.service.getSetting<SysSafeSetting>(SysSafeSetting);
|
||||
const clone: SysSafeSetting = cloneDeep(res);
|
||||
@@ -190,7 +207,7 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
|
||||
return this.ok(clone);
|
||||
}
|
||||
|
||||
@Post("/safe/save", { description: "sys:settings:edit" })
|
||||
@Post("/safe/save", { description: "sys:settings:edit", summary: "保存安全设置" })
|
||||
async safeSave(@Body(ALL) body: any) {
|
||||
if (body.hidden.openPassword) {
|
||||
body.hidden.openPassword = utils.hash.md5(body.hidden.openPassword);
|
||||
@@ -202,24 +219,26 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
|
||||
throw new Error("首次设置需要填写解锁密码");
|
||||
}
|
||||
await this.service.saveSetting(blankSetting);
|
||||
await this.auditLog({ content: "保存了安全设置" });
|
||||
return this.ok({});
|
||||
}
|
||||
|
||||
@Post("/captchaTest", { description: "sys:settings:edit" })
|
||||
@Post("/captchaTest", { description: "sys:settings:edit", summary: "测试验证码" })
|
||||
async captchaTest(@Body(ALL) body: any, @RequestIP() remoteIp: string) {
|
||||
await this.codeService.checkCaptcha(body, { remoteIp });
|
||||
return this.ok({});
|
||||
}
|
||||
|
||||
@Post("/oauth/providers", { description: "sys:settings:view" })
|
||||
@Post("/oauth/providers", { description: "sys:settings:view", summary: "查询OAuth提供商列表" })
|
||||
async oauthProviders() {
|
||||
const list = await addonRegistry.getDefineList("oauth");
|
||||
return this.ok(list);
|
||||
}
|
||||
|
||||
@Post("/clearRuntimeDeps", { description: "sys:settings:edit" })
|
||||
@Post("/clearRuntimeDeps", { description: "sys:settings:edit", summary: "清除运行时依赖" })
|
||||
async clearRuntimeDeps() {
|
||||
await getRuntimeDepsService().clearRuntimeDeps();
|
||||
await this.auditLog({ content: "清除了运行时依赖" });
|
||||
return this.ok(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import { checkPlus } from "@certd/plus-core";
|
||||
import { http, logger, utils } from "@certd/basic";
|
||||
import { TaskServiceBuilder } from "../../../modules/pipeline/service/getter/task-service-getter.js";
|
||||
import { ApiTags } from "@midwayjs/swagger";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
/**
|
||||
* Addon
|
||||
@@ -24,6 +25,10 @@ export class AddonController extends CrudController<AddonService> {
|
||||
return this.service;
|
||||
}
|
||||
|
||||
getAuditType(): string {
|
||||
return AuditType.addon.value;
|
||||
}
|
||||
|
||||
@Post("/page", { description: Constants.per.authOnly, summary: "查询Addon分页列表" })
|
||||
async page(@Body(ALL) body) {
|
||||
const { projectId, userId } = await this.getProjectUserIdRead();
|
||||
@@ -68,7 +73,9 @@ export class AddonController extends CrudController<AddonService> {
|
||||
if (define.needPlus) {
|
||||
checkPlus();
|
||||
}
|
||||
return super.add(bean);
|
||||
const res = await super.add(bean);
|
||||
this.auditLog({ content: `新增了Addon「${bean.name}」(ID:${res.data}, 类型:${bean.type})` });
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/update", { description: Constants.per.authOnly, summary: "更新Addon" })
|
||||
@@ -91,7 +98,9 @@ export class AddonController extends CrudController<AddonService> {
|
||||
}
|
||||
delete bean.userId;
|
||||
delete bean.projectId;
|
||||
return super.update(bean);
|
||||
const res = await super.update(bean);
|
||||
this.auditLog({ content: `修改了Addon「${bean.name}」(ID:${bean.id})` });
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/info", { description: Constants.per.authOnly, summary: "查询Addon详情" })
|
||||
@@ -103,7 +112,9 @@ export class AddonController extends CrudController<AddonService> {
|
||||
@Post("/delete", { description: Constants.per.authOnly, summary: "删除Addon" })
|
||||
async delete(@Query("id") id: number) {
|
||||
await this.checkOwner(this.getService(), id, "write");
|
||||
return super.delete(id);
|
||||
const res = await super.delete(id);
|
||||
this.auditLog({ content: `删除了Addon(ID:${id})` });
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/define", { description: Constants.per.authOnly, summary: "查询Addon插件定义" })
|
||||
@@ -158,6 +169,7 @@ export class AddonController extends CrudController<AddonService> {
|
||||
async setDefault(@Query("addonType") addonType: string, @Query("id") id: number) {
|
||||
const { projectId, userId } = await this.checkOwner(this.getService(), id, "write", true);
|
||||
const res = await this.service.setDefault(id, userId, addonType, projectId);
|
||||
this.auditLog({ content: `设置了默认Addon(ID:${id})` });
|
||||
return this.ok(res);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
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,6 +3,7 @@ import { Constants, CrudController } from "@certd/lib-server";
|
||||
import { AuthService } from "../../../modules/sys/authority/service/auth-service.js";
|
||||
import { GroupService } from "../../../modules/basic/service/group-service.js";
|
||||
import { ApiTags } from "@midwayjs/swagger";
|
||||
import { AuditType } from "../../../modules/sys/enterprise/service/audit-constants.js";
|
||||
|
||||
/**
|
||||
* 通知
|
||||
@@ -20,6 +21,10 @@ export class GroupController extends CrudController<GroupService> {
|
||||
return this.service;
|
||||
}
|
||||
|
||||
getAuditType(): string {
|
||||
return AuditType.pipelineGroup.value;
|
||||
}
|
||||
|
||||
@Post("/page", { description: Constants.per.authOnly, summary: "查询分组分页列表" })
|
||||
async page(@Body(ALL) body: any) {
|
||||
const { projectId, userId } = await this.getProjectUserIdRead();
|
||||
@@ -52,7 +57,9 @@ export class GroupController extends CrudController<GroupService> {
|
||||
const { projectId, userId } = await this.getProjectUserIdRead();
|
||||
bean.projectId = projectId;
|
||||
bean.userId = userId;
|
||||
return await super.add(bean);
|
||||
const res = await super.add(bean);
|
||||
this.auditLog({ content: `新增了分组「${bean.name}」(ID:${res.data})` });
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/update", { description: Constants.per.authOnly, summary: "更新分组" })
|
||||
@@ -60,7 +67,9 @@ export class GroupController extends CrudController<GroupService> {
|
||||
await this.checkOwner(this.getService(), bean.id, "write");
|
||||
delete bean.userId;
|
||||
delete bean.projectId;
|
||||
return await super.update(bean);
|
||||
const res = await super.update(bean);
|
||||
this.auditLog({ content: `修改了分组「${bean.name}」(ID:${bean.id})` });
|
||||
return res;
|
||||
}
|
||||
@Post("/info", { description: Constants.per.authOnly, summary: "查询分组详情" })
|
||||
async info(@Query("id") id: number) {
|
||||
@@ -71,7 +80,9 @@ export class GroupController extends CrudController<GroupService> {
|
||||
@Post("/delete", { description: Constants.per.authOnly, summary: "删除分组" })
|
||||
async delete(@Query("id") id: number) {
|
||||
await this.checkOwner(this.getService(), id, "write");
|
||||
return await super.delete(id);
|
||||
const res = await super.delete(id);
|
||||
this.auditLog({ content: `删除了分组(ID:${id})` });
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("/all", { description: Constants.per.authOnly, summary: "查询所有分组" })
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user