style(trade crud): adjust order and style for order operation buttons

add order prop for syncStatus, cancel and updatePaid buttons, set cancel button to danger style for both trade pages, unify button display order logic

AGENTS.md

@@ -35,6 +35,8 @@ Certd 是一个支持私有化部署的 SSL/TLS 证书自动化管理平台。
 - `packages/ui/certd-server/`：后端服务
 - `packages/ui/certd-client/`：前端 Web 管理台
 
+`packages/pro/` 是独立 Git 工作区，使用 `packages/pro/.git` 管理。根仓库的 `git status` / `git diff` 默认看不到这里的实际改动；修改商业版代码后，要在 `packages/pro` 目录内单独执行 `git status` / `git diff` 检查。
+
 ## 后端
 
 主要后端包：`packages/ui/certd-server`。
@@ -108,6 +110,14 @@ Certd 是一个支持私有化部署的 SSL/TLS 证书自动化管理平台。
 - 不要运行前端 `pnpm tsc` / `vue-tsc`：当前依赖组合中 `vue-tsc@1.8.27` 会直接抛内部错误 `Search string not found: "/supportedTSExtensions = .*(?=;)/"`，不是有效的项目类型检查结果。
 - 前端暂不跑单元测试；当前 `test:unit` 只是占位脚本
 
+前端列表管理页面约定：
+
+- 列表管理、后台管理、记录查询、CRUD 表格类页面，默认优先使用 Fast Crud（`@fast-crud/fast-crud`、`fs-crud`、`useFs`、`createCrudOptions`）实现。
+- 只有轻量只读展示、强交互自定义界面或已有页面模式明确不适合 Fast Crud 时，才手写 `a-table` / 自定义列表，并在回复中说明原因。
+- 开发或重构这类页面前，先读取 `.trae/skills/fast-crud-page-dev/SKILL.md`，按仓库内 Fast Crud 页面拆分与验证方式实现。
+- 前端对话框里只做纯确认时可以使用 `Modal.confirm`；只要对话框里有字段输入、表单校验或提交字段，统一使用 `useFormDialog` / `openFormDialog`，不要在 `Modal.confirm` 的 `content` 里手写输入框。
+- 页面内嵌 Fast Crud 表格时，要显式给外层容器稳定高度或 `flex: 1; min-height: 0` 的撑满链路；Fast Crud 依赖外部元素高度，不能只依赖表格默认高度。
+
 ## 流水线与插件模型
 
 项目最关键的架构概念是证书流水线。
@@ -167,7 +177,9 @@ Certd 是一个支持私有化部署的 SSL/TLS 证书自动化管理平台。
 - 优先沿用现有模块、插件、服务模式，再考虑新增抽象。
 - `packages/ui/certd-server/data/`、`logs/`、生成的 metadata/dist 等通常视为运行时或构建产物，除非任务明确要求处理它们。
 - 注意本地数据和配置里可能包含凭据、证书材料等敏感信息。
+- 使用 `/basic/file/upload` 上传文件后，接口返回的是临时缓存 key。业务保存表单或设置时，后端必须调用 `FileService.saveFile(userId, key, "public" | "private")` 转成永久文件 key 后再入库/入设置；不要直接保存 `tmpfile_key_...`，否则后续回显或下载会失效。
 - 本仓库代码注释优先使用中文，尤其是解释业务规则、兼容逻辑、协议细节和隐藏风险时；除非文件已有明确英文注释风格或引用外部英文术语，否则不要新增英文说明性注释。
+- 代码可读性优先于短写法。遇到包含业务分支的复杂三元表达式、内联对象、链式调用或条件组合时，优先拆成命名清晰的中间变量、独立分支或小函数，让读代码的人能一眼看出业务意图；不要为了少写几行把逻辑压成难读的一坨。
 
 ## 插件开发技能
 
@@ -182,6 +194,7 @@ Certd 是一个支持私有化部署的 SSL/TLS 证书自动化管理平台。
 
 - `access-plugin-dev`：开发 Access 授权插件
 - `dns-provider-dev`：开发 DNS Provider 插件
+- `fast-crud-page-dev`：开发或重构前端 Fast Crud 列表管理页面
 - `task-plugin-dev`：开发 Task 部署任务插件
 - `plugin-converter`：将插件转换为 YAML 配置
 
@@ -220,4 +233,3 @@ Get-ChildItem packages\ui\certd-client\src\views\certd
 - 优先对改动包运行聚焦的测试；后端可按包运行单元测试，前端优先使用 Prettier/ESLint 做改动文件验证。只有跨包影响明显时再考虑全 monorepo 构建。
 
 - 不要主动运行 `pnpm install` 安装依赖：用户会事先准备好 `node_modules`。如果 `pnpm install` 或 `test:unit` 因缺少依赖、TTY 或网络问题失败，立即停止尝试，告知用户解决环境问题。
-

docs/guide/development/index.md

@@ -39,13 +39,21 @@ pnpm install
 pnpm init
 ```
 
+### lib包编译:
+将packages下面依赖的包都编译一遍，并监听改动。
+```shell
+pnpm dev
+```
+
 ### 启动 server:
+启动server
 ```shell
 cd packages/ui/certd-server
 pnpm dev
 ```
 
 ### 启动 client:
+启动前端
 ```shell
 cd packages/ui/certd-client
 pnpm dev

packages/core/acme-client/package.json

@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.40.4",
+        "@certd/basic": "workspace:^1.40.4",
         "@peculiar/x509": "^1.11.0",
         "asn1js": "^3.0.5",
         "axios": "^1.9.0",

packages/core/acme-client/src/client.ts

@@ -467,6 +467,10 @@ class AcmeClient {
             return createHash('sha256').update(result).digest('base64url');
         }
 
+        if (challenge.type === 'dns-persist-01') {
+            return '';
+        }
+
         /* https://datatracker.ietf.org/doc/html/rfc8737 */
         if (challenge.type === 'tls-alpn-01') {
             return result;

packages/core/acme-client/src/rfc8555.ts

@@ -97,7 +97,11 @@ export interface DnsChallenge extends ChallengeAbstract {
     token: string;
 }
 
-export type Challenge = HttpChallenge | DnsChallenge;
+export interface DnsPersistChallenge extends ChallengeAbstract {
+    type: "dns-persist-01";
+}
+
+export type Challenge = HttpChallenge | DnsChallenge | DnsPersistChallenge;
 
 /**
  * Certificate

packages/core/acme-client/src/verify.ts

@@ -170,7 +170,7 @@ export function createChallengeFn(opts = {}) {
 
 
         if (txtRecords.length === 0) {
-            throw new Error(`没有找到TXT解析记录（${recordName}）`);
+            throw new Error(`没有找到TXT解析记录（${recordName}），请稍后重试`);
         }
         return txtRecords;
     }
@@ -203,6 +203,24 @@ export function createChallengeFn(opts = {}) {
         return true;
     }
 
+    async function verifyDnsPersistChallenge(authz, challenge, keyAuthorization, prefix = '_validation-persist.') {
+        const recordName = `${prefix}${authz.identifier.value.replace(/^\*\./, '')}`;
+        log(`本地校验DNS持久验证TXT记录: ${recordName}`);
+        let recordValues = await walkTxtRecord(recordName, 0, walkFromAuthoritative);
+        recordValues = [...new Set(recordValues)];
+        const expected = challenge.expectedRecordValue;
+        if (!expected) {
+            log(`未提供dns-persist-01本地校验期望值，跳过精确匹配，仅确认TXT记录存在`);
+            return true;
+        }
+        log(`DNS查询成功, 找到 ${recordValues.length} 条TXT记录：${recordValues}`);
+        if (!recordValues.length || !recordValues.includes(expected)) {
+            throw new Error(`没有找到需要的DNS持久验证TXT记录: ${recordName}，请稍后重试，期望:${expected},结果:${recordValues}`);
+        }
+        log(`DNS持久验证记录匹配成功（${challenge.type}/${recordName}）:${expected}`);
+        return true;
+    }
+
     /**
      * Verify ACME TLS ALPN challenge
      *
@@ -234,6 +252,7 @@ export function createChallengeFn(opts = {}) {
         challenges: {
             'http-01': verifyHttpChallenge,
             'dns-01': verifyDnsChallenge,
+            'dns-persist-01': verifyDnsPersistChallenge,
             'tls-alpn-01': verifyTlsAlpnChallenge,
         },
         walkTxtRecord,

packages/core/acme-client/types/index.d.ts

@@ -57,7 +57,7 @@ export interface ClientExternalAccountBindingOptions {
 
 export interface ClientAutoOptions {
     csr: CsrBuffer | CsrString;
-    challengeCreateFn: (authz: Authorization, keyAuthorization: (challenge:rfc8555.Challenge)=>Promise<string>) => Promise<{recordReq?:any,recordRes?:any,dnsProvider?:any,challenge: rfc8555.Challenge,keyAuthorization:string}>;
+    challengeCreateFn: (authz: Authorization, keyAuthorization: (challenge:rfc8555.Challenge)=>Promise<string>) => Promise<{recordReq?:any,recordRes?:any,dnsProvider?:any,challenge: rfc8555.Challenge,keyAuthorization:string,httpUploader?:any}>;
     challengeRemoveFn: (authz: Authorization, challenge: rfc8555.Challenge, keyAuthorization: string,recordReq:any, recordRes:any,dnsProvider:any,httpUploader:any) => Promise<any>;
     email?: string;
     termsOfServiceAgreed?: boolean;

packages/core/acme-client/types/rfc8555.d.ts

@@ -97,7 +97,11 @@ export interface DnsChallenge extends ChallengeAbstract {
     token: string;
 }
 
-export type Challenge = HttpChallenge | DnsChallenge;
+export interface DnsPersistChallenge extends ChallengeAbstract {
+    type: 'dns-persist-01';
+}
+
+export type Challenge = HttpChallenge | DnsChallenge | DnsPersistChallenge;
 
 /**
  * Certificate

packages/core/pipeline/package.json

@@ -19,8 +19,8 @@
     "compile": "tsc --skipLibCheck --watch"
   },
   "dependencies": {
-    "@certd/basic": "^1.40.4",
-    "@certd/plus-core": "^1.40.4",
+    "@certd/basic": "workspace:^1.40.4",
+    "@certd/plus-core": "workspace:^1.40.4",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
     "reflect-metadata": "^0.1.13"

packages/core/pipeline/src/access/api.ts

@@ -19,6 +19,7 @@ export type AccessInputDefine = FormItemProps & {
 };
 export type AccessDefine = Registrable & {
   icon?: string;
+  subtype?: string;
   input?: {
     [key: string]: AccessInputDefine;
   };

packages/libs/lib-server/package.json

@@ -29,11 +29,11 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.40.4",
-    "@certd/basic": "^1.40.4",
-    "@certd/pipeline": "^1.40.4",
-    "@certd/plugin-lib": "^1.40.4",
-    "@certd/plus-core": "^1.40.4",
+    "@certd/acme-client": "workspace:^1.40.4",
+    "@certd/basic": "workspace:^1.40.4",
+    "@certd/pipeline": "workspace:^1.40.4",
+    "@certd/plugin-lib": "workspace:^1.40.4",
+    "@certd/plus-core": "workspace:^1.40.4",
     "@midwayjs/cache": "3.14.0",
     "@midwayjs/core": "3.20.11",
     "@midwayjs/i18n": "3.20.13",

packages/libs/lib-server/src/basic/constants.ts

@@ -8,6 +8,8 @@ export const Constants = {
     guest: '_guest_',
     //无需登录
     anonymous: '_guest_',
+    //无需登录，有 token 时解析当前用户
+    guestOptionalAuth: '_guestOptionalAuth_',
     //仅需要登录
     authOnly: '_authOnly_',
     //仅需要登录

packages/libs/lib-server/src/system/basic/service/file-service.test.ts

@@ -0,0 +1,43 @@
+/// <reference types="mocha" />
+/// <reference types="node" />
+
+import assert from "node:assert/strict";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { FileService } from "./file-service.js";
+
+function createUploadFile(key: string) {
+  const uploadRootDir = "./data/upload";
+  const filePath = path.join(uploadRootDir, key);
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
+  fs.writeFileSync(filePath, "test");
+  return filePath;
+}
+
+describe("FileService.getFile", () => {
+  let cwd: string;
+  let oldCwd: string;
+
+  beforeEach(() => {
+    oldCwd = process.cwd();
+    cwd = fs.mkdtempSync(path.join(os.tmpdir(), "certd-file-service-"));
+    process.chdir(cwd);
+  });
+
+  afterEach(() => {
+    process.chdir(oldCwd);
+    fs.rmSync(cwd, { recursive: true, force: true });
+  });
+
+  it("allows admin to read another user's private file", () => {
+    const service = new FileService();
+    const userIdMd5 = Buffer.from(Buffer.from("2").toString("base64")).toString("hex");
+    const key = `/private/${userIdMd5}/2026_05_25/qr.png`;
+    const expectedPath = createUploadFile(key);
+
+    const filePath = service.getFile(key, 1, true);
+
+    assert.equal(filePath, expectedPath);
+  });
+});

packages/libs/lib-server/src/system/basic/service/file-service.ts

@@ -56,7 +56,7 @@ export class FileService {
     return key;
   }
 
-  getFile(key: string, userId?: number) {
+  getFile(key: string, userId?: number, allowAnyPrivateUser = false) {
     if (!key) {
       throw new ParamException('参数错误');
     }
@@ -70,7 +70,7 @@ export class FileService {
     const keyArr = key.split('/');
     const permission = keyArr[1];
     const userIdMd5 = keyArr[2];
-    if (permission !== 'public') {
+    if (permission !== 'public' && !allowAnyPrivateUser) {
       //非公开文件需要验证用户
       const userIdStr = Buffer.from(Buffer.from(userIdMd5, 'hex').toString('base64')).toString();
       const userIdInt: number = parseInt(userIdStr, 10);

packages/libs/lib-server/src/user/access/entity/access.ts

@@ -19,6 +19,9 @@ export class AccessEntity {
   @Column({ comment: '类型', length: 100 })
   type: string;
 
+  @Column({ name: 'subtype', comment: '子类型', length: 100, nullable: true })
+  subtype: string;
+
   @Column({ name: 'setting', comment: '设置', length: 10240, nullable: true })
   setting: string;
 

packages/libs/lib-server/src/user/access/service/access-getter.ts

@@ -1,4 +1,4 @@
-import { IAccessService } from '@certd/pipeline';
+import { IAccessService } from "@certd/pipeline";
 
 export class AccessGetter implements IAccessService {
   userId: number;
@@ -15,6 +15,6 @@ export class AccessGetter implements IAccessService {
   }
 
   async getCommonById<T = any>(id: any) {
-    return await this.getter<T>(id, 0,null);
+    return await this.getter<T>(id, 0, null);
   }
 }

packages/libs/lib-server/src/user/access/service/access-service.test.ts

@@ -1,14 +1,16 @@
 import assert from "assert";
+import esmock from "esmock";
 import { AccessService } from "./access-service.js";
 
 describe("AccessService", () => {
   it("does not write id into access setting when updating selected fields", async () => {
     let updateParam: any;
     const service = new AccessService();
-    service.info = async () => ({
-      id: 12,
-      type: "eab",
-    } as any);
+    service.info = async () =>
+      ({
+        id: 12,
+        type: "eab",
+      }) as any;
     service.decryptAccessEntity = () => ({
       kid: "kid-1",
     });
@@ -27,4 +29,82 @@ describe("AccessService", () => {
       accountKey: "account-key",
     });
   });
+
+  it("writes subtype from access define field", async () => {
+    const { AccessService: MockedAccessService } = await esmock("./access-service.js", {
+      "@certd/pipeline": {
+        accessRegistry: {
+          getDefine(type: string) {
+            assert.equal(type, "acmeAccount");
+            return {
+              name: "acmeAccount",
+              subtype: "caType",
+              input: {
+                caType: {},
+                account: {
+                  encrypt: true,
+                },
+              },
+            };
+          },
+        },
+      },
+    });
+    const service = new MockedAccessService();
+    service.encryptService = {
+      encrypt(value: string) {
+        return `encrypted:${value}`;
+      },
+    };
+    const param: any = {
+      type: "acmeAccount",
+      setting: JSON.stringify({
+        caType: "letsencrypt",
+        account: JSON.stringify({
+          accountKey: "key",
+          accountUri: "https://example.com/acct/1",
+          caType: "letsencrypt",
+        }),
+      }),
+    };
+
+    service.encryptSetting(param);
+
+    assert.equal(param.subtype, "letsencrypt");
+  });
+
+  it("allows acme account access to be saved before account generation", async () => {
+    const { AccessService: MockedAccessService } = await esmock("./access-service.js", {
+      "@certd/pipeline": {
+        accessRegistry: {
+          getDefine() {
+            return {
+              name: "acmeAccount",
+              subtype: "caType",
+              input: {
+                caType: {},
+                account: {
+                  encrypt: true,
+                },
+              },
+            };
+          },
+        },
+      },
+    });
+    const service = new MockedAccessService();
+    const param: any = {
+      type: "acmeAccount",
+      setting: JSON.stringify({
+        caType: "letsencrypt",
+      }),
+    };
+
+    service.encryptSetting(param);
+
+    assert.equal(param.subtype, "letsencrypt");
+    assert.deepEqual(JSON.parse(param.setting), {
+      caType: "letsencrypt",
+    });
+  });
 });

packages/libs/lib-server/src/user/access/service/access-service.ts

@@ -1,17 +1,17 @@
-import {Inject, Provide, Scope, ScopeEnum} from '@midwayjs/core';
-import {InjectEntityModel} from '@midwayjs/typeorm';
+import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
+import { InjectEntityModel } from "@midwayjs/typeorm";
 import { In, Repository } from "typeorm";
-import {AccessGetter, BaseService, PageReq, PermissionException, ValidateException} from '../../../index.js';
-import {AccessEntity} from '../entity/access.js';
-import {AccessDefine, accessRegistry, newAccess} from '@certd/pipeline';
-import {EncryptService} from './encrypt-service.js';
-import { logger, utils } from '@certd/basic';
+import { AccessGetter, BaseService, PageReq, PermissionException, ValidateException } from "../../../index.js";
+import { AccessEntity } from "../entity/access.js";
+import { AccessDefine, accessRegistry, newAccess } from "@certd/pipeline";
+import { EncryptService } from "./encrypt-service.js";
+import { logger, utils } from "@certd/basic";
 
 /**
  * 授权
  */
 @Provide()
-@Scope(ScopeEnum.Request, {allowDowngrade: true})
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
 export class AccessService extends BaseService<AccessEntity> {
   @InjectEntityModel(AccessEntity)
   repository: Repository<AccessEntity>;
@@ -36,16 +36,16 @@ export class AccessService extends BaseService<AccessEntity> {
 
   async add(param) {
     let oldEntity = null;
-    if (param._copyFrom){
+    if (param._copyFrom) {
       oldEntity = await this.info(param._copyFrom);
       if (oldEntity == null) {
-        throw new ValidateException('该授权配置不存在,请确认是否已被删除');
+        throw new ValidateException("该授权配置不存在,请确认是否已被删除");
       }
-      if (oldEntity.userId  !== param.userId) {
-        throw new ValidateException('您无权查看该授权配置');
+      if (oldEntity.userId !== param.userId) {
+        throw new ValidateException("您无权查看该授权配置");
       }
     }
-    delete param._copyFrom
+    delete param._copyFrom;
     this.encryptSetting(param, oldEntity);
     param.keyId = "ac_" + utils.id.simpleNanoId();
     return await super.add(param);
@@ -62,17 +62,20 @@ export class AccessService extends BaseService<AccessEntity> {
       return;
     }
     const json = JSON.parse(setting);
+    if (accessDefine.subtype) {
+      param.subtype = json[accessDefine.subtype] || null;
+    }
     let oldSetting = {};
     let encryptSetting = {};
-    const firstEncrypt = !oldSettingEntity || !oldSettingEntity.encryptSetting || oldSettingEntity.encryptSetting === '{}';
+    const firstEncrypt = !oldSettingEntity || !oldSettingEntity.encryptSetting || oldSettingEntity.encryptSetting === "{}";
     if (oldSettingEntity) {
-      oldSetting = JSON.parse(oldSettingEntity.setting || '{}');
-      encryptSetting = JSON.parse(oldSettingEntity.encryptSetting || '{}');
+      oldSetting = JSON.parse(oldSettingEntity.setting || "{}");
+      encryptSetting = JSON.parse(oldSettingEntity.encryptSetting || "{}");
     }
     for (const key in json) {
       //加密
       let value = json[key];
-      if (value && typeof value === 'string') {
+      if (value && typeof value === "string") {
         //去除前后空格
         value = value.trim();
         json[key] = value;
@@ -81,7 +84,7 @@ export class AccessService extends BaseService<AccessEntity> {
       if (!accessInputDefine) {
         continue;
       }
-      if (!accessInputDefine.encrypt || !value || typeof value !== 'string') {
+      if (!accessInputDefine.encrypt || !value || typeof value !== "string") {
         //定义无需加密、value为空、不是字符串 这些不需要加密
         encryptSetting[key] = {
           value: value,
@@ -96,7 +99,7 @@ export class AccessService extends BaseService<AccessEntity> {
         const subIndex = Math.min(2, length);
         let starLength = length - subIndex * 2;
         starLength = Math.max(2, starLength);
-        const starString = '*'.repeat(starLength);
+        const starString = "*".repeat(starLength);
         json[key] = value.substring(0, subIndex) + starString + value.substring(value.length - subIndex);
         encryptSetting[key] = {
           value: this.encryptService.encrypt(value),
@@ -116,21 +119,21 @@ export class AccessService extends BaseService<AccessEntity> {
   async update(param) {
     const oldEntity = await this.info(param.id);
     if (oldEntity == null) {
-      throw new ValidateException('该授权配置不存在,请确认是否已被删除');
+      throw new ValidateException("该授权配置不存在,请确认是否已被删除");
     }
     this.encryptSetting(param, oldEntity);
-    delete param.keyId
+    delete param.keyId;
     return await super.update(param);
   }
 
   async updateAccess(access: any) {
     const oldEntity = await this.info(access.id);
     if (oldEntity == null) {
-      throw new ValidateException('该授权配置不存在,请确认是否已被删除');
+      throw new ValidateException("该授权配置不存在,请确认是否已被删除");
     }
     const setting = this.decryptAccessEntity(oldEntity);
     for (const key of Object.keys(access)) {
-      if (key === 'id') {
+      if (key === "id") {
         continue;
       }
       setting[key] = access[key];
@@ -145,11 +148,13 @@ export class AccessService extends BaseService<AccessEntity> {
   async getSimpleInfo(id: number) {
     const entity = await this.info(id);
     if (entity == null) {
-      throw new ValidateException('该授权配置不存在,请确认是否已被删除');
+      throw new ValidateException("该授权配置不存在,请确认是否已被删除");
     }
     return {
       id: entity.id,
       name: entity.name,
+      type: entity.type,
+      subtype: entity.subtype,
       userId: entity.userId,
       projectId: entity.projectId,
     };
@@ -162,14 +167,14 @@ export class AccessService extends BaseService<AccessEntity> {
     }
     if (checkUserId) {
       if (userId == null) {
-        throw new ValidateException('userId不能为空');
+        throw new ValidateException("userId不能为空");
       }
       if (userId !== entity.userId) {
-        throw new PermissionException('您对该Access授权无访问权限');
+        throw new PermissionException("您对该Access授权无访问权限");
       }
     }
     if (projectId != null && projectId !== entity.projectId) {
-      throw new PermissionException('您对该Access授权无访问权限');
+      throw new PermissionException("您对该Access授权无访问权限");
     }
 
     // const access = accessRegistry.get(entity.type);
@@ -178,8 +183,8 @@ export class AccessService extends BaseService<AccessEntity> {
       id: entity.id,
       ...setting,
     };
-    const accessGetter = new AccessGetter(userId,projectId, this.getById.bind(this));
-    return await newAccess(entity.type, input,accessGetter);
+    const accessGetter = new AccessGetter(userId, projectId, this.getById.bind(this));
+    return await newAccess(entity.type, input, accessGetter);
   }
 
   async getById(id: any, userId: number, projectId?: number): Promise<any> {
@@ -188,7 +193,7 @@ export class AccessService extends BaseService<AccessEntity> {
 
   decryptAccessEntity(entity: AccessEntity): any {
     let setting = {};
-    if (entity.encryptSetting && entity.encryptSetting !== '{}') {
+    if (entity.encryptSetting && entity.encryptSetting !== "{}") {
       setting = JSON.parse(entity.encryptSetting);
       for (const key in setting) {
         //解密
@@ -213,12 +218,11 @@ export class AccessService extends BaseService<AccessEntity> {
     return accessRegistry.getDefine(type);
   }
 
-
   async getSimpleByIds(ids: number[], userId: any, projectId?: number) {
     if (ids.length === 0) {
       return [];
     }
-    if (userId==null) {
+    if (userId == null) {
       return [];
     }
     return await this.repository.find({
@@ -231,24 +235,24 @@ export class AccessService extends BaseService<AccessEntity> {
         id: true,
         name: true,
         type: true,
-        userId:true,
-        projectId:true,
+        subtype: true,
+        userId: true,
+        projectId: true,
       },
     });
-
   }
 
   /**
    * 复制授权到其他项目
-   * @param accessId 
-   * @param projectId 
+   * @param accessId
+   * @param projectId
    */
-  async copyTo(accessId: number,projectId?: number) {
+  async copyTo(accessId: number, projectId?: number) {
     const access = await this.info(accessId);
     if (access == null) {
       throw new Error(`该授权配置不存在,请确认是否已被删除:id=${accessId}`);
     }
-    
+
     const keyId = access.keyId;
     //检查目标项目里是否已经有相同keyId的配置
     const existAccess = await this.repository.findOne({
@@ -263,10 +267,10 @@ export class AccessService extends BaseService<AccessEntity> {
     }
     const newAccess = {
       ...access,
-      userId:-1,
+      userId: -1,
       id: undefined,
       projectId,
-    }
+    };
     await this.repository.save(newAccess);
     return newAccess.id;
   }

packages/plugins/plugin-cert/package.json

@@ -18,10 +18,10 @@
     "compile": "tsc --skipLibCheck --watch"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.40.4",
-    "@certd/basic": "^1.40.4",
-    "@certd/pipeline": "^1.40.4",
-    "@certd/plugin-lib": "^1.40.4",
+    "@certd/acme-client": "workspace:^1.40.4",
+    "@certd/basic": "workspace:^1.40.4",
+    "@certd/pipeline": "workspace:^1.40.4",
+    "@certd/plugin-lib": "workspace:^1.40.4",
     "psl": "^1.9.0",
     "punycode.js": "^2.3.1"
   },

packages/plugins/plugin-lib/package.json

@@ -23,10 +23,10 @@
     "@alicloud/pop-core": "^1.7.10",
     "@alicloud/tea-util": "^1.4.11",
     "@aws-sdk/client-s3": "^3.964.0",
-    "@certd/acme-client": "^1.40.4",
-    "@certd/basic": "^1.40.4",
-    "@certd/pipeline": "^1.40.4",
-    "@certd/plus-core": "^1.40.4",
+    "@certd/acme-client": "workspace:^1.40.4",
+    "@certd/basic": "workspace:^1.40.4",
+    "@certd/pipeline": "workspace:^1.40.4",
+    "@certd/plus-core": "workspace:^1.40.4",
     "@kubernetes/client-node": "0.21.0",
     "ali-oss": "^6.22.0",
     "basic-ftp": "^5.0.5",

packages/plugins/plugin-lib/src/common/util.ts

@@ -35,7 +35,7 @@ export function createRemoteSelectInputDefine(opts?: {
   helper?: string;
   formItem?: any;
   mode?: string;
-  multi?: boolean;
+  single?: boolean;
   required?: boolean;
   rules?: any;
   mergeScript?: string;
@@ -59,11 +59,8 @@ export function createRemoteSelectInputDefine(opts?: {
   const helper = opts?.helper || "请选择";
   const search = opts?.search ?? false;
   const pager = opts?.pager ?? false;
-  let mode = "default";
-  const multi = opts?.multi ?? true;
-  if (multi) {
-    mode = "tags";
-  }
+  const mode = "tags";
+  const single = opts?.single ?? false;
   const item = {
     title,
     component: {
@@ -75,7 +72,7 @@ export function createRemoteSelectInputDefine(opts?: {
       action,
       search,
       pager,
-      multi,
+      single,
       pageSize: opts?.pageSize,
       watches: [certDomainsInputKey, accessIdInputKey, ...watches],
       uploadCert: opts?.uploadCert,

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-record-info.vue

@@ -11,14 +11,16 @@
       <td class="record-value" :title="cnameRecord.recordValue">
         <fs-copyable v-model="cnameRecord.recordValue"></fs-copyable>
       </td>
-      <td class="status center flex-center">
-        <fs-values-format v-model="cnameRecord.status" :dict="statusDict" />
-        <a-tooltip v-if="cnameRecord.error" :title="cnameRecord.error">
-          <fs-icon class="ml-5 color-red" icon="ion:warning-outline"></fs-icon>
-        </a-tooltip>
-        <a-tooltip v-if="cnameRecord.status === 'valid'" :title="t('certd.verifyPlan.resetStatusTooltip')">
-          <fs-icon class="ml-2 color-yellow text-md pointer" icon="solar:undo-left-square-bold" @click="resetStatus"></fs-icon>
-        </a-tooltip>
+      <td class="status center">
+        <span class="status-content">
+          <fs-values-format v-model="cnameRecord.status" :dict="statusDict" />
+          <a-tooltip v-if="cnameRecord.error" :title="cnameRecord.error">
+            <fs-icon class="ml-5 color-red" icon="ion:warning-outline"></fs-icon>
+          </a-tooltip>
+          <a-tooltip v-if="cnameRecord.status === 'valid'" :title="t('certd.verifyPlan.resetStatusTooltip')">
+            <fs-icon class="ml-2 color-yellow text-md pointer" icon="solar:undo-left-square-bold" @click="resetStatus"></fs-icon>
+          </a-tooltip>
+        </span>
       </td>
       <td class="center">
         <template v-if="cnameRecord.status !== 'valid'">
@@ -142,5 +144,10 @@ async function resetStatus() {
   .fs-copyable {
     width: 100%;
   }
+  .status-content {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+  }
 }
 </style>

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-verify-plan.vue

@@ -2,11 +2,11 @@
   <table class="cname-verify-plan">
     <thead>
       <tr>
-        <td style="width: 160px">{{ t("certd.verifyPlan.hostRecord") }}</td>
-        <td style="width: 100px; text-align: center">{{ t("certd.verifyPlan.recordType") }}</td>
-        <td style="width: 250px">{{ t("certd.verifyPlan.setCnameRecord") }}</td>
-        <td style="width: 120px" class="center">{{ t("certd.status") }}</td>
-        <td style="width: 90px" class="center">{{ t("certd.verifyPlan.operation") }}</td>
+        <td class="col-host">{{ t("certd.verifyPlan.hostRecord") }}</td>
+        <td class="col-type center">{{ t("certd.verifyPlan.recordType") }}</td>
+        <td class="col-value">{{ t("certd.verifyPlan.setCnameRecord") }}</td>
+        <td class="col-status center">{{ t("certd.status") }}</td>
+        <td class="col-action center">{{ t("certd.verifyPlan.operation") }}</td>
       </tr>
     </thead>
     <template v-for="key in domains" :key="key">
@@ -49,6 +49,21 @@ function onRecordChange(domain: string, record: CnameRecord) {
 .cname-verify-plan {
   width: 100%;
   table-layout: fixed;
+  .col-host {
+    width: 220px;
+  }
+  .col-type {
+    width: 100px;
+  }
+  .col-value {
+    width: 360px;
+  }
+  .col-status {
+    width: 120px;
+  }
+  .col-action {
+    width: 150px;
+  }
   tbody tr td {
     border-top: 1px solid #e8e8e8 !important;
   }

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/dns-persist-record-info.vue

@@ -0,0 +1,144 @@
+<template>
+  <tbody class="dns-persist-record-info">
+    <tr v-if="dnsPersistRecord">
+      <td class="host-record" :title="dnsPersistRecord.hostRecord">
+        <fs-copyable v-model="dnsPersistRecord.hostRecord"></fs-copyable>
+      </td>
+      <td style="text-align: center">TXT</td>
+      <td class="record-value" :title="dnsPersistRecord.recordValue">
+        <fs-copyable v-model="dnsPersistRecord.recordValue"></fs-copyable>
+      </td>
+      <td class="status center">
+        <fs-values-format v-model="dnsPersistRecord.status" :dict="statusDict" />
+      </td>
+      <td class="center">
+        <template v-if="dnsPersistRecord.status !== 'valid'">
+          <a-space>
+            <a-button type="primary" size="small" @click="openSettingDialog">设置TXT</a-button>
+            <a-button type="primary" size="small" :loading="loading" @click="doVerify">校验</a-button>
+          </a-space>
+        </template>
+        <div v-else class="helper">请勿删除TXT记录</div>
+      </td>
+    </tr>
+    <tr v-else>
+      <td colspan="5" class="color-red">{{ errorMessage || "请先选择ACME账号" }}</td>
+    </tr>
+  </tbody>
+</template>
+
+<script lang="ts" setup>
+import { dict } from "@fast-crud/fast-crud";
+import { message } from "ant-design-vue";
+import { ref, watch } from "vue";
+import { GetByDomain, Verify } from "/@/views/certd/cert/dns-persist/api";
+import { useDnsPersistSettingDialog } from "/@/views/certd/cert/dns-persist/use-setting-dialog";
+import { DnsPersistRecord } from "./type";
+
+defineOptions({
+  name: "DnsPersistRecordInfo",
+});
+
+const props = defineProps<{
+  domain: string;
+  caType?: string;
+  acmeAccountAccessId?: number;
+  commonAcmeAccountAccessId?: number;
+  wildcard?: boolean;
+  persistUntil?: number;
+}>();
+
+const emit = defineEmits<{
+  change: [DnsPersistRecord];
+}>();
+
+const statusDict = dict({
+  data: [
+    { value: "pending", label: "待设置", color: "warning" },
+    { value: "validating", label: "校验中", color: "blue" },
+    { value: "valid", label: "有效", color: "green" },
+    { value: "failed", label: "请重试", color: "red" },
+  ],
+});
+
+const dnsPersistRecord = ref<DnsPersistRecord | null>(null);
+const loading = ref(false);
+const errorMessage = ref("");
+const { openDnsPersistSettingDialog } = useDnsPersistSettingDialog();
+
+function onRecordChange() {
+  if (dnsPersistRecord.value) {
+    emit("change", dnsPersistRecord.value);
+  } else {
+    emit("change", {
+      domain: props.domain,
+      status: null,
+    } as any);
+  }
+}
+
+async function loadRecord() {
+  errorMessage.value = "";
+  dnsPersistRecord.value = null;
+  if (!props.domain || (!props.acmeAccountAccessId && !props.commonAcmeAccountAccessId)) {
+    onRecordChange();
+    return;
+  }
+  try {
+    dnsPersistRecord.value = await GetByDomain({
+      domain: props.domain,
+      caType: props.caType,
+      acmeAccountAccessId: props.acmeAccountAccessId,
+      commonAcmeAccountAccessId: props.commonAcmeAccountAccessId,
+      wildcard: props.wildcard,
+      persistUntil: props.persistUntil,
+      createOnNotFound: true,
+    });
+    onRecordChange();
+  } catch (e: any) {
+    errorMessage.value = e.message;
+  }
+}
+
+watch(
+  () => [props.domain, props.caType, props.acmeAccountAccessId, props.commonAcmeAccountAccessId, props.wildcard, props.persistUntil],
+  async () => {
+    await loadRecord();
+  },
+  {
+    immediate: true,
+  }
+);
+
+async function doVerify() {
+  if (!dnsPersistRecord.value?.id) {
+    return;
+  }
+  loading.value = true;
+  try {
+    const ok = await Verify(dnsPersistRecord.value.id);
+    message[ok ? "success" : "error"](ok ? "校验成功" : "未找到匹配的TXT记录，请稍后重试");
+    await loadRecord();
+  } finally {
+    loading.value = false;
+  }
+}
+
+function openSettingDialog() {
+  if (!dnsPersistRecord.value) {
+    return;
+  }
+  openDnsPersistSettingDialog({
+    record: dnsPersistRecord.value,
+    onDone: loadRecord,
+  });
+}
+</script>
+
+<style lang="less">
+.dns-persist-record-info {
+  .fs-copyable {
+    width: 100%;
+  }
+}
+</style>

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/dns-persist-verify-plan.vue

@@ -0,0 +1,94 @@
+<template>
+  <table class="dns-persist-verify-plan">
+    <thead>
+      <tr>
+        <td class="col-host">TXT主机名</td>
+        <td class="col-type center">记录类型</td>
+        <td class="col-value">请设置TXT记录（验证成功以后不要删除）</td>
+        <td class="col-status center">状态</td>
+        <td class="col-action center">操作</td>
+      </tr>
+    </thead>
+    <template v-for="key in domains" :key="key">
+      <dns-persist-record-info
+        :domain="key"
+        :ca-type="caType"
+        :acme-account-access-id="acmeAccountAccessId"
+        :common-acme-account-access-id="commonAcmeAccountAccessId"
+        :wildcard="modelValue[key]?.wildcard"
+        :persist-until="modelValue[key]?.persistUntil"
+        @change="onRecordChange(key, $event)"
+      />
+    </template>
+  </table>
+</template>
+
+<script lang="ts" setup>
+import { computed } from "vue";
+import DnsPersistRecordInfo from "./dns-persist-record-info.vue";
+import { DnsPersistRecord } from "./type";
+
+defineOptions({
+  name: "DnsPersistVerifyPlan",
+});
+
+const emit = defineEmits(["update:modelValue", "change"]);
+
+const props = defineProps<{
+  modelValue: Record<string, DnsPersistRecord>;
+  caType?: string;
+  acmeAccountAccessId?: number;
+  commonAcmeAccountAccessId?: number;
+}>();
+
+const domains = computed(() => {
+  return Object.keys(props.modelValue || {});
+});
+
+function onRecordChange(domain: string, record: DnsPersistRecord) {
+  const value = { ...props.modelValue };
+  value[domain] = {
+    ...value[domain],
+    ...record,
+  };
+  emit("update:modelValue", value);
+  emit("change", value);
+}
+</script>
+
+<style lang="less">
+.dns-persist-verify-plan {
+  width: 100%;
+  table-layout: fixed;
+  .col-host {
+    width: 220px;
+  }
+  .col-type {
+    width: 100px;
+  }
+  .col-value {
+    width: 360px;
+  }
+  .col-status {
+    width: 120px;
+  }
+  .col-action {
+    width: 150px;
+  }
+  tbody tr td {
+    border-top: 1px solid #e8e8e8 !important;
+  }
+  tr {
+    td {
+      border: 0 !important;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+
+      &.center {
+        text-align: center;
+      }
+    }
+  }
+}
+</style>

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/index.vue

@@ -46,13 +46,28 @@
                     <div class="form-item">
                       <span class="label">{{ t("certd.verifyPlan.dnsAccess") }}:</span>
                       <span class="input">
-                        <access-selector v-model="item.dnsProviderAccessId" size="small" :type="item.dnsProviderAccessType || item.dnsProviderType" :placeholder="t('certd.verifyPlan.pleaseSelect')" @change="onPlanChanged"></access-selector>
+                        <access-selector
+                          v-model="item.dnsProviderAccessId"
+                          size="small"
+                          :type="item.dnsProviderAccessType || item.dnsProviderType"
+                          :placeholder="t('certd.verifyPlan.pleaseSelect')"
+                          @change="onPlanChanged"
+                        ></access-selector>
                       </span>
                     </div>
                   </div>
                   <div v-if="item.type === 'cname'" class="plan-cname">
                     <cname-verify-plan v-model="item.cnameVerifyPlan" @change="onPlanChanged" />
                   </div>
+                  <div v-if="item.type === 'dns-persist'" class="plan-dns-persist">
+                    <dns-persist-verify-plan
+                      v-model="item.dnsPersistVerifyPlan"
+                      :ca-type="caType"
+                      :acme-account-access-id="acmeAccountAccessId"
+                      :common-acme-account-access-id="commonAcmeAccountAccessId"
+                      @change="onPlanChanged"
+                    />
+                  </div>
                   <div v-if="item.type === 'http'" class="plan-http">
                     <http-verify-plan v-model="item.httpVerifyPlan" @change="onPlanChanged" />
                     <div class="helper">{{ t("certd.verifyPlan.httpHelper") }}</div>
@@ -76,6 +91,7 @@ import { useI18n } from "vue-i18n";
 import { dict, FsDictSelect } from "@fast-crud/fast-crud";
 import AccessSelector from "/@/views/certd/access/access-selector/index.vue";
 import CnameVerifyPlan from "./cname-verify-plan.vue";
+import DnsPersistVerifyPlan from "./dns-persist-verify-plan.vue";
 import HttpVerifyPlan from "./http-verify-plan.vue";
 import { Form } from "ant-design-vue";
 import { DomainsVerifyPlanInput } from "./type";
@@ -92,6 +108,10 @@ const challengeTypeOptions = ref<any[]>([
     label: t("certd.verifyPlan.dnsChallenge"),
     value: "dns",
   },
+  {
+    label: "DNS持久验证",
+    value: "dns-persist",
+  },
   {
     label: t("certd.verifyPlan.cnameChallenge"),
     value: "cname",
@@ -106,6 +126,9 @@ const props = defineProps<{
   modelValue?: DomainsVerifyPlanInput;
   domains?: string[];
   defaultType?: string;
+  caType?: string;
+  acmeAccountAccessId?: number;
+  commonAcmeAccountAccessId?: number;
 }>();
 
 const emit = defineEmits<{
@@ -189,11 +212,15 @@ async function onDomainsChanged(domains: string[]) {
 
     const cnameOrigin = planItem.cnameVerifyPlan;
     const httpOrigin = planItem.httpVerifyPlan;
+    const dnsPersistOrigin = planItem.dnsPersistVerifyPlan;
     planItem.cnameVerifyPlan = {};
     planItem.httpVerifyPlan = {};
+    planItem.dnsPersistVerifyPlan = {};
     const cnamePlan = planItem.cnameVerifyPlan;
     const httpPlan = planItem.httpVerifyPlan;
+    const dnsPersistPlan = planItem.dnsPersistVerifyPlan;
     for (const subDomain of domainGroupItem.keySubDomains) {
+      const wildcard = true;
       if (!cnameOrigin[subDomain]) {
         //@ts-ignore
         planItem.cnameVerifyPlan[subDomain] = {
@@ -225,6 +252,19 @@ async function onDomainsChanged(domains: string[]) {
           domain: subDomain,
         };
       }
+
+      if (!dnsPersistOrigin?.[subDomain]) {
+        //@ts-ignore
+        dnsPersistPlan[subDomain] = {
+          domain: subDomain,
+          wildcard,
+        };
+      } else {
+        dnsPersistPlan[subDomain] = {
+          ...dnsPersistOrigin[subDomain],
+          wildcard,
+        };
+      }
     }
 
     for (const subDomain of Object.keys(cnamePlan)) {
@@ -238,6 +278,12 @@ async function onDomainsChanged(domains: string[]) {
         delete httpPlan[subDomain];
       }
     }
+
+    for (const subDomain of Object.keys(dnsPersistPlan)) {
+      if (!domainGroupItem.keySubDomains.includes(subDomain)) {
+        delete dnsPersistPlan[subDomain];
+      }
+    }
   }
   for (const domain of Object.keys(planRef.value)) {
     const mainDomains = Object.keys(domainGroups);
@@ -268,6 +314,7 @@ watch(
   overflow-x: auto;
   .fullscreen-modal {
     display: none;
+    background-color: rgba(0, 0, 0, 0.42);
   }
 
   &.fullscreen {

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/type.ts

@@ -7,15 +7,32 @@ export type HttpRecord = {
   httpUploadRootDir: string;
 };
 
+export type DnsPersistRecord = {
+  id?: number;
+  domain: string;
+  mainDomain?: string;
+  status?: string;
+  hostRecord?: string;
+  recordValue?: string;
+  caType?: string;
+  acmeAccountAccessId?: number;
+  accountUri?: string;
+  wildcard?: boolean;
+  persistUntil?: number;
+  dnsProviderType?: string;
+  dnsProviderAccess?: number;
+};
+
 export type DomainVerifyPlanInput = {
   domain: string;
   domains: string[];
-  type: "cname" | "dns" | "http";
+  type: "cname" | "dns" | "http" | "dns-persist";
   dnsProviderType?: string;
   dnsProviderAccessType?: string;
   dnsProviderAccessId?: number;
   cnameVerifyPlan?: Record<string, CnameRecord>;
   httpVerifyPlan?: Record<string, HttpRecord>;
+  dnsPersistVerifyPlan?: Record<string, DnsPersistRecord>;
 };
 export type DomainsVerifyPlanInput = {
   [key: string]: DomainVerifyPlanInput;

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/validator.ts

@@ -46,6 +46,14 @@ function checkDomainVerifyPlan(rule: any, value: DomainsVerifyPlanInput) {
       if (!value[domain].dnsProviderType || !value[domain].dnsProviderAccessId) {
         throw new Error($t("certd.verifyPlan.errors.dnsProviderRequired", { domain }));
       }
+    } else if (type === "dns-persist") {
+      const subDomains = Object.keys(value[domain].dnsPersistVerifyPlan || {});
+      for (const subDomain of subDomains) {
+        const plan = value[domain].dnsPersistVerifyPlan[subDomain];
+        if (plan.status !== "valid") {
+          throw new Error(`DNS持久验证记录（${subDomain}）还未校验成功`);
+        }
+      }
     }
   }
   return true;

packages/ui/certd-client/src/components/plugins/common/refresh-input.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="refresh-input">
     <div class="refresh-input-line">
-      <a-input class="refresh-input-control" :value="value" :placeholder="placeholder" allow-clear @update:value="emit('update:value', $event)"></a-input>
-      <fs-button :loading="loading" type="primary" :text="buttonText" :icon="icon" @click="doRefresh"></fs-button>
+      <a-input class="refresh-input-control" :value="value" :placeholder="placeholder" :allow-clear="!disabled" :disabled="disabled" @update:value="emit('update:value', $event)"></a-input>
+      <fs-button :loading="loading" :disabled="disabled" type="primary" :text="buttonText" :icon="icon" @click="doRefresh"></fs-button>
     </div>
     <div class="helper" :class="{ error: hasError }">
       {{ message }}
@@ -25,6 +25,7 @@ type RefreshInputProps = ComponentPropsType & {
   icon?: string;
   placeholder?: string;
   successMessage?: string;
+  disabled?: boolean;
 };
 
 const fromType: any = inject("getFromType");
@@ -49,6 +50,9 @@ const placeholder = computed(() => props.placeholder || "");
 const successMessage = computed(() => props.successMessage || "刷新成功，请保存配置");
 
 const doRefresh = async () => {
+  if (props.disabled) {
+    return;
+  }
   if (loading.value) {
     return;
   }

packages/ui/certd-client/src/components/plugins/common/remote-select.vue

@@ -69,7 +69,7 @@ const props = defineProps<
     watches?: string[];
     search?: boolean;
     pager?: boolean;
-    multi?: boolean;
+    single?: boolean;
     pageSize?: number;
     uploadCert?: UploadCertProps;
   } & ComponentPropsType
@@ -79,15 +79,15 @@ const emit = defineEmits<{
 }>();
 
 function updateValue(value: any) {
-  // if (props.multi !== false) {
-  //   emit("update:value", value);
-  // } else {
-  //   const last = value?.[value.length - 1];
-  //   emit("update:value", last);
-  //   selectRef.value.blur();
-  // }
+  if (props.single === true) {
+    const last = value?.[value.length - 1];
+    emit("update:value", last);
+    selectRef.value.blur();
+  } else {
+    emit("update:value", value);
+  }
 
-  emit("update:value", value);
+  // emit("update:value", value);
 }
 
 const attrs = useAttrs();

packages/ui/certd-client/src/components/plugins/lib/dicts.ts

@@ -5,6 +5,7 @@ function createChallengeTypeDict() {
   return dict({
     data: [
       { value: "dns", label: $t("certd.verifyPlan.dnsChallenge"), color: "green" },
+      { value: "dns-persist", label: "DNS持久验证", color: "cyan" },
       { value: "cname", label: $t("certd.verifyPlan.cnameProxyChallenge"), color: "blue" },
       { value: "http", label: $t("certd.verifyPlan.httpChallenge"), color: "yellow" },
     ],
@@ -39,7 +40,12 @@ export const Dicts = {
   sslProviderDict: dict({
     data: [
       { value: "letsencrypt", label: "Let's Encrypt" },
+      { value: "letsencrypt_staging", label: "Let's Encrypt测试环境" },
+      { value: "google", label: "Google" },
       { value: "zerossl", label: "ZeroSSL" },
+      { value: "sslcom", label: "SSL.com" },
+      { value: "litessl", label: "litessl" },
+      { value: "custom", label: "自定义ACME" },
     ],
   }),
   get challengeTypeDict() {

packages/ui/certd-client/src/locales/langs/en-US/certd/navigation.ts

@@ -11,6 +11,7 @@ export default {
   siteMonitor: "Site Certificate Monitor",
   settings: "Settings",
   accessManager: "Access Management",
+  dnsPersistRecord: "DNS Persist Records",
   subDomain: "Subdomain Delegation Settings",
   pipelineGroup: "Pipeline Group Management",
   openKey: "Open API Key",
@@ -22,6 +23,7 @@ export default {
   mySuite: "My Suite",
   suiteBuy: "Suite Purchase",
   myTrade: "My Orders",
+  inviteCommission: "Incentive Plan",
   paymentReturn: "Payment Return",
   source: "Source Code",
   github: "GitHub",
@@ -46,6 +48,10 @@ export default {
     suiteSetting: "Suite Settings",
     orderManager: "Order Management",
     userSuites: "User Suites",
+    inviteCommissionSetting: "Incentive Plan Settings",
+    inviteLevel: "Promotion Levels",
+    inviteUserLevel: "User Promotion Levels",
+    inviteWithdraw: "Withdrawal Requests",
     netTest: "Network Test",
 
     enterpriseSetting: "Enterprise Settings",

packages/ui/certd-client/src/locales/langs/zh-CN/certd/navigation.ts

@@ -11,6 +11,7 @@ export default {
   siteMonitor: "站点证书监控",
   settings: "设置",
   accessManager: "授权管理",
+  dnsPersistRecord: "DNS持久验证记录",
   subDomain: "子域名托管设置",
   pipelineGroup: "流水线分组管理",
   openKey: "开放接口密钥",
@@ -22,6 +23,8 @@ export default {
   mySuite: "我的套餐",
   suiteBuy: "套餐购买",
   myTrade: "我的订单",
+  myWallet: "我的钱包",
+  inviteCommission: "激励计划",
   paymentReturn: "支付返回",
   source: "源码",
   github: "github",
@@ -46,6 +49,10 @@ export default {
     suiteSetting: "套餐设置",
     orderManager: "订单管理",
     userSuites: "用户套餐",
+    inviteCommissionSetting: "激励计划设置",
+    inviteLevel: "推广等级",
+    inviteUserLevel: "用户推广等级",
+    inviteWithdraw: "提现申请记录",
     netTest: "网络测试",
     enterpriseManager: "企业管理设置",
     projectManager: "项目管理",

packages/ui/certd-client/src/main.ts

@@ -12,9 +12,11 @@ import plugin from "./plugin/";
 import { setupVben } from "./vben";
 import { util } from "/@/utils";
 import { initPreferences } from "/@/vben/preferences";
+import { inviteUtils } from "/@/utils/util.invite";
 // import "./components/code-editor/import-works";
 // @ts-ignore
 async function bootstrap() {
+  inviteUtils.captureFromLocation();
   const app = createApp(App);
   // app.use(Antd);
   app.use(Antd);

packages/ui/certd-client/src/router/source/modules/certd.ts

@@ -186,6 +186,17 @@ export const certdResources = [
               keepAlive: true,
             },
           },
+          {
+            title: "certd.dnsPersistRecord",
+            name: "DnsPersistRecord",
+            path: "/certd/cert/dns-persist",
+            component: "/certd/cert/dns-persist/index.vue",
+            meta: {
+              icon: "ion:shield-half-outline",
+              auth: true,
+              keepAlive: true,
+            },
+          },
           {
             title: "certd.subDomain",
             name: "SubDomain",
@@ -324,7 +335,7 @@ export const certdResources = [
             meta: {
               show: () => {
                 const settingStore = useSettingStore();
-                return settingStore.isComm;
+                return settingStore.isInviteCommissionEnabled;
               },
               icon: "ion:gift-outline",
               auth: true,
@@ -359,6 +370,36 @@ export const certdResources = [
               keepAlive: true,
             },
           },
+          {
+            title: "certd.inviteCommission",
+            name: "InviteCommission",
+            path: "/certd/invite",
+            component: "/certd/invite/index.vue",
+            meta: {
+              show: () => {
+                const settingStore = useSettingStore();
+                return settingStore.isComm;
+              },
+              icon: "ion:gift-outline",
+              auth: true,
+              keepAlive: true,
+            },
+          },
+          {
+            title: "certd.myWallet",
+            name: "MyWallet",
+            path: "/certd/wallet",
+            component: "/certd/wallet/index.vue",
+            meta: {
+              show: () => {
+                const settingStore = useSettingStore();
+                return settingStore.isComm;
+              },
+              icon: "ion:wallet-outline",
+              auth: true,
+              keepAlive: true,
+            },
+          },
           {
             title: "certd.paymentReturn",
             name: "PaymentReturn",

packages/ui/certd-client/src/router/source/modules/sys.ts

@@ -286,6 +286,70 @@ export const sysResources = [
               keepAlive: true,
             },
           },
+          {
+            title: "certd.sysResources.inviteCommissionSetting",
+            name: "SysInviteCommissionSetting",
+            path: "/sys/suite/invite/setting",
+            component: "/sys/suite/invite/setting.vue",
+            meta: {
+              show: () => {
+                const settingStore = useSettingStore();
+                return settingStore.isComm;
+              },
+              icon: "ion:gift-outline",
+              permission: "sys:settings:edit",
+              auth: true,
+              keepAlive: true,
+            },
+          },
+          {
+            title: "certd.sysResources.inviteLevel",
+            name: "SysInviteLevel",
+            path: "/sys/suite/invite/level",
+            component: "/sys/suite/invite/level.vue",
+            meta: {
+              show: () => {
+                const settingStore = useSettingStore();
+                return settingStore.isComm;
+              },
+              icon: "ion:ribbon-outline",
+              permission: "sys:settings:edit",
+              auth: true,
+              keepAlive: true,
+            },
+          },
+          {
+            title: "certd.sysResources.inviteUserLevel",
+            name: "SysInviteUserLevel",
+            path: "/sys/suite/invite/user-level",
+            component: "/sys/suite/invite/user-level.vue",
+            meta: {
+              show: () => {
+                const settingStore = useSettingStore();
+                return settingStore.isComm;
+              },
+              icon: "ion:people-outline",
+              permission: "sys:settings:edit",
+              auth: true,
+              keepAlive: true,
+            },
+          },
+          {
+            title: "certd.sysResources.inviteWithdraw",
+            name: "SysInviteWithdraw",
+            path: "/sys/suite/invite/withdraw",
+            component: "/sys/suite/invite/withdraw.vue",
+            meta: {
+              show: () => {
+                const settingStore = useSettingStore();
+                return settingStore.isComm;
+              },
+              icon: "ion:cash-outline",
+              permission: "sys:settings:edit",
+              auth: true,
+              keepAlive: true,
+            },
+          },
         ],
       },
       {

packages/ui/certd-client/src/store/settings/api.basic.ts

@@ -97,6 +97,9 @@ export type SysPublicSetting = {
 export type SuiteSetting = {
   enabled?: boolean;
 };
+export type InviteSetting = {
+  enabled?: boolean;
+};
 export type SysPrivateSetting = {
   httpProxy?: string;
   httpsProxy?: string;
@@ -142,6 +145,7 @@ export type AllSettings = {
   siteEnv: SiteEnv;
   headerMenus: HeaderMenus;
   suiteSetting: SuiteSetting;
+  inviteSetting: InviteSetting;
   app: AppInfo;
 };
 

packages/ui/certd-client/src/store/settings/index.tsx

@@ -30,6 +30,9 @@ export interface SettingState {
   headerMenus?: HeaderMenus;
   inited?: boolean;
   suiteSetting?: SuiteSetting;
+  inviteSetting?: {
+    enabled?: boolean;
+  };
   app: {
     version?: string;
     time?: number;
@@ -102,6 +105,7 @@ export const useSettingStore = defineStore({
       menus: [],
     },
     suiteSetting: { enabled: false },
+    inviteSetting: { enabled: false },
     inited: false,
     app: {
       version: "",
@@ -196,6 +200,9 @@ export const useSettingStore = defineStore({
       // @ts-ignore
       return this.suiteSetting?.enabled === true;
     },
+    isInviteCommissionEnabled(): boolean {
+      return this.isComm && this.inviteSetting?.enabled === true;
+    },
   },
   actions: {
     checkPlus() {
@@ -215,6 +222,7 @@ export const useSettingStore = defineStore({
       merge(this.plusInfo, allSettings.plusInfo || {});
       merge(this.headerMenus, allSettings.headerMenus || {});
       merge(this.suiteSetting, allSettings.suiteSetting || {});
+      merge(this.inviteSetting, allSettings.inviteSetting || {});
       //@ts-ignore
       this.initSiteInfo(allSettings.siteInfo || {});
       this.initAppInfo(allSettings.app || {});

packages/ui/certd-client/src/store/user/api.user.ts

@@ -4,6 +4,7 @@ export interface RegisterReq {
   username: string;
   password: string;
   confirmPassword: string;
+  inviteCode?: string;
 }
 /**
  * @description: Login interface parameters
@@ -18,6 +19,7 @@ export interface SmsLoginReq {
   phoneCode: string;
   smsCode: string;
   randomStr: string;
+  inviteCode?: string;
 }
 
 export interface ForgotPasswordReq {

packages/ui/certd-client/src/utils/util.invite.ts

@@ -0,0 +1,54 @@
+const INVITE_STORAGE_KEY = "certd_invite_code";
+const INVITE_TTL = 3 * 24 * 60 * 60 * 1000;
+
+export type InviteCache = {
+  code: string;
+  expiresAt: number;
+};
+
+function normalizeInviteCode(code?: string | null) {
+  return code?.trim().toUpperCase();
+}
+
+export const inviteUtils = {
+  save(code?: string | null) {
+    const normalized = normalizeInviteCode(code);
+    if (!normalized) {
+      return;
+    }
+    const cache: InviteCache = {
+      code: normalized,
+      expiresAt: Date.now() + INVITE_TTL,
+    };
+    localStorage.setItem(INVITE_STORAGE_KEY, JSON.stringify(cache));
+  },
+
+  get() {
+    const text = localStorage.getItem(INVITE_STORAGE_KEY);
+    if (!text) {
+      return "";
+    }
+    try {
+      const cache = JSON.parse(text) as InviteCache;
+      if (!cache.code || !cache.expiresAt || cache.expiresAt < Date.now()) {
+        localStorage.removeItem(INVITE_STORAGE_KEY);
+        return "";
+      }
+      return cache.code;
+    } catch (e) {
+      localStorage.removeItem(INVITE_STORAGE_KEY);
+      return "";
+    }
+  },
+
+  captureFromLocation() {
+    const hashQuery = window.location.hash?.split("?")[1] || "";
+    const search = window.location.search?.replace(/^\?/, "") || "";
+    const hashParams = new URLSearchParams(hashQuery);
+    const searchParams = new URLSearchParams(search);
+    const code = hashParams.get("inviteCode") || searchParams.get("inviteCode");
+    if (code) {
+      this.save(code);
+    }
+  },
+};

packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx

@@ -12,6 +12,12 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   const { props, ctx, api } = context;
   const lastResRef = ref();
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    query.query = query.query || {};
+    if (props.subtype) {
+      query.query.subtype = props.subtype;
+    } else {
+      delete query.query.subtype;
+    }
     return await context.api.GetList(query);
   };
   const editRequest = async (req: EditReq) => {
@@ -47,7 +53,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   const { myProjectDict } = useDicts();
   const typeRef = ref("aliyun");
   context.typeRef = typeRef;
-  const commonColumnsDefine = getCommonColumnDefine(crudExpose, typeRef, api);
+  const commonColumnsDefine = getCommonColumnDefine(crudExpose, typeRef, api, props.subtype);
   commonColumnsDefine.type.form.component.disabled = true;
   const projectStore = useProjectStore();
   return {

packages/ui/certd-client/src/views/certd/access/access-selector/access/index.vue

@@ -21,6 +21,10 @@ export default defineComponent({
       type: String, //user | sys
       default: "user",
     },
+    subtype: {
+      type: String,
+      default: "",
+    },
     modelValue: {},
   },
   emits: ["update:modelValue"],
@@ -30,10 +34,17 @@ export default defineComponent({
     const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
 
     // 你可以调用此方法，重新初始化crud配置
+    function refreshSearch() {
+      const form: any = { type: props.type };
+      if (props.subtype) {
+        form.subtype = props.subtype;
+      }
+      crudExpose.setSearchFormData({ form, mergeForm: true });
+      crudExpose.doRefresh();
+    }
     function onTypeChanged(value: any) {
       context.typeRef.value = value;
-      crudExpose.setSearchFormData({ form: { type: value }, mergeForm: true });
-      crudExpose.doRefresh();
+      refreshSearch();
     }
     watch(
       () => {
@@ -44,6 +55,14 @@ export default defineComponent({
         onTypeChanged(value);
       }
     );
+    watch(
+      () => {
+        return props.subtype;
+      },
+      () => {
+        refreshSearch();
+      }
+    );
     // 页面打开后获取列表数据
     onMounted(() => {
       onTypeChanged(props.type);

packages/ui/certd-client/src/views/certd/access/access-selector/index.vue

@@ -9,7 +9,7 @@
     <a-form-item-rest v-if="chooseForm.show">
       <a-modal v-model:open="chooseForm.show" title="选择授权提供者" width="900px" @ok="chooseForm.ok">
         <div style="height: 400px; position: relative">
-          <cert-access-modal v-model="selectedId" :type="type" :from="from"></cert-access-modal>
+          <cert-access-modal v-model="selectedId" :type="type" :subtype="subtype" :from="from"></cert-access-modal>
         </div>
       </a-modal>
     </a-form-item-rest>
@@ -35,6 +35,10 @@ export default defineComponent({
       type: String,
       default: "aliyun",
     },
+    subtype: {
+      type: String,
+      default: "",
+    },
     placeholder: {
       type: String,
       default: "请选择",

packages/ui/certd-client/src/views/certd/access/common.tsx

@@ -1,11 +1,11 @@
 import { ColumnCompositionProps, dict } from "@fast-crud/fast-crud";
-import { computed, provide, ref, toRef } from "vue";
+import { provide, ref, toRef } from "vue";
 import { useReference } from "/@/use/use-refrence";
 import { forEach, get, merge, set } from "lodash-es";
 import SecretPlainGetter from "/@/views/certd/access/access-selector/access/secret-plain-getter.vue";
 import { utils } from "/@/utils";
 
-export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
+export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any, fixedSubtype?: string) {
   provide("getFromType", api.from);
   provide("accessApi", api);
   provide("get:plugin:type", () => {
@@ -34,6 +34,13 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
       }
     }
     console.log('crudBinding.value[mode + "Form"].columns', columnsRef.value);
+    if (mode === "add" && define.subtype && fixedSubtype) {
+      form.access = form.access || {};
+      const subtypeKey = `access.${define.subtype}`;
+      if (get(form, subtypeKey) == null) {
+        set(form, subtypeKey, fixedSubtype);
+      }
+    }
     forEach(define.input, (value: any, mapKey: any) => {
       const key = "access." + mapKey;
       const field = {

packages/ui/certd-client/src/views/certd/cert/dns-persist/api.ts

@@ -0,0 +1,83 @@
+import { request } from "/src/api/service";
+
+const apiPrefix = "/cert/dns-persist";
+
+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 BuildRecord(body: { domain: string; accountUri: string; wildcard?: boolean; persistUntil?: number }) {
+  return await request({
+    url: apiPrefix + "/build",
+    method: "post",
+    data: body,
+  });
+}
+
+export async function GetByDomain(body: { domain: string; caType?: string; acmeAccountAccessId?: number; commonAcmeAccountAccessId?: number; wildcard?: boolean; persistUntil?: number; createOnNotFound?: boolean }) {
+  return await request({
+    url: apiPrefix + "/getByDomain",
+    method: "post",
+    data: body,
+  });
+}
+
+export async function CheckRecord(body: { hostRecord: string; recordValue: string }) {
+  return await request({
+    url: apiPrefix + "/check",
+    method: "post",
+    data: body,
+  });
+}
+
+export async function Verify(id: number) {
+  return await request({
+    url: apiPrefix + "/verify",
+    method: "post",
+    data: { id },
+  });
+}
+
+export async function TriggerVerify(id: number) {
+  return await request({
+    url: apiPrefix + "/triggerVerify",
+    method: "post",
+    data: { id },
+  });
+}
+
+export async function CreateTxt(body: { id: number; dnsProviderType?: string; dnsProviderAccess?: number }) {
+  return await request({
+    url: apiPrefix + "/createTxt",
+    method: "post",
+    data: body,
+  });
+}

packages/ui/certd-client/src/views/certd/cert/dns-persist/crud.tsx

@@ -0,0 +1,349 @@
+import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { message, Modal, notification } from "ant-design-vue";
+import * as api from "./api";
+import { Dicts } from "/@/components/plugins/lib/dicts";
+import { createAccessApi } from "/@/views/certd/access/api";
+import { useDnsPersistSettingDialog } from "./use-setting-dialog";
+
+function parseAccount(account: any) {
+  if (!account) {
+    return null;
+  }
+  if (typeof account === "string") {
+    return JSON.parse(account);
+  }
+  return account;
+}
+
+export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const accessApi = createAccessApi();
+  const { openDnsPersistSettingDialog } = useDnsPersistSettingDialog();
+  const accessDict = dict({
+    value: "id",
+    label: "name",
+    url: "accessDict",
+    async getNodesByValues(ids: number[]) {
+      return await accessApi.GetDictByIds(ids);
+    },
+  });
+
+  const dnsProviderTypeDict = dict({
+    url: "pi/dnsProvider/dnsProviderTypeDict",
+  });
+  const statusDict = dict({
+    data: [
+      { value: "pending", label: "待设置", color: "warning" },
+      { value: "created", label: "已创建", color: "blue" },
+      { value: "validating", label: "校验中", color: "blue" },
+      { value: "valid", label: "有效", color: "green" },
+      { value: "failed", label: "请重试", color: "red" },
+    ],
+  });
+
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetList(query);
+  };
+  const editRequest = async ({ form, row }: EditReq) => {
+    form.id = row.id;
+    return await api.UpdateObj(form);
+  };
+  const delRequest = async ({ row }: DelReq) => {
+    const res = await api.DelObj(row.id);
+    if (res?.message) {
+      notification.warning({
+        message: "请到供应商删除TXT记录",
+        description: res.message,
+        duration: 0,
+      });
+    }
+    return res;
+  };
+  const addRequest = async ({ form }: AddReq) => {
+    return await api.AddObj(form);
+  };
+
+  async function fillRecord(form: any) {
+    if (!form.domain || !form.acmeAccountAccessId) {
+      return;
+    }
+    const access: any = await accessApi.GetObj(form.acmeAccountAccessId);
+    const setting = JSON.parse(access.setting || "{}");
+    const account = parseAccount(setting.account);
+    if (!account?.accountUri) {
+      message.error("ACME账号授权缺少accountUri，请重新生成账号");
+      return;
+    }
+    const record = await api.BuildRecord({
+      domain: form.domain,
+      accountUri: account.accountUri,
+      wildcard: true,
+      persistUntil: form.persistUntil,
+    });
+    form.caType = account.caType;
+    form.accountUri = account.accountUri;
+    form.hostRecord = record.hostRecord;
+    form.recordValue = record.recordValue;
+    form.status = "pending";
+  }
+
+  async function verifyRecord(row: any) {
+    const ok = await api.Verify(row.id);
+    message[ok ? "success" : "error"](ok ? "校验成功" : "未找到匹配的TXT记录，请稍后重试");
+    await crudExpose.doRefresh();
+    return ok;
+  }
+
+  function showRecordHelp(row: any) {
+    openDnsPersistSettingDialog({
+      record: row,
+      async onDone() {
+        await crudExpose.doRefresh();
+      },
+    });
+  }
+
+  return {
+    crudOptions: {
+      request: {
+        pageRequest,
+        addRequest,
+        editRequest,
+        delRequest,
+      },
+      actionbar: {
+        buttons: {
+          add: {
+            icon: "ion:add-circle-outline",
+          },
+        },
+      },
+      rowHandle: {
+        minWidth: 120,
+        fixed: "right",
+      },
+      columns: {
+        id: {
+          title: "ID",
+          key: "id",
+          type: "number",
+          column: { width: 80, order: -999 },
+          form: { show: false },
+        },
+        domain: {
+          title: "域名",
+          type: "text",
+          search: { show: true },
+          form: {
+            required: true,
+            valueChange({ form }) {
+              fillRecord(form);
+            },
+          },
+        },
+        mainDomain: {
+          title: "主域名",
+          type: "text",
+          form: {
+            show: false,
+          },
+          column: {
+            width: 160,
+            order: 901,
+          },
+        },
+        wildcard: {
+          title: "通配符",
+          type: "dict-switch",
+          form: {
+            show: false,
+            value: true,
+          },
+          column: { show: false },
+        },
+        acmeAccountAccessId: {
+          title: "ACME账号授权",
+          type: "dict-select",
+          dict: accessDict,
+          form: {
+            required: true,
+            order: -9,
+            component: {
+              name: "AccessSelector",
+              vModel: "modelValue",
+              type: "acmeAccount",
+              subtype: compute(({ form }) => {
+                return form.caType;
+              }),
+            },
+            valueChange({ form }) {
+              fillRecord(form);
+            },
+          },
+          column: {
+            width: 180,
+          },
+        },
+        caType: {
+          title: "颁发机构",
+          type: "dict-select",
+          dict: Dicts.sslProviderDict,
+          form: {
+            required: true,
+            value: "letsencrypt",
+            order: -10,
+            valueChange({ form }) {
+              form.acmeAccountAccessId = null;
+              fillRecord(form);
+            },
+          },
+          column: { width: 120 },
+        },
+        persistUntil: {
+          title: "有效期至",
+          type: "datetime",
+          form: {
+            helper: "可选；为空表示长期有效",
+            order: 20,
+            valueChange({ form }) {
+              fillRecord(form);
+            },
+          },
+          column: { width: 180, order: 900 },
+        },
+        hostRecord: {
+          title: "TXT主机名",
+          type: "copyable",
+          form: {
+            show: false,
+          },
+          column: {
+            width: 220,
+            cellRender({ value }) {
+              return (
+                <a-tooltip title={value}>
+                  <fs-copyable modelValue={value}></fs-copyable>
+                </a-tooltip>
+              );
+            },
+          },
+        },
+        recordValue: {
+          title: "请设置TXT记录",
+          type: "copyable",
+          form: {
+            show: false,
+          },
+          column: {
+            width: 380,
+            cellRender({ value }) {
+              return (
+                <a-tooltip title={value}>
+                  <fs-copyable modelValue={value}></fs-copyable>
+                </a-tooltip>
+              );
+            },
+          },
+        },
+        dnsProviderType: {
+          title: "DNS服务商",
+          type: "dict-select",
+          dict: dnsProviderTypeDict,
+          form: {
+            show: false,
+            component: {
+              name: "DnsProviderSelector",
+            },
+          },
+          column: { show: false },
+        },
+        dnsProviderAccess: {
+          title: "DNS授权",
+          type: "dict-select",
+          dict: accessDict,
+          form: {
+            show: false,
+            component: {
+              name: "AccessSelector",
+              vModel: "modelValue",
+              type: compute(({ form }) => {
+                const type = form.dnsProviderType || "aliyun";
+                return dnsProviderTypeDict?.dataMap[type]?.accessType || type;
+              }),
+            },
+          },
+          column: { show: false },
+        },
+        status: {
+          title: "状态",
+          type: "dict-select",
+          dict: statusDict,
+          form: {
+            show: false,
+            value: "pending",
+          },
+          column: {
+            width: 120,
+            cellRender({ value, row }) {
+              async function resetStatus() {
+                Modal.confirm({
+                  title: "重新校验",
+                  content: "确认将该记录状态重置为待设置，并重新校验吗？",
+                  onOk: async () => {
+                    await api.UpdateObj({ id: row.id, status: "pending" });
+                    await verifyRecord(row);
+                  },
+                });
+              }
+              return (
+                <div class={"flex flex-left"}>
+                  <fs-values-format modelValue={value} dict={statusDict}></fs-values-format>
+                  {row.status === "valid" && (
+                    <a-tooltip title="撤销并重新校验">
+                      <fs-icon class={"ml-5 pointer color-yellow"} icon="solar:undo-left-square-bold" onClick={resetStatus}></fs-icon>
+                    </a-tooltip>
+                  )}
+                </div>
+              );
+            },
+          },
+        },
+        triggerValidate: {
+          title: "校验",
+          type: "text",
+          form: {
+            show: false,
+          },
+          column: {
+            conditionalRenderDisabled: true,
+            width: 210,
+            align: "center",
+            cellRender({ row }) {
+              return (
+                <a-space>
+                  {row.status === "valid" ? (
+                    <span class="text-gray-500">请勿删除TXT记录</span>
+                  ) : (
+                    <>
+                      <a-button type="primary" size="small" onClick={() => showRecordHelp(row)}>
+                        设置TXT
+                      </a-button>
+                      <a-button type="primary" size="small" onClick={() => verifyRecord(row)}>
+                        校验
+                      </a-button>
+                    </>
+                  )}
+                </a-space>
+              );
+            },
+          },
+        },
+        accountUri: {
+          title: "Account URI",
+          type: "text",
+          form: { show: false },
+          column: { show: false },
+        },
+      },
+    },
+  };
+}

packages/ui/certd-client/src/views/certd/cert/dns-persist/index.vue

@@ -0,0 +1,33 @@
+<template>
+  <fs-page class="page-cert-dns-persist">
+    <template #header>
+      <div class="title">
+        DNS持久验证记录
+        <span class="red sub" style="color: red">当前仅 Let's Encrypt 测试环境可以申请 DNS 持久验证证书。</span>
+      </div>
+    </template>
+    <fs-crud ref="crudRef" v-bind="crudBinding"></fs-crud>
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+import { onActivated, onMounted } from "vue";
+import { useFs } from "@fast-crud/fast-crud";
+import createCrudOptions from "./crud";
+
+defineOptions({
+  name: "DnsPersistRecord",
+});
+
+const context: any = {
+  permission: { isProjectPermission: true },
+};
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
+
+onMounted(() => {
+  crudExpose.doRefresh();
+});
+onActivated(async () => {
+  await crudExpose.doRefresh();
+});
+</script>

packages/ui/certd-client/src/views/certd/cert/dns-persist/use-setting-dialog.tsx

@@ -0,0 +1,133 @@
+import { message } from "ant-design-vue";
+import { reactive } from "vue";
+import AccessSelector from "/@/views/certd/access/access-selector/index.vue";
+import DnsProviderSelector from "/@/components/plugins/cert/dns-provider-selector/index.vue";
+import { useFormDialog } from "/@/use/use-dialog";
+import { CreateTxt, TriggerVerify } from "./api";
+
+export type DnsPersistSettingRecord = {
+  id?: number;
+  mainDomain?: string;
+  hostRecord?: string;
+  recordValue?: string;
+  dnsProviderType?: string;
+  dnsProviderAccess?: number;
+};
+
+export function useDnsPersistSettingDialog() {
+  const { openFormDialog } = useFormDialog();
+
+  function copyableRow(label: string, value?: string) {
+    return (
+      <div class="mb-10 flex items-center">
+        <div style={{ width: "90px", flexShrink: 0 }}>{label}</div>
+        <div style={{ flex: 1, minWidth: 0 }}>
+          <fs-copyable class="w-full" model-value={value || ""}></fs-copyable>
+        </div>
+      </div>
+    );
+  }
+
+  async function openDnsPersistSettingDialog(req: { record: DnsPersistSettingRecord; onDone?: () => Promise<void> | void }) {
+    const record = req.record;
+    const form = reactive({
+      mode: "manual",
+      dnsProviderType: record.dnsProviderType || "",
+      dnsProviderAccessType: "",
+      dnsProviderAccess: record.dnsProviderAccess || null,
+    });
+
+    async function submit() {
+      if (!record.id) {
+        return;
+      }
+      if (form.mode === "manual") {
+        await TriggerVerify(record.id);
+        message.success("已提交校验");
+        await req.onDone?.();
+        return;
+      }
+      if (!form.dnsProviderType || !form.dnsProviderAccess) {
+        throw new Error("请选择DNS服务商和授权");
+      }
+      await CreateTxt({
+        id: record.id,
+        dnsProviderType: form.dnsProviderType,
+        dnsProviderAccess: form.dnsProviderAccess,
+      });
+      message.success("TXT记录已创建");
+      await req.onDone?.();
+    }
+
+    await openFormDialog({
+      title: "设置DNS TXT记录",
+      wrapper: {
+        width: 680,
+        buttons: {
+          reset: {
+            show: false,
+          },
+          ok: {
+            show: true,
+            text: "确定",
+          },
+        },
+      },
+      body: () => (
+        <div>
+          <a-radio-group value={form.mode} buttonStyle="solid" class="mb-10" onUpdate:value={(value: string) => (form.mode = value)}>
+            <a-radio-button value="manual">手动添加</a-radio-button>
+            <a-radio-button value="auto">选择授权添加</a-radio-button>
+          </a-radio-group>
+          {form.mode === "manual" ? (
+            <div>
+              <a-alert class="mb-10" type="info" show-icon message="请到DNS解析控制台添加以下TXT记录，添加后点击确定会立即校验。" />
+              {copyableRow("主域名", record.mainDomain)}
+              {copyableRow("TXT主机名", record.hostRecord)}
+              {copyableRow("TXT值", record.recordValue)}
+            </div>
+          ) : (
+            <div>
+              <a-alert class="mb-10" type="info" show-icon message="请选择DNS服务商和授权，系统会创建TXT记录，后续校验由后台完成。" />
+              {copyableRow("主域名", record.mainDomain)}
+              <div class="mb-10 flex items-center">
+                <div style={{ width: "90px", flexShrink: 0 }}>DNS服务商</div>
+                <div style={{ flex: 1, minWidth: 0 }}>
+                  <DnsProviderSelector
+                    class="w-full"
+                    style={{ width: "100%" }}
+                    modelValue={form.dnsProviderType}
+                    onUpdate:modelValue={(value: string) => {
+                      form.dnsProviderType = value;
+                      form.dnsProviderAccess = null;
+                    }}
+                    onSelectedChange={(option: any) => {
+                      form.dnsProviderAccessType = option?.accessType || form.dnsProviderType;
+                    }}
+                  />
+                </div>
+              </div>
+              <div class="mb-10 flex items-center">
+                <div style={{ width: "90px", flexShrink: 0 }}>DNS授权</div>
+                <div style={{ flex: 1, minWidth: 0 }}>
+                  <AccessSelector
+                    modelValue={form.dnsProviderAccess}
+                    type={form.dnsProviderAccessType || form.dnsProviderType || "aliyun"}
+                    onUpdate:modelValue={(value: number) => {
+                      form.dnsProviderAccess = value;
+                    }}
+                  />
+                </div>
+              </div>
+            </div>
+          )}
+        </div>
+      ),
+      onSubmit: submit,
+    });
+  }
+
+  return {
+    openDnsPersistSettingDialog,
+  };
+}

packages/ui/certd-client/src/views/certd/cert/domain/crud.tsx

@@ -92,6 +92,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           if (form.challengeType === "cname") {
             throw new Error(t("certd.domain.cnameManagedInCnamePage"));
           }
+          if (form.challengeType === "dns-persist") {
+            throw new Error("DNS持久验证记录请在DNS持久验证记录页面管理");
+          }
           if (form.challengeType === "dns") {
             const isSubdomain = await api.IsSubdomain({ domain: form.domain });
             if (isSubdomain && !subdomainConfirmed.value) {
@@ -221,6 +224,17 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
                     crudExpose.getFormWrapperRef().close();
                   },
                 });
+              } else if (value === "dns-persist") {
+                Modal.confirm({
+                  title: "请前往DNS持久验证记录页面添加记录",
+                  content: "DNS持久验证需要先配置ACME账号和_validation-persist持久TXT记录，续期时不再增删DNS记录；当前仅 Let's Encrypt 测试环境可以申请。",
+                  async onOk() {
+                    router.push({
+                      path: "/certd/cert/dns-persist",
+                    });
+                    crudExpose.getFormWrapperRef().close();
+                  },
+                });
               }
             },
           },

packages/ui/certd-client/src/views/certd/invite/api.ts

@@ -0,0 +1,17 @@
+import { request } from "/@/api/service";
+
+export async function GetMyInvite() {
+  return await request({ url: "/invite/my", method: "post" });
+}
+
+export async function OpenInvitePlan() {
+  return await request({ url: "/invite/open", method: "post" });
+}
+
+export async function GetInvitees(query: any) {
+  return await request({ url: "/invite/invitees/page", method: "post", data: query });
+}
+
+export async function GetCommissionLogs(query: any) {
+  return await request({ url: "/invite/commission/page", method: "post", data: query });
+}

packages/ui/certd-client/src/views/certd/invite/crud-invitees.tsx

@@ -0,0 +1,44 @@
+import { CreateCrudOptionsProps, CreateCrudOptionsRet, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import * as api from "./api";
+
+export default function (): CreateCrudOptionsRet {
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetInvitees(query);
+  };
+
+  return {
+    crudOptions: {
+      request: { pageRequest },
+      search: { show: false },
+      actionbar: { show: false },
+      toolbar: { show: false },
+      rowHandle: { show: false },
+      columns: {
+        createTime: {
+          title: "邀请时间",
+          type: "datetime",
+          column: { width: 180 },
+        },
+        simpleUser: {
+          title: "被邀请用户名",
+          type: "text",
+          column: {
+            minWidth: 180,
+            cellRender({ row }) {
+              const simpleUser = row.simpleUser;
+              if (!simpleUser) {
+                return row.inviteeUserId ? `用户${row.inviteeUserId} (${row.inviteeUserId})` : "-";
+              }
+              return simpleUser.displayName || `${simpleUser.username || "-"} (${simpleUser.id})`;
+            },
+          },
+        },
+        inviteCode: {
+          title: "邀请码",
+          type: "text",
+          column: { width: 160 },
+        },
+      },
+    },
+  };
+}

packages/ui/certd-client/src/views/certd/invite/crud-logs.tsx

@@ -0,0 +1,67 @@
+import { CreateCrudOptionsRet, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import * as api from "./api";
+import PriceInput from "/@/views/sys/suite/product/price-input.vue";
+
+export default function (): CreateCrudOptionsRet {
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetCommissionLogs(query);
+  };
+
+  return {
+    crudOptions: {
+      request: { pageRequest },
+      search: { show: false },
+      actionbar: { show: false },
+      toolbar: { show: false },
+      rowHandle: { show: false },
+      columns: {
+        createTime: {
+          title: "时间",
+          type: "datetime",
+          column: { width: 180 },
+        },
+        amount: {
+          title: "收益金额",
+          type: "number",
+          column: {
+            width: 120,
+            component: { name: PriceInput, vModel: "modelValue", edit: false },
+          },
+        },
+        simpleUser: {
+          title: "被推广用户",
+          type: "text",
+          column: {
+            width: 170,
+            cellRender({ row }) {
+              const simpleUser = row.simpleUser;
+              if (!simpleUser) {
+                return "-";
+              }
+              return (
+                <div class="leading-5">
+                  <div>
+                    {simpleUser.username || "-"} ({simpleUser.id})
+                  </div>
+                </div>
+              );
+            },
+          },
+        },
+        consumeAmount: {
+          title: "推广金额",
+          type: "number",
+          column: {
+            width: 120,
+            component: { name: PriceInput, vModel: "modelValue", edit: false },
+          },
+        },
+        remark: {
+          title: "备注",
+          type: "text",
+          column: { minWidth: 220 },
+        },
+      },
+    },
+  };
+}

packages/ui/certd-client/src/views/certd/invite/index.vue

@@ -0,0 +1,829 @@
+<template>
+  <fs-page class="page-invite">
+    <template #header>
+      <div class="title">
+        激励计划
+        <span class="sub"> 邀请好友，获取丰厚佣金奖励 </span>
+      </div>
+      <div class="more">
+        <a-button type="primary" @click="openAgreementDialog(false)">推广协议</a-button>
+      </div>
+    </template>
+
+    <div v-if="loaded && enabled && inviteInfo.enabled" class="invite-body">
+      <div class="invite-summary-grid">
+        <div v-for="item in summaryCards" :key="item.key" class="summary-card">
+          <div class="summary-card-main">
+            <div class="summary-title">{{ item.title }}</div>
+            <div class="summary-value" :class="item.className">{{ item.value }}</div>
+          </div>
+          <div v-if="item.key === 'totalIncome'" class="withdraw-action">
+            <div class="withdraw-available">可提现 {{ moneyText(inviteInfo.wallet?.availableAmount) }}</div>
+            <a-button class="summary-action-button" type="primary" @click="gotoWallet">提现</a-button>
+          </div>
+        </div>
+      </div>
+
+      <div class="invite-link-panel">
+        <div class="invite-info-row invite-highlight-row">
+          <div class="info-icon">
+            <fs-icon icon="ion:ticket-outline" />
+          </div>
+          <span class="info-label">邀请码</span>
+          <div class="info-content">
+            <fs-copyable v-model="inviteInfo.inviteCode" />
+          </div>
+        </div>
+
+        <div class="invite-info-row invite-highlight-row">
+          <div class="info-icon">
+            <fs-icon icon="ion:link-outline" />
+          </div>
+          <span class="info-label">邀请链接</span>
+          <div class="info-content">
+            <fs-copyable v-model="inviteInfo.inviteLink" />
+          </div>
+        </div>
+
+        <div class="invite-info-row invite-highlight-row level-highlight-row" @click="levelDialogOpen = true">
+          <div class="info-icon level-info-icon">
+            <fs-icon v-if="inviteInfo.currentLevel" :icon="levelIcon(inviteInfo.currentLevel)" />
+            <fs-icon v-else icon="ion:ribbon-outline" />
+          </div>
+          <span class="info-label">我的等级</span>
+          <div class="info-content level-info-content">
+            <span class="level-name-text">{{ inviteInfo.currentLevel?.name || "未设置" }}</span>
+            <span v-if="inviteInfo.currentLevel" class="current-level-rate">
+              <span class="current-level-rate-label">返佣比例</span>
+              <span class="current-level-rate-value">{{ inviteInfo.currentLevel.commissionRate }}%</span>
+            </span>
+            <span v-if="inviteInfo.currentLevel" class="level-rate-desc">好友付费后按此比例计算佣金</span>
+          </div>
+          <fs-icon class="level-open-icon" icon="ion:chevron-forward-outline" />
+        </div>
+      </div>
+
+      <a-tabs v-model:active-key="activeTab" class="invite-tabs" @change="handleTabChange">
+        <a-tab-pane key="invitees" tab="邀请成功">
+          <fs-crud v-if="activeTab === 'invitees'" ref="inviteesCrudRef" class="invite-crud" v-bind="inviteesCrudBinding" />
+        </a-tab-pane>
+        <a-tab-pane key="logs" tab="收益记录">
+          <fs-crud v-if="activeTab === 'logs'" ref="logsCrudRef" class="invite-crud" v-bind="logsCrudBinding" />
+        </a-tab-pane>
+      </a-tabs>
+    </div>
+
+    <div v-else-if="loaded && enabled" class="invite-disabled">
+      <a-empty description="请先开通激励计划">
+        <a-button type="primary" @click="openAgreementDialog(true)">开通激励计划</a-button>
+      </a-empty>
+    </div>
+    <a-empty v-else-if="loaded" description="激励计划未开启" />
+
+    <a-modal v-model:open="levelDialogOpen" title="推广等级" width="820px" wrap-class-name="invite-level-modal" :footer="null">
+      <div class="level-modal-subtitle">推广越多，等级越高，返佣比例越高</div>
+      <div class="level-progress-box">
+        <div>
+          <div class="level-progress-label">当前累计推广金额</div>
+          <div class="level-progress-value">¥ {{ amountToYuan(inviteInfo.summary.promotionAmount) }}</div>
+        </div>
+        <div class="level-progress-desc">
+          <template v-if="inviteInfo.nextLevel">距离下一等级「{{ inviteInfo.nextLevel.name }}」还差 {{ amountToYuan(inviteInfo.nextLevel.gapAmount) }} 元</template>
+          <template v-else-if="inviteInfo.currentLevel?.levelType === 'exclusive'">当前为专属等级，不参与自动升级</template>
+          <template v-else>已达到当前可自动升级的最高等级</template>
+        </div>
+      </div>
+      <div class="level-card-grid modal-level-grid">
+        <div v-for="level in visibleLevels" :key="level.id" class="level-card" :class="{ active: level.id === inviteInfo.currentLevel?.id }">
+          <div class="level-name">
+            <span class="level-medal">
+              <fs-icon :icon="levelIcon(level)" />
+            </span>
+            {{ level.name }}
+            <a-tag v-if="level.levelType === 'exclusive'" color="orange">专属</a-tag>
+          </div>
+          <div class="level-rate-label">佣金比例</div>
+          <div class="level-rate">{{ level.commissionRate }}%</div>
+          <div v-if="level.levelType === 'exclusive'" class="level-threshold exclusive-threshold">平台指定专属等级</div>
+          <div v-else class="level-threshold">累计推广 ≥ {{ amountToYuan(level.minAmount) }} 元</div>
+          <a-tag v-if="level.id === inviteInfo.currentLevel?.id" class="current-tag" color="blue">当前等级</a-tag>
+          <div v-else-if="level.id === inviteInfo.nextLevel?.id" class="next-gap">还差 {{ amountToYuan(inviteInfo.nextLevel.gapAmount) }}</div>
+        </div>
+      </div>
+      <div v-if="inviteInfo.nextLevel" class="next-level">距离下一等级「{{ inviteInfo.nextLevel.name }}」还差 {{ amountToYuan(inviteInfo.nextLevel.gapAmount) }} 元推广金额</div>
+      <div v-else class="next-level">已达到当前可自动升级的最高等级</div>
+    </a-modal>
+
+    <a-modal
+      v-model:open="agreementDialogOpen"
+      :title="agreementDialogNeedOpen ? '开通激励计划' : '推广协议'"
+      width="760px"
+      :mask-closable="!agreementDialogNeedOpen"
+      :keyboard="!agreementDialogNeedOpen"
+      :confirm-loading="agreementSubmitting"
+      @ok="handleAgreementOk"
+      @cancel="closeAgreementDialog"
+    >
+      <!-- eslint-disable-next-line vue/no-v-html -->
+      <div class="invite-agreement-content editor-content-view" v-html="agreementText"></div>
+      <div v-if="agreementDialogNeedOpen" class="invite-agreement-confirm">
+        <a-checkbox v-model:checked="agreementAgree">我已阅读并同意推广协议</a-checkbox>
+      </div>
+      <template #footer>
+        <a-button @click="closeAgreementDialog">{{ agreementDialogNeedOpen ? "暂不开通" : "关闭" }}</a-button>
+        <a-button v-if="agreementDialogNeedOpen" type="primary" :disabled="!agreementAgree" :loading="agreementSubmitting" @click="handleAgreementOk">同意并开通</a-button>
+      </template>
+    </a-modal>
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+import { computed, nextTick, onActivated, onMounted, reactive, ref } from "vue";
+import { FsIcon, useFs } from "@fast-crud/fast-crud";
+import { notification } from "ant-design-vue";
+import { useRouter } from "vue-router";
+import * as api from "./api";
+import createInviteesCrudOptions from "./crud-invitees";
+import createLogsCrudOptions from "./crud-logs";
+import { useSettingStore } from "/@/store/settings";
+import { util } from "/@/utils";
+
+defineOptions({ name: "InviteCommission" });
+
+const router = useRouter();
+const settingStore = useSettingStore();
+const enabled = ref(false);
+const activeTab = ref("invitees");
+const loaded = ref(false);
+const levelDialogOpen = ref(false);
+const agreementDialogOpen = ref(false);
+const agreementDialogNeedOpen = ref(false);
+const agreementAgree = ref(false);
+const agreementSubmitting = ref(false);
+const defaultAgreementContent = "<p>请遵守平台推广规则，不得通过虚假注册、刷单、恶意诱导等方式获取收益。平台有权对异常推广行为进行核查，并根据实际情况暂停结算或关闭激励计划资格。</p>";
+
+const inviteInfo = reactive<any>({
+  enabled: false,
+  inviteCode: "",
+  inviteLink: "",
+  agreementContent: "",
+  summary: { totalIncomeAmount: 0, monthIncomeAmount: 0, promotionAmount: 0, inviteeCount: 0 },
+  wallet: { availableAmount: 0 },
+  currentLevel: null,
+  nextLevel: null,
+  levelList: [],
+});
+
+const { crudBinding: inviteesCrudBinding, crudExpose: inviteesCrudExpose, crudRef: inviteesCrudRef } = useFs({ createCrudOptions: createInviteesCrudOptions });
+const { crudBinding: logsCrudBinding, crudExpose: logsCrudExpose, crudRef: logsCrudRef } = useFs({ createCrudOptions: createLogsCrudOptions });
+
+function amountToYuan(amount: number) {
+  return util.amount.toYuan(amount || 0);
+}
+
+function moneyText(amount: number) {
+  return `¥ ${amountToYuan(amount)}`;
+}
+
+const summaryCards = computed(() => [
+  {
+    key: "totalIncome",
+    title: "累计收益",
+    value: moneyText(inviteInfo.summary.totalIncomeAmount),
+    className: "income",
+  },
+  {
+    key: "monthIncome",
+    title: "本月收益",
+    value: moneyText(inviteInfo.summary.monthIncomeAmount),
+    className: "income",
+  },
+  {
+    key: "promotionAmount",
+    title: "累计推广金额",
+    value: moneyText(inviteInfo.summary.promotionAmount),
+    className: "promotion",
+  },
+  {
+    key: "inviteeCount",
+    title: "已推广人数",
+    value: `${inviteInfo.summary.inviteeCount || 0} 人`,
+    className: "people",
+  },
+]);
+
+const visibleLevels = computed(() => {
+  return (inviteInfo.levelList || []).filter((level: any) => !level.disabled);
+});
+
+const agreementText = computed(() => inviteInfo.agreementContent?.trim() || defaultAgreementContent);
+
+function levelIcon(level: any) {
+  return level?.icon || "ion:ribbon-outline";
+}
+
+function gotoWallet() {
+  router.push({ path: "/certd/wallet" });
+}
+
+function openAgreementDialog(needOpenPlan: boolean) {
+  agreementDialogNeedOpen.value = needOpenPlan;
+  agreementAgree.value = false;
+  agreementDialogOpen.value = true;
+}
+
+function closeAgreementDialog() {
+  agreementDialogOpen.value = false;
+}
+
+async function handleAgreementOk() {
+  if (!agreementDialogNeedOpen.value) {
+    closeAgreementDialog();
+    return;
+  }
+  if (!agreementAgree.value) {
+    notification.warning({ message: "请先勾选同意推广协议" });
+    return;
+  }
+  agreementSubmitting.value = true;
+  try {
+    await api.OpenInvitePlan();
+    notification.success({ message: "激励计划已开通" });
+    closeAgreementDialog();
+    await refreshInvitePage(false);
+  } finally {
+    agreementSubmitting.value = false;
+  }
+}
+
+async function loadMyInvite(autoOpenAgreement = false) {
+  const res: any = await api.GetMyInvite();
+  Object.assign(inviteInfo, res || {});
+  if (autoOpenAgreement && !inviteInfo.enabled) {
+    await nextTick();
+    openAgreementDialog(true);
+  }
+}
+
+async function refreshActiveList() {
+  if (!inviteInfo.enabled) {
+    return;
+  }
+  if (activeTab.value === "invitees") {
+    await inviteesCrudExpose.doRefresh();
+  } else if (activeTab.value === "logs") {
+    await logsCrudExpose.doRefresh();
+  }
+}
+
+async function handleTabChange() {
+  await nextTick();
+  await refreshActiveList();
+}
+
+async function refreshInvitePage(autoOpenAgreement = true) {
+  await settingStore.initOnce();
+  enabled.value = settingStore.isInviteCommissionEnabled;
+  loaded.value = true;
+  if (!enabled.value) {
+    return;
+  }
+  await loadMyInvite(autoOpenAgreement);
+  if (!inviteInfo.enabled) {
+    return;
+  }
+  await nextTick();
+  await refreshActiveList();
+}
+
+onMounted(async () => {
+  await refreshInvitePage(true);
+});
+
+onActivated(async () => {
+  if (!loaded.value) {
+    return;
+  }
+  await refreshInvitePage();
+});
+</script>
+
+<style lang="less">
+.page-invite {
+  display: flex;
+  min-height: 0;
+
+  .fs-page-content {
+    display: flex;
+    min-height: 0;
+  }
+
+  .invite-page-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+  }
+
+  .invite-page-subtitle {
+    margin-top: 4px;
+    color: hsl(var(--muted-foreground));
+    font-size: 13px;
+    font-weight: 400;
+  }
+
+  .invite-body {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    min-height: 0;
+    padding: 20px;
+    background: hsl(var(--background-deep));
+  }
+
+  .invite-disabled {
+    display: flex;
+    flex: 1;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .level-subtitle,
+  .level-modal-subtitle {
+    color: hsl(var(--muted-foreground));
+    font-size: 14px;
+  }
+
+  .invite-summary-grid {
+    display: grid;
+    gap: 16px;
+  }
+
+  .invite-summary-grid {
+    flex: none;
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+    margin-bottom: 18px;
+  }
+
+  .summary-card,
+  .invite-link-panel {
+    border: 1px solid rgba(148, 163, 184, 0.28);
+    border-radius: 8px;
+    background: linear-gradient(145deg, rgba(255, 255, 255, 0.94), rgba(248, 250, 252, 0.82)), hsl(var(--card));
+    box-shadow: 0 10px 28px rgba(15, 23, 42, 0.08);
+    transition:
+      transform 0.18s ease,
+      box-shadow 0.18s ease,
+      border-color 0.18s ease;
+  }
+
+  .summary-card:hover,
+  .invite-link-panel:hover {
+    border-color: rgba(52, 120, 246, 0.34);
+    box-shadow: 0 16px 38px rgba(15, 23, 42, 0.12);
+    transform: translateY(-2px);
+  }
+
+  .summary-card {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 16px;
+    min-height: 112px;
+    overflow: hidden;
+    padding: 22px;
+  }
+
+  .summary-card-main {
+    min-width: 0;
+  }
+
+  .summary-title {
+    margin-bottom: 10px;
+    color: hsl(var(--muted-foreground));
+    font-size: 15px;
+  }
+
+  .summary-value {
+    font-size: 30px;
+    font-weight: 700;
+    line-height: 36px;
+  }
+
+  .summary-value.income {
+    color: #c58a35;
+  }
+
+  .summary-value.people {
+    color: #3478f6;
+  }
+
+  .summary-value.promotion {
+    color: #16a085;
+  }
+
+  .summary-action-button {
+    flex: none;
+    min-width: 72px;
+  }
+
+  .withdraw-action {
+    display: flex;
+    align-items: flex-end;
+    flex: none;
+    flex-direction: column;
+    gap: 8px;
+  }
+
+  .withdraw-available {
+    color: hsl(var(--muted-foreground));
+    font-size: 12px;
+    line-height: 18px;
+    white-space: nowrap;
+  }
+
+  .invite-link-panel {
+    flex: none;
+    padding: 16px 18px;
+    margin-bottom: 18px;
+  }
+
+  .invite-info-row {
+    display: flex;
+    align-items: center;
+    min-height: 34px;
+    gap: 10px;
+  }
+
+  .invite-highlight-row {
+    min-height: 48px;
+    padding: 8px 12px;
+    border: 1px solid rgba(52, 120, 246, 0.16);
+    border-radius: 8px;
+    background: rgba(248, 250, 252, 0.72);
+    transition:
+      border-color 0.18s ease,
+      background-color 0.18s ease,
+      box-shadow 0.18s ease;
+  }
+
+  .invite-highlight-row:hover {
+    border-color: rgba(52, 120, 246, 0.34);
+    background: rgba(255, 255, 255, 0.92);
+    box-shadow: 0 8px 18px rgba(15, 23, 42, 0.06);
+  }
+
+  .level-highlight-row {
+    cursor: pointer;
+  }
+
+  .level-info-icon {
+    color: #8a5a16;
+    font-size: 20px;
+  }
+
+  .invite-info-row + .invite-info-row {
+    margin-top: 8px;
+  }
+
+  .info-icon {
+    display: inline-flex;
+    flex: none;
+    align-items: center;
+    justify-content: center;
+    width: 30px;
+    height: 30px;
+    border: 1px solid rgba(52, 120, 246, 0.14);
+    border-radius: 8px;
+    background: rgba(52, 120, 246, 0.08);
+    color: #3478f6;
+    font-size: 17px;
+  }
+
+  .info-label {
+    width: 72px;
+    flex: none;
+    color: hsl(var(--foreground));
+    font-size: 13px;
+    font-weight: 600;
+    text-align: left;
+    white-space: nowrap;
+  }
+
+  .info-content {
+    flex: 1;
+    min-width: 0;
+  }
+
+  .current-level-rate {
+    display: inline-flex;
+    align-items: center;
+    flex: none;
+    height: 26px;
+    margin-left: 6px;
+    overflow: hidden;
+    border: 1px solid rgba(197, 138, 53, 0.22);
+    border-radius: 6px;
+    background: rgba(197, 138, 53, 0.08);
+    color: #c58a35;
+    font-size: 13px;
+    font-weight: 700;
+  }
+
+  .current-level-rate-label {
+    height: 100%;
+    padding: 0 8px;
+    border-right: 1px solid rgba(197, 138, 53, 0.18);
+    background: rgba(197, 138, 53, 0.1);
+    color: #8a5a16;
+    font-weight: 500;
+    line-height: 24px;
+  }
+
+  .current-level-rate-value {
+    padding: 0 8px;
+    line-height: 24px;
+  }
+
+  .level-info-content {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    min-width: 0;
+    flex-wrap: wrap;
+  }
+
+  .level-name-text {
+    flex: none;
+    color: hsl(var(--foreground));
+    font-weight: 600;
+  }
+
+  .level-rate-desc {
+    min-width: 180px;
+    color: hsl(var(--muted-foreground));
+    font-size: 12px;
+    line-height: 20px;
+  }
+
+  .level-open-icon {
+    flex: none;
+    color: hsl(var(--muted-foreground));
+    font-size: 16px;
+    transition: transform 0.18s ease;
+  }
+
+  .level-highlight-row:hover .level-open-icon {
+    transform: translateX(2px);
+  }
+
+  .level-button {
+    display: inline-flex;
+    align-items: center;
+    height: 28px;
+    padding-left: 0;
+    gap: 4px;
+  }
+
+  .level-medal {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 22px;
+    height: 22px;
+    color: #8a5a16;
+    font-size: 20px;
+  }
+
+  .invite-tabs {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    min-height: 0;
+    padding: 0 12px 12px;
+    border: 1px solid rgba(148, 163, 184, 0.28);
+    border-radius: 8px;
+    background: rgba(255, 255, 255, 0.92);
+    box-shadow: 0 10px 28px rgba(15, 23, 42, 0.08);
+  }
+
+  .ant-tabs-content-holder,
+  .ant-tabs-content,
+  .ant-tabs-tabpane {
+    display: flex;
+    flex: 1;
+    min-height: 0;
+  }
+
+  .ant-tabs-tabpane {
+    flex-direction: column;
+  }
+
+  .invite-crud {
+    flex: 1;
+    min-height: 0;
+  }
+
+  .invite-tabs {
+    .fs-search {
+      display: none;
+    }
+  }
+}
+
+.invite-level-modal {
+  .level-card-grid {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+    gap: 16px;
+  }
+
+  .level-card {
+    position: relative;
+    min-height: 132px;
+    padding: 16px;
+    overflow: hidden;
+    border: 1px solid rgba(148, 163, 184, 0.28);
+    border-radius: 8px;
+    background: linear-gradient(145deg, rgba(255, 255, 255, 0.94), rgba(248, 250, 252, 0.8)), linear-gradient(135deg, rgba(197, 138, 53, 0.14), rgba(52, 120, 246, 0.12));
+    box-shadow: 0 8px 22px rgba(15, 23, 42, 0.08);
+    transition:
+      transform 0.18s ease,
+      box-shadow 0.18s ease,
+      border-color 0.2s,
+      background-color 0.2s;
+  }
+
+  .level-card:hover {
+    border-color: rgba(52, 120, 246, 0.38);
+    box-shadow: 0 14px 30px rgba(15, 23, 42, 0.12);
+    transform: translateY(-2px);
+  }
+
+  .level-card.active {
+    border-color: #3478f6;
+    background: linear-gradient(145deg, rgba(236, 244, 255, 0.92), rgba(248, 250, 252, 0.88)), hsl(var(--primary) / 10%);
+  }
+
+  .level-name {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 6px;
+    color: hsl(var(--foreground));
+    font-weight: 700;
+  }
+
+  .level-medal {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 22px;
+    height: 22px;
+    color: #8a5a16;
+    font-size: 20px;
+  }
+
+  .level-rate-label {
+    margin-top: 12px;
+    color: hsl(var(--muted-foreground));
+    font-size: 12px;
+    text-align: center;
+  }
+
+  .level-rate {
+    margin-top: 2px;
+    color: #c58a35;
+    font-size: 24px;
+    font-weight: 700;
+    line-height: 30px;
+    text-align: center;
+  }
+
+  .level-threshold,
+  .next-gap {
+    margin-top: 6px;
+    color: hsl(var(--muted-foreground));
+    font-size: 12px;
+    text-align: center;
+  }
+
+  .exclusive-threshold {
+    color: #8a5a16;
+  }
+
+  .current-tag {
+    display: table;
+    margin: 10px auto 0;
+  }
+
+  .next-gap {
+    color: #3478f6;
+  }
+}
+
+.modal-level-grid {
+  margin-top: 12px;
+}
+
+.level-progress-box {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 16px;
+  padding: 12px 14px;
+  border: 1px solid rgba(52, 120, 246, 0.16);
+  border-radius: 8px;
+  background: rgba(248, 250, 252, 0.86);
+}
+
+.level-progress-label {
+  color: hsl(var(--muted-foreground));
+  font-size: 12px;
+}
+
+.level-progress-value {
+  margin-top: 2px;
+  color: #16a085;
+  font-size: 22px;
+  font-weight: 700;
+  line-height: 28px;
+}
+
+.level-progress-desc {
+  color: #3478f6;
+  font-size: 13px;
+  text-align: right;
+}
+
+.invite-agreement-content {
+  max-height: 360px;
+  padding: 12px;
+  overflow: auto;
+  border: 1px solid #eee;
+  border-radius: 6px;
+  background: hsl(var(--card));
+  line-height: 1.7;
+
+  :deep(img) {
+    max-width: 100%;
+    height: auto;
+  }
+
+  :deep(p) {
+    margin-bottom: 10px;
+  }
+}
+
+.invite-agreement-confirm {
+  margin-top: 14px;
+  padding: 10px 12px;
+  border: 1px solid #e6f4ff;
+  border-radius: 6px;
+  background: #f5fbff;
+}
+
+.level-modal-subtitle {
+  margin-bottom: 12px;
+}
+
+.next-level {
+  margin-top: 16px;
+  color: #3478f6;
+}
+
+@media (max-width: 900px) {
+  .page-invite {
+    .invite-summary-grid,
+    .level-card-grid {
+      grid-template-columns: 1fr;
+    }
+
+    .invite-info-row {
+      align-items: stretch;
+      flex-direction: column;
+    }
+
+    .info-label {
+      width: auto;
+      text-align: left;
+    }
+  }
+
+  .invite-level-modal {
+    .level-card-grid {
+      grid-template-columns: 1fr;
+    }
+
+    .level-progress-box {
+      align-items: flex-start;
+      flex-direction: column;
+    }
+
+    .level-progress-desc {
+      text-align: left;
+    }
+  }
+}
+</style>

packages/ui/certd-client/src/views/certd/mine/user-profile.vue

@@ -455,8 +455,8 @@ onMounted(async () => {
 
     .card-header {
       .header-bg-gradient {
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        opacity: 0.15;
+        background: rgba(255, 255, 255, 0.04);
+        opacity: 1;
       }
     }
 
@@ -572,8 +572,9 @@ onMounted(async () => {
   .bindings-card,
   .passkey-card {
     background: #fff;
-    box-shadow: 0 4px 20px rgba(0, 0, 0, 0.08);
     overflow: hidden;
+    border: 1px solid rgba(148, 163, 184, 0.22);
+    box-shadow: 0 8px 24px rgba(15, 23, 42, 0.06);
     transition: all 0.3s ease;
     margin: 5px;
   }
@@ -586,13 +587,15 @@ onMounted(async () => {
   .profile-card:hover,
   .bindings-card:hover,
   .passkey-card:hover {
-    box-shadow: 0 8px 30px rgba(0, 0, 0, 0.12);
+    border-color: rgba(148, 163, 184, 0.34);
+    box-shadow: 0 12px 30px rgba(15, 23, 42, 0.1);
     transform: translateY(-2px);
   }
 
   .card-header {
     position: relative;
     padding: 40px 30px;
+    background: linear-gradient(145deg, rgba(255, 255, 255, 0.96), rgba(248, 250, 252, 0.9)), hsl(var(--card));
   }
 
   .header-bg-gradient {
@@ -601,8 +604,8 @@ onMounted(async () => {
     left: 0;
     right: 0;
     height: 100%;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    opacity: 0.08;
+    background: radial-gradient(circle at 14% 22%, rgba(52, 120, 246, 0.08), transparent 34%), radial-gradient(circle at 86% 18%, rgba(197, 138, 53, 0.08), transparent 32%);
+    opacity: 1;
   }
 
   .header-content {
@@ -631,14 +634,14 @@ onMounted(async () => {
     padding: 0;
     color: #667eea;
     background: #ffffff;
-    border: 1px solid #e5e7eb;
+    border: 1px solid rgba(148, 163, 184, 0.34);
     border-radius: 50%;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.12);
+    box-shadow: 0 4px 12px rgba(15, 23, 42, 0.12);
   }
 
   .user-avatar {
     border: 4px solid #ffffff;
-    box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1);
+    box-shadow: 0 8px 22px rgba(15, 23, 42, 0.12);
   }
 
   .status-indicator {
@@ -678,7 +681,9 @@ onMounted(async () => {
     align-items: center;
     gap: 6px;
     padding: 6px 12px;
-    border-radius: 20px;
+    border: 1px solid rgba(148, 163, 184, 0.22);
+    border-radius: 8px;
+    background: rgba(255, 255, 255, 0.72);
     font-size: 13px;
   }
 

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue

@@ -213,6 +213,10 @@ function useStepForm() {
   const stepOpen = (step: any, emit: any) => {
     callback.value = emit;
     currentStep.value = merge({ input: {}, strategy: {} }, step);
+    // 旧版证书申请任务没有 version 字段，编辑时补成 1，保持旧任务继续走兼容逻辑。
+    if (mode.value === "edit" && currentStep.value.type === "CertApply" && currentStep.value.input?.version == null) {
+      currentStep.value.input.version = 1;
+    }
     if (step.type) {
       changeCurrentPlugin(currentStep.value);
     }

packages/ui/certd-client/src/views/certd/suite/api.ts

@@ -46,6 +46,7 @@ export type TradeCreateReq = {
   duration: number;
   num: number;
   payType: string;
+  useRebateBalance?: boolean;
 };
 
 export async function TradeCreate(form: TradeCreateReq) {

packages/ui/certd-client/src/views/certd/suite/buy.vue

@@ -125,7 +125,7 @@ loadSuiteIntro();
 
     .suite-card-col {
       width: 20% !important;
-      min-width: 360px !important;
+      min-width: 354px !important;
     }
   }
 }

packages/ui/certd-client/src/views/certd/suite/order-modal.vue

@@ -4,20 +4,33 @@
       <div class="flex-o mt-5">
         <span class="label">{{ $t("certd.order.package") }}：</span>{{ product.title }}
       </div>
-      <div class="flex-o mt-5">
+      <div v-if="product.intro" class="flex-o mt-5">
         <span class="label">{{ $t("certd.order.description") }}：</span>{{ product.intro }}
       </div>
-      <div class="flex-o mt-5">
+      <div class="order-spec-row mt-5">
         <span class="label">{{ $t("certd.order.specifications") }}：</span>
-        <span class="flex-o flex-wrap">
-          <span class="flex-o"> {{ $t("certd.order.pipeline") }}<suite-value class="ml-5" :model-value="product.content.maxPipelineCount" :unit="$t('certd.order.unit.pieces')" />； </span>
-          <span class="flex-o"> {{ $t("certd.order.totalDomain") }}<suite-value class="ml-5" :model-value="product.content.maxDomainCount" :unit="$t('certd.order.unit.count')" />； </span>
-          <span class="flex-o" style="padding-left: 2em">
-            - {{ $t("certd.order.includedWildcardDomain") }}<suite-value class="ml-5" :model-value="product.content.maxWildcardDomainCount" :unit="$t('certd.order.unit.count')" />；
-          </span>
-          <span class="flex-o"> {{ $t("certd.order.deployTimes") }}<suite-value class="ml-5" :model-value="product.content.maxDeployCount" :unit="$t('certd.order.unit.times')" />； </span>
-          <span class="flex-o"> {{ $t("certd.order.monitorCount") }}<suite-value class="ml-5" :model-value="product.content.maxMonitorCount" :unit="$t('certd.order.unit.times')" />； </span>
-        </span>
+        <div class="spec-grid">
+          <div class="spec-item">
+            <div class="spec-name">{{ $t("certd.order.totalDomain") }}</div>
+            <suite-value :model-value="product.content.maxDomainCount" :unit="$t('certd.order.unit.count')" />
+          </div>
+          <div class="spec-item">
+            <div class="spec-name">{{ $t("certd.order.includedWildcardDomain") }}</div>
+            <suite-value :model-value="product.content.maxWildcardDomainCount" :unit="$t('certd.order.unit.count')" />
+          </div>
+          <div class="spec-item">
+            <div class="spec-name">{{ $t("certd.order.pipeline") }}</div>
+            <suite-value :model-value="product.content.maxPipelineCount" :unit="$t('certd.order.unit.pieces')" />
+          </div>
+          <div class="spec-item">
+            <div class="spec-name">{{ $t("certd.order.deployTimes") }}</div>
+            <suite-value :model-value="product.content.maxDeployCount" :unit="$t('certd.order.unit.times')" />
+          </div>
+          <div class="spec-item">
+            <div class="spec-name">{{ $t("certd.order.monitorCount") }}</div>
+            <suite-value :model-value="product.content.maxMonitorCount" :unit="$t('certd.order.unit.times')" />
+          </div>
+        </div>
       </div>
 
       <div class="flex-o mt-5">
@@ -26,12 +39,21 @@
       </div>
       <div class="flex-o mt-5">
         <span class="label">{{ $t("certd.order.price") }}：</span>
-        <price-input :edit="false" :model-value="durationSelected.price"></price-input>
+        <price-input :edit="false" :model-value="durationSelected.price" zero-text="0元"></price-input>
+      </div>
+      <div v-if="durationSelected.price > 0 && wallet.availableAmount > 0" class="flex-o mt-5">
+        <span class="label">余额抵扣：</span>
+        <a-switch v-model:checked="formRef.useRebateBalance" />
+        <span class="ml-10">可用 {{ amountToYuan(wallet.availableAmount) }} 元，预计抵扣 {{ amountToYuan(expectedRebateAmount) }} 元</span>
+      </div>
+      <div v-if="durationSelected.price > 0 && formRef.useRebateBalance" class="flex-o mt-5">
+        <span class="label">还需支付：</span>
+        <span class="color-red">{{ amountToYuan(expectedThirdPartyAmount) }} 元</span>
       </div>
 
       <div class="flex-o mt-5">
         <span class="label">{{ $t("certd.order.paymentMethod") }}：</span>
-        <div v-if="durationSelected.price === 0">{{ $t("certd.order.free") }}</div>
+        <div v-if="durationSelected.price === 0 || expectedThirdPartyAmount === 0">{{ $t("certd.order.free") }}</div>
         <fs-dict-select v-else v-model:value="formRef.payType" :dict="paymentsDictRef" style="width: 200px"> </fs-dict-select>
       </div>
     </div>
@@ -39,7 +61,7 @@
 </template>
 
 <script setup lang="tsx">
-import { ref } from "vue";
+import { computed, ref } from "vue";
 import { GetPaymentTypes, OrderModalOpenReq, TradeCreate } from "/@/views/certd/suite/api";
 import SuiteValue from "/@/views/sys/suite/product/suite-value.vue";
 import PriceInput from "/@/views/sys/suite/product/price-input.vue";
@@ -49,11 +71,14 @@ import DurationValue from "/@/views/sys/suite/product/duration-value.vue";
 import { useRouter } from "vue-router";
 import qrcode from "qrcode";
 import * as api from "/@/views/certd/suite/api";
+import { GetWalletSummary } from "/@/views/certd/wallet/api";
+import { util } from "/@/utils";
 const openRef = ref(false);
 
 const product = ref<any>(null);
 const formRef = ref<any>({});
 const durationSelected = ref<any>(null);
+const wallet = ref<any>({ availableAmount: 0 });
 async function open(opts: OrderModalOpenReq) {
   openRef.value = true;
 
@@ -63,6 +88,12 @@ async function open(opts: OrderModalOpenReq) {
   formRef.value.productId = opts.product.id;
   formRef.value.duration = opts.duration;
   formRef.value.num = opts.num ?? 1;
+  formRef.value.useRebateBalance = false;
+  try {
+    wallet.value = await GetWalletSummary();
+  } catch (e) {
+    wallet.value = { availableAmount: 0 };
+  }
 }
 const paymentsDictRef = dict({
   async getData() {
@@ -77,6 +108,21 @@ const paymentsDictRef = dict({
 
 const router = useRouter();
 
+const expectedRebateAmount = computed(() => {
+  if (!formRef.value.useRebateBalance) {
+    return 0;
+  }
+  return Math.min(wallet.value.availableAmount || 0, durationSelected.value?.price || 0);
+});
+
+const expectedThirdPartyAmount = computed(() => {
+  return Math.max(0, (durationSelected.value?.price || 0) - expectedRebateAmount.value);
+});
+
+function amountToYuan(amount: number) {
+  return util.amount.toYuan(amount || 0);
+}
+
 async function orderCreate() {
   if (durationSelected.value.price === 0) {
     //如果是0，直接请求创建订单
@@ -93,7 +139,7 @@ async function orderCreate() {
     return;
   }
 
-  if (!formRef.value.payType) {
+  if (expectedThirdPartyAmount.value > 0 && !formRef.value.payType) {
     notification.error({
       message: "请选择支付方式",
     });
@@ -104,8 +150,17 @@ async function orderCreate() {
     duration: formRef.value.duration,
     num: formRef.value.num ?? 1,
     payType: formRef.value.payType,
+    useRebateBalance: formRef.value.useRebateBalance,
   });
 
+  if (paymentReq.paid) {
+    notification.success({
+      message: "套餐购买成功",
+    });
+    openRef.value = false;
+    return;
+  }
+
   async function onPaid() {
     openRef.value = false;
     router.push({
@@ -218,6 +273,10 @@ defineExpose({
 </script>
 <style lang="less">
 .order-box {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+
   .label {
     width: 80px;
     text-align: right;
@@ -225,6 +284,37 @@ defineExpose({
     color: #686868;
     flex: none;
   }
+
+  .order-spec-row {
+    display: flex;
+    align-items: flex-start;
+  }
+
+  .spec-grid {
+    display: grid;
+    flex: 1;
+    min-width: 0;
+    grid-template-columns: repeat(3, minmax(0, 1fr));
+    gap: 8px;
+  }
+
+  .spec-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    min-height: 42px;
+    padding: 8px 10px;
+    gap: 8px;
+    border: 1px solid rgba(52, 120, 246, 0.12);
+    border-radius: 8px;
+    background: rgba(248, 250, 252, 0.86);
+  }
+
+  .spec-name {
+    color: hsl(var(--foreground));
+    font-size: 13px;
+    line-height: 20px;
+  }
 }
 
 .modal-confirm-center {

packages/ui/certd-client/src/views/certd/suite/product-info.vue

@@ -39,7 +39,8 @@
       <div class="flex-o duration-label">时长</div>
       <div class="duration-list">
         <div v-for="dp of product.durationPrices" :key="dp.duration" class="duration-item" :class="{ active: selected.duration === dp.duration }" @click="selected = dp">
-          {{ durationDict.dataMap[dp.duration]?.label }}
+          <span class="duration-text">{{ durationDict.dataMap[dp.duration]?.label }}</span>
+          <span v-if="discountText(dp)" class="duration-discount">{{ discountText(dp) }}</span>
         </div>
       </div>
     </div>
@@ -47,8 +48,8 @@
     <div class="price flex-between mt-5">
       <div class="flex-o">价格</div>
       <div class="flex-o price-text">
-        <price-input style="color: red" :font-size="20" :model-value="selected?.price" :edit="false" />
-        <span class="ml-5" style="font-size: 12px"> / {{ durationDict.dataMap[selected.duration]?.label }}</span>
+        <price-input style="color: red" :font-size="20" :model-value="selected?.price" :edit="false" zero-text="免费" />
+        <span class="price-unit">/ {{ durationDict.dataMap[selected.duration]?.label }}</span>
       </div>
     </div>
 
@@ -61,7 +62,7 @@
 import { durationDict } from "/@/views/certd/suite/api";
 import SuiteValue from "/@/views/sys/suite/product/suite-value.vue";
 import PriceInput from "/@/views/sys/suite/product/price-input.vue";
-import { ref } from "vue";
+import { computed, ref } from "vue";
 import { dict, FsIcon } from "@fast-crud/fast-crud";
 
 const props = defineProps<{
@@ -69,6 +70,20 @@ const props = defineProps<{
 }>();
 const selected = ref(props.product.durationPrices[0]);
 
+const originalUnitPrice = computed(() => {
+  const unitPrices = (props.product.durationPrices || [])
+    .map((item: any) => {
+      const duration = Number(item.duration);
+      const price = Number(item.price);
+      if (!duration || duration <= 0 || price <= 0) {
+        return null;
+      }
+      return price / duration;
+    })
+    .filter((item: number | null): item is number => item != null);
+  return Math.max(...unitPrices, 0);
+});
+
 const productTypeDictRef = dict({
   data: [
     { value: "suite", label: "套餐", color: "green" },
@@ -77,6 +92,20 @@ const productTypeDictRef = dict({
 });
 
 const emit = defineEmits(["order"]);
+function discountText(durationPrice: any) {
+  const duration = Number(durationPrice.duration);
+  const price = Number(durationPrice.price);
+  if (!duration || duration <= 0 || price <= 0 || originalUnitPrice.value <= 0) {
+    return "";
+  }
+  const currentUnitPrice = price / duration;
+  const discount = Math.round((currentUnitPrice / originalUnitPrice.value) * 100) / 10;
+  if (discount >= 10) {
+    return "";
+  }
+  return `${discount}折`;
+}
+
 async function doOrder() {
   emit("order", { product: props.product, productId: props.product.id, duration: selected.value.duration, price: selected.value.price });
 }
@@ -108,13 +137,21 @@ async function doOrder() {
   .duration-list {
     display: flex;
     flex-wrap: wrap;
+    justify-content: flex-end;
+    gap: 4px;
     .duration-item {
-      width: 45px;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      position: relative;
+      min-width: 56px;
+      height: 32px;
       border: 1px solid #cdcdcd;
+      border-radius: 4px;
       text-align: center;
-      padding: 2px;
-      margin: 2px;
+      padding: 3px 6px;
       cursor: pointer;
+      line-height: 16px;
 
       &:hover {
         border-color: #1890ff;
@@ -124,6 +161,44 @@ async function doOrder() {
         background-color: #c1eafb;
       }
     }
+
+    .duration-text {
+      display: block;
+      line-height: 20px;
+      white-space: nowrap;
+    }
+
+    .duration-discount {
+      position: absolute;
+      top: -9px;
+      right: -7px;
+      height: 16px;
+      padding: 0 4px;
+      border-radius: 8px 8px 8px 2px;
+      background: #ff4d4f;
+      color: #f5222d;
+      color: #fff;
+      font-size: 11px;
+      font-weight: 600;
+      line-height: 16px;
+      white-space: nowrap;
+      box-shadow: 0 2px 6px rgba(245, 34, 45, 0.24);
+    }
+  }
+
+  .price-text {
+    flex: none;
+    align-items: baseline;
+    justify-content: flex-end;
+    white-space: nowrap;
+  }
+
+  .price-unit {
+    flex: none;
+    margin-left: 5px;
+    color: hsl(var(--muted-foreground));
+    font-size: 12px;
+    white-space: nowrap;
   }
 }
 </style>

packages/ui/certd-client/src/views/certd/trade/api.ts

@@ -26,11 +26,11 @@ export async function UpdateObj(obj: any) {
   });
 }
 
-export async function DelObj(id: any) {
+export async function CancelObj(id: any) {
   return await request({
-    url: apiPrefix + "/delete",
+    url: apiPrefix + "/cancel",
     method: "post",
-    params: { id },
+    data: { id },
   });
 }
 
@@ -50,14 +50,6 @@ export async function GetDetail(id: any) {
   });
 }
 
-export async function DeleteBatch(ids: any[]) {
-  return await request({
-    url: apiPrefix + "/deleteByIds",
-    method: "post",
-    data: { ids },
-  });
-}
-
 export async function SyncStatus(id: any) {
   return await request({
     url: apiPrefix + "/syncStatus",

packages/ui/certd-client/src/views/certd/trade/crud.tsx

@@ -1,18 +1,10 @@
 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 { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { Modal } from "ant-design-vue";
 import PriceInput from "/@/views/sys/suite/product/price-input.vue";
-import SuiteValue from "/@/views/sys/suite/product/suite-value.vue";
 import DurationValue from "/@/views/sys/suite/product/duration-value.vue";
 
-export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
-  const router = useRouter();
-  const { t } = useI18n();
+export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
     return await api.GetList(query);
   };
@@ -21,56 +13,35 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
     const res = await api.UpdateObj(form);
     return res;
   };
-  const delRequest = async ({ row }: DelReq) => {
-    return await api.DelObj(row.id);
-  };
-
   const addRequest = async ({ form }: AddReq) => {
     const res = await api.AddObj(form);
     return res;
   };
 
-  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,
         addRequest,
         editRequest,
-        delRequest,
       },
       rowHandle: {
-        width: 240,
+        width: 120,
         fixed: "right",
         buttons: {
           view: { show: false },
           edit: { show: false },
           copy: { show: false },
+          remove: { show: false },
           syncStatus: {
+            order: 10,
             show: compute(({ row }) => {
               return row.status === "wait_pay";
             }),
-            text: "同步订单状态",
+            title: "同步订单状态",
+            text: null,
+            tooltip: { title: "同步订单状态" },
+            icon: "ant-design:sync-outlined",
             type: "link",
             click: async ({ row }) => {
               Modal.confirm({
@@ -83,6 +54,30 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
               });
             },
           },
+          cancel: {
+            order: 99,
+            show: compute(({ row }) => {
+              return row.status === "wait_pay";
+            }),
+            title: "取消订单",
+            text: null,
+            tooltip: { title: "取消订单" },
+            icon: "ion:close-circle-outline",
+            type: "link",
+            danger: true,
+            click: async ({ row }) => {
+              Modal.confirm({
+                title: "确认取消订单？",
+                content: "取消后订单会关闭，已冻结的余额抵扣金额将自动退回。",
+                okText: "确认取消",
+                cancelText: "再想想",
+                onOk: async () => {
+                  await api.CancelObj(row.id);
+                  await crudExpose.doRefresh();
+                },
+              });
+            },
+          },
         },
       },
       actionbar: {
@@ -151,6 +146,30 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             },
           },
         },
+        rebateAmount: {
+          title: "余额抵扣",
+          type: "number",
+          column: {
+            width: 110,
+            component: {
+              name: PriceInput,
+              vModel: "modelValue",
+              edit: false,
+            },
+          },
+        },
+        thirdPartyPayAmount: {
+          title: "实付金额",
+          type: "number",
+          column: {
+            width: 110,
+            component: {
+              name: PriceInput,
+              vModel: "modelValue",
+              edit: false,
+            },
+          },
+        },
         status: {
           title: "状态",
           search: { show: true },
@@ -177,6 +196,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
               { label: "支付宝", value: "alipay" },
               { label: "微信", value: "wxpay" },
               { label: "免费", value: "free" },
+              { label: "余额抵扣", value: "rebate" },
             ],
           }),
           column: {

packages/ui/certd-client/src/views/certd/trade/index.vue

@@ -3,13 +3,7 @@
     <template #header>
       <div class="title">我的订单</div>
     </template>
-    <fs-crud ref="crudRef" v-bind="crudBinding">
-      <template #pagination-left>
-        <a-tooltip title="批量删除">
-          <fs-button icon="DeleteOutlined" @click="handleBatchDelete"></fs-button>
-        </a-tooltip>
-      </template>
-    </fs-crud>
+    <fs-crud ref="crudRef" v-bind="crudBinding" />
   </fs-page>
 </template>
 
@@ -17,31 +11,11 @@
 import { onActivated, onMounted } from "vue";
 import { useFs } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
-import { message, Modal } from "ant-design-vue";
-import { DeleteBatch } from "./api";
 
 defineOptions({
   name: "MyTrade",
 });
-const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
-
-const selectedRowKeys = context.selectedRowKeys;
-const handleBatchDelete = () => {
-  if (selectedRowKeys.value?.length > 0) {
-    Modal.confirm({
-      title: "确认",
-      content: `确定要批量删除这${selectedRowKeys.value.length}条记录吗`,
-      async onOk() {
-        await DeleteBatch(selectedRowKeys.value);
-        message.info("删除成功");
-        crudExpose.doRefresh();
-        selectedRowKeys.value = [];
-      },
-    });
-  } else {
-    message.error("请先勾选记录");
-  }
-};
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions });
 
 // 页面打开后获取列表数据
 onMounted(() => {

packages/ui/certd-client/src/views/certd/wallet/api.ts

@@ -0,0 +1,29 @@
+import { request } from "/@/api/service";
+
+export async function GetWalletSummary() {
+  return await request({ url: "/wallet/summary", method: "post" });
+}
+
+export async function GetWithdrawSetting() {
+  return await request({ url: "/wallet/withdraw/setting/get", method: "post" });
+}
+
+export async function GetWalletSetting() {
+  return await request({ url: "/wallet/settings/get", method: "post" });
+}
+
+export async function SaveWithdrawSetting(data: any) {
+  return await request({ url: "/wallet/withdraw/setting/save", method: "post", data });
+}
+
+export async function ApplyWithdraw(amount: number) {
+  return await request({ url: "/wallet/withdraw/apply", method: "post", data: { amount } });
+}
+
+export async function GetWithdraws(query: any) {
+  return await request({ url: "/wallet/withdraw/page", method: "post", data: query });
+}
+
+export async function GetWalletLogs(query: any) {
+  return await request({ url: "/wallet/log/page", method: "post", data: query });
+}

packages/ui/certd-client/src/views/certd/wallet/crud-logs.tsx

@@ -0,0 +1,71 @@
+import { CreateCrudOptionsRet, dict, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import * as api from "./api";
+import { util } from "/@/utils";
+
+function moneyText(amount: number) {
+  const yuan = util.amount.toYuan(Math.abs(amount || 0));
+  if (amount < 0) {
+    return `-¥${yuan}`;
+  }
+  return `¥${yuan}`;
+}
+
+export default function (): CreateCrudOptionsRet {
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetWalletLogs(query);
+  };
+
+  return {
+    crudOptions: {
+      request: { pageRequest },
+      search: { show: false },
+      actionbar: { show: false },
+      toolbar: { show: false },
+      rowHandle: { show: false },
+      columns: {
+        createTime: { title: "时间", type: "datetime", column: { width: 180 } },
+        type: {
+          title: "类型",
+          type: "dict-select",
+          dict: dict({
+            data: [
+              { label: "收益入账", value: "income", color: "success" },
+              { label: "余额抵扣", value: "consume", color: "default" },
+              { label: "提现冻结", value: "withdraw_freeze", color: "warning" },
+              { label: "提现成功", value: "withdraw", color: "success" },
+              { label: "提现成功", value: "withdraw_success", color: "success" },
+              { label: "提现退回", value: "withdraw_reject", color: "processing" },
+            ],
+          }),
+          column: { width: 120 },
+        },
+        amount: {
+          title: "变动金额",
+          type: "number",
+          column: {
+            width: 120,
+            cellRender({ value }) {
+              const amount = Number(value || 0);
+              return <span class={amount < 0 ? "text-green-500" : "text-red-500"}>{moneyText(amount)}</span>;
+            },
+          },
+        },
+        balanceAfter: {
+          title: "变动后余额",
+          type: "number",
+          column: {
+            width: 130,
+            cellRender({ value }) {
+              return <span class="text-red-500">{moneyText(Number(value || 0))}</span>;
+            },
+          },
+        },
+        remark: {
+          title: "备注",
+          type: "text",
+          column: { minWidth: 220 },
+        },
+      },
+    },
+  };
+}

packages/ui/certd-client/src/views/certd/wallet/crud-withdraw.tsx

@@ -0,0 +1,54 @@
+import { CreateCrudOptionsRet, dict, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import * as api from "./api";
+import PriceInput from "/@/views/sys/suite/product/price-input.vue";
+
+export default function (): CreateCrudOptionsRet {
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetWithdraws(query);
+  };
+
+  return {
+    crudOptions: {
+      request: { pageRequest },
+      search: { show: false },
+      actionbar: { show: false },
+      toolbar: { show: false },
+      rowHandle: { show: false },
+      columns: {
+        createTime: { title: "申请时间", type: "datetime", column: { width: 180 } },
+        amount: {
+          title: "金额",
+          type: "number",
+          column: {
+            width: 120,
+            component: { name: PriceInput, vModel: "modelValue", edit: false },
+          },
+        },
+        status: {
+          title: "状态",
+          type: "dict-select",
+          dict: dict({
+            data: [
+              { label: "待审核", value: "pending", color: "warning" },
+              { label: "已通过", value: "approved", color: "success" },
+              { label: "已拒绝", value: "rejected", color: "error" },
+            ],
+          }),
+          column: { width: 110 },
+        },
+        channel: {
+          title: "提现渠道",
+          type: "dict-select",
+          dict: dict({
+            data: [
+              { label: "支付宝", value: "alipay" },
+              { label: "银行卡", value: "bank" },
+            ],
+          }),
+          column: { width: 110 },
+        },
+        auditRemark: { title: "审核备注", type: "text", column: { minWidth: 180 } },
+      },
+    },
+  };
+}

packages/ui/certd-client/src/views/certd/wallet/index.vue

@@ -0,0 +1,421 @@
+<template>
+  <fs-page class="page-wallet">
+    <template #header>
+      <div class="title">我的钱包</div>
+    </template>
+    <div class="wallet-body">
+      <div class="wallet-summary-grid">
+        <div v-for="item in summaryCards" :key="item.key" class="summary-card">
+          <div class="summary-card-main">
+            <div class="summary-title">{{ item.title }}</div>
+            <div class="summary-value" :class="item.className">{{ item.value }}</div>
+          </div>
+          <a-button v-if="item.key === 'availableAmount'" class="summary-action-button" type="primary" @click="openWithdrawDialog">申请提现</a-button>
+        </div>
+      </div>
+
+      <a-tabs v-model:active-key="activeTab" class="wallet-tabs" @change="refreshActiveList">
+        <a-tab-pane key="withdraw" tab="提现记录">
+          <fs-crud v-if="activeTab === 'withdraw'" ref="withdrawCrudRef" class="wallet-crud" v-bind="withdrawCrudBinding" />
+        </a-tab-pane>
+        <a-tab-pane key="logs" tab="余额明细">
+          <fs-crud v-if="activeTab === 'logs'" ref="logsCrudRef" class="wallet-crud" v-bind="logsCrudBinding" />
+        </a-tab-pane>
+      </a-tabs>
+    </div>
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+import { computed, h, onActivated, onMounted, reactive, ref } from "vue";
+import { compute, dict, useFs } from "@fast-crud/fast-crud";
+import { Button, notification } from "ant-design-vue";
+import * as api from "./api";
+import createLogsCrudOptions from "./crud-logs";
+import createWithdrawCrudOptions from "./crud-withdraw";
+import { util } from "/@/utils";
+import { useFormDialog } from "/@/use/use-dialog";
+import { useUserStore } from "/@/store/user";
+
+defineOptions({ name: "MyWallet" });
+
+const summary = reactive<any>({ availableAmount: 0, frozenAmount: 0, totalIncomeAmount: 0, totalWithdrawAmount: 0 });
+const loaded = ref(false);
+const activeTab = ref("withdraw");
+const { openFormDialog } = useFormDialog();
+const userStore = useUserStore();
+const { crudBinding: withdrawCrudBinding, crudExpose: withdrawCrudExpose, crudRef: withdrawCrudRef } = useFs({ createCrudOptions: createWithdrawCrudOptions });
+const { crudBinding: logsCrudBinding, crudExpose: logsCrudExpose, crudRef: logsCrudRef } = useFs({ createCrudOptions: createLogsCrudOptions });
+
+function amountToYuan(amount: number) {
+  return util.amount.toYuan(amount || 0);
+}
+
+function moneyText(amount: number) {
+  return `¥ ${amountToYuan(amount)}`;
+}
+
+function buildPrivateFileUrl(key: string) {
+  return `/api/basic/file/download?token=${userStore.getToken}&key=${encodeURIComponent(key)}`;
+}
+
+const summaryCards = computed(() => [
+  {
+    key: "availableAmount",
+    title: "可用余额",
+    value: moneyText(summary.availableAmount),
+    className: "available",
+  },
+  {
+    key: "frozenAmount",
+    title: "冻结余额",
+    value: moneyText(summary.frozenAmount),
+    className: "frozen",
+  },
+  {
+    key: "totalIncomeAmount",
+    title: "累计收入",
+    value: moneyText(summary.totalIncomeAmount),
+    className: "income",
+  },
+  {
+    key: "totalWithdrawAmount",
+    title: "累计提现",
+    value: moneyText(summary.totalWithdrawAmount),
+    className: "withdraw",
+  },
+]);
+
+async function loadWalletSummary() {
+  const res: any = await api.GetWalletSummary();
+  Object.assign(summary, res || {});
+}
+
+async function openWithdrawSetting() {
+  const [setting, walletSetting]: any[] = await Promise.all([api.GetWithdrawSetting(), api.GetWalletSetting()]);
+  const enabledChannels = walletSetting?.withdrawChannels?.length ? walletSetting.withdrawChannels : ["alipay", "bank"];
+  const enabledBanks = walletSetting?.withdrawBanks?.length ? walletSetting.withdrawBanks : [];
+  const channelOptions = [
+    { label: "支付宝", value: "alipay" },
+    { label: "银行卡", value: "bank" },
+  ].filter(item => enabledChannels.includes(item.value));
+  const bankOptions = enabledBanks.map((item: string) => ({ label: item, value: item }));
+  const initialForm = Object.assign({ channel: "alipay", realName: "", account: "", bankName: "" }, setting || {});
+  if (!enabledChannels.includes(initialForm.channel)) {
+    initialForm.channel = enabledChannels[0] || "alipay";
+  }
+  await openFormDialog({
+    title: "提现设置",
+    wrapper: {
+      width: 560,
+    },
+    initialForm,
+    columns: {
+      channel: {
+        title: "提现渠道",
+        type: "dict-radio",
+        dict: dict({
+          data: channelOptions,
+        }),
+        form: {
+          col: { span: 24 },
+          rules: [{ required: true, message: "请选择提现渠道" }],
+        },
+      },
+      realName: {
+        title: "真实姓名",
+        type: "text",
+        form: {
+          col: { span: 24 },
+          rules: [{ required: true, message: "请输入真实姓名" }],
+        },
+      },
+      account: {
+        title: "收款账号",
+        type: "text",
+        form: {
+          col: { span: 24 },
+          rules: [{ required: true, message: "请输入收款账号" }],
+        },
+      },
+      qrCode: {
+        title: "收款二维码",
+        type: "avatar-uploader",
+        form: {
+          col: { span: 24 },
+          helper: "上传支付宝收款二维码图片",
+          show: compute(({ form }) => form.channel !== "bank"),
+          component: {
+            valueType: "key",
+            uploader: {
+              type: "form",
+              action: "/basic/file/upload?token=" + userStore.getToken,
+              name: "file",
+              headers: {
+                Authorization: "Bearer " + userStore.getToken,
+              },
+              successHandle(res: any) {
+                return res;
+              },
+            },
+            buildUrl(key: string) {
+              return buildPrivateFileUrl(key);
+            },
+          },
+        },
+      },
+      bankName: {
+        title: "开户银行",
+        form: {
+          col: { span: 24 },
+          show: compute(({ form }) => form.channel === "bank"),
+          component: {
+            name: "a-select",
+            vModel: "value",
+            options: bankOptions,
+            showSearch: true,
+            placeholder: "请选择开户银行",
+          },
+          rules: [{ required: compute(({ form }) => form.channel === "bank"), message: "请输入开户银行" }],
+        },
+      },
+    },
+    async onSubmit(form: any) {
+      if (form.channel === "bank") {
+        form.qrCode = "";
+      }
+      await api.SaveWithdrawSetting(form);
+      notification.success({ message: "保存成功" });
+    },
+  });
+}
+
+async function openWithdrawDialog() {
+  await openFormDialog({
+    title: "申请提现",
+    wrapper: {
+      width: 520,
+    },
+    initialForm: {
+      amountYuan: null,
+    },
+    body: () =>
+      h("div", { class: "withdraw-dialog-tip" }, [
+        h("span", "提现前需要先设置提现账号。"),
+        h(
+          Button,
+          {
+            size: "small",
+            type: "link",
+            onClick: openWithdrawSetting,
+          },
+          () => "提现设置"
+        ),
+      ]),
+    columns: {
+      amountYuan: {
+        title: "提现金额",
+        form: {
+          col: { span: 24 },
+          component: {
+            name: "a-input-number",
+            vModel: "value",
+            min: 0,
+            precision: 2,
+            addonAfter: "元",
+            style: { width: "100%" },
+          },
+          rules: [{ required: true, message: "请输入提现金额" }],
+        },
+      },
+    },
+    async onSubmit(form: any) {
+      await applyWithdraw(form.amountYuan);
+    },
+  });
+}
+
+async function applyWithdraw(amountYuan: number) {
+  await api.ApplyWithdraw(util.amount.toCent(amountYuan || 0));
+  activeTab.value = "withdraw";
+  await loadWalletSummary();
+  await Promise.all([withdrawCrudExpose.doRefresh(), logsCrudExpose.doRefresh()]);
+  notification.success({ message: "提现申请已提交" });
+}
+
+async function refreshActiveList() {
+  if (activeTab.value === "withdraw") {
+    await withdrawCrudExpose.doRefresh();
+  } else if (activeTab.value === "logs") {
+    await logsCrudExpose.doRefresh();
+  }
+}
+
+async function refreshWalletPage() {
+  await loadWalletSummary();
+  await refreshActiveList();
+  loaded.value = true;
+}
+
+onMounted(refreshWalletPage);
+
+onActivated(async () => {
+  if (!loaded.value) {
+    return;
+  }
+  await refreshWalletPage();
+});
+</script>
+
+<style lang="less">
+.page-wallet {
+  display: flex;
+  min-height: 0;
+
+  .fs-page-content {
+    display: flex;
+    min-height: 0;
+  }
+
+  .wallet-body {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    min-height: 0;
+    padding: 20px;
+    background: hsl(var(--background-deep));
+  }
+
+  .wallet-summary-grid {
+    flex: none;
+  }
+
+  .wallet-summary-grid {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+    gap: 16px;
+    margin-bottom: 18px;
+  }
+
+  .summary-card,
+  .wallet-tabs {
+    border: 1px solid rgba(148, 163, 184, 0.28);
+    border-radius: 8px;
+    background: linear-gradient(145deg, rgba(255, 255, 255, 0.94), rgba(248, 250, 252, 0.82)), hsl(var(--card));
+    box-shadow: 0 10px 28px rgba(15, 23, 42, 0.08);
+    transition:
+      transform 0.18s ease,
+      box-shadow 0.18s ease,
+      border-color 0.18s ease;
+  }
+
+  .summary-card {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 16px;
+    min-height: 112px;
+    overflow: hidden;
+    padding: 22px;
+  }
+
+  .summary-card:hover {
+    border-color: rgba(52, 120, 246, 0.34);
+    box-shadow: 0 16px 38px rgba(15, 23, 42, 0.12);
+    transform: translateY(-2px);
+  }
+
+  .summary-card-main {
+    min-width: 0;
+  }
+
+  .summary-title {
+    margin-bottom: 10px;
+    color: hsl(var(--muted-foreground));
+    font-size: 15px;
+  }
+
+  .summary-value {
+    font-size: 30px;
+    font-weight: 700;
+    line-height: 36px;
+  }
+
+  .summary-value.available,
+  .summary-value.income {
+    color: #c58a35;
+  }
+
+  .summary-value.frozen {
+    color: #8b96a8;
+  }
+
+  .summary-value.withdraw {
+    color: #3478f6;
+  }
+
+  .summary-action-button {
+    flex: none;
+    box-shadow: 0 8px 18px rgba(52, 120, 246, 0.22);
+  }
+
+  .wallet-tabs {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    min-height: 0;
+    padding: 0 12px 12px;
+    background: rgba(255, 255, 255, 0.92);
+  }
+
+  .ant-tabs-content-holder,
+  .ant-tabs-content,
+  .ant-tabs-tabpane {
+    display: flex;
+    flex: 1;
+    min-height: 0;
+  }
+
+  .ant-tabs-tabpane {
+    flex-direction: column;
+  }
+
+  .wallet-crud {
+    flex: 1;
+    min-height: 0;
+  }
+
+  .wallet-tabs {
+    .fs-search {
+      display: none;
+    }
+  }
+}
+
+@media (max-width: 900px) {
+  .page-wallet {
+    .wallet-summary-grid {
+      grid-template-columns: 1fr;
+    }
+
+    .summary-card {
+      align-items: flex-start;
+      flex-direction: column;
+    }
+  }
+}
+
+.withdraw-dialog-tip {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 10px 12px;
+  margin-bottom: 12px;
+  border: 1px solid #d9e8ff;
+  border-radius: 6px;
+  background: #f5f9ff;
+  color: #315174;
+}
+</style>

packages/ui/certd-client/src/views/framework/login/index.vue

@@ -1,3 +1,4 @@
+<!-- eslint-disable vue/multi-word-component-names -->
 <template>
   <div class="main login-page">
     <a-form v-if="!twoFactor.loginId" ref="formRef" class="user-layout-login" name="custom-validation" :model="formState" v-bind="layout" @finish="handleFinish" @finish-failed="handleFinishFailed">
@@ -108,6 +109,7 @@ import * as oauthApi from "../oauth/api";
 import { notification } from "ant-design-vue";
 import { request } from "/src/api/service";
 import * as UserApi from "/src/store/user/api.user";
+import { inviteUtils } from "/@/utils/util.invite";
 
 const { t } = useI18n();
 const route = useRoute();
@@ -136,6 +138,7 @@ const formState = reactive({
   smsCode: "",
   captcha: null,
   smsCaptcha: null,
+  inviteCode: inviteUtils.get(),
 });
 
 const rules = {

packages/ui/certd-client/src/views/framework/register/index.vue

@@ -78,6 +78,14 @@
         </a-tab-pane>
       </a-tabs>
 
+      <a-form-item v-if="registerType !== 'mobile'" has-feedback name="inviteCode" label="邀请码">
+        <a-input v-model:value="formState.inviteCode" placeholder="邀请码（选填）" size="large" autocomplete="off">
+          <template #prefix>
+            <fs-icon icon="ion:gift-outline"></fs-icon>
+          </template>
+        </a-input>
+      </a-form-item>
+
       <a-form-item v-if="registerType !== 'mobile'">
         <a-button type="primary" size="large" html-type="submit" class="login-button">注册</a-button>
       </a-form-item>
@@ -97,6 +105,7 @@ import { useSettingStore } from "/@/store/settings";
 import { notification } from "ant-design-vue";
 import CaptchaInput from "/@/components/captcha/captcha-input.vue";
 import { useRouter } from "vue-router";
+import { inviteUtils } from "/@/utils/util.invite";
 export default defineComponent({
   name: "RegisterPage",
   components: { CaptchaInput, EmailCode },
@@ -125,6 +134,7 @@ export default defineComponent({
       confirmPassword: "",
       captcha: null,
       captchaForEmail: null,
+      inviteCode: inviteUtils.get(),
     });
 
     const rules = {
@@ -213,6 +223,7 @@ export default defineComponent({
             email: formState.email,
             captcha: registerType.value === "email" ? formState.captchaForEmail : formState.captcha,
             validateCode: formState.validateCode,
+            inviteCode: formState.inviteCode,
           }) as any
         );
       } finally {

packages/ui/certd-client/src/views/sys/plugin/config-common.vue

@@ -6,7 +6,7 @@
 
     <div class="sys-plugin-config settings-form">
       <a-form :model="formState" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off" @finish="onFinish" @finish-failed="onFinishFailed">
-        <a-form-item label="公共Google EAB授权" :name="['CertApply', 'sysSetting', 'input', 'googleCommonEabAccessId']">
+        <a-form-item v-show="false" label="公共Google EAB授权" :name="['CertApply', 'sysSetting', 'input', 'googleCommonEabAccessId']">
           <access-selector v-model:model-value="formState.CertApply.sysSetting.input.googleCommonEabAccessId" type="eab" from="sys"></access-selector>
           <div class="helper">
             <div>设置公共Google EAB授权给用户使用，避免用户自己去翻墙获取Google EAB授权</div>
@@ -16,7 +16,14 @@
           </div>
         </a-form-item>
 
-        <a-form-item label="公共ZeroSSL EAB授权" :name="['CertApply', 'sysSetting', 'input', 'zerosslCommonEabAccessId']">
+        <a-form-item label="公共Google ACME账号" :name="['CertApply', 'sysSetting', 'input', 'googleCommonAcmeAccountAccessId']">
+          <access-selector v-model:model-value="formState.CertApply.sysSetting.input.googleCommonAcmeAccountAccessId" type="acmeAccount" subtype="google" from="sys"></access-selector>
+          <div class="helper">
+            <div>优先推荐配置公共ACME账号。配置后普通用户申请Google证书时无需选择账号，也不会重复消费公共EAB。</div>
+          </div>
+        </a-form-item>
+
+        <a-form-item v-show="false" label="公共ZeroSSL EAB授权" :name="['CertApply', 'sysSetting', 'input', 'zerosslCommonEabAccessId']">
           <access-selector v-model:model-value="formState.CertApply.sysSetting.input.zerosslCommonEabAccessId" type="eab" from="sys"></access-selector>
           <div class="helper">
             <div>设置公共ZeroSSL EAB授权给用户使用，避免用户自己去翻墙获取Zero EAB授权</div>
@@ -26,7 +33,11 @@
           </div>
         </a-form-item>
 
-        <a-form-item label="公共litessl EAB授权" :name="['CertApply', 'sysSetting', 'input', 'litesslCommonEabAccessId']">
+        <a-form-item label="公共ZeroSSL ACME账号" :name="['CertApply', 'sysSetting', 'input', 'zerosslCommonAcmeAccountAccessId']">
+          <access-selector v-model:model-value="formState.CertApply.sysSetting.input.zerosslCommonAcmeAccountAccessId" type="acmeAccount" subtype="zerossl" from="sys"></access-selector>
+        </a-form-item>
+
+        <a-form-item v-show="false" label="公共litessl EAB授权" :name="['CertApply', 'sysSetting', 'input', 'litesslCommonEabAccessId']">
           <access-selector v-model:model-value="formState.CertApply.sysSetting.input.litesslCommonEabAccessId" type="eab" from="sys"></access-selector>
           <div class="helper">
             <div>设置公共litessl EAB授权给用户使用，避免用户自己获取litessl EAB授权</div>
@@ -36,6 +47,10 @@
           </div>
         </a-form-item>
 
+        <a-form-item label="公共litessl ACME账号" :name="['CertApply', 'sysSetting', 'input', 'litesslCommonAcmeAccountAccessId']">
+          <access-selector v-model:model-value="formState.CertApply.sysSetting.input.litesslCommonAcmeAccountAccessId" type="acmeAccount" subtype="litessl" from="sys"></access-selector>
+        </a-form-item>
+
         <a-form-item label="其他配置">
           <a-button type="primary" @click="doPluginConfig">证书申请插件默认值设置</a-button>
           <div class="helper">

packages/ui/certd-client/src/views/sys/suite/invite/api.ts

@@ -0,0 +1,49 @@
+import { request } from "/@/api/service";
+
+export async function GetSettings() {
+  return await request({ url: "/sys/invite/settings/get", method: "post" });
+}
+
+export async function SaveSettings(data: any) {
+  return await request({ url: "/sys/invite/settings/save", method: "post", data });
+}
+
+export async function GetLevels(query: any) {
+  return await request({ url: "/sys/invite/level/page", method: "post", data: query });
+}
+
+export async function GetLevelList() {
+  return await request({ url: "/sys/invite/level/list", method: "post", data: {} });
+}
+
+export async function AddLevel(data: any) {
+  return await request({ url: "/sys/invite/level/add", method: "post", data });
+}
+
+export async function UpdateLevel(data: any) {
+  return await request({ url: "/sys/invite/level/update", method: "post", data });
+}
+
+export async function DeleteLevel(id: number) {
+  return await request({ url: "/sys/invite/level/delete", method: "post", params: { id } });
+}
+
+export async function GetUserLevels(query: any) {
+  return await request({ url: "/sys/invite/user/page", method: "post", data: query });
+}
+
+export async function SetUserLevel(data: any) {
+  return await request({ url: "/sys/invite/user/setLevel", method: "post", data });
+}
+
+export async function GetWithdraws(query: any) {
+  return await request({ url: "/sys/wallet/withdraw/page", method: "post", data: query });
+}
+
+export async function ApproveWithdraw(id: number, remark?: string) {
+  return await request({ url: "/sys/wallet/withdraw/approve", method: "post", data: { id, remark } });
+}
+
+export async function RejectWithdraw(id: number, remark: string) {
+  return await request({ url: "/sys/wallet/withdraw/reject", method: "post", data: { id, remark } });
+}

packages/ui/certd-client/src/views/sys/suite/invite/crud-level.tsx

@@ -0,0 +1,134 @@
+import { AddReq, compute, CreateCrudOptionsRet, DelReq, EditReq, UserPageQuery, UserPageRes, dict } from "@fast-crud/fast-crud";
+import * as api from "./api";
+import PriceInput from "/@/views/sys/suite/product/price-input.vue";
+
+export default function (): CreateCrudOptionsRet {
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    query.sort = { prop: "sort", asc: true };
+    return await api.GetLevels(query);
+  };
+  const addRequest = async ({ form }: AddReq) => {
+    return await api.AddLevel(form);
+  };
+  const editRequest = async ({ form, row }: EditReq) => {
+    form.id = row.id;
+    return await api.UpdateLevel(form);
+  };
+  const delRequest = async ({ row }: DelReq) => {
+    return await api.DeleteLevel(row.id);
+  };
+
+  return {
+    crudOptions: {
+      request: { pageRequest, addRequest, editRequest, delRequest },
+      rowHandle: {
+        width: 180,
+        fixed: "right",
+        buttons: {
+          view: { show: false },
+          copy: { show: false },
+          remove: {
+            text: "禁用",
+            show: compute(({ row }) => row.disabled !== true),
+          },
+        },
+      },
+      columns: {
+        id: {
+          title: "ID",
+          type: "number",
+          form: { show: false },
+          column: { width: 90 },
+        },
+        name: {
+          title: "等级名称",
+          type: "text",
+          search: { show: true },
+          form: {
+            rules: [{ required: true, message: "请输入等级名称" }],
+          },
+          column: { width: 140 },
+        },
+        icon: {
+          title: "等级图标",
+          type: "icon",
+          form: {
+            value: "ion:ribbon-outline",
+            rules: [{ required: true, message: "请选择等级图标" }],
+          },
+          column: {
+            width: 90,
+            align: "center",
+            component: {
+              name: "fs-icon",
+              vModel: "icon",
+              style: {
+                fontSize: "22px",
+              },
+            },
+          },
+        },
+        minAmount: {
+          title: "升级金额",
+          type: "number",
+          form: {
+            show: compute(({ form }) => form.levelType !== "exclusive"),
+            component: { name: PriceInput, vModel: "modelValue", edit: true },
+            rules: [{ required: true, message: "请输入升级金额" }],
+          },
+          column: {
+            width: 140,
+            component: { name: PriceInput, vModel: "modelValue", edit: false },
+          },
+        },
+        commissionRate: {
+          title: "佣金比例",
+          type: "number",
+          form: {
+            component: { min: 0, max: 100, addonAfter: "%" },
+            rules: [{ required: true, message: "请输入佣金比例" }],
+          },
+          column: { width: 110, align: "center", cellRender: ({ value }) => `${value || 0}%` },
+        },
+        levelType: {
+          title: "等级类型",
+          type: "dict-radio",
+          dict: dict({
+            data: [
+              { label: "普通等级", value: "normal", color: "success" },
+              { label: "专属等级", value: "exclusive", color: "warning" },
+            ],
+          }),
+          form: {
+            value: "normal",
+            helper: "专属等级可由管理员手动指定，不参与普通用户自动升级。专属等级不会在普通用户端展示。",
+          },
+          column: { width: 120, align: "center" },
+        },
+        sort: {
+          title: "排序",
+          type: "number",
+          form: {
+            value: 10,
+            helper: "排序号越小越靠前。",
+          },
+          column: { width: 90, align: "center", sorter: true },
+        },
+        disabled: {
+          title: "状态",
+          type: "dict-switch",
+          dict: dict({
+            data: [
+              { label: "启用", value: false, color: "success" },
+              { label: "禁用", value: true, color: "error" },
+            ],
+          }),
+          form: { value: false },
+          column: { width: 100, align: "center" },
+        },
+        createTime: { title: "创建时间", type: "datetime", form: { show: false }, column: { width: 170 } },
+        updateTime: { title: "更新时间", type: "datetime", form: { show: false }, column: { width: 170 } },
+      },
+    },
+  };
+}

packages/ui/certd-client/src/views/sys/suite/invite/crud-user-level.tsx

@@ -0,0 +1,131 @@
+import { compute, CreateCrudOptionsProps, CreateCrudOptionsRet, dict, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { notification } from "ant-design-vue";
+import * as api from "./api";
+import PriceInput from "/@/views/sys/suite/product/price-input.vue";
+import { useFormDialog } from "/@/use/use-dialog";
+
+export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const { openFormDialog } = useFormDialog();
+  const levelDict = dict({
+    url: "/sys/invite/level/list",
+    value: "id",
+    label: "name",
+  });
+
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetUserLevels(query);
+  };
+
+  async function openSetLevel(row: any) {
+    await openFormDialog({
+      title: "指定推广等级",
+      wrapper: { width: 560 },
+      initialForm: {
+        userId: row.userId,
+        levelId: row.levelId,
+      },
+      columns: {
+        levelId: {
+          title: "推广等级",
+          type: "dict-select",
+          dict: levelDict,
+          form: {
+            col: { span: 24 },
+            rules: [{ required: true, message: "请选择推广等级" }],
+            helper: "专属等级将锁定为当前等级，普通等级将按累计推广金额自动升级。",
+          },
+        },
+      },
+      async onSubmit(form: any) {
+        await api.SetUserLevel(form);
+        await crudExpose.doRefresh();
+        notification.success({ message: "推广等级已更新" });
+      },
+    });
+  }
+
+  return {
+    crudOptions: {
+      request: { pageRequest },
+      actionbar: { show: false },
+      toolbar: { show: false },
+      rowHandle: {
+        width: 130,
+        fixed: "right",
+        buttons: {
+          view: { show: false },
+          edit: { show: false },
+          copy: { show: false },
+          remove: { show: false },
+          setLevel: {
+            text: "指定等级",
+            type: "link",
+            click: ({ row }) => openSetLevel(row),
+          },
+        },
+      },
+      columns: {
+        userId: { title: "用户ID", type: "number", search: { show: true }, column: { width: 100 } },
+        username: {
+          title: "用户名",
+          type: "text",
+          search: { show: true },
+          column: {
+            width: 180,
+            cellRender({ row }) {
+              return row.simpleUser?.displayName || row.userDisplay || row.username || row.userId;
+            },
+          },
+        },
+        enabled: {
+          title: "开通状态",
+          type: "dict-switch",
+          dict: dict({
+            data: [
+              { label: "未开通", value: false, color: "default" },
+              { label: "已开通", value: true, color: "success" },
+            ],
+          }),
+          column: { width: 110, align: "center" },
+        },
+        levelId: {
+          title: "当前等级",
+          type: "dict-select",
+          dict: levelDict,
+          search: { show: true },
+          column: { width: 130 },
+        },
+        levelLocked: {
+          title: "升级方式",
+          type: "dict-switch",
+          dict: dict({
+            data: [
+              { label: "自动升级", value: false, color: "success" },
+              { label: "锁定", value: true, color: "warning" },
+            ],
+          }),
+          column: { width: 110, align: "center" },
+        },
+        levelType: {
+          title: "等级类型",
+          type: "dict-select",
+          dict: dict({
+            data: [
+              { label: "普通等级", value: "normal", color: "success" },
+              { label: "专属等级", value: "exclusive", color: "warning" },
+            ],
+          }),
+          column: { width: 100, align: "center", show: compute(({ row }) => row.levelId) },
+        },
+        commissionRate: { title: "佣金比例", type: "number", column: { width: 110, align: "center", cellRender: ({ value }) => (value == null ? "-" : `${value}%`) } },
+        promotionAmount: {
+          title: "累计推广金额",
+          type: "number",
+          column: { width: 140, component: { name: PriceInput, vModel: "modelValue", edit: false } },
+        },
+        createTime: { title: "开通时间", type: "datetime", column: { width: 170 } },
+        updateTime: { title: "更新时间", type: "datetime", column: { width: 170 } },
+      },
+    },
+  };
+}

packages/ui/certd-client/src/views/sys/suite/invite/crud-withdraw.tsx

@@ -0,0 +1,180 @@
+import { compute, CreateCrudOptionsProps, CreateCrudOptionsRet, dict, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { notification } from "ant-design-vue";
+import * as api from "./api";
+import PriceInput from "/@/views/sys/suite/product/price-input.vue";
+import { useFormDialog } from "/@/use/use-dialog";
+import { useUserStore } from "/@/store/user";
+
+function buildPrivateFileUrl(key: string) {
+  const userStore = useUserStore();
+  return `/api/basic/file/download?token=${userStore.getToken}&key=${encodeURIComponent(key)}`;
+}
+
+export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const { openFormDialog } = useFormDialog();
+
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetWithdraws(query);
+  };
+
+  function renderWithdrawDetail(row: any) {
+    const isBank = row.channel === "bank";
+    return (
+      <a-descriptions class={"w-full"} bordered column={1} size={"small"}>
+        <a-descriptions-item label="提现金额">
+          <span class={"text-red-500"}>{row.amount / 100} 元</span>
+        </a-descriptions-item>
+        <a-descriptions-item label="渠道类型">{row.channel === "bank" ? "银行卡" : "支付宝"}</a-descriptions-item>
+        <a-descriptions-item label="用户名">{row.userDisplay || row.userId}</a-descriptions-item>
+        <a-descriptions-item label="账号">{row.account || "-"}</a-descriptions-item>
+        {isBank ? <a-descriptions-item label="开户行名称">{row.bankName || "-"}</a-descriptions-item> : null}
+        {!isBank ? <a-descriptions-item label="收款二维码">{row.qrCode ? <a-image src={buildPrivateFileUrl(row.qrCode)} width={160} /> : <span>-</span>}</a-descriptions-item> : null}
+      </a-descriptions>
+    );
+  }
+
+  async function approve(row: any) {
+    await openFormDialog({
+      title: "提现审核",
+      wrapper: {
+        width: 760,
+        buttons: {
+          ok: {
+            text: "确认已转账完成",
+          },
+        },
+      },
+      body: () => renderWithdrawDetail(row),
+      onSubmit: async () => {
+        await api.ApproveWithdraw(row.id);
+        await crudExpose.doRefresh();
+        notification.success({ message: "已审核通过" });
+      },
+    });
+  }
+
+  async function reject(row: any) {
+    await openFormDialog({
+      title: "提现审核",
+      wrapper: {
+        width: 760,
+      },
+      initialForm: {
+        remark: "",
+      },
+      body: () => renderWithdrawDetail(row),
+      columns: {
+        remark: {
+          title: "拒绝理由",
+          type: "textarea",
+          form: {
+            col: {
+              span: 24,
+            },
+            component: {
+              name: "a-textarea",
+              vModel: "value",
+              rows: 4,
+              placeholder: "请填写拒绝理由",
+            },
+            rules: [{ required: true, message: "请填写拒绝理由" }],
+          },
+        },
+      },
+      async onSubmit(form: any) {
+        const remark = form.remark.trim();
+        if (!remark) {
+          notification.error({ message: "请填写拒绝理由" });
+          throw new Error("请填写拒绝理由");
+        }
+        await api.RejectWithdraw(row.id, remark);
+        await crudExpose.doRefresh();
+        notification.success({ message: "已拒绝并退回余额" });
+      },
+    });
+  }
+
+  return {
+    crudOptions: {
+      request: { pageRequest },
+      actionbar: { show: false },
+      toolbar: { show: false },
+      rowHandle: {
+        width: 150,
+        fixed: "right",
+        buttons: {
+          view: { show: false },
+          edit: { show: false },
+          copy: { show: false },
+          remove: { show: false },
+          approve: {
+            text: "通过",
+            type: "link",
+            show: compute(({ row }) => row.status === "pending"),
+            click: ({ row }) => approve(row),
+          },
+          reject: {
+            text: "拒绝",
+            type: "link",
+            show: compute(({ row }) => row.status === "pending"),
+            click: ({ row }) => reject(row),
+          },
+        },
+      },
+      columns: {
+        userId: { title: "用户ID", type: "number", search: { show: true }, column: { width: 100 } },
+        amount: {
+          title: "金额",
+          type: "number",
+          column: {
+            width: 120,
+            component: { name: PriceInput, vModel: "modelValue", edit: false },
+          },
+        },
+        userDisplay: { title: "用户名", type: "text", search: { show: true }, column: { width: 140 } },
+        status: {
+          title: "状态",
+          type: "dict-select",
+          search: { show: true },
+          dict: dict({
+            data: [
+              { label: "待审核", value: "pending", color: "warning" },
+              { label: "已通过", value: "approved", color: "success" },
+              { label: "已拒绝", value: "rejected", color: "error" },
+            ],
+          }),
+          column: { width: 110 },
+        },
+        channel: {
+          title: "提现渠道",
+          type: "dict-select",
+          search: { show: true },
+          dict: dict({
+            data: [
+              { label: "支付宝", value: "alipay" },
+              { label: "银行卡", value: "bank" },
+            ],
+          }),
+          column: { width: 110 },
+        },
+        realName: { title: "真实姓名", type: "text", search: { show: true }, column: { width: 120 } },
+        account: { title: "收款账号", type: "text", column: { width: 180 } },
+        bankName: {
+          title: "开户银行",
+          type: "text",
+          column: {
+            width: 160,
+            cellRender({ row, value }) {
+              if (row.channel !== "bank") {
+                return "-";
+              }
+              return value || "-";
+            },
+          },
+        },
+        auditRemark: { title: "审核备注", type: "text", column: { minWidth: 180 } },
+        createTime: { title: "申请时间", type: "datetime", column: { width: 180 } },
+      },
+    },
+  };
+}

packages/ui/certd-client/src/views/sys/suite/invite/level.vue

@@ -0,0 +1,266 @@
+<template>
+  <fs-page class="page-sys-invite-level">
+    <template #header>
+      <div class="title">推广等级</div>
+    </template>
+    <fs-crud ref="crudRef" v-bind="crudBinding">
+      <a-empty v-if="levelList.length === 0" class="level-empty" />
+      <div v-else class="level-card-grid">
+        <div v-for="(item, index) of levelList" :key="item.id" class="level-card" :class="{ disabled: item.disabled }">
+          <div class="level-card-actions">
+            <a-tooltip title="编辑">
+              <a-button type="text" size="small" @click="openEdit({ index, row: item })">
+                <template #icon><fs-icon icon="ion:create-outline" /></template>
+              </a-button>
+            </a-tooltip>
+            <a-tooltip :title="item.disabled ? '启用' : '禁用'">
+              <a-button type="text" size="small" @click="toggleDisabled(item)">
+                <template #icon><fs-icon :icon="item.disabled ? 'ion:play-outline' : 'ion:pause-outline'" /></template>
+              </a-button>
+            </a-tooltip>
+            <a-tooltip title="删除">
+              <a-button type="text" danger size="small" @click="confirmRemove({ index, row: item })">
+                <template #icon><fs-icon icon="ion:trash-outline" /></template>
+              </a-button>
+            </a-tooltip>
+          </div>
+          <div class="level-name">
+            <span class="level-medal">
+              <fs-icon :icon="levelIcon(item)" />
+            </span>
+            {{ item.name }}
+            <a-tag v-if="item.levelType === 'exclusive'" color="orange">专属</a-tag>
+          </div>
+          <div class="level-rate-label">佣金比例</div>
+          <div class="level-rate">{{ item.commissionRate || 0 }}%</div>
+          <div v-if="item.levelType === 'exclusive'" class="level-threshold exclusive-threshold">平台指定专属等级</div>
+          <div v-else class="level-threshold">累计推广 ≥ {{ amountToYuan(item.minAmount) }} 元</div>
+          <div class="level-meta">
+            <a-tag :color="item.disabled ? 'default' : 'success'">{{ item.disabled ? "已禁用" : "已启用" }}</a-tag>
+            <span>排序 {{ item.sort || 0 }}</span>
+          </div>
+        </div>
+      </div>
+    </fs-crud>
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+import { computed, onActivated, onMounted } from "vue";
+import { Modal, notification } from "ant-design-vue";
+import { useFs } from "@fast-crud/fast-crud";
+import createCrudOptions from "./crud-level";
+import * as api from "./api";
+import { util } from "/@/utils";
+
+defineOptions({ name: "SysInviteLevel" });
+
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions });
+const levelList = computed(() => crudBinding.value?.data || []);
+
+function amountToYuan(amount: number) {
+  return util.amount.toYuan(amount || 0);
+}
+
+function levelIcon(level: any) {
+  return level?.icon || "ion:ribbon-outline";
+}
+
+function openEdit(opts: any) {
+  crudExpose.openEdit(opts);
+}
+
+async function toggleDisabled(row: any) {
+  await api.UpdateLevel({
+    ...row,
+    disabled: !row.disabled,
+  });
+  notification.success({ message: row.disabled ? "已启用" : "已禁用" });
+  await crudExpose.doRefresh();
+}
+
+function confirmRemove(opts: any) {
+  Modal.confirm({
+    title: "确认删除推广等级？",
+    content: "删除后不可恢复。如果该等级已被用户使用，可能会出现异常，请确认已完成数据处理。",
+    okText: "确认删除",
+    okType: "danger",
+    onOk: async () => {
+      await api.DeleteLevel(opts.row.id);
+      notification.success({ message: "已删除" });
+      await crudExpose.doRefresh();
+    },
+  });
+}
+
+onMounted(() => {
+  crudExpose.doRefresh();
+});
+onActivated(() => {
+  crudExpose.doRefresh();
+});
+</script>
+
+<style lang="less">
+.page-sys-invite-level {
+  .fs-crud-container {
+    padding-top: 14px;
+  }
+
+  .fs-crud-table {
+    display: none;
+  }
+
+  .level-card-grid {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+    gap: 16px;
+    padding: 4px 8px;
+  }
+
+  .level-empty {
+    padding: 64px 0;
+  }
+
+  .level-card {
+    position: relative;
+    min-height: 156px;
+    padding: 16px;
+    overflow: hidden;
+    border: 1px solid rgba(148, 163, 184, 0.28);
+    border-radius: 8px;
+    background: linear-gradient(145deg, rgba(255, 255, 255, 0.92), rgba(248, 250, 252, 0.78)), linear-gradient(135deg, rgba(52, 120, 246, 0.14), rgba(197, 138, 53, 0.12));
+    box-shadow: 0 10px 28px rgba(15, 23, 42, 0.08);
+    transition:
+      transform 0.18s ease,
+      box-shadow 0.18s ease,
+      border-color 0.2s,
+      background-color 0.2s;
+  }
+
+  .level-card::before {
+    position: absolute;
+    inset: 12px;
+    border: 1px solid rgba(255, 255, 255, 0.68);
+    border-radius: 6px;
+    content: "";
+    pointer-events: none;
+  }
+
+  .level-card:hover {
+    border-color: rgba(52, 120, 246, 0.42);
+    box-shadow: 0 16px 38px rgba(15, 23, 42, 0.14);
+    transform: translateY(-3px);
+  }
+
+  .level-card.disabled {
+    opacity: 0.66;
+  }
+
+  .level-card-actions {
+    position: absolute;
+    top: 8px;
+    right: 8px;
+    display: flex;
+    gap: 2px;
+
+    .ant-btn {
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      width: 26px;
+      height: 26px;
+      border: 1px solid rgba(148, 163, 184, 0.2);
+      background: rgba(255, 255, 255, 0.72);
+      box-shadow: 0 2px 8px rgba(15, 23, 42, 0.06);
+      backdrop-filter: blur(8px);
+    }
+
+    .ant-btn:hover {
+      background: #fff;
+      transform: translateY(-1px);
+    }
+
+    .fs-icon {
+      font-size: 16px;
+    }
+  }
+
+  .level-name {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-height: 26px;
+    padding: 0 72px;
+    gap: 6px;
+    color: hsl(var(--foreground));
+    font-weight: 700;
+    text-align: center;
+  }
+
+  .level-medal {
+    display: inline-flex;
+    flex: none;
+    align-items: center;
+    justify-content: center;
+    width: 22px;
+    height: 22px;
+    color: #8a5a16;
+    font-size: 20px;
+    filter: drop-shadow(0 4px 8px rgba(197, 138, 53, 0.22));
+  }
+
+  .level-rate-label {
+    margin-top: 12px;
+    color: hsl(var(--muted-foreground));
+    font-size: 12px;
+    text-align: center;
+  }
+
+  .level-rate {
+    margin-top: 2px;
+    color: #c58a35;
+    font-size: 28px;
+    font-weight: 700;
+    line-height: 34px;
+    text-align: center;
+  }
+
+  .level-threshold {
+    margin-top: 6px;
+    color: hsl(var(--muted-foreground));
+    font-size: 12px;
+    text-align: center;
+  }
+
+  .exclusive-threshold {
+    color: #8a5a16;
+  }
+
+  .level-meta {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    margin-top: 10px;
+    color: hsl(var(--muted-foreground));
+    font-size: 12px;
+  }
+}
+
+@media (max-width: 1200px) {
+  .page-sys-invite-level {
+    .level-card-grid {
+      grid-template-columns: repeat(3, minmax(0, 1fr));
+    }
+  }
+}
+
+@media (max-width: 900px) {
+  .page-sys-invite-level {
+    .level-card-grid {
+      grid-template-columns: 1fr;
+    }
+  }
+}
+</style>

packages/ui/certd-client/src/views/sys/suite/invite/setting.vue

@@ -0,0 +1,138 @@
+<template>
+  <fs-page class="page-sys-invite-setting">
+    <template #header>
+      <div class="title">激励计划设置</div>
+    </template>
+    <div class="page-body">
+      <a-form ref="formRef" :model="settings" :label-col="{ style: { width: '140px' } }" class="settings-form">
+        <a-form-item label="开启激励计划" name="enabled">
+          <a-switch v-model:checked="settings.enabled" />
+        </a-form-item>
+        <a-form-item label="最低提现金额" name="minWithdrawAmountYuan">
+          <a-input-number v-model:value="settings.minWithdrawAmountYuan" :min="0" addon-after="元" />
+        </a-form-item>
+        <a-form-item label="提现渠道" name="withdrawChannels">
+          <a-checkbox-group v-model:value="settings.withdrawChannels" :options="withdrawChannelOptions" />
+        </a-form-item>
+        <a-form-item v-if="bankChannelEnabled" label="开户银行" name="withdrawBanks">
+          <a-select v-model:value="settings.withdrawBanks" mode="tags" :options="bankOptions" placeholder="请选择或输入支持的开户银行" :token-separators="['，', ',', '、']" />
+        </a-form-item>
+        <a-form-item label="推广协议" name="agreementContent">
+          <fs-editor-wang5
+            v-model="settings.agreementContent"
+            :toolbar-config="{}"
+            :editor-config="{ placeholder: '请输入用户开通激励计划前需要确认的推广协议内容' }"
+            :uploader="editorUploader"
+            :container="{ class: 'agreement-editor' }"
+            style="height: 400px"
+          />
+        </a-form-item>
+        <a-form-item label=" " :colon="false">
+          <a-button type="primary" @click="saveSettings">保存设置</a-button>
+        </a-form-item>
+      </a-form>
+    </div>
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+import { computed, onMounted, reactive } from "vue";
+import { notification } from "ant-design-vue";
+import * as api from "./api";
+import { util } from "/@/utils";
+import { useSettingStore } from "/@/store/settings";
+import { useUserStore } from "/@/store/user";
+
+defineOptions({ name: "SysInviteCommissionSetting" });
+
+const defaultAgreement = "<p>请遵守平台推广规则，不得通过虚假注册、刷单、恶意诱导等方式获取收益。平台有权对异常推广行为进行核查，并根据实际情况暂停结算或关闭激励计划资格。</p>";
+const defaultWithdrawBanks = [
+  "中国工商银行",
+  "中国农业银行",
+  "中国银行",
+  "中国建设银行",
+  "交通银行",
+  "招商银行",
+  "中国邮政储蓄银行",
+  "中信银行",
+  "中国光大银行",
+  "华夏银行",
+  "中国民生银行",
+  "广发银行",
+  "平安银行",
+  "兴业银行",
+  "浦发银行",
+];
+const settings = reactive<any>({ enabled: false, agreementContent: "", minWithdrawAmountYuan: 0, withdrawChannels: ["alipay", "bank"], withdrawBanks: defaultWithdrawBanks });
+const withdrawChannelOptions = [
+  { label: "支付宝", value: "alipay" },
+  { label: "银行卡", value: "bank" },
+];
+const bankOptions = computed(() => defaultWithdrawBanks.map(item => ({ label: item, value: item })));
+const bankChannelEnabled = computed(() => settings.withdrawChannels?.includes("bank"));
+const userStore = useUserStore();
+const editorUploader = {
+  type: "form",
+  action: "/basic/file/upload?autoSave=true&token=" + userStore.getToken,
+  name: "file",
+  headers: {
+    Authorization: "Bearer " + userStore.getToken,
+  },
+  successHandle(res: any) {
+    return res;
+  },
+  buildUrl(res: any) {
+    return res.url || `/api/basic/file/download?key=${encodeURIComponent(res.key)}`;
+  },
+};
+
+async function loadSettings() {
+  const data: any = await api.GetSettings();
+  settings.enabled = !!data?.enabled;
+  settings.agreementContent = data?.agreementContent || defaultAgreement;
+  settings.minWithdrawAmountYuan = util.amount.toYuan(data?.minWithdrawAmount || 0);
+  settings.withdrawChannels = data?.withdrawChannels?.length ? data.withdrawChannels : ["alipay", "bank"];
+  settings.withdrawBanks = data?.withdrawBanks?.length ? data.withdrawBanks : defaultWithdrawBanks;
+}
+
+async function saveSettings() {
+  const withdrawBanks = bankChannelEnabled.value ? (settings.withdrawBanks || []).map((item: string) => item?.trim()).filter(Boolean) : [];
+  if (isBlankAgreement(settings.agreementContent)) {
+    notification.warning({ message: "请填写推广协议内容" });
+    return;
+  }
+  await api.SaveSettings({
+    enabled: settings.enabled,
+    agreementContent: settings.agreementContent || "",
+    minWithdrawAmount: util.amount.toCent(settings.minWithdrawAmountYuan || 0),
+    withdrawChannels: settings.withdrawChannels || [],
+    withdrawBanks,
+  });
+  await useSettingStore().loadSysSettings();
+  notification.success({ message: "保存成功" });
+}
+
+function isBlankAgreement(content: string) {
+  const text = `${content || ""}`
+    .replace(/<[^>]*>/g, "")
+    .replace(/&nbsp;/g, "")
+    .trim();
+  return !text;
+}
+
+onMounted(loadSettings);
+</script>
+
+<style lang="less">
+.page-sys-invite-setting {
+  .page-body {
+    padding: 20px;
+  }
+  .settings-form {
+    max-width: 860px;
+  }
+  .agreement-editor {
+    min-height: 420px;
+  }
+}
+</style>

packages/ui/certd-client/src/views/sys/suite/invite/user-level.vue

@@ -0,0 +1,25 @@
+<template>
+  <fs-page class="page-sys-invite-user-level">
+    <template #header>
+      <div class="title">用户推广等级</div>
+    </template>
+    <fs-crud ref="crudRef" v-bind="crudBinding" />
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+import { onActivated, onMounted } from "vue";
+import { useFs } from "@fast-crud/fast-crud";
+import createCrudOptions from "./crud-user-level";
+
+defineOptions({ name: "SysInviteUserLevel" });
+
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions });
+
+onMounted(() => {
+  crudExpose.doRefresh();
+});
+onActivated(() => {
+  crudExpose.doRefresh();
+});
+</script>

packages/ui/certd-client/src/views/sys/suite/invite/withdraw.vue

@@ -0,0 +1,25 @@
+<template>
+  <fs-page class="page-sys-invite-withdraw">
+    <template #header>
+      <div class="title">提现申请记录</div>
+    </template>
+    <fs-crud ref="crudRef" v-bind="crudBinding" />
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+import { onActivated, onMounted } from "vue";
+import { useFs } from "@fast-crud/fast-crud";
+import createCrudOptions from "./crud-withdraw";
+
+defineOptions({ name: "SysInviteWithdraw" });
+
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions });
+
+onMounted(() => {
+  crudExpose.doRefresh();
+});
+onActivated(() => {
+  crudExpose.doRefresh();
+});
+</script>

packages/ui/certd-client/src/views/sys/suite/product/price-input.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex-o price-input">
-    <a-input-number v-if="edit" prefix="¥" :value="priceValue" :precision="2" class="ml-5" @update:value="onPriceChange"> </a-input-number>
+    <a-input-number v-if="edit" prefix="¥" :value="priceValue" :precision="2" class="price-input-number" @update:value="onPriceChange"> </a-input-number>
     <span v-else class="price-text" :style="style">{{ priceLabel }}</span>
   </div>
 </template>
@@ -13,11 +13,13 @@ const props = withDefaults(
     modelValue?: number;
     edit?: boolean;
     fontSize?: number;
+    zeroText?: string;
   }>(),
   {
     modelValue: 0,
     edit: false,
     fontSize: 14,
+    zeroText: "¥0",
   }
 );
 
@@ -39,7 +41,7 @@ const priceValue = computed(() => {
 
 const priceLabel = computed(() => {
   if (priceValue.value === 0) {
-    return "免费";
+    return props.zeroText;
   }
   return `¥${priceValue.value}`;
 });
@@ -53,6 +55,12 @@ const onPriceChange = (price: number) => {
 
 <style lang="less">
 .price-input {
+  width: 100%;
+
+  .price-input-number {
+    width: 100%;
+  }
+
   .price-text {
     color: red;
   }

packages/ui/certd-client/src/views/sys/suite/trade/api.ts

@@ -26,11 +26,11 @@ export async function UpdateObj(obj: any) {
   });
 }
 
-export async function DelObj(id: any) {
+export async function CancelObj(id: any) {
   return await request({
-    url: apiPrefix + "/delete",
+    url: apiPrefix + "/cancel",
     method: "post",
-    params: { id },
+    data: { id },
   });
 }
 
@@ -50,14 +50,6 @@ export async function GetDetail(id: any) {
   });
 }
 
-export async function DeleteBatch(ids: any[]) {
-  return await request({
-    url: apiPrefix + "/deleteByIds",
-    method: "post",
-    data: { ids },
-  });
-}
-
 export async function UpdatePaid(id: any) {
   return await request({
     url: apiPrefix + "/updatePaid",

packages/ui/certd-client/src/views/sys/suite/trade/crud.tsx

@@ -1,17 +1,10 @@
 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 { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { Modal } from "ant-design-vue";
 import DurationValue from "/@/views/sys/suite/product/duration-value.vue";
 import PriceInput from "/@/views/sys/suite/product/price-input.vue";
 
-export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
-  const router = useRouter();
-  const { t } = useI18n();
+export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
     return await api.GetList(query);
   };
@@ -20,43 +13,17 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
     const res = await api.UpdateObj(form);
     return res;
   };
-  const delRequest = async ({ row }: DelReq) => {
-    return await api.DelObj(row.id);
-  };
-
   const addRequest = async ({ form }: AddReq) => {
     const res = await api.AddObj(form);
     return res;
   };
 
-  const userStore = useUserStore();
-  const settingStore = useSettingStore();
-  const selectedRowKeys: Ref<any[]> = ref([]);
-  context.selectedRowKeys = selectedRowKeys;
-
   return {
     crudOptions: {
-      settings: {
-        plugins: {
-          //这里使用行选择插件，生成行选择crudOptions配置，最终会与crudOptions合并
-          rowSelection: {
-            enabled: true,
-            order: -99,
-            before: true,
-            // handle: (pluginProps,useCrudProps)=>CrudOptions,
-            props: {
-              multiple: true,
-              crossPage: true,
-              selectedRowKeys,
-            },
-          },
-        },
-      },
       request: {
         pageRequest,
         addRequest,
         editRequest,
-        delRequest,
       },
       actionbar: {
         buttons: {
@@ -67,7 +34,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
       },
       toolbar: { show: false },
       rowHandle: {
-        width: 320,
+        width: 150,
         fixed: "right",
         buttons: {
           view: {
@@ -79,11 +46,18 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           edit: {
             show: false,
           },
+          remove: {
+            show: false,
+          },
           syncStatus: {
+            order: 10,
             show: compute(({ row }) => {
               return row.status === "wait_pay";
             }),
-            text: "同步订单状态",
+            title: "同步订单状态",
+            text: null,
+            tooltip: { title: "同步订单状态" },
+            icon: "ant-design:sync-outlined",
             type: "link",
             click: async ({ row }) => {
               Modal.confirm({
@@ -96,11 +70,39 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
               });
             },
           },
-          updatePaid: {
+          cancel: {
+            order: 99,
             show: compute(({ row }) => {
               return row.status === "wait_pay";
             }),
-            text: "确认已支付",
+            title: "取消订单",
+            text: null,
+            tooltip: { title: "取消订单" },
+            icon: "ion:close-circle-outline",
+            type: "link",
+            danger: true,
+            click({ row }) {
+              Modal.confirm({
+                title: "确认取消订单？",
+                content: "取消后订单会关闭，已冻结的余额抵扣金额将自动退回。",
+                okText: "确认取消",
+                cancelText: "再想想",
+                onOk: async () => {
+                  await api.CancelObj(row.id);
+                  await crudExpose.doRefresh();
+                },
+              });
+            },
+          },
+          updatePaid: {
+            order: 20,
+            show: compute(({ row }) => {
+              return row.status === "wait_pay";
+            }),
+            title: "确认已支付",
+            text: null,
+            tooltip: { title: "确认已支付" },
+            icon: "ant-design:check-circle-outlined",
             type: "link",
             click({ row }) {
               Modal.confirm({
@@ -174,6 +176,30 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             },
           },
         },
+        rebateAmount: {
+          title: "余额抵扣",
+          type: "number",
+          column: {
+            width: 110,
+            component: {
+              name: PriceInput,
+              vModel: "modelValue",
+              edit: false,
+            },
+          },
+        },
+        thirdPartyPayAmount: {
+          title: "实付金额",
+          type: "number",
+          column: {
+            width: 110,
+            component: {
+              name: PriceInput,
+              vModel: "modelValue",
+              edit: false,
+            },
+          },
+        },
         status: {
           title: "状态",
           search: { show: true },
@@ -200,6 +226,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
               { label: "支付宝", value: "alipay" },
               { label: "微信", value: "wxpay" },
               { label: "免费", value: "free" },
+              { label: "余额抵扣", value: "rebate" },
             ],
           }),
           column: {

packages/ui/certd-client/src/views/sys/suite/trade/index.vue

@@ -6,13 +6,7 @@
         <span class="sub"> </span>
       </div>
     </template>
-    <fs-crud ref="crudRef" v-bind="crudBinding">
-      <template #pagination-left>
-        <a-tooltip title="批量删除">
-          <fs-button icon="DeleteOutlined" @click="handleBatchDelete"></fs-button>
-        </a-tooltip>
-      </template>
-    </fs-crud>
+    <fs-crud ref="crudRef" v-bind="crudBinding" />
   </fs-page>
 </template>
 
@@ -20,31 +14,11 @@
 import { onActivated, onMounted } from "vue";
 import { useFs } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
-import { message, Modal } from "ant-design-vue";
-import { DeleteBatch } from "./api";
 
 defineOptions({
   name: "TradeManager",
 });
-const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
-
-const selectedRowKeys = context.selectedRowKeys;
-const handleBatchDelete = () => {
-  if (selectedRowKeys.value?.length > 0) {
-    Modal.confirm({
-      title: "确认",
-      content: `确定要批量删除这${selectedRowKeys.value.length}条记录吗`,
-      async onOk() {
-        await DeleteBatch(selectedRowKeys.value);
-        message.info("删除成功");
-        crudExpose.doRefresh();
-        selectedRowKeys.value = [];
-      },
-    });
-  } else {
-    message.error("请先勾选记录");
-  }
-};
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions });
 
 // 页面打开后获取列表数据
 onMounted(() => {

packages/ui/certd-server/db/migration-mysql/v10045__invite_commission.sql

@@ -0,0 +1,89 @@
+ALTER TABLE cd_trade ADD COLUMN rebate_amount bigint NOT NULL DEFAULT 0;
+ALTER TABLE cd_trade ADD COLUMN third_party_pay_amount bigint NOT NULL DEFAULT 0;
+
+CREATE TABLE `cd_invite_code`
+(
+  `id`          bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `user_id`     bigint,
+  `code`        varchar(50),
+  `disabled`    boolean  NOT NULL DEFAULT false,
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+CREATE UNIQUE INDEX `index_invite_code_user_id` ON `cd_invite_code` (`user_id`);
+CREATE UNIQUE INDEX `index_invite_code_code` ON `cd_invite_code` (`code`);
+
+CREATE TABLE `cd_invite_relation`
+(
+  `id`              bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `inviter_user_id` bigint,
+  `invitee_user_id` bigint,
+  `invite_code`     varchar(50),
+  `create_time`     datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time`     datetime NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+CREATE INDEX `index_invite_relation_inviter` ON `cd_invite_relation` (`inviter_user_id`);
+CREATE UNIQUE INDEX `index_invite_relation_invitee` ON `cd_invite_relation` (`invitee_user_id`);
+
+CREATE TABLE `cd_user_wallet`
+(
+  `id`                      bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `user_id`                 bigint,
+  `total_amount`            bigint NOT NULL DEFAULT 0,
+  `frozen_amount`           bigint NOT NULL DEFAULT 0,
+  `total_income_amount`     bigint NOT NULL DEFAULT 0,
+  `total_consumed_amount`   bigint NOT NULL DEFAULT 0,
+  `total_withdraw_amount`   bigint NOT NULL DEFAULT 0,
+  `create_time`             datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time`             datetime NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+CREATE UNIQUE INDEX `index_user_wallet_user_id` ON `cd_user_wallet` (`user_id`);
+
+CREATE TABLE `cd_invite_commission_log`
+(
+  `id`              bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `user_id`         bigint,
+  `amount`          bigint,
+  `trade_id`        bigint,
+  `invitee_user_id` bigint,
+  `consume_amount`  bigint NOT NULL DEFAULT 0,
+  `remark`          varchar(2048),
+  `create_time`     datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time`     datetime NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+CREATE INDEX `index_invite_log_user_id` ON `cd_invite_commission_log` (`user_id`);
+
+CREATE TABLE `cd_user_wallet_log`
+(
+  `id`              bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `user_id`         bigint,
+  `type`            varchar(50),
+  `amount`          bigint,
+  `balance_after`   bigint,
+  `trade_id`        bigint,
+  `withdraw_id`     bigint,
+  `remark`          varchar(2048),
+  `create_time`     datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time`     datetime NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+CREATE INDEX `index_user_wallet_log_user_id` ON `cd_user_wallet_log` (`user_id`);
+
+CREATE TABLE `cd_user_wallet_withdraw`
+(
+  `id`             bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `user_id`        bigint,
+  `amount`         bigint,
+  `status`         varchar(50),
+  `channel`        varchar(50),
+  `real_name`      varchar(100),
+  `account`        varchar(200),
+  `bank_name`      varchar(200),
+  `qr_code`        varchar(512),
+  `audit_user_id`  bigint,
+  `audit_remark`   varchar(2048),
+  `audit_time`     bigint,
+  `create_time`    datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time`    datetime NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+CREATE INDEX `index_user_wallet_withdraw_user_id` ON `cd_user_wallet_withdraw` (`user_id`);
+CREATE INDEX `index_user_wallet_withdraw_status` ON `cd_user_wallet_withdraw` (`status`);

packages/ui/certd-server/db/migration-mysql/v10046__incentive_plan.sql

@@ -0,0 +1,36 @@
+ALTER TABLE cd_invite_commission_log ADD COLUMN level_id bigint NOT NULL DEFAULT 0;
+ALTER TABLE cd_invite_commission_log ADD COLUMN commission_rate bigint NOT NULL DEFAULT 0;
+
+CREATE TABLE `cd_invite_level`
+(
+  `id`              bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `name`            varchar(100),
+  `icon`            varchar(100) NOT NULL DEFAULT 'fluent-emoji-flat:2nd-place-medal',
+  `sort`            bigint NOT NULL DEFAULT 0,
+  `min_amount`      bigint NOT NULL DEFAULT 0,
+  `commission_rate` bigint NOT NULL DEFAULT 0,
+  `level_type`      varchar(30) NOT NULL DEFAULT 'normal',
+  `disabled`        boolean NOT NULL DEFAULT false,
+  `create_time`     datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time`     datetime NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+CREATE INDEX `index_invite_level_sort` ON `cd_invite_level` (`sort`);
+
+CREATE TABLE `cd_invite_user_plan`
+(
+  `id`             bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `user_id`        bigint,
+  `enabled`        boolean NOT NULL DEFAULT false,
+  `level_id`       bigint NOT NULL DEFAULT 0,
+  `level_locked`   boolean NOT NULL DEFAULT false,
+  `agreement_time` bigint NOT NULL DEFAULT 0,
+  `create_time`    datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time`    datetime NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+CREATE UNIQUE INDEX `index_invite_user_plan_user_id` ON `cd_invite_user_plan` (`user_id`);
+
+INSERT INTO `cd_invite_level` (`name`, `icon`, `sort`, `min_amount`, `commission_rate`, `level_type`, `disabled`)
+VALUES ('青铜', 'fluent-emoji-flat:2nd-place-medal', 10, 0, 10, 'normal', false),
+       ('白银', 'fluent-emoji-flat:1st-place-medal', 20, 100000, 15, 'normal', false),
+       ('黄金', 'fluent-emoji-flat:3rd-place-medal', 30, 500000, 20, 'normal', false),
+       ('钻石', 'streamline-color:diamond-2', 40, 1000000, 30, 'normal', false);

packages/ui/certd-server/db/migration-pg/v10045__invite_commission.sql

@@ -0,0 +1,89 @@
+ALTER TABLE cd_trade ADD COLUMN rebate_amount bigint NOT NULL DEFAULT 0;
+ALTER TABLE cd_trade ADD COLUMN third_party_pay_amount bigint NOT NULL DEFAULT 0;
+
+CREATE TABLE "cd_invite_code"
+(
+  "id"          bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+  "user_id"     bigint,
+  "code"        varchar(50),
+  "disabled"    boolean  NOT NULL DEFAULT (false),
+  "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE UNIQUE INDEX "index_invite_code_user_id" ON "cd_invite_code" ("user_id");
+CREATE UNIQUE INDEX "index_invite_code_code" ON "cd_invite_code" ("code");
+
+CREATE TABLE "cd_invite_relation"
+(
+  "id"              bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+  "inviter_user_id" bigint,
+  "invitee_user_id" bigint,
+  "invite_code"     varchar(50),
+  "create_time"     timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time"     timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE INDEX "index_invite_relation_inviter" ON "cd_invite_relation" ("inviter_user_id");
+CREATE UNIQUE INDEX "index_invite_relation_invitee" ON "cd_invite_relation" ("invitee_user_id");
+
+CREATE TABLE "cd_user_wallet"
+(
+  "id"                      bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+  "user_id"                 bigint,
+  "total_amount"            bigint NOT NULL DEFAULT 0,
+  "frozen_amount"           bigint NOT NULL DEFAULT 0,
+  "total_income_amount"     bigint NOT NULL DEFAULT 0,
+  "total_consumed_amount"   bigint NOT NULL DEFAULT 0,
+  "total_withdraw_amount"   bigint NOT NULL DEFAULT 0,
+  "create_time"             timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time"             timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE UNIQUE INDEX "index_user_wallet_user_id" ON "cd_user_wallet" ("user_id");
+
+CREATE TABLE "cd_invite_commission_log"
+(
+  "id"              bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+  "user_id"         bigint,
+  "amount"          bigint,
+  "trade_id"        bigint,
+  "invitee_user_id" bigint,
+  "consume_amount"  bigint NOT NULL DEFAULT 0,
+  "remark"          varchar(2048),
+  "create_time"     timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time"     timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE INDEX "index_invite_log_user_id" ON "cd_invite_commission_log" ("user_id");
+
+CREATE TABLE "cd_user_wallet_log"
+(
+  "id"              bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+  "user_id"         bigint,
+  "type"            varchar(50),
+  "amount"          bigint,
+  "balance_after"   bigint,
+  "trade_id"        bigint,
+  "withdraw_id"     bigint,
+  "remark"          varchar(2048),
+  "create_time"     timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time"     timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE INDEX "index_user_wallet_log_user_id" ON "cd_user_wallet_log" ("user_id");
+
+CREATE TABLE "cd_user_wallet_withdraw"
+(
+  "id"             bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+  "user_id"        bigint,
+  "amount"         bigint,
+  "status"         varchar(50),
+  "channel"        varchar(50),
+  "real_name"      varchar(100),
+  "account"        varchar(200),
+  "bank_name"      varchar(200),
+  "qr_code"        varchar(512),
+  "audit_user_id"  bigint,
+  "audit_remark"   varchar(2048),
+  "audit_time"     bigint,
+  "create_time"    timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time"    timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE INDEX "index_user_wallet_withdraw_user_id" ON "cd_user_wallet_withdraw" ("user_id");
+CREATE INDEX "index_user_wallet_withdraw_status" ON "cd_user_wallet_withdraw" ("status");

packages/ui/certd-server/db/migration-pg/v10046__incentive_plan.sql

@@ -0,0 +1,36 @@
+ALTER TABLE cd_invite_commission_log ADD COLUMN level_id bigint NOT NULL DEFAULT 0;
+ALTER TABLE cd_invite_commission_log ADD COLUMN commission_rate bigint NOT NULL DEFAULT 0;
+
+CREATE TABLE "cd_invite_level"
+(
+  "id"              bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+  "name"            varchar(100),
+  "icon"            varchar(100) NOT NULL DEFAULT 'fluent-emoji-flat:2nd-place-medal',
+  "sort"            bigint NOT NULL DEFAULT 0,
+  "min_amount"      bigint NOT NULL DEFAULT 0,
+  "commission_rate" bigint NOT NULL DEFAULT 0,
+  "level_type"      varchar(30) NOT NULL DEFAULT 'normal',
+  "disabled"        boolean NOT NULL DEFAULT (false),
+  "create_time"     timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time"     timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE INDEX "index_invite_level_sort" ON "cd_invite_level" ("sort");
+
+CREATE TABLE "cd_invite_user_plan"
+(
+  "id"             bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+  "user_id"        bigint,
+  "enabled"        boolean NOT NULL DEFAULT (false),
+  "level_id"       bigint NOT NULL DEFAULT 0,
+  "level_locked"   boolean NOT NULL DEFAULT (false),
+  "agreement_time" bigint NOT NULL DEFAULT 0,
+  "create_time"    timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time"    timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE UNIQUE INDEX "index_invite_user_plan_user_id" ON "cd_invite_user_plan" ("user_id");
+
+INSERT INTO "cd_invite_level" ("name", "icon", "sort", "min_amount", "commission_rate", "level_type", "disabled")
+VALUES ('青铜', 'fluent-emoji-flat:2nd-place-medal', 10, 0, 10, 'normal', false),
+       ('白银', 'fluent-emoji-flat:1st-place-medal', 20, 100000, 15, 'normal', false),
+       ('黄金', 'fluent-emoji-flat:3rd-place-medal', 30, 500000, 20, 'normal', false),
+       ('钻石', 'streamline-color:diamond-2', 40, 1000000, 30, 'normal', false);

packages/ui/certd-server/db/migration/v10045__invite_commission.sql

@@ -0,0 +1,89 @@
+ALTER TABLE cd_trade ADD COLUMN rebate_amount integer NOT NULL DEFAULT 0;
+ALTER TABLE cd_trade ADD COLUMN third_party_pay_amount integer NOT NULL DEFAULT 0;
+
+CREATE TABLE "cd_invite_code"
+(
+  "id"          integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  "user_id"     integer,
+  "code"        varchar(50),
+  "disabled"    boolean  NOT NULL DEFAULT (false),
+  "create_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE UNIQUE INDEX "index_invite_code_user_id" ON "cd_invite_code" ("user_id");
+CREATE UNIQUE INDEX "index_invite_code_code" ON "cd_invite_code" ("code");
+
+CREATE TABLE "cd_invite_relation"
+(
+  "id"              integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  "inviter_user_id" integer,
+  "invitee_user_id" integer,
+  "invite_code"     varchar(50),
+  "create_time"     datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time"     datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE INDEX "index_invite_relation_inviter" ON "cd_invite_relation" ("inviter_user_id");
+CREATE UNIQUE INDEX "index_invite_relation_invitee" ON "cd_invite_relation" ("invitee_user_id");
+
+CREATE TABLE "cd_user_wallet"
+(
+  "id"                      integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  "user_id"                 integer,
+  "total_amount"            integer NOT NULL DEFAULT 0,
+  "frozen_amount"           integer NOT NULL DEFAULT 0,
+  "total_income_amount"     integer NOT NULL DEFAULT 0,
+  "total_consumed_amount"   integer NOT NULL DEFAULT 0,
+  "total_withdraw_amount"   integer NOT NULL DEFAULT 0,
+  "create_time"             datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time"             datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE UNIQUE INDEX "index_user_wallet_user_id" ON "cd_user_wallet" ("user_id");
+
+CREATE TABLE "cd_invite_commission_log"
+(
+  "id"              integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  "user_id"         integer,
+  "amount"          integer,
+  "trade_id"        integer,
+  "invitee_user_id" integer,
+  "consume_amount"  integer NOT NULL DEFAULT 0,
+  "remark"          varchar(2048),
+  "create_time"     datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time"     datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE INDEX "index_invite_log_user_id" ON "cd_invite_commission_log" ("user_id");
+
+CREATE TABLE "cd_user_wallet_log"
+(
+  "id"              integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  "user_id"         integer,
+  "type"            varchar(50),
+  "amount"          integer,
+  "balance_after"   integer,
+  "trade_id"        integer,
+  "withdraw_id"     integer,
+  "remark"          varchar(2048),
+  "create_time"     datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time"     datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE INDEX "index_user_wallet_log_user_id" ON "cd_user_wallet_log" ("user_id");
+
+CREATE TABLE "cd_user_wallet_withdraw"
+(
+  "id"             integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  "user_id"        integer,
+  "amount"         integer,
+  "status"         varchar(50),
+  "channel"        varchar(50),
+  "real_name"      varchar(100),
+  "account"        varchar(200),
+  "bank_name"      varchar(200),
+  "qr_code"        varchar(512),
+  "audit_user_id"  integer,
+  "audit_remark"   varchar(2048),
+  "audit_time"     integer,
+  "create_time"    datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time"    datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE INDEX "index_user_wallet_withdraw_user_id" ON "cd_user_wallet_withdraw" ("user_id");
+CREATE INDEX "index_user_wallet_withdraw_status" ON "cd_user_wallet_withdraw" ("status");

packages/ui/certd-server/db/migration/v10046__incentive_plan.sql

@@ -0,0 +1,36 @@
+ALTER TABLE cd_invite_commission_log ADD COLUMN level_id integer NOT NULL DEFAULT 0;
+ALTER TABLE cd_invite_commission_log ADD COLUMN commission_rate integer NOT NULL DEFAULT 0;
+
+CREATE TABLE "cd_invite_level"
+(
+  "id"              integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  "name"            varchar(100),
+  "icon"            varchar(100) NOT NULL DEFAULT 'fluent-emoji-flat:2nd-place-medal',
+  "sort"            integer NOT NULL DEFAULT 0,
+  "min_amount"      integer NOT NULL DEFAULT 0,
+  "commission_rate" integer NOT NULL DEFAULT 0,
+  "level_type"      varchar(30) NOT NULL DEFAULT 'normal',
+  "disabled"        boolean NOT NULL DEFAULT (false),
+  "create_time"     datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time"     datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE INDEX "index_invite_level_sort" ON "cd_invite_level" ("sort");
+
+CREATE TABLE "cd_invite_user_plan"
+(
+  "id"             integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  "user_id"        integer,
+  "enabled"        boolean NOT NULL DEFAULT (false),
+  "level_id"       integer NOT NULL DEFAULT 0,
+  "level_locked"   boolean NOT NULL DEFAULT (false),
+  "agreement_time" integer NOT NULL DEFAULT 0,
+  "create_time"    datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time"    datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+CREATE UNIQUE INDEX "index_invite_user_plan_user_id" ON "cd_invite_user_plan" ("user_id");
+
+INSERT INTO "cd_invite_level" ("name", "icon", "sort", "min_amount", "commission_rate", "level_type", "disabled")
+VALUES ('青铜', 'fluent-emoji-flat:2nd-place-medal', 10, 0, 10, 'normal', false),
+       ('白银', 'fluent-emoji-flat:1st-place-medal', 20, 100000, 15, 'normal', false),
+       ('黄金', 'fluent-emoji-flat:3rd-place-medal', 30, 500000, 20, 'normal', false),
+       ('钻石', 'streamline-color:diamond-2', 40, 1000000, 30, 'normal', false);

packages/ui/certd-server/db/migration/v10047__access_subtype_dns_persist.sql

@@ -0,0 +1,31 @@
+ALTER TABLE cd_access ADD COLUMN subtype varchar(100);
+CREATE INDEX "index_access_subtype" ON "cd_access" ("subtype");
+
+CREATE TABLE "cd_dns_persist_record"
+(
+  "id"                     integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  "user_id"                integer      NOT NULL,
+  "project_id"             integer,
+  "domain"                 varchar(255) NOT NULL,
+  "main_domain"            varchar(255) NOT NULL,
+  "ca_type"                varchar(50)  NOT NULL,
+  "acme_account_access_id" integer      NOT NULL,
+  "account_uri"            varchar(512) NOT NULL,
+  "host_record"            varchar(255) NOT NULL,
+  "record_value"           text         NOT NULL,
+  "policy"                 varchar(50),
+  "persist_until"          integer,
+  "status"                 varchar(50)  NOT NULL DEFAULT 'pending',
+  "dns_provider_type"      varchar(50),
+  "dns_provider_access"    integer,
+  "record_res"             text,
+  "disabled"               integer      NOT NULL DEFAULT 0,
+  "create_time"            datetime     NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time"            datetime     NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+
+CREATE INDEX "index_dns_persist_user_id" ON "cd_dns_persist_record" ("user_id");
+CREATE INDEX "index_dns_persist_project_id" ON "cd_dns_persist_record" ("project_id");
+CREATE INDEX "index_dns_persist_domain" ON "cd_dns_persist_record" ("domain");
+CREATE INDEX "index_dns_persist_main_domain" ON "cd_dns_persist_record" ("main_domain");
+CREATE INDEX "index_dns_persist_account" ON "cd_dns_persist_record" ("acme_account_access_id");

packages/ui/certd-server/src/configuration.ts

@@ -137,7 +137,6 @@ export class MainConfiguration {
     });
 
     logger.info('当前环境：', this.app.getEnv()); // prod
-    // throw new Error("address family not supported")
-
+    
   }
 }

packages/ui/certd-server/src/controller/basic/file-controller.test.ts

@@ -3,7 +3,7 @@
 
 import assert from "node:assert/strict";
 
-import { getImageDownloadOptions, isImageFile } from "./file-controller.js";
+import { FileController, getImageDownloadOptions, isImageFile } from "./file-controller.js";
 
 describe("FileController.isImageFile", () => {
   it("detects uploaded logo image files", () => {
@@ -37,3 +37,23 @@ describe("FileController.isImageFile", () => {
     assert.equal(getImageDownloadOptions("data/upload/private/user/cert.pem"), undefined);
   });
 });
+
+describe("FileController.upload", () => {
+  it("auto saves uploaded file to public directory when autoSave is true", async () => {
+    const controller = new FileController();
+    controller.fileService = {
+      async saveFile(userId: number, key: string, permission: string) {
+        assert.equal(userId, 1);
+        assert.equal(permission, "public");
+        assert.equal(key.startsWith("tmpfile_key_"), true);
+        return "/public/1/logo.png";
+      },
+    } as any;
+    controller.ctx = { user: { id: 1 } } as any;
+
+    const res = await controller.upload([{ filename: "logo.png", data: "tmp/logo.png" }] as any, {}, "true");
+
+    assert.equal(res.data.key, "/public/1/logo.png");
+    assert.equal(res.data.url, "/api/basic/file/download?key=%2Fpublic%2F1%2Flogo.png");
+  });
+});

packages/ui/certd-server/src/controller/basic/file-controller.ts

@@ -1,9 +1,10 @@
 import { Controller, Fields, Files, Get, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { BaseController, Constants, FileService, UploadFileItem, uploadTmpFileCacheKey } from '@certd/lib-server';
+import { BaseController, Constants, FileService, PermissionException, UploadFileItem, uploadTmpFileCacheKey } from '@certd/lib-server';
 import send from 'koa-send';
 import { nanoid } from 'nanoid';
 import { cache } from '@certd/basic';
 import { UploadFileInfo } from '@midwayjs/upload';
+import { AuthService } from '../../modules/sys/authority/service/auth-service.js';
 
 const imageExtSet = new Set(['.apng', '.avif', '.bmp', '.gif', '.ico', '.jpeg', '.jpg', '.png', '.svg', '.webp']);
 const imageCacheSeconds = 3 * 24 * 60 * 60;
@@ -32,8 +33,11 @@ export class FileController extends BaseController {
   @Inject()
   fileService: FileService;
 
+  @Inject()
+  authService: AuthService;
+
   @Post('/upload', { description: Constants.per.authOnly })
-  async upload(@Files() files: UploadFileInfo<string>[], @Fields() fields: any) {
+  async upload(@Files() files: UploadFileInfo<string>[], @Fields() fields: any, @Query('autoSave') autoSave: string) {
     console.log('files', files, fields);
     const cacheKey = uploadTmpFileCacheKey + nanoid();
     const file = files[0];
@@ -47,22 +51,42 @@ export class FileController extends BaseController {
         ttl: 1000 * 60 * 60,
       }
     );
+    if (autoSave === 'true') {
+      const key = await this.fileService.saveFile(this.getUserId(), cacheKey, 'public');
+      return this.ok({
+        key,
+        url: `/api/basic/file/download?key=${encodeURIComponent(key)}`,
+      });
+    }
     return this.ok({
       key: cacheKey,
     });
   }
 
-  @Get('/download', { description: Constants.per.guest })
+  @Get('/download', { description: Constants.per.guestOptionalAuth })
   async download(@Query('key') key: string) {
-    let userId: any = null;
-    if (!key.startsWith('/public')) {
-      userId = this.getUserId();
-    }
-    const filePath = this.fileService.getFile(key, userId);
+    const filePath = this.getDownloadFilePath(key);
     const sendOptions = getImageDownloadOptions(filePath);
     if (!sendOptions) {
       this.ctx.response.attachment(filePath);
     }
     await send(this.ctx, filePath, sendOptions);
   }
+
+  private getDownloadFilePath(key: string) {
+    const isPrivateFile = !key.startsWith('/public');
+    const userId = isPrivateFile ? this.getUserId() : null;
+    try {
+      return this.fileService.getFile(key, userId);
+    } catch (e) {
+      if (!(e instanceof PermissionException) || !isPrivateFile || !this.authService.isAdmin(this.ctx)) {
+        throw e;
+      }
+      const adminFilePath = this.fileService.getFile(key, userId, true);
+      if (!isImageFile(adminFilePath)) {
+        throw e;
+      }
+      return adminFilePath;
+    }
+  }
 }

packages/ui/certd-server/src/controller/basic/login/login-controller.ts

@@ -64,6 +64,7 @@ export class LoginController extends BaseController {
       mobile: body.mobile,
       smsCode: body.smsCode,
       randomStr: body.randomStr,
+      inviteCode: body.inviteCode,
     });
 
     this.writeTokenCookie(token);

packages/ui/certd-server/src/controller/basic/login/register-controller.ts

@@ -3,6 +3,7 @@ import { BaseController, Constants, SysSettingsService } from '@certd/lib-server
 import { RegisterType, UserService } from '../../../modules/sys/authority/service/user-service.js';
 import { CodeService } from '../../../modules/basic/service/code-service.js';
 import { checkComm, checkPlus } from '@certd/plus-core';
+import { InviteService } from '@certd/commercial-core';
 
 export type RegisterReq = {
   type: RegisterType;
@@ -14,6 +15,7 @@ export type RegisterReq = {
 
   validateCode: string;
   captcha:any;
+  inviteCode?: string;
 };
 
 /**
@@ -29,6 +31,9 @@ export class RegisterController extends BaseController {
   @Inject()
   sysSettingsService: SysSettingsService;
 
+  @Inject()
+  inviteService: InviteService;
+
   @Post('/register', { description: Constants.per.guest })
   public async register(
     @Body(ALL)
@@ -53,10 +58,13 @@ export class RegisterController extends BaseController {
       }
 
       await this.codeService.checkCaptcha(body.captcha,{remoteIp});
-      const newUser = await this.userService.register(body.type, {
+      const registerUser = {
         username: body.username,
         password: body.password,
-      } as any);
+      } as any;
+      const newUser = await this.userService.register(body.type, registerUser, async txManager => {
+        await this.inviteService.bindInvitee(registerUser.id, body.inviteCode, txManager);
+      });
       return this.ok(newUser);
     } else if (body.type === 'mobile') {
       if (sysPublicSettings.mobileRegisterEnabled === false) {
@@ -70,12 +78,15 @@ export class RegisterController extends BaseController {
         smsCode: body.validateCode,
         throwError: true,
       });
-      const newUser = await this.userService.register(body.type, {
+      const registerUser = {
         username: body.username,
         phoneCode: body.phoneCode,
         mobile: body.mobile,
         password: body.password,
-      } as any);
+      } as any;
+      const newUser = await this.userService.register(body.type, registerUser, async txManager => {
+        await this.inviteService.bindInvitee(registerUser.id, body.inviteCode, txManager);
+      });
       return this.ok(newUser);
     } else if (body.type === 'email') {
       if (sysPublicSettings.emailRegisterEnabled === false) {
@@ -87,11 +98,14 @@ export class RegisterController extends BaseController {
         validateCode: body.validateCode,
         throwError: true,
       });
-      const newUser = await this.userService.register(body.type, {
+      const registerUser = {
         username: body.username,
         email: body.email,
         password: body.password,
-      } as any);
+      } as any;
+      const newUser = await this.userService.register(body.type, registerUser, async txManager => {
+        await this.inviteService.bindInvitee(registerUser.id, body.inviteCode, txManager);
+      });
       return this.ok(newUser);
     }
   }

packages/ui/certd-server/src/controller/basic/settings-controller.ts

@@ -11,6 +11,7 @@ import {
   SysSuiteSetting
 } from "@certd/lib-server";
 import { AppKey, getPlusInfo, isComm } from "@certd/plus-core";
+import { SysInviteCommissionSetting } from "@certd/commercial-core";
 import { cloneDeep } from "lodash-es";
 import { getVersion } from "../../utils/version.js";
 import { http } from "@certd/basic";
@@ -57,6 +58,16 @@ export class BasicSettingsController extends BaseController {
     };
   }
 
+  public async getInviteSetting() {
+    if (!isComm()) {
+      return { enabled: false };
+    }
+    const setting = await this.sysSettingsService.getSetting<SysInviteCommissionSetting>(SysInviteCommissionSetting);
+    return {
+      enabled: setting.enabled,
+    };
+  }
+
   public async getSiteEnv() {
     const env: SysSiteEnv = {
       agent: this.agentConfig
@@ -92,6 +103,7 @@ export class BasicSettingsController extends BaseController {
     const plusInfo = await this.plusInfo();
     const headerMenus = await this.getHeaderMenus();
     const suiteSetting = await this.getSuiteSetting();
+    const inviteSetting = await this.getInviteSetting();
     const version = await getVersion();
     return this.ok({
       sysPublic,
@@ -101,6 +113,7 @@ export class BasicSettingsController extends BaseController {
       plusInfo,
       headerMenus,
       suiteSetting,
+      inviteSetting,
       app: {
         time: new Date().getTime(),
         version

packages/ui/certd-server/src/controller/user/cert/dns-persist-record-controller.ts

@@ -0,0 +1,91 @@
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
+import { Constants, CrudController } from "@certd/lib-server";
+import { ApiTags } from "@midwayjs/swagger";
+import { DnsPersistRecordService } from "../../../modules/cert/service/dns-persist-record-service.js";
+
+@Provide()
+@Controller("/api/cert/dns-persist")
+@ApiTags(["cert"])
+export class DnsPersistRecordController extends CrudController<DnsPersistRecordService> {
+  @Inject()
+  service: DnsPersistRecordService;
+
+  getService(): DnsPersistRecordService {
+    return this.service;
+  }
+
+  @Post("/page", { description: Constants.per.authOnly, summary: "查询DNS持久验证记录分页列表" })
+  async page(@Body(ALL) body: any) {
+    const { projectId, userId } = await this.getProjectUserIdRead();
+    body.query = body.query ?? {};
+    body.query.projectId = projectId;
+    body.query.userId = userId;
+    return super.page(body);
+  }
+
+  @Post("/add", { description: Constants.per.authOnly, summary: "添加DNS持久验证记录" })
+  async add(@Body(ALL) bean: any) {
+    const { projectId, userId } = await this.getProjectUserIdWrite();
+    bean.projectId = projectId;
+    bean.userId = userId;
+    return super.add(bean);
+  }
+
+  @Post("/update", { description: Constants.per.authOnly, summary: "更新DNS持久验证记录" })
+  async update(@Body(ALL) bean: any) {
+    await this.checkOwner(this.getService(), bean.id, "write");
+    delete bean.userId;
+    delete bean.projectId;
+    return super.update(bean);
+  }
+
+  @Post("/info", { description: Constants.per.authOnly, summary: "查询DNS持久验证记录详情" })
+  async info(@Query("id") id: number) {
+    await this.checkOwner(this.getService(), id, "read");
+    return super.info(id);
+  }
+
+  @Post("/delete", { description: Constants.per.authOnly, summary: "删除DNS持久验证记录" })
+  async delete(@Query("id") id: number) {
+    await this.checkOwner(this.getService(), id, "write");
+    await this.service.delete(id as any);
+    return this.ok({
+      message: this.service.lastDeleteMessage,
+    });
+  }
+
+  @Post("/build", { description: Constants.per.authOnly, summary: "生成DNS持久验证记录值" })
+  async build(@Body(ALL) body: { domain: string; accountUri: string; wildcard?: boolean; persistUntil?: number }) {
+    const { projectId, userId } = await this.getProjectUserIdRead();
+    return this.ok(await this.service.buildRecord({ ...body, userId, projectId }));
+  }
+
+  @Post("/getByDomain", { description: Constants.per.authOnly, summary: "根据域名获取或创建DNS持久验证记录" })
+  async getByDomain(@Body(ALL) body: { domain: string; caType?: string; acmeAccountAccessId?: number; commonAcmeAccountAccessId?: number; wildcard?: boolean; persistUntil?: number; createOnNotFound?: boolean }) {
+    const { projectId, userId } = await this.getProjectUserIdWrite();
+    return this.ok(await this.service.getByDomain({ ...body, userId, projectId }));
+  }
+
+  @Post("/check", { description: Constants.per.authOnly, summary: "校验DNS持久验证记录" })
+  async check(@Body(ALL) body: { hostRecord: string; recordValue: string }) {
+    return this.ok(await this.service.checkRecord(body));
+  }
+
+  @Post("/verify", { description: Constants.per.authOnly, summary: "验证DNS持久验证记录" })
+  async verify(@Body(ALL) body: { id: number }) {
+    await this.checkOwner(this.getService(), body.id, "write");
+    return this.ok(await this.service.verify(body.id));
+  }
+
+  @Post("/triggerVerify", { description: Constants.per.authOnly, summary: "后台验证DNS持久验证记录" })
+  async triggerVerify(@Body(ALL) body: { id: number }) {
+    await this.checkOwner(this.getService(), body.id, "write");
+    return this.ok(await this.service.triggerVerify(body.id));
+  }
+
+  @Post("/createTxt", { description: Constants.per.authOnly, summary: "一键创建DNS持久验证TXT记录" })
+  async createTxt(@Body(ALL) body: { id: number; dnsProviderType?: string; dnsProviderAccess?: number }) {
+    await this.checkOwner(this.getService(), body.id, "write");
+    return this.ok(await this.service.createDnsTxt(body));
+  }
+}

packages/ui/certd-server/src/middleware/authority.test.ts

@@ -0,0 +1,56 @@
+/// <reference types="mocha" />
+/// <reference types="node" />
+
+import assert from "node:assert/strict";
+import jwt from "jsonwebtoken";
+import { Constants } from "@certd/lib-server";
+import { AuthorityMiddleware } from "./authority.js";
+
+function createMiddleware(permission: string) {
+  const middleware = new AuthorityMiddleware();
+  middleware.secret = "test-secret";
+  middleware.webRouterService = {
+    async getMatchedRouterInfo() {
+      return { description: permission };
+    },
+  } as any;
+  return middleware;
+}
+
+function createCtx(token?: string) {
+  return {
+    path: "/api/basic/file/download",
+    method: "GET",
+    query: token ? { token } : {},
+    headers: {},
+    get() {
+      return "";
+    },
+  } as any;
+}
+
+describe("AuthorityMiddleware guestOptionalAuth", () => {
+  it("continues without user when token is not provided", async () => {
+    const middleware = createMiddleware(Constants.per.guestOptionalAuth);
+    const ctx = createCtx();
+    let called = false;
+
+    await middleware.resolve()(ctx, async () => {
+      called = true;
+    });
+
+    assert.equal(called, true);
+    assert.equal(ctx.user, undefined);
+  });
+
+  it("sets user when token is provided", async () => {
+    const middleware = createMiddleware(Constants.per.guestOptionalAuth);
+    const token = jwt.sign({ id: 1, roles: [1] }, middleware.secret);
+    const ctx = createCtx(token);
+
+    await middleware.resolve()(ctx, async () => {});
+
+    assert.equal(ctx.user.id, 1);
+    assert.deepEqual(ctx.user.roles, [1]);
+  });
+});

packages/ui/certd-server/src/middleware/authority.ts

@@ -52,29 +52,7 @@ export class AuthorityMiddleware implements IWebMiddleware {
         return;
       }
 
-      let token = ctx.get('Authorization') || '';
-      token = token.replace('Bearer ', '').trim();
-      if (!token) {
-        //尝试从cookie中获取token
-        const cookie = ctx.headers.cookie;
-        if (cookie) {
-          const items = cookie.split(';');
-          for (const item of items) {
-            if (!item  || !item.trim()) {
-              continue;
-            }
-            const [key, value] = item.split('=');
-            if (key.trim() === 'certd_token') {
-              token = value.trim();
-              break;
-            }
-          }
-        }
-      }
-      if (!token) {
-        //尝试从query中获取token
-        token = (ctx.query.token as string) || '';
-      }
+      const token = this.getTokenFromRequest(ctx);
 
       if (token) {
         try {
@@ -84,6 +62,10 @@ export class AuthorityMiddleware implements IWebMiddleware {
           return this.notAuth(ctx);
         }
       } else {
+        if (permission === Constants.per.guestOptionalAuth) {
+          await next();
+          return;
+        }
         //找找openKey
         const openKey = await this.doOpenHandler(ctx);
         if (!openKey) {
@@ -101,6 +83,10 @@ export class AuthorityMiddleware implements IWebMiddleware {
         await next();
         return;
       }
+      if (permission === Constants.per.guestOptionalAuth) {
+        await next();
+        return;
+      }
 
       const pass = await this.authService.checkPermission(ctx, permission);
       if (!pass) {
@@ -123,6 +109,30 @@ export class AuthorityMiddleware implements IWebMiddleware {
     return;
   }
 
+  private getTokenFromRequest(ctx: IMidwayKoaContext) {
+    let token = ctx.get('Authorization') || '';
+    token = token.replace('Bearer ', '').trim();
+    if (token) {
+      return token;
+    }
+
+    const cookie = ctx.headers.cookie;
+    if (cookie) {
+      const items = cookie.split(';');
+      for (const item of items) {
+        if (!item  || !item.trim()) {
+          continue;
+        }
+        const [key, value] = item.split('=');
+        if (key.trim() === 'certd_token') {
+          return value.trim();
+        }
+      }
+    }
+
+    return (ctx.query.token as string) || '';
+  }
+
   async doOpenHandler(ctx: IMidwayKoaContext) {
     //开放接口
     const openKey = ctx.get('x-certd-token') || '';

packages/ui/certd-server/src/modules/auto/fix/auto-fix.test.ts

@@ -44,14 +44,28 @@ describe("AutoFix", () => {
         return true;
       },
     } as any;
+    autoFix.legacyAcmeAccountAccessFix = {
+      async init() {
+        calls.push("legacy-acme");
+        return true;
+      },
+    } as any;
+    autoFix.commonEabToAcmeAccountFix = {
+      async init() {
+        calls.push("common-eab-acme");
+        return true;
+      },
+    } as any;
 
     await autoFix.init();
 
-    assert.deepEqual(calls, ["google", "cert", "suite"]);
+    assert.deepEqual(calls, ["google", "cert", "suite", "legacy-acme", "common-eab-acme"]);
     assert.equal(savedSetting.fixed["google-common-eab-account-key"], true);
     assert.equal(savedSetting.fixed["oauth-subtype-bound-type"], true);
     assert.equal(savedSetting.fixed["cert-info-wildcard-domain-count"], true);
     assert.equal(savedSetting.fixed["suite-content-wildcard-domain-count"], true);
+    assert.equal(savedSetting.fixed["legacy-acme-account-access"], true);
+    assert.equal(savedSetting.fixed["common-eab-to-acme-account"], true);
   });
 
   it("initializes missing fixed map", async () => {
@@ -66,6 +80,8 @@ describe("AutoFix", () => {
     autoFix.oauthSubtypeBoundTypeFix = { async init() {} } as any;
     autoFix.certInfoWildcardDomainCountFix = { async init() {} } as any;
     autoFix.suiteContentWildcardDomainCountFix = { async init() {} } as any;
+    autoFix.legacyAcmeAccountAccessFix = { async init() {} } as any;
+    autoFix.commonEabToAcmeAccountFix = { async init() {} } as any;
 
     await autoFix.init();
   });

packages/ui/certd-server/src/modules/auto/fix/auto-fix.ts

@@ -4,6 +4,8 @@ import { GoogleCommonEabAccountKeyFix } from "./google-common-eab-account-key-fi
 import { OauthSubtypeBoundTypeFix } from "./oauth-subtype-bound-type-fix.js";
 import { CertInfoWildcardDomainCountFix } from "./cert-info-wildcard-domain-count-fix.js";
 import { SuiteContentWildcardDomainCountFix } from "./suite-content-wildcard-domain-count-fix.js";
+import { LegacyAcmeAccountAccessFix } from "./legacy-acme-account-access-fix.js";
+import { CommonEabToAcmeAccountFix } from "./common-eab-to-acme-account-fix.js";
 
 type AutoFixTask = {
   key: string;
@@ -30,6 +32,12 @@ export class AutoFix {
   @Inject()
   suiteContentWildcardDomainCountFix: SuiteContentWildcardDomainCountFix;
 
+  @Inject()
+  legacyAcmeAccountAccessFix: LegacyAcmeAccountAccessFix;
+
+  @Inject()
+  commonEabToAcmeAccountFix: CommonEabToAcmeAccountFix;
+
   async init() {
     const setting = await this.sysSettingsService.getSetting<SysAutoFixSetting>(SysAutoFixSetting);
     setting.fixed = setting.fixed || {};
@@ -50,6 +58,14 @@ export class AutoFix {
         key: "suite-content-wildcard-domain-count",
         fix: this.suiteContentWildcardDomainCountFix,
       },
+      {
+        key: "legacy-acme-account-access",
+        fix: this.legacyAcmeAccountAccessFix,
+      },
+      {
+        key: "common-eab-to-acme-account",
+        fix: this.commonEabToAcmeAccountFix,
+      },
     ];
 
     for (const task of tasks) {

packages/ui/certd-server/src/modules/auto/fix/common-eab-to-acme-account-fix.test.ts

@@ -0,0 +1,135 @@
+import assert from "assert";
+import { buildLegacyCommonEabAccountStorageWhere, CommonEabToAcmeAccountFix, parseEabAccountKey } from "./common-eab-to-acme-account-fix.js";
+import { AcmeService } from "../../../plugins/plugin-cert/plugin/cert-plugin/acme.js";
+
+describe("CommonEabToAcmeAccountFix", () => {
+  it("parses legacy EAB account key payload", () => {
+    assert.equal(
+      parseEabAccountKey(
+        JSON.stringify({
+          kid: "kid-1",
+          privateKey: "private-key",
+        })
+      ),
+      "private-key"
+    );
+  });
+
+  it("builds legacy common EAB account storage query", () => {
+    assert.deepEqual(buildLegacyCommonEabAccountStorageWhere("google", 12), {
+      userId: 0,
+      scope: "user",
+      namespace: "0",
+      key: "acme.config.google.access.12",
+    });
+  });
+
+  it("creates common acme account from common eab and legacy storage", async () => {
+    let addParam: any;
+    const fix = new CommonEabToAcmeAccountFix();
+    fix.accessService = {
+      async getAccessById(id: number) {
+        assert.equal(id, 12);
+        return {
+          accountKey: JSON.stringify({
+            privateKey: "private-key",
+          }),
+          email: "common@example.com",
+        };
+      },
+      async findOne() {
+        return null;
+      },
+      async add(param: any) {
+        addParam = param;
+        return { id: 99 };
+      },
+    } as any;
+    fix.storageService = {
+      getRepository() {
+        return {
+          async findOne(options: any) {
+            assert.deepEqual(options.where, buildLegacyCommonEabAccountStorageWhere("google", 12));
+            return {
+              value: JSON.stringify({
+                value: {
+                  accountUrl: "https://example.com/acct/1",
+                },
+              }),
+            };
+          },
+        };
+      },
+    } as any;
+
+    const id = await fix.createCommonAcmeAccountFromEab("google", 12);
+
+    assert.equal(id, 99);
+    assert.equal(addParam.userId, 0);
+    assert.equal(addParam.type, "acmeAccount");
+    const setting = JSON.parse(addParam.setting);
+    const account = JSON.parse(setting.account);
+    assert.equal(account.accountKey, "private-key");
+    assert.equal(account.accountUri, "https://example.com/acct/1");
+  });
+
+  it("creates common acme account by resolving account uri from eab private key", async () => {
+    const original = AcmeService.prototype.getAcmeClient;
+    const calls: string[] = [];
+    AcmeService.prototype.getAcmeClient = async function (email: string) {
+      calls.push(email);
+      return {
+        getAccountUrl() {
+          return "https://example.com/acct/generated";
+        },
+      } as any;
+    };
+
+    try {
+      let addParam: any;
+      const fix = new CommonEabToAcmeAccountFix();
+      fix.accessService = {
+        async getAccessById(id: number) {
+          assert.equal(id, 12);
+          return {
+            id: 12,
+            kid: "kid-1",
+            hmacKey: "hmac-1",
+            accountKey: JSON.stringify({
+              kid: "kid-1",
+              privateKey: "private-key",
+            }),
+            email: "common@example.com",
+          };
+        },
+        async findOne() {
+          return null;
+        },
+        async add(param: any) {
+          addParam = param;
+          return { id: 100 };
+        },
+      } as any;
+      fix.storageService = {
+        getRepository() {
+          return {
+            async findOne() {
+              return null;
+            },
+          };
+        },
+      } as any;
+
+      const id = await fix.createCommonAcmeAccountFromEab("google", 12);
+
+      assert.equal(id, 100);
+      assert.deepEqual(calls, ["common@example.com"]);
+      const setting = JSON.parse(addParam.setting);
+      const account = JSON.parse(setting.account);
+      assert.equal(account.accountKey, "private-key");
+      assert.equal(account.accountUri, "https://example.com/acct/generated");
+    } finally {
+      AcmeService.prototype.getAcmeClient = original;
+    }
+  });
+});