From eb46f8c7764142a9a79efe4525954cd7c010a283 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Wed, 4 Feb 2026 15:49:01 +0800
Subject: [PATCH 01/62] =?UTF-8?q?chore:=20=E4=BC=81=E4=B8=9A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=BC=8F=E5=88=9D=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/system/settings/service/models.ts     |  2 +
 .../src/user/access/entity/access.ts          |  3 +
 .../lib-server/src/user/addon/entity/addon.ts |  3 +
 .../src/locales/langs/en-US/certd.ts          |  4 ++
 .../src/locales/langs/zh-CN/certd.ts          |  4 ++
 .../src/store/settings/api.basic.ts           |  3 +
 .../src/views/sys/settings/index.vue          |  5 ++
 .../src/views/sys/settings/tabs/base.vue      |  6 +-
 .../src/views/sys/settings/tabs/mode.vue      | 67 +++++++++++++++++++
 .../db/migration/v10038__admin_mode.sql       | 53 +++++++++++++++
 .../src/modules/monitor/entity/cert-info.ts   |  3 +
 .../src/modules/monitor/entity/site-info.ts   |  3 +
 .../src/modules/monitor/entity/site-ip.ts     |  2 +
 .../src/modules/open/entity/open-key.ts       |  3 +
 .../modules/pipeline/entity/history-log.ts    |  3 +
 .../src/modules/pipeline/entity/history.ts    |  4 ++
 .../modules/pipeline/entity/notification.ts   |  3 +
 .../modules/pipeline/entity/pipeline-group.ts |  3 +
 .../src/modules/pipeline/entity/pipeline.ts   |  3 +
 .../src/modules/pipeline/entity/storage.ts    |  3 +
 .../src/modules/pipeline/entity/template.ts   |  3 +
 .../src/modules/sys/audit/entity/audit-log.ts | 43 ++++++++++++
 .../sys/enterprise/entity/project-user.ts     | 31 +++++++++
 .../modules/sys/enterprise/entity/project.ts  | 31 +++++++++
 24 files changed, 285 insertions(+), 3 deletions(-)
 create mode 100644 packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
 create mode 100644 packages/ui/certd-server/db/migration/v10038__admin_mode.sql
 create mode 100644 packages/ui/certd-server/src/modules/sys/audit/entity/audit-log.ts
 create mode 100644 packages/ui/certd-server/src/modules/sys/enterprise/entity/project-user.ts
 create mode 100644 packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts

diff --git a/packages/libs/lib-server/src/system/settings/service/models.ts b/packages/libs/lib-server/src/system/settings/service/models.ts
index 1b9a8128d..69eb81a6f 100644
--- a/packages/libs/lib-server/src/system/settings/service/models.ts
+++ b/packages/libs/lib-server/src/system/settings/service/models.ts
@@ -65,6 +65,8 @@ export class SysPublicSettings extends BaseSettings {
   }> = {};
 
   notice?: string;
+
+  adminMode?: "enterprise" | "saas" = "saas";
 }
 
 export class SysPrivateSettings extends BaseSettings {
diff --git a/packages/libs/lib-server/src/user/access/entity/access.ts b/packages/libs/lib-server/src/user/access/entity/access.ts
index d69128c72..fd635719e 100644
--- a/packages/libs/lib-server/src/user/access/entity/access.ts
+++ b/packages/libs/lib-server/src/user/access/entity/access.ts
@@ -21,6 +21,9 @@ export class AccessEntity {
   @Column({ name: 'encrypt_setting', comment: '已加密设置', length: 10240, nullable: true })
   encryptSetting: string;
 
+  @Column({ name: 'project_id', comment: '项目id' })
+  projectId: number;
+
   @Column({
     name: 'create_time',
     comment: '创建时间',
diff --git a/packages/libs/lib-server/src/user/addon/entity/addon.ts b/packages/libs/lib-server/src/user/addon/entity/addon.ts
index 4d16fb43b..438de2237 100644
--- a/packages/libs/lib-server/src/user/addon/entity/addon.ts
+++ b/packages/libs/lib-server/src/user/addon/entity/addon.ts
@@ -28,6 +28,9 @@ export class AddonEntity {
   @Column({ name: 'is_default', comment: '是否默认',  nullable: false, default: false })
   isDefault: boolean;
 
+  @Column({ name: 'project_id', comment: '项目id' })
+  projectId: number;
+
 
   @Column({
     name: 'create_time',
diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
index b1daa1bf4..96d6a2323 100644
--- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
@@ -861,4 +861,8 @@ export default {
     select: "Select",
     placeholder: "select please",
   },
+  adminMode: {
+    enterpriseMode: "Enterprise Mode",
+    saasMode: "SaaS Mode",
+  },
 };
diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
index d12f92ff6..34d78c3dd 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -876,4 +876,8 @@ export default {
     select: "选择",
     placeholder: "请选择",
   },
+  adminMode: {
+    enterpriseMode: "企业模式",
+    saasMode: "SaaS模式",
+  },
 };
diff --git a/packages/ui/certd-client/src/store/settings/api.basic.ts b/packages/ui/certd-client/src/store/settings/api.basic.ts
index 48a0012fb..57003d3fb 100644
--- a/packages/ui/certd-client/src/store/settings/api.basic.ts
+++ b/packages/ui/certd-client/src/store/settings/api.basic.ts
@@ -86,6 +86,9 @@ export type SysPublicSetting = {
   >;
   // 系统通知
   notice?: string;
+
+  // 管理员模式
+  adminMode?: "enterprise" | "saas";
 };
 export type SuiteSetting = {
   enabled?: boolean;
diff --git a/packages/ui/certd-client/src/views/sys/settings/index.vue b/packages/ui/certd-client/src/views/sys/settings/index.vue
index 962d75c8d..6c62109f5 100644
--- a/packages/ui/certd-client/src/views/sys/settings/index.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/index.vue
@@ -26,6 +26,9 @@
         <a-tab-pane key="pipeline" :tab="t('certd.sys.setting.pipelineSetting')">
           <SettingPipeline v-if="activeKey === 'pipeline'" />
         </a-tab-pane>
+        <a-tab-pane key="mode" :tab="t('certd.adminMode')">
+          <SettingMode v-if="activeKey === 'mode'" />
+        </a-tab-pane>
       </a-tabs>
     </div>
   </fs-page>
@@ -39,6 +42,8 @@ import SettingSafe from "/@/views/sys/settings/tabs/safe.vue";
 import SettingCaptcha from "/@/views/sys/settings/tabs/captcha.vue";
 import SettingPipeline from "/@/views/sys/settings/tabs/pipeline.vue";
 import SettingOauth from "/@/views/sys/settings/tabs/oauth.vue";
+import SettingMode from "/@/views/sys/settings/tabs/mode.vue";
+
 import { useRoute, useRouter } from "vue-router";
 import { ref } from "vue";
 import { useSettingStore } from "/@/store/settings";
diff --git a/packages/ui/certd-client/src/views/sys/settings/tabs/base.vue b/packages/ui/certd-client/src/views/sys/settings/tabs/base.vue
index 4b2b92189..9ff248372 100644
--- a/packages/ui/certd-client/src/views/sys/settings/tabs/base.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/tabs/base.vue
@@ -34,7 +34,9 @@
           <a-select-option value="ipv4first">{{ t("certd.ipv4Priority") }}</a-select-option>
           <a-select-option value="ipv6first">{{ t("certd.ipv6Priority") }}</a-select-option>
         </a-select>
-        <div class="helper">{{ t("certd.dualStackNetworkHelper") }}, <a href="https://certd.docmirror.cn/guide/use/setting/ipv6.html" target="_blank">{{ t("certd.helpDocLink") }}</a></div>
+        <div class="helper">
+          {{ t("certd.dualStackNetworkHelper") }}, <a href="https://certd.docmirror.cn/guide/use/setting/ipv6.html" target="_blank">{{ t("certd.helpDocLink") }}</a>
+        </div>
       </a-form-item>
 
       <a-form-item :label="t('certd.sys.setting.showRunStrategy')" :name="['public', 'showRunStrategy']">
@@ -68,8 +70,6 @@ import { useSettingStore } from "/@/store/settings";
 import { notification } from "ant-design-vue";
 import { util } from "/@/utils";
 import { useI18n } from "/src/locales";
-import AddonSelector from "../../../certd/addon/addon-selector/index.vue";
-import CaptchaInput from "/@/components/captcha/captcha-input.vue";
 const { t } = useI18n();
 
 defineOptions({
diff --git a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
new file mode 100644
index 000000000..4bd95d147
--- /dev/null
+++ b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
@@ -0,0 +1,67 @@
+<template>
+  <div class="sys-settings-form sys-settings-mode">
+    <a-form :model="formState" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off" @finish="onFinish">
+      <a-form-item :label="t('certd.adminMode')" :name="['public', 'adminMode']">
+        <fs-dict-radio v-model:checked="formState.public.adminMode" :dict="adminModeDict" />
+      </a-form-item>
+
+      <a-form-item label=" " :colon="false" :wrapper-col="{ span: 8 }">
+        <a-button :loading="saveLoading" type="primary" html-type="submit">{{ t("certd.saveButton") }}</a-button>
+      </a-form-item>
+    </a-form>
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { reactive, ref } from "vue";
+import { SysSettings } from "/@/views/sys/settings/api";
+import * as api from "/@/views/sys/settings/api";
+import { merge } from "lodash-es";
+import { useSettingStore } from "/@/store/settings";
+import { notification } from "ant-design-vue";
+import { useI18n } from "/src/locales";
+const { t } = useI18n();
+
+defineOptions({
+  name: "SettingMode",
+});
+
+const adminModeDict = [
+  {
+    label: t("certd.adminMode.enterpriseMode"),
+    value: "enterprise",
+  },
+  {
+    label: t("certd.adminMode.saasMode"),
+    value: "saas",
+  },
+];
+
+const formState = reactive<Partial<SysSettings>>({
+  public: {},
+  private: {},
+});
+
+async function loadSysSettings() {
+  const data: any = await api.SysSettingsGet();
+  merge(formState, data);
+}
+
+const saveLoading = ref(false);
+loadSysSettings();
+const settingsStore = useSettingStore();
+const onFinish = async (form: any) => {
+  try {
+    saveLoading.value = true;
+
+    await api.SysSettingsSave(form);
+    await settingsStore.loadSysSettings();
+    notification.success({
+      message: t("certd.saveSuccess"),
+    });
+  } finally {
+    saveLoading.value = false;
+  }
+};
+</script>
+<style lang="less"></style>
diff --git a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
new file mode 100644
index 000000000..0e5249168
--- /dev/null
+++ b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
@@ -0,0 +1,53 @@
+
+CREATE TABLE "cd_project"
+(
+  "id"          integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  "user_id"     integer      NOT NULL,
+  "name"        varchar(512) NOT NULL,
+  "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_project_user_id" ON "cd_project" ("user_id");
+INSERT INTO cd_project (id, user_id, "name", "disabled") VALUES (1, 0, 'default', false);
+
+
+ALTER TABLE cd_cert_info ADD COLUMN  project_id integer;
+CREATE INDEX "index_cert_project_id" ON "cd_cert_info" ("project_id");
+
+ALTER TABLE cd_site_info ADD COLUMN  project_id integer;
+CREATE INDEX "index_site_project_id" ON "cd_site_info" ("project_id");
+
+ALTER TABLE cd_site_ip ADD COLUMN  project_id integer;
+CREATE INDEX "index_site_ip_project_id" ON "cd_site_ip" ("project_id");
+
+ALTER TABLE cd_open_key ADD COLUMN  project_id integer;
+CREATE INDEX "index_open_key_project_id" ON "cd_open_key" ("project_id");
+
+ALTER TABLE cd_access ADD COLUMN  project_id integer;
+CREATE INDEX "index_access_project_id" ON "cd_access" ("project_id");
+
+ALTER TABLE cd_addon ADD COLUMN  project_id integer;
+CREATE INDEX "index_addon_project_id" ON "cd_addon" ("project_id");
+
+ALTER TABLE pi_pipeline ADD COLUMN  project_id integer;
+CREATE INDEX "index_pipeline_project_id" ON "cd_pipeline" ("project_id");
+
+ALTER TABLE pi_pipeline_group ADD COLUMN  project_id integer;
+CREATE INDEX "index_pipeline_group_project_id" ON "cd_pipeline_group" ("project_id");
+
+ALTER TABLE pi_storage ADD COLUMN  project_id integer;
+CREATE INDEX "index_storage_project_id" ON "cd_storage" ("project_id");
+
+ALTER TABLE pi_notification ADD COLUMN  project_id integer;
+CREATE INDEX "index_notification_project_id" ON "cd_notification" ("project_id");
+
+ALTER TABLE pi_history ADD COLUMN  project_id integer;
+CREATE INDEX "index_history_project_id" ON "cd_history" ("project_id");
+
+ALTER TABLE pi_history_log ADD COLUMN  project_id integer;
+CREATE INDEX "index_history_log_project_id" ON "cd_history_log" ("project_id");
+
+
diff --git a/packages/ui/certd-server/src/modules/monitor/entity/cert-info.ts b/packages/ui/certd-server/src/modules/monitor/entity/cert-info.ts
index 807489c91..1f1234ffb 100644
--- a/packages/ui/certd-server/src/modules/monitor/entity/cert-info.ts
+++ b/packages/ui/certd-server/src/modules/monitor/entity/cert-info.ts
@@ -42,6 +42,9 @@ export class CertInfoEntity {
   @Column({ name: 'cert_file', comment: '证书下载' })
   certFile: string;
 
+  @Column({ name: 'project_id', comment: '项目id' })
+  projectId: number;
+
   @Column({
     name: 'create_time',
     comment: '创建时间',
diff --git a/packages/ui/certd-server/src/modules/monitor/entity/site-info.ts b/packages/ui/certd-server/src/modules/monitor/entity/site-info.ts
index 298ffe193..4535f49b3 100644
--- a/packages/ui/certd-server/src/modules/monitor/entity/site-info.ts
+++ b/packages/ui/certd-server/src/modules/monitor/entity/site-info.ts
@@ -71,6 +71,9 @@ export class SiteInfoEntity {
   @Column({ name: 'group_id', comment: '分组id' })
   groupId: number;
 
+  @Column({ name: 'project_id', comment: '项目id' })
+  projectId: number;
+
   @Column({ name: 'create_time', comment: '创建时间', default: () => 'CURRENT_TIMESTAMP' })
   createTime: Date;
   @Column({ name: 'update_time', comment: '修改时间', default: () => 'CURRENT_TIMESTAMP' })
diff --git a/packages/ui/certd-server/src/modules/monitor/entity/site-ip.ts b/packages/ui/certd-server/src/modules/monitor/entity/site-ip.ts
index 3cfa50c3f..91887f815 100644
--- a/packages/ui/certd-server/src/modules/monitor/entity/site-ip.ts
+++ b/packages/ui/certd-server/src/modules/monitor/entity/site-ip.ts
@@ -33,6 +33,8 @@ export class SiteIpEntity {
   remark: string;
   @Column({ name: "disabled", comment: "禁用启用" })
   disabled: boolean;
+  @Column({ name: 'project_id', comment: '项目id' })
+  projectId: number;
 
   @Column({ name: 'create_time', comment: '创建时间', default: () => 'CURRENT_TIMESTAMP' })
   createTime: Date;
diff --git a/packages/ui/certd-server/src/modules/open/entity/open-key.ts b/packages/ui/certd-server/src/modules/open/entity/open-key.ts
index 6c774ce3d..1e8fe0614 100644
--- a/packages/ui/certd-server/src/modules/open/entity/open-key.ts
+++ b/packages/ui/certd-server/src/modules/open/entity/open-key.ts
@@ -17,6 +17,9 @@ export class OpenKeyEntity {
   @Column({ name: 'scope', comment: '权限范围' })
   scope: string; // open 仅开放接口、 user 用户所有权限
 
+  @Column({ name: 'project_id', comment: '项目id' })
+  projectId: number;
+
   @Column({ name: 'create_time', comment: '创建时间', default: () => 'CURRENT_TIMESTAMP' })
   createTime: Date;
 
diff --git a/packages/ui/certd-server/src/modules/pipeline/entity/history-log.ts b/packages/ui/certd-server/src/modules/pipeline/entity/history-log.ts
index bdeeeeaf9..0f2425b88 100644
--- a/packages/ui/certd-server/src/modules/pipeline/entity/history-log.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/entity/history-log.ts
@@ -25,6 +25,9 @@ export class HistoryLogEntity {
   @Column({ comment: '日志内容', length: 40960, nullable: true })
   logs: string;
 
+  @Column({ name: 'project_id', comment: '项目id' })
+  projectId: number;
+
   @Column({
     name: 'create_time',
     comment: '创建时间',
diff --git a/packages/ui/certd-server/src/modules/pipeline/entity/history.ts b/packages/ui/certd-server/src/modules/pipeline/entity/history.ts
index 6461b28f2..5fb7aa2b7 100644
--- a/packages/ui/certd-server/src/modules/pipeline/entity/history.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/entity/history.ts
@@ -26,6 +26,9 @@ export class HistoryEntity {
   })
   endTime: Date;
 
+  @Column({ name: 'project_id', comment: '项目id' })
+  projectId: number;
+
   @Column({
     name: 'create_time',
     comment: '创建时间',
@@ -38,6 +41,7 @@ export class HistoryEntity {
     default: () => 'CURRENT_TIMESTAMP',
   })
   updateTime: Date;
+  
 
   pipelineTitle: string;
 
diff --git a/packages/ui/certd-server/src/modules/pipeline/entity/notification.ts b/packages/ui/certd-server/src/modules/pipeline/entity/notification.ts
index 555c4e884..e66404150 100644
--- a/packages/ui/certd-server/src/modules/pipeline/entity/notification.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/entity/notification.ts
@@ -20,6 +20,9 @@ export class NotificationEntity {
   @Column({ name: 'is_default', comment: '是否默认' })
   isDefault: boolean;
 
+  @Column({ name: 'project_id', comment: '项目id' })
+  projectId: number;
+
   @Column({
     name: 'create_time',
     comment: '创建时间',
diff --git a/packages/ui/certd-server/src/modules/pipeline/entity/pipeline-group.ts b/packages/ui/certd-server/src/modules/pipeline/entity/pipeline-group.ts
index 8ee07ed7d..31d1003cc 100644
--- a/packages/ui/certd-server/src/modules/pipeline/entity/pipeline-group.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/entity/pipeline-group.ts
@@ -17,6 +17,9 @@ export class PipelineGroupEntity {
   @Column({ name: 'favorite', comment: '收藏' })
   favorite: boolean;
 
+  @Column({ name: 'project_id', comment: '项目id' })
+  projectId: number;
+
   @Column({
     name: 'create_time',
     comment: '创建时间',
diff --git a/packages/ui/certd-server/src/modules/pipeline/entity/pipeline.ts b/packages/ui/certd-server/src/modules/pipeline/entity/pipeline.ts
index 4f1d0d4be..168b77b49 100644
--- a/packages/ui/certd-server/src/modules/pipeline/entity/pipeline.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/entity/pipeline.ts
@@ -61,6 +61,9 @@ export class PipelineEntity {
   @Column({name: 'order', comment: '排序', nullable: true,})
   order: number;
 
+  @Column({ name: 'project_id', comment: '项目id' })
+  projectId: number;
+
   @Column({name: 'create_time',comment: '创建时间', default: () => 'CURRENT_TIMESTAMP',})
   createTime: Date;
   @Column({
diff --git a/packages/ui/certd-server/src/modules/pipeline/entity/storage.ts b/packages/ui/certd-server/src/modules/pipeline/entity/storage.ts
index d01eb9bf2..aa87e1d15 100644
--- a/packages/ui/certd-server/src/modules/pipeline/entity/storage.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/entity/storage.ts
@@ -23,6 +23,9 @@ export class StorageEntity {
   @Column({ comment: 'value', length: 40960, nullable: true })
   value: string;
 
+  @Column({ name: 'project_id', comment: '项目id' })
+  projectId: number;
+
   @Column({
     name: 'create_time',
     comment: '创建时间',
diff --git a/packages/ui/certd-server/src/modules/pipeline/entity/template.ts b/packages/ui/certd-server/src/modules/pipeline/entity/template.ts
index 418d09101..bb31b641f 100644
--- a/packages/ui/certd-server/src/modules/pipeline/entity/template.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/entity/template.ts
@@ -39,6 +39,9 @@ export class TemplateEntity {
   })
   order: number;
 
+  @Column({ name: 'project_id', comment: '项目id' })
+  projectId: number;
+
   @Column({
     name: 'create_time',
     comment: '创建时间',
diff --git a/packages/ui/certd-server/src/modules/sys/audit/entity/audit-log.ts b/packages/ui/certd-server/src/modules/sys/audit/entity/audit-log.ts
new file mode 100644
index 000000000..3e5361240
--- /dev/null
+++ b/packages/ui/certd-server/src/modules/sys/audit/entity/audit-log.ts
@@ -0,0 +1,43 @@
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+/**
+ */
+@Entity('cd_audit_log')
+export class AuditLogEntity {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({ name: 'user_id', comment: 'UserId' })
+  userId: number;
+
+  @Column({ name: 'user_name', comment: '用户名' })
+  userName: string;
+
+  @Column({ name: 'project_id', comment: 'ProjectId' })
+  projectId: number;
+
+  @Column({ name: 'project_name', comment: '项目名称' })
+  projectName: string;
+
+  @Column({ name: 'action', comment: '操作' })
+  action: string;
+
+  @Column({ name: 'content', comment: '内容' })
+  content: string;
+
+  @Column({ name: 'ip_address', comment: 'IP地址' })
+  ipAddress: string; 
+
+  @Column({
+    name: 'create_time',
+    comment: '创建时间',
+    default: () => 'CURRENT_TIMESTAMP',
+  })
+  createTime: Date;
+  @Column({
+    name: 'update_time',
+    comment: '修改时间',
+    default: () => 'CURRENT_TIMESTAMP',
+  })
+  updateTime: Date;
+}
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/entity/project-user.ts b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project-user.ts
new file mode 100644
index 000000000..c58bf5ccd
--- /dev/null
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project-user.ts
@@ -0,0 +1,31 @@
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+/**
+ */
+@Entity('cd_project_user')
+export class ProjectUserEntity {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({ name: 'user_id', comment: 'UserId' })
+  userId: number;
+
+  @Column({ name: 'project_id', comment: 'ProjectId' })
+  projectId: number;
+  
+  @Column({ name: 'permission', comment: '权限' })
+  permission: string; // read / write
+
+  @Column({
+    name: 'create_time',
+    comment: '创建时间',
+    default: () => 'CURRENT_TIMESTAMP',
+  })
+  createTime: Date;
+  @Column({
+    name: 'update_time',
+    comment: '修改时间',
+    default: () => 'CURRENT_TIMESTAMP',
+  })
+  updateTime: Date;
+}
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts
new file mode 100644
index 000000000..f41dce77d
--- /dev/null
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts
@@ -0,0 +1,31 @@
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+/**
+ */
+@Entity('cd_project')
+export class ProjectEntity {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({ name: 'user_id', comment: 'UserId' })
+  userId: number;
+
+  @Column({ name: 'name', comment: '项目名称' })
+  name: string;
+
+  @Column({ name: 'disabled', comment: '禁用' })
+  disabled: boolean;
+
+  @Column({
+    name: 'create_time',
+    comment: '创建时间',
+    default: () => 'CURRENT_TIMESTAMP',
+  })
+  createTime: Date;
+  @Column({
+    name: 'update_time',
+    comment: '修改时间',
+    default: () => 'CURRENT_TIMESTAMP',
+  })
+  updateTime: Date;
+}

From bb0afe1fa7b0fc52fde051d24fbe6be69d52f4cc Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Wed, 4 Feb 2026 17:01:08 +0800
Subject: [PATCH 02/62] =?UTF-8?q?perf:=20=E5=BD=93=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E6=B2=A1=E6=9C=89=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=88=9B=E5=BB=BA=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=B1=95=E5=BC=80=E5=9F=9F=E5=90=8D=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/common/domain-selector.vue        | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/ui/certd-client/src/components/plugins/common/domain-selector.vue b/packages/ui/certd-client/src/components/plugins/common/domain-selector.vue
index 7a331e0be..d6fdbf598 100644
--- a/packages/ui/certd-client/src/components/plugins/common/domain-selector.vue
+++ b/packages/ui/certd-client/src/components/plugins/common/domain-selector.vue
@@ -9,6 +9,7 @@
         :options="optionsRef"
         :value="value"
         v-bind="attrs"
+        :open="openProp"
         @click="onClick"
         @update:value="emit('update:value', $event)"
       >
@@ -56,11 +57,11 @@
 </template>
 <script setup lang="ts">
 import { computed, defineComponent, ref, Ref, useAttrs } from "vue";
-import { request } from "/@/api/service";
-import { Dicts } from "../lib/dicts";
 import { useRouter } from "vue-router";
-import { useDomainImport, useDomainImportManage } from "/@/views/certd/cert/domain/use";
+import { Dicts } from "../lib/dicts";
+import { request } from "/@/api/service";
 import { openRouteInNewWindow } from "/@/vben/utils";
+import { useDomainImportManage } from "/@/views/certd/cert/domain/use";
 
 defineOptions({
   name: "DomainSelector",
@@ -82,6 +83,7 @@ const props = defineProps<{
   search?: boolean;
   pager?: boolean;
   value?: any[];
+  open?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -90,6 +92,15 @@ const emit = defineEmits<{
 
 const attrs = useAttrs();
 
+const hasOptions: Ref = ref(null);
+
+const openProp = computed(() => {
+  if (hasOptions.value == null) {
+    return false;
+  }
+  return hasOptions.value;
+});
+
 const searchKeyRef = ref("");
 const optionsRef = ref([]);
 const message = ref("");
@@ -143,6 +154,13 @@ const getOptions = async () => {
     }
 
     optionsRef.value = options;
+    if (hasOptions.value == null) {
+      if (options.length > 0) {
+        hasOptions.value = true;
+      } else {
+        hasOptions.value = false;
+      }
+    }
     pagerRef.value.total = list.length;
     if (props.pager) {
       if (res.total != null) {

From 2fc491015ee292d51f25d7fd0b2cd4fb7633ba4d Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Wed, 4 Feb 2026 18:24:15 +0800
Subject: [PATCH 03/62] chore: project manager

---
 .vscode/settings.json                         |   2 +-
 .../src/locales/langs/en-US/certd.ts          |   4 +
 .../src/locales/langs/zh-CN/certd.ts          |   3 +
 .../src/router/source/modules/sys.ts          |  54 +++-
 .../certd-client/src/store/settings/index.tsx |   3 +
 .../src/views/sys/enterprise/audit/api.ts     |  75 ++++++
 .../src/views/sys/enterprise/audit/crud.tsx   | 254 ++++++++++++++++++
 .../src/views/sys/enterprise/audit/index.vue  |  65 +++++
 .../src/views/sys/enterprise/project/api.ts   |  75 ++++++
 .../src/views/sys/enterprise/project/crud.tsx | 254 ++++++++++++++++++
 .../views/sys/enterprise/project/index.vue    |  65 +++++
 .../sys/enterprise/project-controller.ts      |  70 +++++
 .../sys/enterprise/project-user-controller.ts |  65 +++++
 .../pipeline/service/sub-domain-service.ts    |   1 -
 .../{audit => enterprise}/entity/audit-log.ts |   0
 .../sys/enterprise/service/project-service.ts |  59 ++++
 .../service/project-user-service.ts           |  41 +++
 17 files changed, 1087 insertions(+), 3 deletions(-)
 create mode 100644 packages/ui/certd-client/src/views/sys/enterprise/audit/api.ts
 create mode 100644 packages/ui/certd-client/src/views/sys/enterprise/audit/crud.tsx
 create mode 100644 packages/ui/certd-client/src/views/sys/enterprise/audit/index.vue
 create mode 100644 packages/ui/certd-client/src/views/sys/enterprise/project/api.ts
 create mode 100644 packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
 create mode 100644 packages/ui/certd-client/src/views/sys/enterprise/project/index.vue
 create mode 100644 packages/ui/certd-server/src/controller/sys/enterprise/project-controller.ts
 create mode 100644 packages/ui/certd-server/src/controller/sys/enterprise/project-user-controller.ts
 rename packages/ui/certd-server/src/modules/sys/{audit => enterprise}/entity/audit-log.ts (100%)
 create mode 100644 packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
 create mode 100644 packages/ui/certd-server/src/modules/sys/enterprise/service/project-user-service.ts

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8414615d6..bf25c3e8d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,7 +7,7 @@
     ],
     "editor.defaultFormatter": "dbaeumer.vscode-eslint",
     "[typescript]": {
-        "editor.defaultFormatter": "vscode.typescript-language-features"
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "editor.tabSize": 2,
     "explorer.autoReveal": false,
diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
index 96d6a2323..edb36e602 100644
--- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
@@ -208,6 +208,10 @@ export default {
     orderManager: "Order Management",
     userSuites: "User Suites",
     netTest: "Network Test",
+
+    enterpriseSetting: "Enterprise Settings",
+    projectManager: "Project Management",
+    projectUserManager: "Project User Management",
   },
   certificateRepo: {
     title: "Certificate Repository",
diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
index 34d78c3dd..58a37f091 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -214,6 +214,9 @@ export default {
     orderManager: "订单管理",
     userSuites: "用户套餐",
     netTest: "网络测试",
+    enterpriseSetting: "企业管理设置",
+    projectManager: "项目管理",
+    projectUserManager: "项目用户管理",
   },
   certificateRepo: {
     title: "证书仓库",
diff --git a/packages/ui/certd-client/src/router/source/modules/sys.ts b/packages/ui/certd-client/src/router/source/modules/sys.ts
index 31fa225a5..85357a6de 100644
--- a/packages/ui/certd-client/src/router/source/modules/sys.ts
+++ b/packages/ui/certd-client/src/router/source/modules/sys.ts
@@ -187,7 +187,59 @@ export const sysResources = [
           keepAlive: true,
         },
       },
-
+      {
+        title: "certd.sysResources.enterpriseManager",
+        name: "EnterpriseManager",
+        path: "/sys/enterprise",
+        redirect: "/sys/enterprise/project",
+        meta: {
+          icon: "ion:cart-outline",
+          permission: "sys:settings:edit",
+          show: () => {
+            const settingStore = useSettingStore();
+            return settingStore.isEnterprise;
+          },
+          keepAlive: true,
+        },
+        children: [
+          {
+            title: "certd.sysResources.projectManager",
+            name: "ProjectManager",
+            path: "/sys/enterprise/project",
+            component: "/sys/enterprise/project/index.vue",
+            meta: {
+              show: true,
+              icon: "ion:cart",
+              permission: "sys:settings:edit",
+              keepAlive: true,
+            },
+          },
+          {
+            title: "certd.sysResources.projectUserManager",
+            name: "ProjectUserManager",
+            path: "/sys/enterprise/project/user",
+            component: "/sys/enterprise/project/user/index.vue",
+            meta: {
+              isMenu: false,
+              show: true,
+              icon: "ion:cart",
+              permission: "sys:settings:edit",
+            },
+          },
+          {
+            title: "certd.sysResources.enterpriseSetting",
+            name: "EnterpriseSetting",
+            path: "/sys/enterprise/setting",
+            redirect: "/sys/settings?tab=enterprise",
+            meta: {
+              isMenu: true,
+              show: true,
+              icon: "ion:cart",
+              permission: "sys:settings:edit",
+            },
+          },
+        ],
+      },
       {
         title: "certd.sysResources.suiteManager",
         name: "SuiteManager",
diff --git a/packages/ui/certd-client/src/store/settings/index.tsx b/packages/ui/certd-client/src/store/settings/index.tsx
index 1c884168f..09ccb3e24 100644
--- a/packages/ui/certd-client/src/store/settings/index.tsx
+++ b/packages/ui/certd-client/src/store/settings/index.tsx
@@ -141,6 +141,9 @@ export const useSettingStore = defineStore({
     isComm(): boolean {
       return this.plusInfo?.isComm && (this.plusInfo?.expireTime === -1 || this.plusInfo?.expireTime > new Date().getTime());
     },
+    isEnterprise(): boolean {
+      return this.isPlus && this.sysPublic.adminMode === "enterprise";
+    },
     isAgent(): boolean {
       return this.siteEnv?.agent?.enabled === true;
     },
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/audit/api.ts b/packages/ui/certd-client/src/views/sys/enterprise/audit/api.ts
new file mode 100644
index 000000000..f71795b3c
--- /dev/null
+++ b/packages/ui/certd-client/src/views/sys/enterprise/audit/api.ts
@@ -0,0 +1,75 @@
+import { request } from "/src/api/service";
+
+const apiPrefix = "/sys/project/provider";
+
+export async function GetList(query: any) {
+  return await request({
+    url: apiPrefix + "/page",
+    method: "post",
+    data: query,
+  });
+}
+
+export async function AddObj(obj: any) {
+  return await request({
+    url: apiPrefix + "/add",
+    method: "post",
+    data: obj,
+  });
+}
+
+export async function UpdateObj(obj: any) {
+  return await request({
+    url: apiPrefix + "/update",
+    method: "post",
+    data: obj,
+  });
+}
+
+export async function DelObj(id: any) {
+  return await request({
+    url: apiPrefix + "/delete",
+    method: "post",
+    params: { id },
+  });
+}
+
+export async function GetObj(id: any) {
+  return await request({
+    url: apiPrefix + "/info",
+    method: "post",
+    params: { id },
+  });
+}
+
+export async function GetDetail(id: any) {
+  return await request({
+    url: apiPrefix + "/detail",
+    method: "post",
+    params: { id },
+  });
+}
+
+export async function DeleteBatch(ids: any[]) {
+  return await request({
+    url: apiPrefix + "/deleteByIds",
+    method: "post",
+    data: { ids },
+  });
+}
+
+export async function SetDefault(id: any) {
+  return await request({
+    url: apiPrefix + "/setDefault",
+    method: "post",
+    data: { id },
+  });
+}
+
+export async function SetDisabled(id: any, disabled: boolean) {
+  return await request({
+    url: apiPrefix + "/setDisabled",
+    method: "post",
+    data: { id, disabled },
+  });
+}
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/audit/crud.tsx b/packages/ui/certd-client/src/views/sys/enterprise/audit/crud.tsx
new file mode 100644
index 000000000..025a168bb
--- /dev/null
+++ b/packages/ui/certd-client/src/views/sys/enterprise/audit/crud.tsx
@@ -0,0 +1,254 @@
+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 { Modal } from "ant-design-vue";
+
+export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const router = useRouter();
+  const { t } = useI18n();
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetList(query);
+  };
+  const editRequest = async ({ form, row }: EditReq) => {
+    form.id = row.id;
+    const res = await api.UpdateObj(form);
+    return res;
+  };
+  const delRequest = async ({ row }: DelReq) => {
+    return await api.DelObj(row.id);
+  };
+
+  const 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: {
+        minWidth: 200,
+        fixed: "right",
+      },
+      columns: {
+        id: {
+          title: "ID",
+          key: "id",
+          type: "number",
+          column: {
+            width: 100,
+          },
+          form: {
+            show: false,
+          },
+        },
+        domain: {
+          title: t("certd.cnameDomain"),
+          type: "text",
+          editForm: {
+            component: {
+              disabled: true,
+            },
+          },
+          search: {
+            show: true,
+          },
+          form: {
+            component: {
+              placeholder: t("certd.cnameDomainPlaceholder"),
+            },
+            helper: t("certd.cnameDomainHelper"),
+            rules: [
+              { required: true, message: t("certd.requiredField") },
+              { pattern: /^[^*]+$/, message: t("certd.cnameDomainPattern") },
+            ],
+          },
+          column: {
+            width: 200,
+          },
+        },
+        dnsProviderType: {
+          title: t("certd.dnsProvider"),
+          type: "dict-select",
+          search: {
+            show: true,
+          },
+          dict: dict({
+            url: "pi/dnsProvider/list",
+            value: "key",
+            label: "title",
+          }),
+          form: {
+            rules: [{ required: true, message: t("certd.requiredField") }],
+          },
+          column: {
+            width: 150,
+            component: {
+              color: "auto",
+            },
+          },
+        },
+        accessId: {
+          title: t("certd.dnsProviderAuthorization"),
+          type: "dict-select",
+          dict: dict({
+            url: "/pi/access/list",
+            value: "id",
+            label: "name",
+          }),
+          form: {
+            component: {
+              name: "access-selector",
+              vModel: "modelValue",
+              type: compute(({ form }) => {
+                return form.dnsProviderType;
+              }),
+            },
+            rules: [{ required: true, message: t("certd.requiredField") }],
+          },
+          column: {
+            width: 150,
+            component: {
+              color: "auto",
+            },
+          },
+        },
+        isDefault: {
+          title: t("certd.isDefault"),
+          type: "dict-switch",
+          dict: dict({
+            data: [
+              { label: t("certd.yes"), value: true, color: "success" },
+              { label: t("certd.no"), value: false, color: "default" },
+            ],
+          }),
+          form: {
+            value: false,
+            rules: [{ required: true, message: t("certd.selectIsDefault") }],
+          },
+          column: {
+            align: "center",
+            width: 100,
+          },
+        },
+        setDefault: {
+          title: t("certd.setDefault"),
+          type: "text",
+          form: {
+            show: false,
+          },
+          column: {
+            width: 100,
+            align: "center",
+            conditionalRenderDisabled: true,
+            cellRender: ({ row }) => {
+              if (row.isDefault) {
+                return;
+              }
+              const onClick = async () => {
+                Modal.confirm({
+                  title: t("certd.prompt"),
+                  content: t("certd.confirmSetDefault"),
+                  onOk: async () => {
+                    await api.SetDefault(row.id);
+                    await crudExpose.doRefresh();
+                  },
+                });
+              };
+
+              return (
+                <a-button type={"link"} size={"small"} onClick={onClick}>
+                  {t("certd.setAsDefault")}
+                </a-button>
+              );
+            },
+          },
+        },
+        disabled: {
+          title: t("certd.disabled"),
+          type: "dict-switch",
+          dict: dict({
+            data: [
+              { label: t("certd.enabled"), value: false, color: "success" },
+              { label: t("certd.disabledLabel"), value: true, color: "error" },
+            ],
+          }),
+          form: {
+            value: false,
+          },
+          column: {
+            width: 100,
+            component: {
+              title: t("certd.clickToToggle"),
+              on: {
+                async click({ value, row }) {
+                  Modal.confirm({
+                    title: t("certd.prompt"),
+                    content: t("certd.confirmToggleStatus", { action: !value ? t("certd.disable") : t("certd.enable") }),
+                    onOk: async () => {
+                      await api.SetDisabled(row.id, !value);
+                      await crudExpose.doRefresh();
+                    },
+                  });
+                },
+              },
+            },
+          },
+        },
+        createTime: {
+          title: t("certd.createTime"),
+          type: "datetime",
+          form: {
+            show: false,
+          },
+          column: {
+            sorter: true,
+            width: 160,
+            align: "center",
+          },
+        },
+        updateTime: {
+          title: t("certd.updateTime"),
+          type: "datetime",
+          form: {
+            show: false,
+          },
+          column: {
+            show: true,
+            width: 160,
+          },
+        },
+      },
+    },
+  };
+}
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/audit/index.vue b/packages/ui/certd-client/src/views/sys/enterprise/audit/index.vue
new file mode 100644
index 000000000..e1f2427df
--- /dev/null
+++ b/packages/ui/certd-client/src/views/sys/enterprise/audit/index.vue
@@ -0,0 +1,65 @@
+<template>
+  <fs-page class="page-cert">
+    <template #header>
+      <div class="title">
+        {{ t("certd.cnameTitle") }}
+        <span class="sub">
+          {{ t("certd.cnameDescription") }}
+          <a href="https://certd.docmirror.cn/guide/feature/cname/" target="_blank">
+            {{ t("certd.cnameLinkText") }}
+          </a>
+        </span>
+      </div>
+    </template>
+    <fs-crud ref="crudRef" v-bind="crudBinding">
+      <template #pagination-left>
+        <a-tooltip :title="t('certd.batchDelete')">
+          <fs-button icon="DeleteOutlined" @click="handleBatchDelete"></fs-button>
+        </a-tooltip>
+      </template>
+    </fs-crud>
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+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";
+import { useI18n } from "/src/locales";
+
+const { t } = useI18n();
+
+defineOptions({
+  name: "CnameProvider",
+});
+const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
+
+const selectedRowKeys = context.selectedRowKeys;
+const handleBatchDelete = () => {
+  if (selectedRowKeys.value?.length > 0) {
+    Modal.confirm({
+      title: t("certd.confirmTitle"),
+      content: t("certd.confirmDeleteBatch", { count: selectedRowKeys.value.length }),
+      async onOk() {
+        await DeleteBatch(selectedRowKeys.value);
+        message.info(t("certd.deleteSuccess"));
+        crudExpose.doRefresh();
+        selectedRowKeys.value = [];
+      },
+    });
+  } else {
+    message.error(t("certd.selectRecordsFirst"));
+  }
+};
+
+// 页面打开后获取列表数据
+onMounted(() => {
+  crudExpose.doRefresh();
+});
+onActivated(async () => {
+  await crudExpose.doRefresh();
+});
+</script>
+<style lang="less"></style>
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/api.ts b/packages/ui/certd-client/src/views/sys/enterprise/project/api.ts
new file mode 100644
index 000000000..f71795b3c
--- /dev/null
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/api.ts
@@ -0,0 +1,75 @@
+import { request } from "/src/api/service";
+
+const apiPrefix = "/sys/project/provider";
+
+export async function GetList(query: any) {
+  return await request({
+    url: apiPrefix + "/page",
+    method: "post",
+    data: query,
+  });
+}
+
+export async function AddObj(obj: any) {
+  return await request({
+    url: apiPrefix + "/add",
+    method: "post",
+    data: obj,
+  });
+}
+
+export async function UpdateObj(obj: any) {
+  return await request({
+    url: apiPrefix + "/update",
+    method: "post",
+    data: obj,
+  });
+}
+
+export async function DelObj(id: any) {
+  return await request({
+    url: apiPrefix + "/delete",
+    method: "post",
+    params: { id },
+  });
+}
+
+export async function GetObj(id: any) {
+  return await request({
+    url: apiPrefix + "/info",
+    method: "post",
+    params: { id },
+  });
+}
+
+export async function GetDetail(id: any) {
+  return await request({
+    url: apiPrefix + "/detail",
+    method: "post",
+    params: { id },
+  });
+}
+
+export async function DeleteBatch(ids: any[]) {
+  return await request({
+    url: apiPrefix + "/deleteByIds",
+    method: "post",
+    data: { ids },
+  });
+}
+
+export async function SetDefault(id: any) {
+  return await request({
+    url: apiPrefix + "/setDefault",
+    method: "post",
+    data: { id },
+  });
+}
+
+export async function SetDisabled(id: any, disabled: boolean) {
+  return await request({
+    url: apiPrefix + "/setDisabled",
+    method: "post",
+    data: { id, disabled },
+  });
+}
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
new file mode 100644
index 000000000..025a168bb
--- /dev/null
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
@@ -0,0 +1,254 @@
+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 { Modal } from "ant-design-vue";
+
+export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const router = useRouter();
+  const { t } = useI18n();
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetList(query);
+  };
+  const editRequest = async ({ form, row }: EditReq) => {
+    form.id = row.id;
+    const res = await api.UpdateObj(form);
+    return res;
+  };
+  const delRequest = async ({ row }: DelReq) => {
+    return await api.DelObj(row.id);
+  };
+
+  const 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: {
+        minWidth: 200,
+        fixed: "right",
+      },
+      columns: {
+        id: {
+          title: "ID",
+          key: "id",
+          type: "number",
+          column: {
+            width: 100,
+          },
+          form: {
+            show: false,
+          },
+        },
+        domain: {
+          title: t("certd.cnameDomain"),
+          type: "text",
+          editForm: {
+            component: {
+              disabled: true,
+            },
+          },
+          search: {
+            show: true,
+          },
+          form: {
+            component: {
+              placeholder: t("certd.cnameDomainPlaceholder"),
+            },
+            helper: t("certd.cnameDomainHelper"),
+            rules: [
+              { required: true, message: t("certd.requiredField") },
+              { pattern: /^[^*]+$/, message: t("certd.cnameDomainPattern") },
+            ],
+          },
+          column: {
+            width: 200,
+          },
+        },
+        dnsProviderType: {
+          title: t("certd.dnsProvider"),
+          type: "dict-select",
+          search: {
+            show: true,
+          },
+          dict: dict({
+            url: "pi/dnsProvider/list",
+            value: "key",
+            label: "title",
+          }),
+          form: {
+            rules: [{ required: true, message: t("certd.requiredField") }],
+          },
+          column: {
+            width: 150,
+            component: {
+              color: "auto",
+            },
+          },
+        },
+        accessId: {
+          title: t("certd.dnsProviderAuthorization"),
+          type: "dict-select",
+          dict: dict({
+            url: "/pi/access/list",
+            value: "id",
+            label: "name",
+          }),
+          form: {
+            component: {
+              name: "access-selector",
+              vModel: "modelValue",
+              type: compute(({ form }) => {
+                return form.dnsProviderType;
+              }),
+            },
+            rules: [{ required: true, message: t("certd.requiredField") }],
+          },
+          column: {
+            width: 150,
+            component: {
+              color: "auto",
+            },
+          },
+        },
+        isDefault: {
+          title: t("certd.isDefault"),
+          type: "dict-switch",
+          dict: dict({
+            data: [
+              { label: t("certd.yes"), value: true, color: "success" },
+              { label: t("certd.no"), value: false, color: "default" },
+            ],
+          }),
+          form: {
+            value: false,
+            rules: [{ required: true, message: t("certd.selectIsDefault") }],
+          },
+          column: {
+            align: "center",
+            width: 100,
+          },
+        },
+        setDefault: {
+          title: t("certd.setDefault"),
+          type: "text",
+          form: {
+            show: false,
+          },
+          column: {
+            width: 100,
+            align: "center",
+            conditionalRenderDisabled: true,
+            cellRender: ({ row }) => {
+              if (row.isDefault) {
+                return;
+              }
+              const onClick = async () => {
+                Modal.confirm({
+                  title: t("certd.prompt"),
+                  content: t("certd.confirmSetDefault"),
+                  onOk: async () => {
+                    await api.SetDefault(row.id);
+                    await crudExpose.doRefresh();
+                  },
+                });
+              };
+
+              return (
+                <a-button type={"link"} size={"small"} onClick={onClick}>
+                  {t("certd.setAsDefault")}
+                </a-button>
+              );
+            },
+          },
+        },
+        disabled: {
+          title: t("certd.disabled"),
+          type: "dict-switch",
+          dict: dict({
+            data: [
+              { label: t("certd.enabled"), value: false, color: "success" },
+              { label: t("certd.disabledLabel"), value: true, color: "error" },
+            ],
+          }),
+          form: {
+            value: false,
+          },
+          column: {
+            width: 100,
+            component: {
+              title: t("certd.clickToToggle"),
+              on: {
+                async click({ value, row }) {
+                  Modal.confirm({
+                    title: t("certd.prompt"),
+                    content: t("certd.confirmToggleStatus", { action: !value ? t("certd.disable") : t("certd.enable") }),
+                    onOk: async () => {
+                      await api.SetDisabled(row.id, !value);
+                      await crudExpose.doRefresh();
+                    },
+                  });
+                },
+              },
+            },
+          },
+        },
+        createTime: {
+          title: t("certd.createTime"),
+          type: "datetime",
+          form: {
+            show: false,
+          },
+          column: {
+            sorter: true,
+            width: 160,
+            align: "center",
+          },
+        },
+        updateTime: {
+          title: t("certd.updateTime"),
+          type: "datetime",
+          form: {
+            show: false,
+          },
+          column: {
+            show: true,
+            width: 160,
+          },
+        },
+      },
+    },
+  };
+}
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/index.vue b/packages/ui/certd-client/src/views/sys/enterprise/project/index.vue
new file mode 100644
index 000000000..e1f2427df
--- /dev/null
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/index.vue
@@ -0,0 +1,65 @@
+<template>
+  <fs-page class="page-cert">
+    <template #header>
+      <div class="title">
+        {{ t("certd.cnameTitle") }}
+        <span class="sub">
+          {{ t("certd.cnameDescription") }}
+          <a href="https://certd.docmirror.cn/guide/feature/cname/" target="_blank">
+            {{ t("certd.cnameLinkText") }}
+          </a>
+        </span>
+      </div>
+    </template>
+    <fs-crud ref="crudRef" v-bind="crudBinding">
+      <template #pagination-left>
+        <a-tooltip :title="t('certd.batchDelete')">
+          <fs-button icon="DeleteOutlined" @click="handleBatchDelete"></fs-button>
+        </a-tooltip>
+      </template>
+    </fs-crud>
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+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";
+import { useI18n } from "/src/locales";
+
+const { t } = useI18n();
+
+defineOptions({
+  name: "CnameProvider",
+});
+const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
+
+const selectedRowKeys = context.selectedRowKeys;
+const handleBatchDelete = () => {
+  if (selectedRowKeys.value?.length > 0) {
+    Modal.confirm({
+      title: t("certd.confirmTitle"),
+      content: t("certd.confirmDeleteBatch", { count: selectedRowKeys.value.length }),
+      async onOk() {
+        await DeleteBatch(selectedRowKeys.value);
+        message.info(t("certd.deleteSuccess"));
+        crudExpose.doRefresh();
+        selectedRowKeys.value = [];
+      },
+    });
+  } else {
+    message.error(t("certd.selectRecordsFirst"));
+  }
+};
+
+// 页面打开后获取列表数据
+onMounted(() => {
+  crudExpose.doRefresh();
+});
+onActivated(async () => {
+  await crudExpose.doRefresh();
+});
+</script>
+<style lang="less"></style>
diff --git a/packages/ui/certd-server/src/controller/sys/enterprise/project-controller.ts b/packages/ui/certd-server/src/controller/sys/enterprise/project-controller.ts
new file mode 100644
index 000000000..eaf8f01ab
--- /dev/null
+++ b/packages/ui/certd-server/src/controller/sys/enterprise/project-controller.ts
@@ -0,0 +1,70 @@
+import { CrudController, SysSettingsService } from "@certd/lib-server";
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
+import { ProjectService } from "../../../modules/sys/enterprise/service/project-service.js";
+import { ProjectEntity } from "../../../modules/sys/enterprise/entity/project.js";
+import { merge } from "lodash-es";
+
+/**
+ */
+@Provide()
+@Controller("/api/sys/enterprise/project")
+export class SysProjectController extends CrudController<ProjectEntity> {
+  @Inject()
+  service: ProjectService;
+
+  @Inject()
+  sysSettingsService: SysSettingsService;
+
+  getService<T>() {
+    return this.service;
+  }
+
+  @Post("/page", { summary: "sys:settings:view" })
+  async page(@Body(ALL) body: any) {
+    body.query = body.query ?? {};
+    return await super.page(body);
+  }
+
+  @Post("/list", { summary: "sys:settings:view" })
+  async list(@Body(ALL) body: any) {
+    return super.list(body);
+  }
+
+  @Post("/add", { summary: "sys:settings:edit" })
+  async add(@Body(ALL) bean: any) {
+    const def: any = {
+      isDefault: false,
+      disabled: false,
+    };
+    merge(bean, def);
+    bean.userId = this.getUserId();
+    return super.add(bean);
+  }
+
+  @Post("/update", { summary: "sys:settings:edit" })
+  async update(@Body(ALL) bean: any) {
+    bean.userId = this.getUserId();
+    return super.update(bean);
+  }
+
+  @Post("/info", { summary: "sys:settings:view" })
+  async info(@Query("id") id: number) {
+    return super.info(id);
+  }
+
+  @Post("/delete", { summary: "sys:settings:edit" })
+  async delete(@Query("id") id: number) {
+    return super.delete(id);
+  }
+
+  @Post("/deleteByIds", { summary: "sys:settings:edit" })
+  async deleteByIds(@Body("ids") ids: number[]) {
+    const res = await this.service.delete(ids);
+    return this.ok(res);
+  }
+  @Post("/setDisabled", { summary: "sys:settings:edit" })
+  async setDisabled(@Body("id") id: number, @Body("disabled") disabled: boolean) {
+    await this.service.setDisabled(id, disabled);
+    return this.ok();
+  }
+}
diff --git a/packages/ui/certd-server/src/controller/sys/enterprise/project-user-controller.ts b/packages/ui/certd-server/src/controller/sys/enterprise/project-user-controller.ts
new file mode 100644
index 000000000..cbe0f7c2a
--- /dev/null
+++ b/packages/ui/certd-server/src/controller/sys/enterprise/project-user-controller.ts
@@ -0,0 +1,65 @@
+import { CrudController, SysSettingsService } from "@certd/lib-server";
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
+import { ProjectUserEntity } from "../../../modules/sys/enterprise/entity/project-user.js";
+import { ProjectUserService } from "../../../modules/sys/enterprise/service/project-user-service.js";
+import { merge } from "lodash-es";
+
+/**
+ */
+@Provide()
+@Controller("/api/sys/enterprise/projectUser")
+export class SysProjectUserController extends CrudController<ProjectUserEntity> {
+  @Inject()
+  service: ProjectUserService;
+
+  @Inject()
+  sysSettingsService: SysSettingsService;
+
+  getService<T>() {
+    return this.service;
+  }
+
+  @Post("/page", { summary: "sys:settings:view" })
+  async page(@Body(ALL) body: any) {
+    body.query = body.query ?? {};
+    return await super.page(body);
+  }
+
+  @Post("/list", { summary: "sys:settings:view" })
+  async list(@Body(ALL) body: any) {
+    return super.list(body);
+  }
+
+  @Post("/add", { summary: "sys:settings:edit" })
+  async add(@Body(ALL) bean: any) {
+    const def: any = {
+      isDefault: false,
+      disabled: false,
+    };
+    merge(bean, def);
+    bean.userId = this.getUserId();
+    return super.add(bean);
+  }
+
+  @Post("/update", { summary: "sys:settings:edit" })
+  async update(@Body(ALL) bean: any) {
+    bean.userId = this.getUserId();
+    return super.update(bean);
+  }
+
+  @Post("/info", { summary: "sys:settings:view" })
+  async info(@Query("id") id: number) {
+    return super.info(id);
+  }
+
+  @Post("/delete", { summary: "sys:settings:edit" })
+  async delete(@Query("id") id: number) {
+    return super.delete(id);
+  }
+
+  @Post("/deleteByIds", { summary: "sys:settings:edit" })
+  async deleteByIds(@Body("ids") ids: number[]) {
+    const res = await this.service.delete(ids);
+    return this.ok(res);
+  }
+}
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/sub-domain-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/sub-domain-service.ts
index 5f98e55ab..5b37a5841 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/sub-domain-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/sub-domain-service.ts
@@ -54,7 +54,6 @@ export class SubDomainService extends BaseService<SubDomainEntity> {
      throw new Error('域名已存在');
    }
    return await super.add(bean)
-
   }
 
 }
diff --git a/packages/ui/certd-server/src/modules/sys/audit/entity/audit-log.ts b/packages/ui/certd-server/src/modules/sys/enterprise/entity/audit-log.ts
similarity index 100%
rename from packages/ui/certd-server/src/modules/sys/audit/entity/audit-log.ts
rename to packages/ui/certd-server/src/modules/sys/enterprise/entity/audit-log.ts
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
new file mode 100644
index 000000000..11b7aa9e8
--- /dev/null
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
@@ -0,0 +1,59 @@
+import {Inject, Provide, Scope, ScopeEnum} from '@midwayjs/core';
+import {BaseService, SysSettingsService} from '@certd/lib-server';
+import {InjectEntityModel} from '@midwayjs/typeorm';
+import {Repository} from 'typeorm';
+import { ProjectEntity } from '../entity/project.js';
+
+@Provide()
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
+export class ProjectService extends BaseService<ProjectEntity> {
+  @InjectEntityModel(ProjectEntity)
+  repository: Repository<ProjectEntity>;
+
+
+  @Inject()
+  sysSettingsService: SysSettingsService;
+
+  //@ts-ignore
+  getRepository() {
+    return this.repository;
+  }
+
+  async add(bean: ProjectEntity) {
+    const {name} = bean;
+    if (!name) {
+      throw new Error('项目名称不能为空');
+    }
+    const exist = await this.repository.findOne({
+      where: {
+        name,
+        userId:0,
+      },
+    });
+   if (exist) {
+     throw new Error('项目名称已存在');
+   }
+   bean.userId = 0
+   bean.disabled = false
+   return await super.add(bean)
+  }
+
+  async setDisabled(id: number, disabled: boolean) {
+    const project = await this.repository.findOne({
+      where: {
+        id,
+        userId:0,
+      },
+    });
+    if (!project) {
+      throw new Error('项目不存在');
+    }
+    await this.repository.update({
+      userId:0,
+    }, {
+      disabled,
+    });
+    project.disabled = disabled;
+    await this.repository.save(project);
+  }
+}
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-user-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-user-service.ts
new file mode 100644
index 000000000..e5729a010
--- /dev/null
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-user-service.ts
@@ -0,0 +1,41 @@
+import {Inject, Provide, Scope, ScopeEnum} from '@midwayjs/core';
+import {BaseService, SysSettingsService} from '@certd/lib-server';
+import {InjectEntityModel} from '@midwayjs/typeorm';
+import {Repository} from 'typeorm';
+import { ProjectUserEntity } from '../entity/project-user.js';
+
+@Provide()
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
+export class ProjectUserService extends BaseService<ProjectUserEntity> {
+  @InjectEntityModel(ProjectUserEntity)
+  repository: Repository<ProjectUserEntity>;
+
+  @Inject()
+  sysSettingsService: SysSettingsService;
+
+  //@ts-ignore
+  getRepository() {
+    return this.repository;
+  }
+
+  async add(bean: ProjectUserEntity) {
+    const {projectId, userId} = bean;
+    if (!projectId) {
+      throw new Error('项目ID不能为空');
+    }
+    if (!userId) {
+      throw new Error('用户ID不能为空');
+    }
+    const exist = await this.repository.findOne({
+      where: {
+        projectId,
+        userId,
+      },
+    });
+   if (exist) {
+     throw new Error('项目用户已存在');
+   }
+   return await super.add(bean)
+  }
+
+}

From 6ddc23e2aa025c10263e9e62f3ce6304fde68130 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Wed, 4 Feb 2026 18:54:00 +0800
Subject: [PATCH 04/62] chore: project member

---
 .../src/locales/langs/zh-CN/certd.ts          |   3 +
 .../src/router/source/modules/sys.ts          |   8 +-
 .../src/views/sys/enterprise/project/api.ts   |  11 +-
 .../src/views/sys/enterprise/project/crud.tsx | 117 +------------
 .../views/sys/enterprise/project/index.vue    |  10 +-
 .../sys/enterprise/project/member/api.ts      |  67 ++++++++
 .../sys/enterprise/project/member/crud.tsx    | 155 ++++++++++++++++++
 .../sys/enterprise/project/member/index.vue   |  54 ++++++
 .../sys/authority/user-controller.ts          |  19 ++-
 ...roller.ts => project-member-controller.ts} |  10 +-
 .../{project-user.ts => project-member.ts}    |   6 +-
 ...r-service.ts => project-member-service.ts} |  10 +-
 12 files changed, 323 insertions(+), 147 deletions(-)
 create mode 100644 packages/ui/certd-client/src/views/sys/enterprise/project/member/api.ts
 create mode 100644 packages/ui/certd-client/src/views/sys/enterprise/project/member/crud.tsx
 create mode 100644 packages/ui/certd-client/src/views/sys/enterprise/project/member/index.vue
 rename packages/ui/certd-server/src/controller/sys/enterprise/{project-user-controller.ts => project-member-controller.ts} (79%)
 rename packages/ui/certd-server/src/modules/sys/enterprise/entity/{project-user.ts => project-member.ts} (84%)
 rename packages/ui/certd-server/src/modules/sys/enterprise/service/{project-user-service.ts => project-member-service.ts} (74%)

diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
index 58a37f091..d6c4123db 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -883,4 +883,7 @@ export default {
     enterpriseMode: "企业模式",
     saasMode: "SaaS模式",
   },
+  ent: {
+    projectName: "项目名称",
+  },
 };
diff --git a/packages/ui/certd-client/src/router/source/modules/sys.ts b/packages/ui/certd-client/src/router/source/modules/sys.ts
index 85357a6de..4cd71b0ce 100644
--- a/packages/ui/certd-client/src/router/source/modules/sys.ts
+++ b/packages/ui/certd-client/src/router/source/modules/sys.ts
@@ -215,10 +215,10 @@ export const sysResources = [
             },
           },
           {
-            title: "certd.sysResources.projectUserManager",
-            name: "ProjectUserManager",
-            path: "/sys/enterprise/project/user",
-            component: "/sys/enterprise/project/user/index.vue",
+            title: "certd.sysResources.projectMemberManager",
+            name: "ProjectMemberManager",
+            path: "/sys/enterprise/project/member",
+            component: "/sys/enterprise/project/member/index.vue",
             meta: {
               isMenu: false,
               show: true,
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/api.ts b/packages/ui/certd-client/src/views/sys/enterprise/project/api.ts
index f71795b3c..85cff52ac 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/api.ts
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/api.ts
@@ -1,6 +1,7 @@
 import { request } from "/src/api/service";
 
-const apiPrefix = "/sys/project/provider";
+const apiPrefix = "/sys/enterprise/project";
+const userApiPrefix = "/sys/authority/user";
 
 export async function GetList(query: any) {
   return await request({
@@ -58,14 +59,6 @@ export async function DeleteBatch(ids: any[]) {
   });
 }
 
-export async function SetDefault(id: any) {
-  return await request({
-    url: apiPrefix + "/setDefault",
-    method: "post",
-    data: { id },
-  });
-}
-
 export async function SetDisabled(id: any, disabled: boolean) {
   return await request({
     url: apiPrefix + "/setDisabled",
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
index 025a168bb..e6d4dcb61 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
@@ -72,128 +72,21 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             show: false,
           },
         },
-        domain: {
-          title: t("certd.cnameDomain"),
+        name: {
+          title: t("certd.ent.projectName"),
           type: "text",
-          editForm: {
-            component: {
-              disabled: true,
-            },
-          },
           search: {
             show: true,
           },
           form: {
-            component: {
-              placeholder: t("certd.cnameDomainPlaceholder"),
-            },
-            helper: t("certd.cnameDomainHelper"),
-            rules: [
-              { required: true, message: t("certd.requiredField") },
-              { pattern: /^[^*]+$/, message: t("certd.cnameDomainPattern") },
-            ],
+            component: {},
+            helper: t("certd.ent.projectNameHelper"),
+            rules: [{ required: true, message: t("certd.requiredField") }],
           },
           column: {
             width: 200,
           },
         },
-        dnsProviderType: {
-          title: t("certd.dnsProvider"),
-          type: "dict-select",
-          search: {
-            show: true,
-          },
-          dict: dict({
-            url: "pi/dnsProvider/list",
-            value: "key",
-            label: "title",
-          }),
-          form: {
-            rules: [{ required: true, message: t("certd.requiredField") }],
-          },
-          column: {
-            width: 150,
-            component: {
-              color: "auto",
-            },
-          },
-        },
-        accessId: {
-          title: t("certd.dnsProviderAuthorization"),
-          type: "dict-select",
-          dict: dict({
-            url: "/pi/access/list",
-            value: "id",
-            label: "name",
-          }),
-          form: {
-            component: {
-              name: "access-selector",
-              vModel: "modelValue",
-              type: compute(({ form }) => {
-                return form.dnsProviderType;
-              }),
-            },
-            rules: [{ required: true, message: t("certd.requiredField") }],
-          },
-          column: {
-            width: 150,
-            component: {
-              color: "auto",
-            },
-          },
-        },
-        isDefault: {
-          title: t("certd.isDefault"),
-          type: "dict-switch",
-          dict: dict({
-            data: [
-              { label: t("certd.yes"), value: true, color: "success" },
-              { label: t("certd.no"), value: false, color: "default" },
-            ],
-          }),
-          form: {
-            value: false,
-            rules: [{ required: true, message: t("certd.selectIsDefault") }],
-          },
-          column: {
-            align: "center",
-            width: 100,
-          },
-        },
-        setDefault: {
-          title: t("certd.setDefault"),
-          type: "text",
-          form: {
-            show: false,
-          },
-          column: {
-            width: 100,
-            align: "center",
-            conditionalRenderDisabled: true,
-            cellRender: ({ row }) => {
-              if (row.isDefault) {
-                return;
-              }
-              const onClick = async () => {
-                Modal.confirm({
-                  title: t("certd.prompt"),
-                  content: t("certd.confirmSetDefault"),
-                  onOk: async () => {
-                    await api.SetDefault(row.id);
-                    await crudExpose.doRefresh();
-                  },
-                });
-              };
-
-              return (
-                <a-button type={"link"} size={"small"} onClick={onClick}>
-                  {t("certd.setAsDefault")}
-                </a-button>
-              );
-            },
-          },
-        },
         disabled: {
           title: t("certd.disabled"),
           type: "dict-switch",
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/index.vue b/packages/ui/certd-client/src/views/sys/enterprise/project/index.vue
index e1f2427df..0022b28a1 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/index.vue
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/index.vue
@@ -2,13 +2,7 @@
   <fs-page class="page-cert">
     <template #header>
       <div class="title">
-        {{ t("certd.cnameTitle") }}
-        <span class="sub">
-          {{ t("certd.cnameDescription") }}
-          <a href="https://certd.docmirror.cn/guide/feature/cname/" target="_blank">
-            {{ t("certd.cnameLinkText") }}
-          </a>
-        </span>
+        {{ t("certd.sysResources.projectManager") }}
       </div>
     </template>
     <fs-crud ref="crudRef" v-bind="crudBinding">
@@ -32,7 +26,7 @@ import { useI18n } from "/src/locales";
 const { t } = useI18n();
 
 defineOptions({
-  name: "CnameProvider",
+  name: "ProjectManager",
 });
 const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
 
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/member/api.ts b/packages/ui/certd-client/src/views/sys/enterprise/project/member/api.ts
new file mode 100644
index 000000000..bff9f6adf
--- /dev/null
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/member/api.ts
@@ -0,0 +1,67 @@
+import { request } from "/src/api/service";
+
+const apiPrefix = "/sys/enterprise/projectMember";
+const userApiPrefix = "/sys/authority/user";
+export async function GetList(query: any) {
+  return await request({
+    url: apiPrefix + "/page",
+    method: "post",
+    data: query,
+  });
+}
+
+export async function AddObj(obj: any) {
+  return await request({
+    url: apiPrefix + "/add",
+    method: "post",
+    data: obj,
+  });
+}
+
+export async function UpdateObj(obj: any) {
+  return await request({
+    url: apiPrefix + "/update",
+    method: "post",
+    data: obj,
+  });
+}
+
+export async function DelObj(id: any) {
+  return await request({
+    url: apiPrefix + "/delete",
+    method: "post",
+    params: { id },
+  });
+}
+
+export async function GetObj(id: any) {
+  return await request({
+    url: apiPrefix + "/info",
+    method: "post",
+    params: { id },
+  });
+}
+
+export async function GetDetail(id: any) {
+  return await request({
+    url: apiPrefix + "/detail",
+    method: "post",
+    params: { id },
+  });
+}
+
+export async function DeleteBatch(ids: any[]) {
+  return await request({
+    url: apiPrefix + "/deleteByIds",
+    method: "post",
+    data: { ids },
+  });
+}
+
+export async function GetUserSimpleByIds(query: any) {
+  return await request({
+    url: userApiPrefix + "/getSimpleByIds",
+    method: "post",
+    data: query,
+  });
+}
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/member/crud.tsx b/packages/ui/certd-client/src/views/sys/enterprise/project/member/crud.tsx
new file mode 100644
index 000000000..07144fadd
--- /dev/null
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/member/crud.tsx
@@ -0,0 +1,155 @@
+import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { Modal } from "ant-design-vue";
+import { Ref, ref } from "vue";
+import { useRouter } from "vue-router";
+import * as api from "./api";
+import { useSettingStore } from "/@/store/settings";
+import { useUserStore } from "/@/store/user";
+import { useI18n } from "/src/locales";
+
+export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const router = useRouter();
+  const { t } = useI18n();
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetList(query);
+  };
+  const editRequest = async ({ form, row }: EditReq) => {
+    form.id = row.id;
+    const res = await api.UpdateObj(form);
+    return res;
+  };
+  const delRequest = async ({ row }: DelReq) => {
+    return await api.DelObj(row.id);
+  };
+
+  const 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: {
+        minWidth: 200,
+        fixed: "right",
+      },
+      columns: {
+        id: {
+          title: "ID",
+          key: "id",
+          type: "number",
+          column: {
+            width: 100,
+          },
+          form: {
+            show: false,
+          },
+        },
+        projectId: {
+          title: "项目ID",
+          type: "text",
+          search: {
+            show: false,
+          },
+          form: {
+            show: false,
+          },
+          column: {
+            width: 200,
+            show: false,
+          },
+        },
+        userId: {
+          title: "用户ID",
+          type: "dict-select",
+          dict: dict({
+            url: "/sys/authority/user/getSimpleUsers",
+            value: "id",
+            label: "nickName",
+            labelBuilder: (item: any) => item.nickName || item.username || item.phoneCode + item.mobile,
+          }),
+          search: {
+            show: false,
+          },
+          form: {
+            show: false,
+          },
+          column: {
+            width: 200,
+            show: false,
+          },
+        },
+        permission: {
+          title: t("certd.ent.projectPermission"),
+          type: "dict-select",
+          dict: dict({
+            data: [
+              { label: t("certd.read"), value: "read", color: "cyan" },
+              { label: t("certd.write"), value: "write", color: "blue" },
+              { label: t("certd.admin"), value: "admin", color: "green" },
+            ],
+          }),
+          search: {
+            show: true,
+          },
+          form: {
+            show: true,
+          },
+          column: {
+            width: 200,
+          },
+        },
+        createTime: {
+          title: t("certd.createTime"),
+          type: "datetime",
+          form: {
+            show: false,
+          },
+          column: {
+            sorter: true,
+            width: 160,
+            align: "center",
+          },
+        },
+        updateTime: {
+          title: t("certd.updateTime"),
+          type: "datetime",
+          form: {
+            show: false,
+          },
+          column: {
+            show: true,
+            width: 160,
+          },
+        },
+      },
+    },
+  };
+}
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/member/index.vue b/packages/ui/certd-client/src/views/sys/enterprise/project/member/index.vue
new file mode 100644
index 000000000..c632d1211
--- /dev/null
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/member/index.vue
@@ -0,0 +1,54 @@
+<template>
+  <fs-page class="page-project-member">
+    <fs-crud ref="crudRef" v-bind="crudBinding">
+      <template #pagination-left>
+        <a-tooltip :title="t('certd.batchDelete')">
+          <fs-button icon="DeleteOutlined" @click="handleBatchDelete"></fs-button>
+        </a-tooltip>
+      </template>
+    </fs-crud>
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+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";
+import { useI18n } from "/src/locales";
+
+const { t } = useI18n();
+
+defineOptions({
+  name: "ProjectMemberManager",
+});
+const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
+
+const selectedRowKeys = context.selectedRowKeys;
+const handleBatchDelete = () => {
+  if (selectedRowKeys.value?.length > 0) {
+    Modal.confirm({
+      title: t("certd.confirmTitle"),
+      content: t("certd.confirmDeleteBatch", { count: selectedRowKeys.value.length }),
+      async onOk() {
+        await DeleteBatch(selectedRowKeys.value);
+        message.info(t("certd.deleteSuccess"));
+        crudExpose.doRefresh();
+        selectedRowKeys.value = [];
+      },
+    });
+  } else {
+    message.error(t("certd.selectRecordsFirst"));
+  }
+};
+
+// 页面打开后获取列表数据
+onMounted(() => {
+  crudExpose.doRefresh();
+});
+onActivated(async () => {
+  await crudExpose.doRefresh();
+});
+</script>
+<style lang="less"></style>
diff --git a/packages/ui/certd-server/src/controller/sys/authority/user-controller.ts b/packages/ui/certd-server/src/controller/sys/authority/user-controller.ts
index ccd5da62e..c37ed60a6 100644
--- a/packages/ui/certd-server/src/controller/sys/authority/user-controller.ts
+++ b/packages/ui/certd-server/src/controller/sys/authority/user-controller.ts
@@ -28,7 +28,7 @@ export class UserController extends CrudController<UserService> {
     return this.service;
   }
 
-  @Post('/getSimpleUserByIds', {summary: 'sys:auth:user:add'})
+  @Post('/getSimpleUserByIds', {summary: 'sys:auth:user:view'})
   async getSimpleUserByIds(@Body('ids') ids: number[]) {
     const users = await this.service.find({
       select: {
@@ -46,6 +46,21 @@ export class UserController extends CrudController<UserService> {
     return this.ok(users);
   }
 
+
+  @Post('/getSimpleUsers', {summary: 'sys:auth:user:view'})
+  async getSimpleUsers() {
+    const users = await this.service.find({
+      select: {
+        id: true,
+        username: true,
+        nickName: true,
+        mobile: true,
+        phoneCode: true,
+      },
+    });
+    return this.ok(users);
+  }
+
   @Post('/page', {summary: 'sys:auth:user:view'})
   async page(
     @Body(ALL)
@@ -153,4 +168,6 @@ export class UserController extends CrudController<UserService> {
   }
 
 
+
+
 }
diff --git a/packages/ui/certd-server/src/controller/sys/enterprise/project-user-controller.ts b/packages/ui/certd-server/src/controller/sys/enterprise/project-member-controller.ts
similarity index 79%
rename from packages/ui/certd-server/src/controller/sys/enterprise/project-user-controller.ts
rename to packages/ui/certd-server/src/controller/sys/enterprise/project-member-controller.ts
index cbe0f7c2a..794600728 100644
--- a/packages/ui/certd-server/src/controller/sys/enterprise/project-user-controller.ts
+++ b/packages/ui/certd-server/src/controller/sys/enterprise/project-member-controller.ts
@@ -1,16 +1,16 @@
 import { CrudController, SysSettingsService } from "@certd/lib-server";
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
-import { ProjectUserEntity } from "../../../modules/sys/enterprise/entity/project-user.js";
-import { ProjectUserService } from "../../../modules/sys/enterprise/service/project-user-service.js";
+import { ProjectMemberEntity } from "../../../modules/sys/enterprise/entity/project-member.js";
+import { ProjectMemberService } from "../../../modules/sys/enterprise/service/project-member-service.js";
 import { merge } from "lodash-es";
 
 /**
  */
 @Provide()
-@Controller("/api/sys/enterprise/projectUser")
-export class SysProjectUserController extends CrudController<ProjectUserEntity> {
+@Controller("/api/sys/enterprise/projectMember")
+export class SysProjectMemberController extends CrudController<ProjectMemberEntity> {
   @Inject()
-  service: ProjectUserService;
+  service: ProjectMemberService;
 
   @Inject()
   sysSettingsService: SysSettingsService;
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/entity/project-user.ts b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project-member.ts
similarity index 84%
rename from packages/ui/certd-server/src/modules/sys/enterprise/entity/project-user.ts
rename to packages/ui/certd-server/src/modules/sys/enterprise/entity/project-member.ts
index c58bf5ccd..b0fb8a60d 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/entity/project-user.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project-member.ts
@@ -2,8 +2,8 @@ import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
 /**
  */
-@Entity('cd_project_user')
-export class ProjectUserEntity {
+@Entity('cd_project_member')
+export class ProjectMemberEntity {
   @PrimaryGeneratedColumn()
   id: number;
 
@@ -14,7 +14,7 @@ export class ProjectUserEntity {
   projectId: number;
   
   @Column({ name: 'permission', comment: '权限' })
-  permission: string; // read / write
+  permission: string; // read / write / admin
 
   @Column({
     name: 'create_time',
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-user-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
similarity index 74%
rename from packages/ui/certd-server/src/modules/sys/enterprise/service/project-user-service.ts
rename to packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
index e5729a010..74953946d 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-user-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
@@ -2,13 +2,13 @@ import {Inject, Provide, Scope, ScopeEnum} from '@midwayjs/core';
 import {BaseService, SysSettingsService} from '@certd/lib-server';
 import {InjectEntityModel} from '@midwayjs/typeorm';
 import {Repository} from 'typeorm';
-import { ProjectUserEntity } from '../entity/project-user.js';
+import { ProjectMemberEntity } from '../entity/project-member.js';
 
 @Provide()
 @Scope(ScopeEnum.Request, { allowDowngrade: true })
-export class ProjectUserService extends BaseService<ProjectUserEntity> {
-  @InjectEntityModel(ProjectUserEntity)
-  repository: Repository<ProjectUserEntity>;
+export class ProjectMemberService extends BaseService<ProjectMemberEntity> {
+  @InjectEntityModel(ProjectMemberEntity)
+  repository: Repository<ProjectMemberEntity>;
 
   @Inject()
   sysSettingsService: SysSettingsService;
@@ -18,7 +18,7 @@ export class ProjectUserService extends BaseService<ProjectUserEntity> {
     return this.repository;
   }
 
-  async add(bean: ProjectUserEntity) {
+  async add(bean: ProjectMemberEntity) {
     const {projectId, userId} = bean;
     if (!projectId) {
       throw new Error('项目ID不能为空');

From 8d8304e85962f37fa932129b38a36fa31d4a0e52 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Wed, 4 Feb 2026 19:03:03 +0800
Subject: [PATCH 05/62] chore: 1

---
 .../sys/enterprise/project/member/index.vue   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/member/index.vue b/packages/ui/certd-client/src/views/sys/enterprise/project/member/index.vue
index c632d1211..12a6ad684 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/member/index.vue
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/member/index.vue
@@ -1,5 +1,13 @@
 <template>
   <fs-page class="page-project-member">
+    <template #header>
+      <div class="title">
+        {{ t("certd.projectMemberManager") }}
+        <span class="sub">
+          {{ t("certd.projectMemberDescription") }}
+        </span>
+      </div>
+    </template>
     <fs-crud ref="crudRef" v-bind="crudBinding">
       <template #pagination-left>
         <a-tooltip :title="t('certd.batchDelete')">
@@ -17,13 +25,22 @@ import createCrudOptions from "./crud";
 import { message, Modal } from "ant-design-vue";
 import { DeleteBatch } from "./api";
 import { useI18n } from "/src/locales";
+import { useRoute } from "vue-router";
 
 const { t } = useI18n();
 
 defineOptions({
   name: "ProjectMemberManager",
 });
-const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
+
+const route = useRoute();
+const projectIdStr = route.query.projectId as string;
+const projectId = Number(projectIdStr);
+
+const context: any = {
+  projectId,
+};
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
 
 const selectedRowKeys = context.selectedRowKeys;
 const handleBatchDelete = () => {

From db06f06c9687a2457fddd28df859d68e785cac7c Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 5 Feb 2026 17:18:26 +0800
Subject: [PATCH 06/62] docs: microsoft oauth docs

---
 .../src/plugins/plugin-oauth/oauth2/plugin-microsoft.ts      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/ui/certd-server/src/plugins/plugin-oauth/oauth2/plugin-microsoft.ts b/packages/ui/certd-server/src/plugins/plugin-oauth/oauth2/plugin-microsoft.ts
index e42b9b6c1..a5773cf95 100644
--- a/packages/ui/certd-server/src/plugins/plugin-oauth/oauth2/plugin-microsoft.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-oauth/oauth2/plugin-microsoft.ts
@@ -13,7 +13,7 @@ export class MicrosoftOauthProvider extends BaseAddon implements IOauthProvider
 
   @AddonInput({
     title: "ClientId",
-    helper: "[Azure Portal](https://portal.azure.com/)创建应用后获取",
+    helper: "[Microsoft Entra ID](https://portal.azure.com/#view/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/~/RegisteredApps)创建应用后获取",
     required: true,
   })
   clientId = "";
@@ -23,16 +23,17 @@ export class MicrosoftOauthProvider extends BaseAddon implements IOauthProvider
     component: {
       placeholder: "ClientSecretKey / appSecretKey",
     },
+    helper:"客户端凭据->证书与机密->客户端密码->新客户端密码",
     required: true,
   })
   clientSecretKey = "";
 
   @AddonInput({
     title: "TenantId",
-    helper: "租户ID，留空使用/common端点（需要应用配置为多租户）",
     component: {
       placeholder: "common 或 租户ID",
     },
+    helper:"根据受支持的账户类型填写 common 或 租户ID，默认为common(Microsoft个人账户)。 \n租户ID获取: 概述 -> 目录(租户) ID ",
     value: "common",
     required: false,
   })

From 1f68faddb97a978c5a5e731a8895b4bb0587ad83 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 5 Feb 2026 17:26:47 +0800
Subject: [PATCH 07/62] =?UTF-8?q?perf:=20AI=E5=BC=80=E5=8F=91=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=20skills=20=E5=AE=9A=E4=B9=89=E5=88=9D=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .trae/skills/access-plugin-dev/SKILL.md       | 301 ++++++++++++++
 .../access-plugin-dev/examples/input.md       |   1 +
 .../access-plugin-dev/examples/output.md      | 145 +++++++
 .trae/skills/dns-provider-dev/SKILL.md        | 212 ++++++++++
 .../skills/dns-provider-dev/examples/input.md |   1 +
 .../dns-provider-dev/examples/output.md       | 121 ++++++
 .trae/skills/plugin-converter/SKILL.md        | 201 +++++++++
 .../skills/plugin-converter/examples/input.md |   1 +
 .../plugin-converter/examples/output.md       |  95 +++++
 .../resources/convert-plugin-to-yaml.js       | 160 ++++++++
 .trae/skills/task-plugin-dev/SKILL.md         | 388 ++++++++++++++++++
 .../skills/task-plugin-dev/examples/input.md  |   1 +
 .../skills/task-plugin-dev/examples/output.md | 129 ++++++
 13 files changed, 1756 insertions(+)
 create mode 100644 .trae/skills/access-plugin-dev/SKILL.md
 create mode 100644 .trae/skills/access-plugin-dev/examples/input.md
 create mode 100644 .trae/skills/access-plugin-dev/examples/output.md
 create mode 100644 .trae/skills/dns-provider-dev/SKILL.md
 create mode 100644 .trae/skills/dns-provider-dev/examples/input.md
 create mode 100644 .trae/skills/dns-provider-dev/examples/output.md
 create mode 100644 .trae/skills/plugin-converter/SKILL.md
 create mode 100644 .trae/skills/plugin-converter/examples/input.md
 create mode 100644 .trae/skills/plugin-converter/examples/output.md
 create mode 100644 .trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js
 create mode 100644 .trae/skills/task-plugin-dev/SKILL.md
 create mode 100644 .trae/skills/task-plugin-dev/examples/input.md
 create mode 100644 .trae/skills/task-plugin-dev/examples/output.md

diff --git a/.trae/skills/access-plugin-dev/SKILL.md b/.trae/skills/access-plugin-dev/SKILL.md
new file mode 100644
index 000000000..35742f1d7
--- /dev/null
+++ b/.trae/skills/access-plugin-dev/SKILL.md
@@ -0,0 +1,301 @@
+# Access 插件开发技能
+
+## 什么是 Access 插件
+
+Access 插件是 Certd 系统中用于存储用户第三方应用授权数据的插件，例如用户名密码、accessSecret 或 accessToken 等。同时，它还负责对接实现第三方的 API 接口，供其他插件调用使用。
+
+## 开发步骤
+
+### 1. 导入必要的依赖
+
+```typescript
+import { AccessInput, BaseAccess, IsAccess, Pager, PageRes, PageSearch } from '@certd/pipeline';
+import { DomainRecord } from '@certd/plugin-lib';
+```
+
+### 2. 使用 @IsAccess 注解注册插件
+
+```typescript
+@IsAccess({
+  name: 'demo', // 插件唯一标识
+  title: '授权插件示例', // 插件标题
+  icon: 'clarity:plugin-line', // 插件图标
+  desc: '这是一个示例授权插件，用于演示如何实现一个授权插件', // 插件描述
+})
+export class DemoAccess extends BaseAccess {
+  // 插件实现...
+}
+```
+
+### 3. 定义授权属性
+
+使用 `@AccessInput` 注解定义授权属性：
+
+```typescript
+@AccessInput({
+  title: '授权方式',
+  value: 'apiKey', // 默认值
+  component: {
+    name: "a-select", // 基于 antdv 的输入组件
+    vModel: "value", // v-model 绑定的属性名
+    options: [ // 组件参数
+      { label: "API密钥（推荐）", value: "apiKey" },
+      { label: "账号密码", value: "account" },
+    ],
+    placeholder: 'demoKeyId',
+  },
+  required: true,
+})
+apiType = '';
+
+@AccessInput({
+  title: '密钥Id',
+  component: {
+    name:"a-input",
+    allowClear: true,
+    placeholder: 'demoKeyId',
+  },
+  required: true,
+})
+demoKeyId = '';
+
+@AccessInput({
+  title: '密钥',//标题
+  required: true,  //text组件可以省略
+  encrypt: true, //该属性是否需要加密
+})
+demoKeySecret = '';
+```
+
+### 4. 实现测试方法
+
+```typescript
+@AccessInput({
+  title: "测试",
+  component: {
+    name: "api-test",
+    action: "TestRequest"
+  },
+  helper: "点击测试接口是否正常"
+})
+testRequest = true;
+
+/**
+ * 会通过上面的testRequest参数在ui界面上生成测试按钮，供用户测试接口调用是否正常
+ */
+async onTestRequest() {
+  await this.GetDomainList({});
+  return "ok"
+}
+```
+
+### 5. 实现 API 方法
+
+```typescript
+/**
+ * 获api接口示例 取域名列表，
+ */
+async GetDomainList(req: PageSearch): Promise<PageRes<DomainRecord>> {
+  //输出日志必须使用ctx.logger
+  this.ctx.logger.info(`获取域名列表，req:${JSON.stringify(req)}`);
+  const pager = new Pager(req);
+  const resp = await this.doRequest({
+    action: "ListDomains",
+    data: {
+      domain: req.searchKey,
+      offset: pager.getOffset(),
+      limit: pager.pageSize,
+    }
+  });
+  const total = resp?.TotalCount || 0;
+  let list = resp?.DomainList?.map((item) => {
+    item.domain = item.Domain;
+    item.id = item.DomainId;
+    return item;
+  })
+  return {
+    total,
+    list
+  };
+}
+
+/**
+ *  通用api调用方法, 具体如何构造请求体，需参考对应应用的API文档
+ */
+async doRequest(req: { action: string, data?: any }) {
+  /**
+      this.ctx中包含很多有用的工具类
+      type AccessContext = {
+        http: HttpClient;
+        logger: ILogger;
+        utils: typeof utils;
+        accessService: IAccessService;
+      }
+   */
+  const res = await this.ctx.http.request({
+    url: "https://api.demo.cn/api/",
+    method: "POST",
+    data: {
+      Action: req.action,
+      Body: req.data
+    }
+  });
+
+  if (res.Code !== 0) {
+    //异常处理 
+    throw new Error(res.Message || "请求失败");
+  }
+  return res.Resp;
+}
+```
+
+## 注意事项
+
+1. **插件命名**：插件名称应简洁明了，反映其功能。
+2. **属性加密**：对于敏感信息（如密钥），应设置 `encrypt: true`。
+3. **日志输出**：必须使用 `this.ctx.logger` 输出日志，而不是 `console`。
+4. **错误处理**：API 调用失败时应抛出明确的错误信息。
+5. **测试方法**：实现 `onTestRequest` 方法，以便用户可以测试授权是否正常。
+
+## 完整示例
+
+```typescript
+import { AccessInput, BaseAccess, IsAccess, Pager, PageRes, PageSearch } from '@certd/pipeline';
+import { DomainRecord } from '@certd/plugin-lib';
+
+/**
+ * 这个注解将注册一个授权配置
+ * 在certd的后台管理系统中，用户可以选择添加此类型的授权
+ */
+@IsAccess({
+  name: 'demo',
+  title: '授权插件示例',
+  icon: 'clarity:plugin-line', //插件图标
+  desc: '这是一个示例授权插件，用于演示如何实现一个授权插件',
+})
+export class DemoAccess extends BaseAccess {
+
+   /**
+   * 授权属性配置
+   */
+  @AccessInput({
+    title: '授权方式',
+    value: 'apiKey', //默认值
+    component: {
+      name: "a-select", //基于antdv的输入组件
+      vModel: "value", // v-model绑定的属性名
+      options: [ //组件参数
+        {
+          label: "API密钥（推荐）",
+          value: "apiKey"
+        },
+        {
+          label: "账号密码",
+          value: "account"
+        },
+      ],
+      placeholder: 'demoKeyId',
+    },
+    required: true,
+  })
+  apiType = '';
+
+  /**
+   * 授权属性配置
+   */
+  @AccessInput({
+    title: '密钥Id',
+    component: {
+      name:"a-input",
+      allowClear: true,
+      placeholder: 'demoKeyId',
+    },
+    required: true,
+  })
+  demoKeyId = '';
+
+  @AccessInput({
+    title: '密钥',//标题
+    required: true,  //text组件可以省略
+    encrypt: true, //该属性是否需要加密
+  })
+  demoKeySecret = '';
+
+
+  @AccessInput({
+    title: "测试",
+    component: {
+      name: "api-test",
+      action: "TestRequest"
+    },
+    helper: "点击测试接口是否正常"
+  })
+  testRequest = true;
+
+  /**
+   * 会通过上面的testRequest参数在ui界面上生成测试按钮，供用户测试接口调用是否正常
+   */
+  async onTestRequest() {
+    await this.GetDomainList({});
+    return "ok"
+  }
+
+  /**
+   * 获api接口示例 取域名列表，
+   */
+  async GetDomainList(req: PageSearch): Promise<PageRes<DomainRecord>> {
+    //输出日志必须使用ctx.logger
+    this.ctx.logger.info(`获取域名列表，req:${JSON.stringify(req)}`);
+    const pager = new Pager(req);
+    const resp = await this.doRequest({
+      action: "ListDomains",
+      data: {
+        domain: req.searchKey,
+        offset: pager.getOffset(),
+        limit: pager.pageSize,
+      }
+    });
+    const total = resp?.TotalCount || 0;
+    let list = resp?.DomainList?.map((item) => {
+      item.domain = item.Domain;
+      item.id = item.DomainId;
+      return item;
+    })
+    return {
+      total,
+      list
+    };
+  }
+
+  // 还可以继续编写API
+
+  /**
+   *  通用api调用方法, 具体如何构造请求体，需参考对应应用的API文档
+   */
+  async doRequest(req: { action: string, data?: any }) {
+    /**
+        this.ctx中包含很多有用的工具类
+        type AccessContext = {
+          http: HttpClient;
+          logger: ILogger;
+          utils: typeof utils;
+          accessService: IAccessService;
+        }
+     */
+    const res = await this.ctx.http.request({
+      url: "https://api.demo.cn/api/",
+      method: "POST",
+      data: {
+        Action: req.action,
+        Body: req.data
+      }
+    });
+
+    if (res.Code !== 0) {
+      //异常处理 
+      throw new Error(res.Message || "请求失败");
+    }
+    return res.Resp;
+  }
+}
+```
\ No newline at end of file
diff --git a/.trae/skills/access-plugin-dev/examples/input.md b/.trae/skills/access-plugin-dev/examples/input.md
new file mode 100644
index 000000000..c3540a858
--- /dev/null
+++ b/.trae/skills/access-plugin-dev/examples/input.md
@@ -0,0 +1 @@
+我需要开发一个 Access 插件，用于存储和管理第三方应用的授权信息。请指导我如何实现。
\ No newline at end of file
diff --git a/.trae/skills/access-plugin-dev/examples/output.md b/.trae/skills/access-plugin-dev/examples/output.md
new file mode 100644
index 000000000..92209b335
--- /dev/null
+++ b/.trae/skills/access-plugin-dev/examples/output.md
@@ -0,0 +1,145 @@
+# Access 插件开发指南
+
+## 开发步骤
+
+### 1. 导入必要的依赖
+
+```typescript
+import { AccessInput, BaseAccess, IsAccess, Pager, PageRes, PageSearch } from '@certd/pipeline';
+import { DomainRecord } from '@certd/plugin-lib';
+```
+
+### 2. 使用 @IsAccess 注解注册插件
+
+```typescript
+@IsAccess({
+  name: 'demo', // 插件唯一标识
+  title: '授权插件示例', // 插件标题
+  icon: 'clarity:plugin-line', // 插件图标
+  desc: '这是一个示例授权插件，用于演示如何实现一个授权插件', // 插件描述
+})
+export class DemoAccess extends BaseAccess {
+  // 插件实现...
+}
+```
+
+### 3. 定义授权属性
+
+使用 `@AccessInput` 注解定义授权属性：
+
+```typescript
+@AccessInput({
+  title: '授权方式',
+  value: 'apiKey', // 默认值
+  component: {
+    name: "a-select", // 基于 antdv 的输入组件
+    vModel: "value", // v-model 绑定的属性名
+    options: [ // 组件参数
+      { label: "API密钥（推荐）", value: "apiKey" },
+      { label: "账号密码", value: "account" },
+    ],
+    placeholder: 'demoKeyId',
+  },
+  required: true,
+})
+apiType = '';
+
+@AccessInput({
+  title: '密钥Id',
+  component: {
+    name:"a-input",
+    allowClear: true,
+    placeholder: 'demoKeyId',
+  },
+  required: true,
+})
+demoKeyId = '';
+
+@AccessInput({
+  title: '密钥',//标题
+  required: true,  //text组件可以省略
+  encrypt: true, //该属性是否需要加密
+})
+demoKeySecret = '';
+```
+
+### 4. 实现测试方法
+
+```typescript
+@AccessInput({
+  title: "测试",
+  component: {
+    name: "api-test",
+    action: "TestRequest"
+  },
+  helper: "点击测试接口是否正常"
+})
+testRequest = true;
+
+/**
+ * 会通过上面的testRequest参数在ui界面上生成测试按钮，供用户测试接口调用是否正常
+ */
+async onTestRequest() {
+  await this.GetDomainList({});
+  return "ok"
+}
+```
+
+### 5. 实现 API 方法
+
+```typescript
+/**
+ * 获api接口示例 取域名列表，
+ */
+async GetDomainList(req: PageSearch): Promise<PageRes<DomainRecord>> {
+  //输出日志必须使用ctx.logger
+  this.ctx.logger.info(`获取域名列表，req:${JSON.stringify(req)}`);
+  const pager = new Pager(req);
+  const resp = await this.doRequest({
+    action: "ListDomains",
+    data: {
+      domain: req.searchKey,
+      offset: pager.getOffset(),
+      limit: pager.pageSize,
+    }
+  });
+  const total = resp?.TotalCount || 0;
+  let list = resp?.DomainList?.map((item) => {
+    item.domain = item.Domain;
+    item.id = item.DomainId;
+    return item;
+  })
+  return {
+    total,
+    list
+  };
+}
+
+/**
+ *  通用api调用方法, 具体如何构造请求体，需参考对应应用的API文档
+ */
+async doRequest(req: { action: string, data?: any }) {
+  const res = await this.ctx.http.request({
+    url: "https://api.demo.cn/api/",
+    method: "POST",
+    data: {
+      Action: req.action,
+      Body: req.data
+    }
+  });
+
+  if (res.Code !== 0) {
+    //异常处理 
+    throw new Error(res.Message || "请求失败");
+  }
+  return res.Resp;
+}
+```
+
+## 注意事项
+
+1. **插件命名**：插件名称应简洁明了，反映其功能。
+2. **属性加密**：对于敏感信息（如密钥），应设置 `encrypt: true`。
+3. **日志输出**：必须使用 `this.ctx.logger` 输出日志，而不是 `console`。
+4. **错误处理**：API 调用失败时应抛出明确的错误信息。
+5. **测试方法**：实现 `onTestRequest` 方法，以便用户可以测试授权是否正常。
\ No newline at end of file
diff --git a/.trae/skills/dns-provider-dev/SKILL.md b/.trae/skills/dns-provider-dev/SKILL.md
new file mode 100644
index 000000000..180a698ad
--- /dev/null
+++ b/.trae/skills/dns-provider-dev/SKILL.md
@@ -0,0 +1,212 @@
+# DNS Provider 插件开发技能
+
+## 什么是 DNS Provider 插件
+
+DNS Provider 插件是 Certd 系统中的 DNS 提供商插件，它用于在 ACME 申请证书时给域名添加 TXT 解析记录，以验证域名所有权。
+
+## 开发步骤
+
+### 1. 导入必要的依赖
+
+```typescript
+import { AbstractDnsProvider, CreateRecordOptions, IsDnsProvider, RemoveRecordOptions } from '@certd/plugin-cert';
+import { DemoAccess } from './access.js';
+import { isDev } from '../../utils/env.js';
+```
+
+### 2. 定义记录数据结构
+
+```typescript
+type DemoRecord = {
+  // 这里定义 Record 记录的数据结构，跟对应云平台接口返回值一样即可，一般是拿到 id 就行，用于删除 txt 解析记录，清理申请痕迹
+  // id:string
+};
+```
+
+### 3. 使用 @IsDnsProvider 注解注册插件
+
+```typescript
+// 这里通过 IsDnsProvider 注册一个 dnsProvider
+@IsDnsProvider({
+  name: 'demo', // 插件唯一标识
+  title: 'Dns提供商Demo', // 插件标题
+  desc: 'dns provider示例', // 插件描述
+  icon: 'clarity:plugin-line', // 插件图标
+  // 这里是对应的云平台的 access 类型名称
+  accessType: 'demo',
+  order: 99, // 排序
+})
+export class DemoDnsProvider extends AbstractDnsProvider<DemoRecord> {
+  access!: DemoAccess;
+
+  async onInstance() {
+    this.access = this.ctx.access as DemoAccess;
+    // 也可以通过 ctx 成员变量传递 context
+    this.logger.debug('access', this.access);
+    // 初始化的操作
+    // ...
+  }
+
+  // 插件实现...
+}
+```
+
+### 4. 实现 createRecord 方法
+
+```typescript
+/**
+ * 创建 dns 解析记录，用于验证域名所有权
+ */
+async createRecord(options: CreateRecordOptions): Promise<any> {
+  /**
+   * options 参数说明
+   * fullRecord: '_acme-challenge.example.com',
+   * value: 一串 uuid
+   * type: 'TXT',
+   * domain: 'example.com'
+   */
+  const { fullRecord, value, type, domain } = options;
+  this.logger.info('添加域名解析：', fullRecord, value, type, domain);
+
+  // 调用创建 dns 解析记录的对应的云端接口，创建 txt 类型的 dns 解析记录
+  // 请根据实际接口情况调用，例如：
+  // const createDnsRecordUrl = "xxx"
+  // const record = this.http.post(createDnsRecordUrl,{
+  //   // 授权参数
+  //   // 创建 dns 解析记录的参数
+  // })
+  // // 返回本次创建的 dns 解析记录，这个记录会在删除的时候用到
+  // return record
+}
+```
+
+### 5. 实现 removeRecord 方法
+
+```typescript
+/**
+ *  删除 dns 解析记录,清理申请痕迹
+ * @param options
+ */
+async removeRecord(options: RemoveRecordOptions<DemoRecord>): Promise<void> {
+  const { fullRecord, value, domain } = options.recordReq;
+  const record = options.recordRes;
+  this.logger.info('删除域名解析：', domain, fullRecord, value, record);
+  // 这里调用删除 txt dns 解析记录接口
+  // 请根据实际接口情况调用，例如：
+
+  // const deleteDnsRecordUrl = "xxx"
+  // const res = this.http.delete(deleteDnsRecordUrl,{
+  //   // 授权参数
+  //   // 删除 dns 解析记录的参数
+  // })
+
+
+  this.logger.info('删除域名解析成功:', fullRecord, value);
+}
+```
+
+### 6. 实例化插件
+
+```typescript
+// 实例化这个 provider，将其自动注册到系统中
+if (isDev()) {
+  // 你的实现 要去掉这个 if，不然生产环境将不会显示
+  new DemoDnsProvider();
+}
+```
+
+## 注意事项
+
+1. **插件命名**：插件名称应简洁明了，反映其功能。
+2. **accessType**：必须指定对应的云平台的 access 类型名称。
+3. **记录结构**：定义适合对应云平台的记录数据结构，至少包含 id 字段用于删除记录。
+4. **日志输出**：使用 `this.logger` 输出日志，而不是 `console`。
+5. **错误处理**：API 调用失败时应抛出明确的错误信息。
+6. **实例化**：生产环境中应移除 `if (isDev())` 条件，确保插件在生产环境中也能被注册。
+
+## 完整示例
+
+```typescript
+import { AbstractDnsProvider, CreateRecordOptions, IsDnsProvider, RemoveRecordOptions } from '@certd/plugin-cert';
+import { DemoAccess } from './access.js';
+import { isDev } from '../../utils/env.js';
+
+type DemoRecord = {
+  // 这里定义 Record 记录的数据结构，跟对应云平台接口返回值一样即可，一般是拿到 id 就行，用于删除 txt 解析记录，清理申请痕迹
+  // id:string
+};
+
+// 这里通过 IsDnsProvider 注册一个 dnsProvider
+@IsDnsProvider({
+  name: 'demo',
+  title: 'Dns提供商Demo',
+  desc: 'dns provider示例',
+  icon: 'clarity:plugin-line',
+  // 这里是对应的云平台的 access 类型名称
+  accessType: 'demo',
+  order: 99,
+})
+export class DemoDnsProvider extends AbstractDnsProvider<DemoRecord> {
+  access!: DemoAccess;
+
+  async onInstance() {
+    this.access = this.ctx.access as DemoAccess;
+    // 也可以通过 ctx 成员变量传递 context
+    this.logger.debug('access', this.access);
+    // 初始化的操作
+    // ...
+  }
+
+  /**
+   * 创建 dns 解析记录，用于验证域名所有权
+   */
+  async createRecord(options: CreateRecordOptions): Promise<any> {
+    /**
+     * options 参数说明
+     * fullRecord: '_acme-challenge.example.com',
+     * value: 一串 uuid
+     * type: 'TXT',
+     * domain: 'example.com'
+     */
+    const { fullRecord, value, type, domain } = options;
+    this.logger.info('添加域名解析：', fullRecord, value, type, domain);
+
+    // 调用创建 dns 解析记录的对应的云端接口，创建 txt 类型的 dns 解析记录
+    // 请根据实际接口情况调用，例如：
+    // const createDnsRecordUrl = "xxx"
+    // const record = this.http.post(createDnsRecordUrl,{
+    //   // 授权参数
+    //   // 创建 dns 解析记录的参数
+    // })
+    // // 返回本次创建的 dns 解析记录，这个记录会在删除的时候用到
+    // return record
+  }
+
+  /**
+   *  删除 dns 解析记录,清理申请痕迹
+   * @param options
+   */
+  async removeRecord(options: RemoveRecordOptions<DemoRecord>): Promise<void> {
+    const { fullRecord, value, domain } = options.recordReq;
+    const record = options.recordRes;
+    this.logger.info('删除域名解析：', domain, fullRecord, value, record);
+    // 这里调用删除 txt dns 解析记录接口
+    // 请根据实际接口情况调用，例如：
+
+    // const deleteDnsRecordUrl = "xxx"
+    // const res = this.http.delete(deleteDnsRecordUrl,{
+    //   // 授权参数
+    //   // 删除 dns 解析记录的参数
+    // })
+
+
+    this.logger.info('删除域名解析成功:', fullRecord, value);
+  }
+}
+
+// 实例化这个 provider，将其自动注册到系统中
+if (isDev()) {
+  // 你的实现 要去掉这个 if，不然生产环境将不会显示
+  new DemoDnsProvider();
+}
+```
\ No newline at end of file
diff --git a/.trae/skills/dns-provider-dev/examples/input.md b/.trae/skills/dns-provider-dev/examples/input.md
new file mode 100644
index 000000000..2d483459a
--- /dev/null
+++ b/.trae/skills/dns-provider-dev/examples/input.md
@@ -0,0 +1 @@
+我需要开发一个 DNS Provider 插件，用于在 ACME 申请证书时添加 TXT 解析记录。请指导我如何实现。
\ No newline at end of file
diff --git a/.trae/skills/dns-provider-dev/examples/output.md b/.trae/skills/dns-provider-dev/examples/output.md
new file mode 100644
index 000000000..deb7de392
--- /dev/null
+++ b/.trae/skills/dns-provider-dev/examples/output.md
@@ -0,0 +1,121 @@
+# DNS Provider 插件开发指南
+
+## 开发步骤
+
+### 1. 导入必要的依赖
+
+```typescript
+import { AbstractDnsProvider, CreateRecordOptions, IsDnsProvider, RemoveRecordOptions } from '@certd/plugin-cert';
+import { DemoAccess } from './access.js';
+import { isDev } from '../../utils/env.js';
+```
+
+### 2. 定义记录数据结构
+
+```typescript
+type DemoRecord = {
+  // 这里定义 Record 记录的数据结构，跟对应云平台接口返回值一样即可，一般是拿到 id 就行，用于删除 txt 解析记录，清理申请痕迹
+  // id:string
+};
+```
+
+### 3. 使用 @IsDnsProvider 注解注册插件
+
+```typescript
+// 这里通过 IsDnsProvider 注册一个 dnsProvider
+@IsDnsProvider({
+  name: 'demo', // 插件唯一标识
+  title: 'Dns提供商Demo', // 插件标题
+  desc: 'dns provider示例', // 插件描述
+  icon: 'clarity:plugin-line', // 插件图标
+  // 这里是对应的云平台的 access 类型名称
+  accessType: 'demo',
+  order: 99, // 排序
+})
+export class DemoDnsProvider extends AbstractDnsProvider<DemoRecord> {
+  access!: DemoAccess;
+
+  async onInstance() {
+    this.access = this.ctx.access as DemoAccess;
+    // 也可以通过 ctx 成员变量传递 context
+    this.logger.debug('access', this.access);
+    // 初始化的操作
+    // ...
+  }
+
+  // 插件实现...
+}
+```
+
+### 4. 实现 createRecord 方法
+
+```typescript
+/**
+ * 创建 dns 解析记录，用于验证域名所有权
+ */
+async createRecord(options: CreateRecordOptions): Promise<any> {
+  /**
+   * options 参数说明
+   * fullRecord: '_acme-challenge.example.com',
+   * value: 一串 uuid
+   * type: 'TXT',
+   * domain: 'example.com'
+   */
+  const { fullRecord, value, type, domain } = options;
+  this.logger.info('添加域名解析：', fullRecord, value, type, domain);
+
+  // 调用创建 dns 解析记录的对应的云端接口，创建 txt 类型的 dns 解析记录
+  // 请根据实际接口情况调用，例如：
+  // const createDnsRecordUrl = "xxx"
+  // const record = this.http.post(createDnsRecordUrl,{
+  //   // 授权参数
+  //   // 创建 dns 解析记录的参数
+  // })
+  // // 返回本次创建的 dns 解析记录，这个记录会在删除的时候用到
+  // return record
+}
+```
+
+### 5. 实现 removeRecord 方法
+
+```typescript
+/**
+ *  删除 dns 解析记录,清理申请痕迹
+ * @param options
+ */
+async removeRecord(options: RemoveRecordOptions<DemoRecord>): Promise<void> {
+  const { fullRecord, value, domain } = options.recordReq;
+  const record = options.recordRes;
+  this.logger.info('删除域名解析：', domain, fullRecord, value, record);
+  // 这里调用删除 txt dns 解析记录接口
+  // 请根据实际接口情况调用，例如：
+
+  // const deleteDnsRecordUrl = "xxx"
+  // const res = this.http.delete(deleteDnsRecordUrl,{
+  //   // 授权参数
+  //   // 删除 dns 解析记录的参数
+  // })
+
+
+  this.logger.info('删除域名解析成功:', fullRecord, value);
+}
+```
+
+### 6. 实例化插件
+
+```typescript
+// 实例化这个 provider，将其自动注册到系统中
+if (isDev()) {
+  // 你的实现 要去掉这个 if，不然生产环境将不会显示
+  new DemoDnsProvider();
+}
+```
+
+## 注意事项
+
+1. **插件命名**：插件名称应简洁明了，反映其功能。
+2. **accessType**：必须指定对应的云平台的 access 类型名称。
+3. **记录结构**：定义适合对应云平台的记录数据结构，至少包含 id 字段用于删除记录。
+4. **日志输出**：使用 `this.logger` 输出日志，而不是 `console`。
+5. **错误处理**：API 调用失败时应抛出明确的错误信息。
+6. **实例化**：生产环境中应移除 `if (isDev())` 条件，确保插件在生产环境中也能被注册。
\ No newline at end of file
diff --git a/.trae/skills/plugin-converter/SKILL.md b/.trae/skills/plugin-converter/SKILL.md
new file mode 100644
index 000000000..650e50d75
--- /dev/null
+++ b/.trae/skills/plugin-converter/SKILL.md
@@ -0,0 +1,201 @@
+# 插件转换工具技能
+
+## 什么是插件转换工具
+
+插件转换工具是一个用于将 Certd 插件转换为 YAML 配置文件的命令行工具。它可以分析单个插件文件，识别插件类型，并生成对应的 YAML 配置，方便插件的注册和管理。
+
+## 工具位置
+
+`trae/skills/convert-plugin-to-yaml.js`
+
+## 功能特性
+
+- **单个插件转换**：支持指定单个插件文件进行转换，而不是扫描整个目录
+- **自动类型识别**：自动识别插件类型（Access、Task、DNS Provider、Notification、Addon）
+- **详细日志输出**：提供详细的转换过程日志，便于调试
+- **YAML 配置生成**：生成标准的 YAML 配置文件
+- **配置文件保存**：自动将生成的配置保存到 `./metadata` 目录
+- **可复用函数**：导出了可复用的函数，便于其他模块调用
+
+## 使用方法
+
+### 基本用法
+
+```bash
+node trae/skills/convert-plugin-to-yaml.js <插件文件路径>
+```
+
+### 示例
+
+```bash
+# 转换 Access 插件
+node trae/skills/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/access.js
+
+# 转换 Task 插件
+node trae/skills/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.js
+
+# 转换 DNS Provider 插件
+node trae/skills/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/dns-provider.js
+```
+
+## 转换过程
+
+1. **加载插件模块**：使用 `import()` 动态加载指定的插件文件
+2. **分析插件定义**：检查模块导出的对象，寻找带有 `define` 属性的插件
+3. **识别插件类型**：根据插件的继承关系或属性识别插件类型
+4. **生成 YAML 配置**：基于插件定义生成标准的 YAML 配置
+5. **保存配置文件**：将生成的配置保存到 `./metadata` 目录
+
+## 输出说明
+
+### 命令行输出
+
+执行转换命令后，工具会输出以下信息：
+
+- 插件加载状态
+- 插件导出的对象列表
+- 插件类型识别结果
+- 生成的 YAML 配置内容
+- 配置文件保存路径
+
+### 配置文件命名规则
+
+生成的配置文件命名规则为：
+
+```
+<插件类型>[_<子类型>]_<插件名称>.yaml
+```
+
+例如：
+- `access_demo.yaml`（Access 插件）
+- `deploy_DemoTest.yaml`（Task 插件）
+- `dnsProvider_demo.yaml`（DNS Provider 插件）
+
+## 插件类型识别逻辑
+
+工具通过以下逻辑识别插件类型：
+
+1. **DNS Provider**：如果插件定义中包含 `accessType` 属性
+2. **Task**：如果插件继承自 `AbstractTaskPlugin`
+3. **Notification**：如果插件继承自 `BaseNotification`
+4. **Access**：如果插件继承自 `BaseAccess`
+5. **Addon**：如果插件继承自 `BaseAddon`
+
+## 注意事项
+
+1. **文件路径**：插件文件路径可以是相对路径或绝对路径
+2. **文件格式**：仅支持 `.js` 文件，不支持 `.ts` 文件（需要先编译）
+3. **依赖安装**：执行前确保已安装所有必要的依赖
+4. **配置目录**：如果 `./metadata` 目录不存在，工具会自动创建
+5. **错误处理**：如果插件加载失败或识别失败，工具会输出错误信息但不会终止执行
+
+## 代码结构
+
+### 主要函数
+
+1. **isPrototypeOf(value, cls)**：检查对象是否是指定类的原型
+2. **loadSingleModule(filePath)**：加载单个插件模块
+3. **convertSinglePlugin(pluginPath)**：分析单个插件并生成 YAML 配置
+4. **main()**：主函数，处理命令行参数并执行转换
+
+### 导出函数
+
+工具导出了以下函数，便于其他模块调用：
+
+```javascript
+export {
+  convertSinglePlugin,  // 转换单个插件
+  loadSingleModule,     // 加载单个模块
+  isPrototypeOf         // 检查原型关系
+};
+```
+
+## 应用场景
+
+1. **插件开发**：在开发新插件时，快速生成配置文件
+2. **插件调试**：查看插件的内部定义和配置
+3. **插件管理**：批量转换现有插件为标准配置格式
+4. **自动化构建**：集成到构建流程中，自动生成插件配置
+
+## 示例输出
+
+### 转换 Access 插件示例
+
+```bash
+$ node trae/skills/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/access.js
+开始转换插件: packages/ui/certd-server/src/plugins/plugin-demo/access.js
+插件模块导出了 1 个对象: DemoAccess
+处理插件: DemoAccess
+插件类型: access
+脚本路径: packages/ui/certd-server/src/plugins/plugin-demo/access.js
+
+生成的 YAML 配置:
+name: demo
+title: 授权插件示例
+desc: 这是一个示例授权插件，用于演示如何实现一个授权插件
+icon: clarity:plugin-line
+pluginType: access
+type: builtIn
+scriptFilePath: packages/ui/certd-server/src/plugins/plugin-demo/access.js
+
+YAML 配置已保存到: ./metadata/access_demo.yaml
+插件转换完成!
+```
+
+### 转换 Task 插件示例
+
+```bash
+$ node trae/skills/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.js
+开始转换插件: packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.js
+插件模块导出了 1 个对象: DemoTest
+处理插件: DemoTest
+插件类型: deploy
+脚本路径: packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.js
+
+生成的 YAML 配置:
+name: DemoTest
+title: Demo-测试插件
+desc: ""
+icon: clarity:plugin-line
+group: other
+default:
+  strategy:
+    runStrategy: SkipWhenSucceed
+pluginType: deploy
+type: builtIn
+scriptFilePath: packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.js
+
+YAML 配置已保存到: ./metadata/deploy_DemoTest.yaml
+插件转换完成!
+```
+
+## 故障排除
+
+### 常见问题
+
+1. **模块加载失败**
+   - 原因：插件文件依赖未安装或路径错误
+   - 解决：确保已安装所有依赖，检查文件路径是否正确
+
+2. **插件类型识别失败**
+   - 原因：插件未正确继承基类或缺少必要的属性
+   - 解决：检查插件代码，确保正确继承对应的基类
+
+3. **YAML 配置生成失败**
+   - 原因：插件定义格式不正确
+   - 解决：检查插件的 `define` 属性格式是否正确
+
+4. **配置文件保存失败**
+   - 原因：权限不足或磁盘空间不足
+   - 解决：确保有足够的权限和磁盘空间
+
+### 调试建议
+
+- **查看详细日志**：工具会输出详细的转换过程日志，仔细查看日志信息
+- **检查插件代码**：确保插件代码符合 Certd 插件开发规范
+- **尝试简化插件**：如果转换失败，尝试创建一个最小化的插件示例进行测试
+- **检查依赖版本**：确保使用的依赖版本与 Certd 兼容
+
+## 总结
+
+插件转换工具是一个方便实用的工具，它可以帮助开发者快速生成插件的 YAML 配置文件，简化插件的注册和管理过程。通过命令行参数指定单个插件文件，工具会自动完成类型识别、配置生成和保存等操作，大大提高了插件开发和管理的效率。
\ No newline at end of file
diff --git a/.trae/skills/plugin-converter/examples/input.md b/.trae/skills/plugin-converter/examples/input.md
new file mode 100644
index 000000000..fe075cb3a
--- /dev/null
+++ b/.trae/skills/plugin-converter/examples/input.md
@@ -0,0 +1 @@
+我需要将一个插件转换为 YAML 配置文件。请指导我如何使用插件转换工具。
\ No newline at end of file
diff --git a/.trae/skills/plugin-converter/examples/output.md b/.trae/skills/plugin-converter/examples/output.md
new file mode 100644
index 000000000..2f252f73b
--- /dev/null
+++ b/.trae/skills/plugin-converter/examples/output.md
@@ -0,0 +1,95 @@
+# 插件转换工具使用指南
+
+## 工具说明
+
+插件转换工具用于将单个 Certd 插件转换为 YAML 配置文件，方便插件的注册和管理。
+
+## 工具位置
+
+`.trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js`
+
+## 使用方法
+
+### 基本用法
+
+```bash
+node .trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js <插件文件路径>
+```
+
+### 示例
+
+#### 转换 Access 插件
+
+```bash
+node .trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/access.js
+```
+
+#### 转换 Task 插件
+
+```bash
+node .trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.js
+```
+
+#### 转换 DNS Provider 插件
+
+```bash
+node .trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/dns-provider.js
+```
+
+## 转换过程
+
+1. **加载插件模块**：使用 `import()` 动态加载指定的插件文件
+2. **分析插件定义**：检查模块导出的对象，寻找带有 `define` 属性的插件
+3. **识别插件类型**：根据插件的继承关系或属性识别插件类型
+4. **生成 YAML 配置**：基于插件定义生成标准的 YAML 配置
+5. **保存配置文件**：将生成的配置保存到 `./metadata` 目录
+
+## 输出说明
+
+### 命令行输出
+
+执行转换命令后，工具会输出以下信息：
+
+- 插件加载状态
+- 插件导出的对象列表
+- 插件类型识别结果
+- 生成的 YAML 配置内容
+- 配置文件保存路径
+
+### 配置文件命名规则
+
+生成的配置文件命名规则为：
+
+```
+<插件类型>[_<子类型>]_<插件名称>.yaml
+```
+
+例如：
+- `access_demo.yaml`（Access 插件）
+- `deploy_DemoTest.yaml`（Task 插件）
+- `dnsProvider_demo.yaml`（DNS Provider 插件）
+
+## 示例输出
+
+### 转换 Access 插件示例
+
+```bash
+$ node .trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/access.js
+开始转换插件: packages/ui/certd-server/src/plugins/plugin-demo/access.js
+插件模块导出了 1 个对象: DemoAccess
+处理插件: DemoAccess
+插件类型: access
+脚本路径: packages/ui/certd-server/src/plugins/plugin-demo/access.js
+
+生成的 YAML 配置:
+name: demo
+title: 授权插件示例
+desc: 这是一个示例授权插件，用于演示如何实现一个授权插件
+icon: clarity:plugin-line
+pluginType: access
+type: builtIn
+scriptFilePath: packages/ui/certd-server/src/plugins/plugin-demo/access.js
+
+YAML 配置已保存到: ./metadata/access_demo.yaml
+插件转换完成!
+```
\ No newline at end of file
diff --git a/.trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js b/.trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js
new file mode 100644
index 000000000..0bb6251cc
--- /dev/null
+++ b/.trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js
@@ -0,0 +1,160 @@
+// 转换单个插件为 YAML 配置的技能脚本
+
+import path from "path";
+import fs from "fs";
+import { pathToFileURL } from "node:url";
+import * as yaml from "js-yaml";
+import { AbstractTaskPlugin, BaseAccess, BaseNotification} from "@certd/pipeline";
+import { BaseAddon} from "@certd/lib-server";
+
+/**
+ * 检查对象是否是指定类的原型
+ */
+function isPrototypeOf(value, cls) {
+  return cls.prototype.isPrototypeOf(value.prototype);
+}
+
+/**
+ * 加载单个插件模块
+ */
+async function loadSingleModule(filePath) {
+  try {
+    // 转换为 file:// URL（Windows 必需）
+    const moduleUrl = pathToFileURL(filePath).href;
+    const module = await import(moduleUrl);
+    return module.default || module;
+  } catch (err) {
+    console.error(`加载模块 ${filePath} 失败:`, err);
+    return null;
+  }
+}
+
+/**
+ * 分析单个插件并生成 YAML 配置
+ */
+async function convertSinglePlugin(pluginPath) {
+  console.log(`开始转换插件: ${pluginPath}`);
+  
+  // 加载插件模块
+  const module = await loadSingleModule(pluginPath);
+  if (!module) {
+    console.error("加载插件失败，退出");
+    return;
+  }
+  
+  // 处理模块中的所有导出
+  const entry = Object.entries(module);
+  if (entry.length === 0) {
+    console.error("插件模块没有导出任何内容");
+    return;
+  }
+  
+  console.log(`插件模块导出了 ${entry.length} 个对象: ${entry.map(([name]) => name).join(", ")}`);
+  
+  // 处理每个导出的对象
+  for (const [name, value] of entry) {
+    // 检查是否是插件（有 define 属性）
+    if (!value.define) {
+      console.log(`跳过非插件对象: ${name}`);
+      continue;
+    }
+    
+    console.log(`处理插件: ${name}`);
+    
+    // 构建插件定义
+    const pluginDefine = {
+      ...value.define
+    };
+    
+    let subType = "";
+    
+    // 确定插件类型
+    if (pluginDefine.accessType) {
+      pluginDefine.pluginType = "dnsProvider";
+    } else if (isPrototypeOf(value, AbstractTaskPlugin)) {
+      pluginDefine.pluginType = "deploy";
+    } else if (isPrototypeOf(value, BaseNotification)) {
+      pluginDefine.pluginType = "notification";
+    } else if (isPrototypeOf(value, BaseAccess)) {
+      pluginDefine.pluginType = "access";
+    } else if (isPrototypeOf(value, BaseAddon)) {
+      pluginDefine.pluginType = "addon";
+      subType = "_" + (pluginDefine.addonType || "");
+    } else {
+      console.log(`[warning] 未知的插件类型：${pluginDefine.name}`);
+      continue;
+    }
+    
+    pluginDefine.type = "builtIn";
+    
+    // 计算脚本文件路径
+    const relativePath = path.relative(process.cwd(), pluginPath);
+    const scriptFilePath = relativePath.replace(/\\/g, "/").replace(/\.js$/, ".js");
+    pluginDefine.scriptFilePath = scriptFilePath;
+    
+    console.log(`插件类型: ${pluginDefine.pluginType}`);
+    console.log(`脚本路径: ${scriptFilePath}`);
+    
+    // 生成 YAML 配置
+    const yamlContent = yaml.dump(pluginDefine);
+    console.log("\n生成的 YAML 配置:");
+    console.log(yamlContent);
+    
+    // 可选：保存到文件
+    const outputDir = "./metadata";
+    if (!fs.existsSync(outputDir)) {
+      fs.mkdirSync(outputDir, { recursive: true });
+    }
+    
+    const outputFileName = `${pluginDefine.pluginType}${subType}_${pluginDefine.name}.yaml`;
+    const outputPath = path.join(outputDir, outputFileName);
+    
+    fs.writeFileSync(outputPath, yamlContent, 'utf8');
+    console.log(`\nYAML 配置已保存到: ${outputPath}`);
+    
+    return pluginDefine;
+  }
+  
+  console.error("未找到有效的插件定义");
+}
+
+/**
+ * 主函数
+ */
+async function main() {
+  const args = process.argv.slice(2);
+  
+  if (args.length === 0) {
+    console.error("请指定插件文件路径");
+    console.log("用法: node convert-plugin-to-yaml.js <插件文件路径>");
+    process.exit(1);
+  }
+  
+  const pluginPath = args[0];
+  
+  if (!fs.existsSync(pluginPath)) {
+    console.error(`插件文件不存在: ${pluginPath}`);
+    process.exit(1);
+  }
+  
+  try {
+    await convertSinglePlugin(pluginPath);
+    console.log("\n插件转换完成!");
+  } catch (error) {
+    console.error("转换过程中出错:", error);
+    process.exit(1);
+  }
+}
+
+// 如果直接运行此脚本
+if (import.meta.url === pathToFileURL(process.argv[1]).href) {
+  main();
+}
+
+// 导出函数，以便其他模块使用
+export {
+  convertSinglePlugin,
+  loadSingleModule,
+  isPrototypeOf
+};
+
diff --git a/.trae/skills/task-plugin-dev/SKILL.md b/.trae/skills/task-plugin-dev/SKILL.md
new file mode 100644
index 000000000..84d16e690
--- /dev/null
+++ b/.trae/skills/task-plugin-dev/SKILL.md
@@ -0,0 +1,388 @@
+# Task 插件开发技能
+
+## 什么是 Task 插件
+
+Task 插件是 Certd 系统中的部署任务插件，它继承自 `AbstractTaskPlugin` 类，被流水线调用 `execute` 方法，将证书部署到对应的应用上。
+
+## 开发步骤
+
+### 1. 导入必要的依赖
+
+```typescript
+import { AbstractTaskPlugin, IsTaskPlugin, PageSearch, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
+import { CertInfo, CertReader } from '@certd/plugin-cert';
+import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib';
+import { optionsUtils } from '@certd/basic';
+import { CertApplyPluginNames} from '@certd/plugin-cert';
+```
+
+### 2. 使用 @IsTaskPlugin 注解注册插件
+
+```typescript
+@IsTaskPlugin({
+  // 命名规范，插件类型+功能，大写字母开头，驼峰命名
+  name: 'DemoTest',
+  title: 'Demo-测试插件', // 插件标题
+  icon: 'clarity:plugin-line', // 插件图标
+  // 插件分组
+  group: pluginGroups.other.key,
+  default: {
+    // 默认值配置照抄即可
+    strategy: {
+      runStrategy: RunStrategy.SkipWhenSucceed,
+    },
+  },
+})
+// 类名规范，跟上面插件名称（name）一致
+export class DemoTest extends AbstractTaskPlugin {
+  // 插件实现...
+}
+```
+
+### 3. 定义任务输入参数
+
+使用 `@TaskInput` 注解定义任务输入参数：
+
+```typescript
+// 测试参数
+@TaskInput({
+  title: '属性示例',
+  value: '默认值',
+  component: {
+    // 前端组件配置，具体配置见组件文档 https://www.antdv.com/components/input-cn
+    name: 'a-input',
+    vModel: 'value', // 双向绑定组件的 props 名称
+  },
+  helper: '帮助说明,[链接](https://certd.docmirror.cn)',
+  required: false, // 是否必填
+})
+text!: string;
+
+// 证书选择，此项必须要有
+@TaskInput({
+  title: '域名证书',
+  helper: '请选择前置任务输出的域名证书',
+  component: {
+    name: 'output-selector',
+    from: [...CertApplyPluginNames],
+  },
+  // required: true, // 必填
+})
+cert!: CertInfo;
+
+@TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
+// 前端可以展示，当前申请的证书域名列表
+certDomains!: string[];
+
+// 授权选择框
+@TaskInput({
+  title: 'demo授权',
+  helper: 'demoAccess授权',
+  component: {
+    name: 'access-selector',
+    type: 'demo', // 固定授权类型
+  },
+  // rules: [{ required: true, message: '此项必填' }],
+  // required: true, // 必填
+})
+accessId!: string;
+```
+
+### 4. 实现插件方法
+
+#### 4.1 插件实例化时执行的方法
+
+```typescript
+// 插件实例化时执行的方法
+async onInstance() {}
+```
+
+#### 4.2 插件执行方法
+
+```typescript
+// 插件执行方法
+async execute(): Promise<void> {
+  const { select, text, cert, accessId } = this;
+
+  try {
+    const access = await this.getAccess(accessId);
+    this.logger.debug('access', access);
+  } catch (e) {
+    this.logger.error('获取授权失败', e);
+  }
+
+  try {
+    const certReader = new CertReader(cert);
+    this.logger.debug('certReader', certReader);
+  } catch (e) {
+    this.logger.error('读取crt失败', e);
+  }
+
+  this.logger.info('DemoTestPlugin execute');
+  this.logger.info('text:', text);
+  this.logger.info('select:', select);
+  this.logger.info('switch:', this.switch);
+  this.logger.info('授权id:', accessId);
+
+  // 具体的部署逻辑
+  // ...
+}
+```
+
+#### 4.3 后端获取选项方法
+
+```typescript
+@TaskInput(
+  createRemoteSelectInputDefine({
+    title: '从后端获取选项',
+    helper: '选择时可以从后端获取选项',
+    action: DemoTest.prototype.onGetSiteList.name,
+    // 当以下参数变化时，触发获取选项
+    watches: ['certDomains', 'accessId'],
+    required: true,
+  })
+)
+siteName!: string | string[];
+
+// 从后端获取选项的方法
+async onGetSiteList(req: PageSearch) {
+  if (!this.accessId) {
+    throw new Error('请选择Access授权');
+  }
+
+  // @ts-ignore
+  const access = await this.getAccess(this.accessId);
+
+  // const siteRes = await access.GetDomainList(req);
+  // 以下是模拟数据
+  const siteRes = [
+    { id: 1, siteName: 'site1.com' },
+    { id: 2, siteName: 'site2.com' },
+    { id: 3, siteName: 'site2.com' },
+  ];
+  // 转换为前端所需要的格式
+  const options = siteRes.map((item: any) => {
+    return {
+      value: item.siteName,
+      label: item.siteName,
+      domain: item.siteName,
+    };
+  });
+  // 将站点域名名称根据证书域名进行匹配分组，分成匹配的和不匹配的两组选项，返回给前端，供用户选择
+  return optionsUtils.buildGroupOptions(options, this.certDomains);
+}
+```
+
+## 注意事项
+
+1. **插件命名**：插件名称应遵循命名规范，大写字母开头，驼峰命名。
+2. **类名规范**：类名应与插件名称（name）一致。
+3. **证书选择**：必须包含证书选择参数，用于获取前置任务输出的域名证书。
+4. **日志输出**：使用 `this.logger` 输出日志，而不是 `console`。
+5. **错误处理**：执行过程中的错误应被捕获并记录。
+6. **授权获取**：使用 `this.getAccess(accessId)` 获取授权信息。
+
+## 完整示例
+
+```typescript
+import { AbstractTaskPlugin, IsTaskPlugin, PageSearch, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
+import { CertInfo, CertReader } from '@certd/plugin-cert';
+import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib';
+import { optionsUtils } from '@certd/basic';
+import { CertApplyPluginNames} from '@certd/plugin-cert';
+@IsTaskPlugin({
+  //命名规范，插件类型+功能（就是目录plugin-demo中的demo），大写字母开头，驼峰命名
+  name: 'DemoTest',
+  title: 'Demo-测试插件',
+  icon: 'clarity:plugin-line',
+  //插件分组
+  group: pluginGroups.other.key,
+  default: {
+    //默认值配置照抄即可
+    strategy: {
+      runStrategy: RunStrategy.SkipWhenSucceed,
+    },
+  },
+})
+//类名规范，跟上面插件名称（name）一致
+export class DemoTest extends AbstractTaskPlugin {
+  //测试参数
+  @TaskInput({
+    title: '属性示例',
+    value: '默认值',
+    component: {
+      //前端组件配置，具体配置见组件文档 https://www.antdv.com/components/input-cn
+      name: 'a-input',
+      vModel: 'value', //双向绑定组件的props名称
+    },
+    helper: '帮助说明,[链接](https://certd.docmirror.cn)',
+    required: false, //是否必填
+  })
+  text!: string;
+
+  //测试参数
+  @TaskInput({
+    title: '选择框',
+    component: {
+      //前端组件配置，具体配置见组件文档 https://www.antdv.com/components/select-cn
+      name: 'a-auto-complete',
+      vModel: 'value',
+      options: [
+        //选项列表
+        { label: '动态显', value: 'show' },
+        { label: '动态隐', value: 'hide' },
+      ],
+    },
+  })
+  select!: string;
+
+  @TaskInput({
+    title: '动态显隐',
+    helper: '我会根据选择框的值进行显隐',
+    show: true, //动态计算的值会覆盖它
+    //动态计算脚本， mergeScript返回的对象会合并当前配置，此处演示 show的值会被动态计算结果覆盖，show的值根据用户选择的select的值决定
+    mergeScript: `
+    return {
+      show: ctx.compute(({form})=>{
+        return form.select === 'show';
+      })
+    }
+    `,
+  })
+  showText!: string;
+
+  //测试参数
+  @TaskInput({
+    title: '多选框',
+    component: {
+      //前端组件配置，具体配置见组件文档 https://www.antdv.com/components/select-cn
+      name: 'a-select',
+      vModel: 'value',
+      mode: 'tags',
+      multiple: true,
+      options: [
+        { value: '1', label: '选项1' },
+        { value: '2', label: '选项2' },
+      ],
+    },
+  })
+  multiSelect!: string;
+
+  //测试参数
+  @TaskInput({
+    title: 'switch',
+    component: {
+      //前端组件配置，具体配置见组件文档 https://www.antdv.com/components/switch-cn
+      name: 'a-switch',
+      vModel: 'checked',
+    },
+  })
+  switch!: boolean;
+  //证书选择，此项必须要有
+  @TaskInput({
+    title: '域名证书',
+    helper: '请选择前置任务输出的域名证书',
+    component: {
+      name: 'output-selector',
+      from: [...CertApplyPluginNames],
+    },
+    // required: true, // 必填
+  })
+  cert!: CertInfo;
+
+  @TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
+  //前端可以展示，当前申请的证书域名列表
+  certDomains!: string[];
+
+  //授权选择框
+  @TaskInput({
+    title: 'demo授权',
+    helper: 'demoAccess授权',
+    component: {
+      name: 'access-selector',
+      type: 'demo', //固定授权类型
+    },
+    // rules: [{ required: true, message: '此项必填' }],
+    // required: true, //必填
+  })
+  accessId!: string;
+
+  @TaskInput(
+    createRemoteSelectInputDefine({
+      title: '从后端获取选项',
+      helper: '选择时可以从后端获取选项',
+      action: DemoTest.prototype.onGetSiteList.name,
+      //当以下参数变化时，触发获取选项
+      watches: ['certDomains', 'accessId'],
+      required: true,
+    })
+  )
+  siteName!: string | string[];
+
+  //插件实例化时执行的方法
+  async onInstance() {}
+
+  //插件执行方法
+  async execute(): Promise<void> {
+    const { select, text, cert, accessId } = this;
+
+    try {
+      const access = await this.getAccess(accessId);
+      this.logger.debug('access', access);
+    } catch (e) {
+      this.logger.error('获取授权失败', e);
+    }
+
+    try {
+      const certReader = new CertReader(cert);
+      this.logger.debug('certReader', certReader);
+    } catch (e) {
+      this.logger.error('读取crt失败', e);
+    }
+
+    this.logger.info('DemoTestPlugin execute');
+    this.logger.info('text:', text);
+    this.logger.info('select:', select);
+    this.logger.info('switch:', this.switch);
+    this.logger.info('授权id:', accessId);
+
+    // const res = await this.http.request({
+    //   url: 'https://api.demo.com',
+    //   method: 'GET',
+    // });
+    // if (res.code !== 0) {
+    //   //检查res是否报错,你需要抛异常，来结束插件执行，否则会判定为执行成功，下次执行时会跳过本任务
+    //   throw new Error(res.message);
+    // }
+    // this.logger.info('部署成功:', res);
+  }
+
+  //此方法演示，如何让前端在添加插件时可以从后端获取选项，这里是后端返回选项的方法
+  async onGetSiteList(req: PageSearch) {
+    if (!this.accessId) {
+      throw new Error('请选择Access授权');
+    }
+
+    // @ts-ignore
+    const access = await this.getAccess(this.accessId);
+
+    // const siteRes = await access.GetDomainList(req);
+    //以下是模拟数据
+    const siteRes = [
+      { id: 1, siteName: 'site1.com' },
+      { id: 2, siteName: 'site2.com' },
+      { id: 3, siteName: 'site2.com' },
+    ];
+    //转换为前端所需要的格式
+    const options = siteRes.map((item: any) => {
+      return {
+        value: item.siteName,
+        label: item.siteName,
+        domain: item.siteName,
+      };
+    });
+    //将站点域名名称根据证书域名进行匹配分组，分成匹配的和不匹配的两组选项，返回给前端，供用户选择
+    return optionsUtils.buildGroupOptions(options, this.certDomains);
+  }
+}
+```
\ No newline at end of file
diff --git a/.trae/skills/task-plugin-dev/examples/input.md b/.trae/skills/task-plugin-dev/examples/input.md
new file mode 100644
index 000000000..622920d6d
--- /dev/null
+++ b/.trae/skills/task-plugin-dev/examples/input.md
@@ -0,0 +1 @@
+我需要开发一个 Task 插件，用于将申请的证书部署到指定的应用系统中。请指导我如何实现。
\ No newline at end of file
diff --git a/.trae/skills/task-plugin-dev/examples/output.md b/.trae/skills/task-plugin-dev/examples/output.md
new file mode 100644
index 000000000..28ebb03e0
--- /dev/null
+++ b/.trae/skills/task-plugin-dev/examples/output.md
@@ -0,0 +1,129 @@
+# Task 插件开发指南
+
+## 开发步骤
+
+### 1. 导入必要的依赖
+
+```typescript
+import { AbstractTaskPlugin, IsTaskPlugin, PageSearch, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
+import { CertInfo, CertReader } from '@certd/plugin-cert';
+import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib';
+import { optionsUtils } from '@certd/basic';
+import { CertApplyPluginNames} from '@certd/plugin-cert';
+```
+
+### 2. 使用 @IsTaskPlugin 注解注册插件
+
+```typescript
+@IsTaskPlugin({
+  // 命名规范，插件类型+功能，大写字母开头，驼峰命名
+  name: 'DemoTest',
+  title: 'Demo-测试插件', // 插件标题
+  icon: 'clarity:plugin-line', // 插件图标
+  // 插件分组
+  group: pluginGroups.other.key,
+  default: {
+    // 默认值配置照抄即可
+    strategy: {
+      runStrategy: RunStrategy.SkipWhenSucceed,
+    },
+  },
+})
+// 类名规范，跟上面插件名称（name）一致
+export class DemoTest extends AbstractTaskPlugin {
+  // 插件实现...
+}
+```
+
+### 3. 定义任务输入参数
+
+使用 `@TaskInput` 注解定义任务输入参数：
+
+```typescript
+// 测试参数
+@TaskInput({
+  title: '属性示例',
+  value: '默认值',
+  component: {
+    //前端组件配置，具体配置见组件文档 https://www.antdv.com/components/input-cn
+    name: 'a-input',
+    vModel: 'value', //双向绑定组件的props名称
+  },
+  helper: '帮助说明,[链接](https://certd.docmirror.cn)',
+  required: false, //是否必填
+})
+text!: string;
+
+//证书选择，此项必须要有
+@TaskInput({
+  title: '域名证书',
+  helper: '请选择前置任务输出的域名证书',
+  component: {
+    name: 'output-selector',
+    from: [...CertApplyPluginNames],
+  },
+  // required: true, // 必填
+})
+cert!: CertInfo;
+
+@TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
+//前端可以展示，当前申请的证书域名列表
+certDomains!: string[];
+
+//授权选择框
+@TaskInput({
+  title: 'demo授权',
+  helper: 'demoAccess授权',
+  component: {
+    name: 'access-selector',
+    type: 'demo', //固定授权类型
+  },
+  // rules: [{ required: true, message: '此项必填' }],
+  // required: true, //必填
+})
+accessId!: string;
+```
+
+### 4. 实现插件方法
+
+```typescript
+//插件实例化时执行的方法
+async onInstance() {}
+
+//插件执行方法
+async execute(): Promise<void> {
+  const { select, text, cert, accessId } = this;
+
+  try {
+    const access = await this.getAccess(accessId);
+    this.logger.debug('access', access);
+  } catch (e) {
+    this.logger.error('获取授权失败', e);
+  }
+
+  try {
+    const certReader = new CertReader(cert);
+    this.logger.debug('certReader', certReader);
+  } catch (e) {
+    this.logger.error('读取crt失败', e);
+  }
+
+  this.logger.info('DemoTestPlugin execute');
+  this.logger.info('text:', text);
+  this.logger.info('select:', select);
+  this.logger.info('switch:', this.switch);
+  this.logger.info('授权id:', accessId);
+
+  // 具体的部署逻辑
+  // ...
+}
+```
+
+## 注意事项
+
+1. **插件命名**：插件名称应遵循命名规范，大写字母开头，驼峰命名。
+2. **类名规范**：类名应与插件名称（name）一致。
+3. **证书选择**：必须包含证书选择参数，用于获取前置任务输出的域名证书。
+4. **日志输出**：使用 `this.logger` 输出日志，而不是 `console`。
+5. **错误处理**：执行过程中的错误应被捕获并记录。
+6. **授权获取**：使用 `this.getAccess(accessId)` 获取授权信息。
\ No newline at end of file

From 66d0d0e213cd2629215d2a86725ed346613873f8 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 5 Feb 2026 19:01:03 +0800
Subject: [PATCH 08/62] chore: admin mode

---
 .../certd-client/src/layout/layout-basic.vue  |  2 +-
 .../src/router/source/modules/sys.ts          |  2 +-
 .../src/vben/layouts/basic/header/header.vue  |  6 +--
 .../ui/certd-client/src/views/certd/dicts.ts  | 22 ++++++++
 .../src/views/certd/pipeline/crud.tsx         |  6 +++
 .../src/views/sys/enterprise/project/crud.tsx |  9 +++-
 .../src/views/sys/settings/tabs/mode.vue      | 25 +++++----
 .../db/migration/v10038__admin_mode.sql       | 53 ++++++++++++++++---
 .../user/enterprise/project-controller.ts     | 27 ++++++++++
 .../sys/enterprise/entity/audit-log.ts        |  3 ++
 .../modules/sys/enterprise/entity/project.ts  |  3 ++
 .../service/project-member-service.ts         |  8 +++
 .../sys/enterprise/service/project-service.ts | 27 +++++++++-
 13 files changed, 168 insertions(+), 25 deletions(-)
 create mode 100644 packages/ui/certd-client/src/views/certd/dicts.ts
 create mode 100644 packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts

diff --git a/packages/ui/certd-client/src/layout/layout-basic.vue b/packages/ui/certd-client/src/layout/layout-basic.vue
index df15dbeac..5d79e9c69 100644
--- a/packages/ui/certd-client/src/layout/layout-basic.vue
+++ b/packages/ui/certd-client/src/layout/layout-basic.vue
@@ -94,7 +94,7 @@ provide("fn:ai.open", openChat);
       <div class="hover:bg-accent ml-1 mr-2 cursor-pointer rounded-full">
         <vip-button class="flex-center header-btn" mode="nav" />
       </div>
-      <div v-if="!settingStore.isComm" class="hover:bg-accent ml-1 mr-2 cursor-pointer rounded-full">
+      <div v-if="!settingStore.isComm" class="hover:bg-accent ml-1 mr-2 cursor-pointer rounded-full hidden md:block">
         <fs-button shape="circle" type="text" icon="ion:logo-github" :text="null" @click="goGithub" />
       </div>
     </template>
diff --git a/packages/ui/certd-client/src/router/source/modules/sys.ts b/packages/ui/certd-client/src/router/source/modules/sys.ts
index 4cd71b0ce..83881c993 100644
--- a/packages/ui/certd-client/src/router/source/modules/sys.ts
+++ b/packages/ui/certd-client/src/router/source/modules/sys.ts
@@ -230,7 +230,7 @@ export const sysResources = [
             title: "certd.sysResources.enterpriseSetting",
             name: "EnterpriseSetting",
             path: "/sys/enterprise/setting",
-            redirect: "/sys/settings?tab=enterprise",
+            redirect: "/sys/settings?tab=mode",
             meta: {
               isMenu: true,
               show: true,
diff --git a/packages/ui/certd-client/src/vben/layouts/basic/header/header.vue b/packages/ui/certd-client/src/vben/layouts/basic/header/header.vue
index 4ce85ea48..926a86929 100644
--- a/packages/ui/certd-client/src/vben/layouts/basic/header/header.vue
+++ b/packages/ui/certd-client/src/vben/layouts/basic/header/header.vue
@@ -111,7 +111,7 @@ function clearPreferencesAndLogout() {
   <template v-for="slot in leftSlots.filter(item => item.index < REFERENCE_VALUE)" :key="slot.name">
     <slot :name="slot.name">
       <template v-if="slot.name === 'refresh'">
-        <VbenIconButton class="my-0 mr-1 rounded-md" @click="refresh">
+        <VbenIconButton class="my-0 mr-1 rounded-md hidden md:block" @click="refresh">
           <RotateCw class="size-4" />
         </VbenIconButton>
       </template>
@@ -131,7 +131,7 @@ function clearPreferencesAndLogout() {
     <template v-for="slot in rightSlots" :key="slot.name">
       <slot :name="slot.name">
         <template v-if="slot.name === 'global-search'">
-          <GlobalSearch :enable-shortcut-key="globalSearchShortcutKey" :menus="accessStore.accessMenus" class="mr-1 sm:mr-4" />
+          <GlobalSearch :enable-shortcut-key="globalSearchShortcutKey" :menus="accessStore.accessMenus" class="mr-1 sm:mr-4 hidden md:block" />
         </template>
 
         <template v-else-if="slot.name === 'preferences'">
@@ -144,7 +144,7 @@ function clearPreferencesAndLogout() {
           <LanguageToggle class="mr-1" />
         </template>
         <template v-else-if="slot.name === 'fullscreen'">
-          <VbenFullScreen class="mr-1" />
+          <VbenFullScreen class="mr-1 hidden md:block" />
         </template>
       </slot>
     </template>
diff --git a/packages/ui/certd-client/src/views/certd/dicts.ts b/packages/ui/certd-client/src/views/certd/dicts.ts
new file mode 100644
index 000000000..24c9e028b
--- /dev/null
+++ b/packages/ui/certd-client/src/views/certd/dicts.ts
@@ -0,0 +1,22 @@
+import { dict } from "@fast-crud/fast-crud";
+
+export const projectPermissionDict = dict({
+  data: [
+    {
+      label: "read",
+      value: "只读",
+    },
+    {
+      label: "write",
+      value: "读写",
+    },
+    {
+      label: "admin",
+      value: "管理员",
+    },
+  ],
+});
+
+export const projectDict = dict({
+  url: "/sys/enterprise/project/list",
+});
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
index 812857aaf..871d79085 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
@@ -14,6 +14,7 @@ import GroupSelector from "/@/views/certd/pipeline/group/group-selector.vue";
 import { statusUtil } from "/@/views/certd/pipeline/pipeline/utils/util.status";
 import { useCertViewer } from "/@/views/certd/pipeline/use";
 import { useI18n } from "/src/locales";
+import { projectDict } from "../dicts";
 
 export default function ({ crudExpose, context: { selectedRowKeys, openCertApplyDialog } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
@@ -294,6 +295,11 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
             width: 100,
           },
         },
+        projectId: {
+          title: t("certd.fields.projectName"),
+          type: "number",
+          dict: projectDict,
+        },
         title: {
           title: t("certd.fields.pipelineName"),
           type: "link",
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
index e6d4dcb61..847f7481d 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
@@ -74,7 +74,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         },
         name: {
           title: t("certd.ent.projectName"),
-          type: "text",
+          type: "link",
           search: {
             show: true,
           },
@@ -85,6 +85,13 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
           column: {
             width: 200,
+            cellRender({ row }) {
+              return (
+                <router-link to={`/sys/enterprise/project/member`} query={{ projectId: row.id }}>
+                  {row.name}
+                </router-link>
+              );
+            },
           },
         },
         disabled: {
diff --git a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
index 4bd95d147..2001f5751 100644
--- a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
@@ -2,7 +2,7 @@
   <div class="sys-settings-form sys-settings-mode">
     <a-form :model="formState" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off" @finish="onFinish">
       <a-form-item :label="t('certd.adminMode')" :name="['public', 'adminMode']">
-        <fs-dict-radio v-model:checked="formState.public.adminMode" :dict="adminModeDict" />
+        <fs-dict-radio v-model:value="formState.public.adminMode" :dict="adminModeDict" />
       </a-form-item>
 
       <a-form-item label=" " :colon="false" :wrapper-col="{ span: 8 }">
@@ -20,22 +20,25 @@ import { merge } from "lodash-es";
 import { useSettingStore } from "/@/store/settings";
 import { notification } from "ant-design-vue";
 import { useI18n } from "/src/locales";
+import { dict } from "@fast-crud/fast-crud";
 const { t } = useI18n();
 
 defineOptions({
   name: "SettingMode",
 });
 
-const adminModeDict = [
-  {
-    label: t("certd.adminMode.enterpriseMode"),
-    value: "enterprise",
-  },
-  {
-    label: t("certd.adminMode.saasMode"),
-    value: "saas",
-  },
-];
+const adminModeDict = dict({
+  data: [
+    {
+      label: t("certd.adminMode.enterpriseMode"),
+      value: "enterprise",
+    },
+    {
+      label: t("certd.adminMode.saasMode"),
+      value: "saas",
+    },
+  ],
+});
 
 const formState = reactive<Partial<SysSettings>>({
   public: {},
diff --git a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
index 0e5249168..8fb4aedf5 100644
--- a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
+++ b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
@@ -11,7 +11,7 @@ CREATE TABLE "cd_project"
 
 
 CREATE INDEX "index_project_user_id" ON "cd_project" ("user_id");
-INSERT INTO cd_project (id, user_id, "name", "disabled") VALUES (1, 0, 'default', false);
+INSERT INTO cd_project (id, user_id, "name", "disabled") VALUES (1, 1, 'default', false);
 
 
 ALTER TABLE cd_cert_info ADD COLUMN  project_id integer;
@@ -33,21 +33,60 @@ ALTER TABLE cd_addon ADD COLUMN  project_id integer;
 CREATE INDEX "index_addon_project_id" ON "cd_addon" ("project_id");
 
 ALTER TABLE pi_pipeline ADD COLUMN  project_id integer;
-CREATE INDEX "index_pipeline_project_id" ON "cd_pipeline" ("project_id");
+CREATE INDEX "index_pipeline_project_id" ON "pi_pipeline" ("project_id");
 
 ALTER TABLE pi_pipeline_group ADD COLUMN  project_id integer;
-CREATE INDEX "index_pipeline_group_project_id" ON "cd_pipeline_group" ("project_id");
+CREATE INDEX "index_pipeline_group_project_id" ON "pi_pipeline_group" ("project_id");
 
 ALTER TABLE pi_storage ADD COLUMN  project_id integer;
-CREATE INDEX "index_storage_project_id" ON "cd_storage" ("project_id");
+CREATE INDEX "index_storage_project_id" ON "pi_storage" ("project_id");
 
 ALTER TABLE pi_notification ADD COLUMN  project_id integer;
-CREATE INDEX "index_notification_project_id" ON "cd_notification" ("project_id");
+CREATE INDEX "index_notification_project_id" ON "pi_notification" ("project_id");
 
 ALTER TABLE pi_history ADD COLUMN  project_id integer;
-CREATE INDEX "index_history_project_id" ON "cd_history" ("project_id");
+CREATE INDEX "index_history_project_id" ON "pi_history" ("project_id");
 
 ALTER TABLE pi_history_log ADD COLUMN  project_id integer;
-CREATE INDEX "index_history_log_project_id" ON "cd_history_log" ("project_id");
+CREATE INDEX "index_history_log_project_id" ON "pi_history_log" ("project_id");
+
+ALTER TABLE pi_template ADD COLUMN  project_id integer;
+CREATE INDEX "index_template_project_id" ON "pi_template" ("project_id");
+
+
+
+CREATE TABLE "cd_project_member"
+(
+  "id"          integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  "user_id"     integer      NOT NULL,
+  "project_id"  integer      NOT NULL,
+  "permission"  varchar(128) NOT NULL DEFAULT ('read'),
+  "create_time" datetime     NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time" datetime     NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+
+
+CREATE INDEX "index_project_member_user_id" ON "cd_project_member" ("user_id");
+CREATE INDEX "index_project_member_project_id" ON "cd_project_member" ("project_id");
+
+
+CREATE TABLE "cd_audit_log"
+(
+  "id"          integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  "user_id"     integer      NOT NULL,
+  "username"    varchar(128) NOT NULL,
+  "project_id"  integer      NOT NULL,
+  "project_name" varchar(512) NOT NULL,
+  "type"        varchar(128) NOT NULL,
+  "action"      varchar(128) NOT NULL DEFAULT ('read'),
+  "content"     text         NOT NULL,
+  "ip_address"  varchar(128) NOT NULL,
+  "create_time" datetime     NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time" datetime     NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+
+
+CREATE INDEX "index_audit_log_user_id" ON "cd_audit_log" ("user_id");
+CREATE INDEX "index_audit_log_project_id" ON "cd_audit_log" ("project_id");
 
 
diff --git a/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts b/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts
new file mode 100644
index 000000000..8ba4beddf
--- /dev/null
+++ b/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts
@@ -0,0 +1,27 @@
+import { BaseController, Constants } from '@certd/lib-server';
+import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
+import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
+import { ProjectService } from '../../../modules/sys/enterprise/service/project-service.js';
+
+/**
+ */
+@Provide()
+@Controller('/api/enterprise/project')
+export class UserProjectController extends BaseController {
+  @Inject()
+  service: ProjectService;
+  @Inject()
+  authService: AuthService;
+
+  getService(): ProjectService {
+    return this.service;
+  }
+
+  @Post('/list', { summary: Constants.per.authOnly })
+  async list(@Body(ALL) body: any) {
+    const userId= this.getUserId();
+    const res = await this.service.getByUserId(userId);
+    return this.ok(res);
+  }
+
+}
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/entity/audit-log.ts b/packages/ui/certd-server/src/modules/sys/enterprise/entity/audit-log.ts
index 3e5361240..3de938245 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/entity/audit-log.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/entity/audit-log.ts
@@ -19,6 +19,9 @@ export class AuditLogEntity {
   @Column({ name: 'project_name', comment: '项目名称' })
   projectName: string;
 
+  @Column({ name: 'type', comment: '类型' })
+  type: string;
+
   @Column({ name: 'action', comment: '操作' })
   action: string;
 
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts
index f41dce77d..d968923c2 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts
@@ -28,4 +28,7 @@ export class ProjectEntity {
     default: () => 'CURRENT_TIMESTAMP',
   })
   updateTime: Date;
+
+  // user permission read write admin
+  permission:string
 }
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
index 74953946d..b7f17084b 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
@@ -38,4 +38,12 @@ export class ProjectMemberService extends BaseService<ProjectMemberEntity> {
    return await super.add(bean)
   }
 
+  async getByUserId(userId: number) {
+    return await this.repository.find({
+      where: {
+        userId,
+      },
+    });
+  }
+
 }
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
index 11b7aa9e8..a9bc86e77 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
@@ -1,8 +1,9 @@
 import {Inject, Provide, Scope, ScopeEnum} from '@midwayjs/core';
 import {BaseService, SysSettingsService} from '@certd/lib-server';
 import {InjectEntityModel} from '@midwayjs/typeorm';
-import {Repository} from 'typeorm';
+import {In, Repository} from 'typeorm';
 import { ProjectEntity } from '../entity/project.js';
+import { ProjectMemberService } from './project-member-service.js';
 
 @Provide()
 @Scope(ScopeEnum.Request, { allowDowngrade: true })
@@ -10,6 +11,8 @@ export class ProjectService extends BaseService<ProjectEntity> {
   @InjectEntityModel(ProjectEntity)
   repository: Repository<ProjectEntity>;
 
+  @Inject()
+  projectMemberService: ProjectMemberService;
 
   @Inject()
   sysSettingsService: SysSettingsService;
@@ -56,4 +59,26 @@ export class ProjectService extends BaseService<ProjectEntity> {
     project.disabled = disabled;
     await this.repository.save(project);
   }
+
+  async getByUserId(userId: number) {
+
+    const memberList = await this.projectMemberService.getByUserId(userId);
+    const projectIds = memberList.map(item => item.projectId);
+    const projectList = await this.repository.find({
+      where: {
+        id: In(projectIds),
+      },
+    });
+
+    const memberPermissionMap = memberList.reduce((prev, cur) => {
+      prev[cur.projectId] = cur.permission;
+      return prev;
+    }, {} as Record<number, string>);
+
+    projectList.forEach(item => {
+      item.permission = memberPermissionMap[item.id] || 'read';
+    })
+
+    return projectList
+  }
 }

From 3c85602ab1fc1953cdc06a6cd75a971d14119179 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 6 Feb 2026 12:00:40 +0800
Subject: [PATCH 09/62] =?UTF-8?q?perf:=20http=E8=AF=B7=E6=B1=82=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=BB=BA=E7=AB=8B=E8=BF=9E=E6=8E=A5=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/basic/src/utils/util.request.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/core/basic/src/utils/util.request.ts b/packages/core/basic/src/utils/util.request.ts
index 2a509d5db..e64d59591 100644
--- a/packages/core/basic/src/utils/util.request.ts
+++ b/packages/core/basic/src/utils/util.request.ts
@@ -294,6 +294,7 @@ export function createAgent(opts: CreateAgentOptions = {}) {
     {
       autoSelectFamily: true,
       autoSelectFamilyAttemptTimeout: 1000,
+      connectTimeout: 5000, // 连接建立超时
     },
     opts
   );

From 5e7a67834b09e8188aa728adab459c612581e394 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 6 Feb 2026 13:25:14 +0800
Subject: [PATCH 10/62] chore: docs

---
 .../plugin-plus/synology/plugins/plugin-deploy-to-panel.ts    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/ui/certd-server/src/plugins/plugin-plus/synology/plugins/plugin-deploy-to-panel.ts b/packages/ui/certd-server/src/plugins/plugin-plus/synology/plugins/plugin-deploy-to-panel.ts
index 6921aa2ef..862e9f3d3 100644
--- a/packages/ui/certd-server/src/plugins/plugin-plus/synology/plugins/plugin-deploy-to-panel.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-plus/synology/plugins/plugin-deploy-to-panel.ts
@@ -58,6 +58,10 @@ export class SynologyDeployToPanel extends AbstractPlusTaskPlugin {
   async onInstance() {}
   async execute(): Promise<void> {
     const access: SynologyAccess = await this.getAccess<SynologyAccess>(this.accessId);
+     if (access.deviceId){
+      this.logger.warn(`检测到您开启了二次认证，建议将证书申请任务的更新天数修改为65天，以保证每个月在群辉部署执行一次，刷新二次认证的有效期`); 
+    }
+   
     const client = new SynologyClient(access as any, this.ctx.http, this.ctx.logger, access.skipSslVerify);
     // await client.init();
     await client.doLogin();

From 7b8b9cfd2bf232caaf1f621824d037d825953fcc Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 6 Feb 2026 16:16:00 +0800
Subject: [PATCH 11/62] chore: project

---
 .../src/router/source/modules/certd.ts        | 53 +++++++++++++++++++
 .../src/router/source/modules/sys.ts          | 53 -------------------
 .../src/views/certd/pipeline/crud.tsx         | 10 ++--
 .../views/certd/pipeline/pipeline/index.vue   |  2 +-
 .../src/views/sys/enterprise/project/crud.tsx |  2 +-
 .../project/{member => detail}/api.ts         |  0
 .../project/{member => detail}/crud.tsx       |  0
 .../project/{member => detail}/index.vue      |  0
 .../plugin/cert-plugin/base-convert.ts        |  2 +-
 9 files changed, 61 insertions(+), 61 deletions(-)
 rename packages/ui/certd-client/src/views/sys/enterprise/project/{member => detail}/api.ts (100%)
 rename packages/ui/certd-client/src/views/sys/enterprise/project/{member => detail}/crud.tsx (100%)
 rename packages/ui/certd-client/src/views/sys/enterprise/project/{member => detail}/index.vue (100%)

diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts
index c14e7432e..4d04e4a50 100644
--- a/packages/ui/certd-client/src/router/source/modules/certd.ts
+++ b/packages/ui/certd-client/src/router/source/modules/certd.ts
@@ -94,6 +94,59 @@ export const certdResources = [
           keepAlive: true,
         },
       },
+      {
+        title: "certd.sysResources.enterpriseManager",
+        name: "EnterpriseManager",
+        path: "/sys/enterprise",
+        redirect: "/sys/enterprise/project",
+        meta: {
+          icon: "ion:cart-outline",
+          permission: "sys:settings:edit",
+          show: () => {
+            const settingStore = useSettingStore();
+            return settingStore.isEnterprise;
+          },
+          keepAlive: true,
+        },
+        children: [
+          {
+            title: "certd.sysResources.projectManager",
+            name: "ProjectManager",
+            path: "/sys/enterprise/project",
+            component: "/sys/enterprise/project/index.vue",
+            meta: {
+              show: true,
+              icon: "ion:cart",
+              permission: "sys:settings:edit",
+              keepAlive: true,
+            },
+          },
+          {
+            title: "certd.sysResources.projectMemberManager",
+            name: "ProjectMemberManager",
+            path: "/sys/enterprise/project/member",
+            component: "/sys/enterprise/project/member/index.vue",
+            meta: {
+              isMenu: false,
+              show: true,
+              icon: "ion:cart",
+              permission: "sys:settings:edit",
+            },
+          },
+          {
+            title: "certd.sysResources.enterpriseSetting",
+            name: "EnterpriseSetting",
+            path: "/sys/enterprise/setting",
+            redirect: "/sys/settings?tab=mode",
+            meta: {
+              isMenu: true,
+              show: true,
+              icon: "ion:cart",
+              permission: "sys:settings:edit",
+            },
+          },
+        ],
+      },
       {
         title: "certd.settings",
         name: "MineSetting",
diff --git a/packages/ui/certd-client/src/router/source/modules/sys.ts b/packages/ui/certd-client/src/router/source/modules/sys.ts
index 83881c993..aab7e077b 100644
--- a/packages/ui/certd-client/src/router/source/modules/sys.ts
+++ b/packages/ui/certd-client/src/router/source/modules/sys.ts
@@ -187,59 +187,6 @@ export const sysResources = [
           keepAlive: true,
         },
       },
-      {
-        title: "certd.sysResources.enterpriseManager",
-        name: "EnterpriseManager",
-        path: "/sys/enterprise",
-        redirect: "/sys/enterprise/project",
-        meta: {
-          icon: "ion:cart-outline",
-          permission: "sys:settings:edit",
-          show: () => {
-            const settingStore = useSettingStore();
-            return settingStore.isEnterprise;
-          },
-          keepAlive: true,
-        },
-        children: [
-          {
-            title: "certd.sysResources.projectManager",
-            name: "ProjectManager",
-            path: "/sys/enterprise/project",
-            component: "/sys/enterprise/project/index.vue",
-            meta: {
-              show: true,
-              icon: "ion:cart",
-              permission: "sys:settings:edit",
-              keepAlive: true,
-            },
-          },
-          {
-            title: "certd.sysResources.projectMemberManager",
-            name: "ProjectMemberManager",
-            path: "/sys/enterprise/project/member",
-            component: "/sys/enterprise/project/member/index.vue",
-            meta: {
-              isMenu: false,
-              show: true,
-              icon: "ion:cart",
-              permission: "sys:settings:edit",
-            },
-          },
-          {
-            title: "certd.sysResources.enterpriseSetting",
-            name: "EnterpriseSetting",
-            path: "/sys/enterprise/setting",
-            redirect: "/sys/settings?tab=mode",
-            meta: {
-              isMenu: true,
-              show: true,
-              icon: "ion:cart",
-              permission: "sys:settings:edit",
-            },
-          },
-        ],
-      },
       {
         title: "certd.sysResources.suiteManager",
         name: "SuiteManager",
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
index 871d79085..f864ff728 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
@@ -295,11 +295,6 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
             width: 100,
           },
         },
-        projectId: {
-          title: t("certd.fields.projectName"),
-          type: "number",
-          dict: projectDict,
-        },
         title: {
           title: t("certd.fields.pipelineName"),
           type: "link",
@@ -634,6 +629,11 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
             },
           },
         },
+        projectId: {
+          title: t("certd.fields.projectName"),
+          type: "number",
+          dict: projectDict,
+        },
         updateTime: {
           title: t("certd.fields.updateTime"),
           type: "datetime",
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue
index 501a6b5c3..494c62424 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue
@@ -1,7 +1,7 @@
 <template>
   <fs-page v-if="pipeline" class="page-pipeline-edit">
     <template #header>
-      <div class="title flex-1">
+      <div class="title flex-0">
         <fs-button class="back" icon="ion:chevron-back-outline" @click="goBack"></fs-button>
         <text-editable v-model="pipeline.title" :hover-show="false" :disabled="!editMode"></text-editable>
       </div>
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
index 847f7481d..55b497ff7 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
@@ -87,7 +87,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             width: 200,
             cellRender({ row }) {
               return (
-                <router-link to={`/sys/enterprise/project/member`} query={{ projectId: row.id }}>
+                <router-link to={`/sys/enterprise/project/detail`} query={{ projectId: row.id }}>
                   {row.name}
                 </router-link>
               );
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/member/api.ts b/packages/ui/certd-client/src/views/sys/enterprise/project/detail/api.ts
similarity index 100%
rename from packages/ui/certd-client/src/views/sys/enterprise/project/member/api.ts
rename to packages/ui/certd-client/src/views/sys/enterprise/project/detail/api.ts
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/member/crud.tsx b/packages/ui/certd-client/src/views/sys/enterprise/project/detail/crud.tsx
similarity index 100%
rename from packages/ui/certd-client/src/views/sys/enterprise/project/member/crud.tsx
rename to packages/ui/certd-client/src/views/sys/enterprise/project/detail/crud.tsx
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/member/index.vue b/packages/ui/certd-client/src/views/sys/enterprise/project/detail/index.vue
similarity index 100%
rename from packages/ui/certd-client/src/views/sys/enterprise/project/member/index.vue
rename to packages/ui/certd-client/src/views/sys/enterprise/project/detail/index.vue
diff --git a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base-convert.ts b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base-convert.ts
index 63f7e08d8..d4df9f8af 100644
--- a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base-convert.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base-convert.ts
@@ -27,7 +27,7 @@ export abstract class CertApplyBaseConvertPlugin extends AbstractTaskPlugin {
     helper:
       "1、支持多个域名打到一个证书上，例如： foo.com，*.foo.com，*.bar.com\n" +
       "2、子域名被通配符包含的不要填写，例如：www.foo.com已经被*.foo.com包含，不要填写www.foo.com\n" +
-      "3、泛域名只能通配*号那一级（*.foo.com的证书不能用于xxx.yyy.foo.com、不能用于foo.com）\n" +
+      "3、泛域名只能通配*号那一级（*.foo.com的证书不能用于foo.com且不能用于xxx.yyy.foo.com）\n" +
       "4、输入一个，空格之后，再输入下一个 \n" +
       "5、如果设置了子域托管解析（比如免费的二级域名托管在CF或者阿里云），请先[设置托管子域名](#/certd/pipeline/subDomain)",
   })

From 1e441154617e6516a9a3610412bf597128c62696 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Mon, 9 Feb 2026 13:49:00 +0800
Subject: [PATCH 12/62] =?UTF-8?q?fix:=20esxi=E9=83=A8=E7=BD=B2=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/basic/src/utils/util.log.ts                       | 2 +-
 packages/core/basic/src/utils/util.merge.ts                     | 2 +-
 .../src/plugins/plugin-plus/esxi/plugin-deploy-to-esxi.ts       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/basic/src/utils/util.log.ts b/packages/core/basic/src/utils/util.log.ts
index a106b82d3..77f3f2ab9 100644
--- a/packages/core/basic/src/utils/util.log.ts
+++ b/packages/core/basic/src/utils/util.log.ts
@@ -18,7 +18,7 @@ export function resetLogConfigure() {
   });
 }
 resetLogConfigure();
-export const logger = log4js.getLogger("default");
+export const logger: ILogger = log4js.getLogger("default") as any;
 
 export function resetLogFilePath(filePath: string) {
   logFilePath = filePath;
diff --git a/packages/core/basic/src/utils/util.merge.ts b/packages/core/basic/src/utils/util.merge.ts
index dae9d49d8..eafc2a482 100644
--- a/packages/core/basic/src/utils/util.merge.ts
+++ b/packages/core/basic/src/utils/util.merge.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash-es';
+import * as _ from "lodash-es";
 function isUnMergeable(srcValue: any) {
   return srcValue != null && srcValue instanceof UnMergeable;
 }
diff --git a/packages/ui/certd-server/src/plugins/plugin-plus/esxi/plugin-deploy-to-esxi.ts b/packages/ui/certd-server/src/plugins/plugin-plus/esxi/plugin-deploy-to-esxi.ts
index e64323abf..66cd69f2f 100644
--- a/packages/ui/certd-server/src/plugins/plugin-plus/esxi/plugin-deploy-to-esxi.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-plus/esxi/plugin-deploy-to-esxi.ts
@@ -59,7 +59,7 @@ export class EsxiDeployCertPlugin extends AbstractPlusTaskPlugin {
       handle: async (ctx) => {
         const crtPath = ctx.tmpCrtPath;
         const keyPath = ctx.tmpKeyPath;
-        sshClient.uploadFiles({
+        await sshClient.uploadFiles({
           connectConf: sshConf,
           transports: [
             {

From 2e3d0cc57c16c48ad435bc8fde729bacaedde9f5 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Mon, 9 Feb 2026 13:50:28 +0800
Subject: [PATCH 13/62] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2=E5=88=B0openwrt=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/plugins/plugin-plus/openwrt/plugin-deploy-to-openwrt.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/certd-server/src/plugins/plugin-plus/openwrt/plugin-deploy-to-openwrt.ts b/packages/ui/certd-server/src/plugins/plugin-plus/openwrt/plugin-deploy-to-openwrt.ts
index d8d48788d..469915ddf 100644
--- a/packages/ui/certd-server/src/plugins/plugin-plus/openwrt/plugin-deploy-to-openwrt.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-plus/openwrt/plugin-deploy-to-openwrt.ts
@@ -59,7 +59,7 @@ export class OpenwrtDeployCertPlugin extends AbstractPlusTaskPlugin {
       handle: async (ctx) => {
         const crtPath = ctx.tmpCrtPath;
         const keyPath = ctx.tmpKeyPath;
-        sshClient.uploadFiles({
+        await sshClient.uploadFiles({
           connectConf: sshConf,
           transports: [
             {

From b16f92314b56b33bffd83604c26344b104655cbb Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Mon, 9 Feb 2026 18:40:15 +0800
Subject: [PATCH 14/62] =?UTF-8?q?chore:=20=E8=87=AA=E5=8A=A8=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2mysql=E8=A1=A8=E6=A0=BCengine?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migration-mysql/v10039__mysql_engine.sql  | 36 +++++++++++++++++++
 .../db/migration-pg/v10039__mysql_engine.sql  |  1 +
 .../db/migration/v10039__mysql_engine.sql     |  1 +
 packages/ui/certd-server/db/transform.js      | 20 +++++++++--
 4 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 packages/ui/certd-server/db/migration-mysql/v10039__mysql_engine.sql
 create mode 100644 packages/ui/certd-server/db/migration-pg/v10039__mysql_engine.sql
 create mode 100644 packages/ui/certd-server/db/migration/v10039__mysql_engine.sql

diff --git a/packages/ui/certd-server/db/migration-mysql/v10039__mysql_engine.sql b/packages/ui/certd-server/db/migration-mysql/v10039__mysql_engine.sql
new file mode 100644
index 000000000..d1095a934
--- /dev/null
+++ b/packages/ui/certd-server/db/migration-mysql/v10039__mysql_engine.sql
@@ -0,0 +1,36 @@
+
+ALTER TABLE `cd_access` ENGINE = InnoDB;
+ALTER TABLE `cd_addon` ENGINE = InnoDB;
+ALTER TABLE `cd_cert_info` ENGINE = InnoDB;
+ALTER TABLE `cd_cname_provider` ENGINE = InnoDB;
+ALTER TABLE `cd_cname_record` ENGINE = InnoDB;
+ALTER TABLE `cd_domain` ENGINE = InnoDB;
+ALTER TABLE `cd_group` ENGINE = InnoDB;
+ALTER TABLE `cd_oauth_bound` ENGINE = InnoDB;
+ALTER TABLE `cd_open_key` ENGINE = InnoDB;
+ALTER TABLE `cd_product` ENGINE = InnoDB;
+ALTER TABLE `cd_site_info` ENGINE = InnoDB;
+ALTER TABLE `cd_site_ip` ENGINE = InnoDB;
+ALTER TABLE `cd_trade` ENGINE = InnoDB;
+ALTER TABLE `cd_user_suite` ENGINE = InnoDB;
+ALTER TABLE `flyway_history` ENGINE = InnoDB;
+ALTER TABLE `pi_history` ENGINE = InnoDB;
+ALTER TABLE `pi_history_log` ENGINE = InnoDB;
+ALTER TABLE `pi_notification` ENGINE = InnoDB;
+ALTER TABLE `pi_pipeline` ENGINE = InnoDB;
+ALTER TABLE `pi_pipeline_group` ENGINE = InnoDB;
+ALTER TABLE `pi_plugin` ENGINE = InnoDB;
+ALTER TABLE `pi_storage` ENGINE = InnoDB;
+ALTER TABLE `pi_sub_domain` ENGINE = InnoDB;
+ALTER TABLE `pi_template` ENGINE = InnoDB;
+ALTER TABLE `sys_permission` ENGINE = InnoDB;
+ALTER TABLE `sys_role` ENGINE = InnoDB;
+ALTER TABLE `sys_role_permission` ENGINE = InnoDB;
+ALTER TABLE `sys_settings` ENGINE = InnoDB;
+ALTER TABLE `sys_user` ENGINE = InnoDB;
+ALTER TABLE `sys_user_role` ENGINE = InnoDB;
+ALTER TABLE `user_settings` ENGINE = InnoDB;
+
+ALTER TABLE `cd_audit_log` ENGINE = InnoDB;
+ALTER TABLE `cd_project` ENGINE = InnoDB;
+ALTER TABLE `cd_project_member` ENGINE = InnoDB;
diff --git a/packages/ui/certd-server/db/migration-pg/v10039__mysql_engine.sql b/packages/ui/certd-server/db/migration-pg/v10039__mysql_engine.sql
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/packages/ui/certd-server/db/migration-pg/v10039__mysql_engine.sql
@@ -0,0 +1 @@
+
diff --git a/packages/ui/certd-server/db/migration/v10039__mysql_engine.sql b/packages/ui/certd-server/db/migration/v10039__mysql_engine.sql
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/packages/ui/certd-server/db/migration/v10039__mysql_engine.sql
@@ -0,0 +1 @@
+
diff --git a/packages/ui/certd-server/db/transform.js b/packages/ui/certd-server/db/transform.js
index fbdf395f9..4e6aa799a 100644
--- a/packages/ui/certd-server/db/transform.js
+++ b/packages/ui/certd-server/db/transform.js
@@ -75,8 +75,24 @@ function transformMysql() {
     pgSql = pgSql.replaceAll(/text/g, 'longtext');
     //双引号 替换成反引号
     pgSql = pgSql.replaceAll(/"/g, '`');
-    //create table if not exists
-    pgSql = pgSql.replaceAll(/CREATE TABLE ([ ]+)`/g, 'CREATE TABLE IF NOT EXISTS `');
+
+    
+    //提取所有的 create table 的表格name
+    const tableNames = pgSql.match(/CREATE TABLE `([^`]*)`/g);
+    if (tableNames && tableNames.length > 0) {
+      for (const item of tableNames) {
+        /**
+         * CREATE TABLE `cd_project`
+CREATE TABLE `cd_project_member`
+CREATE TABLE `cd_audit_log`
+         */
+        //提取表名
+        const tableName = item.match(/`([^`]*)`/)[1];
+        pgSql += `\nALTER TABLE \`${tableName}\` ENGINE = InnoDB;`
+      }
+    }
+   
+
 
     fs.writeFileSync(`./migration-mysql/${notFile}`, pgSql);
   }

From 37340838b6a61a94b86bfa13cf5da88b26f1315a Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Tue, 10 Feb 2026 01:57:11 +0800
Subject: [PATCH 15/62] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E7=BA=A7=E7=AE=A1=E7=90=86=E6=A8=A1=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=EF=BC=8C=E7=BB=86=E5=88=86?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/certd-client/src/components/index.ts   |   2 +
 .../src/components/project-selector/api.ts    |   9 ++
 .../src/components/project-selector/index.vue |  43 +++++++
 .../certd-client/src/layout/layout-basic.vue  |   5 +
 .../src/locales/langs/en-US/certd.ts          |  22 +++-
 .../src/locales/langs/zh-CN/certd.ts          |  26 ++++-
 .../src/router/source/modules/certd.ts        |  53 ---------
 .../src/router/source/modules/sys.ts          |  24 ++++
 .../ui/certd-client/src/store/project/api.ts  |   9 ++
 .../certd-client/src/store/project/index.ts   |  86 ++++++++++++++
 .../access/access-selector/access/crud.tsx    |  11 ++
 .../src/views/certd/access/crud.tsx           |  13 +++
 .../src/views/certd/history/crud.tsx          |  22 ++--
 .../src/views/certd/monitor/cert/crud.tsx     |  10 +-
 .../src/views/certd/monitor/site/crud.tsx     |  14 +++
 .../src/views/certd/notification/common.tsx   |   9 ++
 .../src/views/certd/notification/crud.tsx     |   7 ++
 .../notification-selector/modal/crud.tsx      |   5 +
 .../src/views/certd/open/openkey/crud.tsx     |  11 ++
 .../src/views/certd/pipeline/crud.tsx         |   9 +-
 .../src/views/certd/pipeline/group/crud.tsx   |  14 +++
 .../views/certd/pipeline/template/crud.tsx    |  14 +++
 .../src/views/sys/enterprise/dicts.ts         |  11 ++
 .../src/views/sys/enterprise/project/crud.tsx |  16 ++-
 .../sys/enterprise/project/detail/crud.tsx    |  33 +++---
 .../sys/enterprise/project/detail/index.vue   |   8 +-
 .../src/views/sys/settings/index.vue          |   2 +-
 .../src/views/sys/settings/tabs/mode.vue      |   6 +-
 .../db/migration/v10038__admin_mode.sql       |   2 +
 .../sys/enterprise/project-controller.ts      |   6 +-
 .../enterprise/project-member-controller.ts   |  56 ++++++++-
 .../user/enterprise/project-controller.ts     |   2 +-
 .../modules/sys/enterprise/entity/project.ts  |   3 +
 .../service/project-member-service.ts         |  22 ++++
 .../sys/enterprise/service/project-service.ts | 109 ++++++++++++++----
 35 files changed, 559 insertions(+), 135 deletions(-)
 create mode 100644 packages/ui/certd-client/src/components/project-selector/api.ts
 create mode 100644 packages/ui/certd-client/src/components/project-selector/index.vue
 create mode 100644 packages/ui/certd-client/src/store/project/api.ts
 create mode 100644 packages/ui/certd-client/src/store/project/index.ts
 create mode 100644 packages/ui/certd-client/src/views/sys/enterprise/dicts.ts

diff --git a/packages/ui/certd-client/src/components/index.ts b/packages/ui/certd-client/src/components/index.ts
index d751e9c7d..fdb3d94a5 100644
--- a/packages/ui/certd-client/src/components/index.ts
+++ b/packages/ui/certd-client/src/components/index.ts
@@ -16,6 +16,7 @@ import { defineAsyncComponent } from "vue";
 import NotificationSelector from "../views/certd/notification/notification-selector/index.vue";
 import EmailSelector from "./email-selector/index.vue";
 import ValidTimeFormat from "./valid-time-format.vue";
+import ProjectSelector from "./project-selector/index.vue";
 export default {
   install(app: any) {
     app.component(
@@ -45,5 +46,6 @@ export default {
     app.component("ExpiresTimeText", ExpiresTimeText);
     app.use(vip);
     app.use(Plugins);
+    app.component("ProjectSelector", ProjectSelector);
   },
 };
diff --git a/packages/ui/certd-client/src/components/project-selector/api.ts b/packages/ui/certd-client/src/components/project-selector/api.ts
new file mode 100644
index 000000000..f50033e89
--- /dev/null
+++ b/packages/ui/certd-client/src/components/project-selector/api.ts
@@ -0,0 +1,9 @@
+import { request } from "/src/api/service";
+
+export async function MyProjectList() {
+  return await request({
+    url: "/enterprise/project/list",
+    method: "post",
+    data: {},
+  });
+}
diff --git a/packages/ui/certd-client/src/components/project-selector/index.vue b/packages/ui/certd-client/src/components/project-selector/index.vue
new file mode 100644
index 000000000..c7a579699
--- /dev/null
+++ b/packages/ui/certd-client/src/components/project-selector/index.vue
@@ -0,0 +1,43 @@
+<template>
+  <a-dropdown class="project-selector">
+    <template #overlay>
+      <a-menu @click="handleMenuClick">
+        <a-menu-item v-for="item in projectStore.myProjects" :key="item.id">
+          {{ item.name }}
+        </a-menu-item>
+      </a-menu>
+    </template>
+    <div class="rounded pl-2 pr-2 px-2 py-1 flex-center flex pointer bg-accent h-10 button-text">
+      {{ projectStore.currentProject?.name || "..." }}
+      <DownOutlined class="ml-1" />
+    </div>
+  </a-dropdown>
+</template>
+
+<script lang="ts" setup>
+import { onMounted } from "vue";
+import { useProjectStore } from "/@/store/project";
+defineOptions({
+  name: "ProjectSelector",
+});
+
+const projectStore = useProjectStore();
+onMounted(async () => {
+  await projectStore.reload();
+});
+
+function handleMenuClick({ key }: any) {
+  projectStore.changeCurrentProject(key);
+}
+</script>
+<style lang="less">
+.project-selector {
+  &.button-text {
+    min-width: 100px;
+    max-width: 150px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+</style>
diff --git a/packages/ui/certd-client/src/layout/layout-basic.vue b/packages/ui/certd-client/src/layout/layout-basic.vue
index 5d79e9c69..4b0ae6414 100644
--- a/packages/ui/certd-client/src/layout/layout-basic.vue
+++ b/packages/ui/certd-client/src/layout/layout-basic.vue
@@ -81,6 +81,11 @@ provide("fn:ai.open", openChat);
 
 <template>
   <BasicLayout @clear-preferences-and-logout="handleLogout">
+    <template #header-left-0>
+      <div class="ml-1 mr-2">
+        <project-selector class="flex-center header-btn" />
+      </div>
+    </template>
     <template #user-dropdown>
       <UserDropdown :avatar="avatar" :menus="menus" :text="userStore.userInfo?.nickName || userStore.userInfo?.username" description="" tag-text="" @logout="handleLogout" />
     </template>
diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
index c30986999..c9797e677 100644
--- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
@@ -160,6 +160,8 @@ export default {
     updateTime: "Update Time",
     triggerType: "Trigger Type",
     pipelineId: "Pipeline Id",
+    projectName: "Project",
+    adminId: "Admin",
   },
 
   pi: {
@@ -790,6 +792,10 @@ export default {
       pipelineSetting: "Pipeline Settings",
       oauthSetting: "OAuth2 Settings",
       networkSetting: "Network Settings",
+      adminModeSetting: "Admin Mode Settings",
+      adminModeHelper: "enterprise mode : allow to create and manage pipelines, roles, users, etc.\n saas mode : only allow to create and manage pipelines",
+      enterpriseMode: "Enterprise Mode",
+      saasMode: "SaaS Mode",
 
       showRunStrategy: "Show RunStrategy",
       showRunStrategyHelper: "Allow modify the run strategy of the task",
@@ -868,12 +874,20 @@ export default {
     fromType: "From Type",
     expirationDate: "Expiration Date",
   },
+  ent: {
+    projectName: "Project Name",
+    projectDescription: "Project Description",
+    projectDetailManager: "Project Detail",
+    projectDetailDescription: "Manage Project Members",
+    projectPermission: "Permission",
+    permission: {
+      read: "Read",
+      write: "Write",
+      admin: "Admin",
+    },
+  },
   addonSelector: {
     select: "Select",
     placeholder: "select please",
   },
-  adminMode: {
-    enterpriseMode: "Enterprise Mode",
-    saasMode: "SaaS Mode",
-  },
 };
diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
index 8b1ae6491..e7c8ad909 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -167,6 +167,8 @@ export default {
     updateTime: "更新时间",
     triggerType: "触发类型",
     pipelineId: "流水线Id",
+    projectName: "项目",
+    adminId: "管理员",
   },
   pi: {
     validTime: "流水线有效期",
@@ -214,9 +216,10 @@ export default {
     orderManager: "订单管理",
     userSuites: "用户套餐",
     netTest: "网络测试",
-    enterpriseSetting: "企业管理设置",
+    enterpriseManager: "企业管理设置",
     projectManager: "项目管理",
-    projectUserManager: "项目用户管理",
+    projectDetail: "项目详情",
+    enterpriseSetting: "企业设置",
   },
   certificateRepo: {
     title: "证书仓库",
@@ -796,6 +799,12 @@ export default {
       pipelineSetting: "流水线设置",
       oauthSetting: "第三方登录",
       networkSetting: "网络设置",
+      adminModeSetting: "管理模式",
+      adminModeHelper: "企业管理模式: 企业内部使用，通过项目来隔离权限，流水线、授权数据属于项目。\nsaas模式：供外部用户注册使用，各个用户之间数据隔离，流水线、授权数据属于用户。",
+
+      adminMode: "管理模式",
+      enterpriseMode: "企业模式",
+      saasMode: "SaaS模式",
 
       showRunStrategy: "显示运行策略选择",
       showRunStrategyHelper: "任务设置中是否允许选择运行策略",
@@ -886,11 +895,16 @@ export default {
     select: "选择",
     placeholder: "请选择",
   },
-  adminMode: {
-    enterpriseMode: "企业模式",
-    saasMode: "SaaS模式",
-  },
   ent: {
     projectName: "项目名称",
+    projectDescription: "项目描述",
+    projectDetailManager: "项目详情",
+    projectDetailDescription: "管理项目成员",
+    projectPermission: "权限",
+    permission: {
+      read: "读取",
+      write: "写入",
+      admin: "管理员",
+    },
   },
 };
diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts
index 4d04e4a50..c14e7432e 100644
--- a/packages/ui/certd-client/src/router/source/modules/certd.ts
+++ b/packages/ui/certd-client/src/router/source/modules/certd.ts
@@ -94,59 +94,6 @@ export const certdResources = [
           keepAlive: true,
         },
       },
-      {
-        title: "certd.sysResources.enterpriseManager",
-        name: "EnterpriseManager",
-        path: "/sys/enterprise",
-        redirect: "/sys/enterprise/project",
-        meta: {
-          icon: "ion:cart-outline",
-          permission: "sys:settings:edit",
-          show: () => {
-            const settingStore = useSettingStore();
-            return settingStore.isEnterprise;
-          },
-          keepAlive: true,
-        },
-        children: [
-          {
-            title: "certd.sysResources.projectManager",
-            name: "ProjectManager",
-            path: "/sys/enterprise/project",
-            component: "/sys/enterprise/project/index.vue",
-            meta: {
-              show: true,
-              icon: "ion:cart",
-              permission: "sys:settings:edit",
-              keepAlive: true,
-            },
-          },
-          {
-            title: "certd.sysResources.projectMemberManager",
-            name: "ProjectMemberManager",
-            path: "/sys/enterprise/project/member",
-            component: "/sys/enterprise/project/member/index.vue",
-            meta: {
-              isMenu: false,
-              show: true,
-              icon: "ion:cart",
-              permission: "sys:settings:edit",
-            },
-          },
-          {
-            title: "certd.sysResources.enterpriseSetting",
-            name: "EnterpriseSetting",
-            path: "/sys/enterprise/setting",
-            redirect: "/sys/settings?tab=mode",
-            meta: {
-              isMenu: true,
-              show: true,
-              icon: "ion:cart",
-              permission: "sys:settings:edit",
-            },
-          },
-        ],
-      },
       {
         title: "certd.settings",
         name: "MineSetting",
diff --git a/packages/ui/certd-client/src/router/source/modules/sys.ts b/packages/ui/certd-client/src/router/source/modules/sys.ts
index aab7e077b..7f22df52e 100644
--- a/packages/ui/certd-client/src/router/source/modules/sys.ts
+++ b/packages/ui/certd-client/src/router/source/modules/sys.ts
@@ -40,6 +40,30 @@ export const sysResources = [
           permission: "sys:settings:view",
         },
       },
+      {
+        title: "certd.sysResources.projectManager",
+        name: "ProjectManager",
+        path: "/sys/enterprise/project",
+        component: "/sys/enterprise/project/index.vue",
+        meta: {
+          show: true,
+          icon: "ion:apps",
+          permission: "sys:settings:edit",
+          keepAlive: true,
+        },
+      },
+      {
+        title: "certd.sysResources.projectDetail",
+        name: "ProjectDetail",
+        path: "/sys/enterprise/project/detail",
+        component: "/sys/enterprise/project/detail/index.vue",
+        meta: {
+          isMenu: false,
+          show: true,
+          icon: "ion:apps",
+          permission: "sys:settings:edit",
+        },
+      },
       {
         title: "certd.sysResources.cnameSetting",
         name: "CnameSetting",
diff --git a/packages/ui/certd-client/src/store/project/api.ts b/packages/ui/certd-client/src/store/project/api.ts
new file mode 100644
index 000000000..f50033e89
--- /dev/null
+++ b/packages/ui/certd-client/src/store/project/api.ts
@@ -0,0 +1,9 @@
+import { request } from "/src/api/service";
+
+export async function MyProjectList() {
+  return await request({
+    url: "/enterprise/project/list",
+    method: "post",
+    data: {},
+  });
+}
diff --git a/packages/ui/certd-client/src/store/project/index.ts b/packages/ui/certd-client/src/store/project/index.ts
new file mode 100644
index 000000000..4fe0ff55c
--- /dev/null
+++ b/packages/ui/certd-client/src/store/project/index.ts
@@ -0,0 +1,86 @@
+import { defineStore } from "pinia";
+import * as api from "./api";
+import { message } from "ant-design-vue";
+import { computed, ref } from "vue";
+import { useSettingStore } from "../settings";
+import { LocalStorage } from "/@/utils/util.storage";
+
+export type ProjectItem = {
+  id: string;
+  name: string;
+  permission?: string;
+};
+
+export const useProjectStore = defineStore("app.project", () => {
+  const myProjects = ref([]);
+  const lastProjectId = LocalStorage.get("currentProjectId");
+  const currentProjectId = ref(lastProjectId); // 直接调用
+
+  const projects = computed(() => {
+    return myProjects.value;
+  });
+  const currentProject = computed(() => {
+    if (currentProjectId.value) {
+      const project = projects.value.find(item => item.id === currentProjectId.value);
+      if (project) {
+        return project;
+      }
+    }
+    if (projects.value.length > 0) {
+      return projects.value[0];
+    }
+
+    return null;
+  });
+
+  const settingStore = useSettingStore();
+  const isEnterprise = computed(() => {
+    return settingStore.isEnterprise;
+  });
+
+  function getSearchForm() {
+    if (!currentProjectId.value || !isEnterprise.value) {
+      return {};
+    }
+    return {
+      projectId: currentProjectId.value,
+    };
+  }
+  async function loadMyProjects(): Promise<ProjectItem[]> {
+    if (!isEnterprise.value) {
+      return [];
+    }
+    const projects = await api.MyProjectList();
+    myProjects.value = projects;
+  }
+
+  function changeCurrentProject(id: string) {
+    currentProjectId.value = id;
+    LocalStorage.set("currentProjectId", id);
+    message.success("切换项目成功");
+  }
+
+  async function reload() {
+    const projects = await api.MyProjectList();
+    myProjects.value = projects;
+  }
+
+  async function init() {
+    if (!myProjects.value) {
+      await reload();
+    }
+    return myProjects.value;
+  }
+
+  return {
+    projects,
+    myProjects,
+    currentProject,
+    isEnterprise,
+    getSearchForm,
+    loadMyProjects,
+    changeCurrentProject,
+    reload,
+    init,
+  };
+});
diff --git a/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx b/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
index 058d59829..6891410f1 100644
--- a/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
@@ -3,6 +3,8 @@ import { ref } from "vue";
 import { getCommonColumnDefine } from "/@/views/certd/access/common";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { useI18n } from "/src/locales";
+import { useProjectStore } from "/@/store/project";
+import { projectDict } from "../../../dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -44,6 +46,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   context.typeRef = typeRef;
   const commonColumnsDefine = getCommonColumnDefine(crudExpose, typeRef, api);
   commonColumnsDefine.type.form.component.disabled = true;
+  const projectStore = useProjectStore();
   return {
     typeRef,
     crudOptions: {
@@ -58,6 +61,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
       },
       search: {
         show: true,
+        initialForm: {
+          ...projectStore.getSearchForm(),
+        },
       },
       form: {
         wrapper: {
@@ -141,6 +147,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
         },
         ...commonColumnsDefine,
+        projectId: {
+          title: t("certd.fields.projectName"),
+          type: "dict-select",
+          dict: projectDict,
+        },
       },
     },
   };
diff --git a/packages/ui/certd-client/src/views/certd/access/crud.tsx b/packages/ui/certd-client/src/views/certd/access/crud.tsx
index 63cf2c9a3..1e74f4dac 100644
--- a/packages/ui/certd-client/src/views/certd/access/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/access/crud.tsx
@@ -3,6 +3,8 @@ import { useI18n } from "/src/locales";
 import { ref } from "vue";
 import { getCommonColumnDefine } from "/@/views/certd/access/common";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { projectDict } from "../dicts";
+import { useProjectStore } from "/@/store/project";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -29,6 +31,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
 
   const typeRef = ref();
   const commonColumnsDefine = getCommonColumnDefine(crudExpose, typeRef, api);
+  const projectStore = useProjectStore();
   return {
     crudOptions: {
       request: {
@@ -42,6 +45,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           confirmMessage: "授权如果已经被使用，可能会导致流水线无法正常运行，请谨慎操作",
         },
       },
+      search: {
+        initialForm: {
+          ...projectStore.getSearchForm(),
+        },
+      },
       rowHandle: {
         width: 200,
         buttons: {
@@ -115,6 +123,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
         },
         ...commonColumnsDefine,
+        projectId: {
+          title: t("certd.fields.projectName"),
+          type: "dict-select",
+          dict: projectDict,
+        },
       },
     },
   };
diff --git a/packages/ui/certd-client/src/views/certd/history/crud.tsx b/packages/ui/certd-client/src/views/certd/history/crud.tsx
index e1b7b760c..3212f762b 100644
--- a/packages/ui/certd-client/src/views/certd/history/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/history/crud.tsx
@@ -6,6 +6,8 @@ import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, Edi
 import { useUserStore } from "/@/store/user";
 import { useSettingStore } from "/@/store/settings";
 import { statusUtil } from "/@/views/certd/pipeline/pipeline/utils/util.status";
+import { projectDict } from "../dicts";
+import { useProjectStore } from "/@/store/project";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
@@ -32,6 +34,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   const selectedRowKeys: Ref<any[]> = ref([]);
   context.selectedRowKeys = selectedRowKeys;
 
+  const projectStore = useProjectStore();
+
   return {
     crudOptions: {
       settings: {
@@ -64,6 +68,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         },
       },
       search: {
+        initialForm: {
+          ...projectStore.getSearchForm(),
+        },
         formItem: {
           labelCol: {
             style: {
@@ -195,17 +202,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             align: "center",
           },
         },
-        createTime: {
-          title: t("certd.fields.createTime"),
-          type: "datetime",
-          form: {
-            show: false,
-          },
-          column: {
-            sorter: true,
-            width: 160,
-            align: "center",
-          },
+        projectId: {
+          title: t("certd.fields.projectName"),
+          type: "dict-select",
+          dict: projectDict,
         },
         updateTime: {
           title: t("certd.fields.updateTime"),
diff --git a/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx b/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
index c69fe0646..25fd31a18 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
@@ -10,6 +10,8 @@ import { notification } from "ant-design-vue";
 import CertView from "/@/views/certd/pipeline/cert-view.vue";
 import { useCertUpload } from "/@/views/certd/pipeline/cert-upload/use";
 import { useSettingStore } from "/@/store/settings";
+import { useProjectStore } from "/@/store/project";
+import { projectDict } from "../../dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -36,7 +38,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   const router = useRouter();
 
   const settingStore = useSettingStore();
-
+  const projectStore = useProjectStore();
   const model = useModal();
   const viewCert = async (row: any) => {
     const cert = await api.GetCert(row.id);
@@ -63,6 +65,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   const expireStatus = route?.query?.expireStatus as string;
   const searchInitForm = {
     expiresLeft: expireStatus,
+    ...projectStore.getSearchForm(),
   };
   return {
     crudOptions: {
@@ -344,6 +347,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             },
           },
         },
+        projectId: {
+          title: t("certd.fields.projectName"),
+          type: "dict-select",
+          dict: projectDict,
+        },
       },
     },
   };
diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
index 0ad543b7d..3c5ddbc01 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
@@ -13,6 +13,8 @@ import { useSiteImport } from "/@/views/certd/monitor/site/use";
 import { ref } from "vue";
 import GroupSelector from "../../basic/group/group-selector.vue";
 import { createGroupDictRef } from "../../basic/group/api";
+import { useProjectStore } from "/@/store/project";
+import { projectDict } from "../../dicts";
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
   const api = siteInfoApi;
@@ -105,6 +107,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
       return searchFrom.groupId;
     }
   }
+
+  const projectStore = useProjectStore();
   return {
     id: "siteMonitorCrud",
     crudOptions: {
@@ -289,6 +293,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
       //   name: "disabled",
       //   show: true,
       // },
+      search: {
+        initialForm: {
+          ...projectStore.getSearchForm(),
+        },
+      },
       columns: {
         id: {
           title: "ID",
@@ -800,6 +809,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             },
           },
         },
+        projectId: {
+          title: t("certd.fields.projectName"),
+          type: "dict-select",
+          dict: projectDict,
+        },
       },
     },
   };
diff --git a/packages/ui/certd-client/src/views/certd/notification/common.tsx b/packages/ui/certd-client/src/views/certd/notification/common.tsx
index 9b1cec9ff..dea479bb5 100644
--- a/packages/ui/certd-client/src/views/certd/notification/common.tsx
+++ b/packages/ui/certd-client/src/views/certd/notification/common.tsx
@@ -5,6 +5,8 @@ import { forEach, get, merge, set } from "lodash-es";
 import { Modal } from "ant-design-vue";
 import { mitter } from "/@/utils/util.mitt";
 import { useI18n } from "/src/locales";
+import { useProjectStore } from "/@/store/project";
+import { projectDict } from "../dicts";
 
 export function notificationProvide(api: any) {
   provide("notificationApi", api);
@@ -26,6 +28,8 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
     },
   };
 
+  const projectStore = useProjectStore();
+
   provide("getCurrentPluginDefine", () => {
     return currentDefine;
   });
@@ -247,5 +251,10 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
         },
       },
     } as ColumnCompositionProps,
+    projectId: {
+      title: t("certd.fields.projectName"),
+      type: "dict-select",
+      dict: projectDict,
+    },
   };
 }
diff --git a/packages/ui/certd-client/src/views/certd/notification/crud.tsx b/packages/ui/certd-client/src/views/certd/notification/crud.tsx
index 08bebc5c6..53baf1ade 100644
--- a/packages/ui/certd-client/src/views/certd/notification/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/notification/crud.tsx
@@ -2,6 +2,7 @@ import { ref } from "vue";
 import { getCommonColumnDefine } from "./common";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { createNotificationApi } from "/@/views/certd/notification/api";
+import { useProjectStore } from "/@/store/project";
 const api = createNotificationApi();
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
@@ -26,6 +27,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
 
   const typeRef = ref();
   const commonColumnsDefine = getCommonColumnDefine(crudExpose, typeRef, api);
+  const projectStore = useProjectStore();
   return {
     crudOptions: {
       request: {
@@ -34,6 +36,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         editRequest,
         delRequest,
       },
+      search: {
+        initialForm: {
+          ...projectStore.getSearchForm(),
+        },
+      },
       form: {
         labelCol: {
           //固定label宽度
diff --git a/packages/ui/certd-client/src/views/certd/notification/notification-selector/modal/crud.tsx b/packages/ui/certd-client/src/views/certd/notification/notification-selector/modal/crud.tsx
index 3f27ca407..944e29a39 100644
--- a/packages/ui/certd-client/src/views/certd/notification/notification-selector/modal/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/notification/notification-selector/modal/crud.tsx
@@ -2,6 +2,7 @@
 import { ref } from "vue";
 import { getCommonColumnDefine } from "../../common";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { useProjectStore } from "/@/store/project";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { crudBinding } = crudExpose;
@@ -29,6 +30,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
     return res;
   };
 
+  const projectStore = useProjectStore();
   const selectedRowKey = ref([props.modelValue]);
 
   const onSelectChange = (changed: any) => {
@@ -54,6 +56,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
       },
       search: {
         show: false,
+        initialForm: {
+          ...projectStore.getSearchForm(),
+        },
       },
       form: {
         labelCol: {
diff --git a/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx b/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx
index 0f7d8cbe5..1d67cfb83 100644
--- a/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx
@@ -3,6 +3,8 @@ import { useI18n } from "/src/locales";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { OPEN_API_DOC, openkeyApi } from "./api";
 import { useModal } from "/@/use/use-modal";
+import { useProjectStore } from "/@/store/project";
+import { projectDict } from "../../dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -26,6 +28,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
     const res = await api.AddObj(form);
     return res;
   };
+  const projectStore = useProjectStore();
   const model = useModal();
   return {
     crudOptions: {
@@ -37,6 +40,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
       },
       search: {
         show: false,
+        initialForm: {
+          ...projectStore.getSearchForm(),
+        },
       },
       form: {
         labelCol: {
@@ -163,6 +169,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             sorter: true,
           },
         },
+        projectId: {
+          title: t("certd.fields.projectName"),
+          type: "dict-select",
+          dict: projectDict,
+        },
         createTime: {
           title: t("certd.fields.createTime"),
           type: "datetime",
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
index f864ff728..c14b9e424 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
@@ -15,6 +15,7 @@ import { statusUtil } from "/@/views/certd/pipeline/pipeline/utils/util.status";
 import { useCertViewer } from "/@/views/certd/pipeline/use";
 import { useI18n } from "/src/locales";
 import { projectDict } from "../dicts";
+import { useProjectStore } from "/@/store/project";
 
 export default function ({ crudExpose, context: { selectedRowKeys, openCertApplyDialog } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
@@ -67,6 +68,8 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
   const userStore = useUserStore();
   const settingStore = useSettingStore();
 
+  const projectStore = useProjectStore();
+
   const DEFAULT_WILL_EXPIRE_DAYS = settingStore.sysPublic.defaultWillExpireDays || settingStore.sysPublic.defaultCertRenewDays || 15;
 
   function onDialogOpen(opt: any) {
@@ -148,7 +151,9 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
         },
       },
       search: {
-        col: { span: 3 },
+        initialForm: {
+          ...projectStore.getSearchForm(),
+        },
       },
       form: {
         afterSubmit({ form, res, mode }) {
@@ -631,7 +636,7 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
         },
         projectId: {
           title: t("certd.fields.projectName"),
-          type: "number",
+          type: "dict-select",
           dict: projectDict,
         },
         updateTime: {
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx
index 43d6b4841..60550987a 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx
@@ -1,6 +1,8 @@
 import { useI18n } from "/src/locales";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { pipelineGroupApi } from "./api";
+import { useProjectStore } from "/@/store/project";
+import { projectDict } from "../../dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -25,6 +27,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
     return res;
   };
 
+  const projectStore = useProjectStore();
+
   return {
     crudOptions: {
       settings: {
@@ -44,6 +48,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         editRequest,
         delRequest,
       },
+      search: {
+        initialForm: {
+          ...projectStore.getSearchForm(),
+        },
+      },
       form: {
         labelCol: {
           //固定label宽度
@@ -127,6 +136,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             width: 400,
           },
         },
+        projectId: {
+          title: t("certd.fields.projectName"),
+          type: "dict-select",
+          dict: projectDict,
+        },
       },
     },
   };
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx
index c60cc5104..05087ba7f 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx
@@ -6,6 +6,8 @@ import createCrudOptionsPipeline from "../crud";
 import * as pipelineApi from "../api";
 import { useTemplate } from "/@/views/certd/pipeline/template/use";
 import { useI18n } from "/@/locales";
+import { useProjectStore } from "/@/store/project";
+import { projectDict } from "../../dicts";
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const api = templateApi;
   const { t } = useI18n();
@@ -28,6 +30,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
     const res = await api.AddObj(form);
     return res;
   };
+
+  const projectStore = useProjectStore();
   const { openCrudFormDialog } = useFormWrapper();
   const router = useRouter();
 
@@ -48,6 +52,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           router.push({ path: "/certd/pipeline/template/edit", query: { templateId: res.id, editMode: "true" } });
         },
       },
+      search: {
+        initialForm: {
+          ...projectStore.getSearchForm(),
+        },
+      },
       form: {
         labelCol: {
           //固定label宽度
@@ -232,6 +241,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             },
           },
         },
+        projectId: {
+          title: t("certd.fields.projectName"),
+          type: "dict-select",
+          dict: projectDict,
+        },
       },
     },
   };
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/dicts.ts b/packages/ui/certd-client/src/views/sys/enterprise/dicts.ts
new file mode 100644
index 000000000..a70c28f19
--- /dev/null
+++ b/packages/ui/certd-client/src/views/sys/enterprise/dicts.ts
@@ -0,0 +1,11 @@
+import { dict } from "@fast-crud/fast-crud";
+
+export const userDict = dict({
+  url: "/sys/authority/user/getSimpleUsers",
+  value: "id",
+  onReady: ({ dict }) => {
+    for (const item of dict.data) {
+      item.label = item.nickName || item.username || item.phoneCode + item.mobile;
+    }
+  },
+});
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
index 55b497ff7..5343e3e1a 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
@@ -6,6 +6,7 @@ import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq,
 import { useUserStore } from "/@/store/user";
 import { useSettingStore } from "/@/store/settings";
 import { Modal } from "ant-design-vue";
+import { userDict } from "../dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
@@ -80,17 +81,12 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
           form: {
             component: {},
-            helper: t("certd.ent.projectNameHelper"),
             rules: [{ required: true, message: t("certd.requiredField") }],
           },
           column: {
             width: 200,
             cellRender({ row }) {
-              return (
-                <router-link to={`/sys/enterprise/project/detail`} query={{ projectId: row.id }}>
-                  {row.name}
-                </router-link>
-              );
+              return <router-link to={{ path: `/sys/enterprise/project/detail`, query: { projectId: row.id } }}>{row.name}</router-link>;
             },
           },
         },
@@ -125,6 +121,14 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             },
           },
         },
+        adminId: {
+          title: t("certd.fields.adminId"),
+          type: "dict-select",
+          dict: userDict,
+          column: {
+            width: 160,
+          },
+        },
         createTime: {
           title: t("certd.createTime"),
           type: "datetime",
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/detail/crud.tsx b/packages/ui/certd-client/src/views/sys/enterprise/project/detail/crud.tsx
index 07144fadd..437b73a74 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/detail/crud.tsx
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/detail/crud.tsx
@@ -6,6 +6,7 @@ import * as api from "./api";
 import { useSettingStore } from "/@/store/settings";
 import { useUserStore } from "/@/store/user";
 import { useI18n } from "/src/locales";
+import { userDict } from "../../dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
@@ -27,6 +28,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
     return res;
   };
 
+  const projectId = context.projectId;
+
   const userStore = useUserStore();
   const settingStore = useSettingStore();
   const selectedRowKeys: Ref<any[]> = ref([]);
@@ -60,6 +63,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         minWidth: 200,
         fixed: "right",
       },
+      search: {
+        initialForm: {
+          projectId,
+        },
+      },
       columns: {
         id: {
           title: "ID",
@@ -79,6 +87,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             show: false,
           },
           form: {
+            value: projectId,
+            show: false,
+          },
+          editForm: {
             show: false,
           },
           column: {
@@ -87,23 +99,18 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
         },
         userId: {
-          title: "用户ID",
+          title: "用户",
           type: "dict-select",
-          dict: dict({
-            url: "/sys/authority/user/getSimpleUsers",
-            value: "id",
-            label: "nickName",
-            labelBuilder: (item: any) => item.nickName || item.username || item.phoneCode + item.mobile,
-          }),
+          dict: userDict,
           search: {
-            show: false,
+            show: true,
           },
-          form: {
+          form: {},
+          editForm: {
             show: false,
           },
           column: {
             width: 200,
-            show: false,
           },
         },
         permission: {
@@ -111,9 +118,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           type: "dict-select",
           dict: dict({
             data: [
-              { label: t("certd.read"), value: "read", color: "cyan" },
-              { label: t("certd.write"), value: "write", color: "blue" },
-              { label: t("certd.admin"), value: "admin", color: "green" },
+              { label: t("certd.ent.permission.read"), value: "read", color: "cyan" },
+              { label: t("certd.ent.permission.write"), value: "write", color: "blue" },
+              { label: t("certd.ent.permission.admin"), value: "admin", color: "green" },
             ],
           }),
           search: {
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/detail/index.vue b/packages/ui/certd-client/src/views/sys/enterprise/project/detail/index.vue
index 12a6ad684..84f8e6d3e 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/detail/index.vue
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/detail/index.vue
@@ -1,10 +1,10 @@
 <template>
-  <fs-page class="page-project-member">
+  <fs-page class="page-project-detail">
     <template #header>
       <div class="title">
-        {{ t("certd.projectMemberManager") }}
+        {{ t("certd.ent.projectDetailManager") }}
         <span class="sub">
-          {{ t("certd.projectMemberDescription") }}
+          {{ t("certd.ent.projectDetailDescription") }}
         </span>
       </div>
     </template>
@@ -30,7 +30,7 @@ import { useRoute } from "vue-router";
 const { t } = useI18n();
 
 defineOptions({
-  name: "ProjectMemberManager",
+  name: "ProjectDetail",
 });
 
 const route = useRoute();
diff --git a/packages/ui/certd-client/src/views/sys/settings/index.vue b/packages/ui/certd-client/src/views/sys/settings/index.vue
index 1f129319c..16decb4c3 100644
--- a/packages/ui/certd-client/src/views/sys/settings/index.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/index.vue
@@ -29,7 +29,7 @@
         <a-tab-pane key="network" :tab="t('certd.sys.setting.networkSetting')">
           <SettingNetwork v-if="activeKey === 'network'" />
         </a-tab-pane>
-        <a-tab-pane key="mode" :tab="t('certd.adminMode')">
+        <a-tab-pane key="mode" :tab="t('certd.sys.setting.adminModeSetting')">
           <SettingMode v-if="activeKey === 'mode'" />
         </a-tab-pane>
       </a-tabs>
diff --git a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
index 2001f5751..2089d144c 100644
--- a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="sys-settings-form sys-settings-mode">
     <a-form :model="formState" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off" @finish="onFinish">
-      <a-form-item :label="t('certd.adminMode')" :name="['public', 'adminMode']">
+      <a-form-item :label="t('certd.sys.setting.adminMode')" :name="['public', 'adminMode']">
         <fs-dict-radio v-model:value="formState.public.adminMode" :dict="adminModeDict" />
       </a-form-item>
 
@@ -30,11 +30,11 @@ defineOptions({
 const adminModeDict = dict({
   data: [
     {
-      label: t("certd.adminMode.enterpriseMode"),
+      label: t("certd.sys.setting.enterpriseMode"),
       value: "enterprise",
     },
     {
-      label: t("certd.adminMode.saasMode"),
+      label: t("certd.sys.setting.saasMode"),
       value: "saas",
     },
   ],
diff --git a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
index 8fb4aedf5..74b691b29 100644
--- a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
+++ b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
@@ -4,6 +4,7 @@ CREATE TABLE "cd_project"
   "id"          integer PRIMARY KEY AUTOINCREMENT NOT NULL,
   "user_id"     integer      NOT NULL,
   "name"        varchar(512) NOT NULL,
+  "admin_id"    integer      NOT NULL,
   "disabled"    boolean      NOT NULL DEFAULT (false),
   "create_time" datetime     NOT NULL DEFAULT (CURRENT_TIMESTAMP),
   "update_time" datetime     NOT NULL DEFAULT (CURRENT_TIMESTAMP)
@@ -11,6 +12,7 @@ CREATE TABLE "cd_project"
 
 
 CREATE INDEX "index_project_user_id" ON "cd_project" ("user_id");
+CREATE INDEX "index_project_admin_id" ON "cd_project" ("admin_id");
 INSERT INTO cd_project (id, user_id, "name", "disabled") VALUES (1, 1, 'default', false);
 
 
diff --git a/packages/ui/certd-server/src/controller/sys/enterprise/project-controller.ts b/packages/ui/certd-server/src/controller/sys/enterprise/project-controller.ts
index eaf8f01ab..3066a31fc 100644
--- a/packages/ui/certd-server/src/controller/sys/enterprise/project-controller.ts
+++ b/packages/ui/certd-server/src/controller/sys/enterprise/project-controller.ts
@@ -38,7 +38,11 @@ export class SysProjectController extends CrudController<ProjectEntity> {
     };
     merge(bean, def);
     bean.userId = this.getUserId();
-    return super.add(bean);
+    return super.add({
+      ...bean,
+      userId:0,
+      adminId: bean.userId,
+    });
   }
 
   @Post("/update", { summary: "sys:settings:edit" })
diff --git a/packages/ui/certd-server/src/controller/sys/enterprise/project-member-controller.ts b/packages/ui/certd-server/src/controller/sys/enterprise/project-member-controller.ts
index 794600728..e03815450 100644
--- a/packages/ui/certd-server/src/controller/sys/enterprise/project-member-controller.ts
+++ b/packages/ui/certd-server/src/controller/sys/enterprise/project-member-controller.ts
@@ -3,6 +3,7 @@ import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/c
 import { ProjectMemberEntity } from "../../../modules/sys/enterprise/entity/project-member.js";
 import { ProjectMemberService } from "../../../modules/sys/enterprise/service/project-member-service.js";
 import { merge } from "lodash-es";
+import { ProjectService } from "../../../modules/sys/enterprise/service/project-service.js";
 
 /**
  */
@@ -15,6 +16,9 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
   @Inject()
   sysSettingsService: SysSettingsService;
 
+  @Inject()
+  projectService: ProjectService;
+
   getService<T>() {
     return this.service;
   }
@@ -37,29 +41,71 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
       disabled: false,
     };
     merge(bean, def);
-    bean.userId = this.getUserId();
+
+    await this.projectService.checkAdminPermission({
+      userId: this.getUserId(),
+      projectId: bean.projectId,
+    });
+
     return super.add(bean);
   }
 
   @Post("/update", { summary: "sys:settings:edit" })
   async update(@Body(ALL) bean: any) {
-    bean.userId = this.getUserId();
-    return super.update(bean);
+    if (!bean.id) {
+      throw new Error("id is required");
+    }
+    const projectId = await this.service.getProjectId(bean.id)
+    await this.projectService.checkAdminPermission({
+      userId: this.getUserId(),
+      projectId: projectId,
+    });
+    return super.update({
+      id: bean.id,
+      permission: bean.permission,
+    });
   }
 
   @Post("/info", { summary: "sys:settings:view" })
   async info(@Query("id") id: number) {
+     if (!id) {
+      throw new Error("id is required");
+    }
+    const projectId = await this.service.getProjectId(id)
+    await this.projectService.checkReadPermission({
+      userId: this.getUserId(),
+      projectId:projectId,
+    });
     return super.info(id);
   }
 
   @Post("/delete", { summary: "sys:settings:edit" })
   async delete(@Query("id") id: number) {
+    if (!id) {
+      throw new Error("id is required");
+    }
+    const projectId = await this.service.getProjectId(id)
+    await this.projectService.checkAdminPermission({
+      userId: this.getUserId(),
+      projectId:projectId,
+    });
     return super.delete(id);
   }
 
   @Post("/deleteByIds", { summary: "sys:settings:edit" })
   async deleteByIds(@Body("ids") ids: number[]) {
-    const res = await this.service.delete(ids);
-    return this.ok(res);
+    for (const id of ids) {
+      if (!id) {
+        throw new Error("id is required");
+      }
+      const projectId = await this.service.getProjectId(id)
+      await this.projectService.checkAdminPermission({
+        userId: this.getUserId(),
+        projectId:projectId,
+      });
+      await this.service.delete(id as any);
+    }
+   
+    return this.ok({});
   }
 }
diff --git a/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts b/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts
index 8ba4beddf..66fbb60a7 100644
--- a/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts
@@ -20,7 +20,7 @@ export class UserProjectController extends BaseController {
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body: any) {
     const userId= this.getUserId();
-    const res = await this.service.getByUserId(userId);
+    const res = await this.service.getUserProjects(userId);
     return this.ok(res);
   }
 
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts
index d968923c2..23a81fe95 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts
@@ -10,6 +10,9 @@ export class ProjectEntity {
   @Column({ name: 'user_id', comment: 'UserId' })
   userId: number;
 
+  @Column({ name: 'admin_id', comment: '管理员Id' })
+  adminId: number;
+
   @Column({ name: 'name', comment: '项目名称' })
   name: string;
 
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
index b7f17084b..d005494be 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
@@ -46,4 +46,26 @@ export class ProjectMemberService extends BaseService<ProjectMemberEntity> {
     });
   }
 
+  async getMember(projectId: number,userId: number) {
+    return await this.repository.findOne({
+      where: {
+        userId,
+        projectId,
+      },
+    });
+  }
+
+  async getProjectId(id: number) {
+    const member = await this.repository.findOne({
+      select: ['projectId'],
+      where: {
+        id: id,
+      },
+    });
+    if (!member) {
+      throw new Error('项目成员记录不存在');
+    }
+    return member.projectId;
+  }
+
 }
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
index a9bc86e77..521f6cf2e 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
@@ -1,7 +1,7 @@
-import {Inject, Provide, Scope, ScopeEnum} from '@midwayjs/core';
-import {BaseService, SysSettingsService} from '@certd/lib-server';
-import {InjectEntityModel} from '@midwayjs/typeorm';
-import {In, Repository} from 'typeorm';
+import { BaseService, SysSettingsService } from '@certd/lib-server';
+import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
+import { InjectEntityModel } from '@midwayjs/typeorm';
+import { Repository } from 'typeorm';
 import { ProjectEntity } from '../entity/project.js';
 import { ProjectMemberService } from './project-member-service.js';
 
@@ -30,45 +30,34 @@ export class ProjectService extends BaseService<ProjectEntity> {
     const exist = await this.repository.findOne({
       where: {
         name,
-        userId:0,
+        userId: 0,
       },
     });
    if (exist) {
      throw new Error('项目名称已存在');
    }
-   bean.userId = 0
    bean.disabled = false
    return await super.add(bean)
   }
 
   async setDisabled(id: number, disabled: boolean) {
-    const project = await this.repository.findOne({
-      where: {
-        id,
-        userId:0,
-      },
-    });
-    if (!project) {
-      throw new Error('项目不存在');
-    }
     await this.repository.update({
+      id,
       userId:0,
     }, {
       disabled,
     });
-    project.disabled = disabled;
-    await this.repository.save(project);
   }
 
-  async getByUserId(userId: number) {
+  async getUserProjects(userId: number) {
 
     const memberList = await this.projectMemberService.getByUserId(userId);
     const projectIds = memberList.map(item => item.projectId);
-    const projectList = await this.repository.find({
-      where: {
-        id: In(projectIds),
-      },
-    });
+    const projectList = await this.repository.createQueryBuilder('project')
+      .where(' project.disabled = false')
+      .where(' project.userId = :userId', { userId:0 })
+      .where(' project.id IN (:...projectIds) or project.adminId = :userId', { projectIds, userId })
+      .getMany();
 
     const memberPermissionMap = memberList.reduce((prev, cur) => {
       prev[cur.projectId] = cur.permission;
@@ -76,9 +65,81 @@ export class ProjectService extends BaseService<ProjectEntity> {
     }, {} as Record<number, string>);
 
     projectList.forEach(item => {
-      item.permission = memberPermissionMap[item.id] || 'read';
+      if (item.adminId === userId) {
+        item.permission = 'admin';
+      }else{
+        item.permission = memberPermissionMap[item.id] || 'read';
+      }
     })
 
     return projectList
   }
+
+  async checkAdminPermission({userId, projectId}: {userId: number, projectId: number}) {
+    return await this.checkPermission({
+      userId,
+      projectId,
+      permission: 'admin',
+    })
+  }
+  async checkWritePermission({userId, projectId}: {userId: number, projectId: number}) {
+    return await this.checkPermission({
+      userId,
+      projectId,
+      permission: 'write',
+    })
+  }
+  async checkReadPermission({userId, projectId}: {userId: number, projectId: number}) {
+    return await this.checkPermission({
+      userId,
+      projectId,
+      permission: 'read',
+    })
+  }
+
+  async checkPermission({userId, projectId, permission}: {userId: number, projectId: number, permission: string}) {
+   if (permission !== 'admin' && permission !== 'write' && permission !== 'read') {
+     throw new Error('权限类型错误');
+   }
+   if (!userId ){
+     throw new Error('用户ID不能为空');
+   }
+   if (!projectId ){
+     throw new Error('项目ID不能为空');
+   }
+   const project = await this.findOne({
+      select: ['id', 'userId', 'adminId', 'disabled'],
+      where: {
+        id: projectId,
+      },
+   });
+    if (!project) {
+      throw new Error('项目不存在');
+    }
+    if (project.adminId === userId) {
+      //创建者拥有管理权限
+      return true
+    }
+    if (project.disabled) {
+      throw new Error('项目已禁用');
+    }
+    const member = await this.projectMemberService.getMember(projectId,userId);
+    if (!member) {
+      throw new Error('项目成员不存在');
+    }
+    if (permission === 'read') {
+      return true
+    }
+    if (permission === 'write') {
+      if (member.permission === 'admin' || member.permission === 'write') {
+        return true
+      }else{
+        throw new Error('权限不足');
+      }
+    }
+    if (member.permission !== permission) {
+      throw new Error('权限不足');
+    }
+    return true
+  }
 }

From 1e416b9f8af1fa7167a8d67571c2f8137833e366 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Wed, 11 Feb 2026 00:07:29 +0800
Subject: [PATCH 16/62] chore: project controller

---
 .vscode/settings.json                         |   2 +-
 packages/core/acme-client/package.json        |   2 +-
 .../lib-server/src/basic/base-controller.ts   |  40 ++++-
 packages/libs/lib-server/src/basic/index.ts   |   1 +
 packages/libs/lib-server/src/basic/mode.ts    |  12 ++
 .../settings/service/sys-settings-service.ts  |  32 ++--
 packages/ui/certd-client/src/api/service.ts   |   9 +-
 .../plugins/common/domain-selector.vue        |   1 -
 .../src/components/project-selector/index.vue |   5 +-
 .../src/locales/langs/en-US/certd.ts          |   2 +
 .../src/locales/langs/zh-CN/certd.ts          |   2 +
 .../src/router/source/modules/certd.ts        |  24 +++
 .../certd-client/src/store/project/index.ts   |   1 +
 .../access/access-selector/access/crud.tsx    |   4 +-
 .../src/views/certd/access/crud.tsx           |  10 +-
 .../ui/certd-client/src/views/certd/dicts.ts  |  14 +-
 .../src/views/certd/history/crud.tsx          |   4 +-
 .../src/views/certd/monitor/cert/crud.tsx     |   4 +-
 .../src/views/certd/monitor/site/crud.tsx     |   4 +-
 .../src/views/certd/notification/common.tsx   |   4 +-
 .../src/views/certd/open/openkey/crud.tsx     |   4 +-
 .../src/views/certd/pipeline/crud.tsx         |   6 +-
 .../src/views/certd/pipeline/group/crud.tsx   |   4 +-
 .../views/certd/pipeline/template/crud.tsx    |   4 +-
 .../src/views/certd/project/api.ts            |  75 ++++++++
 .../src/views/certd/project/crud.tsx          | 165 ++++++++++++++++++
 .../src/views/certd/project/detail/api.ts     |  67 +++++++
 .../src/views/certd/project/detail/crud.tsx   | 162 +++++++++++++++++
 .../src/views/certd/project/detail/index.vue  |  71 ++++++++
 .../src/views/certd/project/index.vue         |  61 +++++++
 .../user/pipeline/pipeline-controller.ts      |  22 ++-
 .../src/modules/auto/auto-a-init-site.ts      |   3 +-
 .../pipeline/service/pipeline-service.ts      |   5 +-
 33 files changed, 773 insertions(+), 53 deletions(-)
 create mode 100644 packages/libs/lib-server/src/basic/mode.ts
 create mode 100644 packages/ui/certd-client/src/views/certd/project/api.ts
 create mode 100644 packages/ui/certd-client/src/views/certd/project/crud.tsx
 create mode 100644 packages/ui/certd-client/src/views/certd/project/detail/api.ts
 create mode 100644 packages/ui/certd-client/src/views/certd/project/detail/crud.tsx
 create mode 100644 packages/ui/certd-client/src/views/certd/project/detail/index.vue
 create mode 100644 packages/ui/certd-client/src/views/certd/project/index.vue

diff --git a/.vscode/settings.json b/.vscode/settings.json
index bf25c3e8d..8414615d6 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,7 +7,7 @@
     ],
     "editor.defaultFormatter": "dbaeumer.vscode-eslint",
     "[typescript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
+        "editor.defaultFormatter": "vscode.typescript-language-features"
     },
     "editor.tabSize": 2,
     "explorer.autoReveal": false,
diff --git a/packages/core/acme-client/package.json b/packages/core/acme-client/package.json
index 0340db046..4145ac99c 100644
--- a/packages/core/acme-client/package.json
+++ b/packages/core/acme-client/package.json
@@ -53,7 +53,7 @@
         "prepublishOnly": "npm run build-docs",
         "test": "mocha -t 60000 \"test/setup.js\" \"test/**/*.spec.js\"",
         "pub": "npm publish",
-        "compile": "tsc --skipLibCheck --watch"
+        "compile": "echo '1'"
     },
     "repository": {
         "type": "git",
diff --git a/packages/libs/lib-server/src/basic/base-controller.ts b/packages/libs/lib-server/src/basic/base-controller.ts
index 158eec008..6a9789e9c 100644
--- a/packages/libs/lib-server/src/basic/base-controller.ts
+++ b/packages/libs/lib-server/src/basic/base-controller.ts
@@ -1,11 +1,17 @@
-import { Inject } from '@midwayjs/core';
+import { ApplicationContext, Inject } from '@midwayjs/core';
+import type {IMidwayContainer} from  '@midwayjs/core';
 import * as koa from '@midwayjs/koa';
 import { Constants } from './constants.js';
+import { isEnterprise } from './mode.js';
+
 
 export abstract class BaseController {
   @Inject()
   ctx: koa.Context;
 
+  @ApplicationContext()
+  applicationContext: IMidwayContainer;
+
   /**
    * 成功返回
    * @param data 返回数据
@@ -55,4 +61,36 @@ export abstract class BaseController {
     }
   }
 
+  getProjectId(permission:string) {
+    if (!isEnterprise()) {
+      return null
+    }
+    const projectIdStr = this.ctx.headers["project-id"] as string;
+    if (!projectIdStr) {
+      throw new Error("projectId 不能为空")
+    }
+    const userId = this.getUserId()
+    const projectId = parseInt(projectIdStr)
+    this.checkProjectPermission(userId, projectId,permission)
+    return projectId;
+  }
+
+  getProjectUserId(permission:string){
+    let userId = this.getUserId()
+    const projectId = this.getProjectId(permission)
+    if(projectId){
+      userId = 0
+    }
+    return {
+      projectId,userId
+    }
+  }
+
+  async checkProjectPermission(userId: number, projectId: number,permission:string) {
+    const projectService:any = await this.applicationContext.getAsync("projectService");
+    await projectService.checkPermission({userId,projectId,permission})
+
+  }
+
+
 }
diff --git a/packages/libs/lib-server/src/basic/index.ts b/packages/libs/lib-server/src/basic/index.ts
index 184d3339e..d012ec35c 100644
--- a/packages/libs/lib-server/src/basic/index.ts
+++ b/packages/libs/lib-server/src/basic/index.ts
@@ -5,3 +5,4 @@ export * from './enum-item.js';
 export * from './exception/index.js';
 export * from './result.js';
 export * from './base-service.js';
+export * from "./mode.js"
\ No newline at end of file
diff --git a/packages/libs/lib-server/src/basic/mode.ts b/packages/libs/lib-server/src/basic/mode.ts
new file mode 100644
index 000000000..2f8318150
--- /dev/null
+++ b/packages/libs/lib-server/src/basic/mode.ts
@@ -0,0 +1,12 @@
+let adminMode = "saas"
+
+export function setAdminMode(mode:string = "saas"){
+  adminMode = mode
+}
+export function getAdminMode(){
+  return adminMode
+}
+
+export function isEnterprise(){
+  return adminMode === "enterprise"
+}
\ No newline at end of file
diff --git a/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts b/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts
index 5cb56673d..5118235f3 100644
--- a/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts
+++ b/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts
@@ -7,9 +7,9 @@ import { BaseSettings, SysInstallInfo, SysPrivateSettings, SysPublicSettings, Sy
 import { getAllSslProviderDomains, setSslProviderReverseProxies } from '@certd/acme-client';
 import { cache, logger, mergeUtils, setGlobalProxy } from '@certd/basic';
 import * as dns from 'node:dns';
-import { BaseService } from '../../../basic/index.js';
+import { BaseService, setAdminMode } from '../../../basic/index.js';
 import { executorQueue } from '../../basic/service/executor-queue.js';
-const {merge} = mergeUtils;
+const { merge } = mergeUtils;
 /**
  * 设置
  */
@@ -117,6 +117,8 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
 
   async savePublicSettings(bean: SysPublicSettings) {
     await this.saveSetting(bean);
+    //让设置生效
+    await this.reloadPublicSettings();
   }
 
   async getPrivateSettings(): Promise<SysPrivateSettings> {
@@ -137,23 +139,33 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
     await this.reloadPrivateSettings();
   }
 
+  async reloadSettings() {
+    await this.reloadPrivateSettings()
+    await this.reloadPublicSettings()
+  }
+
+  async reloadPublicSettings() {
+    const publicSetting = await this.getPublicSettings()
+    setAdminMode(publicSetting.adminMode)
+  }
+
   async reloadPrivateSettings() {
-    const bean = await this.getPrivateSettings();
+    const privateSetting = await this.getPrivateSettings();
     const opts = {
-      httpProxy: bean.httpProxy,
-      httpsProxy: bean.httpsProxy,
+      httpProxy: privateSetting.httpProxy,
+      httpsProxy: privateSetting.httpsProxy,
     };
     setGlobalProxy(opts);
 
-    if (bean.dnsResultOrder) {
-      dns.setDefaultResultOrder(bean.dnsResultOrder as any);
+    if (privateSetting.dnsResultOrder) {
+      dns.setDefaultResultOrder(privateSetting.dnsResultOrder as any);
     }
 
-    if (bean.pipelineMaxRunningCount){
-      executorQueue.setMaxRunningCount(bean.pipelineMaxRunningCount);
+    if (privateSetting.pipelineMaxRunningCount) {
+      executorQueue.setMaxRunningCount(privateSetting.pipelineMaxRunningCount);
     }
 
-    setSslProviderReverseProxies(bean.reverseProxies);
+    setSslProviderReverseProxies(privateSetting.reverseProxies);
   }
 
   async updateByKey(key: string, setting: any) {
diff --git a/packages/ui/certd-client/src/api/service.ts b/packages/ui/certd-client/src/api/service.ts
index fc4df40d4..9a322f6d7 100644
--- a/packages/ui/certd-client/src/api/service.ts
+++ b/packages/ui/certd-client/src/api/service.ts
@@ -3,6 +3,7 @@ import { get } from "lodash-es";
 import { errorLog, errorCreate } from "./tools";
 import { env } from "/src/utils/util.env";
 import { useUserStore } from "/@/store/user";
+import { useProjectStore } from "../store/project";
 
 export class CodeError extends Error {
   code: number;
@@ -138,11 +139,17 @@ function createRequestFunction(service: any) {
     const configDefault = {
       headers: {
         "Content-Type": get(config, "headers.Content-Type", "application/json"),
-      },
+      } as any,
       timeout: 30000,
       baseURL: env.API,
       data: {},
     };
+    const projectStore = useProjectStore();
+
+    if (projectStore.isEnterprise && !config.url.startsWith("/sys")) {
+      configDefault.headers["project-id"] = projectStore.currentProjectId;
+    }
+
     const userStore = useUserStore();
     const token = userStore.getToken;
     if (token != null) {
diff --git a/packages/ui/certd-client/src/components/plugins/common/domain-selector.vue b/packages/ui/certd-client/src/components/plugins/common/domain-selector.vue
index 79812dc85..1c761873e 100644
--- a/packages/ui/certd-client/src/components/plugins/common/domain-selector.vue
+++ b/packages/ui/certd-client/src/components/plugins/common/domain-selector.vue
@@ -10,7 +10,6 @@
         :options="optionsRef"
         :value="value"
         v-bind="attrs"
-        :open="openProp"
         @click="onClick"
         @update:value="emit('update:value', $event)"
       >
diff --git a/packages/ui/certd-client/src/components/project-selector/index.vue b/packages/ui/certd-client/src/components/project-selector/index.vue
index c7a579699..9b7805f36 100644
--- a/packages/ui/certd-client/src/components/project-selector/index.vue
+++ b/packages/ui/certd-client/src/components/project-selector/index.vue
@@ -7,9 +7,10 @@
         </a-menu-item>
       </a-menu>
     </template>
-    <div class="rounded pl-2 pr-2 px-2 py-1 flex-center flex pointer bg-accent h-10 button-text">
+    <div class="rounded pl-3 pr-3 px-2 py-1 flex-center flex pointer items-center bg-accent h-10 button-text">
+      <fs-icon icon="ion:apps" class="mr-1"></fs-icon>
       {{ projectStore.currentProject?.name || "..." }}
-      <DownOutlined class="ml-1" />
+      <fs-icon icon="ion:chevron-down-outline" class="ml-1"></fs-icon>
     </div>
   </a-dropdown>
 </template>
diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
index c9797e677..5cc8569c2 100644
--- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
@@ -214,6 +214,8 @@ export default {
     enterpriseSetting: "Enterprise Settings",
     projectManager: "Project Management",
     projectUserManager: "Project User Management",
+    myProjectManager: "My Projects",
+    myProjectDetail: "Project Detail",
   },
   certificateRepo: {
     title: "Certificate Repository",
diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
index e7c8ad909..1b6b2c765 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -220,6 +220,8 @@ export default {
     projectManager: "项目管理",
     projectDetail: "项目详情",
     enterpriseSetting: "企业设置",
+    myProjectManager: "我的项目",
+    myProjectDetail: "项目详情",
   },
   certificateRepo: {
     title: "证书仓库",
diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts
index c14e7432e..35b0655cd 100644
--- a/packages/ui/certd-client/src/router/source/modules/certd.ts
+++ b/packages/ui/certd-client/src/router/source/modules/certd.ts
@@ -14,6 +14,30 @@ export const certdResources = [
       order: 0,
     },
     children: [
+      {
+        title: "certd.sysResources.myProjectManager",
+        name: "MyProjectManager",
+        path: "/certd/project",
+        component: "/certd/project/index.vue",
+        meta: {
+          show: true,
+          icon: "ion:apps",
+          permission: "sys:settings:edit",
+          keepAlive: true,
+        },
+      },
+      {
+        title: "certd.sysResources.myProjectDetail",
+        name: "MyProjectDetail",
+        path: "/certd/project/detail",
+        component: "/certd/project/detail/index.vue",
+        meta: {
+          isMenu: false,
+          show: true,
+          icon: "ion:apps",
+          permission: "sys:settings:edit",
+        },
+      },
       {
         title: "certd.pipeline",
         name: "PipelineManager",
diff --git a/packages/ui/certd-client/src/store/project/index.ts b/packages/ui/certd-client/src/store/project/index.ts
index 4fe0ff55c..156daba07 100644
--- a/packages/ui/certd-client/src/store/project/index.ts
+++ b/packages/ui/certd-client/src/store/project/index.ts
@@ -76,6 +76,7 @@ export const useProjectStore = defineStore("app.project", () => {
     projects,
     myProjects,
     currentProject,
+    currentProjectId,
     isEnterprise,
     getSearchForm,
     loadMyProjects,
diff --git a/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx b/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
index 6891410f1..d6361928e 100644
--- a/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
@@ -4,7 +4,7 @@ import { getCommonColumnDefine } from "/@/views/certd/access/common";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { useI18n } from "/src/locales";
 import { useProjectStore } from "/@/store/project";
-import { projectDict } from "../../../dicts";
+import { myProjectDict } from "../../../dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -150,7 +150,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         projectId: {
           title: t("certd.fields.projectName"),
           type: "dict-select",
-          dict: projectDict,
+          dict: myProjectDict,
         },
       },
     },
diff --git a/packages/ui/certd-client/src/views/certd/access/crud.tsx b/packages/ui/certd-client/src/views/certd/access/crud.tsx
index 1e74f4dac..5643939cb 100644
--- a/packages/ui/certd-client/src/views/certd/access/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/access/crud.tsx
@@ -1,10 +1,10 @@
 // @ts-ignore
-import { useI18n } from "/src/locales";
-import { ref } from "vue";
-import { getCommonColumnDefine } from "/@/views/certd/access/common";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
-import { projectDict } from "../dicts";
+import { ref } from "vue";
+import { myProjectDict } from "../dicts";
 import { useProjectStore } from "/@/store/project";
+import { getCommonColumnDefine } from "/@/views/certd/access/common";
+import { useI18n } from "/src/locales";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -126,7 +126,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         projectId: {
           title: t("certd.fields.projectName"),
           type: "dict-select",
-          dict: projectDict,
+          dict: myProjectDict,
         },
       },
     },
diff --git a/packages/ui/certd-client/src/views/certd/dicts.ts b/packages/ui/certd-client/src/views/certd/dicts.ts
index 24c9e028b..dd6bfd0dc 100644
--- a/packages/ui/certd-client/src/views/certd/dicts.ts
+++ b/packages/ui/certd-client/src/views/certd/dicts.ts
@@ -17,6 +17,16 @@ export const projectPermissionDict = dict({
   ],
 });
 
-export const projectDict = dict({
-  url: "/sys/enterprise/project/list",
+export const myProjectDict = dict({
+  url: "/enterprise/project/list",
+});
+
+export const userDict = dict({
+  url: "/sys/authority/user/getSimpleUsers",
+  value: "id",
+  onReady: ({ dict }) => {
+    for (const item of dict.data) {
+      item.label = item.nickName || item.username || item.phoneCode + item.mobile;
+    }
+  },
 });
diff --git a/packages/ui/certd-client/src/views/certd/history/crud.tsx b/packages/ui/certd-client/src/views/certd/history/crud.tsx
index 3212f762b..092f8865d 100644
--- a/packages/ui/certd-client/src/views/certd/history/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/history/crud.tsx
@@ -6,7 +6,7 @@ import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, Edi
 import { useUserStore } from "/@/store/user";
 import { useSettingStore } from "/@/store/settings";
 import { statusUtil } from "/@/views/certd/pipeline/pipeline/utils/util.status";
-import { projectDict } from "../dicts";
+import { myProjectDict } from "../dicts";
 import { useProjectStore } from "/@/store/project";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
@@ -205,7 +205,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         projectId: {
           title: t("certd.fields.projectName"),
           type: "dict-select",
-          dict: projectDict,
+          dict: myProjectDict,
         },
         updateTime: {
           title: t("certd.fields.updateTime"),
diff --git a/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx b/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
index 25fd31a18..19aa8c94a 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
@@ -11,7 +11,7 @@ import CertView from "/@/views/certd/pipeline/cert-view.vue";
 import { useCertUpload } from "/@/views/certd/pipeline/cert-upload/use";
 import { useSettingStore } from "/@/store/settings";
 import { useProjectStore } from "/@/store/project";
-import { projectDict } from "../../dicts";
+import { myProjectDict } from "../../dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -350,7 +350,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         projectId: {
           title: t("certd.fields.projectName"),
           type: "dict-select",
-          dict: projectDict,
+          dict: myProjectDict,
         },
       },
     },
diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
index 3c5ddbc01..15bece7e3 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
@@ -14,7 +14,7 @@ import { ref } from "vue";
 import GroupSelector from "../../basic/group/group-selector.vue";
 import { createGroupDictRef } from "../../basic/group/api";
 import { useProjectStore } from "/@/store/project";
-import { projectDict } from "../../dicts";
+import { myProjectDict } from "../../dicts";
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
   const api = siteInfoApi;
@@ -812,7 +812,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         projectId: {
           title: t("certd.fields.projectName"),
           type: "dict-select",
-          dict: projectDict,
+          dict: myProjectDict,
         },
       },
     },
diff --git a/packages/ui/certd-client/src/views/certd/notification/common.tsx b/packages/ui/certd-client/src/views/certd/notification/common.tsx
index dea479bb5..24d2fdf04 100644
--- a/packages/ui/certd-client/src/views/certd/notification/common.tsx
+++ b/packages/ui/certd-client/src/views/certd/notification/common.tsx
@@ -6,7 +6,7 @@ import { Modal } from "ant-design-vue";
 import { mitter } from "/@/utils/util.mitt";
 import { useI18n } from "/src/locales";
 import { useProjectStore } from "/@/store/project";
-import { projectDict } from "../dicts";
+import { myProjectDict } from "../dicts";
 
 export function notificationProvide(api: any) {
   provide("notificationApi", api);
@@ -254,7 +254,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
     projectId: {
       title: t("certd.fields.projectName"),
       type: "dict-select",
-      dict: projectDict,
+      dict: myProjectDict,
     },
   };
 }
diff --git a/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx b/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx
index 1d67cfb83..9c4eac861 100644
--- a/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx
@@ -4,7 +4,7 @@ import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, Edi
 import { OPEN_API_DOC, openkeyApi } from "./api";
 import { useModal } from "/@/use/use-modal";
 import { useProjectStore } from "/@/store/project";
-import { projectDict } from "../../dicts";
+import { myProjectDict } from "../../dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -172,7 +172,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         projectId: {
           title: t("certd.fields.projectName"),
           type: "dict-select",
-          dict: projectDict,
+          dict: myProjectDict,
         },
         createTime: {
           title: t("certd.fields.createTime"),
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
index c14b9e424..7c2823295 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
@@ -14,7 +14,7 @@ import GroupSelector from "/@/views/certd/pipeline/group/group-selector.vue";
 import { statusUtil } from "/@/views/certd/pipeline/pipeline/utils/util.status";
 import { useCertViewer } from "/@/views/certd/pipeline/use";
 import { useI18n } from "/src/locales";
-import { projectDict } from "../dicts";
+import { myProjectDict } from "../dicts";
 import { useProjectStore } from "/@/store/project";
 
 export default function ({ crudExpose, context: { selectedRowKeys, openCertApplyDialog } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
@@ -445,6 +445,7 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
           type: "dict-select",
           search: {
             show: true,
+            col: { span: 2 },
           },
           dict: dict({
             data: statusUtil.getOptions(),
@@ -537,6 +538,7 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
           type: "dict-select",
           search: {
             show: true,
+            col: { span: 2 },
           },
           dict: dict({
             data: [
@@ -637,7 +639,7 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
         projectId: {
           title: t("certd.fields.projectName"),
           type: "dict-select",
-          dict: projectDict,
+          dict: myProjectDict,
         },
         updateTime: {
           title: t("certd.fields.updateTime"),
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx
index 60550987a..9dae8c6b8 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx
@@ -2,7 +2,7 @@ import { useI18n } from "/src/locales";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { pipelineGroupApi } from "./api";
 import { useProjectStore } from "/@/store/project";
-import { projectDict } from "../../dicts";
+import { myProjectDict } from "../../dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -139,7 +139,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         projectId: {
           title: t("certd.fields.projectName"),
           type: "dict-select",
-          dict: projectDict,
+          dict: myProjectDict,
         },
       },
     },
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx
index 05087ba7f..2204e0fe8 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx
@@ -7,7 +7,7 @@ import * as pipelineApi from "../api";
 import { useTemplate } from "/@/views/certd/pipeline/template/use";
 import { useI18n } from "/@/locales";
 import { useProjectStore } from "/@/store/project";
-import { projectDict } from "../../dicts";
+import { myProjectDict } from "../../dicts";
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const api = templateApi;
   const { t } = useI18n();
@@ -244,7 +244,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         projectId: {
           title: t("certd.fields.projectName"),
           type: "dict-select",
-          dict: projectDict,
+          dict: myProjectDict,
         },
       },
     },
diff --git a/packages/ui/certd-client/src/views/certd/project/api.ts b/packages/ui/certd-client/src/views/certd/project/api.ts
new file mode 100644
index 000000000..cd637e065
--- /dev/null
+++ b/packages/ui/certd-client/src/views/certd/project/api.ts
@@ -0,0 +1,75 @@
+import { request } from "/src/api/service";
+
+const apiPrefix = "/enterprise/project";
+
+export async function GetList(query: any) {
+  return await request({
+    url: apiPrefix + "/list",
+    method: "post",
+    data: query,
+  });
+}
+
+export async function GetPage(query: any) {
+  return await request({
+    url: apiPrefix + "/page",
+    method: "post",
+    data: query,
+  });
+}
+
+export async function AddObj(obj: any) {
+  return await request({
+    url: apiPrefix + "/add",
+    method: "post",
+    data: obj,
+  });
+}
+
+export async function UpdateObj(obj: any) {
+  return await request({
+    url: apiPrefix + "/update",
+    method: "post",
+    data: obj,
+  });
+}
+
+export async function DelObj(id: any) {
+  return await request({
+    url: apiPrefix + "/delete",
+    method: "post",
+    params: { id },
+  });
+}
+
+export async function GetObj(id: any) {
+  return await request({
+    url: apiPrefix + "/info",
+    method: "post",
+    params: { id },
+  });
+}
+
+export async function GetDetail(id: any) {
+  return await request({
+    url: apiPrefix + "/detail",
+    method: "post",
+    params: { id },
+  });
+}
+
+export async function DeleteBatch(ids: any[]) {
+  return await request({
+    url: apiPrefix + "/deleteByIds",
+    method: "post",
+    data: { ids },
+  });
+}
+
+export async function SetDisabled(id: any, disabled: boolean) {
+  return await request({
+    url: apiPrefix + "/setDisabled",
+    method: "post",
+    data: { id, disabled },
+  });
+}
diff --git a/packages/ui/certd-client/src/views/certd/project/crud.tsx b/packages/ui/certd-client/src/views/certd/project/crud.tsx
new file mode 100644
index 000000000..bc3902ee8
--- /dev/null
+++ b/packages/ui/certd-client/src/views/certd/project/crud.tsx
@@ -0,0 +1,165 @@
+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 { Modal } from "ant-design-vue";
+import { userDict } from "../dicts";
+
+export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const router = useRouter();
+  const { t } = useI18n();
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    const list = await api.GetList(query);
+
+    return {
+      records: list,
+      total: list.length,
+      offset: 0,
+      limit: 999,
+    };
+  };
+  const editRequest = async ({ form, row }: EditReq) => {
+    form.id = row.id;
+    const res = await api.UpdateObj(form);
+    return res;
+  };
+  const delRequest = async ({ row }: DelReq) => {
+    return await api.DelObj(row.id);
+  };
+
+  const 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: {
+        minWidth: 200,
+        fixed: "right",
+      },
+      columns: {
+        id: {
+          title: "ID",
+          key: "id",
+          type: "number",
+          column: {
+            width: 100,
+          },
+          form: {
+            show: false,
+          },
+        },
+        name: {
+          title: t("certd.ent.projectName"),
+          type: "link",
+          search: {
+            show: true,
+          },
+          form: {
+            component: {},
+            rules: [{ required: true, message: t("certd.requiredField") }],
+          },
+          column: {
+            width: 200,
+            cellRender({ row }) {
+              return <router-link to={{ path: `/certd/project/detail`, query: { projectId: row.id } }}>{row.name}</router-link>;
+            },
+          },
+        },
+        disabled: {
+          title: t("certd.disabled"),
+          type: "dict-switch",
+          dict: dict({
+            data: [
+              { label: t("certd.enabled"), value: false, color: "success" },
+              { label: t("certd.disabledLabel"), value: true, color: "error" },
+            ],
+          }),
+          form: {
+            value: false,
+          },
+          column: {
+            width: 100,
+            component: {
+              title: t("certd.clickToToggle"),
+              on: {
+                async click({ value, row }) {
+                  Modal.confirm({
+                    title: t("certd.prompt"),
+                    content: t("certd.confirmToggleStatus", { action: !value ? t("certd.disable") : t("certd.enable") }),
+                    onOk: async () => {
+                      await api.SetDisabled(row.id, !value);
+                      await crudExpose.doRefresh();
+                    },
+                  });
+                },
+              },
+            },
+          },
+        },
+        adminId: {
+          title: t("certd.fields.adminId"),
+          type: "dict-select",
+          dict: userDict,
+          column: {
+            width: 160,
+          },
+        },
+        createTime: {
+          title: t("certd.createTime"),
+          type: "datetime",
+          form: {
+            show: false,
+          },
+          column: {
+            sorter: true,
+            width: 160,
+            align: "center",
+          },
+        },
+        updateTime: {
+          title: t("certd.updateTime"),
+          type: "datetime",
+          form: {
+            show: false,
+          },
+          column: {
+            show: true,
+            width: 160,
+          },
+        },
+      },
+    },
+  };
+}
diff --git a/packages/ui/certd-client/src/views/certd/project/detail/api.ts b/packages/ui/certd-client/src/views/certd/project/detail/api.ts
new file mode 100644
index 000000000..e62684eab
--- /dev/null
+++ b/packages/ui/certd-client/src/views/certd/project/detail/api.ts
@@ -0,0 +1,67 @@
+import { request } from "/src/api/service";
+
+const apiPrefix = "/enterprise/myProjectMember";
+const userApiPrefix = "/sys/authority/user";
+export async function GetList(query: any) {
+  return await request({
+    url: apiPrefix + "/page",
+    method: "post",
+    data: query,
+  });
+}
+
+export async function AddObj(obj: any) {
+  return await request({
+    url: apiPrefix + "/add",
+    method: "post",
+    data: obj,
+  });
+}
+
+export async function UpdateObj(obj: any) {
+  return await request({
+    url: apiPrefix + "/update",
+    method: "post",
+    data: obj,
+  });
+}
+
+export async function DelObj(id: any) {
+  return await request({
+    url: apiPrefix + "/delete",
+    method: "post",
+    params: { id },
+  });
+}
+
+export async function GetObj(id: any) {
+  return await request({
+    url: apiPrefix + "/info",
+    method: "post",
+    params: { id },
+  });
+}
+
+export async function GetDetail(id: any) {
+  return await request({
+    url: apiPrefix + "/detail",
+    method: "post",
+    params: { id },
+  });
+}
+
+export async function DeleteBatch(ids: any[]) {
+  return await request({
+    url: apiPrefix + "/deleteByIds",
+    method: "post",
+    data: { ids },
+  });
+}
+
+export async function GetUserSimpleByIds(query: any) {
+  return await request({
+    url: userApiPrefix + "/getSimpleByIds",
+    method: "post",
+    data: query,
+  });
+}
diff --git a/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx b/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx
new file mode 100644
index 000000000..437b73a74
--- /dev/null
+++ b/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx
@@ -0,0 +1,162 @@
+import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { Modal } from "ant-design-vue";
+import { Ref, ref } from "vue";
+import { useRouter } from "vue-router";
+import * as api from "./api";
+import { useSettingStore } from "/@/store/settings";
+import { useUserStore } from "/@/store/user";
+import { useI18n } from "/src/locales";
+import { userDict } from "../../dicts";
+
+export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const router = useRouter();
+  const { t } = useI18n();
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetList(query);
+  };
+  const editRequest = async ({ form, row }: EditReq) => {
+    form.id = row.id;
+    const res = await api.UpdateObj(form);
+    return res;
+  };
+  const delRequest = async ({ row }: DelReq) => {
+    return await api.DelObj(row.id);
+  };
+
+  const addRequest = async ({ form }: AddReq) => {
+    const res = await api.AddObj(form);
+    return res;
+  };
+
+  const projectId = context.projectId;
+
+  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: {
+        minWidth: 200,
+        fixed: "right",
+      },
+      search: {
+        initialForm: {
+          projectId,
+        },
+      },
+      columns: {
+        id: {
+          title: "ID",
+          key: "id",
+          type: "number",
+          column: {
+            width: 100,
+          },
+          form: {
+            show: false,
+          },
+        },
+        projectId: {
+          title: "项目ID",
+          type: "text",
+          search: {
+            show: false,
+          },
+          form: {
+            value: projectId,
+            show: false,
+          },
+          editForm: {
+            show: false,
+          },
+          column: {
+            width: 200,
+            show: false,
+          },
+        },
+        userId: {
+          title: "用户",
+          type: "dict-select",
+          dict: userDict,
+          search: {
+            show: true,
+          },
+          form: {},
+          editForm: {
+            show: false,
+          },
+          column: {
+            width: 200,
+          },
+        },
+        permission: {
+          title: t("certd.ent.projectPermission"),
+          type: "dict-select",
+          dict: dict({
+            data: [
+              { label: t("certd.ent.permission.read"), value: "read", color: "cyan" },
+              { label: t("certd.ent.permission.write"), value: "write", color: "blue" },
+              { label: t("certd.ent.permission.admin"), value: "admin", color: "green" },
+            ],
+          }),
+          search: {
+            show: true,
+          },
+          form: {
+            show: true,
+          },
+          column: {
+            width: 200,
+          },
+        },
+        createTime: {
+          title: t("certd.createTime"),
+          type: "datetime",
+          form: {
+            show: false,
+          },
+          column: {
+            sorter: true,
+            width: 160,
+            align: "center",
+          },
+        },
+        updateTime: {
+          title: t("certd.updateTime"),
+          type: "datetime",
+          form: {
+            show: false,
+          },
+          column: {
+            show: true,
+            width: 160,
+          },
+        },
+      },
+    },
+  };
+}
diff --git a/packages/ui/certd-client/src/views/certd/project/detail/index.vue b/packages/ui/certd-client/src/views/certd/project/detail/index.vue
new file mode 100644
index 000000000..84f8e6d3e
--- /dev/null
+++ b/packages/ui/certd-client/src/views/certd/project/detail/index.vue
@@ -0,0 +1,71 @@
+<template>
+  <fs-page class="page-project-detail">
+    <template #header>
+      <div class="title">
+        {{ t("certd.ent.projectDetailManager") }}
+        <span class="sub">
+          {{ t("certd.ent.projectDetailDescription") }}
+        </span>
+      </div>
+    </template>
+    <fs-crud ref="crudRef" v-bind="crudBinding">
+      <template #pagination-left>
+        <a-tooltip :title="t('certd.batchDelete')">
+          <fs-button icon="DeleteOutlined" @click="handleBatchDelete"></fs-button>
+        </a-tooltip>
+      </template>
+    </fs-crud>
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+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";
+import { useI18n } from "/src/locales";
+import { useRoute } from "vue-router";
+
+const { t } = useI18n();
+
+defineOptions({
+  name: "ProjectDetail",
+});
+
+const route = useRoute();
+const projectIdStr = route.query.projectId as string;
+const projectId = Number(projectIdStr);
+
+const context: any = {
+  projectId,
+};
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
+
+const selectedRowKeys = context.selectedRowKeys;
+const handleBatchDelete = () => {
+  if (selectedRowKeys.value?.length > 0) {
+    Modal.confirm({
+      title: t("certd.confirmTitle"),
+      content: t("certd.confirmDeleteBatch", { count: selectedRowKeys.value.length }),
+      async onOk() {
+        await DeleteBatch(selectedRowKeys.value);
+        message.info(t("certd.deleteSuccess"));
+        crudExpose.doRefresh();
+        selectedRowKeys.value = [];
+      },
+    });
+  } else {
+    message.error(t("certd.selectRecordsFirst"));
+  }
+};
+
+// 页面打开后获取列表数据
+onMounted(() => {
+  crudExpose.doRefresh();
+});
+onActivated(async () => {
+  await crudExpose.doRefresh();
+});
+</script>
+<style lang="less"></style>
diff --git a/packages/ui/certd-client/src/views/certd/project/index.vue b/packages/ui/certd-client/src/views/certd/project/index.vue
new file mode 100644
index 000000000..7412bf464
--- /dev/null
+++ b/packages/ui/certd-client/src/views/certd/project/index.vue
@@ -0,0 +1,61 @@
+<template>
+  <fs-page class="page-cert">
+    <template #header>
+      <div class="title">
+        {{ t("certd.sysResources.myProjectManager") }}
+      </div>
+    </template>
+    <fs-crud ref="crudRef" v-bind="crudBinding">
+      <!-- <div v-if="crudBinding.data" class="project-list">
+        <div v-for="item of crudBinding.data" :key="item.id" class="project-item">
+          <a-card style="width: 300px">
+            <p>{{ item.name }}</p>
+          </a-card>
+        </div>
+      </div> -->
+    </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";
+import { message, Modal } from "ant-design-vue";
+import { DeleteBatch } from "./api";
+import { useI18n } from "/src/locales";
+
+const { t } = useI18n();
+
+defineOptions({
+  name: "MyProjectManager",
+});
+const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
+
+const selectedRowKeys = context.selectedRowKeys;
+const handleBatchDelete = () => {
+  if (selectedRowKeys.value?.length > 0) {
+    Modal.confirm({
+      title: t("certd.confirmTitle"),
+      content: t("certd.confirmDeleteBatch", { count: selectedRowKeys.value.length }),
+      async onOk() {
+        await DeleteBatch(selectedRowKeys.value);
+        message.info(t("certd.deleteSuccess"));
+        crudExpose.doRefresh();
+        selectedRowKeys.value = [];
+      },
+    });
+  } else {
+    message.error(t("certd.selectRecordsFirst"));
+  }
+};
+
+// 页面打开后获取列表数据
+onMounted(() => {
+  crudExpose.doRefresh();
+});
+onActivated(async () => {
+  await crudExpose.doRefresh();
+});
+</script>
+<style lang="less"></style>
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
index dd181e430..ebcbc057d 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
@@ -1,11 +1,11 @@
-import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { Constants, CrudController, SysSettingsService } from '@certd/lib-server';
-import { PipelineService } from '../../../modules/pipeline/service/pipeline-service.js';
+import { isPlus } from '@certd/plus-core';
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
+import { SiteInfoService } from '../../../modules/monitor/index.js';
 import { PipelineEntity } from '../../../modules/pipeline/entity/pipeline.js';
 import { HistoryService } from '../../../modules/pipeline/service/history-service.js';
+import { PipelineService } from '../../../modules/pipeline/service/pipeline-service.js';
 import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
-import { SiteInfoService } from '../../../modules/monitor/index.js';
-import { isPlus } from '@certd/plus-core';
 
 /**
  * 证书
@@ -25,6 +25,7 @@ export class PipelineController extends CrudController<PipelineService> {
   @Inject()
   siteInfoService: SiteInfoService;
 
+
   getService() {
     return this.service;
   }
@@ -34,6 +35,8 @@ export class PipelineController extends CrudController<PipelineService> {
     const isAdmin = await this.authService.isAdmin(this.ctx);
     const publicSettings = await this.sysSettingsService.getPublicSettings();
 
+    const {projectId,userId} = this.getProjectUserId("read")
+     body.query.projectId = projectId
     let onlyOther = false
     if (isAdmin) {
       if (publicSettings.managerOtherUserPipeline) {
@@ -44,10 +47,10 @@ export class PipelineController extends CrudController<PipelineService> {
           delete body.query.userId;
         }
       } else {
-        body.query.userId = this.getUserId();
+        body.query.userId = userId;
       }
     } else {
-      body.query.userId = this.getUserId();
+      body.query.userId = userId;
     }
 
     const title = body.query.title;
@@ -76,14 +79,17 @@ export class PipelineController extends CrudController<PipelineService> {
 
   @Post('/getSimpleByIds', { summary: Constants.per.authOnly })
   async getSimpleById(@Body(ALL) body) {
-    const ret = await this.getService().getSimplePipelines(body.ids, this.getUserId());
+    const {projectId,userId} = this.getProjectUserId("read")
+    const ret = await this.getService().getSimplePipelines(body.ids, userId,projectId);
     return this.ok(ret);
   }
 
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean: PipelineEntity) {
-    bean.userId = this.getUserId();
+    const {projectId,userId} = this.getProjectUserId("write")
+    bean.userId = userId
+    bean.projectId = projectId
     return super.add(bean);
   }
 
diff --git a/packages/ui/certd-server/src/modules/auto/auto-a-init-site.ts b/packages/ui/certd-server/src/modules/auto/auto-a-init-site.ts
index 194e8f0fc..a83d05acb 100644
--- a/packages/ui/certd-server/src/modules/auto/auto-a-init-site.ts
+++ b/packages/ui/certd-server/src/modules/auto/auto-a-init-site.ts
@@ -51,7 +51,8 @@ export class AutoAInitSite {
     //加载一次密钥
     await this.sysSettingsService.getSecret();
 
-    await this.sysSettingsService.reloadPrivateSettings();
+    //加载设置
+    await this.sysSettingsService.reloadSettings();
 
     // 授权许可
     try {
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
index 0e8d3f2c2..be67ba4e0 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
@@ -993,7 +993,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
     return await this.repository.count({ where: { userId } });
   }
 
-  async getSimplePipelines(pipelineIds: number[], userId?: number) {
+  async getSimplePipelines(pipelineIds: number[], userId?: number,projectId?:number) {
     return await this.repository.find({
       select: {
         id: true,
@@ -1001,7 +1001,8 @@ export class PipelineService extends BaseService<PipelineEntity> {
       },
       where: {
         id: In(pipelineIds),
-        userId
+        userId,
+        projectId
       }
     });
   }

From 28dfef985cf74097b91f52f5bfe006e940d7a892 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Wed, 11 Feb 2026 00:54:56 +0800
Subject: [PATCH 17/62] =?UTF-8?q?chore:=20project=20=E5=88=9D=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib-server/src/basic/base-controller.ts   |  18 ++-
 .../settings/service/sys-settings-service.ts  |   7 +
 .../user/pipeline/pipeline-controller.ts      | 145 ++++++++++++++----
 .../pipeline/service/pipeline-service.ts      |  57 +++++--
 .../sys/authority/service/auth-service.ts     |   4 +
 5 files changed, 184 insertions(+), 47 deletions(-)

diff --git a/packages/libs/lib-server/src/basic/base-controller.ts b/packages/libs/lib-server/src/basic/base-controller.ts
index 6a9789e9c..26920077a 100644
--- a/packages/libs/lib-server/src/basic/base-controller.ts
+++ b/packages/libs/lib-server/src/basic/base-controller.ts
@@ -61,7 +61,7 @@ export abstract class BaseController {
     }
   }
 
-  getProjectId(permission:string) {
+  async getProjectId(permission:string) {
     if (!isEnterprise()) {
       return null
     }
@@ -71,13 +71,13 @@ export abstract class BaseController {
     }
     const userId = this.getUserId()
     const projectId = parseInt(projectIdStr)
-    this.checkProjectPermission(userId, projectId,permission)
+    await this.checkProjectPermission(userId, projectId,permission)
     return projectId;
   }
 
-  getProjectUserId(permission:string){
+  async getProjectUserId(permission:string){
     let userId = this.getUserId()
-    const projectId = this.getProjectId(permission)
+    const projectId = await this.getProjectId(permission)
     if(projectId){
       userId = 0
     }
@@ -85,11 +85,19 @@ export abstract class BaseController {
       projectId,userId
     }
   }
+  async getProjectUserIdRead(){
+    return await this.getProjectUserId("read")
+  }
+  async getProjectUserIdWrite(){
+    return await this.getProjectUserId("write")
+  }
+  async getProjectUserIdAdmin(){
+    return await this.getProjectUserId("admin")
+  }
 
   async checkProjectPermission(userId: number, projectId: number,permission:string) {
     const projectService:any = await this.applicationContext.getAsync("projectService");
     await projectService.checkPermission({userId,projectId,permission})
-
   }
 
 
diff --git a/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts b/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts
index 5118235f3..5ae977b12 100644
--- a/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts
+++ b/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts
@@ -9,6 +9,7 @@ import { cache, logger, mergeUtils, setGlobalProxy } from '@certd/basic';
 import * as dns from 'node:dns';
 import { BaseService, setAdminMode } from '../../../basic/index.js';
 import { executorQueue } from '../../basic/service/executor-queue.js';
+import { isComm } from '@certd/plus-core';
 const { merge } = mergeUtils;
 /**
  * 设置
@@ -116,6 +117,12 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
   }
 
   async savePublicSettings(bean: SysPublicSettings) {
+    if(isComm()){
+      if(bean.adminMode === 'enterprise'){
+        throw new Error("商业版不支持使用企业管理模式")
+      }
+    }
+    
     await this.saveSetting(bean);
     //让设置生效
     await this.reloadPublicSettings();
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
index ebcbc057d..2d671a307 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
@@ -35,8 +35,8 @@ export class PipelineController extends CrudController<PipelineService> {
     const isAdmin = await this.authService.isAdmin(this.ctx);
     const publicSettings = await this.sysSettingsService.getPublicSettings();
 
-    const {projectId,userId} = this.getProjectUserId("read")
-     body.query.projectId = projectId
+    const { projectId, userId } = await this.getProjectUserIdRead()
+    body.query.projectId = projectId
     let onlyOther = false
     if (isAdmin) {
       if (publicSettings.managerOtherUserPipeline) {
@@ -79,15 +79,15 @@ export class PipelineController extends CrudController<PipelineService> {
 
   @Post('/getSimpleByIds', { summary: Constants.per.authOnly })
   async getSimpleById(@Body(ALL) body) {
-    const {projectId,userId} = this.getProjectUserId("read")
-    const ret = await this.getService().getSimplePipelines(body.ids, userId,projectId);
+    const { projectId, userId } = await this.getProjectUserIdRead()
+    const ret = await this.getService().getSimplePipelines(body.ids, userId, projectId);
     return this.ok(ret);
   }
 
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean: PipelineEntity) {
-    const {projectId,userId} = this.getProjectUserId("write")
+    const { projectId, userId } = await this.getProjectUserIdWrite()
     bean.userId = userId
     bean.projectId = projectId
     return super.add(bean);
@@ -95,17 +95,27 @@ export class PipelineController extends CrudController<PipelineService> {
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.authService.checkEntityUserId(this.ctx, this.getService(), bean.id);
+    const { projectId } = await this.getProjectUserIdWrite()
+    if (projectId) {
+      await this.authService.checkEntityProjectId(this.getService(), projectId, bean.id);
+    } else {
+      await this.authService.checkEntityUserId(this.ctx, this.getService(), bean.id);
+    }
     delete bean.userId;
     return super.update(bean);
   }
 
   @Post('/save', { summary: Constants.per.authOnly })
   async save(@Body(ALL) bean: { addToMonitorEnabled: boolean, addToMonitorDomains: string } & PipelineEntity) {
+    const { projectId, userId } = await this.getProjectUserIdWrite()
     if (bean.id > 0) {
-      await this.authService.checkEntityUserId(this.ctx, this.getService(), bean.id);
+      if (projectId) {
+        await this.authService.checkEntityProjectId(this.getService(), projectId, bean.id);
+      } else {
+        await this.authService.checkEntityUserId(this.ctx, this.getService(), bean.id);
+      }
     } else {
-      bean.userId = this.getUserId();
+      bean.userId = userId;
     }
 
     if (!this.isAdmin()) {
@@ -121,7 +131,7 @@ export class PipelineController extends CrudController<PipelineService> {
         //增加证书监控
         await this.siteInfoService.doImport({
           text: bean.addToMonitorDomains,
-          userId: this.getUserId(),
+          userId: userId,
         });
       }
     }
@@ -130,14 +140,24 @@ export class PipelineController extends CrudController<PipelineService> {
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
+    const { projectId } = await this.getProjectUserIdWrite()
+    if (projectId) {
+      await this.authService.checkEntityProjectId(this.getService(), projectId, id);
+    } else {
+      await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
+    }
     await this.service.delete(id);
     return this.ok({});
   }
 
   @Post('/disabled', { summary: Constants.per.authOnly })
   async disabled(@Body(ALL) bean) {
-    await this.authService.checkEntityUserId(this.ctx, this.getService(), bean.id);
+    const { projectId } = await this.getProjectUserIdWrite()
+    if (projectId) {
+      await this.authService.checkEntityProjectId(this.getService(), projectId, bean.id);
+    } else {
+      await this.authService.checkEntityUserId(this.ctx, this.getService(), bean.id);
+    }
     delete bean.userId;
     await this.service.disabled(bean.id, bean.disabled);
     return this.ok({});
@@ -145,75 +165,140 @@ export class PipelineController extends CrudController<PipelineService> {
 
   @Post('/detail', { summary: Constants.per.authOnly })
   async detail(@Query('id') id: number) {
-    await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
+    const { projectId } = await this.getProjectUserIdRead()
+    if (projectId) {
+      await this.authService.checkEntityProjectId(this.getService(), projectId, id);
+    } else {
+      await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
+    }
     const detail = await this.service.detail(id);
     return this.ok(detail);
   }
 
   @Post('/trigger', { summary: Constants.per.authOnly })
   async trigger(@Query('id') id: number, @Query('stepId') stepId?: string) {
-    await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
+    const { projectId } = await this.getProjectUserIdWrite()
+    if (projectId) {
+      await this.authService.checkEntityProjectId(this.getService(), projectId, id);
+    } else {
+      await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
+    }
     await this.service.trigger(id, stepId, true);
     return this.ok({});
   }
 
   @Post('/cancel', { summary: Constants.per.authOnly })
   async cancel(@Query('historyId') historyId: number) {
-    await this.authService.checkEntityUserId(this.ctx, this.historyService, historyId);
+    const { projectId } = await this.getProjectUserIdWrite()
+    if (projectId) {
+      await this.authService.checkEntityProjectId(this.historyService, projectId, historyId);
+    } else {
+      await this.authService.checkEntityUserId(this.ctx, this.historyService, historyId);
+    }
     await this.service.cancel(historyId);
     return this.ok({});
   }
 
   @Post('/count', { summary: Constants.per.authOnly })
   async count() {
-    const count = await this.service.count({ userId: this.getUserId() });
+    const { userId } = await this.getProjectUserIdRead()
+    const count = await this.service.count({ userId: userId });
     return this.ok({ count });
   }
 
+
+  private async checkPermissionCall(callback:any){
+    let { projectId ,userId} = await this.getProjectUserIdWrite()
+    if(projectId){
+      return await callback({userId,projectId});
+    }
+    const isAdmin = await this.authService.isAdmin(this.ctx);
+    userId = isAdmin ? undefined : userId;
+    return await callback({userId});
+  }
+
   @Post('/batchDelete', { summary: Constants.per.authOnly })
   async batchDelete(@Body('ids') ids: number[]) {
-    const isAdmin = await this.authService.isAdmin(this.ctx);
-    const userId = isAdmin ? undefined : this.getUserId();
-    await this.service.batchDelete(ids, userId);
-    return this.ok({});
+    // let { projectId ,userId} = await this.getProjectUserIdWrite()
+    // if(projectId){
+    //   await this.service.batchDelete(ids, null,projectId);
+    //   return this.ok({});
+    // }
+    // const isAdmin = await this.authService.isAdmin(this.ctx);
+    // userId = isAdmin ? undefined : userId;
+    // await this.service.batchDelete(ids, userId);
+    // return this.ok({});
+    await this.checkPermissionCall(async ({userId,projectId})=>{
+      await this.service.batchDelete(ids, userId,projectId);
+    })
+    return this.ok({})
   }
 
 
 
   @Post('/batchUpdateGroup', { summary: Constants.per.authOnly })
   async batchUpdateGroup(@Body('ids') ids: number[], @Body('groupId') groupId: number) {
-    const isAdmin = await this.authService.isAdmin(this.ctx);
-    const userId = isAdmin ? undefined : this.getUserId();
-    await this.service.batchUpdateGroup(ids, groupId, userId);
+    // let { projectId ,userId} = await this.getProjectUserIdWrite()
+    // if(projectId){
+    //   await this.service.batchUpdateGroup(ids, groupId, null,projectId);
+    //   return this.ok({});
+    // }
+
+    // const isAdmin = await this.authService.isAdmin(this.ctx);
+    // userId = isAdmin ? undefined : this.getUserId();
+    // await this.service.batchUpdateGroup(ids, groupId, userId);
+    await this.checkPermissionCall(async ({userId,projectId})=>{
+      await this.service.batchUpdateGroup(ids, groupId, userId,projectId);
+    })
     return this.ok({});
   }
 
 
   @Post('/batchUpdateTrigger', { summary: Constants.per.authOnly })
   async batchUpdateTrigger(@Body('ids') ids: number[], @Body('trigger') trigger: any) {
-    const isAdmin = await this.authService.isAdmin(this.ctx);
-    const userId = isAdmin ? undefined : this.getUserId();
-    await this.service.batchUpdateTrigger(ids, trigger, userId);
+    // let { projectId ,userId} = await this.getProjectUserIdWrite()
+    // if(projectId){
+    //  await this.service.batchUpdateTrigger(ids, trigger, null,projectId);
+    //   return this.ok({});
+    // }
+
+    // const isAdmin = await this.authService.isAdmin(this.ctx);
+    // userId = isAdmin ? undefined : this.getUserId();
+    // await this.service.batchUpdateTrigger(ids, trigger, userId);
+    await this.checkPermissionCall(async ({userId,projectId})=>{
+      await this.service.batchUpdateTrigger(ids, trigger, userId,projectId);
+    })
     return this.ok({});
   }
 
   @Post('/batchUpdateNotification', { summary: Constants.per.authOnly })
   async batchUpdateNotification(@Body('ids') ids: number[], @Body('notification') notification: any) {
-    const isAdmin = await this.authService.isAdmin(this.ctx);
-    const userId = isAdmin ? undefined : this.getUserId();
-    await this.service.batchUpdateNotifications(ids, notification, userId);
+    // const isAdmin = await this.authService.isAdmin(this.ctx);
+    // const userId = isAdmin ? undefined : this.getUserId();
+    // await this.service.batchUpdateNotifications(ids, notification, userId);
+    await this.checkPermissionCall(async ({userId,projectId})=>{
+      await this.service.batchUpdateNotifications(ids, notification, userId,projectId);
+    })
     return this.ok({});
   }
 
   @Post('/batchRerun', { summary: Constants.per.authOnly })
   async batchRerun(@Body('ids') ids: number[], @Body('force') force: boolean) {
-    await this.service.batchRerun(ids, this.getUserId(), force);
+    await this.checkPermissionCall(async ({userId,projectId})=>{
+      await this.service.batchRerun(ids,  force,userId,projectId);
+    })
     return this.ok({});
   }
 
   @Post('/refreshWebhookKey', { summary: Constants.per.authOnly })
   async refreshWebhookKey(@Body('id') id: number) {
-    await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
+    
+    const { projectId } = await this.getProjectUserIdWrite()
+    if (projectId) {
+      await this.authService.checkEntityProjectId(this.getService(), projectId, id);
+    } else {
+      await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
+    }
     const res = await this.service.refreshWebhookKey(id);
     return this.ok({
       webhookKey: res,
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
index be67ba4e0..d06f0dea5 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
@@ -4,6 +4,7 @@ import { In, MoreThan, Repository } from "typeorm";
 import {
   AccessService,
   BaseService,
+  isEnterprise,
   NeedSuiteException,
   NeedVIPException,
   PageReq,
@@ -38,7 +39,7 @@ import { CnameRecordService } from "../../cname/service/cname-record-service.js"
 import { PluginConfigGetter } from "../../plugin/service/plugin-config-getter.js";
 import dayjs from "dayjs";
 import { DbAdapter } from "../../db/index.js";
-import { isComm, isPlus } from "@certd/plus-core";
+import { checkPlus, isComm, isPlus } from "@certd/plus-core";
 import { logger, utils } from "@certd/basic";
 import { UrlService } from "./url-service.js";
 import { NotificationService } from "./notification-service.js";
@@ -301,6 +302,12 @@ export class PipelineService extends BaseService<PipelineEntity> {
     //     throw new NeedVIPException(`基础版最多只能创建${freeCount}条流水线`);
     //   }
     // }
+    if(isEnterprise()){
+      //企业模式不限制
+      checkPlus()
+      return;
+    }
+ 
     if (isComm()) {
       //校验pipelineCount
       const suiteSetting = await this.userSuiteService.getSuiteSetting();
@@ -328,6 +335,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
         }
       }
     }
+    
   }
 
   async foreachPipeline(callback: (pipeline: PipelineEntity) => void) {
@@ -559,6 +567,12 @@ export class PipelineService extends BaseService<PipelineEntity> {
   }
 
   async beforeCheck(entity: PipelineEntity) {
+
+    if(isEnterprise()){
+      checkPlus()
+      return {}
+    }
+
     const validTimeEnabled = await this.isPipelineValidTimeEnabled(entity)
     if (!validTimeEnabled) {
       throw new Error(`流水线${entity.id}已过期，不予执行`);
@@ -582,7 +596,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
       const res = await this.beforeCheck(entity);
       suite = res.suite
     } catch (e) {
-      logger.error(`流水线${entity.id}触发${triggerId}失败：${e.message}`);
+      logger.error(`流水线${entity.id}触发失败（${triggerId}）：${e.message}`);
     }
 
     const id = entity.id;
@@ -625,7 +639,10 @@ export class PipelineService extends BaseService<PipelineEntity> {
 
     const userId = entity.userId;
     const historyId = await this.historyService.start(entity, triggerType);
-    const userIsAdmin = await this.userService.isAdmin(userId);
+    let userIsAdmin = false
+    if(userId){
+      userIsAdmin = await this.userService.isAdmin(userId);
+    }
     const user: UserInfo = {
       id: userId,
       role: userIsAdmin ? "admin" : "user"
@@ -836,7 +853,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
     return result;
   }
 
-  async batchDelete(ids: number[], userId: number) {
+  async batchDelete(ids: number[], userId?: number,projectId?:number) {
     if (!isPlus()) {
       throw new NeedVIPException("此功能需要升级专业版");
     }
@@ -844,11 +861,14 @@ export class PipelineService extends BaseService<PipelineEntity> {
       if (userId) {
         await this.checkUserId(id, userId);
       }
+      if(projectId){
+        await this.checkUserId(id,projectId,"projectId")
+      }
       await this.delete(id);
     }
   }
 
-  async batchUpdateGroup(ids: number[], groupId: number, userId: any) {
+  async batchUpdateGroup(ids: number[], groupId: number, userId: any,projectId?:number) {
     if (!isPlus()) {
       throw new NeedVIPException("此功能需要升级专业版");
     }
@@ -856,6 +876,9 @@ export class PipelineService extends BaseService<PipelineEntity> {
     if (userId && userId > 0) {
       query.userId = userId;
     }
+    if(projectId){
+      query.projectId = projectId;
+    }
     await this.repository.update(
       {
         id: In(ids),
@@ -866,7 +889,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
   }
 
 
-  async batchUpdateTrigger(ids: number[], trigger: any, userId: any) {
+  async batchUpdateTrigger(ids: number[], trigger: any, userId: any,projectId?:number) {
     if (!isPlus()) {
       throw new NeedVIPException("此功能需要升级专业版");
     }
@@ -874,6 +897,9 @@ export class PipelineService extends BaseService<PipelineEntity> {
     if (userId && userId > 0) {
       query.userId = userId;
     }
+    if(projectId){
+      query.projectId = projectId;
+    }
     const list = await this.find({
       where: {
         id: In(ids),
@@ -915,7 +941,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
 
   }
 
-  async batchUpdateNotifications(ids: number[], notification: Notification, userId: any) {
+  async batchUpdateNotifications(ids: number[], notification: Notification, userId: any,projectId?:number) {
     if (!isPlus()) {
       throw new NeedVIPException("此功能需要升级专业版");
     }
@@ -923,6 +949,9 @@ export class PipelineService extends BaseService<PipelineEntity> {
     if (userId && userId > 0) {
       query.userId = userId;
     }
+    if(projectId){
+      query.projectId = projectId;
+    }
     const list = await this.find({
       where: {
         id: In(ids),
@@ -950,7 +979,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
     }
   }
 
-  async batchRerun(ids: number[], userId: any, force: boolean) {
+  async batchRerun(ids: number[], force: boolean,userId: any, projectId?:number) {
     if (!isPlus()) {
       throw new NeedVIPException("此功能需要升级专业版");
     }
@@ -958,14 +987,18 @@ export class PipelineService extends BaseService<PipelineEntity> {
     if (!userId || ids.length === 0) {
       return;
     }
+    const where:any = {
+        id: In(ids),
+        userId,
+    }
+    if(projectId){
+      where.projectId = projectId
+    }
     const list = await this.repository.find({
       select: {
         id: true
       },
-      where: {
-        id: In(ids),
-        userId
-      }
+      where:where
     });
 
     ids = list.map(item => item.id);
diff --git a/packages/ui/certd-server/src/modules/sys/authority/service/auth-service.ts b/packages/ui/certd-server/src/modules/sys/authority/service/auth-service.ts
index 3d7e55547..0ea36a3e9 100644
--- a/packages/ui/certd-server/src/modules/sys/authority/service/auth-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/authority/service/auth-service.ts
@@ -35,4 +35,8 @@ export class AuthService {
     }
     await service.checkUserId(id, ctx.user.id, userKey);
   }
+
+  async checkEntityProjectId(service:any,projectId = 0,id:any=0){
+    await service.checkUserId(id, projectId , "projectId");
+  }
 }

From 638a7f0ab4e64c53514bfaed8ff8eec0f628aa7f Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Wed, 11 Feb 2026 18:11:33 +0800
Subject: [PATCH 18/62] chore: history projectId

---
 package.json                                  |  18 +--
 .../lib-server/src/basic/base-controller.ts   |  15 +++
 .../libs/lib-server/src/basic/base-service.ts |  18 ++-
 .../certd-client/src/store/project/index.ts   |   9 +-
 .../ui/certd-client/src/views/certd/dicts.ts  |   2 +
 .../src/views/certd/pipeline/crud.tsx         |   3 +
 .../db/migration/v10038__admin_mode.sql       |   3 +-
 packages/ui/certd-server/package.json         |   8 +-
 .../user/pipeline/history-controller.ts       |  85 +++++++++-----
 .../user/pipeline/pipeline-controller.ts      |  50 ++------
 .../pipeline/service/history-service.ts       |   3 +-
 .../pipeline/service/pipeline-service.ts      |  20 +++-
 .../sys/authority/service/auth-service.ts     |   8 +-
 .../sys/authority/service/role-service.ts     |  19 +--
 .../sys/enterprise/service/project-service.ts | 109 +++++++++++-------
 15 files changed, 224 insertions(+), 146 deletions(-)

diff --git a/package.json b/package.json
index 798617d7b..e8d0d1c68 100644
--- a/package.json
+++ b/package.json
@@ -15,25 +15,25 @@
   },
   "scripts": {
     "start": "lerna bootstrap --hoist",
-    "start:server": "cd ./packages/ui/certd-server && npm start",
+    "start:server": "cd ./packages/ui/certd-server && pnpm start",
     "devb": "lerna run dev-build",
     "i-all": "lerna link && lerna exec npm install  ",
-    "publish": "npm run prepublishOnly2  && lerna publish --force-publish=pro/plus-core --conventional-commits && npm run afterpublishOnly ",
-    "afterpublishOnly": "npm run copylogs && time /t >trigger/build.trigger && git add ./trigger/build.trigger && git commit -m \"build: trigger build image\" && TIMEOUT /T 10 && npm run commitAll",
+    "publish": "pnpm run prepublishOnly2  && lerna publish --force-publish=pro/plus-core --conventional-commits && pnpm run afterpublishOnly ",
+    "afterpublishOnly": "pnpm run copylogs && time /t >trigger/build.trigger && git add ./trigger/build.trigger && git commit -m \"build: trigger build image\" && TIMEOUT /T 10 && pnpm run commitAll",
     "transform-sql": "cd ./packages/ui/certd-server/db/ && node --experimental-json-modules transform.js",
-    "plugin-doc-gen": "cd ./packages/ui/certd-server/ && npm run export-metadata",
-    "commitAll": "git add . && git commit -m \"build: publish\" && git push && npm run commitPro",
+    "plugin-doc-gen": "cd ./packages/ui/certd-server/ && pnpm run export-metadata",
+    "commitAll": "git add . && git commit -m \"build: publish\" && git push && pnpm run commitPro",
     "commitPro": "cd ./packages/pro/ && git add . && git commit -m \"build: publish\" && git push",
     "copylogs": "copyfiles \"CHANGELOG.md\"  ./docs/guide/changelogs/",
-    "prepublishOnly1": "npm run check && lerna run build ",
-    "prepublishOnly2": "npm run check && npm run before-build && lerna run build && npm run plugin-doc-gen",
-    "before-build": "npm run transform-sql && cd ./packages/core/basic && time /t >build.md && git add ./build.md && git commit -m \"build: prepare to build\"",
+    "prepublishOnly1": "pnpm run check && lerna run build ",
+    "prepublishOnly2": "pnpm run check && pnpm run before-build && lerna run build && pnpm run plugin-doc-gen",
+    "before-build": "pnpm run transform-sql && cd ./packages/core/basic && time /t >build.md && git add ./build.md && git commit -m \"build: prepare to build\"",
     "deploy1": "node --experimental-json-modules ./scripts/deploy.js ",
     "check": "node --experimental-json-modules ./scripts/publish-check.js",
     "init": "lerna run build",
     "init:dev": "lerna run build",
     "docs:dev": "vitepress dev docs",
-    "docs:build": "npm run copylogs && vitepress build docs",
+    "docs:build": "pnpm run copylogs && vitepress build docs",
     "docs:preview": "vitepress preview docs",
     "pub": "echo 1",
     "dev": "pnpm run -r --parallel  compile ",
diff --git a/packages/libs/lib-server/src/basic/base-controller.ts b/packages/libs/lib-server/src/basic/base-controller.ts
index 26920077a..b618e3cde 100644
--- a/packages/libs/lib-server/src/basic/base-controller.ts
+++ b/packages/libs/lib-server/src/basic/base-controller.ts
@@ -100,5 +100,20 @@ export abstract class BaseController {
     await projectService.checkPermission({userId,projectId,permission})
   }
 
+  /**
+   * 
+   * @param service 检查记录是否属于某用户或某项目
+   * @param id 
+   */
+  async checkEntityOwner(service:any,id:number,permission:string){
+    let { projectId,userId } = await this.getProjectUserId(permission)
+    const authService:any = await this.applicationContext.getAsync("authService");
+    if (projectId) {
+      await authService.checkEntityProjectId(service, id, projectId);
+    }else{
+      await authService.checkEntityUserId(this.ctx, service, id);
+    }
+    return {projectId,userId}
+  }
 
 }
diff --git a/packages/libs/lib-server/src/basic/base-service.ts b/packages/libs/lib-server/src/basic/base-service.ts
index eed4ecc32..8efd4416c 100644
--- a/packages/libs/lib-server/src/basic/base-service.ts
+++ b/packages/libs/lib-server/src/basic/base-service.ts
@@ -206,18 +206,28 @@ export abstract class BaseService<T> {
     return await qb.getMany();
   }
 
-  async checkUserId(id: any = 0, userId: number, userKey = 'userId') {
-    const res = await this.getRepository().findOne({
+  async checkUserId(ids: number | number[] = 0, userId: number, userKey = 'userId') {
+    if (ids == null) {
+      throw new ValidateException('id不能为空');
+    }
+    if (userId == null) {
+      throw new ValidateException('userId不能为空');
+    }
+    if (!Array.isArray(ids)) {
+      ids = [ids];
+    }
+    const res = await this.getRepository().find({
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
       select: { [userKey]: true },
       where: {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        id,
+        id: In(ids),
+        [userKey]: userId,
       },
     });
-    if (!res || res[userKey] === userId) {
+    if (!res || res.length === ids.length) {
       return;
     }
     throw new PermissionException('权限不足');
diff --git a/packages/ui/certd-client/src/store/project/index.ts b/packages/ui/certd-client/src/store/project/index.ts
index 156daba07..e8884a4e5 100644
--- a/packages/ui/certd-client/src/store/project/index.ts
+++ b/packages/ui/certd-client/src/store/project/index.ts
@@ -52,12 +52,17 @@ export const useProjectStore = defineStore("app.project", () => {
     }
     const projects = await api.MyProjectList();
     myProjects.value = projects;
+    if (projects.length > 0 && !currentProjectId.value) {
+      changeCurrentProject(projects[0].id, true);
+    }
   }
 
-  function changeCurrentProject(id: string) {
+  function changeCurrentProject(id: string, silent?: boolean) {
     currentProjectId.value = id;
     LocalStorage.set("currentProjectId", id);
-    message.success("切换项目成功");
+    if (!silent) {
+      message.success("切换项目成功");
+    }
   }
 
   async function reload() {
diff --git a/packages/ui/certd-client/src/views/certd/dicts.ts b/packages/ui/certd-client/src/views/certd/dicts.ts
index dd6bfd0dc..afe870457 100644
--- a/packages/ui/certd-client/src/views/certd/dicts.ts
+++ b/packages/ui/certd-client/src/views/certd/dicts.ts
@@ -19,6 +19,8 @@ export const projectPermissionDict = dict({
 
 export const myProjectDict = dict({
   url: "/enterprise/project/list",
+  value: "id",
+  label: "name",
 });
 
 export const userDict = dict({
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
index 7c2823295..d6608553c 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
@@ -640,6 +640,9 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
           title: t("certd.fields.projectName"),
           type: "dict-select",
           dict: myProjectDict,
+          form: {
+            show: false,
+          },
         },
         updateTime: {
           title: t("certd.fields.updateTime"),
diff --git a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
index 74b691b29..f768b8543 100644
--- a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
+++ b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
@@ -13,8 +13,7 @@ CREATE TABLE "cd_project"
 
 CREATE INDEX "index_project_user_id" ON "cd_project" ("user_id");
 CREATE INDEX "index_project_admin_id" ON "cd_project" ("admin_id");
-INSERT INTO cd_project (id, user_id, "name", "disabled") VALUES (1, 1, 'default', false);
-
+INSERT INTO cd_project (id, user_id, "admin_id", "name", "disabled") VALUES (1, 0, 1,'default', false);
 
 ALTER TABLE cd_cert_info ADD COLUMN  project_id integer;
 CREATE INDEX "index_cert_project_id" ON "cd_cert_info" ("project_id");
diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json
index 4387bb78f..34af08f3e 100644
--- a/packages/ui/certd-server/package.json
+++ b/packages/ui/certd-server/package.json
@@ -19,16 +19,16 @@
     "dev-new": "cross-env NODE_ENV=dev-new mwtsc --watch --run @midwayjs/mock/app",
     "rm-newdb": "rimraf ./data/db-new.sqlite",
     "test": "cross-env NODE_ENV=unittest mocha",
-    "cov": "cross-env c8 --all --reporter=text --reporter=lcovonly npm run test",
+    "cov": "cross-env c8 --all --reporter=text --reporter=lcovonly pnpm run test",
     "lint": "mwts check",
     "lint:fix": "mwts fix",
-    "ci": "npm run cov",
+    "ci": "pnpm run cov",
     "build-only": "cross-env NODE_ENV=production mwtsc --cleanOutDir --skipLibCheck",
-    "build": "npm run build-only && npm run export-metadata",
+    "build": "pnpm run build-only && pnpm run export-metadata",
     "export-metadata": "node export-plugin-yaml.js",
     "export-metadata-only": "node export-plugin-yaml.js docoff",
     "dev-build": "echo 1",
-    "build-on-docker": "node ./before-build.js && npm run build-only && npm run export-metadata-only",
+    "build-on-docker": "node ./before-build.js && pnpm run build-only && pnpm run export-metadata-only",
     "up-mw-deps": "npx midway-version -u -w",
     "heap": "cross-env NODE_ENV=production clinic heapprofiler    --  node  --optimize-for-size --inspect ./bootstrap.js",
     "flame": "clinic flame   -- node ./bootstrap.js",
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
index 9e8076c76..272e79d92 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
@@ -1,17 +1,17 @@
-import { ALL, Body, Controller, Get, Inject, Post, Provide, Query } from "@midwayjs/core";
-import { CommonException, Constants, CrudController, PermissionException, SysSettingsService } from "@certd/lib-server";
-import { PipelineEntity } from "../../../modules/pipeline/entity/pipeline.js";
-import { HistoryService } from "../../../modules/pipeline/service/history-service.js";
-import { HistoryLogService } from "../../../modules/pipeline/service/history-log-service.js";
-import { HistoryEntity } from "../../../modules/pipeline/entity/history.js";
-import { HistoryLogEntity } from "../../../modules/pipeline/entity/history-log.js";
-import { PipelineService } from "../../../modules/pipeline/service/pipeline-service.js";
-import * as fs from "fs";
 import { logger } from "@certd/basic";
-import { AuthService } from "../../../modules/sys/authority/service/auth-service.js";
+import { CommonException, Constants, CrudController, PermissionException, SysSettingsService } from "@certd/lib-server";
+import { ALL, Body, Controller, Get, Inject, Post, Provide, Query } from "@midwayjs/core";
+import * as fs from "fs";
 import { In } from "typeorm";
-import { UserSettingsService } from "../../../modules/mine/service/user-settings-service.js";
 import { UserGrantSetting } from "../../../modules/mine/service/models.js";
+import { UserSettingsService } from "../../../modules/mine/service/user-settings-service.js";
+import { HistoryLogEntity } from "../../../modules/pipeline/entity/history-log.js";
+import { HistoryEntity } from "../../../modules/pipeline/entity/history.js";
+import { PipelineEntity } from "../../../modules/pipeline/entity/pipeline.js";
+import { HistoryLogService } from "../../../modules/pipeline/service/history-log-service.js";
+import { HistoryService } from "../../../modules/pipeline/service/history-service.js";
+import { PipelineService } from "../../../modules/pipeline/service/pipeline-service.js";
+import { AuthService } from "../../../modules/sys/authority/service/auth-service.js";
 
 /**
  * 证书
@@ -41,12 +41,18 @@ export class HistoryController extends CrudController<HistoryService> {
 
   @Post('/page', { summary: Constants.per.authOnly })
   async page(@Body(ALL) body: any) {
+    const { projectId, userId } = await this.getProjectUserIdRead()
+    body.query.projectId = projectId
+
     const isAdmin = await this.authService.isAdmin(this.ctx);
     const publicSettings = await this.sysSettingsService.getPublicSettings();
     const pipelineQuery: any = {};
     if (!(publicSettings.managerOtherUserPipeline && isAdmin)) {
-      body.query.userId = this.getUserId();
-      pipelineQuery.userId = this.getUserId();
+      body.query.userId = userId;
+      pipelineQuery.userId = userId;
+    }
+    if (projectId) {
+      pipelineQuery.projectId = projectId;
     }
 
     let pipelineIds: any = null;
@@ -82,10 +88,14 @@ export class HistoryController extends CrudController<HistoryService> {
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body) {
+    const { projectId, userId } = await this.getProjectUserIdRead()
+    body.query.projectId = projectId
+
     const isAdmin = this.authService.isAdmin(this.ctx);
     if (!isAdmin) {
-      body.userId = this.getUserId();
+      body.userId = userId;
     }
+
     if (body.pipelineId == null) {
       return this.ok([]);
     }
@@ -106,7 +116,8 @@ export class HistoryController extends CrudController<HistoryService> {
         triggerType: true,
         endTime: true,
         createTime: true,
-        updateTime: true
+        updateTime: true,
+        projectId: true,
       };
     }
     const listRet = await this.getService().list({
@@ -135,32 +146,45 @@ export class HistoryController extends CrudController<HistoryService> {
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean: PipelineEntity) {
-    bean.userId = this.getUserId();
+    const { projectId, userId } = await this.getProjectUserIdRead()
+    bean.projectId = projectId
+    bean.userId = userId;
     return super.add(bean);
   }
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.authService.checkEntityUserId(this.ctx, this.getService(), bean.id);
+    await this.checkEntityOwner(this.getService(), bean.id,"write");
     delete bean.userId;
     return super.update(bean);
   }
 
   @Post('/save', { summary: Constants.per.authOnly })
   async save(@Body(ALL) bean: HistoryEntity) {
-    bean.userId = this.getUserId();
+    const { projectId,userId } = await this.getProjectUserIdWrite()
+    bean.userId = userId;
+    bean.projectId = projectId;
     if (bean.id > 0) {
-      await this.authService.checkEntityUserId(this.ctx, this.getService(), bean.id);
+      //修改
+      delete bean.projectId;
+      delete bean.userId;
+      await this.checkEntityOwner(this.getService(), bean.id,"write");
     }
+   
     await this.service.save(bean);
     return this.ok(bean.id);
   }
 
   @Post('/saveLog', { summary: Constants.per.authOnly })
   async saveLog(@Body(ALL) bean: HistoryLogEntity) {
-    bean.userId = this.getUserId();
+    const { projectId,userId } = await this.getProjectUserIdWrite()
+    bean.projectId = projectId;
+    bean.userId = userId;
     if (bean.id > 0) {
-      await this.authService.checkEntityUserId(this.ctx, this.getService(), bean.id);
+      //修改
+      delete bean.projectId;
+      delete bean.userId;
+      await this.checkEntityOwner(this.logService, bean.id,"write");
     }
     await this.logService.save(bean);
     return this.ok(bean.id);
@@ -168,30 +192,30 @@ export class HistoryController extends CrudController<HistoryService> {
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
+    await this.checkEntityOwner(this.getService(), id,"write");
     await super.delete(id);
     return this.ok();
   }
 
   @Post('/deleteByIds', { summary: Constants.per.authOnly })
   async deleteByIds(@Body(ALL) body: any) {
-    await this.authService.checkEntityUserId(this.ctx, this.getService(), body.ids);
+    let {userId} = await this.checkEntityOwner(this.getService(), body.ids,"write");
     const isAdmin = await this.authService.isAdmin(this.ctx);
-    const userId = isAdmin ? null : this.getUserId();
+    userId = isAdmin ? null : userId;
     await this.getService().deleteByIds(body.ids, userId);
     return this.ok();
   }
 
   @Post('/detail', { summary: Constants.per.authOnly })
   async detail(@Query('id') id: number) {
-    await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
+    await this.checkEntityOwner(this.getService(), id,"read");
     const detail = await this.service.detail(id);
     return this.ok(detail);
   }
 
   @Post('/logs', { summary: Constants.per.authOnly })
   async logs(@Query('id') id: number) {
-    await this.authService.checkEntityUserId(this.ctx, this.logService, id);
+    await this.checkEntityOwner(this.logService, id,"read");
     const logInfo = await this.logService.info(id);
     return this.ok(logInfo);
   }
@@ -213,7 +237,14 @@ export class HistoryController extends CrudController<HistoryService> {
     if (history == null) {
       throw new CommonException('historyId is null');
     }
-    if (history.userId !== this.getUserId()) {
+    const {projectId} = await this.getProjectUserIdRead()
+    if (projectId) {
+      //enterprise模式
+      if(history.projectId !== projectId){
+        throw new PermissionException("您没有权限下载该流水线证书，请先加入该项目："+history.projectId);
+      }
+      //有权限下载
+    }else if (history.userId !== this.getUserId()) {
       // 如果是管理员，检查用户是否有授权管理员查看
       const isAdmin = await this.isAdmin()
       if (!isAdmin) {
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
index 2d671a307..cc40999b6 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
@@ -95,25 +95,16 @@ export class PipelineController extends CrudController<PipelineService> {
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    const { projectId } = await this.getProjectUserIdWrite()
-    if (projectId) {
-      await this.authService.checkEntityProjectId(this.getService(), projectId, bean.id);
-    } else {
-      await this.authService.checkEntityUserId(this.ctx, this.getService(), bean.id);
-    }
+    await this.checkEntityOwner(this.getService(), bean.id,"write");
     delete bean.userId;
     return super.update(bean);
   }
 
   @Post('/save', { summary: Constants.per.authOnly })
   async save(@Body(ALL) bean: { addToMonitorEnabled: boolean, addToMonitorDomains: string } & PipelineEntity) {
-    const { projectId, userId } = await this.getProjectUserIdWrite()
+     const { userId } = await this.getProjectUserIdWrite()
     if (bean.id > 0) {
-      if (projectId) {
-        await this.authService.checkEntityProjectId(this.getService(), projectId, bean.id);
-      } else {
-        await this.authService.checkEntityUserId(this.ctx, this.getService(), bean.id);
-      }
+      await this.checkEntityOwner(this.getService(), bean.id,"write");
     } else {
       bean.userId = userId;
     }
@@ -140,24 +131,14 @@ export class PipelineController extends CrudController<PipelineService> {
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    const { projectId } = await this.getProjectUserIdWrite()
-    if (projectId) {
-      await this.authService.checkEntityProjectId(this.getService(), projectId, id);
-    } else {
-      await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
-    }
+    await this.checkEntityOwner(this.getService(), id,"write");
     await this.service.delete(id);
     return this.ok({});
   }
 
   @Post('/disabled', { summary: Constants.per.authOnly })
   async disabled(@Body(ALL) bean) {
-    const { projectId } = await this.getProjectUserIdWrite()
-    if (projectId) {
-      await this.authService.checkEntityProjectId(this.getService(), projectId, bean.id);
-    } else {
-      await this.authService.checkEntityUserId(this.ctx, this.getService(), bean.id);
-    }
+    await this.checkEntityOwner(this.getService(), bean.id,"write");
     delete bean.userId;
     await this.service.disabled(bean.id, bean.disabled);
     return this.ok({});
@@ -165,36 +146,21 @@ export class PipelineController extends CrudController<PipelineService> {
 
   @Post('/detail', { summary: Constants.per.authOnly })
   async detail(@Query('id') id: number) {
-    const { projectId } = await this.getProjectUserIdRead()
-    if (projectId) {
-      await this.authService.checkEntityProjectId(this.getService(), projectId, id);
-    } else {
-      await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
-    }
+    await this.checkEntityOwner(this.getService(), id,"read");
     const detail = await this.service.detail(id);
     return this.ok(detail);
   }
 
   @Post('/trigger', { summary: Constants.per.authOnly })
   async trigger(@Query('id') id: number, @Query('stepId') stepId?: string) {
-    const { projectId } = await this.getProjectUserIdWrite()
-    if (projectId) {
-      await this.authService.checkEntityProjectId(this.getService(), projectId, id);
-    } else {
-      await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
-    }
+    await this.checkEntityOwner(this.getService(), id,"write");
     await this.service.trigger(id, stepId, true);
     return this.ok({});
   }
 
   @Post('/cancel', { summary: Constants.per.authOnly })
   async cancel(@Query('historyId') historyId: number) {
-    const { projectId } = await this.getProjectUserIdWrite()
-    if (projectId) {
-      await this.authService.checkEntityProjectId(this.historyService, projectId, historyId);
-    } else {
-      await this.authService.checkEntityUserId(this.ctx, this.historyService, historyId);
-    }
+    await this.checkEntityOwner(this.historyService, historyId,"write");
     await this.service.cancel(historyId);
     return this.ok({});
   }
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts
index 5829f8f0d..296569c07 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts
@@ -66,7 +66,8 @@ export class HistoryService extends BaseService<HistoryEntity> {
       pipelineId: pipeline.id,
       title: pipeline.title,
       status: 'start',
-      triggerType
+      triggerType,
+      projectId: pipeline.projectId,
     };
     const { id } = await this.add(bean);
     //清除大于pipeline.keepHistoryCount的历史记录
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
index d06f0dea5..6405f8891 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
@@ -747,20 +747,35 @@ export class PipelineService extends BaseService<PipelineEntity> {
     return;
   }
 
+  async getProjectId(pipelineId: number) {
+    const pipelineEntity = await this.repository.findOne({
+      select: {
+        projectId: true,
+      },
+      where: {
+        id: pipelineId,
+      },
+    });
+    return pipelineEntity.projectId;
+  }
   private async saveHistory(history: RunHistory) {
     //修改pipeline状态
-    const pipelineEntity = new PipelineEntity();
+    let pipelineEntity = new PipelineEntity();
     pipelineEntity.id = parseInt(history.pipeline.id);
     pipelineEntity.status = history.pipeline.status.result + "";
     pipelineEntity.lastHistoryTime = history.pipeline.status.startTime;
     await this.update(pipelineEntity);
 
+    const projectId = await this.getProjectId(pipelineEntity.id);
+    pipelineEntity.projectId = projectId;
+
     const entity: HistoryEntity = new HistoryEntity();
     entity.id = parseInt(history.id);
     entity.userId = history.pipeline.userId;
     entity.status = pipelineEntity.status;
     entity.pipeline = JSON.stringify(history.pipeline);
     entity.pipelineId = parseInt(history.pipeline.id);
+    entity.projectId = pipelineEntity.projectId;
     await this.historyService.save(entity);
 
     const logEntity: HistoryLogEntity = new HistoryLogEntity();
@@ -769,6 +784,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
     logEntity.pipelineId = entity.pipelineId;
     logEntity.historyId = entity.id;
     logEntity.logs = JSON.stringify(history.logs);
+    logEntity.projectId = pipelineEntity.projectId;
     await this.historyLogService.addOrUpdate(logEntity);
   }
 
@@ -984,7 +1000,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
       throw new NeedVIPException("此功能需要升级专业版");
     }
 
-    if (!userId || ids.length === 0) {
+    if (userId == null || ids.length === 0) {
       return;
     }
     const where:any = {
diff --git a/packages/ui/certd-server/src/modules/sys/authority/service/auth-service.ts b/packages/ui/certd-server/src/modules/sys/authority/service/auth-service.ts
index 0ea36a3e9..5ed4d78da 100644
--- a/packages/ui/certd-server/src/modules/sys/authority/service/auth-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/authority/service/auth-service.ts
@@ -28,15 +28,15 @@ export class AuthService {
   }
 
   //管理员有权限查看其他用户的数据
-  async checkEntityUserId(ctx: any, service: any, id: any = 0, userKey = 'userId') {
+  async checkEntityUserId(ctx: any, service: any, ids: number| number[] = null, userKey = 'userId') {
     const isAdmin = await this.isAdmin(ctx);
     if (isAdmin) {
       return true;
     }
-    await service.checkUserId(id, ctx.user.id, userKey);
+    await service.checkUserId(ids, ctx.user.id, userKey);
   }
 
-  async checkEntityProjectId(service:any,projectId = 0,id:any=0){
-    await service.checkUserId(id, projectId , "projectId");
+  async checkEntityProjectId(service:any,ids:number| number[] = null,projectId = null){
+    await service.checkUserId(ids, projectId , "projectId");
   }
 }
diff --git a/packages/ui/certd-server/src/modules/sys/authority/service/role-service.ts b/packages/ui/certd-server/src/modules/sys/authority/service/role-service.ts
index f710daa5d..636ae8488 100644
--- a/packages/ui/certd-server/src/modules/sys/authority/service/role-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/authority/service/role-service.ts
@@ -9,6 +9,12 @@ import { PermissionService } from './permission-service.js';
 import * as _ from 'lodash-es';
 import { RolePermissionService } from './role-permission-service.js';
 import { LRUCache } from 'lru-cache';
+
+const permissionCache = new LRUCache<string, any>({
+  max: 1000,
+  ttl: 1000 * 60 * 10,
+});
+
 /**
  * 角色
  */
@@ -24,10 +30,7 @@ export class RoleService extends BaseService<RoleEntity> {
   @Inject()
   rolePermissionService: RolePermissionService;
 
-  permissionCache = new LRUCache<string, any>({
-    max: 1000,
-    ttl: 1000 * 60 * 10,
-  });
+ 
 
   //@ts-ignore
   getRepository() {
@@ -84,7 +87,7 @@ export class RoleService extends BaseService<RoleEntity> {
     //再添加
     await this.addRoles(userId, roles);
 
-    this.permissionCache.clear();
+    permissionCache.clear();
   }
 
   async getPermissionTreeByRoleId(id: any) {
@@ -105,7 +108,7 @@ export class RoleService extends BaseService<RoleEntity> {
         permissionId,
       });
     }
-    this.permissionCache.clear();
+    permissionCache.clear();
   }
 
   async getPermissionSetByRoleIds(roleIds: number[]): Promise<Set<string>> {
@@ -120,12 +123,12 @@ export class RoleService extends BaseService<RoleEntity> {
 
   async getCachedPermissionSetByRoleIds(roleIds: number[]): Promise<Set<string>> {
     const roleIdsKey = roleIds.join(',');
-    let permissionSet = this.permissionCache.get(roleIdsKey);
+    let permissionSet = permissionCache.get(roleIdsKey);
     if (permissionSet) {
       return permissionSet;
     }
     permissionSet = await this.getPermissionSetByRoleIds(roleIds);
-    this.permissionCache.set(roleIdsKey, permissionSet);
+    permissionCache.set(roleIdsKey, permissionSet);
     return permissionSet;
   }
 
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
index 521f6cf2e..27d4e524c 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
@@ -1,10 +1,16 @@
 import { BaseService, SysSettingsService } from '@certd/lib-server';
 import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
+import { LRUCache } from 'lru-cache';
 import { Repository } from 'typeorm';
 import { ProjectEntity } from '../entity/project.js';
 import { ProjectMemberService } from './project-member-service.js';
 
+const projectCache = new LRUCache<string, any>({
+  max: 1000,
+  ttl: 1000 * 60 * 10,
+});
+
 @Provide()
 @Scope(ScopeEnum.Request, { allowDowngrade: true })
 export class ProjectService extends BaseService<ProjectEntity> {
@@ -23,7 +29,7 @@ export class ProjectService extends BaseService<ProjectEntity> {
   }
 
   async add(bean: ProjectEntity) {
-    const {name} = bean;
+    const { name } = bean;
     if (!name) {
       throw new Error('项目名称不能为空');
     }
@@ -33,17 +39,25 @@ export class ProjectService extends BaseService<ProjectEntity> {
         userId: 0,
       },
     });
-   if (exist) {
-     throw new Error('项目名称已存在');
-   }
-   bean.disabled = false
-   return await super.add(bean)
+    if (exist) {
+      throw new Error('项目名称已存在');
+    }
+    bean.disabled = false
+    const res= await super.add(bean)
+    projectCache.clear();
+    return res;
+  }
+
+  async update( bean: ProjectEntity) {
+    const res= await super.update(bean)
+    projectCache.clear();
+    return res;
   }
 
   async setDisabled(id: number, disabled: boolean) {
     await this.repository.update({
       id,
-      userId:0,
+      userId: 0,
     }, {
       disabled,
     });
@@ -55,7 +69,7 @@ export class ProjectService extends BaseService<ProjectEntity> {
     const projectIds = memberList.map(item => item.projectId);
     const projectList = await this.repository.createQueryBuilder('project')
       .where(' project.disabled = false')
-      .where(' project.userId = :userId', { userId:0 })
+      .where(' project.userId = :userId', { userId: 0 })
       .where(' project.id IN (:...projectIds) or project.adminId = :userId', { projectIds, userId })
       .getMany();
 
@@ -67,7 +81,7 @@ export class ProjectService extends BaseService<ProjectEntity> {
     projectList.forEach(item => {
       if (item.adminId === userId) {
         item.permission = 'admin';
-      }else{
+      } else {
         item.permission = memberPermissionMap[item.id] || 'read';
       }
     })
@@ -75,21 +89,21 @@ export class ProjectService extends BaseService<ProjectEntity> {
     return projectList
   }
 
-  async checkAdminPermission({userId, projectId}: {userId: number, projectId: number}) {
+  async checkAdminPermission({ userId, projectId }: { userId: number, projectId: number }) {
     return await this.checkPermission({
       userId,
       projectId,
       permission: 'admin',
     })
   }
-  async checkWritePermission({userId, projectId}: {userId: number, projectId: number}) {
+  async checkWritePermission({ userId, projectId }: { userId: number, projectId: number }) {
     return await this.checkPermission({
       userId,
       projectId,
       permission: 'write',
     })
   }
-  async checkReadPermission({userId, projectId}: {userId: number, projectId: number}) {
+  async checkReadPermission({ userId, projectId }: { userId: number, projectId: number }) {
     return await this.checkPermission({
       userId,
       projectId,
@@ -97,47 +111,60 @@ export class ProjectService extends BaseService<ProjectEntity> {
     })
   }
 
-  async checkPermission({userId, projectId, permission}: {userId: number, projectId: number, permission: string}) {
-   if (permission !== 'admin' && permission !== 'write' && permission !== 'read') {
-     throw new Error('权限类型错误');
-   }
-   if (!userId ){
-     throw new Error('用户ID不能为空');
-   }
-   if (!projectId ){
-     throw new Error('项目ID不能为空');
-   }
-   const project = await this.findOne({
-      select: ['id', 'userId', 'adminId', 'disabled'],
-      where: {
-        id: projectId,
-      },
-   });
-    if (!project) {
-      throw new Error('项目不存在');
+  async checkPermission({ userId, projectId, permission }: { userId: number, projectId: number, permission: string }) {
+    if (permission !== 'admin' && permission !== 'write' && permission !== 'read') {
+      throw new Error('权限类型错误');
     }
-    if (project.adminId === userId) {
-      //创建者拥有管理权限
-      return true
+    if (!userId) {
+      throw new Error('用户ID不能为空');
     }
-    if (project.disabled) {
-      throw new Error('项目已禁用');
+    if (!projectId) {
+      throw new Error('项目ID不能为空');
     }
-    const member = await this.projectMemberService.getMember(projectId,userId);
-    if (!member) {
-      throw new Error('项目成员不存在');
+
+    const cacheKey = `projectPermission:${projectId}:${userId}`
+    let savedPermission = projectCache.get(cacheKey);
+    
+    if (!savedPermission){
+        const project = await this.findOne({
+          select: ['id', 'userId', 'adminId', 'disabled'],
+          where: {
+            id: projectId,
+          },
+        });
+        if (!project) {
+          throw new Error('项目不存在');
+        }
+        if (project.adminId === userId) {
+          //创建者拥有管理权限
+          savedPermission = 'admin';
+        }else{
+          if (project.disabled) {
+            throw new Error('项目已禁用');
+          } 
+          const member = await this.projectMemberService.getMember(projectId, userId);
+          if (!member) {
+            throw new Error('项目成员不存在');
+          }
+          savedPermission = member.permission;
+        }
     }
+    projectCache.set(cacheKey, savedPermission,{ttl:  3 * 60 * 1000});
+    if (!savedPermission) {
+      throw new Error('权限不足');
+    }
+    
     if (permission === 'read') {
       return true
     }
     if (permission === 'write') {
-      if (member.permission === 'admin' || member.permission === 'write') {
+      if (savedPermission === 'admin' || savedPermission === 'write') {
         return true
-      }else{
+      } else {
         throw new Error('权限不足');
       }
     }
-    if (member.permission !== permission) {
+    if (savedPermission !== permission) {
       throw new Error('权限不足');
     }
     return true

From 99db1b1cc3b68f0c2863a8c9065b26188fdb2acf Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Wed, 11 Feb 2026 18:17:46 +0800
Subject: [PATCH 19/62] chore: history projectId

---
 .../src/controller/user/pipeline/history-controller.ts    | 7 ++++++-
 .../src/controller/user/pipeline/pipeline-controller.ts   | 8 +-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
index 272e79d92..7c4e10708 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
@@ -89,7 +89,12 @@ export class HistoryController extends CrudController<HistoryService> {
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body) {
     const { projectId, userId } = await this.getProjectUserIdRead()
-    body.query.projectId = projectId
+    if (!body){
+      body = {}
+    }
+    if (projectId){
+      body.projectId = projectId
+    }
 
     const isAdmin = this.authService.isAdmin(this.ctx);
     if (!isAdmin) {
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
index cc40999b6..40b49c861 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
@@ -258,13 +258,7 @@ export class PipelineController extends CrudController<PipelineService> {
 
   @Post('/refreshWebhookKey', { summary: Constants.per.authOnly })
   async refreshWebhookKey(@Body('id') id: number) {
-    
-    const { projectId } = await this.getProjectUserIdWrite()
-    if (projectId) {
-      await this.authService.checkEntityProjectId(this.getService(), projectId, id);
-    } else {
-      await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
-    }
+    await this.checkEntityOwner(this.getService(), id,"write");
     const res = await this.service.refreshWebhookKey(id);
     return this.ok({
       webhookKey: res,

From 67f347197e907c6a004aef2ed0b758f814334c0d Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 13 Feb 2026 00:41:40 +0800
Subject: [PATCH 20/62] chore: project query

---
 .../lib-server/src/basic/base-controller.ts   | 10 ++--
 .../access/access-selector/access/crud.tsx    |  3 ++
 .../src/views/certd/access/crud.tsx           |  3 ++
 .../src/views/certd/history/crud.tsx          |  3 ++
 .../src/views/certd/monitor/cert/crud.tsx     |  3 ++
 .../src/views/certd/monitor/site/crud.tsx     |  3 ++
 .../src/views/certd/notification/common.tsx   |  3 ++
 .../src/views/certd/open/openkey/crud.tsx     |  3 ++
 .../src/views/certd/pipeline/group/crud.tsx   |  3 ++
 .../views/certd/pipeline/template/crud.tsx    |  3 ++
 .../controller/user/addon/addon-controller.ts |  2 +-
 .../user/monitor/cert-info-controller.ts      | 33 ++++++++-----
 .../user/monitor/site-info-controller.ts      | 49 ++++++++++++-------
 .../user/monitor/site-ip-controller.ts        | 36 ++++++++------
 .../user/pipeline/access-controller.ts        |  2 +-
 .../user/pipeline/history-controller.ts       | 14 +++---
 .../user/pipeline/notification-controller.ts  |  2 +-
 .../user/pipeline/pipeline-controller.ts      | 16 +++---
 .../user/pipeline/template-controller.ts      | 31 ++++++++----
 .../monitor/service/site-info-service.ts      | 19 +++++--
 .../monitor/service/site-ip-service.ts        |  6 ++-
 .../pipeline/service/pipeline-service.ts      |  3 ++
 .../pipeline/service/template-service.ts      | 14 ++++--
 .../sys/authority/service/auth-service.ts     |  8 ++-
 24 files changed, 183 insertions(+), 89 deletions(-)

diff --git a/packages/libs/lib-server/src/basic/base-controller.ts b/packages/libs/lib-server/src/basic/base-controller.ts
index b618e3cde..092016580 100644
--- a/packages/libs/lib-server/src/basic/base-controller.ts
+++ b/packages/libs/lib-server/src/basic/base-controller.ts
@@ -105,13 +105,17 @@ export abstract class BaseController {
    * @param service 检查记录是否属于某用户或某项目
    * @param id 
    */
-  async checkEntityOwner(service:any,id:number,permission:string){
+  async checkOwner(service:any,id:number,permission:string,allowAdmin:boolean = false){
     let { projectId,userId } = await this.getProjectUserId(permission)
     const authService:any = await this.applicationContext.getAsync("authService");
     if (projectId) {
-      await authService.checkEntityProjectId(service, id, projectId);
+      await authService.checkProjectId(service, id, projectId);
     }else{
-      await authService.checkEntityUserId(this.ctx, service, id);
+      if(allowAdmin){
+        await authService.checkUserIdButAllowAdmin(this.ctx, service, id);
+      }else{
+        await authService.checkUserId(this.ctx, service, id);
+      }
     }
     return {projectId,userId}
   }
diff --git a/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx b/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
index d6361928e..e06d69f00 100644
--- a/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
@@ -151,6 +151,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           title: t("certd.fields.projectName"),
           type: "dict-select",
           dict: myProjectDict,
+          form: {
+            show: false,
+          },
         },
       },
     },
diff --git a/packages/ui/certd-client/src/views/certd/access/crud.tsx b/packages/ui/certd-client/src/views/certd/access/crud.tsx
index 5643939cb..0dc6bad77 100644
--- a/packages/ui/certd-client/src/views/certd/access/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/access/crud.tsx
@@ -127,6 +127,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           title: t("certd.fields.projectName"),
           type: "dict-select",
           dict: myProjectDict,
+          form: {
+            show: false,
+          },
         },
       },
     },
diff --git a/packages/ui/certd-client/src/views/certd/history/crud.tsx b/packages/ui/certd-client/src/views/certd/history/crud.tsx
index 092f8865d..a49d805d7 100644
--- a/packages/ui/certd-client/src/views/certd/history/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/history/crud.tsx
@@ -206,6 +206,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           title: t("certd.fields.projectName"),
           type: "dict-select",
           dict: myProjectDict,
+          form: {
+            show: false,
+          },
         },
         updateTime: {
           title: t("certd.fields.updateTime"),
diff --git a/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx b/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
index 19aa8c94a..0e033542c 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
@@ -351,6 +351,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           title: t("certd.fields.projectName"),
           type: "dict-select",
           dict: myProjectDict,
+          form: {
+            show: false,
+          },
         },
       },
     },
diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
index 15bece7e3..e5c8ebf76 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
@@ -813,6 +813,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           title: t("certd.fields.projectName"),
           type: "dict-select",
           dict: myProjectDict,
+          form: {
+            show: false,
+          },
         },
       },
     },
diff --git a/packages/ui/certd-client/src/views/certd/notification/common.tsx b/packages/ui/certd-client/src/views/certd/notification/common.tsx
index 24d2fdf04..a54582397 100644
--- a/packages/ui/certd-client/src/views/certd/notification/common.tsx
+++ b/packages/ui/certd-client/src/views/certd/notification/common.tsx
@@ -255,6 +255,9 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
       title: t("certd.fields.projectName"),
       type: "dict-select",
       dict: myProjectDict,
+      form: {
+        show: false,
+      },
     },
   };
 }
diff --git a/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx b/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx
index 9c4eac861..d95075cbb 100644
--- a/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx
@@ -173,6 +173,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           title: t("certd.fields.projectName"),
           type: "dict-select",
           dict: myProjectDict,
+          form: {
+            show: false,
+          },
         },
         createTime: {
           title: t("certd.fields.createTime"),
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx
index 9dae8c6b8..2ada545a5 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx
@@ -140,6 +140,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           title: t("certd.fields.projectName"),
           type: "dict-select",
           dict: myProjectDict,
+          form: {
+            show: false,
+          },
         },
       },
     },
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx
index 2204e0fe8..be9c3c961 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx
@@ -245,6 +245,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           title: t("certd.fields.projectName"),
           type: "dict-select",
           dict: myProjectDict,
+          form: {
+            show: false,
+          },
         },
       },
     },
diff --git a/packages/ui/certd-server/src/controller/user/addon/addon-controller.ts b/packages/ui/certd-server/src/controller/user/addon/addon-controller.ts
index 3eacd0171..641683d27 100644
--- a/packages/ui/certd-server/src/controller/user/addon/addon-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/addon/addon-controller.ts
@@ -140,7 +140,7 @@ export class AddonController extends CrudController<AddonService> {
       const simple = await this.service.getSimpleInfo(res.id);
       return this.ok(simple);
     }
-    await this.authService.checkEntityUserId(this.ctx, this.service, id);
+    await this.authService.checkUserIdButAllowAdmin(this.ctx, this.service, id);
     const res = await this.service.getSimpleInfo(id);
     return this.ok(res);
   }
diff --git a/packages/ui/certd-server/src/controller/user/monitor/cert-info-controller.ts b/packages/ui/certd-server/src/controller/user/monitor/cert-info-controller.ts
index 054717f1a..c6dad8ef1 100644
--- a/packages/ui/certd-server/src/controller/user/monitor/cert-info-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/monitor/cert-info-controller.ts
@@ -30,7 +30,10 @@ export class CertInfoController extends CrudController<CertInfoService> {
   @Post('/page', { summary: Constants.per.authOnly })
   async page(@Body(ALL) body: any) {
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+
+    const { projectId, userId } = await this.getProjectUserIdRead()
+    body.query.projectId = projectId
+    body.query.userId = userId;
     const domains = body.query?.domains;
     delete body.query.domains;
 
@@ -76,17 +79,20 @@ export class CertInfoController extends CrudController<CertInfoService> {
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body: any) {
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    const { projectId, userId } = await this.getProjectUserIdRead()
+    body.query.projectId = projectId
+    body.query.userId = userId;
     return await super.list(body);
   }
 
 
   @Post('/getOptionsByIds', { summary: Constants.per.authOnly })
   async getOptionsByIds(@Body(ALL) body: {ids:any[]}) {
-
+    const { projectId, userId } = await this.getProjectUserIdRead()
     const list = await this.service.list({
       query:{
-        userId: this.getUserId(),
+        projectId,
+        userId,
       },
       buildQuery: (bq: SelectQueryBuilder<any>) => {
         bq.andWhere('id in (:...ids)', { ids: body.ids });
@@ -107,33 +113,37 @@ export class CertInfoController extends CrudController<CertInfoService> {
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean: any) {
-    bean.userId = this.getUserId();
+    const { projectId, userId } = await this.getProjectUserIdWrite()
+    bean.projectId = projectId
+    bean.userId = userId;
     return await super.add(bean);
   }
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.service.checkUserId(bean.id, this.getUserId());
+    await this.checkOwner(this.service,bean.id,"write");
     delete bean.userId;
     return await super.update(bean);
   }
   @Post('/info', { summary: Constants.per.authOnly })
   async info(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.service,id,"read");
     return await super.info(id);
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.service,id,"write");
     return await super.delete(id);
   }
 
   @Post('/all', { summary: Constants.per.authOnly })
   async all() {
+    const { projectId, userId } = await this.getProjectUserIdRead()
     const list: any = await this.service.find({
       where: {
-        userId: this.getUserId(),
+        projectId,
+        userId,
       },
     });
     return this.ok(list);
@@ -143,7 +153,7 @@ export class CertInfoController extends CrudController<CertInfoService> {
 
   @Post('/getCert', { summary: Constants.per.authOnly })
   async getCert(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(),id,"read");
     const certInfoEntity = await this.service.info(id);
     const certInfo = JSON.parse(certInfoEntity.certInfo);
     return this.ok(certInfo);
@@ -151,7 +161,8 @@ export class CertInfoController extends CrudController<CertInfoService> {
 
   @Get('/download', { summary: Constants.per.authOnly })
   async download(@Query('id') id: number) {
-    const certInfo = await this.service.info(id)
+    await this.checkOwner(this.getService(),id,"read");
+    const certInfo = await this.getService().info(id)
     if (certInfo == null) {
       throw new CommonException('file not found');
     }
diff --git a/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts b/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts
index 4ebda0274..68bbd1736 100644
--- a/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts
@@ -26,7 +26,9 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
   @Post('/page', { summary: Constants.per.authOnly })
   async page(@Body(ALL) body: any) {
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    const { projectId, userId } = await this.getProjectUserIdRead()
+    body.query.projectId = projectId
+    body.query.userId = userId;
     const certDomains = body.query.certDomains;
     const domain = body.query.domain;
     const name = body.query.name;
@@ -55,13 +57,17 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body: any) {
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    const { projectId, userId } = await this.getProjectUserIdRead()
+    body.query.projectId = projectId
+    body.query.userId = userId;
     return await super.list(body);
   }
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean: any) {
-    bean.userId = this.getUserId();
+    const { projectId, userId } = await this.getProjectUserIdWrite()
+    bean.projectId = projectId
+    bean.userId = userId;
     const res = await this.service.add(bean);
     const entity = await this.service.info(res.id);
     if (entity.disabled) {
@@ -72,7 +78,7 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.service.checkUserId(bean.id, this.getUserId());
+    await this.checkOwner(this.service,bean.id,"write");
     delete bean.userId;
     await this.service.update(bean);
     const entity = await this.service.info(bean.id);
@@ -83,27 +89,27 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
   }
   @Post('/info', { summary: Constants.per.authOnly })
   async info(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.service,id,"read");
     return await super.info(id);
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.service,id,"write");
     return await super.delete(id);
   }
 
 
   @Post('/batchDelete', { summary: Constants.per.authOnly })
   async batchDelete(@Body(ALL) body: any) {
-    const userId = this.getUserId();
-    await this.service.batchDelete(body.ids,userId);
+    const { projectId, userId } = await this.getProjectUserIdWrite()
+    await this.service.batchDelete(body.ids,userId,projectId);
     return this.ok();
   }
 
   @Post('/check', { summary: Constants.per.authOnly })
   async check(@Body('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.service,id,"read");
     await this.service.check(id, true, 0);
     await utils.sleep(1000);
     return this.ok();
@@ -111,26 +117,27 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
 
   @Post('/checkAll', { summary: Constants.per.authOnly })
   async checkAll() {
-    const userId = this.getUserId();
-    await this.service.checkAllByUsers(userId);
+    const { projectId, userId } = await this.getProjectUserIdWrite()
+    await this.service.checkAllByUsers(userId,projectId);
     return this.ok();
   }
 
   @Post('/import', { summary: Constants.per.authOnly })
   async doImport(@Body(ALL) body: any) {
-    const userId = this.getUserId();
+    const { projectId, userId } = await this.getProjectUserIdWrite()
     await this.service.doImport({
       text:body.text,
       groupId:body.groupId,
-      userId
+      userId,
+      projectId
     })
     return this.ok();
   }
 
+
   @Post('/ipCheckChange', { summary: Constants.per.authOnly })
   async ipCheckChange(@Body(ALL) bean: any) {
-    const userId = this.getUserId();
-    await this.service.checkUserId(bean.id, userId)
+    await this.checkOwner(this.service,bean.id,"read");
     await this.service.ipCheckChange({
       id: bean.id,
       ipCheck: bean.ipCheck
@@ -140,8 +147,7 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
 
   @Post('/disabledChange', { summary: Constants.per.authOnly })
   async disabledChange(@Body(ALL) bean: any) {
-    const userId = this.getUserId();
-    await this.service.checkUserId(bean.id, userId)
+    await this.checkOwner(this.service,bean.id,"write");
     await this.service.disabledChange({
       id: bean.id,
       disabled: bean.disabled
@@ -151,14 +157,19 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
 
   @Post("/setting/get", { summary: Constants.per.authOnly })
   async get() {
-    const userId = this.getUserId();
+    const { userId } = await this.getProjectUserIdRead()
     const setting = await this.service.getSetting(userId)
     return this.ok(setting);
   }
 
   @Post("/setting/save", { summary: Constants.per.authOnly })
   async save(@Body(ALL) bean: any) {
-    const userId = this.getUserId();
+    const { userId } = await this.getProjectUserIdWrite()
+    if(userId === 0){
+      if(!this.isAdmin()){
+        throw new Error("仅管理员可以修改");
+      }
+    }
     const setting = new UserSiteMonitorSetting();
     merge(setting, bean);
 
diff --git a/packages/ui/certd-server/src/controller/user/monitor/site-ip-controller.ts b/packages/ui/certd-server/src/controller/user/monitor/site-ip-controller.ts
index 8df6ccd56..6c170884a 100644
--- a/packages/ui/certd-server/src/controller/user/monitor/site-ip-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/monitor/site-ip-controller.ts
@@ -22,8 +22,10 @@ export class SiteInfoController extends CrudController<SiteIpService> {
 
   @Post('/page', { summary: Constants.per.authOnly })
   async page(@Body(ALL) body: any) {
+    const { projectId, userId } = await this.getProjectUserIdRead()
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    body.query.userId = userId;
+    body.query.projectId = projectId
     const res = await this.service.page({
       query: body.query,
       page: body.page,
@@ -35,13 +37,17 @@ export class SiteInfoController extends CrudController<SiteIpService> {
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body: any) {
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    const { projectId, userId } = await this.getProjectUserIdRead()
+    body.query.userId = userId;
+    body.query.projectId = projectId
     return await super.list(body);
   }
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean: any) {
-    bean.userId = this.getUserId();
+    const { projectId, userId } = await this.getProjectUserIdWrite()
+    bean.userId = userId;
+    bean.projectId = projectId
     bean.from = "manual"
     const res = await this.service.add(bean);
     const siteEntity = await this.siteInfoService.info(bean.siteId);
@@ -54,7 +60,7 @@ export class SiteInfoController extends CrudController<SiteIpService> {
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.service.checkUserId(bean.id, this.getUserId());
+    await this.checkOwner(this.service,bean.id,"write");
     delete bean.userId;
     await this.service.update(bean);
     const siteEntity = await this.siteInfoService.info(bean.siteId);
@@ -66,23 +72,24 @@ export class SiteInfoController extends CrudController<SiteIpService> {
   }
   @Post('/info', { summary: Constants.per.authOnly })
   async info(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.service,id,"read");
     return await super.info(id);
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
+    await this.checkOwner(this.service,id,"write");
     const entity = await this.service.info(id);
-    await this.service.checkUserId(id, this.getUserId());
-
     const res = await super.delete(id);
     await this.service.updateIpCount(entity.siteId)
     return res
   }
 
+
+
   @Post('/check', { summary: Constants.per.authOnly })
   async check(@Body('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.service,id,"read");
     const entity = await this.service.info(id);
     const siteEntity = await this.siteInfoService.info(entity.siteId);
     const domain = siteEntity.domain;
@@ -93,8 +100,7 @@ export class SiteInfoController extends CrudController<SiteIpService> {
 
   @Post('/checkAll', { summary: Constants.per.authOnly })
   async checkAll(@Body('siteId') siteId: number) {
-    const userId = this.getUserId();
-    await this.siteInfoService.checkUserId(siteId, userId);
+    await this.getProjectUserIdRead()
     const siteEntity = await this.siteInfoService.info(siteId);
     await this.service.syncAndCheck(siteEntity);
     return this.ok();
@@ -102,22 +108,20 @@ export class SiteInfoController extends CrudController<SiteIpService> {
 
   @Post('/sync', { summary: Constants.per.authOnly })
   async sync(@Body('siteId') siteId: number) {
-    const userId = this.getUserId();
+    await this.getProjectUserIdWrite()
     const entity = await this.siteInfoService.info(siteId)
-    if(entity.userId != userId){
-      throw new Error('无权限')
-    }
     await this.service.sync(entity);
     return this.ok();
   }
 
   @Post('/import', { summary: Constants.per.authOnly })
   async doImport(@Body(ALL) body: any) {
-    const userId = this.getUserId();
+    const { userId, projectId } = await this.getProjectUserIdWrite()
     await this.service.doImport({
       text:body.text,
       userId,
-      siteId:body.siteId
+      siteId:body.siteId,
+      projectId
     })
     return this.ok();
   }
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/access-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/access-controller.ts
index 2aa5b2bd3..be21b7e5b 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/access-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/access-controller.ts
@@ -102,7 +102,7 @@ export class AccessController extends CrudController<AccessService> {
 
   @Post('/simpleInfo', { summary: Constants.per.authOnly })
   async simpleInfo(@Query('id') id: number) {
-    await this.authService.checkEntityUserId(this.ctx, this.service, id);
+    await this.authService.checkUserIdButAllowAdmin(this.ctx, this.service, id);
     const res = await this.service.getSimpleInfo(id);
     return this.ok(res);
   }
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
index 7c4e10708..8cfc62b2f 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
@@ -159,7 +159,7 @@ export class HistoryController extends CrudController<HistoryService> {
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.checkEntityOwner(this.getService(), bean.id,"write");
+    await this.checkOwner(this.getService(), bean.id,"write",true);
     delete bean.userId;
     return super.update(bean);
   }
@@ -173,7 +173,7 @@ export class HistoryController extends CrudController<HistoryService> {
       //修改
       delete bean.projectId;
       delete bean.userId;
-      await this.checkEntityOwner(this.getService(), bean.id,"write");
+      await this.checkOwner(this.getService(), bean.id,"write",true);
     }
    
     await this.service.save(bean);
@@ -189,7 +189,7 @@ export class HistoryController extends CrudController<HistoryService> {
       //修改
       delete bean.projectId;
       delete bean.userId;
-      await this.checkEntityOwner(this.logService, bean.id,"write");
+      await this.checkOwner(this.logService, bean.id,"write",true);
     }
     await this.logService.save(bean);
     return this.ok(bean.id);
@@ -197,14 +197,14 @@ export class HistoryController extends CrudController<HistoryService> {
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.checkEntityOwner(this.getService(), id,"write");
+    await this.checkOwner(this.getService(), id,"write",true);
     await super.delete(id);
     return this.ok();
   }
 
   @Post('/deleteByIds', { summary: Constants.per.authOnly })
   async deleteByIds(@Body(ALL) body: any) {
-    let {userId} = await this.checkEntityOwner(this.getService(), body.ids,"write");
+    let {userId} = await this.checkOwner(this.getService(), body.ids,"write",true);
     const isAdmin = await this.authService.isAdmin(this.ctx);
     userId = isAdmin ? null : userId;
     await this.getService().deleteByIds(body.ids, userId);
@@ -213,14 +213,14 @@ export class HistoryController extends CrudController<HistoryService> {
 
   @Post('/detail', { summary: Constants.per.authOnly })
   async detail(@Query('id') id: number) {
-    await this.checkEntityOwner(this.getService(), id,"read");
+    await this.checkOwner(this.getService(), id,"read",true);
     const detail = await this.service.detail(id);
     return this.ok(detail);
   }
 
   @Post('/logs', { summary: Constants.per.authOnly })
   async logs(@Query('id') id: number) {
-    await this.checkEntityOwner(this.logService, id,"read");
+    await this.checkOwner(this.logService, id,"read",true);
     const logInfo = await this.logService.info(id);
     return this.ok(logInfo);
   }
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/notification-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/notification-controller.ts
index 2f0028577..2c063e36b 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/notification-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/notification-controller.ts
@@ -127,7 +127,7 @@ export class NotificationController extends CrudController<NotificationService>
       const simple = await this.service.getSimpleInfo(res.id);
       return this.ok(simple);
     }
-    await this.authService.checkEntityUserId(this.ctx, this.service, id);
+    await this.authService.checkUserIdButAllowAdmin(this.ctx, this.service, id);
     const res = await this.service.getSimpleInfo(id);
     return this.ok(res);
   }
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
index 40b49c861..7acca305c 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
@@ -95,7 +95,7 @@ export class PipelineController extends CrudController<PipelineService> {
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.checkEntityOwner(this.getService(), bean.id,"write");
+    await this.checkOwner(this.getService(), bean.id,"write",true);
     delete bean.userId;
     return super.update(bean);
   }
@@ -104,7 +104,7 @@ export class PipelineController extends CrudController<PipelineService> {
   async save(@Body(ALL) bean: { addToMonitorEnabled: boolean, addToMonitorDomains: string } & PipelineEntity) {
      const { userId } = await this.getProjectUserIdWrite()
     if (bean.id > 0) {
-      await this.checkEntityOwner(this.getService(), bean.id,"write");
+      await this.checkOwner(this.getService(), bean.id,"write",true);
     } else {
       bean.userId = userId;
     }
@@ -131,14 +131,14 @@ export class PipelineController extends CrudController<PipelineService> {
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.checkEntityOwner(this.getService(), id,"write");
+    await this.checkOwner(this.getService(), id,"write",true);
     await this.service.delete(id);
     return this.ok({});
   }
 
   @Post('/disabled', { summary: Constants.per.authOnly })
   async disabled(@Body(ALL) bean) {
-    await this.checkEntityOwner(this.getService(), bean.id,"write");
+    await this.checkOwner(this.getService(), bean.id,"write",true);
     delete bean.userId;
     await this.service.disabled(bean.id, bean.disabled);
     return this.ok({});
@@ -146,21 +146,21 @@ export class PipelineController extends CrudController<PipelineService> {
 
   @Post('/detail', { summary: Constants.per.authOnly })
   async detail(@Query('id') id: number) {
-    await this.checkEntityOwner(this.getService(), id,"read");
+    await this.checkOwner(this.getService(), id,"read",true);
     const detail = await this.service.detail(id);
     return this.ok(detail);
   }
 
   @Post('/trigger', { summary: Constants.per.authOnly })
   async trigger(@Query('id') id: number, @Query('stepId') stepId?: string) {
-    await this.checkEntityOwner(this.getService(), id,"write");
+    await this.checkOwner(this.getService(), id,"write",true);
     await this.service.trigger(id, stepId, true);
     return this.ok({});
   }
 
   @Post('/cancel', { summary: Constants.per.authOnly })
   async cancel(@Query('historyId') historyId: number) {
-    await this.checkEntityOwner(this.historyService, historyId,"write");
+    await this.checkOwner(this.historyService, historyId,"write",true);
     await this.service.cancel(historyId);
     return this.ok({});
   }
@@ -258,7 +258,7 @@ export class PipelineController extends CrudController<PipelineService> {
 
   @Post('/refreshWebhookKey', { summary: Constants.per.authOnly })
   async refreshWebhookKey(@Body('id') id: number) {
-    await this.checkEntityOwner(this.getService(), id,"write");
+    await this.checkOwner(this.getService(), id,"write",true);
     const res = await this.service.refreshWebhookKey(id);
     return this.ok({
       webhookKey: res,
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/template-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/template-controller.ts
index 28f5e164a..27641589a 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/template-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/template-controller.ts
@@ -19,10 +19,14 @@ export class TemplateController extends CrudController<TemplateService> {
 
   @Post('/page', { summary: Constants.per.authOnly })
   async page(@Body(ALL) body) {
+    
     body.query = body.query ?? {};
     delete body.query.userId;
+    const { projectId, userId } = await this.getProjectUserIdRead()
+    body.query.projectId = projectId
+    
     const buildQuery = qb => {
-      qb.andWhere('user_id = :userId', { userId: this.getUserId() });
+      qb.andWhere('user_id = :userId', { userId: userId });
     };
     const res = await this.service.page({
       query: body.query,
@@ -36,49 +40,58 @@ export class TemplateController extends CrudController<TemplateService> {
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body) {
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    const { projectId, userId } = await this.getProjectUserIdRead()
+    body.query.projectId = projectId
+    body.query.userId = userId
     return super.list(body);
   }
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean) {
-    bean.userId = this.getUserId();
+    const { projectId, userId } = await this.getProjectUserIdRead()
+    bean.userId = userId;
+    bean.projectId = projectId
     checkPlus()
     return super.add(bean);
   }
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.service.checkUserId(bean.id, this.getUserId());
+    await this.checkOwner(this.service, bean.id, "write");
     delete bean.userId;
     return super.update(bean);
   }
   @Post('/info', { summary: Constants.per.authOnly })
   async info(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+     await this.checkOwner(this.service, id, "read");
     return super.info(id);
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.service.batchDelete([id], this.getUserId());
+     const { userId ,projectId } = await this.getProjectUserIdWrite()
+    await this.service.batchDelete([id], userId,projectId);
     return this.ok({});
   }
 
   @Post('/batchDelete', { summary: Constants.per.authOnly })
   async batchDelete(@Body('ids') ids: number[]) {
-    await this.service.batchDelete(ids, this.getUserId());
+    const { userId ,projectId } = await this.getProjectUserIdWrite()
+    await this.service.batchDelete(ids, userId,projectId);
     return this.ok({});
   }
 
   @Post('/detail', { summary: Constants.per.authOnly })
   async detail(@Query('id') id: number) {
-    const detail = await this.service.detail(id, this.getUserId());
+    const { userId ,projectId } = await this.getProjectUserIdRead()
+    const detail = await this.service.detail(id, userId,projectId);
     return this.ok(detail);
   }
   @Post('/createPipelineByTemplate', { summary: Constants.per.authOnly })
   async createPipelineByTemplate(@Body(ALL) body: any) {
-    body.userId = this.getUserId();
+    const { userId ,projectId } = await this.getProjectUserIdWrite()
+    body.userId = userId;
+    body.projectId = projectId
     checkPlus()
     const res = await this.service.createPipelineByTemplate(body);
     return this.ok(res);
diff --git a/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts b/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
index e465bca13..580e2d8ef 100644
--- a/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
+++ b/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
@@ -1,7 +1,7 @@
 import {Inject, Provide, Scope, ScopeEnum} from "@midwayjs/core";
 import {BaseService, NeedSuiteException, NeedVIPException, SysSettingsService} from "@certd/lib-server";
 import {InjectEntityModel} from "@midwayjs/typeorm";
-import {Repository} from "typeorm";
+import {In, Repository} from "typeorm";
 import {SiteInfoEntity} from "../entity/site-info.js";
 import {siteTester} from "./site-tester.js";
 import dayjs from "dayjs";
@@ -344,12 +344,12 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
     }
   }
 
-  async checkAllByUsers(userId: any) {
+  async checkAllByUsers(userId: any,projectId?: number) {
     if (!userId) {
       throw new Error("userId is required");
     }
     const sites = await this.repository.find({
-      where: {userId}
+      where: {userId,projectId}
     });
     this.checkList(sites,false);
   }
@@ -418,7 +418,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
     }
   }
 
-  async doImport(req: { text: string; userId: number,groupId?:number }) {
+  async doImport(req: { text: string; userId: number,groupId?:number,projectId?:number }) {
     if (!req.text) {
       throw new Error("text is required");
     }
@@ -461,7 +461,8 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
         httpsPort: port,
         userId: req.userId,
         remark,
-        groupId: req.groupId
+        groupId: req.groupId,
+        projectId: req.projectId
       });
     }
 
@@ -537,4 +538,12 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
 
     logger.info(`站点证书检查完成[${userId??'所有用户'}]`);
   }
+
+  async batchDelete(ids: number[], userId: number,projectId?:number): Promise<void> {
+    await this.repository.delete({
+      id: In(ids),
+      userId,
+      projectId,
+    });
+  }
 }
diff --git a/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts b/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts
index 6d4eb6157..203f7da27 100644
--- a/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts
+++ b/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts
@@ -278,7 +278,7 @@ export class SiteIpService extends BaseService<SiteIpEntity> {
     })
   }
 
-  async doImport(req: { text: string; userId:number, siteId:number }) {
+  async doImport(req: { text: string; userId:number, siteId:number,projectId?:number }) {
     if (!req.text) {
       throw new Error("text is required");
     }
@@ -289,7 +289,8 @@ export class SiteIpService extends BaseService<SiteIpEntity> {
     const siteEntity = await this.siteInfoRepository.findOne({
       where: {
         id: req.siteId,
-        userId:req.userId
+        userId:req.userId,
+        projectId:req.projectId
       }
     });
     if (!siteEntity) {
@@ -311,6 +312,7 @@ export class SiteIpService extends BaseService<SiteIpEntity> {
         siteId: req.siteId,
         from: "import",
         disabled:false,
+        projectId: req.projectId,
       });
     }
 
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
index 6405f8891..3d8f9b2e4 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
@@ -756,6 +756,9 @@ export class PipelineService extends BaseService<PipelineEntity> {
         id: pipelineId,
       },
     });
+    if(!pipelineEntity){
+      return null
+    }
     return pipelineEntity.projectId;
   }
   private async saveHistory(history: RunHistory) {
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/template-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/template-service.ts
index cbf97fb08..7e5e41067 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/template-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/template-service.ts
@@ -67,7 +67,7 @@ export class TemplateService extends BaseService<TemplateEntity> {
 
   }
 
-  async detail(id: number, userId: number) {
+  async detail(id: number, userId: number,projectId?:number) {
     const info = await this.info(id)
     if (!info) {
       throw new Error('模板不存在');
@@ -75,6 +75,9 @@ export class TemplateService extends BaseService<TemplateEntity> {
     if (info.userId !== userId) {
       throw new Error('无权限');
     }
+    if (projectId && info.projectId !== projectId) {
+      throw new Error('无权限');
+    }
     let pipeline = null
     if (info.pipelineId) {
       const pipelineEntity = await this.pipelineService.info(info.pipelineId);
@@ -88,19 +91,22 @@ export class TemplateService extends BaseService<TemplateEntity> {
     }
   }
 
-  async batchDelete(ids: number[], userId: number) {
+  async batchDelete(ids: number[], userId: number,projectId?:number) {
 
     const where: any = {
       id: In(ids),
     }
-    if (userId > 0) {
+    if (userId != null) {
       where.userId = userId
     }
+    if (projectId) {
+      where.projectId = projectId
+    }
     const list = await this.getRepository().find({where})
     ids = list.map(item => item.id)
     const pipelineIds = list.map(item => item.pipelineId)
     await this.delete(ids);
-    await this.pipelineService.batchDelete(pipelineIds, userId)
+    await this.pipelineService.batchDelete(pipelineIds, userId, projectId)
   }
 
   async createPipelineByTemplate(body: PipelineEntity) {
diff --git a/packages/ui/certd-server/src/modules/sys/authority/service/auth-service.ts b/packages/ui/certd-server/src/modules/sys/authority/service/auth-service.ts
index 5ed4d78da..3eaa1dd4a 100644
--- a/packages/ui/certd-server/src/modules/sys/authority/service/auth-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/authority/service/auth-service.ts
@@ -28,7 +28,7 @@ export class AuthService {
   }
 
   //管理员有权限查看其他用户的数据
-  async checkEntityUserId(ctx: any, service: any, ids: number| number[] = null, userKey = 'userId') {
+  async checkUserIdButAllowAdmin(ctx: any, service: any, ids: number| number[] = null, userKey = 'userId') {
     const isAdmin = await this.isAdmin(ctx);
     if (isAdmin) {
       return true;
@@ -36,7 +36,11 @@ export class AuthService {
     await service.checkUserId(ids, ctx.user.id, userKey);
   }
 
-  async checkEntityProjectId(service:any,ids:number| number[] = null,projectId = null){
+  async checkProjectId(service:any,ids:number| number[] = null,projectId = null){
     await service.checkUserId(ids, projectId , "projectId");
   }
+
+  async checkUserId(service:any,ids:number| number[] = null,userId = null){
+    await service.checkUserId(ids, userId , "userId");
+  }
 }

From 4ee6e38a94c06fe37341a3a774744a644c7c0b81 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 13 Feb 2026 21:28:17 +0800
Subject: [PATCH 21/62] chore: project controller ok

---
 packages/core/pipeline/src/plugin/api.ts      |  3 +
 .../lib-server/src/basic/base-controller.ts   |  8 +-
 .../libs/lib-server/src/basic/base-service.ts |  5 +-
 .../src/user/access/service/access-getter.ts  | 10 ++-
 .../src/user/access/service/access-service.ts | 18 +++--
 .../src/user/addon/service/addon-service.ts   | 38 ++++++----
 .../src/components/project-selector/index.vue |  8 +-
 .../certd-client/src/layout/layout-basic.vue  | 12 +--
 .../src/router/source/modules/certd.ts        |  6 +-
 .../src/vben/layouts/basic/layout.vue         |  2 +
 .../db/migration/v10038__admin_mode.sql       | 13 ++++
 .../controller/user/addon/addon-controller.ts | 49 ++++++------
 .../controller/user/basic/group-controller.ts | 23 ++++--
 .../controller/user/cert/domain-controller.ts | 48 ++++++++----
 .../user/cname/cname-record-controller.ts     | 15 +++-
 .../mine/setting-two-factor-controller.ts     |  4 +-
 .../user/mine/user-settings-controller.ts     |  7 +-
 .../user/monitor/cert-info-controller.ts      |  1 +
 .../user/monitor/site-info-controller.ts      |  1 +
 .../user/monitor/site-ip-controller.ts        |  1 +
 .../user/open/open-key-controller.ts          | 21 +++--
 .../user/pipeline/access-controller.ts        | 28 ++++---
 .../user/pipeline/cert-controller.ts          |  5 +-
 .../user/pipeline/dns-provider-controller.ts  |  1 -
 .../user/pipeline/handle-controller.ts        | 12 ++-
 .../user/pipeline/history-controller.ts       |  1 +
 .../user/pipeline/notification-controller.ts  | 39 ++++++----
 .../user/pipeline/pipeline-controller.ts      |  2 +
 .../pipeline/pipeline-group-controller.ts     | 23 ++++--
 .../user/pipeline/plugin-controller.ts        |  3 -
 .../user/pipeline/sub-domain-controller.ts    | 26 ++++---
 .../user/pipeline/template-controller.ts      |  1 +
 .../src/modules/basic/entity/group.ts         |  3 +
 .../src/modules/cert/entity/domain.ts         |  3 +
 .../modules/cert/service/domain-service.ts    | 76 ++++++++++++-------
 .../src/modules/cname/entity/cname-record.ts  |  3 +
 .../src/modules/mine/entity/user-settings.ts  |  3 +
 .../mine/service/user-settings-service.ts     | 29 ++++---
 .../src/modules/pipeline/entity/sub-domain.ts |  3 +
 .../service/getter/notification-getter.ts     | 10 ++-
 .../service/getter/task-service-getter.ts     | 12 ++-
 .../pipeline/service/notification-service.ts  | 21 +++--
 42 files changed, 399 insertions(+), 198 deletions(-)

diff --git a/packages/core/pipeline/src/plugin/api.ts b/packages/core/pipeline/src/plugin/api.ts
index fec035cbd..2ce76af34 100644
--- a/packages/core/pipeline/src/plugin/api.ts
+++ b/packages/core/pipeline/src/plugin/api.ts
@@ -122,6 +122,9 @@ export type TaskInstanceContext = {
   //用户信息
   user: UserInfo;
 
+  //项目id
+  projectId?: number;
+
   emitter: TaskEmitter;
 
   //service 容器
diff --git a/packages/libs/lib-server/src/basic/base-controller.ts b/packages/libs/lib-server/src/basic/base-controller.ts
index 092016580..1118067b8 100644
--- a/packages/libs/lib-server/src/basic/base-controller.ts
+++ b/packages/libs/lib-server/src/basic/base-controller.ts
@@ -65,7 +65,13 @@ export abstract class BaseController {
     if (!isEnterprise()) {
       return null
     }
-    const projectIdStr = this.ctx.headers["project-id"] as string;
+    let projectIdStr = this.ctx.headers["project-id"] as string;
+    if (!projectIdStr){
+      projectIdStr = this.ctx.request.query["projectId"] as string;
+    }
+    if (!projectIdStr){
+      return null
+    }
     if (!projectIdStr) {
       throw new Error("projectId 不能为空")
     }
diff --git a/packages/libs/lib-server/src/basic/base-service.ts b/packages/libs/lib-server/src/basic/base-service.ts
index 8efd4416c..d16733d22 100644
--- a/packages/libs/lib-server/src/basic/base-service.ts
+++ b/packages/libs/lib-server/src/basic/base-service.ts
@@ -233,13 +233,14 @@ export abstract class BaseService<T> {
     throw new PermissionException('权限不足');
   }
 
-  async batchDelete(ids: number[], userId: number) {
-    if(userId >0){
+  async batchDelete(ids: number[], userId: number,projectId?:number) {
+    if(userId!=null){
       const list = await this.getRepository().find({
         where: {
           // @ts-ignore
           id: In(ids),
           userId,
+          projectId,
         },
       })
       // @ts-ignore
diff --git a/packages/libs/lib-server/src/user/access/service/access-getter.ts b/packages/libs/lib-server/src/user/access/service/access-getter.ts
index 0fd2d3f19..1bbb75ea8 100644
--- a/packages/libs/lib-server/src/user/access/service/access-getter.ts
+++ b/packages/libs/lib-server/src/user/access/service/access-getter.ts
@@ -2,17 +2,19 @@ import { IAccessService } from '@certd/pipeline';
 
 export class AccessGetter implements IAccessService {
   userId: number;
-  getter: <T>(id: any, userId?: number) => Promise<T>;
-  constructor(userId: number, getter: (id: any, userId: number) => Promise<any>) {
+  projectId?: number;
+  getter: <T>(id: any, userId?: number, projectId?: number) => Promise<T>;
+  constructor(userId: number, projectId: number, getter: (id: any, userId: number, projectId?: number) => Promise<any>) {
     this.userId = userId;
+    this.projectId = projectId;
     this.getter = getter;
   }
 
   async getById<T = any>(id: any) {
-    return await this.getter<T>(id, this.userId);
+    return await this.getter<T>(id, this.userId, this.projectId);
   }
 
   async getCommonById<T = any>(id: any) {
-    return await this.getter<T>(id, 0);
+    return await this.getter<T>(id, 0,null);
   }
 }
diff --git a/packages/libs/lib-server/src/user/access/service/access-service.ts b/packages/libs/lib-server/src/user/access/service/access-service.ts
index 756e72d1d..950e5f243 100644
--- a/packages/libs/lib-server/src/user/access/service/access-service.ts
+++ b/packages/libs/lib-server/src/user/access/service/access-service.ts
@@ -129,10 +129,11 @@ export class AccessService extends BaseService<AccessEntity> {
       id: entity.id,
       name: entity.name,
       userId: entity.userId,
+      projectId: entity.projectId,
     };
   }
 
-  async getAccessById(id: any, checkUserId: boolean, userId?: number): Promise<any> {
+  async getAccessById(id: any, checkUserId: boolean, userId?: number, projectId?: number): Promise<any> {
     const entity = await this.info(id);
     if (entity == null) {
       throw new Error(`该授权配置不存在,请确认是否已被删除:id=${id}`);
@@ -145,6 +146,9 @@ export class AccessService extends BaseService<AccessEntity> {
         throw new PermissionException('您对该Access授权无访问权限');
       }
     }
+    if (projectId != null && projectId !== entity.projectId) {
+      throw new PermissionException('您对该Access授权无访问权限');
+    }
 
     // const access = accessRegistry.get(entity.type);
     const setting = this.decryptAccessEntity(entity);
@@ -152,12 +156,12 @@ export class AccessService extends BaseService<AccessEntity> {
       id: entity.id,
       ...setting,
     };
-    const accessGetter = new AccessGetter(userId, this.getById.bind(this));
+    const accessGetter = new AccessGetter(userId,projectId, this.getById.bind(this));
     return await newAccess(entity.type, input,accessGetter);
   }
 
-  async getById(id: any, userId: number): Promise<any> {
-    return await this.getAccessById(id, true, userId);
+  async getById(id: any, userId: number, projectId?: number): Promise<any> {
+    return await this.getAccessById(id, true, userId, projectId);
   }
 
   decryptAccessEntity(entity: AccessEntity): any {
@@ -188,7 +192,7 @@ export class AccessService extends BaseService<AccessEntity> {
   }
 
 
-  async getSimpleByIds(ids: number[], userId: any) {
+  async getSimpleByIds(ids: number[], userId: any, projectId?: number) {
     if (ids.length === 0) {
       return [];
     }
@@ -199,12 +203,14 @@ export class AccessService extends BaseService<AccessEntity> {
       where: {
         id: In(ids),
         userId,
+        projectId,
       },
       select: {
         id: true,
         name: true,
         type: true,
-        userId:true
+        userId:true,
+        projectId:true,
       },
     });
 
diff --git a/packages/libs/lib-server/src/user/addon/service/addon-service.ts b/packages/libs/lib-server/src/user/addon/service/addon-service.ts
index 55928d9bf..c152d2fad 100644
--- a/packages/libs/lib-server/src/user/addon/service/addon-service.ts
+++ b/packages/libs/lib-server/src/user/addon/service/addon-service.ts
@@ -70,7 +70,8 @@ export class AddonService extends BaseService<AddonEntity> {
       name: entity.name,
       userId: entity.userId,
       addonType: entity.addonType,
-      type: entity.type
+      type: entity.type,
+      projectId: entity.projectId
     };
   }
 
@@ -84,7 +85,7 @@ export class AddonService extends BaseService<AddonEntity> {
   }
 
 
-  async getSimpleByIds(ids: number[], userId: any) {
+  async getSimpleByIds(ids: number[], userId: any,projectId?:number) {
     if (ids.length === 0) {
       return [];
     }
@@ -94,7 +95,8 @@ export class AddonService extends BaseService<AddonEntity> {
     return await this.repository.find({
       where: {
         id: In(ids),
-        userId
+        userId,
+        projectId
       },
       select: {
         id: true,
@@ -109,11 +111,12 @@ export class AddonService extends BaseService<AddonEntity> {
   }
 
 
-  async getDefault(userId: number, addonType: string): Promise<any> {
+  async getDefault(userId: number, addonType: string,projectId?:number): Promise<any> {
     const res = await this.repository.findOne({
       where: {
         userId,
-        addonType
+        addonType,
+        projectId
       },
       order: {
         isDefault: "DESC"
@@ -133,11 +136,12 @@ export class AddonService extends BaseService<AddonEntity> {
       type: res.type,
       name: res.name,
       userId: res.userId,
-      setting
+      setting,
+      projectId: res.projectId
     };
   }
 
-  async setDefault(id: number, userId: number, addonType: string) {
+  async setDefault(id: number, userId: number, addonType: string,projectId?:number) {
     if (!id) {
       throw new ValidateException("id不能为空");
     }
@@ -147,7 +151,8 @@ export class AddonService extends BaseService<AddonEntity> {
     await this.repository.update(
       {
         userId,
-        addonType
+        addonType,
+        projectId
       },
       {
         isDefault: false
@@ -157,7 +162,8 @@ export class AddonService extends BaseService<AddonEntity> {
       {
         id,
         userId,
-        addonType
+        addonType,
+        projectId
       },
       {
         isDefault: true
@@ -165,12 +171,12 @@ export class AddonService extends BaseService<AddonEntity> {
     );
   }
 
-  async getOrCreateDefault(opts: { addonType: string, type: string, inputs: any, userId: any }) {
-    const { addonType, type, inputs, userId } = opts;
+  async getOrCreateDefault(opts: { addonType: string, type: string, inputs: any, userId: any,projectId?:number }) {
+    const { addonType, type, inputs, userId,projectId } = opts;
 
     const addonDefine = this.getDefineByType(type, addonType);
 
-    const defaultConfig = await this.getDefault(userId, addonType);
+    const defaultConfig = await this.getDefault(userId, addonType,projectId);
     if (defaultConfig) {
       return defaultConfig;
     }
@@ -183,17 +189,19 @@ export class AddonService extends BaseService<AddonEntity> {
       type: type,
       name: addonDefine.title,
       setting: JSON.stringify(setting),
-      isDefault: true
+      isDefault: true,
+      projectId
     });
     return this.buildAddonInstanceConfig(res);
   }
 
-  async getOneByType(req:{addonType:string,type:string,userId:number}) {
+  async getOneByType(req:{addonType:string,type:string,userId:number,projectId?:number}) {
     return await this.repository.findOne({
       where: {
         addonType: req.addonType,
         type: req.type,
-        userId: req.userId
+        userId: req.userId,
+        projectId: req.projectId
       }
     });
   }
diff --git a/packages/ui/certd-client/src/components/project-selector/index.vue b/packages/ui/certd-client/src/components/project-selector/index.vue
index 9b7805f36..dfac42954 100644
--- a/packages/ui/certd-client/src/components/project-selector/index.vue
+++ b/packages/ui/certd-client/src/components/project-selector/index.vue
@@ -7,9 +7,9 @@
         </a-menu-item>
       </a-menu>
     </template>
-    <div class="rounded pl-3 pr-3 px-2 py-1 flex-center flex pointer items-center bg-accent h-10 button-text">
+    <div class="rounded pl-3 pr-3 px-2 py-1 flex-center flex pointer items-center bg-accent h-10 button-text" title="当前项目">
       <fs-icon icon="ion:apps" class="mr-1"></fs-icon>
-      {{ projectStore.currentProject?.name || "..." }}
+      当前项目：{{ projectStore.currentProject?.name || "..." }}
       <fs-icon icon="ion:chevron-down-outline" class="ml-1"></fs-icon>
     </div>
   </a-dropdown>
@@ -34,8 +34,8 @@ function handleMenuClick({ key }: any) {
 <style lang="less">
 .project-selector {
   &.button-text {
-    min-width: 100px;
-    max-width: 150px;
+    min-width: 150px;
+    max-width: 250px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
diff --git a/packages/ui/certd-client/src/layout/layout-basic.vue b/packages/ui/certd-client/src/layout/layout-basic.vue
index 4b0ae6414..bbac875d1 100644
--- a/packages/ui/certd-client/src/layout/layout-basic.vue
+++ b/packages/ui/certd-client/src/layout/layout-basic.vue
@@ -10,6 +10,7 @@ import PageFooter from "./components/footer/index.vue";
 import { useRouter } from "vue-router";
 import MaxKBChat from "/@/components/ai/index.vue";
 import { useI18n } from "vue-i18n";
+import { useProjectStore } from "../store/project";
 
 const { t } = useI18n();
 
@@ -77,15 +78,13 @@ const openChat = (q: string) => {
   chatBox.value.openChat({ q });
 };
 provide("fn:ai.open", openChat);
+
+const projectStore = useProjectStore();
 </script>
 
 <template>
   <BasicLayout @clear-preferences-and-logout="handleLogout">
-    <template #header-left-0>
-      <div class="ml-1 mr-2">
-        <project-selector class="flex-center header-btn" />
-      </div>
-    </template>
+    <template #header-left-0> </template>
     <template #user-dropdown>
       <UserDropdown :avatar="avatar" :menus="menus" :text="userStore.userInfo?.nickName || userStore.userInfo?.username" description="" tag-text="" @logout="handleLogout" />
     </template>
@@ -93,6 +92,9 @@ provide("fn:ai.open", openChat);
       <LockScreen :avatar @to-login="handleLogout" />
     </template>
     <template #header-right-0>
+      <div v-if="projectStore.isEnterprise" class="ml-1 mr-2">
+        <project-selector class="flex-center header-btn" />
+      </div>
       <div class="hover:bg-accent ml-1 mr-2 cursor-pointer rounded-full hidden md:block">
         <tutorial-button class="flex-center header-btn" mode="nav" />
       </div>
diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts
index 35b0655cd..74ca90f15 100644
--- a/packages/ui/certd-client/src/router/source/modules/certd.ts
+++ b/packages/ui/certd-client/src/router/source/modules/certd.ts
@@ -1,6 +1,7 @@
 import { useSettingStore } from "/@/store/settings";
 import aboutResource from "/@/router/source/modules/about";
 import i18n from "/@/locales/i18n";
+import { useProjectStore } from "/@/store/project";
 
 export const certdResources = [
   {
@@ -20,7 +21,10 @@ export const certdResources = [
         path: "/certd/project",
         component: "/certd/project/index.vue",
         meta: {
-          show: true,
+          show: () => {
+            const projectStore = useProjectStore();
+            return projectStore.isEnterprise;
+          },
           icon: "ion:apps",
           permission: "sys:settings:edit",
           keepAlive: true,
diff --git a/packages/ui/certd-client/src/vben/layouts/basic/layout.vue b/packages/ui/certd-client/src/vben/layouts/basic/layout.vue
index bdd260a66..125e815ae 100644
--- a/packages/ui/certd-client/src/vben/layouts/basic/layout.vue
+++ b/packages/ui/certd-client/src/vben/layouts/basic/layout.vue
@@ -210,9 +210,11 @@ const headerSlots = computed(() => {
     </template>
     <!-- 侧边额外区域 -->
     <template #side-extra>
+      1111
       <LayoutExtraMenu :accordion="preferences.navigation.accordion" :collapse="preferences.sidebar.extraCollapse" :menus="wrapperMenus(extraMenus)" :rounded="isMenuRounded" :theme="sidebarTheme" />
     </template>
     <template #side-extra-title>
+      234234234
       <VbenLogo v-if="preferences.logo.enable" :text="preferences.app.name" :theme="theme" />
     </template>
 
diff --git a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
index f768b8543..19e42fc9d 100644
--- a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
+++ b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
@@ -54,6 +54,19 @@ CREATE INDEX "index_history_log_project_id" ON "pi_history_log" ("project_id");
 ALTER TABLE pi_template ADD COLUMN  project_id integer;
 CREATE INDEX "index_template_project_id" ON "pi_template" ("project_id");
 
+ALTER TABLE pi_sub_domain ADD COLUMN  project_id integer;
+CREATE INDEX "index_sub_domain_project_id" ON "pi_sub_domain" ("project_id");
+
+ALTER TABLE cd_cname_record ADD COLUMN  project_id integer;
+CREATE INDEX "index_cname_record_project_id" ON "cd_cname_record" ("project_id");
+
+ALTER TABLE cd_domain ADD COLUMN  project_id integer;
+CREATE INDEX "index_domain_project_id" ON "cd_domain" ("project_id");
+
+ALTER TABLE user_settings ADD COLUMN  project_id integer;
+CREATE INDEX "index_user_settings_project_id" ON "user_settings" ("project_id");
+
+
 
 
 CREATE TABLE "cd_project_member"
diff --git a/packages/ui/certd-server/src/controller/user/addon/addon-controller.ts b/packages/ui/certd-server/src/controller/user/addon/addon-controller.ts
index 641683d27..d294a44ac 100644
--- a/packages/ui/certd-server/src/controller/user/addon/addon-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/addon/addon-controller.ts
@@ -32,10 +32,12 @@ export class AddonController extends CrudController<AddonService> {
 
   @Post("/page", { summary: Constants.per.authOnly })
   async page(@Body(ALL) body) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
     delete body.query.userId;
+    body.query.projectId = projectId;
     const buildQuery = qb => {
-      qb.andWhere("user_id = :userId", { userId: this.getUserId() });
+      qb.andWhere("user_id = :userId", { userId });
     };
     const res = await this.service.page({
       query: body.query,
@@ -48,14 +50,18 @@ export class AddonController extends CrudController<AddonService> {
 
   @Post("/list", { summary: Constants.per.authOnly })
   async list(@Body(ALL) body) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    body.query.userId = userId;
+    body.query.projectId = projectId;
     return super.list(body);
   }
 
   @Post("/add", { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean) {
-    bean.userId = this.getUserId();
+    const {userId,projectId} = await this.getProjectUserIdRead();
+    bean.userId = userId;
+    bean.projectId = projectId;
     const type = bean.type;
     const addonType = bean.addonType;
     if (!type || !addonType) {
@@ -73,7 +79,7 @@ export class AddonController extends CrudController<AddonService> {
 
   @Post("/update", { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.service.checkUserId(bean.id, this.getUserId());
+    await this.checkOwner(this.getService(), bean.id, "write");
     const old = await this.service.info(bean.id);
     if (!old) {
       throw new ValidateException("Addon配置不存在");
@@ -90,18 +96,19 @@ export class AddonController extends CrudController<AddonService> {
       }
     }
     delete bean.userId;
+    delete bean.projectId;
     return super.update(bean);
   }
 
   @Post("/info", { summary: Constants.per.authOnly })
   async info(@Query("id") id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "read");
     return super.info(id);
   }
 
   @Post("/delete", { summary: Constants.per.authOnly })
   async delete(@Query("id") id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "write");
     return super.delete(id);
   }
 
@@ -133,38 +140,42 @@ export class AddonController extends CrudController<AddonService> {
   async simpleInfo(@Query("addonType") addonType: string, @Query("id") id: number) {
     if (id === 0) {
       //获取默认
-      const res = await this.service.getDefault(this.getUserId(), addonType);
+      const {projectId,userId} = await this.getProjectUserIdRead();
+      const res = await this.service.getDefault(userId, addonType,projectId);
       if (!res) {
         throw new ValidateException("默认Addon配置不存在");
       }
       const simple = await this.service.getSimpleInfo(res.id);
       return this.ok(simple);
     }
-    await this.authService.checkUserIdButAllowAdmin(this.ctx, this.service, id);
+    await this.checkOwner(this.getService(), id, "read",true);
     const res = await this.service.getSimpleInfo(id);
     return this.ok(res);
   }
 
   @Post("/getDefaultId", { summary: Constants.per.authOnly })
   async getDefaultId(@Query("addonType") addonType: string) {
-    const res = await this.service.getDefault(this.getUserId(), addonType);
+    const {projectId,userId} = await this.getProjectUserIdRead();
+    const res = await this.service.getDefault(userId, addonType,projectId);
     return this.ok(res?.id);
   }
 
   @Post("/setDefault", { summary: Constants.per.authOnly })
   async setDefault(@Query("addonType") addonType: string, @Query("id") id: number) {
-    await this.service.checkUserId(id, this.getUserId());
-    const res = await this.service.setDefault(id, this.getUserId(), addonType);
+    const {projectId,userId} = await this.checkOwner(this.getService(), id, "write",true);
+    const res = await this.service.setDefault(id, userId, addonType,projectId);
     return this.ok(res);
   }
 
 
   @Post("/options", { summary: Constants.per.authOnly })
   async options(@Query("addonType") addonType: string) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     const res = await this.service.list({
       query: {
-        userId: this.getUserId(),
-        addonType
+        userId,
+        addonType,
+        projectId
       }
     });
     for (const item of res) {
@@ -176,22 +187,16 @@ export class AddonController extends CrudController<AddonService> {
 
   @Post("/handle", { summary: Constants.per.authOnly })
   async handle(@Body(ALL) body: AddonRequestHandleReq) {
-    const userId = this.getUserId();
     let inputAddon = body.input.addon;
     if (body.input.id > 0) {
+      await this.checkOwner(this.getService(), body.input.id, "write",true);
       const oldEntity = await this.service.info(body.input.id);
       if (oldEntity) {
-        if (oldEntity.userId !== userId) {
-          throw new Error("addon not found");
-        }
-        // const param: any = {
-        //   type: body.typeName,
-        //   setting: JSON.stringify(body.input.access),
-        // };
         inputAddon = JSON.parse(oldEntity.setting);
       }
     }
-    const serviceGetter = this.taskServiceBuilder.create({ userId });
+    const {projectId,userId} = await this.getProjectUserIdRead();
+    const serviceGetter = this.taskServiceBuilder.create({ userId,projectId });
 
     const ctx = {
       http: http,
diff --git a/packages/ui/certd-server/src/controller/user/basic/group-controller.ts b/packages/ui/certd-server/src/controller/user/basic/group-controller.ts
index 0192ae2bd..483764962 100644
--- a/packages/ui/certd-server/src/controller/user/basic/group-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/basic/group-controller.ts
@@ -20,10 +20,12 @@ export class GroupController extends CrudController<GroupService> {
 
   @Post('/page', { summary: Constants.per.authOnly })
   async page(@Body(ALL) body: any) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
+    body.query.projectId = projectId;
     delete body.query.userId;
     const buildQuery = qb => {
-      qb.andWhere('user_id = :userId', { userId: this.getUserId() });
+      qb.andWhere('user_id = :userId', { userId });
     };
     const res = await this.service.page({
       query: body.query,
@@ -36,40 +38,47 @@ export class GroupController extends CrudController<GroupService> {
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body: any) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    body.query.projectId = projectId;
+    body.query.userId = userId;
     return await super.list(body);
   }
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean: any) {
-    bean.userId = this.getUserId();
+    const {projectId,userId} = await this.getProjectUserIdRead();
+    bean.projectId = projectId;
+    bean.userId = userId;
     return await super.add(bean);
   }
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.service.checkUserId(bean.id, this.getUserId());
+    await this.checkOwner(this.getService(), bean.id, "write");
     delete bean.userId;
+    delete bean.projectId;
     return await super.update(bean);
   }
   @Post('/info', { summary: Constants.per.authOnly })
   async info(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "read");
     return await super.info(id);
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "write");
     return await super.delete(id);
   }
 
   @Post('/all', { summary: Constants.per.authOnly })
   async all(@Query('type') type: string) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     const list: any = await this.service.find({
       where: {
-        userId: this.getUserId(),
+        projectId,
+        userId,
         type,
       },
     });
diff --git a/packages/ui/certd-server/src/controller/user/cert/domain-controller.ts b/packages/ui/certd-server/src/controller/user/cert/domain-controller.ts
index ea76ac588..299ba10d3 100644
--- a/packages/ui/certd-server/src/controller/user/cert/domain-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/cert/domain-controller.ts
@@ -18,8 +18,10 @@ export class DomainController extends CrudController<DomainService> {
 
   @Post('/page', { summary: Constants.per.authOnly })
   async page(@Body(ALL) body: any) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    body.query.projectId = projectId;
+    body.query.userId = userId;
     const domain = body.query.domain;
     delete body.query.domain;
 
@@ -40,41 +42,48 @@ export class DomainController extends CrudController<DomainService> {
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body: any) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    body.query.projectId = projectId;
+    body.query.userId = userId;
     const list = await this.getService().list(body);
     return this.ok(list);
   }
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean: any) {
-    bean.userId = this.getUserId();
+    const {projectId,userId} = await this.getProjectUserIdRead();
+    bean.projectId = projectId;
+    bean.userId = userId;
     return super.add(bean);
   }
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean: any) {
-    await this.service.checkUserId(bean.id, this.getUserId());
+    await this.checkOwner(this.getService(), bean.id, "write");
     delete bean.userId;
+    delete bean.projectId;
     return super.update(bean);
   }
 
   @Post('/info', { summary: Constants.per.authOnly })
   async info(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "read");
     return super.info(id);
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "write");
     return super.delete(id);
   }
 
   @Post('/deleteByIds', { summary: Constants.per.authOnly })
   async deleteByIds(@Body(ALL) body: any) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     await this.service.delete(body.ids, {
-      userId: this.getUserId(),
+      userId: userId,
+      projectId: projectId,
     });
     return this.ok();
   }
@@ -83,9 +92,12 @@ export class DomainController extends CrudController<DomainService> {
   @Post('/import/start', { summary: Constants.per.authOnly })
   async importStart(@Body(ALL) body: any) {
     checkPlus();
+    const {projectId,userId} = await this.getProjectUserIdRead();
     const { key } = body;
     const req = {
-      key, userId: this.getUserId(),
+      key, 
+      userId: userId,
+      projectId: projectId,
     }
     await this.service.startDomainImportTask(req);
     return this.ok();
@@ -93,8 +105,10 @@ export class DomainController extends CrudController<DomainService> {
 
   @Post('/import/status', { summary: Constants.per.authOnly })
   async importStatus() {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     const req = {
-      userId: this.getUserId(),
+      userId: userId,
+      projectId: projectId,
     }
     const task = await this.service.getDomainImportTaskStatus(req);
     return this.ok(task);
@@ -103,9 +117,11 @@ export class DomainController extends CrudController<DomainService> {
 
   @Post('/import/delete', { summary: Constants.per.authOnly })
   async importDelete(@Body(ALL) body: any) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     const { key } = body;
     const req = {
-      userId: this.getUserId(),
+      userId: userId,
+      projectId: projectId,
       key,
     }
     await this.service.deleteDomainImportTask(req);
@@ -115,9 +131,11 @@ export class DomainController extends CrudController<DomainService> {
   @Post('/import/save', { summary: Constants.per.authOnly })
   async importSave(@Body(ALL) body: any) {
     checkPlus();
+    const {projectId,userId} = await this.getProjectUserIdRead();
     const { dnsProviderType, dnsProviderAccessId, key } = body;
     const req = {
-      userId: this.getUserId(),
+      userId: userId,
+      projectId: projectId,
       dnsProviderType, dnsProviderAccessId,  key
     }
     const item = await this.service.saveDomainImportTask(req);
@@ -127,15 +145,19 @@ export class DomainController extends CrudController<DomainService> {
 
   @Post('/sync/expiration/start', { summary: Constants.per.authOnly })
   async syncExpirationStart(@Body(ALL) body: any) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     await this.service.startSyncExpirationTask({
-      userId: this.getUserId(),
+      userId: userId,
+      projectId: projectId,
     })
     return this.ok();
   }
   @Post('/sync/expiration/status', { summary: Constants.per.authOnly })
   async syncExpirationStatus(@Body(ALL) body: any) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     const status = await this.service.getSyncExpirationTaskStatus({
-      userId: this.getUserId(),
+      userId: userId,
+      projectId: projectId,
     })
     return this.ok(status);
   }
diff --git a/packages/ui/certd-server/src/controller/user/cname/cname-record-controller.ts b/packages/ui/certd-server/src/controller/user/cname/cname-record-controller.ts
index 21065e29a..13215ab16 100644
--- a/packages/ui/certd-server/src/controller/user/cname/cname-record-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/cname/cname-record-controller.ts
@@ -17,8 +17,10 @@ export class CnameRecordController extends CrudController<CnameRecordService> {
 
   @Post('/page', { summary: Constants.per.authOnly })
   async page(@Body(ALL) body: any) {
+    const {userId,projectId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    body.query.userId = userId;
+    body.query.projectId = projectId;
     const domain = body.query.domain;
     delete body.query.domain;
 
@@ -39,22 +41,27 @@ export class CnameRecordController extends CrudController<CnameRecordService> {
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body: any) {
+    const {userId,projectId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    body.query.userId = userId;
+    body.query.projectId = projectId;
     const list = await this.getService().list(body);
     return this.ok(list);
   }
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean: any) {
-    bean.userId = this.getUserId();
+    const {userId,projectId} = await this.getProjectUserIdWrite();
+    bean.userId = userId;
+    bean.projectId = projectId;
     return super.add(bean);
   }
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean: any) {
-    await this.service.checkUserId(bean.id, this.getUserId());
+    await this.checkOwner(this.getService(), bean.id, "write");
     delete bean.userId;
+    delete bean.projectId;
     return super.update(bean);
   }
 
diff --git a/packages/ui/certd-server/src/controller/user/mine/setting-two-factor-controller.ts b/packages/ui/certd-server/src/controller/user/mine/setting-two-factor-controller.ts
index 9ef49f89b..711cd571d 100644
--- a/packages/ui/certd-server/src/controller/user/mine/setting-two-factor-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/mine/setting-two-factor-controller.ts
@@ -22,7 +22,7 @@ export class UserTwoFactorSettingController extends BaseController {
   @Post("/get", { summary: Constants.per.authOnly })
   async get() {
     const userId = this.getUserId();
-    const setting = await this.service.getSetting<UserTwoFactorSetting>(userId, UserTwoFactorSetting);
+    const setting = await this.service.getSetting<UserTwoFactorSetting>(userId,null, UserTwoFactorSetting);
     return this.ok(setting);
   }
 
@@ -41,7 +41,7 @@ export class UserTwoFactorSettingController extends BaseController {
         setting.authenticator.verified = false;
     }
 
-    await this.service.saveSetting(userId, setting);
+    await this.service.saveSetting(userId,null, setting);
     return this.ok({});
   }
 
diff --git a/packages/ui/certd-server/src/controller/user/mine/user-settings-controller.ts b/packages/ui/certd-server/src/controller/user/mine/user-settings-controller.ts
index efa813a6c..ec378d30f 100644
--- a/packages/ui/certd-server/src/controller/user/mine/user-settings-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/mine/user-settings-controller.ts
@@ -65,13 +65,14 @@ export class UserSettingsController extends CrudController<UserSettingsService>
 
   @Post('/get', { summary: Constants.per.authOnly })
   async get(@Query('key') key: string) {
-    const entity = await this.service.getByKey(key, this.getUserId());
+    const {projectId,userId} = await this.getProjectUserIdRead();
+    const entity = await this.service.getByKey(key, userId, projectId);
     return this.ok(entity);
   }
 @Post("/grant/get", { summary: Constants.per.authOnly })
   async grantSettingsGet() {
     const userId = this.getUserId();
-    const setting = await this.service.getSetting<UserGrantSetting>(userId, UserGrantSetting);
+    const setting = await this.service.getSetting<UserGrantSetting>(userId, null, UserGrantSetting);
     return this.ok(setting);
   }
 
@@ -84,7 +85,7 @@ export class UserSettingsController extends CrudController<UserSettingsService>
     const setting = new UserGrantSetting();
     merge(setting, bean);
 
-    await this.service.saveSetting(userId, setting);
+    await this.service.saveSetting(userId,null, setting);
     return this.ok({});
   }
 
diff --git a/packages/ui/certd-server/src/controller/user/monitor/cert-info-controller.ts b/packages/ui/certd-server/src/controller/user/monitor/cert-info-controller.ts
index c6dad8ef1..62c2b3d1d 100644
--- a/packages/ui/certd-server/src/controller/user/monitor/cert-info-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/monitor/cert-info-controller.ts
@@ -123,6 +123,7 @@ export class CertInfoController extends CrudController<CertInfoService> {
   async update(@Body(ALL) bean) {
     await this.checkOwner(this.service,bean.id,"write");
     delete bean.userId;
+    delete bean.projectId;
     return await super.update(bean);
   }
   @Post('/info', { summary: Constants.per.authOnly })
diff --git a/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts b/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts
index 68bbd1736..e56caefe2 100644
--- a/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts
@@ -80,6 +80,7 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
   async update(@Body(ALL) bean) {
     await this.checkOwner(this.service,bean.id,"write");
     delete bean.userId;
+    delete bean.projectId;
     await this.service.update(bean);
     const entity = await this.service.info(bean.id);
     if (entity.disabled) {
diff --git a/packages/ui/certd-server/src/controller/user/monitor/site-ip-controller.ts b/packages/ui/certd-server/src/controller/user/monitor/site-ip-controller.ts
index 6c170884a..127c4a387 100644
--- a/packages/ui/certd-server/src/controller/user/monitor/site-ip-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/monitor/site-ip-controller.ts
@@ -62,6 +62,7 @@ export class SiteInfoController extends CrudController<SiteIpService> {
   async update(@Body(ALL) bean) {
     await this.checkOwner(this.service,bean.id,"write");
     delete bean.userId;
+    delete bean.projectId;
     await this.service.update(bean);
     const siteEntity = await this.siteInfoService.info(bean.siteId);
     if(!siteEntity.disabled){
diff --git a/packages/ui/certd-server/src/controller/user/open/open-key-controller.ts b/packages/ui/certd-server/src/controller/user/open/open-key-controller.ts
index 8233ae576..4477e665c 100644
--- a/packages/ui/certd-server/src/controller/user/open/open-key-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/open/open-key-controller.ts
@@ -19,8 +19,10 @@ export class OpenKeyController extends CrudController<OpenKeyService> {
 
   @Post('/page', { summary: Constants.per.authOnly })
   async page(@Body(ALL) body: any) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    body.query.projectId = projectId;
+    body.query.userId = userId;
     const res = await this.service.page({
       query: body.query,
       page: body.page,
@@ -31,40 +33,45 @@ export class OpenKeyController extends CrudController<OpenKeyService> {
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body: any) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    body.query.projectId = projectId;
+    body.query.userId = userId;
     return await super.list(body);
   }
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) body: any) {
-    body.userId = this.getUserId();
+    const {projectId,userId} = await this.getProjectUserIdRead();
+    body.projectId = projectId;
+    body.userId = userId;
     const res = await this.service.add(body);
     return this.ok(res);
   }
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.service.checkUserId(bean.id, this.getUserId());
+    await this.checkOwner(this.getService(), bean.id, "write");
     delete bean.userId;
+    delete bean.projectId;
     await this.service.update(bean);
     return this.ok();
   }
   @Post('/info', { summary: Constants.per.authOnly })
   async info(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "read");
     return await super.info(id);
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "write");
     return await super.delete(id);
   }
 
   @Post('/getApiToken', { summary: Constants.per.authOnly })
   async getApiToken(@Body('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "write");
     const token = await this.service.getApiToken(id);
     return this.ok(token);
   }
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/access-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/access-controller.ts
index be21b7e5b..e5dfcecd3 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/access-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/access-controller.ts
@@ -21,9 +21,11 @@ export class AccessController extends CrudController<AccessService> {
 
   @Post('/page', { summary: Constants.per.authOnly })
   async page(@Body(ALL) body) {
+    const { projectId, userId } = await this.getProjectUserIdRead()
     body.query = body.query ?? {};
     delete body.query.userId;
-    body.query.userId = this.getUserId()
+    body.query.userId = userId;
+    body.query.projectId = projectId;
     let name = body.query?.name;
     delete body.query.name;
     const buildQuery = qb => {
@@ -42,32 +44,37 @@ export class AccessController extends CrudController<AccessService> {
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body) {
+    const { projectId, userId } = await this.getProjectUserIdRead()
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    body.query.userId = userId;
+    body.query.projectId = projectId;
     return super.list(body);
   }
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean) {
-    bean.userId = this.getUserId();
+    const { projectId, userId } = await this.getProjectUserIdWrite()
+    bean.userId = userId;
+    bean.projectId = projectId;
     return super.add(bean);
   }
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.service.checkUserId(bean.id, this.getUserId());
+    await this.checkOwner(this.getService(), bean.id, "write");
     delete bean.userId;
+    delete bean.projectId;
     return super.update(bean);
   }
   @Post('/info', { summary: Constants.per.authOnly })
   async info(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "read");
     return super.info(id);
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "write");
     return super.delete(id);
   }
 
@@ -79,7 +86,8 @@ export class AccessController extends CrudController<AccessService> {
 
   @Post('/getSecretPlain', { summary: Constants.per.authOnly })
   async getSecretPlain(@Body(ALL) body: { id: number; key: string }) {
-    const value = await this.service.getById(body.id, this.getUserId());
+    const {userId, projectId}  = await this.checkOwner(this.getService(), body.id, "read");
+    const value = await this.service.getById(body.id, userId, projectId);  
     return this.ok(value[body.key]);
   }
 
@@ -102,14 +110,16 @@ export class AccessController extends CrudController<AccessService> {
 
   @Post('/simpleInfo', { summary: Constants.per.authOnly })
   async simpleInfo(@Query('id') id: number) {
-    await this.authService.checkUserIdButAllowAdmin(this.ctx, this.service, id);
+    // await this.authService.checkUserIdButAllowAdmin(this.ctx, this.service, id);
+    await this.checkOwner(this.getService(), id, "read",true);
     const res = await this.service.getSimpleInfo(id);
     return this.ok(res);
   }
 
   @Post('/getDictByIds', { summary: Constants.per.authOnly })
   async getDictByIds(@Body('ids') ids: number[]) {
-    const res = await this.service.getSimpleByIds(ids, this.getUserId());
+    const { userId, projectId } = await this.getProjectUserIdRead()
+    const res = await this.service.getSimpleByIds(ids, userId, projectId);
     return this.ok(res);
   }
 }
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/cert-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/cert-controller.ts
index c723c5d1e..dbe947523 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/cert-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/cert-controller.ts
@@ -21,9 +21,8 @@ export class CertController extends BaseController {
 
   @Post('/get', { summary: Constants.per.authOnly })
   async getCert(@Query('id') id: number) {
-    const userId = this.getUserId();
-
 
+    const {userId} = await this.getProjectUserIdRead()
 
     const pipleinUserId = await this.pipelineService.getPipelineUserId(id);
 
@@ -34,7 +33,7 @@ export class CertController extends BaseController {
         throw new PermissionException();
       }
       // 是否允许管理员查看
-      const setting = await this.userSettingsService.getSetting<UserGrantSetting>(pipleinUserId, UserGrantSetting, false);
+      const setting = await this.userSettingsService.getSetting<UserGrantSetting>(pipleinUserId,null, UserGrantSetting, false);
       if (setting?.allowAdminViewCerts !== true) {
         //不允许管理员查看
         throw new PermissionException("该流水线的用户还未授权管理员查看证书，请先让用户在”设置->授权委托“中打开开关");
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/dns-provider-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/dns-provider-controller.ts
index c03a79bf2..bde2bf9f5 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/dns-provider-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/dns-provider-controller.ts
@@ -14,7 +14,6 @@ export class DnsProviderController extends BaseController {
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Query(ALL) query: any) {
-    query.userId = this.getUserId();
     const list = this.service.getList();
     return this.ok(list);
   }
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/handle-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/handle-controller.ts
index 2c4eaab53..559e514f4 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/handle-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/handle-controller.ts
@@ -34,7 +34,7 @@ export class HandleController extends BaseController {
 
   @Post('/access', { summary: Constants.per.authOnly })
   async accessRequest(@Body(ALL) body: AccessRequestHandleReq) {
-    const userId = this.getUserId();
+    const {projectId,userId} = await this.getProjectUserIdRead()
     let inputAccess = body.input.access;
     if (body.input.id > 0) {
       const oldEntity = await this.accessService.info(body.input.id);
@@ -42,6 +42,9 @@ export class HandleController extends BaseController {
         if (oldEntity.userId !== this.getUserId()) {
           throw new Error('access not found');
         }
+        if (oldEntity.projectId && oldEntity.projectId !== projectId) {
+          throw new Error('access not found');
+        }
         const param: any = {
           type: body.typeName,
           setting: JSON.stringify(body.input.access),
@@ -50,7 +53,7 @@ export class HandleController extends BaseController {
         inputAccess = this.accessService.decryptAccessEntity(param);
       }
     }
-    const accessGetter = new AccessGetter(userId, this.accessService.getById.bind(this.accessService));
+    const accessGetter = new AccessGetter(userId,projectId, this.accessService.getById.bind(this.accessService));
     const access = await newAccess(body.typeName, inputAccess,accessGetter);
 
     mergeUtils.merge(access, body.input);
@@ -77,7 +80,7 @@ export class HandleController extends BaseController {
 
   @Post('/plugin', { summary: Constants.per.authOnly })
   async pluginRequest(@Body(ALL) body: PluginRequestHandleReq) {
-    const userId = this.getUserId();
+    const {projectId,userId} = await this.getProjectUserIdRead()
     const pluginDefine = pluginRegistry.get(body.typeName);
     const pluginCls = await pluginDefine.target();
     if (pluginCls == null) {
@@ -98,7 +101,7 @@ export class HandleController extends BaseController {
       });
     };
 
-    const taskServiceGetter = this.taskServiceBuilder.create({userId})
+    const taskServiceGetter = this.taskServiceBuilder.create({userId,projectId})
 
     const accessGetter = await taskServiceGetter.get<IAccessService>("accessService")
     //@ts-ignore
@@ -118,6 +121,7 @@ export class HandleController extends BaseController {
       fileStore: undefined,
       signal: undefined,
       user: {id:userId,role:"user"},
+      projectId,
       // pipelineContext: this.pipelineContext,
       // userContext: this.contextFactory.getContext('user', this.options.userId),
       // fileStore: new FileStore({
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
index 8cfc62b2f..1ba2b592d 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
@@ -161,6 +161,7 @@ export class HistoryController extends CrudController<HistoryService> {
   async update(@Body(ALL) bean) {
     await this.checkOwner(this.getService(), bean.id,"write",true);
     delete bean.userId;
+    delete bean.projectId;
     return super.update(bean);
   }
 
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/notification-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/notification-controller.ts
index 2c063e36b..82421c562 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/notification-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/notification-controller.ts
@@ -22,10 +22,12 @@ export class NotificationController extends CrudController<NotificationService>
 
   @Post('/page', { summary: Constants.per.authOnly })
   async page(@Body(ALL) body) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
     delete body.query.userId;
+    body.query.projectId = projectId;
     const buildQuery = qb => {
-      qb.andWhere('user_id = :userId', { userId: this.getUserId() });
+      qb.andWhere('user_id = :userId', { userId:  userId});
     };
     const res = await this.service.page({
       query: body.query,
@@ -38,14 +40,18 @@ export class NotificationController extends CrudController<NotificationService>
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    body.query.userId = userId;
+    body.query.projectId = projectId;
     return super.list(body);
   }
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean) {
-    bean.userId = this.getUserId();
+    const {projectId,userId} = await this.getProjectUserIdRead();
+    bean.userId = userId;
+    bean.projectId = projectId;
     const type = bean.type;
     const define: NotificationDefine = this.service.getDefineByType(type);
     if (!define) {
@@ -59,7 +65,7 @@ export class NotificationController extends CrudController<NotificationService>
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.service.checkUserId(bean.id, this.getUserId());
+    await this.checkOwner(this.getService(), bean.id,"write");
     const old = await this.service.info(bean.id);
     if (!old) {
       throw new ValidateException('通知配置不存在');
@@ -75,17 +81,18 @@ export class NotificationController extends CrudController<NotificationService>
       }
     }
     delete bean.userId;
+    delete bean.projectId;
     return super.update(bean);
   }
   @Post('/info', { summary: Constants.per.authOnly })
   async info(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id,"read");
     return super.info(id);
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id,"write");
     return super.delete(id);
   }
 
@@ -118,44 +125,50 @@ export class NotificationController extends CrudController<NotificationService>
 
   @Post('/simpleInfo', { summary: Constants.per.authOnly })
   async simpleInfo(@Query('id') id: number) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     if (id === 0) {
       //获取默认
-      const res = await this.service.getDefault(this.getUserId());
+      const res = await this.service.getDefault(userId,projectId);
       if (!res) {
         throw new ValidateException('默认通知配置不存在');
       }
       const simple = await this.service.getSimpleInfo(res.id);
       return this.ok(simple);
     }
-    await this.authService.checkUserIdButAllowAdmin(this.ctx, this.service, id);
+    await this.checkOwner(this.getService(), id,"read",true);
     const res = await this.service.getSimpleInfo(id);
     return this.ok(res);
   }
 
   @Post('/getDefaultId', { summary: Constants.per.authOnly })
   async getDefaultId() {
-    const res = await this.service.getDefault(this.getUserId());
+    const {projectId,userId} = await this.getProjectUserIdRead();
+    const res = await this.service.getDefault(userId,projectId);
     return this.ok(res?.id);
   }
 
   @Post('/setDefault', { summary: Constants.per.authOnly })
   async setDefault(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
-    const res = await this.service.setDefault(id, this.getUserId());
+    const {projectId,userId} = await this.getProjectUserIdRead();
+    await this.checkOwner(this.getService(), id,"write");
+    const res = await this.service.setDefault(id, userId,projectId);
     return this.ok(res);
   }
 
   @Post('/getOrCreateDefault', { summary: Constants.per.authOnly })
   async getOrCreateDefault(@Body('email') email: string) {
-    const res = await this.service.getOrCreateDefault(email, this.getUserId());
+    const {projectId,userId} = await this.getProjectUserIdRead();
+    const res = await this.service.getOrCreateDefault(email, userId,projectId);
     return this.ok(res);
   }
 
   @Post('/options', { summary: Constants.per.authOnly })
   async options() {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     const res = await this.service.list({
       query: {
-        userId: this.getUserId(),
+        userId: userId,
+        projectId: projectId,
       },
     });
     for (const item of res) {
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
index 7acca305c..89deb00bb 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
@@ -97,6 +97,7 @@ export class PipelineController extends CrudController<PipelineService> {
   async update(@Body(ALL) bean) {
     await this.checkOwner(this.getService(), bean.id,"write",true);
     delete bean.userId;
+    delete bean.projectId;
     return super.update(bean);
   }
 
@@ -140,6 +141,7 @@ export class PipelineController extends CrudController<PipelineService> {
   async disabled(@Body(ALL) bean) {
     await this.checkOwner(this.getService(), bean.id,"write",true);
     delete bean.userId;
+    delete bean.projectId;
     await this.service.disabled(bean.id, bean.disabled);
     return this.ok({});
   }
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-group-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-group-controller.ts
index dad21359d..9f5e93d42 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-group-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-group-controller.ts
@@ -20,10 +20,12 @@ export class PipelineGroupController extends CrudController<PipelineGroupService
 
   @Post('/page', { summary: Constants.per.authOnly })
   async page(@Body(ALL) body: any) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
     delete body.query.userId;
+    body.query.projectId = projectId;
     const buildQuery = qb => {
-      qb.andWhere('user_id = :userId', { userId: this.getUserId() });
+      qb.andWhere('user_id = :userId', { userId: userId });
     };
     const res = await this.service.page({
       query: body.query,
@@ -36,40 +38,47 @@ export class PipelineGroupController extends CrudController<PipelineGroupService
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body: any) {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    body.query.userId = userId;
+    body.query.projectId = projectId;
     return await super.list(body);
   }
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean: any) {
-    bean.userId = this.getUserId();
+    const {projectId,userId} = await this.getProjectUserIdRead();
+    bean.userId = userId;
+    bean.projectId = projectId;
     return await super.add(bean);
   }
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.service.checkUserId(bean.id, this.getUserId());
+    await this.checkOwner(this.getService(), bean.id, "write");
     delete bean.userId;
+    delete bean.projectId;
     return await super.update(bean);
   }
   @Post('/info', { summary: Constants.per.authOnly })
   async info(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "read");
     return await super.info(id);
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "write");
     return await super.delete(id);
   }
 
   @Post('/all', { summary: Constants.per.authOnly })
   async all() {
+    const {projectId,userId} = await this.getProjectUserIdRead();
     const list: any = await this.service.find({
       where: {
-        userId: this.getUserId(),
+        userId: userId,
+        projectId: projectId,
       },
     });
     return this.ok(list);
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/plugin-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/plugin-controller.ts
index ceba8864c..4ae968cbf 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/plugin-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/plugin-controller.ts
@@ -18,21 +18,18 @@ export class PluginController extends BaseController {
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Query(ALL) query: any) {
-    query.userId = this.getUserId();
     const list = await this.service.getEnabledBuiltInList();
     return this.ok(list);
   }
 
   @Post('/groups', { summary: Constants.per.authOnly })
   async groups(@Query(ALL) query: any) {
-    query.userId = this.getUserId();
     const group = await this.service.getEnabledBuildInGroup();
     return this.ok(group);
   }
 
   @Post('/groupsList', { summary: Constants.per.authOnly })
   async groupsList(@Query(ALL) query: any) {
-    query.userId = this.getUserId();
     const groups = pluginGroups
     const groupsList:any = []
     for (const key in groups) {
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/sub-domain-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/sub-domain-controller.ts
index f4ae320a3..b022c894c 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/sub-domain-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/sub-domain-controller.ts
@@ -22,8 +22,8 @@ export class SubDomainController extends CrudController<SubDomainService> {
 
   @Post('/parseDomain', { summary: Constants.per.authOnly })
   async parseDomain(@Body("fullDomain") fullDomain:string) {
-    const userId = this.getUserId()
-    const taskService = this.taskServiceBuilder.create({ userId: userId });
+    const {projectId,userId} = await this.getProjectUserIdRead();
+    const taskService = this.taskServiceBuilder.create({ userId: userId, projectId: projectId });
     const subDomainGetter = await taskService.getSubDomainsGetter();
     const domainParser = new DomainParser(subDomainGetter)
     const domain = await domainParser.parse(fullDomain)
@@ -33,10 +33,12 @@ export class SubDomainController extends CrudController<SubDomainService> {
 
   @Post('/page', { summary: Constants.per.authOnly })
   async page(@Body(ALL) body) {
+    const {userId,projectId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
     delete body.query.userId;
+    body.query.projectId = projectId;
     const buildQuery = qb => {
-      qb.andWhere('user_id = :userId', { userId: this.getUserId() });
+      qb.andWhere('user_id = :userId', { userId: userId });
     };
     const res = await this.service.page({
       query: body.query,
@@ -49,38 +51,44 @@ export class SubDomainController extends CrudController<SubDomainService> {
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body) {
+    const {userId,projectId} = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
+    body.query.userId = userId;
+    body.query.projectId = projectId;
     return super.list(body);
   }
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean) {
-    bean.userId = this.getUserId();
+    const {userId,projectId} = await this.getProjectUserIdRead();
+    bean.userId = userId;
+    bean.projectId = projectId;
     return super.add(bean);
   }
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.service.checkUserId(bean.id, this.getUserId());
+    await this.checkOwner(this.getService(), bean.id, "write");
     delete bean.userId;
+    delete bean.projectId;
     return super.update(bean);
   }
   @Post('/info', { summary: Constants.per.authOnly })
   async info(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "read");
     return super.info(id);
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "write");
     return super.delete(id);
   }
 
   @Post('/batchDelete', { summary: Constants.per.authOnly })
   async batchDelete(@Body('ids') ids: number[]) {
-    await this.service.batchDelete(ids, this.getUserId());
+    const {userId,projectId} = await this.getProjectUserIdWrite();
+    await this.service.batchDelete(ids, userId, projectId);
     return this.ok({});
   }
 }
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/template-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/template-controller.ts
index 27641589a..1febcae42 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/template-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/template-controller.ts
@@ -59,6 +59,7 @@ export class TemplateController extends CrudController<TemplateService> {
   async update(@Body(ALL) bean) {
     await this.checkOwner(this.service, bean.id, "write");
     delete bean.userId;
+    delete bean.projectId;
     return super.update(bean);
   }
   @Post('/info', { summary: Constants.per.authOnly })
diff --git a/packages/ui/certd-server/src/modules/basic/entity/group.ts b/packages/ui/certd-server/src/modules/basic/entity/group.ts
index 92a41319a..ae6d920a1 100644
--- a/packages/ui/certd-server/src/modules/basic/entity/group.ts
+++ b/packages/ui/certd-server/src/modules/basic/entity/group.ts
@@ -22,6 +22,9 @@ export class GroupEntity {
   @Column({ name: 'type', comment: '类型', length: 512 })
   type: string;
 
+  @Column({ name: 'project_id', comment: '项目Id' })
+  projectId: number;
+
   @Column({
     name: 'create_time',
     comment: '创建时间',
diff --git a/packages/ui/certd-server/src/modules/cert/entity/domain.ts b/packages/ui/certd-server/src/modules/cert/entity/domain.ts
index 577c088f7..1b0a07aa5 100644
--- a/packages/ui/certd-server/src/modules/cert/entity/domain.ts
+++ b/packages/ui/certd-server/src/modules/cert/entity/domain.ts
@@ -44,6 +44,9 @@ export class DomainEntity {
   @Column({ comment: 'http上传根目录', name: 'http_upload_root_dir', length: 512 })
   httpUploadRootDir: string;
 
+  @Column({ name: 'project_id', comment: '项目Id' })
+  projectId: number;
+
   @Column({
     comment: '创建时间',
     name: 'create_time',
diff --git a/packages/ui/certd-server/src/modules/cert/service/domain-service.ts b/packages/ui/certd-server/src/modules/cert/service/domain-service.ts
index a181e598b..c7b41b1c9 100644
--- a/packages/ui/certd-server/src/modules/cert/service/domain-service.ts
+++ b/packages/ui/certd-server/src/modules/cert/service/domain-service.ts
@@ -18,6 +18,7 @@ import { DomainEntity } from '../entity/domain.js';
 
 export interface SyncFromProviderReq {
   userId: number;
+  projectId: number;
   dnsProviderType: string;
   dnsProviderAccessId: number;
 }
@@ -215,9 +216,9 @@ export class DomainService extends BaseService<DomainEntity> {
   }
 
 
-  async startDomainImportTask(req: { userId: number, key: string }) {
+  async startDomainImportTask(req: { userId: number, projectId: number, key: string }) {
     const key = req.key
-    const setting = await this.userSettingService.getSetting<UserDomainImportSetting>(req.userId, UserDomainImportSetting)
+    const setting = await this.userSettingService.getSetting<UserDomainImportSetting>(req.userId, req.projectId, UserDomainImportSetting)
 
     const item = setting.domainImportList.find(item => item.key === key)
     if (!item) {
@@ -232,6 +233,7 @@ export class DomainService extends BaseService<DomainEntity> {
       run: async (task: BackTask) => {
         await this._syncFromProvider({
           userId: req.userId,
+          projectId: req.projectId,
           dnsProviderType,
           dnsProviderAccessId,
         }, task)
@@ -240,13 +242,13 @@ export class DomainService extends BaseService<DomainEntity> {
   }
 
   private async _syncFromProvider(req: SyncFromProviderReq, task: BackTask) {
-    const { userId, dnsProviderType, dnsProviderAccessId } = req;
+    const { userId, projectId, dnsProviderType, dnsProviderAccessId } = req;
 
-    const serviceGetter = this.taskServiceBuilder.create({ userId });
+    const serviceGetter = this.taskServiceBuilder.create({ userId, projectId });
     const subDomainGetter = await serviceGetter.getSubDomainsGetter();
     const domainParser = new DomainParser(subDomainGetter)
 
-    const access = await this.accessService.getById(dnsProviderAccessId, userId);
+    const access = await this.accessService.getById(dnsProviderAccessId, userId, projectId);
     const context = { access, logger, http, utils, domainParser, serviceGetter };
     // 翻页查询dns的记录
     const dnsProvider = await createDnsProvider({ dnsProviderType, context })
@@ -272,6 +274,7 @@ export class DomainService extends BaseService<DomainEntity> {
         where: {
           domain,
           userId,
+          projectId,
         }
       })
       if (old) {
@@ -296,6 +299,7 @@ export class DomainService extends BaseService<DomainEntity> {
         //添加
         await this.add({
           userId,
+          projectId,
           domain,
           dnsProviderType,
           dnsProviderAccess: dnsProviderAccessId,
@@ -314,10 +318,11 @@ export class DomainService extends BaseService<DomainEntity> {
     logger.info(`从域名提供商${dnsProviderType}导入域名完成(${key})，共导入${task.total}个域名，跳过${task.getSkipCount()}个域名，成功${task.getSuccessCount()}个域名，失败${task.getErrorCount()}个域名`)
   }
 
-  async getDomainImportTaskStatus(req: { userId?: number }) {
+  async getDomainImportTaskStatus(req: { userId?: number ,projectId?: number}) {
     const userId = req.userId || 0
+    const projectId = req.projectId 
 
-    const setting = await this.userSettingService.getSetting<UserDomainImportSetting>(userId, UserDomainImportSetting)
+    const setting = await this.userSettingService.getSetting<UserDomainImportSetting>(userId, projectId, UserDomainImportSetting)
     const list = setting?.domainImportList || []
 
     const taskList: any = []
@@ -335,8 +340,9 @@ export class DomainService extends BaseService<DomainEntity> {
     return taskList
   }
 
-  async getProviderTitle(req: { userId?: number, dnsProviderType: string, dnsProviderAccessId: number }) {
+  async getProviderTitle(req: { userId?: number, projectId?: number, dnsProviderType: string, dnsProviderAccessId: number }) {
     const userId = req.userId || 0
+    const projectId = req.projectId
     const { dnsProviderType, dnsProviderAccessId } = req
     const dnsProviderDefine = dnsProviderRegistry.getDefine(dnsProviderType)
     if (!dnsProviderDefine) {
@@ -346,6 +352,9 @@ export class DomainService extends BaseService<DomainEntity> {
     if (!access || access.userId !== userId) {
       throw new Error(`该授权（${dnsProviderAccessId}）不存在，请检查是否已被删除`)
     }
+    if (projectId && access.projectId !== projectId) {
+      throw new Error(`该授权（${dnsProviderAccessId}）不存在，请检查是否已被删除`)
+    }
     return {
       title: `${dnsProviderDefine.title}_${access.name || ''}`,
       //@ts-ignore
@@ -353,21 +362,22 @@ export class DomainService extends BaseService<DomainEntity> {
     }
   }
 
-  async addDomainImportTask(req: { userId?: number, dnsProviderType: string, dnsProviderAccessId: number, index?: number }) {
+  async addDomainImportTask(req: { userId?: number, projectId?: number, dnsProviderType: string, dnsProviderAccessId: number, index?: number }) {
     const userId = req.userId || 0
+    const projectId = req.projectId
     const { dnsProviderType, dnsProviderAccessId, index = 0 } = req
     const key = `user_${userId}_${dnsProviderType}_${dnsProviderAccessId}`
 
     const { title, icon } = await this.getProviderTitle(req)
 
 
-    const setting = await this.userSettingService.getSetting<UserDomainImportSetting>(userId, UserDomainImportSetting)
+    const setting = await this.userSettingService.getSetting<UserDomainImportSetting>(userId, projectId, UserDomainImportSetting)
     setting.domainImportList = setting.domainImportList || []
     if (setting.domainImportList.find(item => item.key === key)) {
       throw new Error(`该域名导入任务${key}已存在`)
     }
 
-    const access = await this.accessService.getAccessById(dnsProviderAccessId, true, userId)
+    const access = await this.accessService.getAccessById(dnsProviderAccessId, true, userId, projectId)
     if (!access) {
       throw new Error(`该授权（${dnsProviderAccessId}）不存在，请检查是否已被删除`)
     }
@@ -380,16 +390,17 @@ export class DomainService extends BaseService<DomainEntity> {
       icon: icon || '',
     }
     setting.domainImportList.splice(index, 0, item)
-    await this.userSettingService.saveSetting(userId, setting)
+    await this.userSettingService.saveSetting(userId, projectId, setting)
 
     return item
   }
 
-  async deleteDomainImportTask(req: { userId?: number, key: string }) {
+  async deleteDomainImportTask(req: { userId?: number, projectId?: number, key: string }) {
     const userId = req.userId || 0
     const { key } = req
 
-    const setting = await this.userSettingService.getSetting<UserDomainImportSetting>(userId, UserDomainImportSetting)
+    const projectId = req.projectId
+    const setting = await this.userSettingService.getSetting<UserDomainImportSetting>(userId, projectId, UserDomainImportSetting)
     setting.domainImportList = setting.domainImportList || []
     const index = setting.domainImportList.findIndex(item => item.key === key)
     if (index === -1) {
@@ -397,13 +408,14 @@ export class DomainService extends BaseService<DomainEntity> {
     }
     setting.domainImportList.splice(index, 1)
     taskExecutor.clear(DOMAIN_IMPORT_TASK_TYPE, key)
-    await this.userSettingService.saveSetting(userId, setting)
+    await this.userSettingService.saveSetting(userId, projectId, setting)
   }
 
-  async saveDomainImportTask(req: { userId?: number, dnsProviderType: string, dnsProviderAccessId: number, key?: string }) {
+  async saveDomainImportTask(req: { userId?: number, projectId?: number, dnsProviderType: string, dnsProviderAccessId: number, key?: string }) {
     const userId = req.userId || 0
+    const projectId = req.projectId
     const { dnsProviderType, dnsProviderAccessId, key } = req
-    const setting = await this.userSettingService.getSetting<UserDomainImportSetting>(userId, UserDomainImportSetting)
+    const setting = await this.userSettingService.getSetting<UserDomainImportSetting>(userId, projectId, UserDomainImportSetting)
     setting.domainImportList = setting.domainImportList || []
 
     let index = 0
@@ -412,36 +424,46 @@ export class DomainService extends BaseService<DomainEntity> {
       if (index === -1) {
         throw new Error(`该域名导入任务${key}不存在`)
       }
-      await this.deleteDomainImportTask({ userId, key })
+      await this.deleteDomainImportTask({ userId, projectId, key })
     }
 
-    return await this.addDomainImportTask({ userId, dnsProviderType, dnsProviderAccessId, index })
+
+
+    return await this.addDomainImportTask({ userId, projectId, dnsProviderType, dnsProviderAccessId, index })
   }
 
 
 
 
-  async getSyncExpirationTaskStatus(req: { userId?: number }) {
+  async getSyncExpirationTaskStatus(req: { userId?: number, projectId?: number }) {
     const userId = req.userId ?? 'all'
-    const key = `user_${userId}`
+    const projectId = req.projectId
+    let key = `user_${userId}`
+    if (projectId!=null) {
+      key += `_${projectId}`
+    }
     const task = taskExecutor.get(DOMAIN_EXPIRE_TASK_TYPE, key)
     return task
   }
 
-  async startSyncExpirationTask(req: { userId?: number }) {
+  async startSyncExpirationTask(req: { userId?: number, projectId?: number }) {
     const userId = req.userId
-    const key = `user_${userId ?? 'all'}`
+    const projectId = req.projectId
+    let key = `user_${userId ?? 'all'}`
+    if (projectId!=null) {
+      key += `_${projectId}`
+    }
     taskExecutor.start(new BackTask({
       type: DOMAIN_EXPIRE_TASK_TYPE,
       key,
       title: `同步注册域名过期时间(${key}))`,
       run: async (task: BackTask) => {
-        await this._syncDomainsExpirationDate({ userId, task })
+        await this._syncDomainsExpirationDate({ userId, projectId, task })
       }
     }))
   }
 
-  private async _syncDomainsExpirationDate(req: { userId?: number, task: BackTask }) {
+  private async _syncDomainsExpirationDate(req: { userId?: number, projectId?: number, task: BackTask }) {
     //同步所有域名的过期时间
     const pager = new Pager({
       pageNo: 1,
@@ -498,6 +520,9 @@ export class DomainService extends BaseService<DomainEntity> {
     if (req.userId != null) {
       query.userId = req.userId
     }
+    if (req.projectId != null) {
+      query.projectId = req.projectId
+    }
     const getDomainPage = async (pager: Pager) => {
       const pageRes = await this.page({
         query: query,
@@ -549,5 +574,4 @@ export class DomainService extends BaseService<DomainEntity> {
     logger.info(`同步用户(${key})注册域名过期时间完成(${req.task.getSuccessCount()}个成功，${req.task.getErrorCount()}个失败)`)
   }
 
-
 }
diff --git a/packages/ui/certd-server/src/modules/cname/entity/cname-record.ts b/packages/ui/certd-server/src/modules/cname/entity/cname-record.ts
index 7ef34a380..a1494d464 100644
--- a/packages/ui/certd-server/src/modules/cname/entity/cname-record.ts
+++ b/packages/ui/certd-server/src/modules/cname/entity/cname-record.ts
@@ -31,6 +31,9 @@ export class CnameRecordEntity {
   @Column({ comment: '错误信息' })
   error: string
 
+  @Column({ name: 'project_id', comment: '项目Id' })
+  projectId: number;
+
   @Column({
     comment: '创建时间',
     name: 'create_time',
diff --git a/packages/ui/certd-server/src/modules/mine/entity/user-settings.ts b/packages/ui/certd-server/src/modules/mine/entity/user-settings.ts
index fe682ebaf..86f15f69e 100644
--- a/packages/ui/certd-server/src/modules/mine/entity/user-settings.ts
+++ b/packages/ui/certd-server/src/modules/mine/entity/user-settings.ts
@@ -15,6 +15,9 @@ export class UserSettingsEntity {
   @Column({ name: 'setting', comment: '设置', length: 1024, nullable: true })
   setting: string;
 
+  @Column({ name: 'project_id', comment: '项目Id' })
+  projectId: number;
+
   @Column({
     name: 'create_time',
     comment: '创建时间',
diff --git a/packages/ui/certd-server/src/modules/mine/service/user-settings-service.ts b/packages/ui/certd-server/src/modules/mine/service/user-settings-service.ts
index d6b289507..641c23ded 100644
--- a/packages/ui/certd-server/src/modules/mine/service/user-settings-service.ts
+++ b/packages/ui/certd-server/src/modules/mine/service/user-settings-service.ts
@@ -37,7 +37,7 @@ export class UserSettingsService extends BaseService<UserSettingsEntity> {
     };
   }
 
-  async getByKey(key: string, userId: number): Promise<UserSettingsEntity | null> {
+  async getByKey(key: string, userId: number, projectId: number): Promise<UserSettingsEntity | null> {
     if(!userId){
       throw new Error('userId is required');
     }
@@ -47,16 +47,17 @@ export class UserSettingsService extends BaseService<UserSettingsEntity> {
     return await this.repository.findOne({
       where: {
         key,
-        userId
+        userId,
+        projectId
       }
     });
   }
 
-  async getSettingByKey(key: string, userId: number): Promise<any | null> {
+  async getSettingByKey(key: string, userId: number, projectId: number): Promise<any | null> {
     if(!userId){
       throw new Error('userId is required');
     }
-    const entity = await this.getByKey(key, userId);
+    const entity = await this.getByKey(key, userId, projectId);
     if (!entity) {
       return null;
     }
@@ -67,7 +68,8 @@ export class UserSettingsService extends BaseService<UserSettingsEntity> {
     const entity = await this.repository.findOne({
       where: {
         key: bean.key,
-        userId: bean.userId
+        userId: bean.userId,
+        projectId: bean.projectId
       }
     });
     if (entity) {
@@ -80,12 +82,16 @@ export class UserSettingsService extends BaseService<UserSettingsEntity> {
   }
 
 
-  async getSetting<T>( userId: number,type: any, cache:boolean = false): Promise<T> {
+  async getSetting<T>( userId: number, projectId: number,type: any, cache:boolean = false): Promise<T> {
     if(!userId){
       throw new Error('userId is required');
     }
     const key = type.__key__;
-    const cacheKey = key + '_' + userId;
+    let cacheKey = key + '_' + userId ;
+    if (projectId) {
+      cacheKey += '_' + projectId;
+    }
+
     if (cache) {
       const settings: T = UserSettingCache.get(cacheKey);
       if (settings) {
@@ -94,7 +100,7 @@ export class UserSettingsService extends BaseService<UserSettingsEntity> {
     }
 
     let newSetting: T = new type();
-    const savedSettings = await this.getSettingByKey(key, userId);
+    const savedSettings = await this.getSettingByKey(key, userId, projectId);
     newSetting = merge(newSetting, savedSettings);
 
     if (cache) {
@@ -103,11 +109,11 @@ export class UserSettingsService extends BaseService<UserSettingsEntity> {
     return newSetting;
   }
 
-  async saveSetting<T extends BaseSettings>(userId:number,bean: T) {
+  async saveSetting<T extends BaseSettings>(userId:number, projectId: number,bean: T) {
     if(!userId){
       throw new Error('userId is required');
     }
-    const old = await this.getSetting(userId,bean.constructor)
+    const old = await this.getSetting(userId, projectId,bean.constructor)
     bean = merge(old,bean)
 
     const type: any = bean.constructor;
@@ -115,7 +121,7 @@ export class UserSettingsService extends BaseService<UserSettingsEntity> {
     if(!key){
       throw new Error(`${type.name} must have __key__`);
     }
-    const entity = await this.getByKey(key,userId);
+    const entity = await this.getByKey(key,userId, projectId);
     const newEntity = new UserSettingsEntity();
     if (entity) {
       newEntity.id = entity.id;
@@ -123,6 +129,7 @@ export class UserSettingsService extends BaseService<UserSettingsEntity> {
       newEntity.key = key;
       newEntity.title = type.__title__;
       newEntity.userId = userId;
+      newEntity.projectId = projectId;
     }
     newEntity.setting = JSON.stringify(bean);
     await this.repository.save(newEntity);
diff --git a/packages/ui/certd-server/src/modules/pipeline/entity/sub-domain.ts b/packages/ui/certd-server/src/modules/pipeline/entity/sub-domain.ts
index a6d324ed6..e775ab675 100644
--- a/packages/ui/certd-server/src/modules/pipeline/entity/sub-domain.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/entity/sub-domain.ts
@@ -17,6 +17,9 @@ export class SubDomainEntity {
   @Column({ name: 'disabled', comment: '禁用' })
   disabled: boolean;
 
+  @Column({ name: 'project_id', comment: '项目Id' })
+  projectId: number;
+
   @Column({
     name: 'create_time',
     comment: '创建时间',
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/getter/notification-getter.ts b/packages/ui/certd-server/src/modules/pipeline/service/getter/notification-getter.ts
index 691608ad3..9487666f2 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/getter/notification-getter.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/getter/notification-getter.ts
@@ -3,22 +3,24 @@ import {NotificationService} from "../notification-service.js";
 
 export class NotificationGetter implements INotificationService {
   userId: number;
+  projectId: number;
   notificationService: NotificationService;
 
-  constructor(userId: number, notificationService: NotificationService) {
+  constructor(userId: number, projectId: number, notificationService: NotificationService) {
     this.userId = userId;
+    this.projectId = projectId;
     this.notificationService = notificationService;
   }
 
   async getDefault() {
-    return await this.notificationService.getDefault(this.userId);
+    return await this.notificationService.getDefault(this.userId, this.projectId);
   }
 
   async getById(id: any) {
-    return await this.notificationService.getById(id, this.userId);
+    return await this.notificationService.getById(id, this.userId, this.projectId);
   }
 
   async send(req: NotificationSendReq): Promise<void> {
-    return await this.notificationService.send(req, this.userId);
+    return await this.notificationService.send(req, this.userId, this.projectId);
   }
 }
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts b/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts
index 5fdffb3f0..b99b6bd88 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts
@@ -15,9 +15,11 @@ const serviceNames = [
 ]
 export class TaskServiceGetter implements IServiceGetter{
   private userId: number;
+  private projectId: number;
   private appCtx : IMidwayContainer;
-  constructor(userId:number,appCtx:IMidwayContainer) {
+  constructor(userId:number,projectId:number,appCtx:IMidwayContainer) {
     this.userId = userId;
+    this.projectId = projectId;
     this.appCtx = appCtx
   }
   async get<T>(serviceName: string): Promise<T> {
@@ -51,7 +53,7 @@ export class TaskServiceGetter implements IServiceGetter{
 
   async getAccessService(): Promise<AccessGetter> {
     const accessService:AccessService = await  this.appCtx.getAsync("accessService")
-    return new AccessGetter(this.userId, accessService.getById.bind(accessService));
+    return new AccessGetter(this.userId, this.projectId, accessService.getById.bind(accessService));
   }
 
 
@@ -62,7 +64,7 @@ export class TaskServiceGetter implements IServiceGetter{
 
   async getNotificationService(): Promise<NotificationGetter> {
     const notificationService:NotificationService = await  this.appCtx.getAsync("notificationService")
-    return new NotificationGetter(this.userId, notificationService);
+    return new NotificationGetter(this.userId, this.projectId, notificationService);
   }
 
   async getDomainVerifierGetter(): Promise<DomainVerifierGetter> {
@@ -78,12 +80,14 @@ export class TaskServiceBuilder  {
 
   create(req:TaskServiceCreateReq){
     const userId = req.userId;
-    return new TaskServiceGetter(userId,this.appCtx)
+    const projectId = req.projectId;
+    return new TaskServiceGetter(userId,projectId,this.appCtx)
   }
 }
 
 export type TaskServiceCreateReq = {
   userId: number;
+  projectId?: number;
 }
 
 
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts
index 95eb049ce..14ddd287d 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts
@@ -84,7 +84,7 @@ export class NotificationService extends BaseService<NotificationEntity> {
     }
   }
 
-  async getById(id: number, userId: number): Promise<NotificationInstanceConfig> {
+  async getById(id: number, userId: number, projectId?: number): Promise<NotificationInstanceConfig> {
     if (!id) {
       throw new ValidateException('id不能为空');
     }
@@ -95,6 +95,7 @@ export class NotificationService extends BaseService<NotificationEntity> {
       where: {
         id,
         userId,
+        projectId,
       },
     });
     if (!res) {
@@ -114,10 +115,11 @@ export class NotificationService extends BaseService<NotificationEntity> {
     };
   }
 
-  async getDefault(userId: number): Promise<NotificationInstanceConfig> {
+  async getDefault(userId: number, projectId?: number): Promise<NotificationInstanceConfig> {
     const res = await this.repository.findOne({
       where: {
         userId,
+        projectId,
       },
       order: {
         isDefault: 'DESC',
@@ -129,7 +131,7 @@ export class NotificationService extends BaseService<NotificationEntity> {
     return this.buildNotificationInstanceConfig(res);
   }
 
-  async setDefault(id: number, userId: number) {
+  async setDefault(id: number, userId: number, projectId?: number) {
     if (!id) {
       throw new ValidateException('id不能为空');
     }
@@ -139,6 +141,7 @@ export class NotificationService extends BaseService<NotificationEntity> {
     await this.repository.update(
       {
         userId,
+        projectId,
       },
       {
         isDefault: false,
@@ -148,6 +151,7 @@ export class NotificationService extends BaseService<NotificationEntity> {
       {
         id,
         userId,
+        projectId,
       },
       {
         isDefault: true,
@@ -155,8 +159,8 @@ export class NotificationService extends BaseService<NotificationEntity> {
     );
   }
 
-  async getOrCreateDefault(email: string, userId: any) {
-    const defaultConfig = await this.getDefault(userId);
+  async getOrCreateDefault(email: string, userId: any, projectId?: number) {
+    const defaultConfig = await this.getDefault(userId, projectId);
     if (defaultConfig) {
       return defaultConfig;
     }
@@ -169,21 +173,22 @@ export class NotificationService extends BaseService<NotificationEntity> {
       name: '邮件通知',
       setting: JSON.stringify(setting),
       isDefault: true,
+      projectId,
     });
     return this.buildNotificationInstanceConfig(res);
   }
 
-  async send(req: NotificationSendReq, userId?: number) {
+  async send(req: NotificationSendReq, userId?: number, projectId?: number) {
     const logger = req.logger;
     let notifyConfig: NotificationInstanceConfig = null;
     if (req.id && req.id > 0) {
-      notifyConfig = await this.getById(req.id, userId);
+      notifyConfig = await this.getById(req.id, userId, projectId);
       if (!notifyConfig) {
         logger.warn(`未找到通知配置<${req.id}>,请确认是否已被删除`);
       }
     }
     if (!notifyConfig) {
-      notifyConfig = await this.getDefault(userId);
+      notifyConfig = await this.getDefault(userId, projectId);
       if (!notifyConfig) {
         logger.warn(`未找到默认通知配置`);
       }

From cfd5b388f1ad618c9740d3f1a2ed6ab761b7c126 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 13 Feb 2026 22:24:04 +0800
Subject: [PATCH 22/62] chore: project

---
 .../libs/lib-server/src/basic/base-service.ts | 15 +++++
 .../src/components/project-selector/index.vue |  1 +
 .../controller/openapi/v1/cert-controller.ts  |  5 +-
 .../user/monitor/site-info-controller.ts      | 13 ++---
 .../user/pipeline/history-controller.ts       |  2 +-
 .../user/pipeline/pipeline-controller.ts      |  4 +-
 .../src/modules/auto/auto-c-register-cron.ts  |  2 +-
 .../modules/basic/service/email-service.ts    | 10 ++--
 .../mine/service/two-factor-service.ts        |  8 +--
 .../mine/service/user-settings-service.ts     | 10 ++--
 .../monitor/facade/cert-info-facade.ts        | 12 ++--
 .../monitor/service/cert-info-service.ts      | 11 +++-
 .../monitor/service/site-info-service.ts      | 56 ++++++++++---------
 .../monitor/service/site-ip-service.ts        |  2 +-
 .../modules/open/service/open-key-service.ts  |  9 ++-
 .../src/modules/sys/settings/fix.ts           |  2 +-
 16 files changed, 95 insertions(+), 67 deletions(-)

diff --git a/packages/libs/lib-server/src/basic/base-service.ts b/packages/libs/lib-server/src/basic/base-service.ts
index d16733d22..a9a26046b 100644
--- a/packages/libs/lib-server/src/basic/base-service.ts
+++ b/packages/libs/lib-server/src/basic/base-service.ts
@@ -253,4 +253,19 @@ export abstract class BaseService<T> {
   async findOne(options: FindOneOptions<T>) {
     return await this.getRepository().findOne(options);
   }
+
 }
+
+export function checkUserProjectParam(userId: number, projectId: number) {
+  if (projectId != null ){
+    if( userId !==0) {
+      throw new ValidateException('userId projectId 错误');
+    }
+    return true
+  }else{
+    if( userId > 0) {
+      return true
+    }
+     throw new ValidateException('userId不能为空');
+  }
+}
\ No newline at end of file
diff --git a/packages/ui/certd-client/src/components/project-selector/index.vue b/packages/ui/certd-client/src/components/project-selector/index.vue
index dfac42954..7e3ab33f7 100644
--- a/packages/ui/certd-client/src/components/project-selector/index.vue
+++ b/packages/ui/certd-client/src/components/project-selector/index.vue
@@ -29,6 +29,7 @@ onMounted(async () => {
 
 function handleMenuClick({ key }: any) {
   projectStore.changeCurrentProject(key);
+  window.location.reload();
 }
 </script>
 <style lang="less">
diff --git a/packages/ui/certd-server/src/controller/openapi/v1/cert-controller.ts b/packages/ui/certd-server/src/controller/openapi/v1/cert-controller.ts
index 3a3a5402f..6824827ba 100644
--- a/packages/ui/certd-server/src/controller/openapi/v1/cert-controller.ts
+++ b/packages/ui/certd-server/src/controller/openapi/v1/cert-controller.ts
@@ -28,9 +28,11 @@ export class OpenCertController extends BaseOpenController {
   async get(@Body(ALL) bean: CertGetReq, @Query(ALL) query: CertGetReq) {
     const openKey: OpenKey = this.ctx.openKey;
     const userId = openKey.userId;
+    
     if (!userId) {
       throw new CodeException(Constants.res.openKeyError);
     }
+    const projectId = openKey.projectId;
 
     const req = merge({}, bean, query)
 
@@ -39,7 +41,8 @@ export class OpenCertController extends BaseOpenController {
       domains: req.domains,
       certId: req.certId,
       autoApply: req.autoApply??false,
-      format: req.format
+      format: req.format,
+      projectId,
     });
     return this.ok(res);
   }
diff --git a/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts b/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts
index e56caefe2..6cb3540f6 100644
--- a/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts
@@ -158,23 +158,18 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
 
   @Post("/setting/get", { summary: Constants.per.authOnly })
   async get() {
-    const { userId } = await this.getProjectUserIdRead()
-    const setting = await this.service.getSetting(userId)
+    const { userId, projectId } = await this.getProjectUserIdRead()
+    const setting = await this.service.getSetting(userId, projectId)
     return this.ok(setting);
   }
 
   @Post("/setting/save", { summary: Constants.per.authOnly })
   async save(@Body(ALL) bean: any) {
-    const { userId } = await this.getProjectUserIdWrite()
-    if(userId === 0){
-      if(!this.isAdmin()){
-        throw new Error("仅管理员可以修改");
-      }
-    }
+    const { userId, projectId} = await this.getProjectUserIdWrite()
     const setting = new UserSiteMonitorSetting();
     merge(setting, bean);
 
-    await this.service.saveSetting(userId, setting);
+    await this.service.saveSetting(userId, projectId,setting);
     return this.ok({});
   }
 
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
index 1ba2b592d..43b083a35 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
@@ -257,7 +257,7 @@ export class HistoryController extends CrudController<HistoryService> {
         throw new PermissionException();
       }
       // 是否允许管理员查看
-      const setting = await this.userSettingsService.getSetting<UserGrantSetting>(history.userId, UserGrantSetting, false);
+      const setting = await this.userSettingsService.getSetting<UserGrantSetting>(history.userId, null, UserGrantSetting, false);
       if (setting?.allowAdminViewCerts!==true) {
         //不允许管理员查看
         throw new PermissionException("该流水线的用户还未授权管理员下载证书，请先让用户在”设置->授权委托“中打开开关");
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
index 89deb00bb..7d55ab0d1 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
@@ -103,11 +103,12 @@ export class PipelineController extends CrudController<PipelineService> {
 
   @Post('/save', { summary: Constants.per.authOnly })
   async save(@Body(ALL) bean: { addToMonitorEnabled: boolean, addToMonitorDomains: string } & PipelineEntity) {
-     const { userId } = await this.getProjectUserIdWrite()
+     const { userId ,projectId} = await this.getProjectUserIdWrite()
     if (bean.id > 0) {
       await this.checkOwner(this.getService(), bean.id,"write",true);
     } else {
       bean.userId = userId;
+      bean.projectId = projectId;
     }
 
     if (!this.isAdmin()) {
@@ -124,6 +125,7 @@ export class PipelineController extends CrudController<PipelineService> {
         await this.siteInfoService.doImport({
           text: bean.addToMonitorDomains,
           userId: userId,
+          projectId: projectId,
         });
       }
     }
diff --git a/packages/ui/certd-server/src/modules/auto/auto-c-register-cron.ts b/packages/ui/certd-server/src/modules/auto/auto-c-register-cron.ts
index 8f6c45113..0cf7b9cc8 100644
--- a/packages/ui/certd-server/src/modules/auto/auto-c-register-cron.ts
+++ b/packages/ui/certd-server/src/modules/auto/auto-c-register-cron.ts
@@ -84,7 +84,7 @@ export class AutoCRegisterCron {
       if(!setting?.cron){
         continue
       }
-      await this.siteInfoService.registerSiteMonitorJob(item.userId)
+      await this.siteInfoService.registerSiteMonitorJob(item.userId,item.projectId)
     }
 
     if (this.immediateTriggerSiteMonitor) {
diff --git a/packages/ui/certd-server/src/modules/basic/service/email-service.ts b/packages/ui/certd-server/src/modules/basic/service/email-service.ts
index a7c2641e9..3b70d600a 100644
--- a/packages/ui/certd-server/src/modules/basic/service/email-service.ts
+++ b/packages/ui/certd-server/src/modules/basic/service/email-service.ts
@@ -135,23 +135,23 @@ export class EmailService implements IEmailService {
   }
 
   async list(userId: any) {
-    const userEmailSetting = await this.settingsService.getSetting<UserEmailSetting>(userId, UserEmailSetting)
+    const userEmailSetting = await this.settingsService.getSetting<UserEmailSetting>(userId,null, UserEmailSetting)
     return userEmailSetting.list;
   }
 
   async delete(userId: any, email: string) {
-    const userEmailSetting = await this.settingsService.getSetting<UserEmailSetting>(userId, UserEmailSetting)
+    const userEmailSetting = await this.settingsService.getSetting<UserEmailSetting>(userId, null, UserEmailSetting)
     userEmailSetting.list = userEmailSetting.list.filter(item => item !== email);
-    await this.settingsService.saveSetting(userId, userEmailSetting)
+    await this.settingsService.saveSetting(userId, null, userEmailSetting)
   }
   async add(userId: any, email: string) {
-    const userEmailSetting = await this.settingsService.getSetting<UserEmailSetting>(userId, UserEmailSetting)
+    const userEmailSetting = await this.settingsService.getSetting<UserEmailSetting>(userId, null, UserEmailSetting)
     //如果已存在
     if (userEmailSetting.list.includes(email)) {
       return
     }
     userEmailSetting.list.unshift(email)
-    await this.settingsService.saveSetting(userId, userEmailSetting)
+    await this.settingsService.saveSetting(userId, null, userEmailSetting)
   }
 
 
diff --git a/packages/ui/certd-server/src/modules/mine/service/two-factor-service.ts b/packages/ui/certd-server/src/modules/mine/service/two-factor-service.ts
index bb15cc42f..134c58da9 100644
--- a/packages/ui/certd-server/src/modules/mine/service/two-factor-service.ts
+++ b/packages/ui/certd-server/src/modules/mine/service/two-factor-service.ts
@@ -23,7 +23,7 @@ export class TwoFactorService {
       const { authenticator  } = await import("otplib");
 
       authenticatorSetting.secret = authenticator.generateSecret()
-      await this.userSettingsService.saveSetting(userId, setting);
+      await this.userSettingsService.saveSetting(userId, null, setting);
     }
 
     const user = await this.userService.info(userId);
@@ -59,7 +59,7 @@ export class TwoFactorService {
     authenticatorSetting.enabled = true;
     authenticatorSetting.verified = true;
 
-    await this.userSettingsService.saveSetting(userId, setting);
+    await this.userSettingsService.saveSetting(userId, null, setting);
   }
 
   async offAuthenticator(userId:number) {
@@ -71,11 +71,11 @@ export class TwoFactorService {
     setting.authenticator.enabled = false;
     setting.authenticator.verified = false;
     setting.authenticator.secret = '';
-    await this.userSettingsService.saveSetting(userId, setting);
+    await this.userSettingsService.saveSetting(userId, null, setting);
   }
 
   async getSetting(userId:number) {
-    return await this.userSettingsService.getSetting<UserTwoFactorSetting>(userId, UserTwoFactorSetting);
+    return await this.userSettingsService.getSetting<UserTwoFactorSetting>(userId, null, UserTwoFactorSetting);
 
   }
 
diff --git a/packages/ui/certd-server/src/modules/mine/service/user-settings-service.ts b/packages/ui/certd-server/src/modules/mine/service/user-settings-service.ts
index 641c23ded..d5cfdd178 100644
--- a/packages/ui/certd-server/src/modules/mine/service/user-settings-service.ts
+++ b/packages/ui/certd-server/src/modules/mine/service/user-settings-service.ts
@@ -38,10 +38,10 @@ export class UserSettingsService extends BaseService<UserSettingsEntity> {
   }
 
   async getByKey(key: string, userId: number, projectId: number): Promise<UserSettingsEntity | null> {
-    if(!userId){
+    if(userId == null){
       throw new Error('userId is required');
     }
-    if (!key || !userId) {
+    if (!key) {
       return null;
     }
     return await this.repository.findOne({
@@ -54,7 +54,7 @@ export class UserSettingsService extends BaseService<UserSettingsEntity> {
   }
 
   async getSettingByKey(key: string, userId: number, projectId: number): Promise<any | null> {
-    if(!userId){
+    if(userId == null){
       throw new Error('userId is required');
     }
     const entity = await this.getByKey(key, userId, projectId);
@@ -83,7 +83,7 @@ export class UserSettingsService extends BaseService<UserSettingsEntity> {
 
 
   async getSetting<T>( userId: number, projectId: number,type: any, cache:boolean = false): Promise<T> {
-    if(!userId){
+    if(userId==null){
       throw new Error('userId is required');
     }
     const key = type.__key__;
@@ -110,7 +110,7 @@ export class UserSettingsService extends BaseService<UserSettingsEntity> {
   }
 
   async saveSetting<T extends BaseSettings>(userId:number, projectId: number,bean: T) {
-    if(!userId){
+    if(userId == null){
       throw new Error('userId is required');
     }
     const old = await this.getSetting(userId, projectId,bean.constructor)
diff --git a/packages/ui/certd-server/src/modules/monitor/facade/cert-info-facade.ts b/packages/ui/certd-server/src/modules/monitor/facade/cert-info-facade.ts
index 0c3d8d154..bea4d24df 100644
--- a/packages/ui/certd-server/src/modules/monitor/facade/cert-info-facade.ts
+++ b/packages/ui/certd-server/src/modules/monitor/facade/cert-info-facade.ts
@@ -27,10 +27,10 @@ export class CertInfoFacade  {
   @Inject()
   userSettingsService : UserSettingsService
 
-  async getCertInfo(req: { domains?: string; certId?: number; userId: number,autoApply?:boolean,format?:string }) {
-    const { domains, certId, userId } = req;
+  async getCertInfo(req: { domains?: string; certId?: number; userId: number, projectId:number, autoApply?:boolean,format?:string }) {
+    const { domains, certId, userId,projectId } = req;
     if (certId) {
-      return await this.certInfoService.getCertInfoById({ id: certId, userId });
+      return await this.certInfoService.getCertInfoById({ id: certId, userId, projectId });
     }
     if (!domains) {
       throw new CodeException({
@@ -69,7 +69,7 @@ export class CertInfoFacade  {
       }
     }
 
-    return await this.certInfoService.getCertInfoById({ id: matched.id, userId: userId,format:req.format });
+    return await this.certInfoService.getCertInfoById({ id: matched.id, userId: userId,projectId,format:req.format });
 
 
 
@@ -124,7 +124,7 @@ export class CertInfoFacade  {
       }
     }
 
-    const userEmailSetting = await this.userSettingsService.getSetting<UserEmailSetting>(req.userId,UserEmailSetting)
+    const userEmailSetting = await this.userSettingsService.getSetting<UserEmailSetting>(req.userId,null, UserEmailSetting)
     if(!userEmailSetting.list){
       throw new CodeException(Constants.res.openEmailNotFound)
     }
@@ -134,7 +134,7 @@ export class CertInfoFacade  {
       domains: req.domains,
       email,
       userId: req.userId,
-      from:"OpenAPI"
+      from: "OpenAPI"
     })
 
   }
diff --git a/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts b/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts
index dc38308a0..ff2ef2b65 100644
--- a/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts
+++ b/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts
@@ -11,6 +11,7 @@ export type UploadCertReq = {
   certReader: CertReader;
   fromType?: string;
   userId?: number;
+  projectId?: number;
   file?:any
 };
 
@@ -113,9 +114,12 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
     });
   }
 
-  async getCertInfoById(req: { id: number; userId: number,format?:string }) {
+  async getCertInfoById(req: { id: number; userId: number,projectId:number,format?:string }) {
     const entity = await this.info(req.id);
-    if (!entity || entity.userId !== req.userId) {
+    if (!entity || entity.userId !== req.userId ) {
+      throw new CodeException(Constants.res.openCertNotFound);
+    }
+    if (req.projectId && entity.projectId !== req.projectId) {
       throw new CodeException(Constants.res.openCertNotFound);
     }
 
@@ -167,7 +171,8 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
     bean.effectiveTime = certReader.effective;
     bean.expiresTime = certReader.expires;
     bean.certProvider = certReader.detail.issuer.commonName;
-    bean.userId = userId
+    bean.userId = userId;
+    bean.projectId = req.projectId;
     if(req.file){
       bean.certFile = req.file
     }
diff --git a/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts b/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
index 580e2d8ef..3b0808c8d 100644
--- a/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
+++ b/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
@@ -110,7 +110,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
       throw new Error("站点域名不能为空");
     }
 
-    const setting = await this.userSettingsService.getSetting<UserSiteMonitorSetting>(site.userId, UserSiteMonitorSetting);
+    const setting = await this.userSettingsService.getSetting<UserSiteMonitorSetting>(site.userId,site.projectId, UserSiteMonitorSetting);
     const dnsServer = setting.dnsServer
     let customDns = null
     if (dnsServer && dnsServer.length > 0) {
@@ -162,7 +162,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
       }
       await this.update(updateData);
 
-      const setting = await this.userSettingsService.getSetting<UserSiteMonitorSetting>(site.userId, UserSiteMonitorSetting)
+      const setting = await this.userSettingsService.getSetting<UserSiteMonitorSetting>(site.userId,site.projectId, UserSiteMonitorSetting)
       //检查ip
       await this.checkAllIp(site,retryTimes,setting);
 
@@ -356,16 +356,17 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
 
   async checkList(sites: SiteInfoEntity[],isCommon: boolean) {
     const cache = {}
-    const getFromCache = async (userId: number) =>{
-      if (cache[userId]) {
-        return cache[userId];
+    const getFromCache = async (userId: number,projectId?: number) =>{
+      const key = `${userId}-${projectId??""}`
+      if (cache[key]) {
+        return cache[key];
       }
-      const setting =  await this.userSettingsService.getSetting<UserSiteMonitorSetting>(userId, UserSiteMonitorSetting)
-      cache[userId] = setting
+      const setting =  await this.userSettingsService.getSetting<UserSiteMonitorSetting>(userId,projectId, UserSiteMonitorSetting)
+      cache[key] = setting
       return setting;
     }
     for (const site of sites) {
-      const setting = await getFromCache(site.userId)
+      const setting = await getFromCache(site.userId,site.projectId)
       if (isCommon) {
         //公共的检查，排除有设置cron的用户
         if  (setting?.cron) {
@@ -381,17 +382,17 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
     }
   }
 
-  async getSetting(userId: number) {
-    return await this.userSettingsService.getSetting<UserSiteMonitorSetting>(userId, UserSiteMonitorSetting);
+  async getSetting(userId: number,projectId?: number) {
+    return await this.userSettingsService.getSetting<UserSiteMonitorSetting>(userId,projectId, UserSiteMonitorSetting);
   }
 
-  async saveSetting(userId: number, bean: UserSiteMonitorSetting) {
-    await this.userSettingsService.saveSetting(userId, bean);
+  async saveSetting(userId: number,projectId: number, bean: UserSiteMonitorSetting) {
+    await this.userSettingsService.saveSetting(userId,projectId, bean);
     if(bean.cron){
       //注册job
-      await this.registerSiteMonitorJob(userId);
+      await this.registerSiteMonitorJob(userId,projectId);
     }else{
-      this.clearSiteMonitorJob(userId);
+      this.clearSiteMonitorJob(userId,projectId);
     }
   }
 
@@ -476,13 +477,13 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
     await batchAdd(list);
   }
 
-  clearSiteMonitorJob(userId: number) {
-    this.cron.remove(`siteMonitor-${userId}`);
+  clearSiteMonitorJob(userId: number,projectId?: number) {
+    this.cron.remove(`siteMonitor-${userId}-${projectId||""}`);
   }
 
-  async registerSiteMonitorJob(userId?: number) {
+  async registerSiteMonitorJob(userId?: number,projectId?: number) {
 
-    if(!userId){
+    if(userId == null){
       //注册公共job
       logger.info(`注册站点证书检查定时任务`)
       this.cron.register({
@@ -494,27 +495,30 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
       });
       logger.info(`注册站点证书检查定时任务完成`)
     }else{
-      const setting = await this.userSettingsService.getSetting<UserSiteMonitorSetting>(userId, UserSiteMonitorSetting);
+      const setting = await this.userSettingsService.getSetting<UserSiteMonitorSetting>(userId,projectId, UserSiteMonitorSetting);
       if (!setting.cron) {
         return;
       }
-      //注册个人的
+      //注册个人的 或项目的
       this.cron.register({
-        name: `siteMonitor-${userId}`,
+        name: `siteMonitor-${userId}-${projectId||""}`,
         cron: setting.cron,
-        job: () => this.triggerJobOnce(userId),
+        job: () => this.triggerJobOnce(userId,projectId),
       });
     }
 
   }
 
-  async triggerJobOnce(userId?:number) {
-    logger.info(`站点证书检查开始执行[${userId??'所有用户'}]`);
+  async triggerJobOnce(userId?:number,projectId?:number) {
+    logger.info(`站点证书检查开始执行[${userId??'所有用户'}-${projectId??'所有项目'}]`);
     const query:any = { disabled: false };
     if(userId){
       query.userId = userId;
+      if(projectId){
+        query.projectId = projectId;
+      }
       //判断是否已关闭
-      const setting = await this.userSettingsService.getSetting<UserSiteMonitorSetting>(userId, UserSiteMonitorSetting);
+      const setting = await this.userSettingsService.getSetting<UserSiteMonitorSetting>(userId,projectId, UserSiteMonitorSetting);
       if (!setting.cron) {
         return;
       }
@@ -536,7 +540,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
       await this.checkList(records,isCommon);
     }
 
-    logger.info(`站点证书检查完成[${userId??'所有用户'}]`);
+    logger.info(`站点证书检查完成[${userId??'所有用户'}-${projectId??'所有项目'}]`);
   }
 
   async batchDelete(ids: number[], userId: number,projectId?:number): Promise<void> {
diff --git a/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts b/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts
index 203f7da27..1045ac1ae 100644
--- a/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts
+++ b/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts
@@ -67,7 +67,7 @@ export class SiteIpService extends BaseService<SiteIpEntity> {
 
     const domain = entity.domain;
 
-    const setting = await this.userSettingsService.getSetting<UserSiteMonitorSetting>(entity.userId, UserSiteMonitorSetting);
+    const setting = await this.userSettingsService.getSetting<UserSiteMonitorSetting>(entity.userId,entity.projectId, UserSiteMonitorSetting);
 
     const dnsServer = setting.dnsServer
     let resolver = dns
diff --git a/packages/ui/certd-server/src/modules/open/service/open-key-service.ts b/packages/ui/certd-server/src/modules/open/service/open-key-service.ts
index dd80a262f..778be22aa 100644
--- a/packages/ui/certd-server/src/modules/open/service/open-key-service.ts
+++ b/packages/ui/certd-server/src/modules/open/service/open-key-service.ts
@@ -9,6 +9,7 @@ import dayjs from 'dayjs';
 
 export type OpenKey = {
   userId: number;
+  projectId?: number;
   keyId: string;
   keySecret: string;
   encrypt: boolean;
@@ -30,15 +31,16 @@ export class OpenKeyService extends BaseService<OpenKeyEntity> {
   }
 
   async add(bean: OpenKeyEntity) {
-    return await this.generate(bean.userId, bean.scope);
+    return await this.generate(bean.userId,bean.projectId, bean.scope);
   }
 
-  async generate(userId: number, scope: string) {
+  async generate(userId: number, projectId?: number, scope: string = 'open') {
     const keyId = utils.id.simpleNanoId(18) + '_key';
     const secretKey = crypto.randomBytes(32);
     const keySecret = Buffer.from(secretKey).toString('hex');
     const entity = new OpenKeyEntity();
     entity.userId = userId;
+    entity.projectId = projectId;
     entity.keyId = keyId;
     entity.keySecret = keySecret;
     entity.scope = scope ?? 'open';
@@ -80,7 +82,7 @@ export class OpenKeyService extends BaseService<OpenKeyEntity> {
       throw new CodeException(Constants.res.openKeySignError);
     }
 
-    if (!entity.userId) {
+    if (entity.userId==null) {
       throw new CodeException(Constants.res.openKeyError);
     }
 
@@ -89,6 +91,7 @@ export class OpenKeyService extends BaseService<OpenKeyEntity> {
       keyId: entity.keyId,
       keySecret: entity.keySecret,
       encrypt: encrypt,
+      projectId: entity.projectId,
       scope: entity.scope,
     };
   }
diff --git a/packages/ui/certd-server/src/modules/sys/settings/fix.ts b/packages/ui/certd-server/src/modules/sys/settings/fix.ts
index 3d703a6ff..37886464e 100644
--- a/packages/ui/certd-server/src/modules/sys/settings/fix.ts
+++ b/packages/ui/certd-server/src/modules/sys/settings/fix.ts
@@ -6,7 +6,7 @@ export async function getEmailSettings(sysSettingService: SysSettingsService, us
   let conf = await sysSettingService.getSetting<SysEmailConf>(SysEmailConf);
   if (!conf.host || conf.usePlus == null) {
     //到userSetting里面去找
-    const adminEmailSetting = await userSettingsService.getByKey('email', 1);
+    const adminEmailSetting = await userSettingsService.getByKey('email', 1,null);
     if (adminEmailSetting) {
       const setting = JSON.parse(adminEmailSetting.setting);
       conf = _.merge(conf, setting);

From 83d81b64b3adb375366039e07c87d1ad79121c13 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 13 Feb 2026 23:51:19 +0800
Subject: [PATCH 23/62] =?UTF-8?q?perf:=20=E7=AB=99=E7=82=B9=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E6=94=AF=E6=8C=81=E6=8C=87=E5=AE=9Aip=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/monitor/service/site-info-service.ts     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts b/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
index 3b0808c8d..e6840f121 100644
--- a/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
+++ b/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
@@ -48,7 +48,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
   }
 
   async add(data: SiteInfoEntity) {
-    if (!data.userId) {
+    if (data.userId == null) {
       throw new Error("userId is required");
     }
 
@@ -91,7 +91,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
   }
 
   async getUserMonitorCount(userId: number) {
-    if (!userId) {
+    if (userId==null) {
       throw new Error("userId is required");
     }
     return await this.repository.count({
@@ -127,7 +127,8 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
         host: site.domain,
         port: site.httpsPort,
         retryTimes,
-        customDns
+        customDns,
+        ipAddress: site.ipAddress,
       });
 
       const certi: PeerCertificate = res.certificate;
@@ -345,7 +346,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
   }
 
   async checkAllByUsers(userId: any,projectId?: number) {
-    if (!userId) {
+    if (userId==null) {
       throw new Error("userId is required");
     }
     const sites = await this.repository.find({

From 956d68695cf56456f8b99fb918609d73fe7e9765 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 13 Feb 2026 23:51:27 +0800
Subject: [PATCH 24/62] chore: project

---
 .../src/user/access/service/access-service.ts      |  2 +-
 .../src/user/addon/service/addon-service.ts        |  4 ++--
 .../certd-client/src/locales/langs/zh-CN/certd.ts  |  2 ++
 .../src/views/certd/monitor/site/crud.tsx          | 14 ++++++++++++++
 .../db/migration/v10038__admin_mode.sql            |  6 ++++++
 .../src/controller/basic/login/oauth-controller.ts |  4 ++--
 .../src/controller/openapi/v1/cert-controller.ts   |  2 +-
 .../src/modules/basic/service/captcha-service.ts   |  2 +-
 .../src/modules/basic/service/email-service.ts     |  4 ++--
 .../src/modules/cert/service/domain-service.ts     |  6 ++++--
 .../modules/cname/service/cname-record-service.ts  |  2 +-
 .../src/modules/monitor/entity/site-info.ts        |  3 +++
 .../src/modules/monitor/facade/cert-info-facade.ts |  9 +++++----
 .../modules/monitor/service/cert-info-service.ts   |  7 ++++---
 .../pipeline/service/addon-getter-service.ts       | 13 +++++++------
 .../service/getter/domain-verifier-getter.ts       |  6 ++++--
 .../pipeline/service/getter/sub-domain-getter.ts   |  6 ++++--
 .../pipeline/service/getter/task-service-getter.ts |  4 ++--
 .../pipeline/service/notification-service.ts       |  4 ++--
 .../modules/pipeline/service/pipeline-service.ts   |  3 ++-
 .../modules/pipeline/service/sub-domain-service.ts | 10 ++++++----
 21 files changed, 75 insertions(+), 38 deletions(-)

diff --git a/packages/libs/lib-server/src/user/access/service/access-service.ts b/packages/libs/lib-server/src/user/access/service/access-service.ts
index 950e5f243..f3e1ee29d 100644
--- a/packages/libs/lib-server/src/user/access/service/access-service.ts
+++ b/packages/libs/lib-server/src/user/access/service/access-service.ts
@@ -196,7 +196,7 @@ export class AccessService extends BaseService<AccessEntity> {
     if (ids.length === 0) {
       return [];
     }
-    if (!userId) {
+    if (userId==null) {
       return [];
     }
     return await this.repository.find({
diff --git a/packages/libs/lib-server/src/user/addon/service/addon-service.ts b/packages/libs/lib-server/src/user/addon/service/addon-service.ts
index c152d2fad..38c9636c0 100644
--- a/packages/libs/lib-server/src/user/addon/service/addon-service.ts
+++ b/packages/libs/lib-server/src/user/addon/service/addon-service.ts
@@ -89,7 +89,7 @@ export class AddonService extends BaseService<AddonEntity> {
     if (ids.length === 0) {
       return [];
     }
-    if (!userId) {
+    if (userId==null) {
       return [];
     }
     return await this.repository.find({
@@ -145,7 +145,7 @@ export class AddonService extends BaseService<AddonEntity> {
     if (!id) {
       throw new ValidateException("id不能为空");
     }
-    if (!userId) {
+    if (userId==null) {
       throw new ValidateException("userId不能为空");
     }
     await this.repository.update(
diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
index 1b6b2c765..ff7119119 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -311,6 +311,8 @@ export default {
     days: "天",
     lastCheckTime: "上次检查时间",
     disabled: "禁用启用",
+    ipAddress: "IP地址",
+    ipAddressHelper: "填写则固定检查此IP，不从DNS获取域名的IP地址",
     ipCheck: "开启IP检查",
     ipCheckHelper: "开启后，会检查IP（或源站）上的证书有效期",
     ipSyncAuto: "自动同步IP",
diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
index e5c8ebf76..e307efd4c 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
@@ -556,6 +556,20 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             },
           },
         },
+        ipAddress: {
+          title: t("certd.monitor.ipAddress"),
+          search: {
+            show: false,
+          },
+          type: "text",
+          form: {
+            helper: t("certd.monitor.ipAddressHelper"),
+          },
+          column: {
+            width: 150,
+            sorter: true,
+          },
+        },
         groupId: {
           title: t("certd.fields.group"),
           type: "dict-select",
diff --git a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
index 19e42fc9d..8f81bdb16 100644
--- a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
+++ b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
@@ -66,6 +66,9 @@ CREATE INDEX "index_domain_project_id" ON "cd_domain" ("project_id");
 ALTER TABLE user_settings ADD COLUMN  project_id integer;
 CREATE INDEX "index_user_settings_project_id" ON "user_settings" ("project_id");
 
+ALTER TABLE cd_group ADD COLUMN  project_id integer;
+CREATE INDEX "index_group_project_id" ON "cd_group" ("project_id");
+
 
 
 
@@ -104,3 +107,6 @@ CREATE INDEX "index_audit_log_user_id" ON "cd_audit_log" ("user_id");
 CREATE INDEX "index_audit_log_project_id" ON "cd_audit_log" ("project_id");
 
 
+
+ALTER TABLE cd_site_info ADD COLUMN ip_address varchar(128);
+
diff --git a/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts b/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts
index f4de35338..8e89fdeb3 100644
--- a/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts
+++ b/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts
@@ -46,7 +46,7 @@ export class ConnectController extends BaseController {
       throw new Error(`未配置该OAuth类型:${type}`);
     }
 
-    const addon = await this.addonGetterService.getAddonById(setting.addonId, true, 0);
+    const addon = await this.addonGetterService.getAddonById(setting.addonId, true, 0,null);
     if (!addon) {
       throw new Error("初始化OAuth插件失败");
     }
@@ -251,7 +251,7 @@ export class ConnectController extends BaseController {
           provider.addonId = conf.addonId;
           provider.addonTitle = addonEntity.name;
 
-          const addon = await this.addonGetterService.getAddonById(conf.addonId,true,0);
+          const addon = await this.addonGetterService.getAddonById(conf.addonId,true,0,null);
           const {logoutUrl} = await addon.buildLogoutUrl();
           if (logoutUrl){
             provider.logoutUrl = logoutUrl;
diff --git a/packages/ui/certd-server/src/controller/openapi/v1/cert-controller.ts b/packages/ui/certd-server/src/controller/openapi/v1/cert-controller.ts
index 6824827ba..2136e727a 100644
--- a/packages/ui/certd-server/src/controller/openapi/v1/cert-controller.ts
+++ b/packages/ui/certd-server/src/controller/openapi/v1/cert-controller.ts
@@ -29,7 +29,7 @@ export class OpenCertController extends BaseOpenController {
     const openKey: OpenKey = this.ctx.openKey;
     const userId = openKey.userId;
     
-    if (!userId) {
+    if (userId==null) {
       throw new CodeException(Constants.res.openKeyError);
     }
     const projectId = openKey.projectId;
diff --git a/packages/ui/certd-server/src/modules/basic/service/captcha-service.ts b/packages/ui/certd-server/src/modules/basic/service/captcha-service.ts
index 76456e117..930980838 100644
--- a/packages/ui/certd-server/src/modules/basic/service/captcha-service.ts
+++ b/packages/ui/certd-server/src/modules/basic/service/captcha-service.ts
@@ -18,7 +18,7 @@ export class CaptchaService {
       const settings = await this.sysSettingsService.getPublicSettings();
       captchaAddonId = settings.captchaAddonId ?? 0;
     }
-    const addon: ICaptchaAddon = await this.addonGetterService.getAddonById(captchaAddonId, true, 0, {
+    const addon: ICaptchaAddon = await this.addonGetterService.getAddonById(captchaAddonId, true, 0,null, {
       type: "captcha",
       name: "image"
     });
diff --git a/packages/ui/certd-server/src/modules/basic/service/email-service.ts b/packages/ui/certd-server/src/modules/basic/service/email-service.ts
index 3b70d600a..84c959592 100644
--- a/packages/ui/certd-server/src/modules/basic/service/email-service.ts
+++ b/packages/ui/certd-server/src/modules/basic/service/email-service.ts
@@ -160,7 +160,7 @@ export class EmailService implements IEmailService {
     const emailConf = await this.sysSettingsService.getSetting<SysEmailConf>(SysEmailConf);
     const template = emailConf?.templates?.[req.type]
     if (isPlus() && template &&  template.addonId) {
-      const addon: ITemplateProvider<EmailContent> = await this.addonGetterService.getAddonById(template.addonId, true, 0)
+      const addon: ITemplateProvider<EmailContent> = await this.addonGetterService.getAddonById(template.addonId, true, 0,null)
       if (addon) {
         content = await addon.buildContent({ data: req.data })
       }
@@ -168,7 +168,7 @@ export class EmailService implements IEmailService {
     if (isPlus() && !content ) {
       //看看有没有通用模版
       if (emailConf?.templates?.common && emailConf?.templates?.common.addonId) {
-        const addon: ITemplateProvider<EmailContent> = await this.addonGetterService.getAddonById(emailConf.templates.common.addonId, true, 0)
+        const addon: ITemplateProvider<EmailContent> = await this.addonGetterService.getAddonById(emailConf.templates.common.addonId, true, 0,null)
         if (addon) {
           content = await addon.buildContent({ data: req.data })
         }
diff --git a/packages/ui/certd-server/src/modules/cert/service/domain-service.ts b/packages/ui/certd-server/src/modules/cert/service/domain-service.ts
index c7b41b1c9..b8cf6e4a1 100644
--- a/packages/ui/certd-server/src/modules/cert/service/domain-service.ts
+++ b/packages/ui/certd-server/src/modules/cert/service/domain-service.ts
@@ -109,10 +109,10 @@ export class DomainService extends BaseService<DomainEntity> {
    * @param userId
    * @param domains //去除* 且去重之后的域名列表
    */
-  async getDomainVerifiers(userId: number, domains: string[]): Promise<DomainVerifiers> {
+  async getDomainVerifiers(userId: number, projectId: number, domains: string[]): Promise<DomainVerifiers> {
 
     const mainDomainMap: Record<string, string> = {}
-    const taskService = this.taskServiceBuilder.create({ userId: userId });
+    const taskService = this.taskServiceBuilder.create({ userId: userId, projectId: projectId });
     const subDomainGetter = await taskService.getSubDomainsGetter();
     const domainParser = new DomainParser(subDomainGetter)
 
@@ -133,6 +133,7 @@ export class DomainService extends BaseService<DomainEntity> {
       where: {
         domain: In(allDomains),
         userId,
+        projectId,
         disabled: false,
       }
     })
@@ -153,6 +154,7 @@ export class DomainService extends BaseService<DomainEntity> {
       where: {
         domain: In(allDomains),
         userId,
+        projectId,
         status: "valid",
       }
     })
diff --git a/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts b/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts
index cb1764ce2..8207ee687 100644
--- a/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts
+++ b/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts
@@ -72,7 +72,7 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
     if (!param.domain) {
       throw new ValidateException("域名不能为空");
     }
-    if (!param.userId) {
+    if (param.userId == null) {
       throw new ValidateException("userId不能为空");
     }
     if (param.domain.startsWith("*.")) {
diff --git a/packages/ui/certd-server/src/modules/monitor/entity/site-info.ts b/packages/ui/certd-server/src/modules/monitor/entity/site-info.ts
index 4535f49b3..80aae8a10 100644
--- a/packages/ui/certd-server/src/modules/monitor/entity/site-info.ts
+++ b/packages/ui/certd-server/src/modules/monitor/entity/site-info.ts
@@ -71,6 +71,9 @@ export class SiteInfoEntity {
   @Column({ name: 'group_id', comment: '分组id' })
   groupId: number;
 
+  @Column({ name: 'ip_address', comment: 'IP地址', length: 128 })
+  ipAddress: string;
+
   @Column({ name: 'project_id', comment: '项目id' })
   projectId: number;
 
diff --git a/packages/ui/certd-server/src/modules/monitor/facade/cert-info-facade.ts b/packages/ui/certd-server/src/modules/monitor/facade/cert-info-facade.ts
index bea4d24df..d0d63eafb 100644
--- a/packages/ui/certd-server/src/modules/monitor/facade/cert-info-facade.ts
+++ b/packages/ui/certd-server/src/modules/monitor/facade/cert-info-facade.ts
@@ -40,12 +40,12 @@ export class CertInfoFacade  {
     }
     const domainArr = domains.split(',');
 
-    const matchedList = await this.certInfoService.getMatchCertList({domains:domainArr,userId})
+    const matchedList = await this.certInfoService.getMatchCertList({domains:domainArr,userId,projectId})
 
     if (matchedList.length === 0 ) {
       if(req.autoApply === true){
         //自动申请，先创建自动申请流水线
-        const pipeline:PipelineEntity = await this.createAutoPipeline({domains:domainArr,userId})
+        const pipeline:PipelineEntity = await this.createAutoPipeline({domains:domainArr,userId,projectId})
         await this.triggerApplyPipeline({pipelineId:pipeline.id})
       }else{
         throw new CodeException({
@@ -103,9 +103,9 @@ export class CertInfoFacade  {
     return matched;
   }
 
-  async createAutoPipeline(req:{domains:string[],userId:number}){
+  async createAutoPipeline(req:{domains:string[],userId:number,projectId:number}){
 
-    const verifierGetter = new DomainVerifierGetter(req.userId, this.domainService)
+    const verifierGetter = new DomainVerifierGetter(req.userId, req.projectId, this.domainService)
 
     const allDomains = []
     for (const item of req.domains) {
@@ -133,6 +133,7 @@ export class CertInfoFacade  {
     return await this.pipelineService.createAutoPipeline({
       domains: req.domains,
       email,
+      projectId: req.projectId,
       userId: req.userId,
       from: "OpenAPI"
     })
diff --git a/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts b/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts
index ff2ef2b65..86b51fc83 100644
--- a/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts
+++ b/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts
@@ -32,7 +32,7 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
   }
 
   async getUserDomainCount(userId: number) {
-    if (!userId) {
+    if (userId==null) {
       throw new Error('userId is required');
     }
     return await this.repository.sum('domainCount', {
@@ -84,8 +84,8 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
     });
   }
 
-  async getMatchCertList(params: { domains: string[]; userId: number }) {
-    const { domains, userId } = params;
+  async getMatchCertList(params: { domains: string[]; userId: number,projectId?:number }) {
+    const { domains, userId,projectId } = params;
     if (!domains) {
       throw new CodeException({
         ...Constants.res.openCertNotFound,
@@ -102,6 +102,7 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
       },
       where: {
         userId,
+        projectId,
       },
       order: {
         id: 'DESC',
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/addon-getter-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/addon-getter-service.ts
index f31d6fc0f..ba6048aa6 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/addon-getter-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/addon-getter-service.ts
@@ -16,9 +16,10 @@ export class AddonGetterService  {
   addonService: AddonService;
 
 
-  async getAddonById(id: any, checkUserId: boolean, userId?: number, defaultAddon?:{type:string,name:string} ): Promise<any> {
+  async getAddonById(id: any, checkUserId: boolean, userId?: number, projectId?: number, defaultAddon?:{type:string,name:string} ): Promise<any> {
     const serviceGetter = this.taskServiceBuilder.create({
-      userId
+      userId,
+      projectId,
     });
     const ctx = {
       http,
@@ -58,13 +59,13 @@ export class AddonGetterService  {
     return await newAddon(entity.addonType, entity.type, input, ctx);
   }
 
-  async getById(id: any, userId: number): Promise<any> {
-    return await this.getAddonById(id, true, userId);
+  async getById(id: any, userId: number, projectId?: number): Promise<any> {
+    return await this.getAddonById(id, true, userId, projectId);
   }
 
 
-  async getBlank(addonType:string,subType:string){
-    return await this.getAddonById(null,false,0,{
+  async getBlank(addonType:string,subType:string,projectId?: number){
+    return await this.getAddonById(null,false,0,projectId,{
       type: addonType, name:subType
     })
   }
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/getter/domain-verifier-getter.ts b/packages/ui/certd-server/src/modules/pipeline/service/getter/domain-verifier-getter.ts
index 36744759d..251f8003e 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/getter/domain-verifier-getter.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/getter/domain-verifier-getter.ts
@@ -3,15 +3,17 @@ import {DomainService} from "../../../cert/service/domain-service.js";
 
 export class DomainVerifierGetter implements IDomainVerifierGetter {
   private userId: number;
+  private projectId: number;
   private domainService: DomainService;
 
-  constructor(userId: number, domainService: DomainService) {
+  constructor(userId: number, projectId: number, domainService: DomainService) {
     this.userId = userId;
+    this.projectId = projectId;
     this.domainService = domainService;
   }
 
   async getVerifiers(domains: string[]): Promise<DomainVerifiers>{
-    return await this.domainService.getDomainVerifiers(this.userId,domains);
+    return await this.domainService.getDomainVerifiers(this.userId,this.projectId,domains);
   }
 
 }
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/getter/sub-domain-getter.ts b/packages/ui/certd-server/src/modules/pipeline/service/getter/sub-domain-getter.ts
index a95a310b4..399a23a9d 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/getter/sub-domain-getter.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/getter/sub-domain-getter.ts
@@ -4,17 +4,19 @@ import { DomainService } from "../../../cert/service/domain-service.js";
 
 export class SubDomainsGetter implements ISubDomainsGetter {
   userId: number;
+  projectId: number;
   subDomainService: SubDomainService;
   domainService: DomainService;
 
-  constructor(userId: number, subDomainService: SubDomainService, domainService: DomainService) {
+  constructor(userId: number, projectId: number, subDomainService: SubDomainService, domainService: DomainService) {
     this.userId = userId;
+    this.projectId = projectId;
     this.subDomainService = subDomainService;
     this.domainService = domainService;
   }
 
   async getSubDomains() {
-    return await this.subDomainService.getListByUserId(this.userId)
+    return await this.subDomainService.getListByUserId(this.userId, this.projectId)
   }
 
   async hasSubDomain(fullDomain: string) {
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts b/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts
index b99b6bd88..e30a20511 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts
@@ -48,7 +48,7 @@ export class TaskServiceGetter implements IServiceGetter{
   async getSubDomainsGetter(): Promise<SubDomainsGetter> {
     const subDomainsService:SubDomainService = await  this.appCtx.getAsync("subDomainService")
     const domainService:DomainService = await  this.appCtx.getAsync("domainService")
-    return new SubDomainsGetter(this.userId, subDomainsService,domainService)
+    return new SubDomainsGetter(this.userId,this.projectId, subDomainsService,domainService)
   }
 
   async getAccessService(): Promise<AccessGetter> {
@@ -69,7 +69,7 @@ export class TaskServiceGetter implements IServiceGetter{
 
   async getDomainVerifierGetter(): Promise<DomainVerifierGetter> {
     const domainService:DomainService = await  this.appCtx.getAsync("domainService")
-    return new DomainVerifierGetter(this.userId, domainService);
+    return new DomainVerifierGetter(this.userId, this.projectId, domainService);
   }
 }
 @Provide()
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts
index 14ddd287d..a6504720f 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts
@@ -88,7 +88,7 @@ export class NotificationService extends BaseService<NotificationEntity> {
     if (!id) {
       throw new ValidateException('id不能为空');
     }
-    if (!userId) {
+    if (userId==null) {
       throw new ValidateException('userId不能为空');
     }
     const res = await this.repository.findOne({
@@ -135,7 +135,7 @@ export class NotificationService extends BaseService<NotificationEntity> {
     if (!id) {
       throw new ValidateException('id不能为空');
     }
-    if (!userId) {
+    if (userId==null) {
       throw new ValidateException('userId不能为空');
     }
     await this.repository.update(
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
index 3d8f9b2e4..b6dd4a211 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
@@ -1082,7 +1082,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
     }
   }
 
-  async createAutoPipeline(req: { domains: string[]; email: string; userId: number, from: string }) {
+  async createAutoPipeline(req: { domains: string[]; email: string; userId: number,projectId?:number, from: string }) {
 
     const randomHour = Math.floor(Math.random() * 6);
     const randomMin = Math.floor(Math.random() * 60);
@@ -1162,6 +1162,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
     bean.type = "cert_auto";
     bean.disabled = false
     bean.keepHistoryCount = 30
+    bean.projectId = req.projectId
     await this.save(bean)
 
 
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/sub-domain-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/sub-domain-service.ts
index 5b37a5841..5f2d6c742 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/sub-domain-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/sub-domain-service.ts
@@ -22,13 +22,14 @@ export class SubDomainService extends BaseService<SubDomainEntity> {
     return this.repository;
   }
 
-  async getListByUserId(userId:number):Promise<string[]>{
-    if (!userId) {
+  async getListByUserId(userId:number, projectId?: number):Promise<string[]>{
+    if (userId==null) {
       return [];
     }
     const list = await this.find({
       where: {
         userId,
+        projectId,
         disabled: false,
       },
     });
@@ -37,17 +38,18 @@ export class SubDomainService extends BaseService<SubDomainEntity> {
   }
 
   async add(bean: SubDomainEntity) {
-    const {domain, userId} = bean;
+    const {domain, userId, projectId} = bean;
     if (!domain) {
       throw new Error('域名不能为空');
     }
-    if (!userId) {
+    if (userId==null) {
       throw new Error('用户ID不能为空');
     }
     const exist = await this.repository.findOne({
       where: {
         domain,
         userId,
+        projectId,
       },
     });
    if (exist) {

From d125eb56b332d0f2e08b5f4a8663ee4dd1f36b25 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sat, 14 Feb 2026 00:08:13 +0800
Subject: [PATCH 25/62] chore: project

---
 .../src/controller/user/pipeline/pipeline-controller.ts     | 4 +++-
 .../src/modules/monitor/service/cert-info-service.ts        | 4 +++-
 .../src/modules/pipeline/service/pipeline-service.ts        | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
index 7d55ab0d1..9a7f3f90d 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts
@@ -105,7 +105,9 @@ export class PipelineController extends CrudController<PipelineService> {
   async save(@Body(ALL) bean: { addToMonitorEnabled: boolean, addToMonitorDomains: string } & PipelineEntity) {
      const { userId ,projectId} = await this.getProjectUserIdWrite()
     if (bean.id > 0) {
-      await this.checkOwner(this.getService(), bean.id,"write",true);
+      const {userId,projectId} = await this.checkOwner(this.getService(), bean.id,"write",true);
+      bean.userId = userId;
+      bean.projectId = projectId;
     } else {
       bean.userId = userId;
       bean.projectId = projectId;
diff --git a/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts b/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts
index 86b51fc83..32f8b31b4 100644
--- a/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts
+++ b/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts
@@ -40,11 +40,12 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
     });
   }
 
-  async updateDomains(pipelineId: number, userId: number, domains: string[],fromType?:string) {
+  async updateDomains(pipelineId: number, userId: number, projectId: number, domains: string[],fromType?:string) {
     const found = await this.repository.findOne({
       where: {
         pipelineId,
         userId,
+        projectId,
       },
     });
     const bean = new CertInfoEntity();
@@ -55,6 +56,7 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
       //create
       bean.pipelineId = pipelineId;
       bean.userId = userId;
+      bean.projectId = projectId;
       bean.fromType = fromType
       if (!domains || domains.length === 0) {
         return;
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
index b6dd4a211..580bb6d7e 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
@@ -256,7 +256,6 @@ export class PipelineService extends BaseService<PipelineEntity> {
     }
 
     await this.doUpdatePipelineJson(bean, pipeline);
-
     //保存域名信息到certInfo表
     let fromType = "pipeline";
     if (bean.type === "cert_upload") {
@@ -264,7 +263,9 @@ export class PipelineService extends BaseService<PipelineEntity> {
     } else if (bean.type === "cert_auto") {
       fromType = "auto";
     }
-    await this.certInfoService.updateDomains(pipeline.id, pipeline.userId || bean.userId, domains, fromType);
+    const userId = pipeline.userId || bean.userId;
+    const projectId = pipeline.projectId ?? bean.projectId ??null;
+    await this.certInfoService.updateDomains(pipeline.id, userId, projectId ,  domains, fromType);
     return {
       ...bean,
       version: pipeline.version,
@@ -293,6 +294,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
     bean.content = JSON.stringify(pipeline);
     await this.addOrUpdate(bean);
     await this.registerTrigger(bean);
+    return bean
   }
 
   private async checkMaxPipelineCount(bean: PipelineEntity, pipeline: Pipeline, domains: string[]) {

From 79be392775a2c91848dd5a66a2618adc4e4b48f6 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Wed, 18 Feb 2026 10:13:24 +0800
Subject: [PATCH 26/62] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=BE=A4=E8=BE=89deviceid=E6=8A=A5=E9=94=99=E7=9A=84b?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/plugins/synology/device-id-getter.vue    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/ui/certd-client/src/components/plugins/synology/device-id-getter.vue b/packages/ui/certd-client/src/components/plugins/synology/device-id-getter.vue
index e34ac6b79..4e6307be5 100644
--- a/packages/ui/certd-client/src/components/plugins/synology/device-id-getter.vue
+++ b/packages/ui/certd-client/src/components/plugins/synology/device-id-getter.vue
@@ -13,6 +13,7 @@
 import { inject, ref, useAttrs } from "vue";
 import { Modal } from "ant-design-vue";
 import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
+import { getInputFromForm } from "../common/utils";
 
 defineOptions({
   name: "DeviceIdGetter",
@@ -34,7 +35,7 @@ const getPluginType: any = inject("get:plugin:type", () => {
 async function loginWithOTPCode(otpCode: string) {
   const { form } = getScope();
   const pluginType = getPluginType();
-
+  const { input, record } = getInputFromForm(form, pluginType);
   return await doRequest({
     type: pluginType,
     typeName: form.type,
@@ -42,7 +43,8 @@ async function loginWithOTPCode(otpCode: string) {
     data: {
       otpCode,
     },
-    input: form,
+    input: input,
+    record,
   });
 }
 

From 1bcadd5f8eb4337e2db342cf68e93b1b7d6654e7 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 19 Feb 2026 00:17:02 +0800
Subject: [PATCH 27/62] chore: 1

---
 packages/ui/certd-client/src/locales/langs/en-US/monitor.ts   | 2 ++
 packages/ui/certd-client/src/locales/langs/zh-CN/monitor.ts   | 2 ++
 .../ui/certd-client/src/views/certd/monitor/site/crud.tsx     | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/ui/certd-client/src/locales/langs/en-US/monitor.ts b/packages/ui/certd-client/src/locales/langs/en-US/monitor.ts
index f9543abf4..505d5f891 100644
--- a/packages/ui/certd-client/src/locales/langs/en-US/monitor.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/monitor.ts
@@ -1,4 +1,6 @@
 export default {
+  ipAddress: "IP地址",
+  ipAddressHelper: "填写则固定检查此IP，不从DNS获取域名的IP地址",
   remark: "Remark",
   title: "Site Certificate Monitoring",
   description: "Check website certificates' expiration at 0:00 daily; reminders sent 10 days before expiration (using default notification channel);",
diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/monitor.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/monitor.ts
index f3dbfcd86..ddd609166 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/monitor.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/monitor.ts
@@ -1,4 +1,6 @@
 export default {
+  ipAddress: "IP地址",
+  ipAddressHelper: "填写则固定检查此IP，不从DNS获取域名的IP地址",
   remark: "备注",
   title: "站点证书监控",
   description: "每天0点，检查网站证书的过期时间，到期前10天时将发出提醒（使用默认通知渠道）;",
diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
index 16d375bb0..2e19d4a64 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
@@ -557,13 +557,13 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
         },
         ipAddress: {
-          title: t("certd.monitor.ipAddress"),
+          title: t("monitor.ipAddress"),
           search: {
             show: false,
           },
           type: "text",
           form: {
-            helper: t("certd.monitor.ipAddressHelper"),
+            helper: t("monitor.ipAddressHelper"),
           },
           column: {
             width: 150,

From 06c69d23be52e1b19f98b962291e6a308add639a Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 19 Feb 2026 00:18:29 +0800
Subject: [PATCH 28/62] chore: 1

---
 packages/ui/certd-client/src/locales/langs/en-US/certd.ts | 2 +-
 packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
index f1265d661..ccf565b95 100644
--- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
@@ -1,4 +1,4 @@
-//注意： @符号是保留字符，需要用{'@'}替换
+//注意： @符号是保留字符，需要用{'@'}替换， AI请务必提醒我修改
 export default {
   app: {
     crud: {
diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
index 0d264db20..a8fcfe758 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -1,4 +1,4 @@
-//注意： @符号是保留字符，需要用{'@'}替换
+//注意： @符号是保留字符，需要用{'@'}替换， AI请务必提醒我修改
 export default {
   app: {
     crud: {

From faf08f6513a0936c4f523fd57930f41c1f8ca1e9 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sat, 21 Feb 2026 23:20:26 +0800
Subject: [PATCH 29/62] chore: project

---
 packages/ui/certd-client/src/api/service.ts   |  2 +-
 .../certd-client/src/layout/layout-basic.vue  |  9 +++---
 .../certd-client/src/store/project/index.ts   | 30 +++++++++++++++++++
 .../ui/certd-client/src/style/common.less     |  1 +
 packages/ui/certd-client/src/style/dark.less  | 14 ++++++---
 packages/ui/certd-client/src/style/vben.less  |  3 ++
 .../src/vben/layouts/basic/layout.vue         |  2 --
 .../access/access-selector/access/crud.tsx    |  4 +--
 .../src/views/certd/access/crud.tsx           |  4 ++-
 .../ui/certd-client/src/views/certd/dicts.ts  | 26 ++++++++++++++--
 .../src/views/certd/history/crud.tsx          |  4 +--
 .../src/views/certd/monitor/cert/crud.tsx     |  4 +--
 .../src/views/certd/monitor/site/crud.tsx     |  4 +--
 .../src/views/certd/notification/common.tsx   |  4 +--
 .../src/views/certd/open/openkey/crud.tsx     | 12 +++++++-
 .../src/views/certd/pipeline/crud.tsx         | 12 ++++++--
 .../src/views/certd/pipeline/group/crud.tsx   |  4 +--
 .../views/certd/pipeline/template/crud.tsx    |  4 +--
 .../src/views/certd/project/api.ts            |  7 +++++
 .../src/views/sys/settings/tabs/mode.vue      |  3 ++
 .../sys/enterprise/service/project-service.ts |  8 ++---
 21 files changed, 125 insertions(+), 36 deletions(-)
 create mode 100644 packages/ui/certd-client/src/style/vben.less

diff --git a/packages/ui/certd-client/src/api/service.ts b/packages/ui/certd-client/src/api/service.ts
index 9a322f6d7..6a27fb9f3 100644
--- a/packages/ui/certd-client/src/api/service.ts
+++ b/packages/ui/certd-client/src/api/service.ts
@@ -146,7 +146,7 @@ function createRequestFunction(service: any) {
     };
     const projectStore = useProjectStore();
 
-    if (projectStore.isEnterprise && !config.url.startsWith("/sys")) {
+    if (projectStore.isEnterprise && !config.url.startsWith("/sys") && !config.url.startsWith("http")) {
       configDefault.headers["project-id"] = projectStore.currentProjectId;
     }
 
diff --git a/packages/ui/certd-client/src/layout/layout-basic.vue b/packages/ui/certd-client/src/layout/layout-basic.vue
index bbac875d1..944c7b41c 100644
--- a/packages/ui/certd-client/src/layout/layout-basic.vue
+++ b/packages/ui/certd-client/src/layout/layout-basic.vue
@@ -84,7 +84,11 @@ const projectStore = useProjectStore();
 
 <template>
   <BasicLayout @clear-preferences-and-logout="handleLogout">
-    <template #header-left-0> </template>
+    <template #header-left-0>
+      <div v-if="projectStore.isEnterprise" class="ml-1 mr-2">
+        <project-selector class="flex-center header-btn" />
+      </div>
+    </template>
     <template #user-dropdown>
       <UserDropdown :avatar="avatar" :menus="menus" :text="userStore.userInfo?.nickName || userStore.userInfo?.username" description="" tag-text="" @logout="handleLogout" />
     </template>
@@ -92,9 +96,6 @@ const projectStore = useProjectStore();
       <LockScreen :avatar @to-login="handleLogout" />
     </template>
     <template #header-right-0>
-      <div v-if="projectStore.isEnterprise" class="ml-1 mr-2">
-        <project-selector class="flex-center header-btn" />
-      </div>
       <div class="hover:bg-accent ml-1 mr-2 cursor-pointer rounded-full hidden md:block">
         <tutorial-button class="flex-center header-btn" mode="nav" />
       </div>
diff --git a/packages/ui/certd-client/src/store/project/index.ts b/packages/ui/certd-client/src/store/project/index.ts
index e8884a4e5..721cdb97d 100644
--- a/packages/ui/certd-client/src/store/project/index.ts
+++ b/packages/ui/certd-client/src/store/project/index.ts
@@ -77,16 +77,46 @@ export const useProjectStore = defineStore("app.project", () => {
     return myProjects.value;
   }
 
+  const isRead = computed(() => {
+    if (!isEnterprise.value) {
+      return true;
+    }
+    return currentProject.value;
+  });
+
+  const isWrite = computed(() => {
+    if (!isEnterprise.value) {
+      return true;
+    }
+    return currentProject.value?.permission === "write" || currentProject.value?.permission === "admin";
+  });
+
+  const isAdmin = computed(() => {
+    if (!isEnterprise.value) {
+      return true;
+    }
+    return currentProject.value?.permission === "admin";
+  });
+
+  function $reset() {
+    myProjects.value = [];
+    currentProjectId.value = "";
+  }
+
   return {
     projects,
     myProjects,
     currentProject,
     currentProjectId,
     isEnterprise,
+    isRead,
+    isWrite,
+    isAdmin,
     getSearchForm,
     loadMyProjects,
     changeCurrentProject,
     reload,
     init,
+    $reset,
   };
 });
diff --git a/packages/ui/certd-client/src/style/common.less b/packages/ui/certd-client/src/style/common.less
index 96a13462c..a784bea43 100644
--- a/packages/ui/certd-client/src/style/common.less
+++ b/packages/ui/certd-client/src/style/common.less
@@ -6,6 +6,7 @@
 @import "./antdv4.less";
 @import "./certd.less";
 @import "./dark.less";
+@import "./vben.less";
 
 html,
 body {
diff --git a/packages/ui/certd-client/src/style/dark.less b/packages/ui/certd-client/src/style/dark.less
index 0b167dff0..7c690c2c4 100644
--- a/packages/ui/certd-client/src/style/dark.less
+++ b/packages/ui/certd-client/src/style/dark.less
@@ -1,7 +1,13 @@
-.dark{
-  .fs-page-header{
+.dark {
+  .fs-page-header {
     .title {
-        color: #d5d5d5 !important;
-      }
+      color: #d5d5d5 !important;
     }
+  }
+
+
+  .vben-normal-menu__item.is-active{
+    background-color: #3b3b3b !important;
+    }
+
 }
\ No newline at end of file
diff --git a/packages/ui/certd-client/src/style/vben.less b/packages/ui/certd-client/src/style/vben.less
new file mode 100644
index 000000000..be47330c1
--- /dev/null
+++ b/packages/ui/certd-client/src/style/vben.less
@@ -0,0 +1,3 @@
+.vben-normal-menu__item.is-active{
+background-color: #ebf1f6 !important;
+}
\ No newline at end of file
diff --git a/packages/ui/certd-client/src/vben/layouts/basic/layout.vue b/packages/ui/certd-client/src/vben/layouts/basic/layout.vue
index 125e815ae..bdd260a66 100644
--- a/packages/ui/certd-client/src/vben/layouts/basic/layout.vue
+++ b/packages/ui/certd-client/src/vben/layouts/basic/layout.vue
@@ -210,11 +210,9 @@ const headerSlots = computed(() => {
     </template>
     <!-- 侧边额外区域 -->
     <template #side-extra>
-      1111
       <LayoutExtraMenu :accordion="preferences.navigation.accordion" :collapse="preferences.sidebar.extraCollapse" :menus="wrapperMenus(extraMenus)" :rounded="isMenuRounded" :theme="sidebarTheme" />
     </template>
     <template #side-extra-title>
-      234234234
       <VbenLogo v-if="preferences.logo.enable" :text="preferences.app.name" :theme="theme" />
     </template>
 
diff --git a/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx b/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
index e06d69f00..821514155 100644
--- a/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
@@ -4,7 +4,7 @@ import { getCommonColumnDefine } from "/@/views/certd/access/common";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { useI18n } from "/src/locales";
 import { useProjectStore } from "/@/store/project";
-import { myProjectDict } from "../../../dicts";
+import { useDicts } from "../../../dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -41,7 +41,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
     selectedRowKey.value = changed;
     ctx.emit("update:modelValue", changed[0]);
   };
-
+  const { myProjectDict } = useDicts();
   const typeRef = ref("aliyun");
   context.typeRef = typeRef;
   const commonColumnsDefine = getCommonColumnDefine(crudExpose, typeRef, api);
diff --git a/packages/ui/certd-client/src/views/certd/access/crud.tsx b/packages/ui/certd-client/src/views/certd/access/crud.tsx
index 0dc6bad77..d15dd61a9 100644
--- a/packages/ui/certd-client/src/views/certd/access/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/access/crud.tsx
@@ -1,7 +1,7 @@
 // @ts-ignore
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { ref } from "vue";
-import { myProjectDict } from "../dicts";
+import { useDicts } from "../dicts";
 import { useProjectStore } from "/@/store/project";
 import { getCommonColumnDefine } from "/@/views/certd/access/common";
 import { useI18n } from "/src/locales";
@@ -32,6 +32,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   const typeRef = ref();
   const commonColumnsDefine = getCommonColumnDefine(crudExpose, typeRef, api);
   const projectStore = useProjectStore();
+
+  const { myProjectDict } = useDicts();
   return {
     crudOptions: {
       request: {
diff --git a/packages/ui/certd-client/src/views/certd/dicts.ts b/packages/ui/certd-client/src/views/certd/dicts.ts
index afe870457..07cdf0d56 100644
--- a/packages/ui/certd-client/src/views/certd/dicts.ts
+++ b/packages/ui/certd-client/src/views/certd/dicts.ts
@@ -1,6 +1,7 @@
 import { dict } from "@fast-crud/fast-crud";
+import { GetMyProjectList } from "./project/api";
 
-export const projectPermissionDict = dict({
+const projectPermissionDict = dict({
   data: [
     {
       label: "read",
@@ -17,13 +18,24 @@ export const projectPermissionDict = dict({
   ],
 });
 
-export const myProjectDict = dict({
+const myProjectDict = dict({
   url: "/enterprise/project/list",
+  getData: async () => {
+    const res = await GetMyProjectList();
+    return res;
+  },
   value: "id",
   label: "name",
+  immediate: false,
+  onReady: ({ dict }) => {
+    for (const item of dict.data) {
+      item.label = item.name;
+      item.value = item.id;
+    }
+  },
 });
 
-export const userDict = dict({
+const userDict = dict({
   url: "/sys/authority/user/getSimpleUsers",
   value: "id",
   onReady: ({ dict }) => {
@@ -32,3 +44,11 @@ export const userDict = dict({
     }
   },
 });
+
+export function useDicts() {
+  return {
+    projectPermissionDict,
+    myProjectDict,
+    userDict,
+  };
+}
diff --git a/packages/ui/certd-client/src/views/certd/history/crud.tsx b/packages/ui/certd-client/src/views/certd/history/crud.tsx
index a49d805d7..dd64a1f98 100644
--- a/packages/ui/certd-client/src/views/certd/history/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/history/crud.tsx
@@ -6,7 +6,7 @@ import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, Edi
 import { useUserStore } from "/@/store/user";
 import { useSettingStore } from "/@/store/settings";
 import { statusUtil } from "/@/views/certd/pipeline/pipeline/utils/util.status";
-import { myProjectDict } from "../dicts";
+import { useDicts } from "../dicts";
 import { useProjectStore } from "/@/store/project";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
@@ -33,7 +33,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   const settingStore = useSettingStore();
   const selectedRowKeys: Ref<any[]> = ref([]);
   context.selectedRowKeys = selectedRowKeys;
-
+  const { myProjectDict } = useDicts();
   const projectStore = useProjectStore();
 
   return {
diff --git a/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx b/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
index 59047a686..53bcf7738 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
@@ -11,7 +11,7 @@ import CertView from "/@/views/certd/pipeline/cert-view.vue";
 import { useCertUpload } from "/@/views/certd/pipeline/cert-upload/use";
 import { useSettingStore } from "/@/store/settings";
 import { useProjectStore } from "/@/store/project";
-import { myProjectDict } from "../../dicts";
+import { useDicts } from "../../dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -36,7 +36,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
     return res;
   };
   const router = useRouter();
-
+  const { myProjectDict } = useDicts();
   const settingStore = useSettingStore();
   const projectStore = useProjectStore();
   const model = useModal();
diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
index 2e19d4a64..800f0b75d 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
@@ -14,7 +14,7 @@ import { ref } from "vue";
 import GroupSelector from "../../basic/group/group-selector.vue";
 import { createGroupDictRef } from "../../basic/group/api";
 import { useProjectStore } from "/@/store/project";
-import { myProjectDict } from "../../dicts";
+import { useDicts } from "../../dicts";
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
   const api = siteInfoApi;
@@ -39,7 +39,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
     const res = await api.AddObj(form);
     return res;
   };
-
+  const { myProjectDict } = useDicts();
   const settingsStore = useSettingStore();
 
   const checkStatusDict = dict({
diff --git a/packages/ui/certd-client/src/views/certd/notification/common.tsx b/packages/ui/certd-client/src/views/certd/notification/common.tsx
index a54582397..91726d8ee 100644
--- a/packages/ui/certd-client/src/views/certd/notification/common.tsx
+++ b/packages/ui/certd-client/src/views/certd/notification/common.tsx
@@ -6,7 +6,7 @@ import { Modal } from "ant-design-vue";
 import { mitter } from "/@/utils/util.mitt";
 import { useI18n } from "/src/locales";
 import { useProjectStore } from "/@/store/project";
-import { myProjectDict } from "../dicts";
+import { useDicts } from "../dicts";
 
 export function notificationProvide(api: any) {
   provide("notificationApi", api);
@@ -29,7 +29,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
   };
 
   const projectStore = useProjectStore();
-
+  const { myProjectDict } = useDicts();
   provide("getCurrentPluginDefine", () => {
     return currentDefine;
   });
diff --git a/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx b/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx
index d95075cbb..66a3a9128 100644
--- a/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx
@@ -4,7 +4,8 @@ import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, Edi
 import { OPEN_API_DOC, openkeyApi } from "./api";
 import { useModal } from "/@/use/use-modal";
 import { useProjectStore } from "/@/store/project";
-import { myProjectDict } from "../../dicts";
+import { computed } from "vue";
+import { useDicts } from "../../dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -28,6 +29,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
     const res = await api.AddObj(form);
     return res;
   };
+  const { myProjectDict } = useDicts();
   const projectStore = useProjectStore();
   const model = useModal();
   return {
@@ -176,6 +178,14 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           form: {
             show: false,
           },
+          column: {
+            show: computed(() => {
+              return projectStore.isEnterprise;
+            }),
+            width: 120,
+            align: "center",
+            sorter: true,
+          },
         },
         createTime: {
           title: t("certd.fields.createTime"),
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
index 9c7629277..7d60a94ea 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
@@ -14,7 +14,7 @@ import GroupSelector from "/@/views/certd/pipeline/group/group-selector.vue";
 import { statusUtil } from "/@/views/certd/pipeline/pipeline/utils/util.status";
 import { useCertViewer } from "/@/views/certd/pipeline/use";
 import { useI18n } from "/src/locales";
-import { myProjectDict } from "../dicts";
+import { useDicts } from "../dicts";
 import { useProjectStore } from "/@/store/project";
 
 export default function ({ crudExpose, context: { selectedRowKeys, openCertApplyDialog } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
@@ -69,7 +69,7 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
   const settingStore = useSettingStore();
 
   const projectStore = useProjectStore();
-
+  const { myProjectDict } = useDicts();
   const DEFAULT_WILL_EXPIRE_DAYS = settingStore.sysPublic.defaultWillExpireDays || settingStore.sysPublic.defaultCertRenewDays || 15;
 
   function onDialogOpen(opt: any) {
@@ -656,6 +656,14 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
           form: {
             show: false,
           },
+          column: {
+            show: computed(() => {
+              return settingStore.isEnterprise;
+            }),
+            width: 120,
+            align: "center",
+            sorter: true,
+          },
         },
         updateTime: {
           title: t("certd.fields.updateTime"),
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx
index 2ada545a5..d83850f43 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/group/crud.tsx
@@ -2,7 +2,7 @@ import { useI18n } from "/src/locales";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { pipelineGroupApi } from "./api";
 import { useProjectStore } from "/@/store/project";
-import { myProjectDict } from "../../dicts";
+import { useDicts } from "../../dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -28,7 +28,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   };
 
   const projectStore = useProjectStore();
-
+  const { myProjectDict } = useDicts();
   return {
     crudOptions: {
       settings: {
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx
index be9c3c961..091e6688d 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx
@@ -7,7 +7,7 @@ import * as pipelineApi from "../api";
 import { useTemplate } from "/@/views/certd/pipeline/template/use";
 import { useI18n } from "/@/locales";
 import { useProjectStore } from "/@/store/project";
-import { myProjectDict } from "../../dicts";
+import { useDicts } from "../../dicts";
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const api = templateApi;
   const { t } = useI18n();
@@ -36,7 +36,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   const router = useRouter();
 
   const model = useModal();
-
+  const { myProjectDict } = useDicts();
   const { openCreateFromTemplateDialog } = useTemplate();
 
   return {
diff --git a/packages/ui/certd-client/src/views/certd/project/api.ts b/packages/ui/certd-client/src/views/certd/project/api.ts
index cd637e065..b5eafb8e0 100644
--- a/packages/ui/certd-client/src/views/certd/project/api.ts
+++ b/packages/ui/certd-client/src/views/certd/project/api.ts
@@ -10,6 +10,13 @@ export async function GetList(query: any) {
   });
 }
 
+export async function GetMyProjectList() {
+  return await request({
+    url: apiPrefix + "/list",
+    method: "post",
+  });
+}
+
 export async function GetPage(query: any) {
   return await request({
     url: apiPrefix + "/page",
diff --git a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
index 2089d144c..c23734319 100644
--- a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
@@ -21,6 +21,7 @@ import { useSettingStore } from "/@/store/settings";
 import { notification } from "ant-design-vue";
 import { useI18n } from "/src/locales";
 import { dict } from "@fast-crud/fast-crud";
+import { useProjectStore } from "/@/store/project";
 const { t } = useI18n();
 
 defineOptions({
@@ -53,12 +54,14 @@ async function loadSysSettings() {
 const saveLoading = ref(false);
 loadSysSettings();
 const settingsStore = useSettingStore();
+const projectStore = useProjectStore();
 const onFinish = async (form: any) => {
   try {
     saveLoading.value = true;
 
     await api.SysSettingsSave(form);
     await settingsStore.loadSysSettings();
+    await projectStore.reload();
     notification.success({
       message: t("certd.saveSuccess"),
     });
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
index 27d4e524c..c959f3c02 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
@@ -144,14 +144,14 @@ export class ProjectService extends BaseService<ProjectEntity> {
           } 
           const member = await this.projectMemberService.getMember(projectId, userId);
           if (!member) {
-            throw new Error('项目成员不存在');
+            throw new Error(`用户${userId}不是该项目${projectId}成员`);
           }
           savedPermission = member.permission;
         }
     }
     projectCache.set(cacheKey, savedPermission,{ttl:  3 * 60 * 1000});
     if (!savedPermission) {
-      throw new Error('权限不足');
+      throw new Error(`权限不足，需要${permission}权限`);
     }
     
     if (permission === 'read') {
@@ -161,11 +161,11 @@ export class ProjectService extends BaseService<ProjectEntity> {
       if (savedPermission === 'admin' || savedPermission === 'write') {
         return true
       } else {
-        throw new Error('权限不足');
+        throw new Error(`权限不足，需要${permission}权限`);
       }
     }
     if (savedPermission !== permission) {
-      throw new Error('权限不足');
+      throw new Error(`权限不足，需要${permission}权限`);
     }
     return true
   }

From 3a8b5de8f78bd043455ec8f87693860eb96caf6c Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 26 Feb 2026 00:12:59 +0800
Subject: [PATCH 30/62] chore: project permission

---
 .../plugin/permission/use-crud-permission.ts  | 62 +++++++++++++++----
 .../certd-client/src/store/project/index.ts   | 15 +++++
 .../src/views/certd/access/index.vue          |  2 +-
 .../src/views/certd/cert/domain/crud.tsx      |  3 +
 .../src/views/certd/cert/domain/index.vue     | 13 +++-
 .../src/views/certd/monitor/site/crud.tsx     |  4 +-
 .../src/views/certd/monitor/site/index.vue    |  7 ++-
 .../src/views/certd/pipeline/crud.tsx         |  7 ++-
 .../src/views/certd/pipeline/index.vue        |  6 +-
 .../views/certd/pipeline/pipeline/index.vue   |  6 +-
 .../views/certd/pipeline/template/crud.tsx    |  1 -
 .../views/certd/pipeline/template/index.vue   |  7 ++-
 .../src/views/certd/project/crud.tsx          |  2 +-
 .../src/views/sys/enterprise/project/crud.tsx | 14 ++---
 14 files changed, 119 insertions(+), 30 deletions(-)

diff --git a/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts b/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts
index 71618bde0..1aa96707a 100644
--- a/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts
+++ b/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts
@@ -1,12 +1,14 @@
 import { usePermission } from "/@/plugin/permission";
 import { merge as LodashMerge } from "lodash-es";
+import { useProjectStore } from "/@/store/project";
 
 export type UseCrudPermissionExtraProps = {
   hasActionPermission: (action: string) => boolean;
 };
 export type UseCrudPermissionExtra = (props: UseCrudPermissionExtraProps) => any;
 export type UseCrudPermissionCompProps = {
-  prefix: string;
+  isProjectPermission?: boolean;
+  prefix?: string;
   extra?: UseCrudPermissionExtra;
   [key: string]: any;
 };
@@ -20,14 +22,31 @@ export type UseCrudPermissionProps = {
 export function useCrudPermission({ permission }: UseCrudPermissionProps) {
   const { hasPermissions } = usePermission();
 
-  const prefix = permission instanceof Object ? permission.prefix : permission;
-
   //根据权限显示按钮
-  function hasActionPermission(action: string) {
+  let hasActionPermission = (action: string) => {
     if (!prefix) {
       return true;
     }
     return hasPermissions(prefix + ":" + action);
+  };
+
+  let per: UseCrudPermissionCompProps = permission as any;
+  if (per == null) {
+    per = { prefix: "" };
+  }
+  if (typeof per === "string") {
+    per = {
+      prefix: per || "",
+    };
+  }
+  let prefix = per.prefix || "";
+  const isProjectPermission = per.isProjectPermission || false;
+  if (isProjectPermission) {
+    const projectStore = useProjectStore();
+    prefix = "";
+    hasActionPermission = function (value: string) {
+      return projectStore.hasPermission(value as string);
+    };
   }
 
   function buildCrudPermission(): any {
@@ -36,25 +55,44 @@ export function useCrudPermission({ permission }: UseCrudPermissionProps) {
     }
 
     let extra = {};
-    if (permission instanceof Object) {
-      extra = permission.extra;
-      if (permission.extra && permission.extra instanceof Function) {
-        extra = permission.extra({ hasActionPermission });
+    if (per instanceof Object) {
+      extra = per.extra;
+      if (per.extra && per.extra instanceof Function) {
+        extra = per.extra({ hasActionPermission });
       }
     }
 
+    let viewPermission = "view";
+    if (isProjectPermission) {
+      viewPermission = "read";
+    }
+
+    let addPermission = "add";
+    if (isProjectPermission) {
+      addPermission = "write";
+    }
+
+    let editPermission = "edit";
+    if (isProjectPermission) {
+      editPermission = "write";
+    }
+
+    let removePermission = "remove";
+    if (isProjectPermission) {
+      removePermission = "write";
+    }
     return LodashMerge(
       {
         actionbar: {
           buttons: {
-            add: { show: hasActionPermission("add") },
+            add: { show: hasActionPermission(addPermission) },
           },
         },
         rowHandle: {
           buttons: {
-            edit: { show: hasActionPermission("edit") },
-            remove: { show: hasActionPermission("remove") },
-            view: { show: hasActionPermission("view") },
+            edit: { show: hasActionPermission(editPermission) },
+            remove: { show: hasActionPermission(removePermission) },
+            view: { show: hasActionPermission(viewPermission) },
           },
         },
       },
diff --git a/packages/ui/certd-client/src/store/project/index.ts b/packages/ui/certd-client/src/store/project/index.ts
index 721cdb97d..9160b4178 100644
--- a/packages/ui/certd-client/src/store/project/index.ts
+++ b/packages/ui/certd-client/src/store/project/index.ts
@@ -98,6 +98,20 @@ export const useProjectStore = defineStore("app.project", () => {
     return currentProject.value?.permission === "admin";
   });
 
+  function hasPermission(value: string) {
+    if (!isEnterprise.value) {
+      return true;
+    }
+    if (value === "read") {
+      return isRead.value;
+    } else if (value === "write") {
+      return isWrite.value;
+    } else if (value === "admin") {
+      return isAdmin.value;
+    }
+    return false;
+  }
+
   function $reset() {
     myProjects.value = [];
     currentProjectId.value = "";
@@ -118,5 +132,6 @@ export const useProjectStore = defineStore("app.project", () => {
     reload,
     init,
     $reset,
+    hasPermission,
   };
 });
diff --git a/packages/ui/certd-client/src/views/certd/access/index.vue b/packages/ui/certd-client/src/views/certd/access/index.vue
index 25d312652..2079c4040 100644
--- a/packages/ui/certd-client/src/views/certd/access/index.vue
+++ b/packages/ui/certd-client/src/views/certd/access/index.vue
@@ -22,7 +22,7 @@ export default defineComponent({
   setup() {
     const { t } = useI18n();
     const api = createAccessApi("user");
-    const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api } });
+    const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api, permission: { isProjectPermission: true } } });
 
     // 页面打开后获取列表数据
     onMounted(() => {
diff --git a/packages/ui/certd-client/src/views/certd/cert/domain/crud.tsx b/packages/ui/certd-client/src/views/certd/cert/domain/crud.tsx
index 6fc3c2db6..1757c8dca 100644
--- a/packages/ui/certd-client/src/views/certd/cert/domain/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/cert/domain/crud.tsx
@@ -12,6 +12,7 @@ import { useI18n } from "/src/locales";
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
   const { t } = useI18n();
+  const { hasActionPermission } = context;
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
     return await api.GetList(query);
   };
@@ -96,6 +97,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             icon: "ion:add-circle-outline",
           },
           import: {
+            show: hasActionPermission("write"),
             title: "从域名提供商导入域名",
             type: "primary",
             text: "从域名提供商导入",
@@ -111,6 +113,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             },
           },
           syncExpirationDate: {
+            show: hasActionPermission("write"),
             title: "同步域名过期时间",
             type: "primary",
             icon: "ion:refresh-outline",
diff --git a/packages/ui/certd-client/src/views/certd/cert/domain/index.vue b/packages/ui/certd-client/src/views/certd/cert/domain/index.vue
index 2ffd486e4..0a366f8e7 100644
--- a/packages/ui/certd-client/src/views/certd/cert/domain/index.vue
+++ b/packages/ui/certd-client/src/views/certd/cert/domain/index.vue
@@ -10,7 +10,7 @@
     </template>
     <fs-crud ref="crudRef" v-bind="crudBinding">
       <template #pagination-left>
-        <a-tooltip :title="t('certd.batch_delete')">
+        <a-tooltip v-if="hasActionPermission('write')" :title="t('certd.batch_delete')">
           <fs-button icon="DeleteOutlined" @click="handleBatchDelete"></fs-button>
         </a-tooltip>
       </template>
@@ -25,13 +25,22 @@ import createCrudOptions from "./crud";
 import { message, Modal } from "ant-design-vue";
 import { DeleteBatch } from "./api";
 import { useI18n } from "/src/locales";
+import { useCrudPermission } from "/@/plugin/permission";
 
 const { t } = useI18n();
 
 defineOptions({
   name: "DomainManager",
 });
-const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
+const context: any = {
+  permission: {
+    isProjectPermission: true,
+  },
+};
+
+const { hasActionPermission } = useCrudPermission({ permission: context.permission });
+context.hasActionPermission = hasActionPermission;
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
 
 const selectedRowKeys = context.selectedRowKeys;
 const handleBatchDelete = () => {
diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
index 800f0b75d..5dcc10fa3 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
@@ -15,6 +15,7 @@ import GroupSelector from "../../basic/group/group-selector.vue";
 import { createGroupDictRef } from "../../basic/group/api";
 import { useProjectStore } from "/@/store/project";
 import { useDicts } from "../../dicts";
+import { useCrudPermission } from "/@/plugin/permission";
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
   const api = siteInfoApi;
@@ -109,6 +110,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   }
 
   const projectStore = useProjectStore();
+  const { hasActionPermission } = useCrudPermission({ permission: context.permission });
   return {
     id: "siteMonitorCrud",
     crudOptions: {
@@ -231,7 +233,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
           //导入按钮
           import: {
-            show: true,
+            show: hasActionPermission("write"),
             text: t("monitor.bulkImport"),
             type: "primary",
             async click() {
diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/index.vue b/packages/ui/certd-client/src/views/certd/monitor/site/index.vue
index 55a7221f8..01dfe2a8b 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/site/index.vue
+++ b/packages/ui/certd-client/src/views/certd/monitor/site/index.vue
@@ -34,7 +34,12 @@ const { t } = useI18n();
 defineOptions({
   name: "SiteCertMonitor",
 });
-const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
+const context: any = {
+  permission: {
+    isProjectPermission: true,
+  },
+};
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
 
 const handleBatchDelete = context.handleBatchDelete;
 
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
index 7d60a94ea..acea8e2e0 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
@@ -17,7 +17,7 @@ import { useI18n } from "/src/locales";
 import { useDicts } from "../dicts";
 import { useProjectStore } from "/@/store/project";
 
-export default function ({ crudExpose, context: { selectedRowKeys, openCertApplyDialog } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+export default function ({ crudExpose, context: { selectedRowKeys, openCertApplyDialog, hasActionPermission } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
   const lastResRef = ref();
 
@@ -124,9 +124,11 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
             click() {
               openCertApplyDialog({ key: "CertApply" });
             },
+            show: hasActionPermission("add"),
           },
           uploadCert: {
             order: 2,
+            show: hasActionPermission("uploadCert"),
             text: t("certd.commercialCertHosting"),
             type: "primary",
             tooltip: {
@@ -207,6 +209,7 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
             },
           },
           copy: {
+            show: hasActionPermission("write"),
             click: async context => {
               settingStore.checkPlus();
               const { ui } = useUi();
@@ -224,6 +227,7 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
             class: "need-plus",
           },
           config: {
+            show: hasActionPermission("write"),
             order: 1,
             title: t("certd.actions.editPipeline"),
             type: "link",
@@ -234,6 +238,7 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
             },
           },
           edit: {
+            show: hasActionPermission("write"),
             order: 2,
             title: t("certd.actions.editConfigGroup"),
             icon: "ant-design:setting-outlined",
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/index.vue
index c2c7b8fec..0b590f234 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/index.vue
@@ -13,7 +13,7 @@
     </a-alert> -->
     <fs-crud ref="crudRef" v-bind="crudBinding">
       <template #actionbar-right>
-        <a-dropdown class="ml-1">
+        <a-dropdown v-if="hasActionPermission('write')" class="ml-1">
           <a-button type="primary" class="ant-dropdown-link" @click.prevent>
             {{ t("certd.pipelinePage.addMore") }}
             <DownOutlined />
@@ -68,6 +68,7 @@ import { useSettingStore } from "/@/store/settings";
 import { groupDictRef } from "./group/dicts";
 import { useCertPipelineCreator } from "./certd-form/use";
 import { useRouter } from "vue-router";
+import { useCrudPermission } from "/@/plugin/permission";
 
 defineOptions({
   name: "PipelineManager",
@@ -106,7 +107,10 @@ function openCertApplyDialog(req: { key: string; title: string }) {
   openAddCertdPipelineDialog({ pluginName: req.key, defaultGroupId, title: req.title });
 }
 context.openCertApplyDialog = openCertApplyDialog;
+context.permission = { isProjectPermission: true };
 
+const { hasActionPermission } = useCrudPermission({ permission: { isProjectPermission: true } });
+context.hasActionPermission = hasActionPermission;
 const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
 
 // 页面打开后获取列表数据
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue
index 8a1a1d2dc..e0b71633a 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue
@@ -46,7 +46,7 @@
             </span>
           </a-tag>
         </div>
-        <div class="basis-40 flex justify-end mr-10">
+        <div v-if="hasActionPermission('write')" class="basis-40 flex justify-end mr-10">
           <template v-if="editMode">
             <fs-button type="primary" :loading="saveLoading" @click="save">保存</fs-button>
             <fs-button class="ml-5" @click="cancel">取消</fs-button>
@@ -333,6 +333,7 @@ import { getCronNextTimes } from "/@/components/cron-editor/utils";
 import { useCertViewer } from "/@/views/certd/pipeline/use";
 import { useI18n } from "/@/locales";
 import TriggerIcon from "./component/trigger-icon.vue";
+import { useCrudPermission } from "/@/plugin/permission";
 
 export default defineComponent({
   name: "PipelineEdit",
@@ -1002,12 +1003,15 @@ export default defineComponent({
     const hasWebhookTrigger = computed(() => {
       return currentPipeline.value?.triggers?.some((item: any) => item.type === "webhook");
     });
+
+    const { hasActionPermission } = useCrudPermission({ permission: { isProjectPermission: true } });
     return {
       isCert,
       pipeline,
       currentHistory,
       histories,
       goBack,
+      hasActionPermission,
       userStore,
       settingStore,
       ...useTaskRet,
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx
index 091e6688d..8c0f5a741 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/template/crud.tsx
@@ -78,7 +78,6 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           add: {
             text: t("certd.template.createTemplate"),
             type: "primary",
-            show: true,
           },
         },
       },
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/template/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/template/index.vue
index 2c6936760..2c3e3edbc 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/template/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/template/index.vue
@@ -21,7 +21,12 @@ import { useI18n } from "/src/locales";
 defineOptions({
   name: "PipelineTemplate",
 });
-const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: {} });
+const { crudBinding, crudRef, crudExpose } = useFs({
+  createCrudOptions,
+  context: {
+    permission: { isProjectPermission: true },
+  },
+});
 const { t } = useI18n();
 // 页面打开后获取列表数据
 onMounted(() => {
diff --git a/packages/ui/certd-client/src/views/certd/project/crud.tsx b/packages/ui/certd-client/src/views/certd/project/crud.tsx
index bc3902ee8..6ae9bd2b0 100644
--- a/packages/ui/certd-client/src/views/certd/project/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/project/crud.tsx
@@ -6,7 +6,7 @@ import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq,
 import { useUserStore } from "/@/store/user";
 import { useSettingStore } from "/@/store/settings";
 import { Modal } from "ant-design-vue";
-import { userDict } from "../dicts";
+import { userDict } from "../../sys/enterprise/dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
index 5343e3e1a..b509f8dc7 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
@@ -1,12 +1,12 @@
-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, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { Modal } from "ant-design-vue";
+import { Ref, ref } from "vue";
+import { useRouter } from "vue-router";
 import { userDict } from "../dicts";
+import * as api from "./api";
+import { useSettingStore } from "/@/store/settings";
+import { useUserStore } from "/@/store/user";
+import { useI18n } from "/src/locales";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();

From 51ab6d6da1bb551b55b3a6a4a9a945c8d6ace806 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 26 Feb 2026 23:50:01 +0800
Subject: [PATCH 31/62] =?UTF-8?q?perf:=20=E3=80=90=E7=A0=B4=E5=9D=8F?=
 =?UTF-8?q?=E6=80=A7=E6=9B=B4=E6=96=B0=E3=80=91=E9=94=99=E8=AF=AF=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=BF=A1=E6=81=AFmsg=E5=AD=97=E6=AE=B5=E5=90=8D?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=94=B9=E6=88=90message=EF=BC=8C=E4=B8=8E?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E7=9A=84=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libs/lib-server/src/basic/base-controller.ts   |  2 +-
 .../src/basic/exception/base-exception.ts          |  2 +-
 packages/libs/lib-server/src/basic/result.ts       | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/libs/lib-server/src/basic/base-controller.ts b/packages/libs/lib-server/src/basic/base-controller.ts
index 1118067b8..39cf55edf 100644
--- a/packages/libs/lib-server/src/basic/base-controller.ts
+++ b/packages/libs/lib-server/src/basic/base-controller.ts
@@ -34,7 +34,7 @@ export abstract class BaseController {
   fail(msg: string, code?: any) {
     return {
       code: code ? code : Constants.res.error.code,
-      msg: msg ? msg : Constants.res.error.code,
+      message: msg ? msg : Constants.res.error.code,
     };
   }
 
diff --git a/packages/libs/lib-server/src/basic/exception/base-exception.ts b/packages/libs/lib-server/src/basic/exception/base-exception.ts
index 3ee44d788..65959654d 100644
--- a/packages/libs/lib-server/src/basic/exception/base-exception.ts
+++ b/packages/libs/lib-server/src/basic/exception/base-exception.ts
@@ -4,7 +4,7 @@
 export class BaseException extends Error {
   code: number;
   data?:any
-  constructor(name, code, message,data?:any) {
+  constructor(name: string, code: number, message: string ,data?:any) {
     super(message);
     this.name = name;
     this.code = code;
diff --git a/packages/libs/lib-server/src/basic/result.ts b/packages/libs/lib-server/src/basic/result.ts
index ca42e8d14..0d1dcc375 100644
--- a/packages/libs/lib-server/src/basic/result.ts
+++ b/packages/libs/lib-server/src/basic/result.ts
@@ -1,19 +1,19 @@
 export class Result<T> {
   code: number;
-  msg: string;
+  message: string;
   data: T;
 
-  constructor(code, msg, data?) {
+  constructor(code, message, data?) {
     this.code = code;
-    this.msg = msg;
+    this.message = message;
     this.data = data;
   }
 
-  static error(code = 1, msg, data?: any) {
-    return new Result(code, msg, data);
+  static error(code = 1, message, data?: any) {
+    return new Result(code, message, data);
   }
 
-  static success(msg, data?) {
-    return new Result(0, msg, data);
+  static success(message, data?) {
+    return new Result(0, message, data);
   }
 }

From 85785474673b33903d7eeff295380441862fa7c5 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 26 Feb 2026 23:50:15 +0800
Subject: [PATCH 32/62] chore: project permission

---
 .../src/components/project-selector/index.vue  | 18 ++++++++++++++----
 .../plugin/permission/use-crud-permission.ts   |  7 ++++---
 .../src/router/source/modules/certd.ts         |  4 ++++
 .../src/views/certd/addon/index.vue            |  5 ++++-
 .../src/views/certd/basic/group/index.vue      |  7 ++++++-
 .../src/views/certd/cname/record/crud.tsx      |  4 ++++
 .../src/views/certd/cname/record/index.vue     | 11 +++++++++--
 .../ui/certd-client/src/views/certd/dicts.ts   | 18 ++++++++++++------
 .../src/views/certd/history/index.vue          | 11 +++++++++--
 .../src/views/certd/monitor/cert/index.vue     |  2 +-
 .../views/certd/monitor/site/setting/index.vue |  5 ++++-
 .../src/views/certd/notification/index.vue     |  2 +-
 .../src/views/certd/open/openkey/index.vue     |  2 +-
 .../src/views/certd/pipeline/crud.tsx          |  4 ++--
 .../src/views/certd/pipeline/group/index.vue   |  8 ++++++--
 .../src/views/certd/pipeline/index.vue         |  8 ++++----
 .../views/certd/pipeline/sub-domain/index.vue  | 12 ++++++++++--
 .../src/views/certd/project/detail/crud.tsx    |  4 +++-
 .../src/views/certd/project/index.vue          |  3 ++-
 19 files changed, 100 insertions(+), 35 deletions(-)

diff --git a/packages/ui/certd-client/src/components/project-selector/index.vue b/packages/ui/certd-client/src/components/project-selector/index.vue
index 7e3ab33f7..e5be4aea4 100644
--- a/packages/ui/certd-client/src/components/project-selector/index.vue
+++ b/packages/ui/certd-client/src/components/project-selector/index.vue
@@ -3,21 +3,25 @@
     <template #overlay>
       <a-menu @click="handleMenuClick">
         <a-menu-item v-for="item in projectStore.myProjects" :key="item.id">
-          {{ item.name }}
+          <div class="flex items-center justify-between w-full">
+            <span class="mr-1">{{ item.name }}</span>
+            <fs-values-format :model-value="item.permission" :dict="projectPermissionDict"></fs-values-format>
+          </div>
         </a-menu-item>
       </a-menu>
     </template>
     <div class="rounded pl-3 pr-3 px-2 py-1 flex-center flex pointer items-center bg-accent h-10 button-text" title="当前项目">
-      <fs-icon icon="ion:apps" class="mr-1"></fs-icon>
+      <!-- <fs-icon icon="ion:apps" class="mr-1"></fs-icon> -->
+      <fs-icon :icon="currentIcon" class="mr-5"></fs-icon>
       当前项目：{{ projectStore.currentProject?.name || "..." }}
-      <fs-icon icon="ion:chevron-down-outline" class="ml-1"></fs-icon>
     </div>
   </a-dropdown>
 </template>
 
 <script lang="ts" setup>
-import { onMounted } from "vue";
+import { computed, onMounted } from "vue";
 import { useProjectStore } from "/@/store/project";
+import { useDicts } from "/@/views/certd/dicts";
 defineOptions({
   name: "ProjectSelector",
 });
@@ -25,12 +29,18 @@ defineOptions({
 const projectStore = useProjectStore();
 onMounted(async () => {
   await projectStore.reload();
+  console.log(projectStore.myProjects);
 });
 
 function handleMenuClick({ key }: any) {
   projectStore.changeCurrentProject(key);
   window.location.reload();
 }
+const { projectPermissionDict } = useDicts();
+
+const currentIcon = computed(() => {
+  return projectPermissionDict.dataMap[projectStore.currentProject?.permission || ""]?.icon || "";
+});
 </script>
 <style lang="less">
 .project-selector {
diff --git a/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts b/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts
index 1aa96707a..315e21ccd 100644
--- a/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts
+++ b/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts
@@ -8,6 +8,7 @@ export type UseCrudPermissionExtraProps = {
 export type UseCrudPermissionExtra = (props: UseCrudPermissionExtraProps) => any;
 export type UseCrudPermissionCompProps = {
   isProjectPermission?: boolean;
+  projectPermission?: string;
   prefix?: string;
   extra?: UseCrudPermissionExtra;
   [key: string]: any;
@@ -69,17 +70,17 @@ export function useCrudPermission({ permission }: UseCrudPermissionProps) {
 
     let addPermission = "add";
     if (isProjectPermission) {
-      addPermission = "write";
+      addPermission = per.projectPermission || "write";
     }
 
     let editPermission = "edit";
     if (isProjectPermission) {
-      editPermission = "write";
+      editPermission = per.projectPermission || "write";
     }
 
     let removePermission = "remove";
     if (isProjectPermission) {
-      removePermission = "write";
+      removePermission = per.projectPermission || "write";
     }
     return LodashMerge(
       {
diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts
index 74ca90f15..ab624c908 100644
--- a/packages/ui/certd-client/src/router/source/modules/certd.ts
+++ b/packages/ui/certd-client/src/router/source/modules/certd.ts
@@ -241,6 +241,10 @@ export const certdResources = [
               icon: "mi:user-check",
               auth: true,
               isMenu: true,
+              show: () => {
+                const projectStore = useProjectStore();
+                return !projectStore.isEnterprise;
+              },
             },
           },
           {
diff --git a/packages/ui/certd-client/src/views/certd/addon/index.vue b/packages/ui/certd-client/src/views/certd/addon/index.vue
index a268390c0..6ab6cd736 100644
--- a/packages/ui/certd-client/src/views/certd/addon/index.vue
+++ b/packages/ui/certd-client/src/views/certd/addon/index.vue
@@ -22,7 +22,10 @@ export default defineComponent({
   setup() {
     const api = createAddonApi({ from: "user", addonType: "" });
     addonProvide(api);
-    const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api } });
+    const { crudBinding, crudRef, crudExpose } = useFs({
+      createCrudOptions,
+      context: { api, permission: { isProjectPermission: true } },
+    });
 
     // 页面打开后获取列表数据
     onMounted(() => {
diff --git a/packages/ui/certd-client/src/views/certd/basic/group/index.vue b/packages/ui/certd-client/src/views/certd/basic/group/index.vue
index 26f2665bd..8dd866783 100644
--- a/packages/ui/certd-client/src/views/certd/basic/group/index.vue
+++ b/packages/ui/certd-client/src/views/certd/basic/group/index.vue
@@ -18,7 +18,12 @@ import createCrudOptions from "./crud";
 export default defineComponent({
   name: "BasicGroupManager",
   setup() {
-    const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: {} });
+    const { crudBinding, crudRef, crudExpose } = useFs({
+      createCrudOptions,
+      context: {
+        permission: { isProjectPermission: true },
+      },
+    });
 
     // 页面打开后获取列表数据
     onMounted(() => {
diff --git a/packages/ui/certd-client/src/views/certd/cname/record/crud.tsx b/packages/ui/certd-client/src/views/certd/cname/record/crud.tsx
index 6817749ee..2716ef614 100644
--- a/packages/ui/certd-client/src/views/certd/cname/record/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/cname/record/crud.tsx
@@ -8,6 +8,7 @@ import { useSettingStore } from "/@/store/settings";
 import { message, Modal } from "ant-design-vue";
 import CnameTip from "/@/components/plugins/cert/domains-verify-plan-editor/cname-tip.vue";
 import { useCnameImport } from "./use";
+import { useCrudPermission } from "/@/plugin/permission";
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const crudBinding = crudExpose.crudBinding;
   const router = useRouter();
@@ -45,6 +46,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
       { label: t("certd.validation_timed_out"), value: "timeout", color: "red" },
     ],
   });
+
+  const { hasActionPermission } = useCrudPermission(context);
   return {
     crudOptions: {
       settings: {
@@ -75,6 +78,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             icon: "ion:add-circle-outline",
           },
           import: {
+            show: hasActionPermission("write"),
             title: "导入CNAME记录",
             type: "primary",
             text: "批量导入",
diff --git a/packages/ui/certd-client/src/views/certd/cname/record/index.vue b/packages/ui/certd-client/src/views/certd/cname/record/index.vue
index 833ba5478..5f4f49522 100644
--- a/packages/ui/certd-client/src/views/certd/cname/record/index.vue
+++ b/packages/ui/certd-client/src/views/certd/cname/record/index.vue
@@ -12,7 +12,7 @@
     </template>
     <fs-crud ref="crudRef" v-bind="crudBinding">
       <template #pagination-left>
-        <a-tooltip :title="t('certd.batch_delete')">
+        <a-tooltip v-if="hasActionPermission('write')" :title="t('certd.batch_delete')">
           <fs-button icon="DeleteOutlined" @click="handleBatchDelete"></fs-button>
         </a-tooltip>
       </template>
@@ -27,13 +27,20 @@ import createCrudOptions from "./crud";
 import { message, Modal } from "ant-design-vue";
 import { DeleteBatch } from "./api";
 import { useI18n } from "/src/locales";
+import { useCrudPermission } from "/@/plugin/permission";
 
 const { t } = useI18n();
 
 defineOptions({
   name: "CnameRecord",
 });
-const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
+
+const context: any = {
+  permission: { isProjectPermission: true },
+};
+
+const { hasActionPermission } = useCrudPermission(context);
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
 
 const selectedRowKeys = context.selectedRowKeys;
 const handleBatchDelete = () => {
diff --git a/packages/ui/certd-client/src/views/certd/dicts.ts b/packages/ui/certd-client/src/views/certd/dicts.ts
index 07cdf0d56..4b22d682a 100644
--- a/packages/ui/certd-client/src/views/certd/dicts.ts
+++ b/packages/ui/certd-client/src/views/certd/dicts.ts
@@ -4,16 +4,22 @@ import { GetMyProjectList } from "./project/api";
 const projectPermissionDict = dict({
   data: [
     {
-      label: "read",
-      value: "只读",
+      value: "read",
+      label: "只读",
+      color: "cyan",
+      icon: "material-symbols:folder-eye-outline-sharp",
     },
     {
-      label: "write",
-      value: "读写",
+      value: "write",
+      label: "读写",
+      color: "green",
+      icon: "material-symbols:edit-square-outline-rounded",
     },
     {
-      label: "admin",
-      value: "管理员",
+      value: "admin",
+      label: "管理员",
+      color: "orange",
+      icon: "material-symbols:manage-accounts-rounded",
     },
   ],
 });
diff --git a/packages/ui/certd-client/src/views/certd/history/index.vue b/packages/ui/certd-client/src/views/certd/history/index.vue
index dea2c720d..74e298830 100644
--- a/packages/ui/certd-client/src/views/certd/history/index.vue
+++ b/packages/ui/certd-client/src/views/certd/history/index.vue
@@ -5,7 +5,7 @@
     </template>
     <fs-crud ref="crudRef" v-bind="crudBinding">
       <template #pagination-left>
-        <a-tooltip :title="t('certd.batchDelete')">
+        <a-tooltip v-if="hasActionPermission('write')" :title="t('certd.batchDelete')">
           <fs-button icon="DeleteOutlined" @click="handleBatchDelete"></fs-button>
         </a-tooltip>
       </template>
@@ -20,13 +20,20 @@ import createCrudOptions from "./crud";
 import { message, Modal } from "ant-design-vue";
 import { DeleteBatch } from "./api";
 import { useI18n } from "/src/locales";
+import { useCrudPermission } from "/@/plugin/permission";
 
 const { t } = useI18n();
 
 defineOptions({
   name: "PipelineHistory",
 });
-const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
+
+const context: any = {
+  permission: { isProjectPermission: true },
+};
+
+const { hasActionPermission } = useCrudPermission(context);
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
 
 const selectedRowKeys = context.selectedRowKeys;
 const handleBatchDelete = () => {
diff --git a/packages/ui/certd-client/src/views/certd/monitor/cert/index.vue b/packages/ui/certd-client/src/views/certd/monitor/cert/index.vue
index b8486669e..6c04a8314 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/cert/index.vue
+++ b/packages/ui/certd-client/src/views/certd/monitor/cert/index.vue
@@ -21,7 +21,7 @@ const { t } = useI18n();
 defineOptions({
   name: "CertStore",
 });
-const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: {} });
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { permission: { isProjectPermission: true } } });
 
 // 页面打开后获取列表数据
 onMounted(() => {
diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/setting/index.vue b/packages/ui/certd-client/src/views/certd/monitor/site/setting/index.vue
index 3f13c386c..5b6e1f15b 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/site/setting/index.vue
+++ b/packages/ui/certd-client/src/views/certd/monitor/site/setting/index.vue
@@ -37,7 +37,7 @@
           <div class="helper">{{ t("monitor.setting.cronTrigger") }}</div>
         </a-form-item>
         <a-form-item label=" " :colon="false" :wrapper-col="{ span: 16 }">
-          <loading-button type="primary" html-type="button" :click="doSave">{{ t("certd.save") }}</loading-button>
+          <loading-button type="primary" html-type="button" :click="doSave" :disabled="!hasActionPermission('write')">{{ t("certd.save") }}</loading-button>
         </a-form-item>
       </a-form>
     </div>
@@ -55,6 +55,7 @@ import { utils } from "/@/utils";
 import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
 import { useI18n } from "/src/locales";
 import { useSettingStore } from "/src/store/settings";
+import { useCrudPermission } from "/@/plugin/permission";
 
 const { t } = useI18n();
 
@@ -73,6 +74,8 @@ async function loadUserSettings() {
   merge(formState, data);
 }
 
+const { hasActionPermission } = useCrudPermission({ permission: { isProjectPermission: true } });
+
 loadUserSettings();
 const doSave = async (form: any) => {
   await utils.sleep(300);
diff --git a/packages/ui/certd-client/src/views/certd/notification/index.vue b/packages/ui/certd-client/src/views/certd/notification/index.vue
index 059404bbd..614e08c27 100644
--- a/packages/ui/certd-client/src/views/certd/notification/index.vue
+++ b/packages/ui/certd-client/src/views/certd/notification/index.vue
@@ -22,7 +22,7 @@ export default defineComponent({
   setup() {
     const api = createNotificationApi();
     notificationProvide(api);
-    const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api } });
+    const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api, permission: { isProjectPermission: true } } });
 
     // 页面打开后获取列表数据
     onMounted(() => {
diff --git a/packages/ui/certd-client/src/views/certd/open/openkey/index.vue b/packages/ui/certd-client/src/views/certd/open/openkey/index.vue
index 89e8815f5..1c4a425ac 100644
--- a/packages/ui/certd-client/src/views/certd/open/openkey/index.vue
+++ b/packages/ui/certd-client/src/views/certd/open/openkey/index.vue
@@ -19,7 +19,7 @@ import { OPEN_API_DOC } from "/@/views/certd/open/openkey/api";
 defineOptions({
   name: "OpenKey",
 });
-const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: {} });
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { permission: { isProjectPermission: true } } });
 
 // 页面打开后获取列表数据
 onMounted(() => {
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
index acea8e2e0..028694b01 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
@@ -124,11 +124,11 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
             click() {
               openCertApplyDialog({ key: "CertApply" });
             },
-            show: hasActionPermission("add"),
+            show: hasActionPermission("write"),
           },
           uploadCert: {
             order: 2,
-            show: hasActionPermission("uploadCert"),
+            show: hasActionPermission("write"),
             text: t("certd.commercialCertHosting"),
             type: "primary",
             tooltip: {
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/group/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/group/index.vue
index f4cdad28f..d83be9422 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/group/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/group/index.vue
@@ -14,12 +14,16 @@
 import { defineComponent, onActivated, onMounted } from "vue";
 import { useFs } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
-import { createApi } from "./api";
 
 export default defineComponent({
   name: "PipelineGroupManager",
   setup() {
-    const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: {} });
+    const { crudBinding, crudRef, crudExpose } = useFs({
+      createCrudOptions,
+      context: {
+        permission: { isProjectPermission: true },
+      },
+    });
 
     // 页面打开后获取列表数据
     onMounted(() => {
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/index.vue
index 0b590f234..4b8e31131 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/index.vue
@@ -37,11 +37,11 @@
       <div v-if="selectedRowKeys.length > 0" class="batch-actions">
         <div class="batch-actions-inner">
           <span>{{ t("certd.selectedCount", { count: selectedRowKeys.length }) }}</span>
-          <fs-button icon="ion:trash-outline" class="color-red" type="link" :text="t('certd.batchDelete')" @click="batchDelete"></fs-button>
+          <fs-button v-if="hasActionPermission('write')" icon="ion:trash-outline" class="color-red" type="link" :text="t('certd.batchDelete')" @click="batchDelete"></fs-button>
           <batch-rerun :selected-row-keys="selectedRowKeys" @change="batchFinished"></batch-rerun>
-          <change-group :selected-row-keys="selectedRowKeys" @change="batchFinished"></change-group>
-          <change-notification :selected-row-keys="selectedRowKeys" @change="batchFinished"></change-notification>
-          <change-trigger :selected-row-keys="selectedRowKeys" @change="batchFinished"></change-trigger>
+          <change-group v-if="hasActionPermission('write')" :selected-row-keys="selectedRowKeys" @change="batchFinished"></change-group>
+          <change-notification v-if="hasActionPermission('write')" :selected-row-keys="selectedRowKeys" @change="batchFinished"></change-notification>
+          <change-trigger v-if="hasActionPermission('write')" :selected-row-keys="selectedRowKeys" @change="batchFinished"></change-trigger>
         </div>
       </div>
       <template #form-bottom>
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/sub-domain/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/sub-domain/index.vue
index f713ed3a3..27135d4d8 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/sub-domain/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/sub-domain/index.vue
@@ -17,7 +17,7 @@
     </template>
     <fs-crud ref="crudRef" v-bind="crudBinding">
       <template #pagination-left>
-        <a-tooltip :title="t('certd.batchDelete')">
+        <a-tooltip v-if="hasActionPermission('write')" :title="t('certd.batchDelete')">
           <fs-button icon="DeleteOutlined" @click="handleBatchDelete"></fs-button>
         </a-tooltip>
       </template>
@@ -32,13 +32,21 @@ import createCrudOptions from "./crud";
 import { message, Modal } from "ant-design-vue";
 import { DeleteBatch } from "./api";
 import { useI18n } from "/src/locales";
+import { useCrudPermission } from "/@/plugin/permission";
 
 const { t } = useI18n();
 
 defineOptions({
   name: "CnameRecord",
 });
-const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
+const context: any = {
+  permission: {
+    isProjectPermission: true,
+  },
+};
+const { hasActionPermission } = useCrudPermission({ permission: context.permission });
+context.hasActionPermission = hasActionPermission;
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
 
 const selectedRowKeys = context.selectedRowKeys;
 const handleBatchDelete = () => {
diff --git a/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx b/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx
index 437b73a74..556336e92 100644
--- a/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx
@@ -6,7 +6,7 @@ import * as api from "./api";
 import { useSettingStore } from "/@/store/settings";
 import { useUserStore } from "/@/store/user";
 import { useI18n } from "/src/locales";
-import { userDict } from "../../dicts";
+import { useDicts } from "../../dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
@@ -35,6 +35,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   const selectedRowKeys: Ref<any[]> = ref([]);
   context.selectedRowKeys = selectedRowKeys;
 
+  const { userDict } = useDicts();
+
   return {
     crudOptions: {
       settings: {
diff --git a/packages/ui/certd-client/src/views/certd/project/index.vue b/packages/ui/certd-client/src/views/certd/project/index.vue
index 7412bf464..3830104e7 100644
--- a/packages/ui/certd-client/src/views/certd/project/index.vue
+++ b/packages/ui/certd-client/src/views/certd/project/index.vue
@@ -30,7 +30,8 @@ const { t } = useI18n();
 defineOptions({
   name: "MyProjectManager",
 });
-const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
+const context: any = { permission: { isProjectPermission: true, projectPermission: "admin" } };
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
 
 const selectedRowKeys = context.selectedRowKeys;
 const handleBatchDelete = () => {

From 787f6ef52893d8dc912ee2a7a5b8ce2b73c108c9 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 27 Feb 2026 00:06:44 +0800
Subject: [PATCH 33/62] =?UTF-8?q?perf:=20=E4=BB=BB=E5=8A=A1=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=B2=E8=A1=8C?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=8F=90=E7=A4=BA=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/certd/pipeline/pipeline/component/task-form/index.vue  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-form/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-form/index.vue
index 667566d38..0d81031d7 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-form/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-form/index.vue
@@ -49,6 +49,7 @@
                   </div>
                 </template>
               </v-draggable>
+              <div v-if="currentTask.steps?.length > 0" class="helper mt-6">任务步骤会串行执行，如果前面步骤失败，后面的步骤不会运行</div>
             </a-form-item>
           </div>
         </a-form>

From b2c421600c1a67b3ad87ea4dcfe30c88081ece8f Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 27 Feb 2026 00:14:53 +0800
Subject: [PATCH 34/62] =?UTF-8?q?chore:=20=E9=A6=96=E9=A1=B5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1=E9=A1=B9=E7=9B=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/ui/certd-client/src/api/service.ts   | 14 ++++++----
 .../ui/certd-client/src/components/index.ts   |  3 ++
 .../project-selector/project-current.vue      | 28 +++++++++++++++++++
 .../views/framework/home/dashboard/index.vue  |  5 ++++
 .../user/dashboard/statistic-controller.ts    | 13 +++++----
 .../monitor/service/cert-info-service.ts      |  5 +++-
 .../pipeline/service/history-service.ts       |  5 +++-
 .../pipeline/service/pipeline-service.ts      | 21 ++++++++------
 8 files changed, 72 insertions(+), 22 deletions(-)
 create mode 100644 packages/ui/certd-client/src/components/project-selector/project-current.vue

diff --git a/packages/ui/certd-client/src/api/service.ts b/packages/ui/certd-client/src/api/service.ts
index 6a27fb9f3..02b4a99df 100644
--- a/packages/ui/certd-client/src/api/service.ts
+++ b/packages/ui/certd-client/src/api/service.ts
@@ -136,27 +136,29 @@ function createService() {
  */
 function createRequestFunction(service: any) {
   return function (config: any) {
-    const configDefault = {
+    const configDefault: any = {
       headers: {
         "Content-Type": get(config, "headers.Content-Type", "application/json"),
       } as any,
       timeout: 30000,
       baseURL: env.API,
       data: {},
+      params: {},
     };
     const projectStore = useProjectStore();
 
-    if (projectStore.isEnterprise && !config.url.startsWith("/sys") && !config.url.startsWith("http")) {
-      configDefault.headers["project-id"] = projectStore.currentProjectId;
-    }
-
     const userStore = useUserStore();
     const token = userStore.getToken;
     if (token != null) {
       // @ts-ignore
       configDefault.headers.Authorization = token;
     }
-    return service(Object.assign(configDefault, config));
+    Object.assign(configDefault, config);
+
+    if (projectStore.isEnterprise && !config.url.startsWith("/sys") && !config.url.startsWith("http")) {
+      configDefault.params.projectId = projectStore.currentProjectId;
+    }
+    return service(configDefault);
   };
 }
 
diff --git a/packages/ui/certd-client/src/components/index.ts b/packages/ui/certd-client/src/components/index.ts
index fdb3d94a5..418472789 100644
--- a/packages/ui/certd-client/src/components/index.ts
+++ b/packages/ui/certd-client/src/components/index.ts
@@ -17,6 +17,8 @@ import NotificationSelector from "../views/certd/notification/notification-selec
 import EmailSelector from "./email-selector/index.vue";
 import ValidTimeFormat from "./valid-time-format.vue";
 import ProjectSelector from "./project-selector/index.vue";
+import ProjectCurrent from "./project-selector/project-current.vue";
+
 export default {
   install(app: any) {
     app.component(
@@ -47,5 +49,6 @@ export default {
     app.use(vip);
     app.use(Plugins);
     app.component("ProjectSelector", ProjectSelector);
+    app.component("ProjectCurrent", ProjectCurrent);
   },
 };
diff --git a/packages/ui/certd-client/src/components/project-selector/project-current.vue b/packages/ui/certd-client/src/components/project-selector/project-current.vue
new file mode 100644
index 000000000..5ca94cf6b
--- /dev/null
+++ b/packages/ui/certd-client/src/components/project-selector/project-current.vue
@@ -0,0 +1,28 @@
+<template>
+  <a-tag color="green" class="flex-center flex pointer items-center button-text" title="当前项目">
+    <!-- <fs-icon icon="ion:apps" class="mr-1"></fs-icon> -->
+    <fs-icon :icon="currentIcon" class="mr-5"></fs-icon>
+    当前项目：{{ projectStore.currentProject?.name || "..." }}
+  </a-tag>
+</template>
+
+<script lang="ts" setup>
+import { computed, onMounted } from "vue";
+import { useProjectStore } from "/@/store/project";
+import { useDicts } from "/@/views/certd/dicts";
+defineOptions({
+  name: "ProjectCurrent",
+});
+
+const projectStore = useProjectStore();
+// onMounted(async () => {
+//   await projectStore.reload();
+// });
+
+const { projectPermissionDict } = useDicts();
+
+const currentIcon = computed(() => {
+  return projectPermissionDict.dataMap[projectStore.currentProject?.permission || ""]?.icon || "";
+});
+</script>
+<style lang="less"></style>
diff --git a/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue b/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue
index abd8eecc1..8455eb7db 100644
--- a/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue
+++ b/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue
@@ -35,6 +35,11 @@
                 <a-divider type="vertical" />
                 <vip-button mode="nav" style="font-size: 12px"></vip-button>
               </template>
+
+              <template v-if="settingsStore.isEnterprise">
+                <a-divider type="vertical" />
+                <project-current></project-current>
+              </template>
               <template v-if="settingsStore.isComm">
                 <a-divider type="vertical" />
                 <suite-card class="m-0"></suite-card>
diff --git a/packages/ui/certd-server/src/controller/user/dashboard/statistic-controller.ts b/packages/ui/certd-server/src/controller/user/dashboard/statistic-controller.ts
index f41bf0778..970ffb035 100644
--- a/packages/ui/certd-server/src/controller/user/dashboard/statistic-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/dashboard/statistic-controller.ts
@@ -46,14 +46,15 @@ export class StatisticController extends BaseController {
 
   @Post('/count', { summary: Constants.per.authOnly })
   public async count() {
-    const pipelineCount = await this.pipelineService.count({ userId: this.getUserId() });
-    const pipelineStatusCount = await this.pipelineService.statusCount({ userId: this.getUserId() });
-    const pipelineEnableCount = await this.pipelineService.enableCount({ userId: this.getUserId() });
+    const {userId,projectId} = await this.getProjectUserIdRead();
+    const pipelineCount = await this.pipelineService.count({ userId,projectId });
+    const pipelineStatusCount = await this.pipelineService.statusCount({ userId,projectId });
+    const pipelineEnableCount = await this.pipelineService.enableCount({ userId,projectId });
 
-    const historyCount = await this.historyService.countPerDay({ userId: this.getUserId(), days: 7 });
-    const expiringList = await this.pipelineService.latestExpiringList({ userId: this.getUserId(), count: 5 });
+    const historyCount = await this.historyService.countPerDay({ userId,projectId, days: 7 });
+    const expiringList = await this.pipelineService.latestExpiringList({ userId,projectId, count: 5 });
 
-    const certCount = await this.certInfoService.count({ userId: this.getUserId() });
+    const certCount = await this.certInfoService.count({ userId,projectId });
 
     const count: UserStatisticCount = {
       pipelineCount,
diff --git a/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts b/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts
index 32f8b31b4..190840966 100644
--- a/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts
+++ b/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts
@@ -191,11 +191,12 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
     });
   }
 
-  async count({ userId }: { userId: number }) {
+  async count({ userId,projectId }: { userId: number,projectId?:number }) {
     const total = await this.repository.count({
       where: {
         userId,
         expiresTime: Not(IsNull()),
+        projectId,
       },
     });
 
@@ -203,6 +204,7 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
       where: {
         userId,
         expiresTime: LessThan(new Date().getTime()),
+        projectId,
       },
     });
 
@@ -210,6 +212,7 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
       where: {
         userId,
         expiresTime: Between(new Date().getTime(), new Date().getTime() + 15 * 24 * 60 * 60 * 1000),
+        projectId,
       },
     });
 
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts
index 296569c07..4cc1a1b2d 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts
@@ -183,7 +183,7 @@ export class HistoryService extends BaseService<HistoryEntity> {
     }
   }
 
-  async countPerDay(param: { days: number; userId?: any }) {
+  async countPerDay(param: { days: number; userId?: any,projectId?:number }) {
     const todayEnd = dayjs().endOf('day');
     const where: any = {
       createTime: MoreThan(todayEnd.add(-param.days, 'day').toDate()),
@@ -191,6 +191,9 @@ export class HistoryService extends BaseService<HistoryEntity> {
     if (param.userId > 0) {
       where.userId = param.userId;
     }
+    if (param.projectId > 0) {
+      where.projectId = param.projectId;
+    }
     const result = await this.getRepository()
       .createQueryBuilder('main')
       .select(`${this.dbAdapter.date('main.createTime')}  AS date`) // 将UNIX时间戳转换为日期
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
index aee1395c4..a7a939f48 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
@@ -824,35 +824,39 @@ export class PipelineService extends BaseService<PipelineEntity> {
     await this.historyLogService.addOrUpdate(logEntity);
   }
 
-  async count(param: { userId?: any }) {
+  async count(param: { userId?: any,projectId?:number }) {
     const count = await this.repository.count({
       where: {
-        userId: param.userId
+        userId: param.userId,
+        projectId: param.projectId,
+        isTemplate: false
       }
     });
     return count;
   }
 
-  async statusCount(param: { userId?: any } = {}) {
+  async statusCount(param: { userId?: any,projectId?:number } = {}) {
     const statusCount = await this.repository
       .createQueryBuilder()
       .select("status")
       .addSelect("count(1)", "count")
       .where({
-        userId: param.userId
+        userId: param.userId,
+        projectId: param.projectId
       })
       .groupBy("status")
       .getRawMany();
     return statusCount;
   }
 
-  async enableCount(param: { userId?: any } = {}) {
+  async enableCount(param: { userId?: any,projectId?:number } = {}) {
     const statusCount = await this.repository
       .createQueryBuilder()
       .select("disabled")
       .addSelect("count(1)", "count")
       .where({
-        userId: param.userId
+        userId: param.userId,
+        projectId: param.projectId
       })
       .groupBy("disabled")
       .getRawMany();
@@ -866,7 +870,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
     return result;
   }
 
-  async latestExpiringList({ userId }: any) {
+  async latestExpiringList({ userId,projectId }: any) {
     let list = await this.repository.find({
       select: {
         id: true,
@@ -875,7 +879,8 @@ export class PipelineService extends BaseService<PipelineEntity> {
       },
       where: {
         userId,
-        disabled: false
+        disabled: false,
+        projectId
       }
     });
     await this.fillLastVars(list);

From 316537eb4dcbe5ec57784e8bf95ee3cdfd21dce7 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 27 Feb 2026 00:37:24 +0800
Subject: [PATCH 35/62] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=81=B6?=
 =?UTF-8?q?=E5=B0=94=E4=B8=8B=E8=BD=BD=E8=AF=81=E4=B9=A6=E6=8A=A5=E6=9C=AA?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/project-selector/index.vue        |  2 +-
 .../components/project-selector/project-current.vue  |  2 +-
 .../src/views/certd/monitor/cert/crud.tsx            |  9 ++++++++-
 .../ui/certd-client/src/views/certd/pipeline/use.tsx | 10 +++++++++-
 .../src/controller/basic/login/login-controller.ts   |  4 +---
 .../src/controller/basic/login/oauth-controller.ts   |  8 ++++++++
 .../controller/user/monitor/cert-info-controller.ts  |  7 +++++--
 .../controller/user/pipeline/history-controller.ts   |  2 +-
 .../src/modules/login/service/login-service.ts       |  6 ++++++
 .../src/modules/pipeline/service/pipeline-service.ts | 12 ++++++++----
 10 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/packages/ui/certd-client/src/components/project-selector/index.vue b/packages/ui/certd-client/src/components/project-selector/index.vue
index e5be4aea4..b9f53a837 100644
--- a/packages/ui/certd-client/src/components/project-selector/index.vue
+++ b/packages/ui/certd-client/src/components/project-selector/index.vue
@@ -12,8 +12,8 @@
     </template>
     <div class="rounded pl-3 pr-3 px-2 py-1 flex-center flex pointer items-center bg-accent h-10 button-text" title="当前项目">
       <!-- <fs-icon icon="ion:apps" class="mr-1"></fs-icon> -->
-      <fs-icon :icon="currentIcon" class="mr-5"></fs-icon>
       当前项目：{{ projectStore.currentProject?.name || "..." }}
+      <fs-icon :icon="currentIcon" class="ml-5"></fs-icon>
     </div>
   </a-dropdown>
 </template>
diff --git a/packages/ui/certd-client/src/components/project-selector/project-current.vue b/packages/ui/certd-client/src/components/project-selector/project-current.vue
index 5ca94cf6b..073b65b82 100644
--- a/packages/ui/certd-client/src/components/project-selector/project-current.vue
+++ b/packages/ui/certd-client/src/components/project-selector/project-current.vue
@@ -1,8 +1,8 @@
 <template>
   <a-tag color="green" class="flex-center flex pointer items-center button-text" title="当前项目">
     <!-- <fs-icon icon="ion:apps" class="mr-1"></fs-icon> -->
-    <fs-icon :icon="currentIcon" class="mr-5"></fs-icon>
     当前项目：{{ projectStore.currentProject?.name || "..." }}
+    <fs-icon :icon="currentIcon" class="ml-5"></fs-icon>
   </a-tag>
 </template>
 
diff --git a/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx b/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
index 53bcf7738..69b5d44ed 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
@@ -12,6 +12,7 @@ import { useCertUpload } from "/@/views/certd/pipeline/cert-upload/use";
 import { useSettingStore } from "/@/store/settings";
 import { useProjectStore } from "/@/store/project";
 import { useDicts } from "../../dicts";
+import { useUserStore } from "/@/store/user";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -39,6 +40,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   const { myProjectDict } = useDicts();
   const settingStore = useSettingStore();
   const projectStore = useProjectStore();
+  const userStore = useUserStore();
   const model = useModal();
   const viewCert = async (row: any) => {
     const cert = await api.GetCert(row.id);
@@ -140,7 +142,12 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
                 notification.error({ message: t("certd.certificateNotGenerated") });
                 return;
               }
-              window.open("/api/monitor/cert/download?id=" + row.id);
+              let url = "/api/monitor/cert/download?id=" + row.id;
+              if (projectStore.isEnterprise) {
+                url += `&projectId=${projectStore.currentProject?.id}`;
+              }
+              url += `&token=${userStore.getToken}`;
+              window.open(url);
             },
           },
         },
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/use.tsx b/packages/ui/certd-client/src/views/certd/pipeline/use.tsx
index 1a69b3442..889dfecfa 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/use.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/use.tsx
@@ -3,8 +3,12 @@ import { notification } from "ant-design-vue";
 import CertView from "/@/views/certd/pipeline/cert-view.vue";
 import { env } from "/@/utils/util.env";
 import { useModal } from "/@/use/use-modal";
+import { useProjectStore } from "/@/store/project";
+import { useUserStore } from "/@/store/user";
 
 export function useCertViewer() {
+  const projectStore = useProjectStore();
+  const userStore = useUserStore();
   const model = useModal();
   const viewCert = async (id: number) => {
     const cert = await api.GetCert(id);
@@ -33,7 +37,11 @@ export function useCertViewer() {
       content: () => {
         const children = [];
         for (const file of files) {
-          const downloadUrl = `${env.API}/pi/history/download?pipelineId=${id}&fileId=${file.id}`;
+          let downloadUrl = `${env.API}/pi/history/download?pipelineId=${id}&fileId=${file.id}`;
+          if (projectStore.isEnterprise) {
+            downloadUrl += `&projectId=${projectStore.currentProject?.id}`;
+          }
+          downloadUrl += `&token=${userStore.getToken}`;
           children.push(
             <div>
               <div class={"flex-o m-5"}>
diff --git a/packages/ui/certd-server/src/controller/basic/login/login-controller.ts b/packages/ui/certd-server/src/controller/basic/login/login-controller.ts
index 0f3a739e5..6eae30469 100644
--- a/packages/ui/certd-server/src/controller/basic/login/login-controller.ts
+++ b/packages/ui/certd-server/src/controller/basic/login/login-controller.ts
@@ -40,9 +40,7 @@ export class LoginController extends BaseController {
   }
 
   private writeTokenCookie(token: { expire: any; token: any }) {
-    this.ctx.cookies.set("certd_token", token.token, {
-      maxAge: 1000 * token.expire
-    });
+    // this.loginService.writeTokenCookie(this.ctx,token);
   }
 
   @Post('/loginBySms', { summary: Constants.per.guest })
diff --git a/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts b/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts
index 8e89fdeb3..0933bf0d7 100644
--- a/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts
+++ b/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts
@@ -70,6 +70,8 @@ export class ConnectController extends BaseController {
     })
     return this.ok({ loginUrl, ticket });
   }
+
+
   @Get('/callback/:type', { summary: Constants.per.guest })
   public async callback(@Param('type') type: string, @Query() query: Record<string, string>) {
 
@@ -154,10 +156,15 @@ export class ConnectController extends BaseController {
       });
     }
 
+    this.writeTokenCookie(loginRes);
     //返回登录成功token
     return this.ok(loginRes);
   }
 
+  private writeTokenCookie(token: { expire: any; token: any }) {
+    // this.loginService.writeTokenCookie(this.ctx,token);
+  }
+
 
   @Post('/autoRegister', { summary: Constants.per.guest })
   public async autoRegister(@Body(ALL) body: { validationCode: string, type: string }) {
@@ -183,6 +190,7 @@ export class ConnectController extends BaseController {
     });
 
     const loginRes = await this.loginService.generateToken(newUser);
+    this.writeTokenCookie(loginRes);
     return this.ok(loginRes);
   }
 
diff --git a/packages/ui/certd-server/src/controller/user/monitor/cert-info-controller.ts b/packages/ui/certd-server/src/controller/user/monitor/cert-info-controller.ts
index 62c2b3d1d..b8a323898 100644
--- a/packages/ui/certd-server/src/controller/user/monitor/cert-info-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/monitor/cert-info-controller.ts
@@ -162,12 +162,15 @@ export class CertInfoController extends CrudController<CertInfoService> {
 
   @Get('/download', { summary: Constants.per.authOnly })
   async download(@Query('id') id: number) {
-    await this.checkOwner(this.getService(),id,"read");
+    const {userId,projectId} =await this.checkOwner(this.getService(),id,"read");
     const certInfo = await this.getService().info(id)
     if (certInfo == null) {
       throw new CommonException('file not found');
     }
-    if (certInfo.userId !== this.getUserId()) {
+    if (certInfo.userId !== userId) {
+      throw new CommonException('file not found');
+    }
+    if (projectId && certInfo.projectId !== projectId) {
       throw new CommonException('file not found');
     }
     // koa send file
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
index 43b083a35..92c06fb61 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
@@ -241,7 +241,7 @@ export class HistoryController extends CrudController<HistoryService> {
       history = await this.service.getLastHistory(pipelineId);
     }
     if (history == null) {
-      throw new CommonException('historyId is null');
+      throw new CommonException('流水线还未运行过');
     }
     const {projectId} = await this.getProjectUserIdRead()
     if (projectId) {
diff --git a/packages/ui/certd-server/src/modules/login/service/login-service.ts b/packages/ui/certd-server/src/modules/login/service/login-service.ts
index 8563782d4..684bab648 100644
--- a/packages/ui/certd-server/src/modules/login/service/login-service.ts
+++ b/packages/ui/certd-server/src/modules/login/service/login-service.ts
@@ -199,6 +199,12 @@ export class LoginService {
     return this.generateToken(info);
   }
 
+  writeTokenCookie(ctx:any,token: { expire: any; token: any }) {
+    ctx.cookies.set("certd_token", token.token, {
+      maxAge: 1000 * token.expire
+    });
+  }
+
 
   /**
    * 生成token
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
index a7a939f48..303bf981e 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
@@ -842,7 +842,8 @@ export class PipelineService extends BaseService<PipelineEntity> {
       .addSelect("count(1)", "count")
       .where({
         userId: param.userId,
-        projectId: param.projectId
+        projectId: param.projectId,
+        isTemplate: false
       })
       .groupBy("status")
       .getRawMany();
@@ -856,7 +857,8 @@ export class PipelineService extends BaseService<PipelineEntity> {
       .addSelect("count(1)", "count")
       .where({
         userId: param.userId,
-        projectId: param.projectId
+        projectId: param.projectId,
+        isTemplate: false
       })
       .groupBy("disabled")
       .getRawMany();
@@ -880,7 +882,8 @@ export class PipelineService extends BaseService<PipelineEntity> {
       where: {
         userId,
         disabled: false,
-        projectId
+        projectId,
+        isTemplate: false
       }
     });
     await this.fillLastVars(list);
@@ -902,7 +905,8 @@ export class PipelineService extends BaseService<PipelineEntity> {
       .addSelect("COUNT(1) AS count")
       .where({
         // 0点
-        createTime: MoreThan(todayEnd.add(-param.days, "day").toDate())
+        createTime: MoreThan(todayEnd.add(-param.days, "day").toDate()),
+        isTemplate: false
       })
       .groupBy("date")
       .getRawMany();

From e17f381b1fa35f716f61e30e3cc0c2946eea9a4a Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 27 Feb 2026 23:09:50 +0800
Subject: [PATCH 36/62] chore: project blank

---
 .../src/locales/langs/en-US/certd.ts          |  11 ++
 .../src/locales/langs/zh-CN/certd.ts          |  11 ++
 packages/ui/certd-client/src/router/guard.ts  |  17 +-
 .../src/router/source/modules/certd.ts        |  11 ++
 .../certd-client/src/store/project/index.ts   |  12 +-
 .../src/views/certd/project/blank.vue         | 122 +++++++++++++
 pnpm-lock.yaml                                | 160 ++++++++++++------
 7 files changed, 289 insertions(+), 55 deletions(-)
 create mode 100644 packages/ui/certd-client/src/views/certd/project/blank.vue

diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
index ccf565b95..585816573 100644
--- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
@@ -820,6 +820,17 @@ export default {
       admin: "Admin",
     },
   },
+  project: {
+    noProjectJoined: "You haven't joined any projects yet",
+    applyToJoin: "Please apply to join a project to start using",
+    systemProjects: "System Project List",
+    createdAt: "Created At",
+    applyJoin: "Apply to Join",
+    noSystemProjects: "No system projects available",
+    fetchFailed: "Failed to fetch project list",
+    applySuccess: "Application successful, waiting for admin approval",
+    applyFailed: "Application failed, please try again later",
+  },
   addonSelector: {
     select: "Select",
     placeholder: "select please",
diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
index a8fcfe758..803e51b48 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -836,4 +836,15 @@ export default {
       admin: "管理员",
     },
   },
+  project: {
+    noProjectJoined: "您还没有加入任何项目",
+    applyToJoin: "请申请加入项目以开始使用",
+    systemProjects: "系统项目列表",
+    createdAt: "创建时间",
+    applyJoin: "申请加入",
+    noSystemProjects: "暂无系统项目",
+    fetchFailed: "获取项目列表失败",
+    applySuccess: "申请成功，等待管理员审核",
+    applyFailed: "申请失败，请稍后重试",
+  },
 };
diff --git a/packages/ui/certd-client/src/router/guard.ts b/packages/ui/certd-client/src/router/guard.ts
index c18941595..ab370f432 100644
--- a/packages/ui/certd-client/src/router/guard.ts
+++ b/packages/ui/certd-client/src/router/guard.ts
@@ -9,7 +9,8 @@ import { useSettingStore } from "/@/store/settings";
 import { usePermissionStore } from "/@/plugin/permission/store.permission";
 import util from "/@/plugin/permission/util.permission";
 import { useUserStore } from "/@/store/user";
-
+import { useProjectStore } from "../store/project";
+export const PROJECT_BLANK_PATH = "/certd/project/blank";
 function buildAccessedMenus(menus: any) {
   if (menus == null) {
     return;
@@ -124,6 +125,20 @@ function setupAccessGuard(router: Router) {
         };
       }
       return true;
+    } else {
+      // 如果是项目模式
+      const projectStore = useProjectStore();
+      if (projectStore.isEnterprise) {
+        //加载我的项目
+        await projectStore.init();
+        if (!projectStore.currentProject && to.path !== PROJECT_BLANK_PATH) {
+          //没有项目
+          return {
+            path: PROJECT_BLANK_PATH,
+            replace: true,
+          };
+        }
+      }
     }
   });
 }
diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts
index ab624c908..c7582f0f2 100644
--- a/packages/ui/certd-client/src/router/source/modules/certd.ts
+++ b/packages/ui/certd-client/src/router/source/modules/certd.ts
@@ -42,6 +42,17 @@ export const certdResources = [
           permission: "sys:settings:edit",
         },
       },
+      {
+        title: "certd.sysResources.myProjectBlank",
+        name: "MyProjectBlank",
+        path: "/certd/project/blank",
+        component: "/certd/project/blank.vue",
+        meta: {
+          isMenu: false,
+          show: true,
+          icon: "ion:apps",
+        },
+      },
       {
         title: "certd.pipeline",
         name: "PipelineManager",
diff --git a/packages/ui/certd-client/src/store/project/index.ts b/packages/ui/certd-client/src/store/project/index.ts
index 9160b4178..68d656524 100644
--- a/packages/ui/certd-client/src/store/project/index.ts
+++ b/packages/ui/certd-client/src/store/project/index.ts
@@ -13,6 +13,7 @@ export type ProjectItem = {
 
 export const useProjectStore = defineStore("app.project", () => {
   const myProjects = ref([]);
+  const inited = ref(false);
   const lastProjectId = LocalStorage.get("currentProjectId");
   const currentProjectId = ref(lastProjectId); // 直接调用
 
@@ -66,13 +67,16 @@ export const useProjectStore = defineStore("app.project", () => {
   }
 
   async function reload() {
-    const projects = await api.MyProjectList();
-    myProjects.value = projects;
+    debugger;
+    inited.value = false;
+    await init();
   }
 
   async function init() {
-    if (!myProjects.value) {
-      await reload();
+    debugger;
+    if (!inited.value) {
+      await loadMyProjects();
+      inited.value = true;
     }
     return myProjects.value;
   }
diff --git a/packages/ui/certd-client/src/views/certd/project/blank.vue b/packages/ui/certd-client/src/views/certd/project/blank.vue
new file mode 100644
index 000000000..53d783fec
--- /dev/null
+++ b/packages/ui/certd-client/src/views/certd/project/blank.vue
@@ -0,0 +1,122 @@
+<template>
+  <fs-page class="page-cert">
+    <template #header>
+      <div class="title">
+        {{ t("certd.sysResources.myProjectManager") }}
+      </div>
+    </template>
+    <div class="blank-container">
+      <div class="project-list-container">
+        <h3 class="text-lg font-medium mb-4">{{ t("certd.project.systemProjects") }}</h3>
+        <a-card v-for="project in projects" :key="project.id" :bordered="false" class="project-card">
+          <div class="project-card-content">
+            <div class="project-info">
+              <h4 class="text-md font-medium">{{ project.name }}</h4>
+              <p class="text-gray-500 text-sm">{{ t("certd.project.createdAt") }}: {{ formatDate(project.createTime) }}</p>
+            </div>
+            <a-button type="primary" @click="applyToJoin(project.id)">{{ t("certd.project.applyJoin") }}</a-button>
+          </div>
+        </a-card>
+        <div v-if="projects.length === 0" class="no-projects"></div>
+      </div>
+    </div>
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted } from "vue";
+import { useI18n } from "/src/locales";
+import { message } from "ant-design-vue";
+import { request } from "/src/api/service";
+
+const { t } = useI18n();
+
+const projects = ref<any[]>([]);
+
+const getSystemProjects = async () => {
+  try {
+    // 假设这里调用获取系统项目列表的API
+    const response = await request({
+      url: "/enterprise/project/list",
+      method: "post",
+      data: { type: "system" }, // 假设type=system表示系统项目
+    });
+    projects.value = response || [];
+  } catch (error) {
+    message.error(t("certd.project.fetchFailed"));
+    console.error("获取项目列表失败:", error);
+  }
+};
+
+const applyToJoin = async (projectId: number) => {
+  try {
+    // 假设这里调用申请加入项目的API
+    await request({
+      url: "/enterprise/project/apply",
+      method: "post",
+      data: { projectId },
+    });
+    message.success(t("certd.project.applySuccess"));
+    // 申请成功后可以刷新页面或跳转到项目列表
+  } catch (error) {
+    message.error(t("certd.project.applyFailed"));
+    console.error("申请加入项目失败:", error);
+  }
+};
+
+const formatDate = (dateString: string) => {
+  if (!dateString) return "";
+  const date = new Date(dateString);
+  return date.toLocaleString();
+};
+
+onMounted(() => {
+  getSystemProjects();
+});
+</script>
+
+<style lang="less">
+.blank-container {
+  padding: 24px;
+  max-width: 1200px;
+  margin: 0 auto;
+}
+
+.empty-state {
+  margin-bottom: 48px;
+  text-align: center;
+}
+
+.empty-description {
+  margin-top: 16px;
+}
+
+.project-list-container {
+  margin-top: 32px;
+}
+
+.project-card {
+  margin-bottom: 16px;
+  transition: all 0.3s;
+
+  &:hover {
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+  }
+}
+
+.project-card-content {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.project-info {
+  flex: 1;
+}
+
+.no-projects {
+  margin-top: 24px;
+  padding: 48px 0;
+  text-align: center;
+}
+</style>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9d2c6e510..cf49b81f1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -49,7 +49,7 @@ importers:
   packages/core/acme-client:
     dependencies:
       '@certd/basic':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../basic
       '@peculiar/x509':
         specifier: ^1.11.0
@@ -213,11 +213,11 @@ importers:
   packages/core/pipeline:
     dependencies:
       '@certd/basic':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../basic
       '@certd/plus-core':
-        specifier: ^1.38.9
-        version: link:../../pro/plus-core
+        specifier: ^1.38.12
+        version: 1.38.12
       dayjs:
         specifier: ^1.11.7
         version: 1.11.13
@@ -412,7 +412,7 @@ importers:
   packages/libs/lib-k8s:
     dependencies:
       '@certd/basic':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../core/basic
       '@kubernetes/client-node':
         specifier: 0.21.0
@@ -452,20 +452,20 @@ importers:
   packages/libs/lib-server:
     dependencies:
       '@certd/acme-client':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../core/acme-client
       '@certd/basic':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../core/basic
       '@certd/pipeline':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../core/pipeline
       '@certd/plugin-lib':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../plugins/plugin-lib
       '@certd/plus-core':
-        specifier: ^1.38.9
-        version: link:../../pro/plus-core
+        specifier: ^1.38.12
+        version: 1.38.12
       '@midwayjs/cache':
         specifier: 3.14.0
         version: 3.14.0
@@ -610,16 +610,16 @@ importers:
   packages/plugins/plugin-cert:
     dependencies:
       '@certd/acme-client':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../core/acme-client
       '@certd/basic':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../core/basic
       '@certd/pipeline':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../core/pipeline
       '@certd/plugin-lib':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../plugin-lib
       psl:
         specifier: ^1.9.0
@@ -683,17 +683,17 @@ importers:
         specifier: ^3.964.0
         version: 3.964.0(aws-crt@1.26.2)
       '@certd/acme-client':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../core/acme-client
       '@certd/basic':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../core/basic
       '@certd/pipeline':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../core/pipeline
       '@certd/plus-core':
-        specifier: ^1.38.9
-        version: link:../../pro/plus-core
+        specifier: ^1.38.12
+        version: 1.38.12
       '@kubernetes/client-node':
         specifier: 0.21.0
         version: 0.21.0
@@ -783,16 +783,16 @@ importers:
   packages/pro/commercial-core:
     dependencies:
       '@certd/basic':
-        specifier: ^1.38.9
+        specifier: ^1.38.8
         version: link:../../core/basic
       '@certd/lib-server':
-        specifier: ^1.38.9
+        specifier: ^1.38.8
         version: link:../../libs/lib-server
       '@certd/pipeline':
-        specifier: ^1.38.9
+        specifier: ^1.38.8
         version: link:../../core/pipeline
       '@certd/plus-core':
-        specifier: ^1.38.9
+        specifier: ^1.38.8
         version: link:../plus-core
       '@midwayjs/core':
         specifier: 3.20.11
@@ -865,16 +865,16 @@ importers:
   packages/pro/plugin-plus:
     dependencies:
       '@certd/basic':
-        specifier: ^1.38.9
+        specifier: ^1.38.8
         version: link:../../core/basic
       '@certd/pipeline':
-        specifier: ^1.38.9
+        specifier: ^1.38.8
         version: link:../../core/pipeline
       '@certd/plugin-lib':
-        specifier: ^1.38.9
+        specifier: ^1.38.8
         version: link:../../plugins/plugin-lib
       '@certd/plus-core':
-        specifier: ^1.38.9
+        specifier: ^1.38.8
         version: link:../plus-core
       crypto-js:
         specifier: ^4.2.0
@@ -950,7 +950,7 @@ importers:
   packages/pro/plus-core:
     dependencies:
       '@certd/basic':
-        specifier: ^1.38.9
+        specifier: ^1.38.8
         version: link:../../core/basic
       dayjs:
         specifier: ^1.11.7
@@ -1246,10 +1246,10 @@ importers:
         version: 0.1.3(zod@3.24.4)
     devDependencies:
       '@certd/lib-iframe':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../libs/lib-iframe
       '@certd/pipeline':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../core/pipeline
       '@rollup/plugin-commonjs':
         specifier: ^25.0.7
@@ -1444,47 +1444,47 @@ importers:
         specifier: ^3.990.0
         version: 3.990.0(aws-crt@1.26.2)
       '@certd/acme-client':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../core/acme-client
       '@certd/basic':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../core/basic
       '@certd/commercial-core':
-        specifier: ^1.38.9
-        version: link:../../pro/commercial-core
+        specifier: ^1.38.12
+        version: 1.38.12(better-sqlite3@11.10.0)(mysql2@3.14.1)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.100)(typescript@5.9.3))
       '@certd/cv4pve-api-javascript':
         specifier: ^8.4.2
         version: 8.4.2
       '@certd/jdcloud':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../libs/lib-jdcloud
       '@certd/lib-huawei':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../libs/lib-huawei
       '@certd/lib-k8s':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../libs/lib-k8s
       '@certd/lib-server':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../libs/lib-server
       '@certd/midway-flyway-js':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../libs/midway-flyway-js
       '@certd/pipeline':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../core/pipeline
       '@certd/plugin-cert':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../plugins/plugin-cert
       '@certd/plugin-lib':
-        specifier: ^1.38.9
+        specifier: ^1.38.12
         version: link:../../plugins/plugin-lib
       '@certd/plugin-plus':
-        specifier: ^1.38.9
-        version: link:../../pro/plugin-plus
+        specifier: ^1.38.12
+        version: 1.38.12
       '@certd/plus-core':
-        specifier: ^1.38.9
-        version: link:../../pro/plus-core
+        specifier: ^1.38.12
+        version: 1.38.12
       '@google-cloud/publicca':
         specifier: ^1.3.0
         version: 1.3.0(encoding@0.1.13)
@@ -2820,9 +2820,18 @@ packages:
   '@better-scroll/zoom@2.5.1':
     resolution: {integrity: sha512-aGvFY5ooeZWS4RcxQLD+pGLpQHQxpPy0sMZV3yadcd2QK53PK9gS4Dp+BYfRv8lZ4/P2LoNEhr6Wq1DN6+uPlA==}
 
+  '@certd/commercial-core@1.38.12':
+    resolution: {integrity: sha512-kP4vM3F+D6TME9NYSM7Q1YqTx6Ig1dseWQUFVf7GnfG9E3A2odaRwmeYwy5QomChF0vbPHPkJqOtfYv9WItikQ==}
+
   '@certd/cv4pve-api-javascript@8.4.2':
     resolution: {integrity: sha512-udGce7ewrVl4DmZvX+17PjsnqsdDIHEDatr8QP0AVrY2p+8JkaSPW4mXCKiLGf82C9K2+GXgT+qNIqgW7tfF9Q==}
 
+  '@certd/plugin-plus@1.38.12':
+    resolution: {integrity: sha512-I0aQAzIRaDFSwM2vb/ycLqaNjVcb/fWUOgmX/BpHEnN446oNk5+pl8d4KFE+OMzEDQcwOwZhdXhjrOsskqY3PA==}
+
+  '@certd/plus-core@1.38.12':
+    resolution: {integrity: sha512-2BKhInDmMrH4l/WRKcSq7E6PA4ANcE1PVMIVoWlhSnnW+sghYUioymRaSoGTxJYfSvGHlLrqZXAassQHAzm98g==}
+
   '@certd/vue-js-cron-core@6.0.3':
     resolution: {integrity: sha512-kqzoAMhYz9j6FGNWEODRYtt4NpUEUwjpkU89z5WVg2tCtOcI5VhwyUGOd8AxiBCRfd6PtXvzuqw85PaOps9wrQ==}
 
@@ -15028,12 +15037,63 @@ snapshots:
     dependencies:
       '@better-scroll/core': 2.5.1
 
+  '@certd/commercial-core@1.38.12(better-sqlite3@11.10.0)(mysql2@3.14.1)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.100)(typescript@5.9.3))':
+    dependencies:
+      '@certd/basic': link:packages/core/basic
+      '@certd/lib-server': link:packages/libs/lib-server
+      '@certd/pipeline': link:packages/core/pipeline
+      '@certd/plus-core': 1.38.12
+      '@midwayjs/core': 3.20.11
+      '@midwayjs/koa': 3.20.13
+      '@midwayjs/logger': 3.4.2
+      '@midwayjs/typeorm': 3.20.11
+      dayjs: 1.11.13
+      typeorm: 0.3.24(better-sqlite3@11.10.0)(mysql2@3.14.1)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.100)(typescript@5.9.3))
+    transitivePeerDependencies:
+      - '@google-cloud/spanner'
+      - '@sap/hana-client'
+      - babel-plugin-macros
+      - better-sqlite3
+      - hdb-pool
+      - ioredis
+      - mongodb
+      - mssql
+      - mysql2
+      - oracledb
+      - pg
+      - pg-native
+      - pg-query-stream
+      - redis
+      - reflect-metadata
+      - sql.js
+      - sqlite3
+      - supports-color
+      - ts-node
+      - typeorm-aurora-data-api-driver
+
   '@certd/cv4pve-api-javascript@8.4.2':
     dependencies:
       debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
+  '@certd/plugin-plus@1.38.12':
+    dependencies:
+      '@certd/basic': link:packages/core/basic
+      '@certd/pipeline': link:packages/core/pipeline
+      '@certd/plugin-lib': link:packages/plugins/plugin-lib
+      '@certd/plus-core': 1.38.12
+      crypto-js: 4.2.0
+      dayjs: 1.11.13
+      form-data: 4.0.2
+      jsrsasign: 11.1.0
+      querystring: 0.2.1
+
+  '@certd/plus-core@1.38.12':
+    dependencies:
+      '@certd/basic': link:packages/core/basic
+      dayjs: 1.11.13
+
   '@certd/vue-js-cron-core@6.0.3':
     dependencies:
       mustache: 4.2.0
@@ -20599,13 +20659,13 @@ snapshots:
       resolve: 1.22.10
       semver: 6.3.1
 
-  eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8):
+  eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8):
     dependencies:
       eslint: 7.32.0
       prettier: 2.8.8
       prettier-linter-helpers: 1.0.0
     optionalDependencies:
-      eslint-config-prettier: 8.10.0(eslint@7.32.0)
+      eslint-config-prettier: 8.10.0(eslint@8.57.0)
 
   eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@8.57.0)(prettier@2.8.8):
     dependencies:
@@ -23009,7 +23069,7 @@ snapshots:
       eslint: 7.32.0
       eslint-config-prettier: 8.10.0(eslint@7.32.0)
       eslint-plugin-node: 11.1.0(eslint@7.32.0)
-      eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8)
+      eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8)
       execa: 5.1.1
       inquirer: 7.3.3
       json5: 2.2.3

From 6163c3f08e9b8c9cd1cd564fb3e0133926c955e7 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sat, 28 Feb 2026 00:49:02 +0800
Subject: [PATCH 37/62] chore: join project

---
 packages/ui/certd-client/src/api/tools.ts     |  18 +--
 .../src/locales/langs/en-US/certd.ts          |   4 +
 .../src/locales/langs/zh-CN/certd.ts          |   8 +-
 packages/ui/certd-client/src/router/guard.ts  |   6 +-
 .../src/router/source/modules/certd.ts        |   8 +-
 .../ui/certd-client/src/views/certd/dicts.ts  |  24 +++
 .../src/views/certd/project/blank.vue         | 122 --------------
 .../src/views/certd/project/join.vue          | 153 ++++++++++++++++++
 .../db/migration/v10038__admin_mode.sql       |   1 +
 .../user/enterprise/project-controller.ts     |  80 +++++++++
 .../sys/enterprise/entity/project-member.ts   |   3 +
 .../modules/sys/enterprise/entity/project.ts  |   6 +
 .../service/project-member-service.ts         |   5 +-
 .../sys/enterprise/service/project-service.ts |  87 +++++++++-
 14 files changed, 379 insertions(+), 146 deletions(-)
 delete mode 100644 packages/ui/certd-client/src/views/certd/project/blank.vue
 create mode 100644 packages/ui/certd-client/src/views/certd/project/join.vue

diff --git a/packages/ui/certd-client/src/api/tools.ts b/packages/ui/certd-client/src/api/tools.ts
index 193a570c1..f889197eb 100644
--- a/packages/ui/certd-client/src/api/tools.ts
+++ b/packages/ui/certd-client/src/api/tools.ts
@@ -19,30 +19,30 @@ export function parse(jsonString = "{}", defaultValue = {}) {
 /**
  * @description 接口请求返回
  * @param {Any} data 返回值
- * @param {String} msg 状态信息
+ * @param {String} message 状态信息
  * @param {Number} code 状态码
  */
-export function response(data = {}, msg = "", code = 0) {
-  return [200, { code, msg, data }];
+export function response(data = {}, message = "", code = 0) {
+  return [200, { code, message, data }];
 }
 
 /**
  * @description 接口请求返回 正确返回
  * @param {Any} data 返回值
- * @param {String} msg 状态信息
+ * @param {String} message 状态信息
  */
-export function responseSuccess(data = {}, msg = "成功") {
-  return response(data, msg);
+export function responseSuccess(data = {}, message = "成功") {
+  return response(data, message);
 }
 
 /**
  * @description 接口请求返回 错误返回
  * @param {Any} data 返回值
- * @param {String} msg 状态信息
+ * @param {String} message 状态信息
  * @param {Number} code 状态码
  */
-export function responseError(data = {}, msg = "请求失败", code = 500) {
-  return response(data, msg, code);
+export function responseError(data = {}, message = "请求失败", code = 500) {
+  return response(data, message, code);
 }
 
 /**
diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
index 585816573..5d56e96cb 100644
--- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
@@ -218,6 +218,7 @@ export default {
     projectUserManager: "Project User Management",
     myProjectManager: "My Projects",
     myProjectDetail: "Project Detail",
+    projectJoin: "Join Project",
   },
   certificateRepo: {
     title: "Certificate Repository",
@@ -830,6 +831,9 @@ export default {
     fetchFailed: "Failed to fetch project list",
     applySuccess: "Application successful, waiting for admin approval",
     applyFailed: "Application failed, please try again later",
+    leave: "Leave Project",
+    leaveSuccess: "Leave project successful",
+    leaveFailed: "Leave project failed, please try again later",
   },
   addonSelector: {
     select: "Select",
diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
index 803e51b48..1d2d8b819 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -224,6 +224,7 @@ export default {
     enterpriseSetting: "企业设置",
     myProjectManager: "我的项目",
     myProjectDetail: "项目详情",
+    projectJoin: "加入项目",
   },
   certificateRepo: {
     title: "证书仓库",
@@ -839,12 +840,15 @@ export default {
   project: {
     noProjectJoined: "您还没有加入任何项目",
     applyToJoin: "请申请加入项目以开始使用",
-    systemProjects: "系统项目列表",
+    projectList: "项目列表",
     createdAt: "创建时间",
     applyJoin: "申请加入",
-    noSystemProjects: "暂无系统项目",
+    noProjects: "暂无项目",
     fetchFailed: "获取项目列表失败",
     applySuccess: "申请成功，等待管理员审核",
     applyFailed: "申请失败，请稍后重试",
+    leave: "退出项目",
+    leaveSuccess: "退出项目成功",
+    leaveFailed: "退出项目失败，请稍后重试",
   },
 };
diff --git a/packages/ui/certd-client/src/router/guard.ts b/packages/ui/certd-client/src/router/guard.ts
index ab370f432..12bc772bc 100644
--- a/packages/ui/certd-client/src/router/guard.ts
+++ b/packages/ui/certd-client/src/router/guard.ts
@@ -10,7 +10,7 @@ import { usePermissionStore } from "/@/plugin/permission/store.permission";
 import util from "/@/plugin/permission/util.permission";
 import { useUserStore } from "/@/store/user";
 import { useProjectStore } from "../store/project";
-export const PROJECT_BLANK_PATH = "/certd/project/blank";
+export const PROJECT_JOIN_PATH = "/certd/project/join";
 function buildAccessedMenus(menus: any) {
   if (menus == null) {
     return;
@@ -131,10 +131,10 @@ function setupAccessGuard(router: Router) {
       if (projectStore.isEnterprise) {
         //加载我的项目
         await projectStore.init();
-        if (!projectStore.currentProject && to.path !== PROJECT_BLANK_PATH) {
+        if (!projectStore.currentProject && to.path !== PROJECT_JOIN_PATH) {
           //没有项目
           return {
-            path: PROJECT_BLANK_PATH,
+            path: PROJECT_JOIN_PATH,
             replace: true,
           };
         }
diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts
index c7582f0f2..990aac7eb 100644
--- a/packages/ui/certd-client/src/router/source/modules/certd.ts
+++ b/packages/ui/certd-client/src/router/source/modules/certd.ts
@@ -43,10 +43,10 @@ export const certdResources = [
         },
       },
       {
-        title: "certd.sysResources.myProjectBlank",
-        name: "MyProjectBlank",
-        path: "/certd/project/blank",
-        component: "/certd/project/blank.vue",
+        title: "certd.sysResources.projectJoin",
+        name: "ProjectJoin",
+        path: "/certd/project/join",
+        component: "/certd/project/join.vue",
         meta: {
           isMenu: false,
           show: true,
diff --git a/packages/ui/certd-client/src/views/certd/dicts.ts b/packages/ui/certd-client/src/views/certd/dicts.ts
index 4b22d682a..3ce74fa29 100644
--- a/packages/ui/certd-client/src/views/certd/dicts.ts
+++ b/packages/ui/certd-client/src/views/certd/dicts.ts
@@ -24,6 +24,29 @@ const projectPermissionDict = dict({
   ],
 });
 
+const projectMemberStatusDict = dict({
+  data: [
+    {
+      value: "pending",
+      label: "待审核",
+      color: "orange",
+      icon: "material-symbols:hourglass-top",
+    },
+    {
+      value: "approved",
+      label: "已加入",
+      color: "green",
+      icon: "material-symbols:done-all",
+    },
+    {
+      value: "rejected",
+      label: "已拒绝",
+      color: "red",
+      icon: "material-symbols:close",
+    },
+  ],
+});
+
 const myProjectDict = dict({
   url: "/enterprise/project/list",
   getData: async () => {
@@ -56,5 +79,6 @@ export function useDicts() {
     projectPermissionDict,
     myProjectDict,
     userDict,
+    projectMemberStatusDict,
   };
 }
diff --git a/packages/ui/certd-client/src/views/certd/project/blank.vue b/packages/ui/certd-client/src/views/certd/project/blank.vue
deleted file mode 100644
index 53d783fec..000000000
--- a/packages/ui/certd-client/src/views/certd/project/blank.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<template>
-  <fs-page class="page-cert">
-    <template #header>
-      <div class="title">
-        {{ t("certd.sysResources.myProjectManager") }}
-      </div>
-    </template>
-    <div class="blank-container">
-      <div class="project-list-container">
-        <h3 class="text-lg font-medium mb-4">{{ t("certd.project.systemProjects") }}</h3>
-        <a-card v-for="project in projects" :key="project.id" :bordered="false" class="project-card">
-          <div class="project-card-content">
-            <div class="project-info">
-              <h4 class="text-md font-medium">{{ project.name }}</h4>
-              <p class="text-gray-500 text-sm">{{ t("certd.project.createdAt") }}: {{ formatDate(project.createTime) }}</p>
-            </div>
-            <a-button type="primary" @click="applyToJoin(project.id)">{{ t("certd.project.applyJoin") }}</a-button>
-          </div>
-        </a-card>
-        <div v-if="projects.length === 0" class="no-projects"></div>
-      </div>
-    </div>
-  </fs-page>
-</template>
-
-<script lang="ts" setup>
-import { ref, onMounted } from "vue";
-import { useI18n } from "/src/locales";
-import { message } from "ant-design-vue";
-import { request } from "/src/api/service";
-
-const { t } = useI18n();
-
-const projects = ref<any[]>([]);
-
-const getSystemProjects = async () => {
-  try {
-    // 假设这里调用获取系统项目列表的API
-    const response = await request({
-      url: "/enterprise/project/list",
-      method: "post",
-      data: { type: "system" }, // 假设type=system表示系统项目
-    });
-    projects.value = response || [];
-  } catch (error) {
-    message.error(t("certd.project.fetchFailed"));
-    console.error("获取项目列表失败:", error);
-  }
-};
-
-const applyToJoin = async (projectId: number) => {
-  try {
-    // 假设这里调用申请加入项目的API
-    await request({
-      url: "/enterprise/project/apply",
-      method: "post",
-      data: { projectId },
-    });
-    message.success(t("certd.project.applySuccess"));
-    // 申请成功后可以刷新页面或跳转到项目列表
-  } catch (error) {
-    message.error(t("certd.project.applyFailed"));
-    console.error("申请加入项目失败:", error);
-  }
-};
-
-const formatDate = (dateString: string) => {
-  if (!dateString) return "";
-  const date = new Date(dateString);
-  return date.toLocaleString();
-};
-
-onMounted(() => {
-  getSystemProjects();
-});
-</script>
-
-<style lang="less">
-.blank-container {
-  padding: 24px;
-  max-width: 1200px;
-  margin: 0 auto;
-}
-
-.empty-state {
-  margin-bottom: 48px;
-  text-align: center;
-}
-
-.empty-description {
-  margin-top: 16px;
-}
-
-.project-list-container {
-  margin-top: 32px;
-}
-
-.project-card {
-  margin-bottom: 16px;
-  transition: all 0.3s;
-
-  &:hover {
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
-  }
-}
-
-.project-card-content {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.project-info {
-  flex: 1;
-}
-
-.no-projects {
-  margin-top: 24px;
-  padding: 48px 0;
-  text-align: center;
-}
-</style>
diff --git a/packages/ui/certd-client/src/views/certd/project/join.vue b/packages/ui/certd-client/src/views/certd/project/join.vue
new file mode 100644
index 000000000..56150dd66
--- /dev/null
+++ b/packages/ui/certd-client/src/views/certd/project/join.vue
@@ -0,0 +1,153 @@
+<template>
+  <fs-page class="page-project-join">
+    <template #header>
+      <div class="title">
+        {{ t("certd.sysResources.projectJoin") }}
+        <span v-if="projectStore.projects.length === 0" class="sub">{{ t("certd.project.noProjectJoined") }}</span>
+      </div>
+    </template>
+    <div class="project-container">
+      <h3 class="text-lg font-medium mb-4">{{ t("certd.project.projectList") }}</h3>
+      <div class="flex flex-wrap gap-4">
+        <div v-for="project in projects" :key="project.id" class="w-full md:w-1/4">
+          <a-card :bordered="true" class="project-card">
+            <div class="project-card-content">
+              <div class="project-info">
+                <h3 class="text-md font-bold title">{{ project.name }}</h3>
+                <p class="text-gray-500 text-sm">{{ formatDate(project.createTime) }}</p>
+              </div>
+              <div class="flex justify-between items-center">
+                <div v-if="project.status">
+                  <fs-values-format :model-value="project.status" :dict="projectMemberStatusDict"></fs-values-format>
+                </div>
+                <div v-if="project.permission"><fs-values-format :model-value="project.permission" :dict="projectPermissionDict"></fs-values-format></div>
+              </div>
+            </div>
+            <template #actions>
+              <span v-if="!project.status || project.status === 'rejected'" class="flex-inline items-center" :title="t('certd.project.applyJoin')" @click="applyToJoin(project.id)">
+                <fs-icon class="fs-18 mr-2" icon="mdi:checkbox-marked-circle-outline"></fs-icon>
+                {{ t("certd.project.applyJoin") }}
+              </span>
+              <span v-if="project.status === 'pending' || project.status === 'approved'" class="flex-inline items-center" :title="t('certd.project.leave')" @click="leaveProject(project.id)">
+                <fs-icon class="fs-18 mr-2" icon="mdi:arrow-right-thin-circle-outline"></fs-icon>
+                {{ t("certd.project.leave") }}
+              </span>
+            </template>
+          </a-card>
+        </div>
+      </div>
+    </div>
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted } from "vue";
+import { useI18n } from "/src/locales";
+import { message, Modal } from "ant-design-vue";
+import { request } from "/src/api/service";
+import { useProjectStore } from "/@/store/project";
+import dayjs from "dayjs";
+import { useDicts } from "../dicts";
+import { modalProps } from "ant-design-vue/es/modal/Modal";
+
+defineOptions({
+  name: "ProjectJoin",
+});
+const { t } = useI18n();
+
+const { projectMemberStatusDict, projectPermissionDict } = useDicts();
+
+const projects = ref<any[]>([]);
+
+const projectStore = useProjectStore();
+
+const getSystemProjects = async () => {
+  try {
+    // 假设这里调用获取系统项目列表的API
+    const response = await request({
+      url: "/enterprise/project/all",
+      method: "post",
+    });
+    projects.value = response || [];
+  } catch (error) {
+    message.error(t("certd.project.fetchFailed"));
+    console.error("获取项目列表失败:", error);
+  }
+};
+
+const applyToJoin = async (projectId: number) => {
+  // 假设这里调用申请加入项目的API
+  Modal.confirm({
+    title: t("certd.project.applyJoin"),
+    content: t("certd.project.applyJoinConfirm"),
+    onOk: async () => {
+      await request({
+        url: "/enterprise/project/applyJoin",
+        method: "post",
+        data: { projectId },
+      });
+      message.success(t("certd.project.applySuccess"));
+      await getSystemProjects();
+      // 申请成功后可以刷新页面或跳转到项目列表
+    },
+  });
+};
+
+const formatDate = (dateString: string) => {
+  if (!dateString) {
+    return "";
+  }
+  return dayjs(dateString).format("YYYY-MM-DD HH:mm:ss");
+};
+
+onMounted(() => {
+  getSystemProjects();
+});
+
+async function leaveProject(projectId: number) {
+  // 假设这里调用退出项目的API
+  Modal.confirm({
+    title: t("certd.project.leave"),
+    content: t("certd.project.leaveConfirm"),
+    onOk: async () => {
+      await request({
+        url: "/enterprise/project/leave",
+        method: "post",
+        data: { projectId },
+      });
+      message.success(t("certd.project.leaveSuccess"));
+      // 退出成功后可以刷新页面或跳转到项目列表
+      await getSystemProjects();
+    },
+  });
+}
+</script>
+
+<style lang="less">
+.page-project-join {
+  .project-container {
+    padding: 24px;
+    margin: 0 auto;
+    .project-card {
+      margin-bottom: 16px;
+      transition: all 0.3s;
+
+      &:hover {
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+      }
+
+      .project-card-content {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
+
+      .title {
+        font-size: 16px;
+        font-weight: bold;
+        margin-bottom: 8px;
+      }
+    }
+  }
+}
+</style>
diff --git a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
index 8f81bdb16..8e7a88f9f 100644
--- a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
+++ b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
@@ -82,6 +82,7 @@ CREATE TABLE "cd_project_member"
   "update_time" datetime     NOT NULL DEFAULT (CURRENT_TIMESTAMP)
 );
 
+ALTER TABLE cd_project_member ADD COLUMN  status varchar(128);
 
 CREATE INDEX "index_project_member_user_id" ON "cd_project_member" ("user_id");
 CREATE INDEX "index_project_member_project_id" ON "cd_project_member" ("project_id");
diff --git a/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts b/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts
index 66fbb60a7..61803aaea 100644
--- a/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts
@@ -2,6 +2,7 @@ import { BaseController, Constants } from '@certd/lib-server';
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
 import { ProjectService } from '../../../modules/sys/enterprise/service/project-service.js';
+import { ProjectMemberService } from '../../../modules/sys/enterprise/service/project-member-service.js';
 
 /**
  */
@@ -10,6 +11,10 @@ import { ProjectService } from '../../../modules/sys/enterprise/service/project-
 export class UserProjectController extends BaseController {
   @Inject()
   service: ProjectService;
+
+  @Inject()
+  projectMemberService: ProjectMemberService;
+  
   @Inject()
   authService: AuthService;
 
@@ -17,6 +22,11 @@ export class UserProjectController extends BaseController {
     return this.service;
   }
 
+  /**
+   * 我的项目
+   * @param body 
+   * @returns 
+   */
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body: any) {
     const userId= this.getUserId();
@@ -24,4 +34,74 @@ export class UserProjectController extends BaseController {
     return this.ok(res);
   }
 
+
+  /**
+   * 
+   * @param body 所有项目
+   * @returns 
+   */
+  @Post('/all', { summary: Constants.per.authOnly })
+  async all(@Body(ALL) body: any) {
+    const userId= this.getUserId();
+    const res = await this.service.getAllWithStatus(userId);
+    return this.ok(res);
+  }
+
+  @Post('/applyJoin', { summary: Constants.per.authOnly })
+  async applyJoin(@Body(ALL) body: any) {
+    const userId= this.getUserId();
+    const res = await this.service.applyJoin({ userId, projectId: body.projectId });
+    return this.ok(res);
+  }
+
+  @Post('/updateMember', { summary: Constants.per.authOnly })
+  async updateMember(@Body(ALL) body: any) {
+    const {projectId} = await this.getProjectUserIdAdmin();
+    const {status,permission,userId} = body;
+    const member = await this.projectMemberService.findOne({
+      where: {
+        projectId,
+        userId,
+      },
+    });
+    if (!member) {
+      throw new Error('成员不存在');
+    }
+    const res = await this.projectMemberService.update({
+      id: member.id,
+      status,
+      permission,
+    });
+    return this.ok(res);
+  }
+
+  @Post('/approveJoin', { summary: Constants.per.authOnly })
+  async approveJoin(@Body(ALL) body: any) {
+    const {projectId} = await this.getProjectUserIdAdmin();
+    const {status,permission,userId} = body;
+    const res = await this.service.approveJoin({ userId, projectId: projectId,status,permission });
+    return this.ok(res);
+  }
+
+  @Post('/delete', { summary: Constants.per.authOnly })
+  async delete(@Body(ALL) body: any) {
+     const {projectId} = await this.getProjectUserIdAdmin();
+    await this.projectMemberService.deleteWhere({
+      projectId,
+      userId: this.getUserId(),
+    });
+    return this.ok();
+  }
+
+  @Post('/leave', { summary: Constants.per.authOnly })
+  async leave(@Body(ALL) body: any) {
+    const {projectId}  = body
+     const userId = this.getUserId();
+    await this.projectMemberService.deleteWhere({
+      projectId,
+      userId,
+    });
+    return this.ok();
+  }
+
 }
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/entity/project-member.ts b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project-member.ts
index b0fb8a60d..516b65b8c 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/entity/project-member.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project-member.ts
@@ -16,6 +16,9 @@ export class ProjectMemberEntity {
   @Column({ name: 'permission', comment: '权限' })
   permission: string; // read / write / admin
 
+  @Column({ name: 'status', comment: '申请状态' })
+  status: string; // pending / approved / rejected
+
   @Column({
     name: 'create_time',
     comment: '创建时间',
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts
index 23a81fe95..52c12f015 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts
@@ -34,4 +34,10 @@ export class ProjectEntity {
 
   // user permission read write admin
   permission:string
+
 }
+
+export type ProjectMemberItem = {
+  memberId: number;
+  status: string;
+} & ProjectEntity
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
index d005494be..d70340315 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
@@ -18,7 +18,7 @@ export class ProjectMemberService extends BaseService<ProjectMemberEntity> {
     return this.repository;
   }
 
-  async add(bean: ProjectMemberEntity) {
+  async add(bean: Partial<ProjectMemberEntity>) {
     const {projectId, userId} = bean;
     if (!projectId) {
       throw new Error('项目ID不能为空');
@@ -38,10 +38,11 @@ export class ProjectMemberService extends BaseService<ProjectMemberEntity> {
    return await super.add(bean)
   }
 
-  async getByUserId(userId: number) {
+  async getByUserId(userId: number,status?:string) {
     return await this.repository.find({
       where: {
         userId,
+        status,
       },
     });
   }
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
index c959f3c02..d99f4a625 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
@@ -3,7 +3,7 @@ import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { LRUCache } from 'lru-cache';
 import { Repository } from 'typeorm';
-import { ProjectEntity } from '../entity/project.js';
+import { ProjectEntity, ProjectMemberItem } from '../entity/project.js';
 import { ProjectMemberService } from './project-member-service.js';
 
 const projectCache = new LRUCache<string, any>({
@@ -65,7 +65,7 @@ export class ProjectService extends BaseService<ProjectEntity> {
 
   async getUserProjects(userId: number) {
 
-    const memberList = await this.projectMemberService.getByUserId(userId);
+    const memberList = await this.projectMemberService.getByUserId(userId,'approved');
     const projectIds = memberList.map(item => item.projectId);
     const projectList = await this.repository.createQueryBuilder('project')
       .where(' project.disabled = false')
@@ -89,6 +89,39 @@ export class ProjectService extends BaseService<ProjectEntity> {
     return projectList
   }
 
+  async getAllWithStatus(userId: number) : Promise<ProjectMemberItem[]> {
+    let projectList:any = await this.find({
+      where: {
+        disabled: false,
+        userId: 0,
+      },
+    }) 
+    const  projectMemberItemList:ProjectMemberItem[] = projectList
+   
+    const memberList = await this.projectMemberService.getByUserId(userId);
+
+    const memberMap = memberList.reduce((prev, cur) => {
+      prev[cur.projectId] = cur as any;
+      return prev;
+    }, {} as Record<number, ProjectMemberItem>);
+
+    projectMemberItemList.forEach(item => {
+      if (item.adminId === userId) {
+        item.permission = 'admin';
+        item.status = 'approved';
+        item.memberId = userId
+      } else {
+        const memberItem :any = memberMap[item.id]
+        if (memberItem) {
+          item.permission = memberItem.permission;
+          item.status = memberItem.status;
+          item.memberId = memberItem.userId
+        }
+      }
+    })
+    return projectMemberItemList
+  }
+
   async checkAdminPermission({ userId, projectId }: { userId: number, projectId: number }) {
     return await this.checkPermission({
       userId,
@@ -143,8 +176,8 @@ export class ProjectService extends BaseService<ProjectEntity> {
             throw new Error('项目已禁用');
           } 
           const member = await this.projectMemberService.getMember(projectId, userId);
-          if (!member) {
-            throw new Error(`用户${userId}不是该项目${projectId}成员`);
+          if (!member || member.status !== 'approved') {
+            throw new Error(`用户${userId}还不是项目${projectId}的成员`);
           }
           savedPermission = member.permission;
         }
@@ -169,4 +202,50 @@ export class ProjectService extends BaseService<ProjectEntity> {
     }
     return true
   }
+
+
+  async applyJoin({ userId, projectId }: { userId: number, projectId: number }) {
+    const project = await this.info(projectId);
+    if (!project) {
+      throw new Error('项目不存在');
+    }
+    if (project.disabled) {
+      throw new Error('项目已禁用');
+    }
+    if (project.adminId === userId) {
+      throw new Error('申请用户已经是该项目的管理员');
+    }
+    const member = await this.projectMemberService.getMember(projectId, userId);
+    if (member && member.status === 'approved') {
+      throw new Error('用户已加入项目');
+    }
+    if (member){
+      this.projectMemberService.update({
+        id: member.id,
+        status: 'pending',
+      })
+    }else{
+      // 加入项目
+      await this.projectMemberService.add({
+        userId,
+        projectId,
+        permission: 'read',
+        status: 'pending',
+      })
+    }
+  }
+
+  async approveJoin({ userId, projectId,status,permission }: { userId: number, projectId: number,status:string,permission:string }) {
+    const member = await this.projectMemberService.getMember(projectId, userId);
+    if (!member) {
+      throw new Error('找不到用户的申请记录');
+    }
+ 
+    await this.projectMemberService.update({
+      id: member.id,
+      status: status,
+      permission,
+    })
+  }
+
 }

From 8a4e98193105dca85f61b8e290e6178a3fc522bb Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sat, 28 Feb 2026 12:13:31 +0800
Subject: [PATCH 38/62] chore: project detail join approve

---
 packages/ui/certd-client/src/api/service.ts   |   2 +-
 .../src/components/project-selector/index.vue |  13 ++
 .../src/locales/langs/en-US/certd.ts          |   3 +
 .../src/locales/langs/zh-CN/certd.ts          |   3 +
 .../src/plugin/fast-crud/index.tsx            |   1 -
 .../plugin/permission/use-crud-permission.ts  |   2 +
 .../src/router/source/modules/certd.ts        |  10 +-
 .../certd-client/src/store/project/index.ts   |   7 +-
 .../ui/certd-client/src/views/certd/dicts.ts  |  11 +-
 .../src/views/certd/project/detail/api.ts     |  12 +-
 .../src/views/certd/project/detail/crud.tsx   |  58 +++++++--
 .../src/views/certd/project/detail/index.vue  |  48 +++++++-
 .../src/views/certd/project/detail/use.ts     |  46 +++++++
 .../src/views/certd/project/join.vue          |  18 +--
 .../controller/user/basic/user-controller.ts  |  60 +++++++++
 .../user/enterprise/project-controller.ts     |  12 ++
 .../enterprise/project-member-controller.ts   | 115 ++++++++++++++++++
 .../service/project-member-service.ts         |   3 +-
 .../sys/enterprise/service/project-service.ts |  97 +++++++++------
 19 files changed, 449 insertions(+), 72 deletions(-)
 create mode 100644 packages/ui/certd-client/src/views/certd/project/detail/use.ts
 create mode 100644 packages/ui/certd-server/src/controller/user/basic/user-controller.ts
 create mode 100644 packages/ui/certd-server/src/controller/user/enterprise/project-member-controller.ts

diff --git a/packages/ui/certd-client/src/api/service.ts b/packages/ui/certd-client/src/api/service.ts
index 02b4a99df..e42647448 100644
--- a/packages/ui/certd-client/src/api/service.ts
+++ b/packages/ui/certd-client/src/api/service.ts
@@ -156,7 +156,7 @@ function createRequestFunction(service: any) {
     Object.assign(configDefault, config);
 
     if (projectStore.isEnterprise && !config.url.startsWith("/sys") && !config.url.startsWith("http")) {
-      configDefault.params.projectId = projectStore.currentProjectId;
+      configDefault.params.projectId = projectStore.currentProject?.id;
     }
     return service(configDefault);
   };
diff --git a/packages/ui/certd-client/src/components/project-selector/index.vue b/packages/ui/certd-client/src/components/project-selector/index.vue
index b9f53a837..1d6a30bd0 100644
--- a/packages/ui/certd-client/src/components/project-selector/index.vue
+++ b/packages/ui/certd-client/src/components/project-selector/index.vue
@@ -8,6 +8,12 @@
             <fs-values-format :model-value="item.permission" :dict="projectPermissionDict"></fs-values-format>
           </div>
         </a-menu-item>
+        <a-menu-item key="join">
+          <div class="flex items-center w-full">
+            <fs-icon icon="ion:add" class="mr-1"></fs-icon>
+            <span>加入其他项目</span>
+          </div>
+        </a-menu-item>
       </a-menu>
     </template>
     <div class="rounded pl-3 pr-3 px-2 py-1 flex-center flex pointer items-center bg-accent h-10 button-text" title="当前项目">
@@ -22,6 +28,7 @@
 import { computed, onMounted } from "vue";
 import { useProjectStore } from "/@/store/project";
 import { useDicts } from "/@/views/certd/dicts";
+import { useRouter } from "vue-router";
 defineOptions({
   name: "ProjectSelector",
 });
@@ -32,7 +39,13 @@ onMounted(async () => {
   console.log(projectStore.myProjects);
 });
 
+const router = useRouter();
 function handleMenuClick({ key }: any) {
+  if (key === "join") {
+    router.push("/certd/project/join");
+    return;
+  }
+
   projectStore.changeCurrentProject(key);
   window.location.reload();
 }
diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
index 5d56e96cb..dcf00ef08 100644
--- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
@@ -820,6 +820,7 @@ export default {
       write: "Write",
       admin: "Admin",
     },
+    projectMemberStatus: "Member Status",
   },
   project: {
     noProjectJoined: "You haven't joined any projects yet",
@@ -834,6 +835,8 @@ export default {
     leave: "Leave Project",
     leaveSuccess: "Leave project successful",
     leaveFailed: "Leave project failed, please try again later",
+    applyJoinConfirm: "Are you sure you want to apply to join this project?",
+    leaveConfirm: "Are you sure you want to leave this project?",
   },
   addonSelector: {
     select: "Select",
diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
index 1d2d8b819..23e7416fe 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -836,6 +836,7 @@ export default {
       write: "写入",
       admin: "管理员",
     },
+    projectMemberStatus: "成员状态",
   },
   project: {
     noProjectJoined: "您还没有加入任何项目",
@@ -850,5 +851,7 @@ export default {
     leave: "退出项目",
     leaveSuccess: "退出项目成功",
     leaveFailed: "退出项目失败，请稍后重试",
+    applyJoinConfirm: "确认加入项目？",
+    leaveConfirm: "确认退出项目？",
   },
 };
diff --git a/packages/ui/certd-client/src/plugin/fast-crud/index.tsx b/packages/ui/certd-client/src/plugin/fast-crud/index.tsx
index 50922a486..0ffd43247 100644
--- a/packages/ui/certd-client/src/plugin/fast-crud/index.tsx
+++ b/packages/ui/certd-client/src/plugin/fast-crud/index.tsx
@@ -123,7 +123,6 @@ function install(app: App, options: any = {}) {
               if (scope.key === "__blank__") {
                 return false;
               }
-
               //不能用 !scope.value ， 否则switch组件设置为关之后就消失了
               const { value, key, props } = scope;
               return !value && key != "_index" && value != false && value != 0;
diff --git a/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts b/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts
index 315e21ccd..964921ee2 100644
--- a/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts
+++ b/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts
@@ -82,6 +82,7 @@ export function useCrudPermission({ permission }: UseCrudPermissionProps) {
     if (isProjectPermission) {
       removePermission = per.projectPermission || "write";
     }
+    debugger;
     return LodashMerge(
       {
         actionbar: {
@@ -94,6 +95,7 @@ export function useCrudPermission({ permission }: UseCrudPermissionProps) {
             edit: { show: hasActionPermission(editPermission) },
             remove: { show: hasActionPermission(removePermission) },
             view: { show: hasActionPermission(viewPermission) },
+            copy: { show: hasActionPermission(addPermission) },
           },
         },
       },
diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts
index 990aac7eb..f5a4681f6 100644
--- a/packages/ui/certd-client/src/router/source/modules/certd.ts
+++ b/packages/ui/certd-client/src/router/source/modules/certd.ts
@@ -25,8 +25,8 @@ export const certdResources = [
             const projectStore = useProjectStore();
             return projectStore.isEnterprise;
           },
+          isMenu: false,
           icon: "ion:apps",
-          permission: "sys:settings:edit",
           keepAlive: true,
         },
       },
@@ -36,10 +36,12 @@ export const certdResources = [
         path: "/certd/project/detail",
         component: "/certd/project/detail/index.vue",
         meta: {
-          isMenu: false,
-          show: true,
+          show: () => {
+            const projectStore = useProjectStore();
+            return projectStore.isEnterprise;
+          },
+          isMenu: true,
           icon: "ion:apps",
-          permission: "sys:settings:edit",
         },
       },
       {
diff --git a/packages/ui/certd-client/src/store/project/index.ts b/packages/ui/certd-client/src/store/project/index.ts
index 68d656524..0627f8420 100644
--- a/packages/ui/certd-client/src/store/project/index.ts
+++ b/packages/ui/certd-client/src/store/project/index.ts
@@ -4,6 +4,7 @@ import { message } from "ant-design-vue";
 import { computed, ref } from "vue";
 import { useSettingStore } from "../settings";
 import { LocalStorage } from "/@/utils/util.storage";
+import { useUserStore } from "../user";
 
 export type ProjectItem = {
   id: string;
@@ -14,7 +15,9 @@ export type ProjectItem = {
 export const useProjectStore = defineStore("app.project", () => {
   const myProjects = ref([]);
   const inited = ref(false);
-  const lastProjectId = LocalStorage.get("currentProjectId");
+  const userStore = useUserStore();
+  const userId = userStore.getUserInfo?.id;
+  const lastProjectId = LocalStorage.get("currentProjectId:" + userId);
   const currentProjectId = ref(lastProjectId); // 直接调用
 
   const projects = computed(() => {
@@ -67,13 +70,11 @@ export const useProjectStore = defineStore("app.project", () => {
   }
 
   async function reload() {
-    debugger;
     inited.value = false;
     await init();
   }
 
   async function init() {
-    debugger;
     if (!inited.value) {
       await loadMyProjects();
       inited.value = true;
diff --git a/packages/ui/certd-client/src/views/certd/dicts.ts b/packages/ui/certd-client/src/views/certd/dicts.ts
index 3ce74fa29..f80f4754f 100644
--- a/packages/ui/certd-client/src/views/certd/dicts.ts
+++ b/packages/ui/certd-client/src/views/certd/dicts.ts
@@ -1,5 +1,6 @@
 import { dict } from "@fast-crud/fast-crud";
 import { GetMyProjectList } from "./project/api";
+import { request } from "/@/api/service";
 
 const projectPermissionDict = dict({
   data: [
@@ -65,8 +66,16 @@ const myProjectDict = dict({
 });
 
 const userDict = dict({
-  url: "/sys/authority/user/getSimpleUsers",
+  url: "/basic/user/getSimpleUsers",
   value: "id",
+  getData: async () => {
+    const res = await request({
+      url: "/basic/user/getSimpleUsers",
+      method: "POST",
+    });
+    return res;
+  },
+  immediate: false,
   onReady: ({ dict }) => {
     for (const item of dict.data) {
       item.label = item.nickName || item.username || item.phoneCode + item.mobile;
diff --git a/packages/ui/certd-client/src/views/certd/project/detail/api.ts b/packages/ui/certd-client/src/views/certd/project/detail/api.ts
index e62684eab..b1cdf8646 100644
--- a/packages/ui/certd-client/src/views/certd/project/detail/api.ts
+++ b/packages/ui/certd-client/src/views/certd/project/detail/api.ts
@@ -1,6 +1,6 @@
 import { request } from "/src/api/service";
 
-const apiPrefix = "/enterprise/myProjectMember";
+const apiPrefix = "/enterprise/projectMember";
 const userApiPrefix = "/sys/authority/user";
 export async function GetList(query: any) {
   return await request({
@@ -65,3 +65,13 @@ export async function GetUserSimpleByIds(query: any) {
     data: query,
   });
 }
+
+export async function ApproveJoin(id: any) {
+  return await request({
+    url: "/enterprise/project/approveJoin",
+    method: "post",
+    data: {
+      id,
+    },
+  });
+}
diff --git a/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx b/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx
index 556336e92..67a7a300c 100644
--- a/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx
@@ -7,6 +7,7 @@ import { useSettingStore } from "/@/store/settings";
 import { useUserStore } from "/@/store/user";
 import { useI18n } from "/src/locales";
 import { useDicts } from "../../dicts";
+import { useApprove } from "./use";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
@@ -34,8 +35,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   const settingStore = useSettingStore();
   const selectedRowKeys: Ref<any[]> = ref([]);
   context.selectedRowKeys = selectedRowKeys;
-
-  const { userDict } = useDicts();
+  const { hasActionPermission } = context;
+  const { userDict, projectMemberStatusDict, projectPermissionDict } = useDicts();
+  const { openApproveDialog } = useApprove();
 
   return {
     crudOptions: {
@@ -118,13 +120,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         permission: {
           title: t("certd.ent.projectPermission"),
           type: "dict-select",
-          dict: dict({
-            data: [
-              { label: t("certd.ent.permission.read"), value: "read", color: "cyan" },
-              { label: t("certd.ent.permission.write"), value: "write", color: "blue" },
-              { label: t("certd.ent.permission.admin"), value: "admin", color: "green" },
-            ],
-          }),
+          dict: projectPermissionDict,
           search: {
             show: true,
           },
@@ -135,6 +131,50 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             width: 200,
           },
         },
+        status: {
+          title: t("certd.ent.projectMemberStatus"),
+          type: "dict-select",
+          dict: projectMemberStatusDict,
+          search: {
+            show: true,
+          },
+          form: {
+            show: true,
+          },
+          column: {
+            width: 200,
+            cellRender: ({ row }) => {
+              let approveButton: any = "";
+              if (row.status === "pending" && hasActionPermission("admin")) {
+                approveButton = (
+                  <fs-button
+                    class="ml-2"
+                    type="primary"
+                    size="small"
+                    onClick={async () => {
+                      openApproveDialog({
+                        id: row.id,
+                        permission: row.permission,
+                        onSubmit: async (form: any) => {
+                          await api.ApproveJoin(form);
+                          crudExpose.doRefresh();
+                        },
+                      });
+                    }}
+                  >
+                    审批
+                  </fs-button>
+                );
+              }
+              return (
+                <div class="flex items-center">
+                  <fs-values-format model-value={row.status} dict={projectMemberStatusDict}></fs-values-format>
+                  {approveButton}
+                </div>
+              );
+            },
+          },
+        },
         createTime: {
           title: t("certd.createTime"),
           type: "datetime",
diff --git a/packages/ui/certd-client/src/views/certd/project/detail/index.vue b/packages/ui/certd-client/src/views/certd/project/detail/index.vue
index 84f8e6d3e..b122634cd 100644
--- a/packages/ui/certd-client/src/views/certd/project/detail/index.vue
+++ b/packages/ui/certd-client/src/views/certd/project/detail/index.vue
@@ -3,8 +3,14 @@
     <template #header>
       <div class="title">
         {{ t("certd.ent.projectDetailManager") }}
-        <span class="sub">
-          {{ t("certd.ent.projectDetailDescription") }}
+        <span class="sub flex-inline items-center">
+          项目名称 ：<a-tag color="green">{{ project?.name }}</a-tag>
+          <a-divider type="vertical"></a-divider>
+          管理员：<fs-values-format :model-value="project.adminId" :dict="userDict" color="green"></fs-values-format>
+          <!-- <a-divider type="vertical"></a-divider>
+          <fs-values-format :model-value="project.permission" :dict="projectPermissionDict"></fs-values-format>
+          <a-divider type="vertical"></a-divider>
+          <fs-values-format :model-value="project.status" :dict="projectMemberStatusDict"></fs-values-format> -->
         </span>
       </div>
     </template>
@@ -19,13 +25,17 @@
 </template>
 
 <script lang="ts" setup>
-import { onActivated, onMounted } from "vue";
+import { onActivated, onMounted, Ref, ref } from "vue";
 import { useFs } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
 import { message, Modal } from "ant-design-vue";
 import { DeleteBatch } from "./api";
 import { useI18n } from "/src/locales";
 import { useRoute } from "vue-router";
+import { useProjectStore } from "/@/store/project";
+import { request } from "/@/api/service";
+import { useDicts } from "../../dicts";
+import { useCrudPermission } from "/@/plugin/permission";
 
 const { t } = useI18n();
 
@@ -35,11 +45,38 @@ defineOptions({
 
 const route = useRoute();
 const projectIdStr = route.query.projectId as string;
-const projectId = Number(projectIdStr);
+let projectId = Number(projectIdStr);
+const projectStore = useProjectStore();
+if (!projectId) {
+  projectId = projectStore.currentProject?.id;
+}
+
+const { projectPermissionDict, projectMemberStatusDict, userDict } = useDicts();
+
+const project: Ref<any> = ref({});
+
+async function loadProjectDetail() {
+  if (projectId) {
+    const res = await request({
+      url: `/enterprise/project/detail`,
+      method: "post",
+      params: {
+        projectId,
+      },
+    });
+    project.value = res;
+  }
+}
 
 const context: any = {
   projectId,
+  permission: {
+    isProjectPermission: true,
+    projectPermission: "admin",
+  },
 };
+const { hasActionPermission } = useCrudPermission(context);
+context.hasActionPermission = hasActionPermission;
 const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
 
 const selectedRowKeys = context.selectedRowKeys;
@@ -61,7 +98,8 @@ const handleBatchDelete = () => {
 };
 
 // 页面打开后获取列表数据
-onMounted(() => {
+onMounted(async () => {
+  await loadProjectDetail();
   crudExpose.doRefresh();
 });
 onActivated(async () => {
diff --git a/packages/ui/certd-client/src/views/certd/project/detail/use.ts b/packages/ui/certd-client/src/views/certd/project/detail/use.ts
new file mode 100644
index 000000000..fbcae7782
--- /dev/null
+++ b/packages/ui/certd-client/src/views/certd/project/detail/use.ts
@@ -0,0 +1,46 @@
+import { dict } from "@fast-crud/fast-crud";
+import { useDicts } from "../../dicts";
+import { useFormDialog } from "/@/use/use-dialog";
+
+export function useApprove() {
+  const { openFormDialog } = useFormDialog();
+  const { projectPermissionDict, projectMemberStatusDict, userDict } = useDicts();
+  function openApproveDialog({ id, permission, onSubmit }: { id: any; permission: any; onSubmit: any }) {
+    openFormDialog({
+      title: "审批加入申请",
+      columns: {
+        permission: {
+          title: "成员权限",
+          type: "dict-select",
+          dict: projectPermissionDict,
+        },
+        status: {
+          title: "审批结果",
+          type: "dict-radio",
+          dict: dict({
+            data: [
+              {
+                label: "通过",
+                value: "approved",
+              },
+              {
+                label: "拒绝",
+                value: "rejected",
+              },
+            ],
+          }),
+        },
+      },
+      onSubmit: onSubmit,
+      initialForm: {
+        id: id,
+        permission: permission,
+        status: "approved",
+      },
+    });
+  }
+
+  return {
+    openApproveDialog,
+  };
+}
diff --git a/packages/ui/certd-client/src/views/certd/project/join.vue b/packages/ui/certd-client/src/views/certd/project/join.vue
index 56150dd66..9ed5a675a 100644
--- a/packages/ui/certd-client/src/views/certd/project/join.vue
+++ b/packages/ui/certd-client/src/views/certd/project/join.vue
@@ -16,19 +16,22 @@
                 <h3 class="text-md font-bold title">{{ project.name }}</h3>
                 <p class="text-gray-500 text-sm">{{ formatDate(project.createTime) }}</p>
               </div>
-              <div class="flex justify-between items-center">
-                <div v-if="project.status">
-                  <fs-values-format :model-value="project.status" :dict="projectMemberStatusDict"></fs-values-format>
+              <div class="flex-col items-center">
+                <div>管理员： <fs-values-format :model-value="project.adminId" :dict="userDict"></fs-values-format></div>
+                <div class="flex items-center mt-2">
+                  <div v-if="project.status">
+                    <fs-values-format :model-value="project.status" :dict="projectMemberStatusDict"></fs-values-format>
+                  </div>
+                  <div v-if="project.permission"><fs-values-format :model-value="project.permission" :dict="projectPermissionDict"></fs-values-format></div>
                 </div>
-                <div v-if="project.permission"><fs-values-format :model-value="project.permission" :dict="projectPermissionDict"></fs-values-format></div>
               </div>
             </div>
             <template #actions>
-              <span v-if="!project.status || project.status === 'rejected'" class="flex-inline items-center" :title="t('certd.project.applyJoin')" @click="applyToJoin(project.id)">
+              <span v-if="!project.status || project.status === 'rejected'" class="flex-inline items-center text-blue-500" :title="t('certd.project.applyJoin')" @click="applyToJoin(project.id)">
                 <fs-icon class="fs-18 mr-2" icon="mdi:checkbox-marked-circle-outline"></fs-icon>
                 {{ t("certd.project.applyJoin") }}
               </span>
-              <span v-if="project.status === 'pending' || project.status === 'approved'" class="flex-inline items-center" :title="t('certd.project.leave')" @click="leaveProject(project.id)">
+              <span v-if="project.status === 'pending' || project.status === 'approved'" class="flex-inline items-center text-red-500" :title="t('certd.project.leave')" @click="leaveProject(project.id)">
                 <fs-icon class="fs-18 mr-2" icon="mdi:arrow-right-thin-circle-outline"></fs-icon>
                 {{ t("certd.project.leave") }}
               </span>
@@ -48,14 +51,13 @@ import { request } from "/src/api/service";
 import { useProjectStore } from "/@/store/project";
 import dayjs from "dayjs";
 import { useDicts } from "../dicts";
-import { modalProps } from "ant-design-vue/es/modal/Modal";
 
 defineOptions({
   name: "ProjectJoin",
 });
 const { t } = useI18n();
 
-const { projectMemberStatusDict, projectPermissionDict } = useDicts();
+const { projectMemberStatusDict, projectPermissionDict, userDict } = useDicts();
 
 const projects = ref<any[]>([]);
 
diff --git a/packages/ui/certd-server/src/controller/user/basic/user-controller.ts b/packages/ui/certd-server/src/controller/user/basic/user-controller.ts
new file mode 100644
index 000000000..d74f37e1e
--- /dev/null
+++ b/packages/ui/certd-server/src/controller/user/basic/user-controller.ts
@@ -0,0 +1,60 @@
+import { Constants, isEnterprise } from '@certd/lib-server';
+import { Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
+import { In } from 'typeorm';
+import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
+import { UserService } from '../../../modules/sys/authority/service/user-service.js';
+import { BasicController } from '../../basic/code-controller.js';
+
+/**
+ * 通知
+ */
+@Provide()
+@Controller('/api/basic/user')
+export class BasicUserController extends BasicController {
+  @Inject()
+  service: UserService;
+  @Inject()
+  authService: AuthService;
+
+  getService(): UserService {
+    return this.service;
+  }
+
+  @Post('/getSimpleUserByIds', { summary: Constants.per.authOnly })
+  async getSimpleUserByIds(@Body('ids') ids: number[]) {
+    if(!isEnterprise()){
+       throw new Error('非企业模式不能获取用户信息');
+    }
+    const users = await this.service.find({
+      select: {
+        id: true,
+        username: true,
+        nickName: true,
+        mobile: true,
+        phoneCode: true,
+      },
+      where: {
+        id: In(ids),
+      },
+    });
+    return this.ok(users);
+  }
+
+  @Post('/getSimpleUsers', {summary: Constants.per.authOnly})
+  async getSimpleUsers() {
+    if(!isEnterprise()){
+       throw new Error('非企业模式不能获取所有用户信息');
+    }
+    const users = await this.service.find({
+      select: {
+        id: true,
+        username: true,
+        nickName: true,
+        mobile: true,
+        phoneCode: true,
+      },
+    });
+    return this.ok(users);
+  }
+
+}
diff --git a/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts b/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts
index 61803aaea..3289c8ffb 100644
--- a/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts
@@ -22,6 +22,18 @@ export class UserProjectController extends BaseController {
     return this.service;
   }
 
+   /**
+   * @param body 
+   * @returns 
+   */
+  @Post('/detail', { summary: Constants.per.authOnly })
+  async detail(@Body(ALL) body: any) {
+    const {projectId} = await this.getProjectUserIdRead();
+    const res = await this.service.getDetail(projectId,this.getUserId());
+    return this.ok(res);
+  }
+
+
   /**
    * 我的项目
    * @param body 
diff --git a/packages/ui/certd-server/src/controller/user/enterprise/project-member-controller.ts b/packages/ui/certd-server/src/controller/user/enterprise/project-member-controller.ts
new file mode 100644
index 000000000..95f10df17
--- /dev/null
+++ b/packages/ui/certd-server/src/controller/user/enterprise/project-member-controller.ts
@@ -0,0 +1,115 @@
+import { CrudController, SysSettingsService,Constants } from "@certd/lib-server";
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
+import { ProjectMemberEntity } from "../../../modules/sys/enterprise/entity/project-member.js";
+import { ProjectMemberService } from "../../../modules/sys/enterprise/service/project-member-service.js";
+import { merge } from "lodash-es";
+import { ProjectService } from "../../../modules/sys/enterprise/service/project-service.js";
+/**
+ */
+@Provide()
+@Controller("/api/enterprise/projectMember")
+export class ProjectMemberController extends CrudController<ProjectMemberEntity> {
+  @Inject()
+  service: ProjectMemberService;
+
+  @Inject()
+  sysSettingsService: SysSettingsService;
+
+  @Inject()
+  projectService: ProjectService;
+
+  getService<T>() {
+    return this.service;
+  }
+
+  @Post("/page", { summary: Constants.per.authOnly })
+  async page(@Body(ALL) body: any) {
+    const {projectId} = await this.getProjectUserIdRead();
+    body.query = body.query ?? {};
+    body.query.projectId = projectId;
+    return await super.page(body);
+  }
+
+  @Post("/list", { summary: Constants.per.authOnly })
+  async list(@Body(ALL) body: any) {
+    const {projectId} = await this.getProjectUserIdRead();
+    body.query = body.query ?? {};
+    body.query.projectId = projectId;
+    return super.list(body);
+  }
+
+  @Post("/add", { summary: Constants.per.authOnly })
+  async add(@Body(ALL) bean: any) {
+    const def: any = {
+      isDefault: false,
+      disabled: false,
+    };
+    merge(bean, def);
+
+    await this.projectService.checkAdminPermission({
+      userId: this.getUserId(),
+      projectId: bean.projectId,
+    });
+
+    return super.add(bean);
+  }
+
+  @Post("/update", { summary: Constants.per.authOnly }) 
+  async update(@Body(ALL) bean: any) {
+    if (!bean.id) {
+      throw new Error("id is required");
+    }
+    const projectId = await this.service.getProjectId(bean.id)
+    await this.projectService.checkAdminPermission({
+      userId: this.getUserId(),
+      projectId: projectId,
+    });
+    return super.update({
+      id: bean.id,
+      permission: bean.permission,
+    });
+  }
+
+  @Post("/info", { summary: Constants.per.authOnly })
+  async info(@Query("id") id: number) {
+     if (!id) {
+      throw new Error("id is required");
+    }
+    const projectId = await this.service.getProjectId(id)
+    await this.projectService.checkReadPermission({
+      userId: this.getUserId(),
+      projectId:projectId,
+    });
+    return super.info(id);
+  }
+
+  @Post("/delete", { summary: Constants.per.authOnly })
+  async delete(@Query("id") id: number) {
+    if (!id) {
+      throw new Error("id is required");
+    }
+    const projectId = await this.service.getProjectId(id)
+    await this.projectService.checkAdminPermission({
+      userId: this.getUserId(),
+      projectId:projectId,
+    });
+    return super.delete(id);
+  }
+
+  @Post("/deleteByIds", { summary: Constants.per.authOnly })
+  async deleteByIds(@Body("ids") ids: number[]) {
+    for (const id of ids) {
+      if (!id) {
+        throw new Error("id is required");
+      }
+      const projectId = await this.service.getProjectId(id)
+      await this.projectService.checkAdminPermission({
+        userId: this.getUserId(),
+        projectId:projectId,
+      });
+      await this.service.delete(id as any);
+    }
+   
+    return this.ok({});
+  }
+}
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
index d70340315..6d86d87ff 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
@@ -47,11 +47,12 @@ export class ProjectMemberService extends BaseService<ProjectMemberEntity> {
     });
   }
 
-  async getMember(projectId: number,userId: number) {
+  async getMember(projectId: number,userId: number,status?:string) {
     return await this.repository.findOne({
       where: {
         userId,
         projectId,
+        status,
       },
     });
   }
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
index d99f4a625..17dadb9b2 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
@@ -43,13 +43,13 @@ export class ProjectService extends BaseService<ProjectEntity> {
       throw new Error('项目名称已存在');
     }
     bean.disabled = false
-    const res= await super.add(bean)
+    const res = await super.add(bean)
     projectCache.clear();
     return res;
   }
 
-  async update( bean: ProjectEntity) {
-    const res= await super.update(bean)
+  async update(bean: ProjectEntity) {
+    const res = await super.update(bean)
     projectCache.clear();
     return res;
   }
@@ -65,7 +65,7 @@ export class ProjectService extends BaseService<ProjectEntity> {
 
   async getUserProjects(userId: number) {
 
-    const memberList = await this.projectMemberService.getByUserId(userId,'approved');
+    const memberList = await this.projectMemberService.getByUserId(userId, 'approved');
     const projectIds = memberList.map(item => item.projectId);
     const projectList = await this.repository.createQueryBuilder('project')
       .where(' project.disabled = false')
@@ -89,15 +89,15 @@ export class ProjectService extends BaseService<ProjectEntity> {
     return projectList
   }
 
-  async getAllWithStatus(userId: number) : Promise<ProjectMemberItem[]> {
-    let projectList:any = await this.find({
+  async getAllWithStatus(userId: number): Promise<ProjectMemberItem[]> {
+    let projectList: any = await this.find({
       where: {
         disabled: false,
         userId: 0,
       },
-    }) 
-    const  projectMemberItemList:ProjectMemberItem[] = projectList
-   
+    })
+    const projectMemberItemList: ProjectMemberItem[] = projectList
+
     const memberList = await this.projectMemberService.getByUserId(userId);
 
     const memberMap = memberList.reduce((prev, cur) => {
@@ -111,7 +111,7 @@ export class ProjectService extends BaseService<ProjectEntity> {
         item.status = 'approved';
         item.memberId = userId
       } else {
-        const memberItem :any = memberMap[item.id]
+        const memberItem: any = memberMap[item.id]
         if (memberItem) {
           item.permission = memberItem.permission;
           item.status = memberItem.status;
@@ -122,6 +122,27 @@ export class ProjectService extends BaseService<ProjectEntity> {
     return projectMemberItemList
   }
 
+
+  async getDetail(projectId: number, userId?: number): Promise<ProjectMemberItem[]> {
+    const project: any = await this.info(projectId);
+    if (!project) {
+      throw new Error('项目不存在');
+    }
+    if (project.adminId === userId) {
+      project.permission = 'admin';
+      project.status = 'approved';
+      project.memberId = userId
+    } else {
+      const member = await this.projectMemberService.getMember(projectId, userId);
+      if (member) {
+        project.permission = member.permission;
+        project.status = member.status;
+        project.memberId = member.userId
+      }
+    }
+    return project
+  }
+
   async checkAdminPermission({ userId, projectId }: { userId: number, projectId: number }) {
     return await this.checkPermission({
       userId,
@@ -157,36 +178,36 @@ export class ProjectService extends BaseService<ProjectEntity> {
 
     const cacheKey = `projectPermission:${projectId}:${userId}`
     let savedPermission = projectCache.get(cacheKey);
-    
-    if (!savedPermission){
-        const project = await this.findOne({
-          select: ['id', 'userId', 'adminId', 'disabled'],
-          where: {
-            id: projectId,
-          },
-        });
-        if (!project) {
-          throw new Error('项目不存在');
+
+    if (!savedPermission) {
+      const project = await this.findOne({
+        select: ['id', 'userId', 'adminId', 'disabled'],
+        where: {
+          id: projectId,
+        },
+      });
+      if (!project) {
+        throw new Error('项目不存在');
+      }
+      if (project.adminId === userId) {
+        //创建者拥有管理权限
+        savedPermission = 'admin';
+      } else {
+        if (project.disabled) {
+          throw new Error('项目已禁用');
         }
-        if (project.adminId === userId) {
-          //创建者拥有管理权限
-          savedPermission = 'admin';
-        }else{
-          if (project.disabled) {
-            throw new Error('项目已禁用');
-          } 
-          const member = await this.projectMemberService.getMember(projectId, userId);
-          if (!member || member.status !== 'approved') {
-            throw new Error(`用户${userId}还不是项目${projectId}的成员`);
-          }
-          savedPermission = member.permission;
+        const member = await this.projectMemberService.getMember(projectId, userId);
+        if (!member || member.status !== 'approved') {
+          throw new Error(`用户${userId}还不是项目${projectId}的成员`);
         }
+        savedPermission = member.permission;
+      }
     }
-    projectCache.set(cacheKey, savedPermission,{ttl:  3 * 60 * 1000});
+    projectCache.set(cacheKey, savedPermission, { ttl: 3 * 60 * 1000 });
     if (!savedPermission) {
       throw new Error(`权限不足，需要${permission}权限`);
     }
-    
+
     if (permission === 'read') {
       return true
     }
@@ -219,12 +240,12 @@ export class ProjectService extends BaseService<ProjectEntity> {
     if (member && member.status === 'approved') {
       throw new Error('用户已加入项目');
     }
-    if (member){
+    if (member) {
       this.projectMemberService.update({
         id: member.id,
         status: 'pending',
       })
-    }else{
+    } else {
       // 加入项目
       await this.projectMemberService.add({
         userId,
@@ -235,12 +256,12 @@ export class ProjectService extends BaseService<ProjectEntity> {
     }
   }
 
-  async approveJoin({ userId, projectId,status,permission }: { userId: number, projectId: number,status:string,permission:string }) {
+  async approveJoin({ userId, projectId, status, permission }: { userId: number, projectId: number, status: string, permission: string }) {
     const member = await this.projectMemberService.getMember(projectId, userId);
     if (!member) {
       throw new Error('找不到用户的申请记录');
     }
- 
+
     await this.projectMemberService.update({
       id: member.id,
       status: status,

From 26b1c4244f58f48d772853a3de9902109e1dd4bd Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sat, 28 Feb 2026 12:14:38 +0800
Subject: [PATCH 39/62] chore: project approve

---
 .../ui/certd-client/src/views/certd/project/detail/api.ts   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/ui/certd-client/src/views/certd/project/detail/api.ts b/packages/ui/certd-client/src/views/certd/project/detail/api.ts
index b1cdf8646..2a2c8af83 100644
--- a/packages/ui/certd-client/src/views/certd/project/detail/api.ts
+++ b/packages/ui/certd-client/src/views/certd/project/detail/api.ts
@@ -66,12 +66,10 @@ export async function GetUserSimpleByIds(query: any) {
   });
 }
 
-export async function ApproveJoin(id: any) {
+export async function ApproveJoin(form: any) {
   return await request({
     url: "/enterprise/project/approveJoin",
     method: "post",
-    data: {
-      id,
-    },
+    data: form,
   });
 }

From 1548ba0b8d76c52b689ba673c174cd8f1ed5fc62 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sat, 28 Feb 2026 18:17:53 +0800
Subject: [PATCH 40/62] chore: project manager

---
 .../public/static/images/ent/admin_mode.png   | Bin 0 -> 119757 bytes
 .../sys/enterprise/project/detail/crud.tsx    |  24 ++++++
 .../views/sys/enterprise/project/index.vue    |   5 +-
 .../views/sys/enterprise/project/intro.vue    |  75 ++++++++++++++++++
 .../src/views/sys/settings/tabs/mode.vue      |  15 ++--
 5 files changed, 113 insertions(+), 6 deletions(-)
 create mode 100644 packages/ui/certd-client/public/static/images/ent/admin_mode.png
 create mode 100644 packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue

diff --git a/packages/ui/certd-client/public/static/images/ent/admin_mode.png b/packages/ui/certd-client/public/static/images/ent/admin_mode.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa42f96e726530288c00cabebc3a75b6dab94ac5
GIT binary patch
literal 119757
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
E11cA7^8f$<

literal 0
HcmV?d00001

diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/detail/crud.tsx b/packages/ui/certd-client/src/views/sys/enterprise/project/detail/crud.tsx
index 437b73a74..a29bdd507 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/detail/crud.tsx
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/detail/crud.tsx
@@ -7,6 +7,7 @@ import { useSettingStore } from "/@/store/settings";
 import { useUserStore } from "/@/store/user";
 import { useI18n } from "/src/locales";
 import { userDict } from "../../dicts";
+import { useDicts } from "/@/views/certd/dicts";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
@@ -35,6 +36,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   const selectedRowKeys: Ref<any[]> = ref([]);
   context.selectedRowKeys = selectedRowKeys;
 
+  const { projectMemberStatusDict } = useDicts();
+
   return {
     crudOptions: {
       settings: {
@@ -133,6 +136,27 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             width: 200,
           },
         },
+        status: {
+          title: t("certd.ent.projectMemberStatus"),
+          type: "dict-select",
+          dict: projectMemberStatusDict,
+          search: {
+            show: true,
+          },
+          form: {
+            show: true,
+          },
+          column: {
+            width: 200,
+            cellRender: ({ row }) => {
+              return (
+                <div class="flex items-center">
+                  <fs-values-format model-value={row.status} dict={projectMemberStatusDict}></fs-values-format>
+                </div>
+              );
+            },
+          },
+        },
         createTime: {
           title: t("certd.createTime"),
           type: "datetime",
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/index.vue b/packages/ui/certd-client/src/views/sys/enterprise/project/index.vue
index 0022b28a1..f89d92e85 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/index.vue
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/index.vue
@@ -12,6 +12,7 @@
         </a-tooltip>
       </template>
     </fs-crud>
+    <AdminModeIntro v-if="!projectStore.isEnterprise"></AdminModeIntro>
   </fs-page>
 </template>
 
@@ -22,7 +23,8 @@ import createCrudOptions from "./crud";
 import { message, Modal } from "ant-design-vue";
 import { DeleteBatch } from "./api";
 import { useI18n } from "/src/locales";
-
+import { useProjectStore } from "/@/store/project";
+import AdminModeIntro from "./intro.vue";
 const { t } = useI18n();
 
 defineOptions({
@@ -30,6 +32,7 @@ defineOptions({
 });
 const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
 
+const projectStore = useProjectStore();
 const selectedRowKeys = context.selectedRowKeys;
 const handleBatchDelete = () => {
   if (selectedRowKeys.value?.length > 0) {
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue b/packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue
new file mode 100644
index 000000000..c8bd57d0b
--- /dev/null
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue
@@ -0,0 +1,75 @@
+<template>
+  <div class="admin-mode-intro">
+    <div class="mask">
+      <div class="intro-content">
+        <h2 class="intro-title text-xl font-bold">当前为SaaS管理模式，项目管理需要切换到企业模式</h2>
+        <div class="mt-8 image-block">
+          <div class="flex gap-8">
+            <div class="intro-desc flex-1">SaaS模式：每个用户管理自己的流水线和授权资源，独立使用。</div>
+            <div class="intro-desc flex-1">企业模式：企业内部员工使用，通过项目合作管理流水线证书和授权资源。</div>
+          </div>
+          <div class="image-intro">
+            <img :src="src" alt="" />
+          </div>
+        </div>
+        <div class="action">
+          <a-button type="primary" html-type="button" @click="goSwitchMode">立即前往切换模式</a-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { ref } from "vue";
+import { useI18n } from "/src/locales";
+import { useRouter } from "vue-router";
+defineOptions({
+  name: "AdminModeIntro",
+});
+
+const src = ref("static/images/ent/admin_mode.png");
+
+const router = useRouter();
+function goSwitchMode() {
+  router.push("/sys/settings?tab=mode");
+}
+</script>
+
+<style lang="less">
+.admin-mode-intro {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+
+  .mask {
+    padding: 20px;
+    border-radius: 10px;
+  }
+
+  .intro-content {
+    background-color: #fff;
+    padding: 20px;
+    border-radius: 10px;
+    text-align: center;
+  }
+
+  .image-block {
+    text-align: center;
+    .image-intro {
+      width: 100%;
+      img {
+        margin: 0 auto;
+        max-width: 100%;
+      }
+    }
+  }
+}
+</style>
diff --git a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
index c23734319..5ba3f39b2 100644
--- a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
@@ -2,7 +2,12 @@
   <div class="sys-settings-form sys-settings-mode">
     <a-form :model="formState" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off" @finish="onFinish">
       <a-form-item :label="t('certd.sys.setting.adminMode')" :name="['public', 'adminMode']">
-        <fs-dict-radio v-model:value="formState.public.adminMode" :dict="adminModeDict" />
+        <div class="w-full flex items-center">
+          <fs-dict-radio v-model:value="formState.public.adminMode" :disabled="!settingsStore.isPlus" :dict="adminModeDict" />
+          <vip-button class="ml-5" mode="button"></vip-button>
+        </div>
+        <div class="intro-desc helper">SaaS模式：每个用户管理自己的流水线和授权资源，独立使用。</div>
+        <div class="intro-desc helper">企业模式：企业内部员工使用，通过项目合作管理流水线证书和授权资源。</div>
       </a-form-item>
 
       <a-form-item label=" " :colon="false" :wrapper-col="{ span: 8 }">
@@ -30,14 +35,14 @@ defineOptions({
 
 const adminModeDict = dict({
   data: [
-    {
-      label: t("certd.sys.setting.enterpriseMode"),
-      value: "enterprise",
-    },
     {
       label: t("certd.sys.setting.saasMode"),
       value: "saas",
     },
+    {
+      label: t("certd.sys.setting.enterpriseMode"),
+      value: "enterprise",
+    },
   ],
 });
 

From 5b5b48fc061db1bca51e4768810d2caf02af973b Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sat, 28 Feb 2026 18:30:04 +0800
Subject: [PATCH 41/62] chore: admin mode setting

---
 .../views/sys/enterprise/project/index.vue    |  2 +-
 .../views/sys/enterprise/project/intro.vue    | 19 +++++++++++++++----
 .../src/views/sys/settings/tabs/mode.vue      |  6 ++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/index.vue b/packages/ui/certd-client/src/views/sys/enterprise/project/index.vue
index f89d92e85..b953b8b71 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/index.vue
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/index.vue
@@ -12,7 +12,7 @@
         </a-tooltip>
       </template>
     </fs-crud>
-    <AdminModeIntro v-if="!projectStore.isEnterprise"></AdminModeIntro>
+    <AdminModeIntro v-if="!projectStore.isEnterprise" title="当前为SaaS管理模式，项目管理需要切换到企业模式" :open="true"></AdminModeIntro>
   </fs-page>
 </template>
 
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue b/packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue
index c8bd57d0b..8e8e55f2e 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="admin-mode-intro">
-    <div class="mask">
+  <div v-if="open" class="admin-mode-intro" :style="fixed ? 'position: fixed;' : 'position: absolute;'">
+    <div class="mask" @click="close()">
       <div class="intro-content">
-        <h2 class="intro-title text-xl font-bold">当前为SaaS管理模式，项目管理需要切换到企业模式</h2>
+        <h2 class="intro-title text-xl font-bold">{{ title || "管理模式介绍" }}</h2>
         <div class="mt-8 image-block">
           <div class="flex gap-8">
             <div class="intro-desc flex-1">SaaS模式：每个用户管理自己的流水线和授权资源，独立使用。</div>
@@ -22,12 +22,23 @@
 
 <script setup lang="tsx">
 import { ref } from "vue";
-import { useI18n } from "/src/locales";
 import { useRouter } from "vue-router";
 defineOptions({
   name: "AdminModeIntro",
 });
 
+const props = defineProps<{
+  title?: string;
+  open?: boolean;
+  fixed?: boolean;
+}>();
+
+const emit = defineEmits(["update:open"]);
+
+function close() {
+  emit("update:open", false);
+}
+
 const src = ref("static/images/ent/admin_mode.png");
 
 const router = useRouter();
diff --git a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
index 5ba3f39b2..1cdb86422 100644
--- a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
@@ -8,12 +8,15 @@
         </div>
         <div class="intro-desc helper">SaaS模式：每个用户管理自己的流水线和授权资源，独立使用。</div>
         <div class="intro-desc helper">企业模式：企业内部员工使用，通过项目合作管理流水线证书和授权资源。</div>
+        <div><a @click="adminModeIntroOpen = true"> 查看示意图</a></div>
       </a-form-item>
 
       <a-form-item label=" " :colon="false" :wrapper-col="{ span: 8 }">
         <a-button :loading="saveLoading" type="primary" html-type="submit">{{ t("certd.saveButton") }}</a-button>
       </a-form-item>
     </a-form>
+
+    <AdminModeIntro v-model:open="adminModeIntroOpen" fixed></AdminModeIntro>
   </div>
 </template>
 
@@ -27,12 +30,15 @@ import { notification } from "ant-design-vue";
 import { useI18n } from "/src/locales";
 import { dict } from "@fast-crud/fast-crud";
 import { useProjectStore } from "/@/store/project";
+import AdminModeIntro from "/@/views/sys/enterprise/project/intro.vue";
 const { t } = useI18n();
 
 defineOptions({
   name: "SettingMode",
 });
 
+const adminModeIntroOpen = ref(false);
+
 const adminModeDict = dict({
   data: [
     {

From ea5e7d956337d152c7fcb95d5d3252697d64c9ee Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sat, 28 Feb 2026 18:49:46 +0800
Subject: [PATCH 42/62] chore: project setting

---
 packages/ui/certd-client/src/locales/langs/en-US/certd.ts | 1 +
 packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts | 5 +++--
 .../ui/certd-client/src/router/source/modules/certd.ts    | 8 +++-----
 packages/ui/certd-client/src/views/certd/dicts.ts         | 4 ++--
 .../certd-client/src/views/certd/project/detail/index.vue | 4 +---
 .../src/views/sys/enterprise/project/intro.vue            | 4 ++--
 .../ui/certd-client/src/views/sys/settings/tabs/mode.vue  | 5 ++---
 7 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
index dcf00ef08..ac8499944 100644
--- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
@@ -219,6 +219,7 @@ export default {
     myProjectManager: "My Projects",
     myProjectDetail: "Project Detail",
     projectJoin: "Join Project",
+    currentProject: "Current Project",
   },
   certificateRepo: {
     title: "Certificate Repository",
diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
index 23e7416fe..4e25f7878 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -225,6 +225,7 @@ export default {
     myProjectManager: "我的项目",
     myProjectDetail: "项目详情",
     projectJoin: "加入项目",
+    currentProject: "当前项目",
   },
   certificateRepo: {
     title: "证书仓库",
@@ -832,8 +833,8 @@ export default {
     projectDetailDescription: "管理项目成员",
     projectPermission: "权限",
     permission: {
-      read: "读取",
-      write: "写入",
+      read: "查看",
+      write: "修改",
       admin: "管理员",
     },
     projectMemberStatus: "成员状态",
diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts
index f5a4681f6..2bab1acf7 100644
--- a/packages/ui/certd-client/src/router/source/modules/certd.ts
+++ b/packages/ui/certd-client/src/router/source/modules/certd.ts
@@ -1,7 +1,5 @@
-import { useSettingStore } from "/@/store/settings";
-import aboutResource from "/@/router/source/modules/about";
-import i18n from "/@/locales/i18n";
 import { useProjectStore } from "/@/store/project";
+import { useSettingStore } from "/@/store/settings";
 
 export const certdResources = [
   {
@@ -31,8 +29,8 @@ export const certdResources = [
         },
       },
       {
-        title: "certd.sysResources.myProjectDetail",
-        name: "MyProjectDetail",
+        title: "certd.sysResources.currentProject",
+        name: "CurrentProject",
         path: "/certd/project/detail",
         component: "/certd/project/detail/index.vue",
         meta: {
diff --git a/packages/ui/certd-client/src/views/certd/dicts.ts b/packages/ui/certd-client/src/views/certd/dicts.ts
index f80f4754f..a091b80db 100644
--- a/packages/ui/certd-client/src/views/certd/dicts.ts
+++ b/packages/ui/certd-client/src/views/certd/dicts.ts
@@ -6,13 +6,13 @@ const projectPermissionDict = dict({
   data: [
     {
       value: "read",
-      label: "只读",
+      label: "查看",
       color: "cyan",
       icon: "material-symbols:folder-eye-outline-sharp",
     },
     {
       value: "write",
-      label: "读写",
+      label: "修改",
       color: "green",
       icon: "material-symbols:edit-square-outline-rounded",
     },
diff --git a/packages/ui/certd-client/src/views/certd/project/detail/index.vue b/packages/ui/certd-client/src/views/certd/project/detail/index.vue
index b122634cd..de9a125de 100644
--- a/packages/ui/certd-client/src/views/certd/project/detail/index.vue
+++ b/packages/ui/certd-client/src/views/certd/project/detail/index.vue
@@ -2,10 +2,8 @@
   <fs-page class="page-project-detail">
     <template #header>
       <div class="title">
-        {{ t("certd.ent.projectDetailManager") }}
+        当前项目 ：{{ project?.name }}
         <span class="sub flex-inline items-center">
-          项目名称 ：<a-tag color="green">{{ project?.name }}</a-tag>
-          <a-divider type="vertical"></a-divider>
           管理员：<fs-values-format :model-value="project.adminId" :dict="userDict" color="green"></fs-values-format>
           <!-- <a-divider type="vertical"></a-divider>
           <fs-values-format :model-value="project.permission" :dict="projectPermissionDict"></fs-values-format>
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue b/packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue
index 8e8e55f2e..f5de7ef65 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue
@@ -1,6 +1,6 @@
 <template>
-  <div v-if="open" class="admin-mode-intro" :style="fixed ? 'position: fixed;' : 'position: absolute;'">
-    <div class="mask" @click="close()">
+  <div v-if="open" class="admin-mode-intro" :style="fixed ? 'position: fixed;' : 'position: absolute;'" @click="close()">
+    <div class="mask">
       <div class="intro-content">
         <h2 class="intro-title text-xl font-bold">{{ title || "管理模式介绍" }}</h2>
         <div class="mt-8 image-block">
diff --git a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
index 1cdb86422..a3b10fc88 100644
--- a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
@@ -6,9 +6,8 @@
           <fs-dict-radio v-model:value="formState.public.adminMode" :disabled="!settingsStore.isPlus" :dict="adminModeDict" />
           <vip-button class="ml-5" mode="button"></vip-button>
         </div>
-        <div class="intro-desc helper">SaaS模式：每个用户管理自己的流水线和授权资源，独立使用。</div>
-        <div class="intro-desc helper">企业模式：企业内部员工使用，通过项目合作管理流水线证书和授权资源。</div>
-        <div><a @click="adminModeIntroOpen = true"> 查看示意图</a></div>
+        <div class="helper">建议在开始使用时选择合适的模式，之后就不要随意切换了。</div>
+        <div><a @click="adminModeIntroOpen = true"> 管理模式介绍</a></div>
       </a-form-item>
 
       <a-form-item label=" " :colon="false" :wrapper-col="{ span: 8 }">

From bc326489abc1d50a0930b4f47aa2d62d3a486798 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sat, 28 Feb 2026 19:29:13 +0800
Subject: [PATCH 43/62] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6=E6=B5=81=E6=B0=B4=E7=BA=BF=E4=BF=9D=E5=AD=98=E5=90=8E?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E5=88=86=E7=BB=84=E5=92=8C=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/project-selector/index.vue |  2 +-
 .../plugin/permission/use-crud-permission.ts  |  1 -
 .../src/router/source/modules/certd.ts        |  9 ++++++++
 .../src/router/source/modules/sys.ts          | 22 ++++++++++++++++---
 .../certd-client/src/store/project/index.ts   |  5 +++--
 .../src/views/certd/pipeline/crud.tsx         |  5 +++--
 .../pipeline/service/pipeline-service.ts      |  1 +
 7 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/packages/ui/certd-client/src/components/project-selector/index.vue b/packages/ui/certd-client/src/components/project-selector/index.vue
index 1d6a30bd0..37139a6a2 100644
--- a/packages/ui/certd-client/src/components/project-selector/index.vue
+++ b/packages/ui/certd-client/src/components/project-selector/index.vue
@@ -35,7 +35,7 @@ defineOptions({
 
 const projectStore = useProjectStore();
 onMounted(async () => {
-  await projectStore.reload();
+  await projectStore.init();
   console.log(projectStore.myProjects);
 });
 
diff --git a/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts b/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts
index 964921ee2..f19f582c8 100644
--- a/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts
+++ b/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts
@@ -82,7 +82,6 @@ export function useCrudPermission({ permission }: UseCrudPermissionProps) {
     if (isProjectPermission) {
       removePermission = per.projectPermission || "write";
     }
-    debugger;
     return LodashMerge(
       {
         actionbar: {
diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts
index 2bab1acf7..936733a8b 100644
--- a/packages/ui/certd-client/src/router/source/modules/certd.ts
+++ b/packages/ui/certd-client/src/router/source/modules/certd.ts
@@ -26,6 +26,7 @@ export const certdResources = [
           isMenu: false,
           icon: "ion:apps",
           keepAlive: true,
+          auth: true,
         },
       },
       {
@@ -40,6 +41,7 @@ export const certdResources = [
           },
           isMenu: true,
           icon: "ion:apps",
+          auth: true,
         },
       },
       {
@@ -51,6 +53,7 @@ export const certdResources = [
           isMenu: false,
           show: true,
           icon: "ion:apps",
+          auth: true,
         },
       },
       {
@@ -61,6 +64,7 @@ export const certdResources = [
         meta: {
           icon: "ion:analytics-sharp",
           keepAlive: true,
+          auth: true,
         },
       },
       {
@@ -70,6 +74,7 @@ export const certdResources = [
         component: "/certd/pipeline/detail.vue",
         meta: {
           isMenu: false,
+          auth: true,
         },
       },
       {
@@ -80,6 +85,7 @@ export const certdResources = [
         meta: {
           icon: "ion:timer-outline",
           keepAlive: true,
+          auth: true,
         },
       },
       {
@@ -90,6 +96,7 @@ export const certdResources = [
         meta: {
           isMenu: true,
           icon: "ion:duplicate-outline",
+          auth: true,
         },
       },
       {
@@ -99,6 +106,7 @@ export const certdResources = [
         component: "/certd/pipeline/template/edit.vue",
         meta: {
           isMenu: false,
+          auth: true,
         },
       },
       {
@@ -108,6 +116,7 @@ export const certdResources = [
         component: "/certd/pipeline/template/import/index.vue",
         meta: {
           isMenu: false,
+          auth: true,
         },
       },
       {
diff --git a/packages/ui/certd-client/src/router/source/modules/sys.ts b/packages/ui/certd-client/src/router/source/modules/sys.ts
index 7f22df52e..161ba44cd 100644
--- a/packages/ui/certd-client/src/router/source/modules/sys.ts
+++ b/packages/ui/certd-client/src/router/source/modules/sys.ts
@@ -1,7 +1,4 @@
-import LayoutPass from "/@/layout/layout-pass.vue";
 import { useSettingStore } from "/@/store/settings";
-import aboutResource from "/@/router/source/modules/about";
-import i18n from "/@/locales/i18n";
 
 export const sysResources = [
   {
@@ -13,6 +10,7 @@ export const sysResources = [
       icon: "ion:settings-outline",
       permission: "sys:settings:view",
       order: 10,
+      auth: true,
     },
     children: [
       {
@@ -27,6 +25,7 @@ export const sysResources = [
           },
           icon: "ion:speedometer-outline",
           permission: "sys:auth:user:view",
+          auth: true,
         },
       },
 
@@ -38,6 +37,7 @@ export const sysResources = [
         meta: {
           icon: "ion:settings-outline",
           permission: "sys:settings:view",
+          auth: true,
         },
       },
       {
@@ -47,6 +47,7 @@ export const sysResources = [
         component: "/sys/enterprise/project/index.vue",
         meta: {
           show: true,
+          auth: true,
           icon: "ion:apps",
           permission: "sys:settings:edit",
           keepAlive: true,
@@ -60,6 +61,7 @@ export const sysResources = [
         meta: {
           isMenu: false,
           show: true,
+          auth: true,
           icon: "ion:apps",
           permission: "sys:settings:edit",
         },
@@ -73,6 +75,7 @@ export const sysResources = [
           icon: "ion:earth-outline",
           permission: "sys:settings:view",
           keepAlive: true,
+          auth: true,
         },
       },
       {
@@ -96,6 +99,7 @@ export const sysResources = [
             const settingStore = useSettingStore();
             return settingStore.isComm;
           },
+          auth: true,
           icon: "ion:document-text-outline",
           permission: "sys:settings:view",
         },
@@ -110,6 +114,7 @@ export const sysResources = [
             const settingStore = useSettingStore();
             return settingStore.isComm;
           },
+          auth: true,
           icon: "ion:menu",
           permission: "sys:settings:view",
           keepAlive: true,
@@ -125,6 +130,7 @@ export const sysResources = [
             const settingStore = useSettingStore();
             return settingStore.isComm;
           },
+          auth: true,
           icon: "ion:disc-outline",
           permission: "sys:settings:view",
           keepAlive: true,
@@ -139,6 +145,7 @@ export const sysResources = [
           icon: "ion:extension-puzzle-outline",
           permission: "sys:settings:view",
           keepAlive: true,
+          auth: true,
         },
       },
       {
@@ -151,6 +158,7 @@ export const sysResources = [
           icon: "ion:extension-puzzle",
           permission: "sys:settings:view",
           keepAlive: true,
+          auth: true,
         },
       },
       {
@@ -165,6 +173,7 @@ export const sysResources = [
           },
           icon: "ion:extension-puzzle",
           permission: "sys:settings:view",
+          auth: true,
         },
       },
       {
@@ -176,6 +185,7 @@ export const sysResources = [
           icon: "ion:golf-outline",
           permission: "sys:settings:view",
           keepAlive: true,
+          auth: true,
         },
       },
       {
@@ -187,6 +197,7 @@ export const sysResources = [
           icon: "ion:list-outline",
           permission: "sys:auth:per:view",
           keepAlive: true,
+          auth: true,
         },
       },
       {
@@ -198,6 +209,7 @@ export const sysResources = [
           icon: "ion:people-outline",
           permission: "sys:auth:role:view",
           keepAlive: true,
+          auth: true,
         },
       },
       {
@@ -209,6 +221,7 @@ export const sysResources = [
           icon: "ion:person-outline",
           permission: "sys:auth:user:view",
           keepAlive: true,
+          auth: true,
         },
       },
       {
@@ -224,6 +237,7 @@ export const sysResources = [
             return settingStore.isComm;
           },
           keepAlive: true,
+          auth: true,
         },
         children: [
           {
@@ -238,6 +252,7 @@ export const sysResources = [
               },
               icon: "ion:cart",
               permission: "sys:settings:edit",
+              auth: true,
             },
           },
           {
@@ -253,6 +268,7 @@ export const sysResources = [
               icon: "ion:bag-check",
               permission: "sys:settings:edit",
               keepAlive: true,
+              auth: true,
             },
           },
           {
diff --git a/packages/ui/certd-client/src/store/project/index.ts b/packages/ui/certd-client/src/store/project/index.ts
index 0627f8420..09c1bb967 100644
--- a/packages/ui/certd-client/src/store/project/index.ts
+++ b/packages/ui/certd-client/src/store/project/index.ts
@@ -17,7 +17,8 @@ export const useProjectStore = defineStore("app.project", () => {
   const inited = ref(false);
   const userStore = useUserStore();
   const userId = userStore.getUserInfo?.id;
-  const lastProjectId = LocalStorage.get("currentProjectId:" + userId);
+  const lastProjectIdCacheKey = "currentProjectId:" + userId;
+  const lastProjectId = LocalStorage.get(lastProjectIdCacheKey);
   const currentProjectId = ref(lastProjectId); // 直接调用
 
   const projects = computed(() => {
@@ -63,7 +64,7 @@ export const useProjectStore = defineStore("app.project", () => {
 
   function changeCurrentProject(id: string, silent?: boolean) {
     currentProjectId.value = id;
-    LocalStorage.set("currentProjectId", id);
+    LocalStorage.set(lastProjectIdCacheKey, id);
     if (!silent) {
       message.success("切换项目成功");
     }
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
index 028694b01..c69119847 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
@@ -50,6 +50,7 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
       delete form.lastVars;
       delete form.createTime;
       delete form.id;
+      delete form.webhook;
       let pipeline = form.content;
       if (typeof pipeline === "string" && pipeline.startsWith("{")) {
         pipeline = JSON.parse(form.content);
@@ -75,8 +76,8 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
   function onDialogOpen(opt: any) {
     const searchForm = crudExpose.getSearchValidatedFormData();
     opt.initialForm = {
-      ...opt.initialForm,
       groupId: searchForm.groupId,
+      ...opt.initialForm,
     };
   }
 
@@ -219,7 +220,7 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
               row = info.pipeline;
               row.content = JSON.parse(row.content);
               row.title = row.title + "_copy";
-              await crudExpose.openCopy({
+              await crudExpose.openAdd({
                 row: row,
                 index: context.index,
               });
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
index 303bf981e..7eddef03f 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
@@ -251,6 +251,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
     if (bean.id > 0) {
       //修改
       old = await this.info(bean.id);
+      bean.order = old.order;
     }
     if (!old || !old.webhookKey) {
       bean.webhookKey = await this.genWebhookKey();

From 72f850f675b500d12ebff2338d1b99d6fab476e1 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Tue, 3 Mar 2026 11:29:50 +0800
Subject: [PATCH 44/62] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96dcdn=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2=E4=B8=8A=E4=BC=A0=E5=A4=9A=E6=AC=A1=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=20=E5=81=B6=E5=B0=94=E6=8A=A5=20The=20CertName=20already=20exi?=
 =?UTF-8?q?sts=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts
index 8bc11d2db..09c344ef2 100644
--- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts
@@ -79,9 +79,11 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
     if (typeof this.domainName === 'string') {
       this.domainName = [this.domainName];
     }
+
+    const params:any = await this.buildParams();
     for (const domainName of this.domainName) {
       this.logger.info(`[${domainName}]开始部署`)
-      const params = await this.buildParams(domainName);
+      params.DomainName = domainName;
       await this.doRequest(client, params);
       this.logger.info(`[${domainName}]部署成功`)
     }
@@ -100,7 +102,7 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
     return client;
   }
 
-  async buildParams(domainName: string) {
+  async buildParams() {
     const CertName = (this.certName ?? 'certd') + '-' + dayjs().format('YYYYMMDDHHmmss');
 
     let certId: any = this.cert
@@ -111,7 +113,6 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
         this.logger.info('上传证书:', CertName);
         const cert: any = this.cert;
         return {
-          DomainName: domainName,
           SSLProtocol: 'on',
           CertName: CertName,
           CertType: 'upload',
@@ -126,7 +127,6 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
     }
     this.logger.info('使用已上传的证书:', certId);
     return {
-      DomainName: domainName,
       SSLProtocol: 'on',
       CertType: 'cas',
       CertName: CertName,

From 78c2ced43b1a73d142b0ed783b162b97f545ab06 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Tue, 3 Mar 2026 11:31:52 +0800
Subject: [PATCH 45/62] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddcdn=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E5=9F=9F=E5=90=8D=E5=90=8C=E6=97=B6=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E6=97=B6=20=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts
index 09c344ef2..632e3f660 100644
--- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts
@@ -79,12 +79,11 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
     if (typeof this.domainName === 'string') {
       this.domainName = [this.domainName];
     }
-
-    const params:any = await this.buildParams();
     for (const domainName of this.domainName) {
       this.logger.info(`[${domainName}]开始部署`)
-      params.DomainName = domainName;
+      const params = await this.buildParams(domainName);
       await this.doRequest(client, params);
+      await this.ctx.utils.sleep(1000);
       this.logger.info(`[${domainName}]部署成功`)
     }
 
@@ -102,7 +101,7 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
     return client;
   }
 
-  async buildParams() {
+  async buildParams(domainName: string) {
     const CertName = (this.certName ?? 'certd') + '-' + dayjs().format('YYYYMMDDHHmmss');
 
     let certId: any = this.cert
@@ -113,6 +112,7 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
         this.logger.info('上传证书:', CertName);
         const cert: any = this.cert;
         return {
+          DomainName: domainName,
           SSLProtocol: 'on',
           CertName: CertName,
           CertType: 'upload',
@@ -127,6 +127,7 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
     }
     this.logger.info('使用已上传的证书:', certId);
     return {
+      DomainName: domainName,
       SSLProtocol: 'on',
       CertType: 'cas',
       CertName: CertName,

From 92c9ac382692e6c84140ff787759ab6d39ccbe96 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Tue, 3 Mar 2026 14:35:50 +0800
Subject: [PATCH 46/62] =?UTF-8?q?fix(cert-plugin):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=8F=88=E6=8B=8D=E4=BA=91=E5=AE=A2=E6=88=B7=E7=AB=AF=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C=E5=BD=93?=
 =?UTF-8?q?=E5=9F=9F=E5=90=8D=E5=B7=B2=E7=BB=91=E5=AE=9A=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=86=8D=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/plugin-cert/plugin/cert-plugin/base.ts    |  2 +-
 .../plugin-cert/plugin/cert-plugin/lego/index.ts      |  2 +-
 .../certd-server/src/plugins/plugin-upyun/client.ts   | 11 +++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base.ts b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base.ts
index 24499090e..ca6622d81 100644
--- a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base.ts
@@ -133,7 +133,7 @@ export abstract class CertApplyBasePlugin extends CertApplyBaseConvertPlugin {
   }
 
   /**
-   * 检查是否过期，默认提前35天
+   * 检查是否过期，默认提前15天
    * @param expires
    * @param maxDays
    */
diff --git a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/lego/index.ts b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/lego/index.ts
index 2f9e84942..93f617952 100644
--- a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/lego/index.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/lego/index.ts
@@ -16,7 +16,7 @@ import { PrivateKeyType } from "./dns.js";
   desc: "支持海量DNS解析提供商，推荐使用，一样的免费通配符域名证书申请，支持多个域名打到同一个证书上",
   default: {
     input: {
-      renewDays: 35,
+      renewDays: 15,
       forceUpdate: false,
     },
     strategy: {
diff --git a/packages/ui/certd-server/src/plugins/plugin-upyun/client.ts b/packages/ui/certd-server/src/plugins/plugin-upyun/client.ts
index be86799cd..5d33c1811 100644
--- a/packages/ui/certd-server/src/plugins/plugin-upyun/client.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-upyun/client.ts
@@ -71,11 +71,18 @@ export class UpyunClient {
         Cookie: req.cookie
       }
     });
+    let errorMessage = null;
     if (res.msg?.errors?.length > 0) {
-      throw new Error(JSON.stringify(res.msg));
+      errorMessage = JSON.stringify(res.msg);
     }
     if(res.data?.error_code){
-      throw new Error(res.data?.message);
+      errorMessage = res.data?.message;
+    }
+    if(errorMessage){
+      if (errorMessage.includes("domain has been bound to this certificate")) {
+        return res;
+      }
+      throw new Error(errorMessage);
     }
     return res;
   }

From a853fc20268295338c53e0806a9a491f12bb07f4 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Tue, 3 Mar 2026 18:25:55 +0800
Subject: [PATCH 47/62] chore: vip tip

---
 packages/ui/certd-client/src/locales/langs/zh-CN/vip.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/vip.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/vip.ts
index e4edf5782..2877bce9f 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/vip.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/vip.ts
@@ -55,7 +55,7 @@ export default {
   email_webhook_notifications: "邮件、webhook通知方式",
 
   professional_edition: "专业版",
-  open_source_support: "开源需要您的赞助支持",
+  open_source_support: "开源需要您的赞助支持，个人和企业内部使用",
   vip_group_priority: "可加VIP群，您的需求将优先实现",
   unlimited_site_certificate_monitoring: "站点证书监控无限制",
   more_notification_methods: "更多通知方式",
@@ -66,13 +66,13 @@ export default {
   get_after_support: "立即赞助",
 
   business_edition: "商业版",
-  commercial_license: "商业授权，可对外运营",
+  commercial_license: "商业授权，可对外运营，提供SaaS服务",
   all_pro_privileges: "拥有专业版所有特权",
   allow_commercial_use_modify_logo_title: "允许商用，可修改logo、标题",
   data_statistics: "数据统计",
   plugin_management: "插件管理",
   unlimited_multi_users: "多用户无限制",
-  support_user_payment: "支持用户支付",
+  support_user_payment: "支持用户支付（购买套餐，按流水线条数、域名数量、部署次数计费）",
   activate: "激活",
   get_pro_code_after_support: "前往获取",
   business_contact_author: "",

From 6c546b5290ddbe42f7ecc34797918e55602b2617 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Tue, 3 Mar 2026 23:31:42 +0800
Subject: [PATCH 48/62] chore: project finished

---
 .../lib-server/src/basic/base-controller.ts   |  4 +-
 .../src/user/access/entity/access.ts          |  3 ++
 packages/ui/certd-client/src/api/service.ts   |  2 +-
 .../src/locales/langs/en-US/certd.ts          |  1 +
 .../src/locales/langs/zh-CN/certd.ts          |  1 +
 packages/ui/certd-client/src/router/guard.ts  |  8 ++--
 .../src/views/certd/project/detail/crud.tsx   |  8 +++-
 .../src/views/certd/project/detail/index.vue  |  4 ++
 .../src/views/certd/project/join.vue          | 38 +++++++++++++------
 .../sys/enterprise/project/detail/crud.tsx    |  6 ++-
 .../views/sys/enterprise/project/intro.vue    |  4 +-
 .../src/views/sys/settings/tabs/mode.vue      |  6 ++-
 .../sys/access/access-controller.ts           | 15 +++++++-
 .../controller/sys/addon/addon-controller.ts  |  5 +++
 .../enterprise/project-member-controller.ts   |  4 +-
 .../enterprise/project-member-controller.ts   |  5 ++-
 .../user/pipeline/access-controller.ts        |  2 +-
 17 files changed, 87 insertions(+), 29 deletions(-)

diff --git a/packages/libs/lib-server/src/basic/base-controller.ts b/packages/libs/lib-server/src/basic/base-controller.ts
index 39cf55edf..23816ec09 100644
--- a/packages/libs/lib-server/src/basic/base-controller.ts
+++ b/packages/libs/lib-server/src/basic/base-controller.ts
@@ -69,10 +69,8 @@ export abstract class BaseController {
     if (!projectIdStr){
       projectIdStr = this.ctx.request.query["projectId"] as string;
     }
-    if (!projectIdStr){
-      return null
-    }
     if (!projectIdStr) {
+      //这里必须抛异常，否则可能会有权限问题
       throw new Error("projectId 不能为空")
     }
     const userId = this.getUserId()
diff --git a/packages/libs/lib-server/src/user/access/entity/access.ts b/packages/libs/lib-server/src/user/access/entity/access.ts
index fd635719e..87968bc5f 100644
--- a/packages/libs/lib-server/src/user/access/entity/access.ts
+++ b/packages/libs/lib-server/src/user/access/entity/access.ts
@@ -24,6 +24,9 @@ export class AccessEntity {
   @Column({ name: 'project_id', comment: '项目id' })
   projectId: number;
 
+  @Column({ comment: '权限等级', length: 100 })
+  level: string; // user common system
+
   @Column({
     name: 'create_time',
     comment: '创建时间',
diff --git a/packages/ui/certd-client/src/api/service.ts b/packages/ui/certd-client/src/api/service.ts
index e42647448..a38d92c49 100644
--- a/packages/ui/certd-client/src/api/service.ts
+++ b/packages/ui/certd-client/src/api/service.ts
@@ -155,7 +155,7 @@ function createRequestFunction(service: any) {
     }
     Object.assign(configDefault, config);
 
-    if (projectStore.isEnterprise && !config.url.startsWith("/sys") && !config.url.startsWith("http")) {
+    if (!configDefault.params.projectId && projectStore.isEnterprise && !config.url.startsWith("/sys") && !config.url.startsWith("http")) {
       configDefault.params.projectId = projectStore.currentProject?.id;
     }
     return service(configDefault);
diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
index ac8499944..cee33d466 100644
--- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
@@ -838,6 +838,7 @@ export default {
     leaveFailed: "Leave project failed, please try again later",
     applyJoinConfirm: "Are you sure you want to apply to join this project?",
     leaveConfirm: "Are you sure you want to leave this project?",
+    viewDetail: "View Detail",
   },
   addonSelector: {
     select: "Select",
diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
index 4e25f7878..e60b96e65 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -854,5 +854,6 @@ export default {
     leaveFailed: "退出项目失败，请稍后重试",
     applyJoinConfirm: "确认加入项目？",
     leaveConfirm: "确认退出项目？",
+    viewDetail: "查看详情",
   },
 };
diff --git a/packages/ui/certd-client/src/router/guard.ts b/packages/ui/certd-client/src/router/guard.ts
index 12bc772bc..87c84506f 100644
--- a/packages/ui/certd-client/src/router/guard.ts
+++ b/packages/ui/certd-client/src/router/guard.ts
@@ -10,7 +10,9 @@ import { usePermissionStore } from "/@/plugin/permission/store.permission";
 import util from "/@/plugin/permission/util.permission";
 import { useUserStore } from "/@/store/user";
 import { useProjectStore } from "../store/project";
-export const PROJECT_JOIN_PATH = "/certd/project/join";
+export const PROJECT_PATH_PREFIX = "/certd/project";
+export const SYS_PATH_PREFIX = "/sys";
+
 function buildAccessedMenus(menus: any) {
   if (menus == null) {
     return;
@@ -131,10 +133,10 @@ function setupAccessGuard(router: Router) {
       if (projectStore.isEnterprise) {
         //加载我的项目
         await projectStore.init();
-        if (!projectStore.currentProject && to.path !== PROJECT_JOIN_PATH) {
+        if (!projectStore.currentProject && !to.path.startsWith(PROJECT_PATH_PREFIX) && !to.path.startsWith(SYS_PATH_PREFIX)) {
           //没有项目
           return {
-            path: PROJECT_JOIN_PATH,
+            path: `${PROJECT_PATH_PREFIX}/join`,
             replace: true,
           };
         }
diff --git a/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx b/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx
index 67a7a300c..c44ff5024 100644
--- a/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx
@@ -109,7 +109,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           search: {
             show: true,
           },
-          form: {},
+          form: {
+            show: true,
+            rules: [{ required: true, message: "请选择用户" }],
+          },
           editForm: {
             show: false,
           },
@@ -126,6 +129,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
           form: {
             show: true,
+            rules: [{ required: true, message: "请选择权限" }],
           },
           column: {
             width: 200,
@@ -140,6 +144,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
           form: {
             show: true,
+            rules: [{ required: true, message: "请选择状态" }],
           },
           column: {
             width: 200,
@@ -156,6 +161,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
                         id: row.id,
                         permission: row.permission,
                         onSubmit: async (form: any) => {
+                          form.userId = row.userId;
                           await api.ApproveJoin(form);
                           crudExpose.doRefresh();
                         },
diff --git a/packages/ui/certd-client/src/views/certd/project/detail/index.vue b/packages/ui/certd-client/src/views/certd/project/detail/index.vue
index de9a125de..6358c644b 100644
--- a/packages/ui/certd-client/src/views/certd/project/detail/index.vue
+++ b/packages/ui/certd-client/src/views/certd/project/detail/index.vue
@@ -97,6 +97,10 @@ const handleBatchDelete = () => {
 
 // 页面打开后获取列表数据
 onMounted(async () => {
+  if (!projectId) {
+    message.error("您还未选择项目");
+    return;
+  }
   await loadProjectDetail();
   crudExpose.doRefresh();
 });
diff --git a/packages/ui/certd-client/src/views/certd/project/join.vue b/packages/ui/certd-client/src/views/certd/project/join.vue
index 9ed5a675a..2c19cd4ca 100644
--- a/packages/ui/certd-client/src/views/certd/project/join.vue
+++ b/packages/ui/certd-client/src/views/certd/project/join.vue
@@ -5,6 +5,10 @@
         {{ t("certd.sysResources.projectJoin") }}
         <span v-if="projectStore.projects.length === 0" class="sub">{{ t("certd.project.noProjectJoined") }}</span>
       </div>
+
+      <div class="more">
+        <a-button v-if="userStore.isAdmin" @click="goProjectManager">{{ t("certd.project.projectManager") }}</a-button>
+      </div>
     </template>
     <div class="project-container">
       <h3 class="text-lg font-medium mb-4">{{ t("certd.project.projectList") }}</h3>
@@ -13,20 +17,20 @@
           <a-card :bordered="true" class="project-card">
             <div class="project-card-content">
               <div class="project-info">
-                <h3 class="text-md font-bold title">{{ project.name }}</h3>
-                <p class="text-gray-500 text-sm">{{ formatDate(project.createTime) }}</p>
+                <div class="text-md font-bold title">{{ project.name }}</div>
+                <div class="flex items-center justify-start">管理员： <fs-values-format :model-value="project.adminId" :dict="userDict" color="green"></fs-values-format></div>
+                <p class="text-gray-500 text-sm">创建时间：{{ formatDate(project.createTime) }}</p>
               </div>
-              <div class="flex-col items-center">
-                <div>管理员： <fs-values-format :model-value="project.adminId" :dict="userDict"></fs-values-format></div>
-                <div class="flex items-center mt-2">
-                  <div v-if="project.status">
-                    <fs-values-format :model-value="project.status" :dict="projectMemberStatusDict"></fs-values-format>
-                  </div>
-                  <div v-if="project.permission"><fs-values-format :model-value="project.permission" :dict="projectPermissionDict"></fs-values-format></div>
-                </div>
+              <div class="flex-col items-start">
+                <div v-if="project.status" class="mt-1 flex items-center justify-start">状态：<fs-values-format :model-value="project.status" :dict="projectMemberStatusDict"></fs-values-format></div>
+                <div v-if="project.permission" class="mt-1 flex items-center justify-start">权限：<fs-values-format :model-value="project.permission" :dict="projectPermissionDict"></fs-values-format></div>
               </div>
             </div>
             <template #actions>
+              <span v-if="project.status === 'approved'" class="flex-inline items-center text-blue-500" :title="t('certd.project.viewDetail')" @click="goProjectDetail(project.id)">
+                <fs-icon class="fs-18 mr-2" icon="mdi:eye-outline"></fs-icon>
+                {{ t("certd.project.viewDetail") }}
+              </span>
               <span v-if="!project.status || project.status === 'rejected'" class="flex-inline items-center text-blue-500" :title="t('certd.project.applyJoin')" @click="applyToJoin(project.id)">
                 <fs-icon class="fs-18 mr-2" icon="mdi:checkbox-marked-circle-outline"></fs-icon>
                 {{ t("certd.project.applyJoin") }}
@@ -51,6 +55,8 @@ import { request } from "/src/api/service";
 import { useProjectStore } from "/@/store/project";
 import dayjs from "dayjs";
 import { useDicts } from "../dicts";
+import { useRouter } from "vue-router";
+import { useUserStore } from "/@/store/user";
 
 defineOptions({
   name: "ProjectJoin",
@@ -62,6 +68,17 @@ const { projectMemberStatusDict, projectPermissionDict, userDict } = useDicts();
 const projects = ref<any[]>([]);
 
 const projectStore = useProjectStore();
+const userStore = useUserStore();
+function goProjectManager() {
+  // 假设这里调用跳转到项目管理页的API
+  router.push(`/sys/enterprise/project`);
+}
+
+const router = useRouter();
+function goProjectDetail(projectId: number) {
+  // 假设这里调用跳转到项目详情页的API
+  router.push(`/certd/project/detail?projectId=${projectId}`);
+}
 
 const getSystemProjects = async () => {
   try {
@@ -147,7 +164,6 @@ async function leaveProject(projectId: number) {
       .title {
         font-size: 16px;
         font-weight: bold;
-        margin-bottom: 8px;
       }
     }
   }
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/detail/crud.tsx b/packages/ui/certd-client/src/views/sys/enterprise/project/detail/crud.tsx
index a29bdd507..720ff891d 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/detail/crud.tsx
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/detail/crud.tsx
@@ -108,7 +108,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           search: {
             show: true,
           },
-          form: {},
+          form: {
+            rules: [{ required: true, message: "请选择用户" }],
+          },
           editForm: {
             show: false,
           },
@@ -131,6 +133,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
           form: {
             show: true,
+            rules: [{ required: true, message: "请选择权限" }],
           },
           column: {
             width: 200,
@@ -145,6 +148,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
           form: {
             show: true,
+            rules: [{ required: true, message: "请选择状态" }],
           },
           column: {
             width: 200,
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue b/packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue
index f5de7ef65..077ffc7f4 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue
@@ -5,8 +5,8 @@
         <h2 class="intro-title text-xl font-bold">{{ title || "管理模式介绍" }}</h2>
         <div class="mt-8 image-block">
           <div class="flex gap-8">
-            <div class="intro-desc flex-1">SaaS模式：每个用户管理自己的流水线和授权资源，独立使用。</div>
-            <div class="intro-desc flex-1">企业模式：企业内部员工使用，通过项目合作管理流水线证书和授权资源。</div>
+            <div class="intro-desc flex-1">SaaS模式：每个用户管理自己的流水线和授权资源，每个用户独立使用。</div>
+            <div class="intro-desc flex-1">企业模式：通过项目合作管理流水线证书和授权资源，所有用户视为企业内部员工。</div>
           </div>
           <div class="image-intro">
             <img :src="src" alt="" />
diff --git a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
index a3b10fc88..5cf066b4f 100644
--- a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
@@ -6,8 +6,10 @@
           <fs-dict-radio v-model:value="formState.public.adminMode" :disabled="!settingsStore.isPlus" :dict="adminModeDict" />
           <vip-button class="ml-5" mode="button"></vip-button>
         </div>
-        <div class="helper">建议在开始使用时选择合适的模式，之后就不要随意切换了。</div>
-        <div><a @click="adminModeIntroOpen = true"> 管理模式介绍</a></div>
+        <div class="helper">SaaS模式：每个用户管理自己的流水线和授权资源，独立使用。</div>
+        <div class="helper">企业模式：通过项目合作管理流水线证书和授权资源，所有用户视为企业内部员工。</div>
+        <div class="helper text-red-500">建议在开始使用时固定一个合适的模式，之后就不要随意切换了。</div>
+        <div><a @click="adminModeIntroOpen = true"> 更多管理模式介绍</a></div>
       </a-form-item>
 
       <a-form-item label=" " :colon="false" :wrapper-col="{ span: 8 }">
diff --git a/packages/ui/certd-server/src/controller/sys/access/access-controller.ts b/packages/ui/certd-server/src/controller/sys/access/access-controller.ts
index 93d6e2e7a..d069c38a5 100644
--- a/packages/ui/certd-server/src/controller/sys/access/access-controller.ts
+++ b/packages/ui/certd-server/src/controller/sys/access/access-controller.ts
@@ -1,5 +1,5 @@
+import { AccessService } from "@certd/lib-server";
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
-import { AccessService, Constants } from "@certd/lib-server";
 import { AccessController } from "../../user/pipeline/access-controller.js";
 
 /**
@@ -15,6 +15,12 @@ export class SysAccessController extends AccessController {
     return this.service2;
   }
 
+  async getProjectUserId(permission:string){
+    return {
+      projectId:null,userId:0
+    }
+  }
+
   getUserId() {
     // checkComm();
     return 0;
@@ -54,7 +60,7 @@ export class SysAccessController extends AccessController {
     return await super.define(type);
   }
 
-  @Post('/getSecretPlain', { summary: Constants.per.authOnly })
+  @Post('/getSecretPlain', { summary: 'sys:settings:view' })
   async getSecretPlain(@Body(ALL) body: { id: number; key: string }) {
     const value = await this.service.getById(body.id, 0);
     return this.ok(value[body.key]);
@@ -69,4 +75,9 @@ export class SysAccessController extends AccessController {
   async simpleInfo(@Query('id') id: number) {
     return await super.simpleInfo(id);
   }
+
+    @Post('/getDictByIds', { summary: 'sys:settings:view' })
+    async getDictByIds(@Body('ids') ids: number[]) {
+      return await super.getDictByIds(ids);
+    }
 }
diff --git a/packages/ui/certd-server/src/controller/sys/addon/addon-controller.ts b/packages/ui/certd-server/src/controller/sys/addon/addon-controller.ts
index bd5864237..804460142 100644
--- a/packages/ui/certd-server/src/controller/sys/addon/addon-controller.ts
+++ b/packages/ui/certd-server/src/controller/sys/addon/addon-controller.ts
@@ -12,6 +12,11 @@ export class SysAddonController extends AddonController {
     return this.service2;
   }
 
+  async getProjectUserId(permission:string){
+    return {
+      projectId:null,userId:0
+    }
+  }
   getUserId() {
     // checkComm();
     return 0;
diff --git a/packages/ui/certd-server/src/controller/sys/enterprise/project-member-controller.ts b/packages/ui/certd-server/src/controller/sys/enterprise/project-member-controller.ts
index e03815450..8ce7e236c 100644
--- a/packages/ui/certd-server/src/controller/sys/enterprise/project-member-controller.ts
+++ b/packages/ui/certd-server/src/controller/sys/enterprise/project-member-controller.ts
@@ -60,10 +60,12 @@ export class SysProjectMemberController extends CrudController<ProjectMemberEnti
       userId: this.getUserId(),
       projectId: projectId,
     });
-    return super.update({
+    const res =await this.service.update({
       id: bean.id,
       permission: bean.permission,
+      status: bean.status,
     });
+    return this.ok(res);
   }
 
   @Post("/info", { summary: "sys:settings:view" })
diff --git a/packages/ui/certd-server/src/controller/user/enterprise/project-member-controller.ts b/packages/ui/certd-server/src/controller/user/enterprise/project-member-controller.ts
index 95f10df17..1c4f751b8 100644
--- a/packages/ui/certd-server/src/controller/user/enterprise/project-member-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/enterprise/project-member-controller.ts
@@ -64,10 +64,13 @@ export class ProjectMemberController extends CrudController<ProjectMemberEntity>
       userId: this.getUserId(),
       projectId: projectId,
     });
-    return super.update({
+    const res = await this.service.update({
       id: bean.id,
       permission: bean.permission,
+      status: bean.status,
     });
+
+    return this.ok(res);
   }
 
   @Post("/info", { summary: Constants.per.authOnly })
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/access-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/access-controller.ts
index e5dfcecd3..19d42d7bd 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/access-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/access-controller.ts
@@ -111,7 +111,7 @@ export class AccessController extends CrudController<AccessService> {
   @Post('/simpleInfo', { summary: Constants.per.authOnly })
   async simpleInfo(@Query('id') id: number) {
     // await this.authService.checkUserIdButAllowAdmin(this.ctx, this.service, id);
-    await this.checkOwner(this.getService(), id, "read",true);
+    // await this.checkOwner(this.getService(), id, "read",true);
     const res = await this.service.getSimpleInfo(id);
     return this.ok(res);
   }

From 17dd77cc96c397c87c408beb88a75aff324c8f72 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Wed, 4 Mar 2026 23:15:48 +0800
Subject: [PATCH 49/62] chore: project userid fixed -1

---
 .../lib-server/src/basic/base-controller.ts   |  2 +-
 .../libs/lib-server/src/basic/base-service.ts |  4 +--
 .../src/user/access/entity/access.ts          |  5 +---
 .../src/locales/langs/en-US/certd.ts          |  4 +++
 .../src/locales/langs/zh-CN/certd.ts          |  5 +++-
 .../src/router/source/modules/certd.ts        | 30 +++++++++----------
 .../access/access-selector/access/crud.tsx    |  2 +-
 .../src/views/certd/access/crud.tsx           |  2 +-
 .../src/views/sys/enterprise/project/crud.tsx | 26 ++++------------
 .../db/migration/v10038__admin_mode.sql       |  3 +-
 .../sys/account/account-controller.ts         |  6 ++++
 .../controller/sys/addon/addon-controller.ts  |  2 +-
 .../sys/enterprise/project-controller.ts      |  2 +-
 .../mine/service/two-factor-service.ts        |  2 +-
 .../monitor/service/site-info-service.ts      | 14 ++++-----
 .../monitor/service/site-ip-service.ts        |  2 +-
 .../pipeline/service/history-service.ts       |  6 ++--
 .../pipeline/service/pipeline-service.ts      | 30 ++++++++++++++-----
 .../modules/sys/enterprise/entity/project.ts  |  4 +++
 .../service/project-member-service.ts         |  2 +-
 .../sys/enterprise/service/project-service.ts | 16 +++++++---
 21 files changed, 97 insertions(+), 72 deletions(-)

diff --git a/packages/libs/lib-server/src/basic/base-controller.ts b/packages/libs/lib-server/src/basic/base-controller.ts
index 23816ec09..7b58cd6c2 100644
--- a/packages/libs/lib-server/src/basic/base-controller.ts
+++ b/packages/libs/lib-server/src/basic/base-controller.ts
@@ -83,7 +83,7 @@ export abstract class BaseController {
     let userId = this.getUserId()
     const projectId = await this.getProjectId(permission)
     if(projectId){
-      userId = 0
+      userId = -1 // 企业管理模式下，用户id固定-1
     }
     return {
       projectId,userId
diff --git a/packages/libs/lib-server/src/basic/base-service.ts b/packages/libs/lib-server/src/basic/base-service.ts
index a9a26046b..00e9e5fd4 100644
--- a/packages/libs/lib-server/src/basic/base-service.ts
+++ b/packages/libs/lib-server/src/basic/base-service.ts
@@ -258,12 +258,12 @@ export abstract class BaseService<T> {
 
 export function checkUserProjectParam(userId: number, projectId: number) {
   if (projectId != null ){
-    if( userId !==0) {
+    if( userId !==-1) {
       throw new ValidateException('userId projectId 错误');
     }
     return true
   }else{
-    if( userId > 0) {
+    if( userId != null) {
       return true
     }
      throw new ValidateException('userId不能为空');
diff --git a/packages/libs/lib-server/src/user/access/entity/access.ts b/packages/libs/lib-server/src/user/access/entity/access.ts
index 87968bc5f..fa8349370 100644
--- a/packages/libs/lib-server/src/user/access/entity/access.ts
+++ b/packages/libs/lib-server/src/user/access/entity/access.ts
@@ -8,7 +8,7 @@ export class AccessEntity {
   @PrimaryGeneratedColumn()
   id: number;
   @Column({ name: 'user_id', comment: '用户id' })
-  userId: number;
+  userId: number; // 0为系统级别, -1为企业，大于1为用户
   @Column({ comment: '名称', length: 100 })
   name: string;
 
@@ -24,9 +24,6 @@ export class AccessEntity {
   @Column({ name: 'project_id', comment: '项目id' })
   projectId: number;
 
-  @Column({ comment: '权限等级', length: 100 })
-  level: string; // user common system
-
   @Column({
     name: 'create_time',
     comment: '创建时间',
diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
index cee33d466..4c8394bfe 100644
--- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
@@ -220,6 +220,7 @@ export default {
     myProjectDetail: "Project Detail",
     projectJoin: "Join Project",
     currentProject: "Current Project",
+    projectMemberManager: "Project Member",
   },
   certificateRepo: {
     title: "Certificate Repository",
@@ -822,6 +823,9 @@ export default {
       admin: "Admin",
     },
     projectMemberStatus: "Member Status",
+
+    isSystem: "Is System Project",
+    isSystemHelper: "System-level projects allow running admin plugins",
   },
   project: {
     noProjectJoined: "You haven't joined any projects yet",
diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
index e60b96e65..030759015 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -220,12 +220,12 @@ export default {
     netTest: "网络测试",
     enterpriseManager: "企业管理设置",
     projectManager: "项目管理",
-    projectDetail: "项目详情",
     enterpriseSetting: "企业设置",
     myProjectManager: "我的项目",
     myProjectDetail: "项目详情",
     projectJoin: "加入项目",
     currentProject: "当前项目",
+    projectMemberManager: "项目成员管理",
   },
   certificateRepo: {
     title: "证书仓库",
@@ -838,6 +838,9 @@ export default {
       admin: "管理员",
     },
     projectMemberStatus: "成员状态",
+
+    isSystem: "是否系统项目",
+    isSystemHelper: "系统级项目允许运行管理员插件",
   },
   project: {
     noProjectJoined: "您还没有加入任何项目",
diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts
index 936733a8b..e38745825 100644
--- a/packages/ui/certd-client/src/router/source/modules/certd.ts
+++ b/packages/ui/certd-client/src/router/source/modules/certd.ts
@@ -29,21 +29,6 @@ export const certdResources = [
           auth: true,
         },
       },
-      {
-        title: "certd.sysResources.currentProject",
-        name: "CurrentProject",
-        path: "/certd/project/detail",
-        component: "/certd/project/detail/index.vue",
-        meta: {
-          show: () => {
-            const projectStore = useProjectStore();
-            return projectStore.isEnterprise;
-          },
-          isMenu: true,
-          icon: "ion:apps",
-          auth: true,
-        },
-      },
       {
         title: "certd.sysResources.projectJoin",
         name: "ProjectJoin",
@@ -278,6 +263,21 @@ export const certdResources = [
               isMenu: false,
             },
           },
+          {
+            title: "certd.sysResources.projectMemberManager",
+            name: "ProjectMemberManager",
+            path: "/certd/project/detail",
+            component: "/certd/project/detail/index.vue",
+            meta: {
+              show: () => {
+                const projectStore = useProjectStore();
+                return projectStore.isEnterprise;
+              },
+              isMenu: true,
+              icon: "ion:apps",
+              auth: true,
+            },
+          },
         ],
       },
       {
diff --git a/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx b/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
index 821514155..880361bb3 100644
--- a/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
@@ -143,7 +143,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             order: 10,
           },
           valueBuilder: ({ row, key, value }) => {
-            row[key] = row.userId > 0 ? "user" : "sys";
+            row[key] = row.userId != 0 ? "user" : "sys";
           },
         },
         ...commonColumnsDefine,
diff --git a/packages/ui/certd-client/src/views/certd/access/crud.tsx b/packages/ui/certd-client/src/views/certd/access/crud.tsx
index d15dd61a9..f3be184f6 100644
--- a/packages/ui/certd-client/src/views/certd/access/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/access/crud.tsx
@@ -121,7 +121,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             order: 10,
           },
           valueBuilder: ({ row, key, value }) => {
-            row[key] = row.userId > 0 ? "user" : "sys";
+            row[key] = row.userId != 0 ? "user" : "sys";
           },
         },
         ...commonColumnsDefine,
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
index b509f8dc7..a3c6b7645 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
@@ -90,35 +90,21 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             },
           },
         },
-        disabled: {
-          title: t("certd.disabled"),
+        isSystem: {
+          title: t("certd.ent.isSystem"),
           type: "dict-switch",
           dict: dict({
             data: [
-              { label: t("certd.enabled"), value: false, color: "success" },
-              { label: t("certd.disabledLabel"), value: true, color: "error" },
+              { label: t("common.yes"), value: true, color: "success" },
+              { label: t("common.no"), value: false, color: "error" },
             ],
           }),
           form: {
-            value: false,
+            value: true,
+            helper: t("certd.ent.isSystemHelper"),
           },
           column: {
             width: 100,
-            component: {
-              title: t("certd.clickToToggle"),
-              on: {
-                async click({ value, row }) {
-                  Modal.confirm({
-                    title: t("certd.prompt"),
-                    content: t("certd.confirmToggleStatus", { action: !value ? t("certd.disable") : t("certd.enable") }),
-                    onOk: async () => {
-                      await api.SetDisabled(row.id, !value);
-                      await crudExpose.doRefresh();
-                    },
-                  });
-                },
-              },
-            },
           },
         },
         adminId: {
diff --git a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
index 8e7a88f9f..4111cae61 100644
--- a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
+++ b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
@@ -6,6 +6,7 @@ CREATE TABLE "cd_project"
   "name"        varchar(512) NOT NULL,
   "admin_id"    integer      NOT NULL,
   "disabled"    boolean      NOT NULL DEFAULT (false),
+  "is_system"   boolean      NOT NULL DEFAULT (false),
   "create_time" datetime     NOT NULL DEFAULT (CURRENT_TIMESTAMP),
   "update_time" datetime     NOT NULL DEFAULT (CURRENT_TIMESTAMP)
 );
@@ -13,7 +14,7 @@ CREATE TABLE "cd_project"
 
 CREATE INDEX "index_project_user_id" ON "cd_project" ("user_id");
 CREATE INDEX "index_project_admin_id" ON "cd_project" ("admin_id");
-INSERT INTO cd_project (id, user_id, "admin_id", "name", "disabled") VALUES (1, 0, 1,'default', false);
+INSERT INTO cd_project (id, user_id, "admin_id", "name", "disabled") VALUES (1, -1, 1,'default', false,false);
 
 ALTER TABLE cd_cert_info ADD COLUMN  project_id integer;
 CREATE INDEX "index_cert_project_id" ON "cd_cert_info" ("project_id");
diff --git a/packages/ui/certd-server/src/controller/sys/account/account-controller.ts b/packages/ui/certd-server/src/controller/sys/account/account-controller.ts
index cd55986a8..3af8074d1 100644
--- a/packages/ui/certd-server/src/controller/sys/account/account-controller.ts
+++ b/packages/ui/certd-server/src/controller/sys/account/account-controller.ts
@@ -21,12 +21,18 @@ export class BasicController extends BaseController {
   @Post('/preBindUser', { summary: 'sys:settings:edit' })
   public async preBindUser(@Body(ALL) body: PreBindUserReq) {
     // 设置缓存内容
+    if (body.userId == null || body.userId <= 0) {
+      throw new Error("用户ID不能为空");
+    }
     await this.plusService.userPreBind(body.userId);
     return this.ok({});
   }
 
   @Post('/bindUser', { summary: 'sys:settings:edit' })
   public async bindUser(@Body(ALL) body: BindUserReq) {
+    if (body.userId == null || body.userId <= 0) {
+      throw new Error("用户ID不能为空");
+    }
     const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
     installInfo.bindUserId = body.userId;
     await this.sysSettingsService.saveSetting(installInfo);
diff --git a/packages/ui/certd-server/src/controller/sys/addon/addon-controller.ts b/packages/ui/certd-server/src/controller/sys/addon/addon-controller.ts
index 804460142..a42aa240f 100644
--- a/packages/ui/certd-server/src/controller/sys/addon/addon-controller.ts
+++ b/packages/ui/certd-server/src/controller/sys/addon/addon-controller.ts
@@ -14,7 +14,7 @@ export class SysAddonController extends AddonController {
 
   async getProjectUserId(permission:string){
     return {
-      projectId:null,userId:0
+      projectId:null,userId:0 //0为系统级别
     }
   }
   getUserId() {
diff --git a/packages/ui/certd-server/src/controller/sys/enterprise/project-controller.ts b/packages/ui/certd-server/src/controller/sys/enterprise/project-controller.ts
index 3066a31fc..73ae7c689 100644
--- a/packages/ui/certd-server/src/controller/sys/enterprise/project-controller.ts
+++ b/packages/ui/certd-server/src/controller/sys/enterprise/project-controller.ts
@@ -40,7 +40,7 @@ export class SysProjectController extends CrudController<ProjectEntity> {
     bean.userId = this.getUserId();
     return super.add({
       ...bean,
-      userId:0,
+      userId:-1, //企业用户id固定为-1
       adminId: bean.userId,
     });
   }
diff --git a/packages/ui/certd-server/src/modules/mine/service/two-factor-service.ts b/packages/ui/certd-server/src/modules/mine/service/two-factor-service.ts
index 134c58da9..4f327ba64 100644
--- a/packages/ui/certd-server/src/modules/mine/service/two-factor-service.ts
+++ b/packages/ui/certd-server/src/modules/mine/service/two-factor-service.ts
@@ -63,7 +63,7 @@ export class TwoFactorService {
   }
 
   async offAuthenticator(userId:number) {
-    if (!userId) {
+    if (!userId || userId <= 0) {
       throw new Error("userId is required");
     }
 
diff --git a/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts b/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
index e6840f121..f92c2c3d4 100644
--- a/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
+++ b/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
@@ -358,7 +358,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
   async checkList(sites: SiteInfoEntity[],isCommon: boolean) {
     const cache = {}
     const getFromCache = async (userId: number,projectId?: number) =>{
-      const key = `${userId}-${projectId??""}`
+      const key = `${userId}_${projectId??""}`
       if (cache[key]) {
         return cache[key];
       }
@@ -424,7 +424,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
     if (!req.text) {
       throw new Error("text is required");
     }
-    if (!req.userId) {
+    if (req.userId == null) {
       throw new Error("userId is required");
     }
 
@@ -479,7 +479,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
   }
 
   clearSiteMonitorJob(userId: number,projectId?: number) {
-    this.cron.remove(`siteMonitor-${userId}-${projectId||""}`);
+    this.cron.remove(`siteMonitor_${userId}_${projectId||""}`);
   }
 
   async registerSiteMonitorJob(userId?: number,projectId?: number) {
@@ -502,7 +502,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
       }
       //注册个人的 或项目的
       this.cron.register({
-        name: `siteMonitor-${userId}-${projectId||""}`,
+        name: `siteMonitor_${userId}_${projectId||""}`,
         cron: setting.cron,
         job: () => this.triggerJobOnce(userId,projectId),
       });
@@ -511,9 +511,9 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
   }
 
   async triggerJobOnce(userId?:number,projectId?:number) {
-    logger.info(`站点证书检查开始执行[${userId??'所有用户'}-${projectId??'所有项目'}]`);
+    logger.info(`站点证书检查开始执行[${userId??'所有用户'}_${projectId??'所有项目'}]`);
     const query:any = { disabled: false };
-    if(userId){
+    if(userId!=null){
       query.userId = userId;
       if(projectId){
         query.projectId = projectId;
@@ -541,7 +541,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
       await this.checkList(records,isCommon);
     }
 
-    logger.info(`站点证书检查完成[${userId??'所有用户'}-${projectId??'所有项目'}]`);
+    logger.info(`站点证书检查完成[${userId??'所有用户'}_${projectId??'所有项目'}]`);
   }
 
   async batchDelete(ids: number[], userId: number,projectId?:number): Promise<void> {
diff --git a/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts b/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts
index 1045ac1ae..6b67d5c80 100644
--- a/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts
+++ b/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts
@@ -43,7 +43,7 @@ export class SiteIpService extends BaseService<SiteIpEntity> {
   }
 
   async add(data: SiteIpEntity) {
-    if (!data.userId) {
+    if (data.userId == null) {
       throw new Error("userId is required");
     }
     data.disabled = false;
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts
index 4cc1a1b2d..352582482 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts
@@ -188,11 +188,11 @@ export class HistoryService extends BaseService<HistoryEntity> {
     const where: any = {
       createTime: MoreThan(todayEnd.add(-param.days, 'day').toDate()),
     };
-    if (param.userId > 0) {
-      where.userId = param.userId;
-    }
+    
     if (param.projectId > 0) {
       where.projectId = param.projectId;
+    }else if (param.userId > 0) {
+      where.userId = param.userId;
     }
     const result = await this.getRepository()
       .createQueryBuilder('main')
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
index 7eddef03f..6d9926187 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
@@ -50,6 +50,7 @@ import { nanoid } from "nanoid";
 import { set } from "lodash-es";
 import { executorQueue } from "@certd/lib-server";
 import parser from "cron-parser";
+import { ProjectService } from "../../sys/enterprise/service/project-service.js";
 const runningTasks: Map<string | number, Executor> = new Map();
 
 
@@ -107,6 +108,9 @@ export class PipelineService extends BaseService<PipelineEntity> {
   @Inject()
   certInfoService: CertInfoService;
 
+  @Inject()
+  projectService: ProjectService;
+
   //@ts-ignore
   getRepository() {
     return this.repository;
@@ -252,6 +256,8 @@ export class PipelineService extends BaseService<PipelineEntity> {
       //修改
       old = await this.info(bean.id);
       bean.order = old.order;
+      bean.userId = old.userId;
+      bean.projectId = old.projectId;
     }
     if (!old || !old.webhookKey) {
       bean.webhookKey = await this.genWebhookKey();
@@ -262,6 +268,8 @@ export class PipelineService extends BaseService<PipelineEntity> {
 
     const pipeline = JSON.parse(bean.content || "{}");
     RunnableCollection.initPipelineRunnableType(pipeline);
+    pipeline.userId = bean.userId;
+    pipeline.projectId = bean.projectId;
     let domains = [];
     if (pipeline.stages) {
       RunnableCollection.each(pipeline.stages, (runnable: any) => {
@@ -295,8 +303,8 @@ export class PipelineService extends BaseService<PipelineEntity> {
     } else if (bean.type === "cert_auto") {
       fromType = "auto";
     }
-    const userId = pipeline.userId || bean.userId;
-    const projectId = pipeline.projectId ?? bean.projectId ??null;
+    const userId = bean.userId;
+    const projectId = bean.projectId ??null;
     await this.certInfoService.updateDomains(pipeline.id, userId, projectId ,  domains, fromType);
     return {
       ...bean,
@@ -672,9 +680,12 @@ export class PipelineService extends BaseService<PipelineEntity> {
     };
 
     const userId = entity.userId;
-    const historyId = await this.historyService.start(entity, triggerType);
+    const projectId = entity.projectId;
     let userIsAdmin = false
-    if(userId){
+
+    if (projectId && projectId>0) {
+      userIsAdmin = await this.projectService.isAdmin(projectId);
+    }else if(userId>0){
       userIsAdmin = await this.userService.isAdmin(userId);
     }
     const user: UserInfo = {
@@ -682,7 +693,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
       role: userIsAdmin ? "admin" : "user"
     };
 
-
+     const historyId = await this.historyService.start(entity, triggerType);
     const sysInfo: SysInfo = {};
     if (isComm()) {
       const siteInfo = await this.sysSettingsService.getSetting<SysSiteInfo>(SysSiteInfo);
@@ -690,7 +701,8 @@ export class PipelineService extends BaseService<PipelineEntity> {
     }
 
     const taskServiceGetter = this.taskServiceBuilder.create({
-      userId
+      userId,
+      projectId
     });
     const accessGetter = await taskServiceGetter.get<IAccessService>("accessService");
     const notificationGetter = await taskServiceGetter.get<INotificationService>("notificationService");
@@ -920,7 +932,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
       throw new NeedVIPException("此功能需要升级专业版");
     }
     for (const id of ids) {
-      if (userId) {
+      if (userId && userId > 0) {
         await this.checkUserId(id, userId);
       }
       if(projectId){
@@ -1104,6 +1116,10 @@ export class PipelineService extends BaseService<PipelineEntity> {
 
 
   private async checkUserStatus(userId: number) {
+    if(isEnterprise()){
+      //企业模式不检查用户状态，都允许运行流水线
+      return 
+    }
     const userEntity = await this.userService.info(userId);
     if (userEntity == null) {
       throw new Error("用户不存在");
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts
index 52c12f015..78897dcee 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/entity/project.ts
@@ -19,6 +19,10 @@ export class ProjectEntity {
   @Column({ name: 'disabled', comment: '禁用' })
   disabled: boolean;
 
+  @Column({ name: 'is_system', comment: '是否系统项目' })
+  isSystem: boolean; //系统项目内的流水线允许运行管理员级别的插件
+
+
   @Column({
     name: 'create_time',
     comment: '创建时间',
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
index 6d86d87ff..e61dcd7d3 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
@@ -23,7 +23,7 @@ export class ProjectMemberService extends BaseService<ProjectMemberEntity> {
     if (!projectId) {
       throw new Error('项目ID不能为空');
     }
-    if (!userId) {
+    if (!userId || userId <= 0) {
       throw new Error('用户ID不能为空');
     }
     const exist = await this.repository.findOne({
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
index 17dadb9b2..e594020e4 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
@@ -11,9 +11,12 @@ const projectCache = new LRUCache<string, any>({
   ttl: 1000 * 60 * 10,
 });
 
+const ENTERPRISE_USER_ID = -1 //企业模式下 企业userId 固定为-1
+
 @Provide()
 @Scope(ScopeEnum.Request, { allowDowngrade: true })
 export class ProjectService extends BaseService<ProjectEntity> {
+ 
   @InjectEntityModel(ProjectEntity)
   repository: Repository<ProjectEntity>;
 
@@ -36,7 +39,7 @@ export class ProjectService extends BaseService<ProjectEntity> {
     const exist = await this.repository.findOne({
       where: {
         name,
-        userId: 0,
+        userId: ENTERPRISE_USER_ID,
       },
     });
     if (exist) {
@@ -57,7 +60,7 @@ export class ProjectService extends BaseService<ProjectEntity> {
   async setDisabled(id: number, disabled: boolean) {
     await this.repository.update({
       id,
-      userId: 0,
+      userId: ENTERPRISE_USER_ID,
     }, {
       disabled,
     });
@@ -69,7 +72,7 @@ export class ProjectService extends BaseService<ProjectEntity> {
     const projectIds = memberList.map(item => item.projectId);
     const projectList = await this.repository.createQueryBuilder('project')
       .where(' project.disabled = false')
-      .where(' project.userId = :userId', { userId: 0 })
+      .where(' project.userId = :userId', { userId: ENTERPRISE_USER_ID })
       .where(' project.id IN (:...projectIds) or project.adminId = :userId', { projectIds, userId })
       .getMany();
 
@@ -93,7 +96,7 @@ export class ProjectService extends BaseService<ProjectEntity> {
     let projectList: any = await this.find({
       where: {
         disabled: false,
-        userId: 0,
+        userId: ENTERPRISE_USER_ID,
       },
     })
     const projectMemberItemList: ProjectMemberItem[] = projectList
@@ -269,4 +272,9 @@ export class ProjectService extends BaseService<ProjectEntity> {
     })
   }
 
+   async isAdmin(projectId: number): Promise<boolean> {
+    const project = await this.info(projectId);
+    return project?.isSystem ?? false;
+  }
+
 }

From 5ee3874b7e30e231bbb05266e446ebe95a4e7bc8 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Wed, 4 Mar 2026 23:53:19 +0800
Subject: [PATCH 50/62] chore: project fix

---
 packages/core/pipeline/src/plugin/api.ts      | 10 ++++++---
 .../src/views/certd/monitor/site/crud.tsx     |  6 +++---
 .../src/views/certd/pipeline/crud.tsx         |  5 ++++-
 .../src/views/sys/enterprise/project/crud.tsx |  2 +-
 .../user/cname/cname-provider-controller.ts   |  2 --
 .../user/cname/cname-record-controller.ts     | 21 ++++++++++---------
 .../cname/service/cname-record-service.ts     | 20 ++++++++++--------
 .../service/getter/cname-proxy-service.ts     |  8 ++++---
 .../service/getter/task-service-getter.ts     |  2 +-
 .../plugins/plugin-admin/plugin-db-backup.ts  |  4 +---
 .../plugin-admin/plugin-deploy-to-certd.ts    |  4 +---
 .../plugins/plugin-admin/plugin-restart.ts    |  4 +---
 .../src/plugins/plugin-admin/plugin-script.ts |  4 +---
 .../plugin-host/plugin/copy-to-local/index.ts |  4 +---
 14 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/packages/core/pipeline/src/plugin/api.ts b/packages/core/pipeline/src/plugin/api.ts
index 9753e35b7..27f06be7c 100644
--- a/packages/core/pipeline/src/plugin/api.ts
+++ b/packages/core/pipeline/src/plugin/api.ts
@@ -170,9 +170,7 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
     }
 
     if (this.ctx?.define?.onlyAdmin) {
-      if (!this.isAdmin()) {
-        throw new Error("只有管理员才能运行此任务");
-      }
+      this.checkAdmin();
     }
   }
 
@@ -284,6 +282,12 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
     return this.ctx.user.role === "admin";
   }
 
+  checkAdmin() {
+    if (!this.isAdmin()) {
+      throw new Error("只有“管理员”或“系统级项目”才有权限运行此插件任务");
+    }
+  }
+
   getStepFromPipeline(stepId: string) {
     let found: any = null;
     RunnableCollection.each(this.ctx.pipeline.stages, step => {
diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
index 5dcc10fa3..4b1823ea6 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
@@ -734,7 +734,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             }),
           },
           column: {
-            width: 100,
+            width: 140,
             sorter: true,
             align: "center",
           },
@@ -757,7 +757,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             helper: t("monitor.ipSyncModeHelper"),
           },
           column: {
-            width: 100,
+            width: 140,
             sorter: true,
             align: "center",
           },
@@ -779,7 +779,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             helper: t("monitor.ipIgnoreCoherenceHelper"),
           },
           column: {
-            width: 100,
+            width: 180,
             sorter: true,
             align: "center",
           },
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
index c69119847..ca8144cfa 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
@@ -16,13 +16,16 @@ import { useCertViewer } from "/@/views/certd/pipeline/use";
 import { useI18n } from "/src/locales";
 import { useDicts } from "../dicts";
 import { useProjectStore } from "/@/store/project";
+import { useCrudPermission } from "/@/plugin/permission";
 
-export default function ({ crudExpose, context: { selectedRowKeys, openCertApplyDialog, hasActionPermission } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+export default function ({ crudExpose, context: { selectedRowKeys, openCertApplyDialog, permission } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
   const lastResRef = ref();
 
   const { t } = useI18n();
 
+  const { hasActionPermission } = useCrudPermission({ permission });
+
   const { openUploadCreateDialog } = useCertUpload();
 
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
diff --git a/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
index a3c6b7645..d6e0e053e 100644
--- a/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
+++ b/packages/ui/certd-client/src/views/sys/enterprise/project/crud.tsx
@@ -104,7 +104,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             helper: t("certd.ent.isSystemHelper"),
           },
           column: {
-            width: 100,
+            width: 150,
           },
         },
         adminId: {
diff --git a/packages/ui/certd-server/src/controller/user/cname/cname-provider-controller.ts b/packages/ui/certd-server/src/controller/user/cname/cname-provider-controller.ts
index 044713c79..618cbbe7e 100644
--- a/packages/ui/certd-server/src/controller/user/cname/cname-provider-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/cname/cname-provider-controller.ts
@@ -20,8 +20,6 @@ export class CnameProviderController extends BaseController {
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body: any) {
-    body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
     const res = await this.providerService.list({});
     return this.ok(res);
   }
diff --git a/packages/ui/certd-server/src/controller/user/cname/cname-record-controller.ts b/packages/ui/certd-server/src/controller/user/cname/cname-record-controller.ts
index 13215ab16..c2cc24dcd 100644
--- a/packages/ui/certd-server/src/controller/user/cname/cname-record-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/cname/cname-record-controller.ts
@@ -67,50 +67,51 @@ export class CnameRecordController extends CrudController<CnameRecordService> {
 
   @Post('/info', { summary: Constants.per.authOnly })
   async info(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "read");
     return super.info(id);
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.getUserId());
+    await this.checkOwner(this.getService(), id, "write");
     return super.delete(id);
   }
 
   @Post('/deleteByIds', { summary: Constants.per.authOnly })
   async deleteByIds(@Body(ALL) body: any) {
+    const {userId,projectId} = await this.getProjectUserIdWrite();
     await this.service.delete(body.ids, {
-      userId: this.getUserId(),
+      userId,
+      projectId,
     });
     return this.ok();
   }
   @Post('/getByDomain', { summary: Constants.per.authOnly })
   async getByDomain(@Body(ALL) body: { domain: string; createOnNotFound: boolean }) {
-    const userId = this.getUserId();
-    const res = await this.service.getByDomain(body.domain, userId, body.createOnNotFound);
+    const {userId,projectId} = await this.getProjectUserIdRead();
+    const res = await this.service.getByDomain(body.domain, userId,projectId, body.createOnNotFound);
     return this.ok(res);
   }
 
   @Post('/verify', { summary: Constants.per.authOnly })
   async verify(@Body(ALL) body: { id: number }) {
-    const userId = this.getUserId();
-    await this.service.checkUserId(body.id, userId);
+    await this.checkOwner(this.getService(), body.id, "read");
     const res = await this.service.verify(body.id);
     return this.ok(res);
   }
 
   @Post('/resetStatus', { summary: Constants.per.authOnly })
   async resetStatus(@Body(ALL) body: { id: number }) {
-    const userId = this.getUserId();
-    await this.service.checkUserId(body.id, userId);
+    await this.checkOwner(this.getService(), body.id, "read");
     const res = await this.service.resetStatus(body.id);
     return this.ok(res);
   }
  @Post('/import', { summary: Constants.per.authOnly })
   async import(@Body(ALL) body: { domainList: string; cnameProviderId: any }) {
-    const userId = this.getUserId();
+    const {userId,projectId} = await this.getProjectUserIdWrite();
     const res = await this.service.doImport({
       userId,
+      projectId,
       domainList: body.domainList,
       cnameProviderId: body.cnameProviderId,
     });
diff --git a/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts b/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts
index 8207ee687..1fb8f13d6 100644
--- a/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts
+++ b/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts
@@ -164,8 +164,8 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
   //   // 3.  检查原域名是否有cname记录
   // }
 
-  async getWithAccessByDomain(domain: string, userId: number) {
-    const record: CnameRecord = await this.getByDomain(domain, userId);
+  async getWithAccessByDomain(domain: string, userId: number,projectId?:number) {
+    const record: CnameRecord = await this.getByDomain(domain, userId,projectId);
     if (record.cnameProvider.id > 0) {
       //自定义cname服务
       record.cnameProvider.access = await this.accessService.getAccessById(record.cnameProvider.accessId, false);
@@ -179,17 +179,17 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
     return record;
   }
 
-  async getByDomain(domain: string, userId: number, createOnNotFound = true) {
+  async getByDomain(domain: string, userId: number,projectId?:number, createOnNotFound = true) {
     if (!domain) {
       throw new ValidateException("domain不能为空");
     }
     if (userId == null) {
       throw new ValidateException("userId不能为空");
     }
-    let record = await this.getRepository().findOne({ where: { domain, userId } });
+    let record = await this.getRepository().findOne({ where: { domain, userId,projectId } });
     if (record == null) {
       if (createOnNotFound) {
-        record = await this.add({ domain, userId });
+        record = await this.add({ domain, userId,projectId });
       } else {
         throw new ValidateException(`找不到${domain}的CNAME记录`);
       }
@@ -489,8 +489,8 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
     await this.getRepository().update(id, { status: "cname", mainDomain: "" });
   }
 
-  async doImport(req:{ userId: number; domainList: string; cnameProviderId: any }) {
-    const {userId,cnameProviderId,domainList} = req;
+  async doImport(req:{ userId: number; projectId: number; domainList: string; cnameProviderId: any }) {
+    const {userId,projectId,cnameProviderId,domainList} = req;
     const domains = domainList.split("\n").map(item => item.trim()).filter(item => item.length > 0);
     if (domains.length === 0) {
       throw new ValidateException("域名列表不能为空");
@@ -504,18 +504,19 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
       key: "user_"+userId,
       title: "导入CNAME记录",
       run: async (task) => {
-        await this._import({ userId, domains, cnameProviderId },task);
+        await this._import({ userId,projectId, domains, cnameProviderId },task);
       }
     }));
   }
 
-  async _import(req :{ userId: number; domains: string[]; cnameProviderId: any },task:BackTask) {
+  async _import(req :{ userId: number; projectId: number; domains: string[]; cnameProviderId: any },task:BackTask) {
     const userId = req.userId;
     for (const domain of req.domains) {
       const old = await this.getRepository().findOne({
         where: {
           userId: req.userId,
           domain,
+          projectId: req.projectId,
         },
       });
       if (old) {
@@ -526,6 +527,7 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
           await this.add({
             userId,
             domain: domain,
+            projectId: req.projectId,
             cnameProviderId: req.cnameProviderId,
           });
       }catch(e){
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/getter/cname-proxy-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/getter/cname-proxy-service.ts
index 4f4a7113f..e8b5df3b9 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/getter/cname-proxy-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/getter/cname-proxy-service.ts
@@ -2,13 +2,15 @@ import { CnameRecord, ICnameProxyService } from '@certd/pipeline';
 
 export class CnameProxyService implements ICnameProxyService {
   userId: number;
-  getter: <T>(domain: string, userId?: number) => Promise<T>;
-  constructor(userId: number, getter: (domain: string, userId: number) => Promise<any>) {
+  projectId: number;
+  getter: <T>(domain: string, userId?: number, projectId?: number) => Promise<T>;
+  constructor(userId: number, projectId: number, getter: (domain: string, userId: number, projectId: number) => Promise<any>) {
     this.userId = userId;
+    this.projectId = projectId;
     this.getter = getter;
   }
 
   async getByDomain(domain: string): Promise<CnameRecord> {
-    return await this.getter<CnameRecord>(domain, this.userId);
+    return await this.getter<CnameRecord>(domain, this.userId, this.projectId);
   }
 }
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts b/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts
index e30a20511..12ef4e1d7 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts
@@ -59,7 +59,7 @@ export class TaskServiceGetter implements IServiceGetter{
 
   async getCnameProxyService(): Promise<CnameProxyService> {
     const cnameRecordService:CnameRecordService = await  this.appCtx.getAsync("cnameRecordService")
-    return new CnameProxyService(this.userId, cnameRecordService.getWithAccessByDomain.bind(cnameRecordService));
+    return new CnameProxyService(this.userId, this.projectId, cnameRecordService.getWithAccessByDomain.bind(cnameRecordService));
   }
 
   async getNotificationService(): Promise<NotificationGetter> {
diff --git a/packages/ui/certd-server/src/plugins/plugin-admin/plugin-db-backup.ts b/packages/ui/certd-server/src/plugins/plugin-admin/plugin-db-backup.ts
index 6d54f06cd..1499f26c0 100644
--- a/packages/ui/certd-server/src/plugins/plugin-admin/plugin-db-backup.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-admin/plugin-db-backup.ts
@@ -157,9 +157,7 @@ export class DBBackupPlugin extends AbstractPlusTaskPlugin {
   async onInstance() {}
 
   async execute(): Promise<void> {
-    if (!this.isAdmin()) {
-      throw new Error("只有管理员才能运行此任务");
-    }
+    this.checkAdmin();
 
     this.logger.info("开始备份数据库");
 
diff --git a/packages/ui/certd-server/src/plugins/plugin-admin/plugin-deploy-to-certd.ts b/packages/ui/certd-server/src/plugins/plugin-admin/plugin-deploy-to-certd.ts
index 235fab024..12279bb8d 100644
--- a/packages/ui/certd-server/src/plugins/plugin-admin/plugin-deploy-to-certd.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-admin/plugin-deploy-to-certd.ts
@@ -32,9 +32,7 @@ export class DeployToCertdPlugin extends AbstractTaskPlugin {
   cert!: CertInfo;
   async onInstance() { }
   async execute(): Promise<void> {
-    if (!this.isAdmin()) {
-      throw new Error('只有管理员才能运行此任务');
-    }
+    this.checkAdmin();
 
     //部署证书
     let crtPath = "ssl/cert.crt";
diff --git a/packages/ui/certd-server/src/plugins/plugin-admin/plugin-restart.ts b/packages/ui/certd-server/src/plugins/plugin-admin/plugin-restart.ts
index 4a1659473..1a9698daa 100644
--- a/packages/ui/certd-server/src/plugins/plugin-admin/plugin-restart.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-admin/plugin-restart.ts
@@ -17,9 +17,7 @@ import { httpsServer } from '../../modules/auto/https/server.js';
 export class RestartCertdPlugin extends AbstractTaskPlugin {
   async onInstance() {}
   async execute(): Promise<void> {
-    if (!this.isAdmin()) {
-      throw new Error('只有管理员才能运行此任务');
-    }
+    this.checkAdmin();
     this.logger.info('Certd https server 将在 3 秒后重启');
     await this.ctx.utils.sleep(3000);
     await httpsServer.restart();
diff --git a/packages/ui/certd-server/src/plugins/plugin-admin/plugin-script.ts b/packages/ui/certd-server/src/plugins/plugin-admin/plugin-script.ts
index aa34667f6..4a4c00834 100644
--- a/packages/ui/certd-server/src/plugins/plugin-admin/plugin-script.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-admin/plugin-script.ts
@@ -47,9 +47,7 @@ export class CustomScriptPlugin extends AbstractTaskPlugin {
 
   async onInstance() {}
   async execute(): Promise<void> {
-    if (!this.isAdmin()) {
-      throw new Error('只有管理员才能运行此任务');
-    }
+    this.checkAdmin();
     this.logger.info('执行自定义脚本:\n', this.script);
     const ctx: CustomScriptContext = {
       CertReader,
diff --git a/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts b/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts
index 5c46308eb..cbd6fa884 100644
--- a/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts
@@ -198,9 +198,7 @@ export class CopyCertToLocalPlugin extends AbstractTaskPlugin {
     fs.copyFileSync(srcFile, destFile);
   }
   async execute(): Promise<void> {
-    if (!this.isAdmin()) {
-      throw new Error('只有管理员才能运行此任务');
-    }
+    this.checkAdmin();
 
     let { crtPath, keyPath, icPath, pfxPath, derPath, jksPath } = this;
     const certReader = new CertReader(this.cert);

From dd9a7cf5d7e2026a5b44a71556225f3eb0afee14 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 5 Mar 2026 00:11:08 +0800
Subject: [PATCH 51/62] chore: project fix

---
 .../lib-server/src/basic/base-controller.ts    |  2 +-
 .../certd-server/src/config/config.default.ts  |  2 +-
 .../pipeline/service/notification-service.ts   | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/libs/lib-server/src/basic/base-controller.ts b/packages/libs/lib-server/src/basic/base-controller.ts
index 7b58cd6c2..e09f30b32 100644
--- a/packages/libs/lib-server/src/basic/base-controller.ts
+++ b/packages/libs/lib-server/src/basic/base-controller.ts
@@ -118,7 +118,7 @@ export abstract class BaseController {
       if(allowAdmin){
         await authService.checkUserIdButAllowAdmin(this.ctx, service, id);
       }else{
-        await authService.checkUserId(this.ctx, service, id);
+        await authService.checkUserId( service, id, userId);
       }
     }
     return {projectId,userId}
diff --git a/packages/ui/certd-server/src/config/config.default.ts b/packages/ui/certd-server/src/config/config.default.ts
index 6c458b67e..47179e276 100644
--- a/packages/ui/certd-server/src/config/config.default.ts
+++ b/packages/ui/certd-server/src/config/config.default.ts
@@ -80,7 +80,7 @@ const development = {
         type: 'better-sqlite3',
         database: './data/db.sqlite',
         synchronize: false, // 如果第一次使用，不存在表，有同步的需求可以写 true
-        logging: false,
+        logging: true,
         highlightSql: false,
 
         // 配置实体模型 或者 entities: '/entity',
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts
index a6504720f..1636c6ffa 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts
@@ -138,21 +138,21 @@ export class NotificationService extends BaseService<NotificationEntity> {
     if (userId==null) {
       throw new ValidateException('userId不能为空');
     }
+    const query:any = {
+       userId,
+    }
+    if (projectId){
+      query.projectId = projectId
+    }
     await this.repository.update(
-      {
-        userId,
-        projectId,
-      },
+      query,
       {
         isDefault: false,
       }
     );
+    query.id = id
     await this.repository.update(
-      {
-        id,
-        userId,
-        projectId,
-      },
+     query,
       {
         isDefault: true,
       }

From 4925d5a5e7d2065a3f5b1e82f6a0ab454a07629f Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sun, 8 Mar 2026 00:48:29 +0800
Subject: [PATCH 52/62] chore: project prerelease

---
 .../src/locales/langs/en-US/certd.ts          |   1 +
 .../src/locales/langs/zh-CN/certd.ts          |   1 +
 .../src/views/certd/project/join.vue          |   2 +-
 .../src/views/sys/settings/tabs/mode.vue      |   1 +
 packages/ui/certd-server/.env.dev-mysql.yaml  |   2 +-
 .../db/migration-mysql/v10038__admin_mode.sql | 118 ++++++++++++++++++
 .../db/migration-pg/v10038__admin_mode.sql    | 116 +++++++++++++++++
 .../db/migration/v10038__admin_mode.sql       |   2 +-
 .../sys/enterprise/service/project-service.ts |   5 +-
 9 files changed, 244 insertions(+), 4 deletions(-)
 create mode 100644 packages/ui/certd-server/db/migration-mysql/v10038__admin_mode.sql
 create mode 100644 packages/ui/certd-server/db/migration-pg/v10038__admin_mode.sql

diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
index 4c8394bfe..4d72810aa 100644
--- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
@@ -843,6 +843,7 @@ export default {
     applyJoinConfirm: "Are you sure you want to apply to join this project?",
     leaveConfirm: "Are you sure you want to leave this project?",
     viewDetail: "View Detail",
+    projectManage: "Project Manage",
   },
   addonSelector: {
     select: "Select",
diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
index 030759015..6a15e954a 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -858,5 +858,6 @@ export default {
     applyJoinConfirm: "确认加入项目？",
     leaveConfirm: "确认退出项目？",
     viewDetail: "查看详情",
+    projectManage: "项目管理",
   },
 };
diff --git a/packages/ui/certd-client/src/views/certd/project/join.vue b/packages/ui/certd-client/src/views/certd/project/join.vue
index 2c19cd4ca..c8539b8b3 100644
--- a/packages/ui/certd-client/src/views/certd/project/join.vue
+++ b/packages/ui/certd-client/src/views/certd/project/join.vue
@@ -7,7 +7,7 @@
       </div>
 
       <div class="more">
-        <a-button v-if="userStore.isAdmin" @click="goProjectManager">{{ t("certd.project.projectManager") }}</a-button>
+        <a-button v-if="userStore.isAdmin" type="primary" @click="goProjectManager">{{ t("certd.project.projectManage") }}</a-button>
       </div>
     </template>
     <div class="project-container">
diff --git a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
index 5cf066b4f..ee466d074 100644
--- a/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue
@@ -9,6 +9,7 @@
         <div class="helper">SaaS模式：每个用户管理自己的流水线和授权资源，独立使用。</div>
         <div class="helper">企业模式：通过项目合作管理流水线证书和授权资源，所有用户视为企业内部员工。</div>
         <div class="helper text-red-500">建议在开始使用时固定一个合适的模式，之后就不要随意切换了。</div>
+        <div v-if="settingsStore.isComm" class="helper text-red-500">商业版不建议设置为企业模式，除非你确定要转成企业内部使用</div>
         <div><a @click="adminModeIntroOpen = true"> 更多管理模式介绍</a></div>
       </a-form-item>
 
diff --git a/packages/ui/certd-server/.env.dev-mysql.yaml b/packages/ui/certd-server/.env.dev-mysql.yaml
index f54421169..99dbb0d62 100644
--- a/packages/ui/certd-server/.env.dev-mysql.yaml
+++ b/packages/ui/certd-server/.env.dev-mysql.yaml
@@ -6,7 +6,7 @@ typeorm:
     default:
       type: mysql # mariadb
       host: localhost
-      port: 3309
+      port: 3308
       username: root
       password: root
       database: certd
diff --git a/packages/ui/certd-server/db/migration-mysql/v10038__admin_mode.sql b/packages/ui/certd-server/db/migration-mysql/v10038__admin_mode.sql
new file mode 100644
index 000000000..9bb2a1cb7
--- /dev/null
+++ b/packages/ui/certd-server/db/migration-mysql/v10038__admin_mode.sql
@@ -0,0 +1,118 @@
+
+CREATE TABLE `cd_project`
+(
+  `id`          bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `user_id`     bigint      NOT NULL,
+  `name`        varchar(512) NOT NULL,
+  `admin_id`    bigint      NOT NULL,
+  `disabled`    boolean      NOT NULL DEFAULT false,
+  `is_system`   boolean      NOT NULL DEFAULT false,
+  `create_time` timestamp     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time` timestamp     NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+
+CREATE INDEX `index_project_user_id` ON `cd_project` (`user_id`);
+CREATE INDEX `index_project_admin_id` ON `cd_project` (`admin_id`);
+INSERT INTO cd_project (id, user_id, `admin_id`, `name`, `disabled`, `is_system`) VALUES (1, -1, 1,'default', false,false);
+
+ALTER TABLE cd_cert_info ADD COLUMN  project_id bigint;
+CREATE INDEX `index_cert_project_id` ON `cd_cert_info` (`project_id`);
+
+ALTER TABLE cd_site_info ADD COLUMN  project_id bigint;
+CREATE INDEX `index_site_project_id` ON `cd_site_info` (`project_id`);
+
+ALTER TABLE cd_site_ip ADD COLUMN  project_id bigint;
+CREATE INDEX `index_site_ip_project_id` ON `cd_site_ip` (`project_id`);
+
+ALTER TABLE cd_open_key ADD COLUMN  project_id bigint;
+CREATE INDEX `index_open_key_project_id` ON `cd_open_key` (`project_id`);
+
+ALTER TABLE cd_access ADD COLUMN  project_id bigint;
+CREATE INDEX `index_access_project_id` ON `cd_access` (`project_id`);
+
+ALTER TABLE cd_addon ADD COLUMN  project_id bigint;
+CREATE INDEX `index_addon_project_id` ON `cd_addon` (`project_id`);
+
+ALTER TABLE pi_pipeline ADD COLUMN  project_id bigint;
+CREATE INDEX `index_pipeline_project_id` ON `pi_pipeline` (`project_id`);
+
+ALTER TABLE pi_pipeline_group ADD COLUMN  project_id bigint;
+CREATE INDEX `index_pipeline_group_project_id` ON `pi_pipeline_group` (`project_id`);
+
+ALTER TABLE pi_storage ADD COLUMN  project_id bigint;
+CREATE INDEX `index_storage_project_id` ON `pi_storage` (`project_id`);
+
+ALTER TABLE pi_notification ADD COLUMN  project_id bigint;
+CREATE INDEX `index_notification_project_id` ON `pi_notification` (`project_id`);
+
+ALTER TABLE pi_history ADD COLUMN  project_id bigint;
+CREATE INDEX `index_history_project_id` ON `pi_history` (`project_id`);
+
+ALTER TABLE pi_history_log ADD COLUMN  project_id bigint;
+CREATE INDEX `index_history_log_project_id` ON `pi_history_log` (`project_id`);
+
+ALTER TABLE pi_template ADD COLUMN  project_id bigint;
+CREATE INDEX `index_template_project_id` ON `pi_template` (`project_id`);
+
+ALTER TABLE pi_sub_domain ADD COLUMN  project_id bigint;
+CREATE INDEX `index_sub_domain_project_id` ON `pi_sub_domain` (`project_id`);
+
+ALTER TABLE cd_cname_record ADD COLUMN  project_id bigint;
+CREATE INDEX `index_cname_record_project_id` ON `cd_cname_record` (`project_id`);
+
+ALTER TABLE cd_domain ADD COLUMN  project_id bigint;
+CREATE INDEX `index_domain_project_id` ON `cd_domain` (`project_id`);
+
+ALTER TABLE user_settings ADD COLUMN  project_id bigint;
+CREATE INDEX `index_user_settings_project_id` ON `user_settings` (`project_id`);
+
+ALTER TABLE cd_group ADD COLUMN  project_id bigint;
+CREATE INDEX `index_group_project_id` ON `cd_group` (`project_id`);
+
+
+
+
+CREATE TABLE `cd_project_member`
+(
+  `id`          bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `user_id`     bigint      NOT NULL,
+  `project_id`  bigint      NOT NULL,
+  `permission`  varchar(128) NOT NULL DEFAULT 'read',
+  `create_time` timestamp     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time` timestamp     NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+ALTER TABLE cd_project_member ADD COLUMN  status varchar(128);
+
+CREATE INDEX `index_project_member_user_id` ON `cd_project_member` (`user_id`);
+CREATE INDEX `index_project_member_project_id` ON `cd_project_member` (`project_id`);
+
+
+CREATE TABLE `cd_audit_log`
+(
+  `id`          bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `user_id`     bigint      NOT NULL,
+  `username`    varchar(128) NOT NULL,
+  `project_id`  bigint      NOT NULL,
+  `project_name` varchar(512) NOT NULL,
+  `type`        varchar(128) NOT NULL,
+  `action`      varchar(128) NOT NULL DEFAULT 'read',
+  `content`     longtext         NOT NULL,
+  `ip_address`  varchar(128) NOT NULL,
+  `create_time` timestamp     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time` timestamp     NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+
+CREATE INDEX `index_audit_log_user_id` ON `cd_audit_log` (`user_id`);
+CREATE INDEX `index_audit_log_project_id` ON `cd_audit_log` (`project_id`);
+
+
+
+ALTER TABLE cd_site_info ADD COLUMN ip_address varchar(128);
+
+
+ALTER TABLE `cd_project` ENGINE = InnoDB;
+ALTER TABLE `cd_project_member` ENGINE = InnoDB;
+ALTER TABLE `cd_audit_log` ENGINE = InnoDB;
\ No newline at end of file
diff --git a/packages/ui/certd-server/db/migration-pg/v10038__admin_mode.sql b/packages/ui/certd-server/db/migration-pg/v10038__admin_mode.sql
new file mode 100644
index 000000000..f1c798876
--- /dev/null
+++ b/packages/ui/certd-server/db/migration-pg/v10038__admin_mode.sql
@@ -0,0 +1,116 @@
+
+CREATE TABLE "cd_project"
+(
+  "id"          bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+  "user_id"     bigint      NOT NULL,
+  "name"        varchar(512) NOT NULL,
+  "admin_id"    bigint      NOT NULL,
+  "disabled"    boolean      NOT NULL DEFAULT (false),
+  "is_system"   boolean      NOT NULL DEFAULT (false),
+  "create_time" timestamp     NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time" timestamp     NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+
+
+CREATE INDEX "index_project_user_id" ON "cd_project" ("user_id");
+CREATE INDEX "index_project_admin_id" ON "cd_project" ("admin_id");
+INSERT INTO cd_project (id, user_id, "admin_id", "name", "disabled", "is_system") VALUES (1, -1, 1,'default', false,false);
+select setval('cd_project_id_seq', 1);
+
+
+ALTER TABLE cd_cert_info ADD COLUMN  project_id bigint;
+CREATE INDEX "index_cert_project_id" ON "cd_cert_info" ("project_id");
+
+ALTER TABLE cd_site_info ADD COLUMN  project_id bigint;
+CREATE INDEX "index_site_project_id" ON "cd_site_info" ("project_id");
+
+ALTER TABLE cd_site_ip ADD COLUMN  project_id bigint;
+CREATE INDEX "index_site_ip_project_id" ON "cd_site_ip" ("project_id");
+
+ALTER TABLE cd_open_key ADD COLUMN  project_id bigint;
+CREATE INDEX "index_open_key_project_id" ON "cd_open_key" ("project_id");
+
+ALTER TABLE cd_access ADD COLUMN  project_id bigint;
+CREATE INDEX "index_access_project_id" ON "cd_access" ("project_id");
+
+ALTER TABLE cd_addon ADD COLUMN  project_id bigint;
+CREATE INDEX "index_addon_project_id" ON "cd_addon" ("project_id");
+
+ALTER TABLE pi_pipeline ADD COLUMN  project_id bigint;
+CREATE INDEX "index_pipeline_project_id" ON "pi_pipeline" ("project_id");
+
+ALTER TABLE pi_pipeline_group ADD COLUMN  project_id bigint;
+CREATE INDEX "index_pipeline_group_project_id" ON "pi_pipeline_group" ("project_id");
+
+ALTER TABLE pi_storage ADD COLUMN  project_id bigint;
+CREATE INDEX "index_storage_project_id" ON "pi_storage" ("project_id");
+
+ALTER TABLE pi_notification ADD COLUMN  project_id bigint;
+CREATE INDEX "index_notification_project_id" ON "pi_notification" ("project_id");
+
+ALTER TABLE pi_history ADD COLUMN  project_id bigint;
+CREATE INDEX "index_history_project_id" ON "pi_history" ("project_id");
+
+ALTER TABLE pi_history_log ADD COLUMN  project_id bigint;
+CREATE INDEX "index_history_log_project_id" ON "pi_history_log" ("project_id");
+
+ALTER TABLE pi_template ADD COLUMN  project_id bigint;
+CREATE INDEX "index_template_project_id" ON "pi_template" ("project_id");
+
+ALTER TABLE pi_sub_domain ADD COLUMN  project_id bigint;
+CREATE INDEX "index_sub_domain_project_id" ON "pi_sub_domain" ("project_id");
+
+ALTER TABLE cd_cname_record ADD COLUMN  project_id bigint;
+CREATE INDEX "index_cname_record_project_id" ON "cd_cname_record" ("project_id");
+
+ALTER TABLE cd_domain ADD COLUMN  project_id bigint;
+CREATE INDEX "index_domain_project_id" ON "cd_domain" ("project_id");
+
+ALTER TABLE user_settings ADD COLUMN  project_id bigint;
+CREATE INDEX "index_user_settings_project_id" ON "user_settings" ("project_id");
+
+ALTER TABLE cd_group ADD COLUMN  project_id bigint;
+CREATE INDEX "index_group_project_id" ON "cd_group" ("project_id");
+
+
+
+
+CREATE TABLE "cd_project_member"
+(
+  "id"          bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+  "user_id"     bigint      NOT NULL,
+  "project_id"  bigint      NOT NULL,
+  "permission"  varchar(128) NOT NULL DEFAULT ('read'),
+  "create_time" timestamp     NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time" timestamp     NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+
+ALTER TABLE cd_project_member ADD COLUMN  status varchar(128);
+
+CREATE INDEX "index_project_member_user_id" ON "cd_project_member" ("user_id");
+CREATE INDEX "index_project_member_project_id" ON "cd_project_member" ("project_id");
+
+
+CREATE TABLE "cd_audit_log"
+(
+  "id"          bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+  "user_id"     bigint      NOT NULL,
+  "username"    varchar(128) NOT NULL,
+  "project_id"  bigint      NOT NULL,
+  "project_name" varchar(512) NOT NULL,
+  "type"        varchar(128) NOT NULL,
+  "action"      varchar(128) NOT NULL DEFAULT ('read'),
+  "content"     text         NOT NULL,
+  "ip_address"  varchar(128) NOT NULL,
+  "create_time" timestamp     NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time" timestamp     NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+
+
+CREATE INDEX "index_audit_log_user_id" ON "cd_audit_log" ("user_id");
+CREATE INDEX "index_audit_log_project_id" ON "cd_audit_log" ("project_id");
+
+
+
+ALTER TABLE cd_site_info ADD COLUMN ip_address varchar(128);
+
diff --git a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
index 4111cae61..2543808ee 100644
--- a/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
+++ b/packages/ui/certd-server/db/migration/v10038__admin_mode.sql
@@ -14,7 +14,7 @@ CREATE TABLE "cd_project"
 
 CREATE INDEX "index_project_user_id" ON "cd_project" ("user_id");
 CREATE INDEX "index_project_admin_id" ON "cd_project" ("admin_id");
-INSERT INTO cd_project (id, user_id, "admin_id", "name", "disabled") VALUES (1, -1, 1,'default', false,false);
+INSERT INTO cd_project (id, user_id, "admin_id", "name", "disabled", "is_system") VALUES (1, -1, 1,'default', false,false);
 
 ALTER TABLE cd_cert_info ADD COLUMN  project_id integer;
 CREATE INDEX "index_cert_project_id" ON "cd_cert_info" ("project_id");
diff --git a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
index e594020e4..e10b85779 100644
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
@@ -69,7 +69,10 @@ export class ProjectService extends BaseService<ProjectEntity> {
   async getUserProjects(userId: number) {
 
     const memberList = await this.projectMemberService.getByUserId(userId, 'approved');
-    const projectIds = memberList.map(item => item.projectId);
+    let projectIds = memberList.map(item => item.projectId); 
+    if (!projectIds || projectIds.length === 0) {
+      projectIds = [0]
+    }
     const projectList = await this.repository.createQueryBuilder('project')
       .where(' project.disabled = false')
       .where(' project.userId = :userId', { userId: ENTERPRISE_USER_ID })

From d9c0130b59997144a3c274d456635b800135e43f Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sun, 8 Mar 2026 01:14:33 +0800
Subject: [PATCH 53/62] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=AC?=
 =?UTF-8?q?=E4=B8=9C=E4=BA=91=E5=9F=9F=E5=90=8D=E7=94=B3=E8=AF=B7=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=E6=8A=A5=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/plugins/plugin-jdcloud/dns-provider.ts      | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/ui/certd-server/src/plugins/plugin-jdcloud/dns-provider.ts b/packages/ui/certd-server/src/plugins/plugin-jdcloud/dns-provider.ts
index a86473fbd..81eacbb5d 100644
--- a/packages/ui/certd-server/src/plugins/plugin-jdcloud/dns-provider.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-jdcloud/dns-provider.ts
@@ -34,8 +34,14 @@ export class JDCloudDnsProvider extends AbstractDnsProvider {
     if (!domainRes.result?.dataList?.length) {
       throw new Error(`域名${domain}在此京东云账号中不存在`)
     }
+    const list = domainRes.result.dataList
 
-    const domainId = domainRes.result.dataList[0].id
+    const found =  list.find((item) => item.domainName === domain)
+    if (!found){
+      throw new Error(`域名${domain}在此京东云账号中不存在`)
+    }
+
+    const domainId = found.id
     this.logger.info("域名ID：", domainId)
     /**
      * hostRecord	String	True		主机记录
@@ -55,11 +61,12 @@ export class JDCloudDnsProvider extends AbstractDnsProvider {
           hostRecord: hostRecord,
           hostValue: value,
           type: type,
-          ttl: 100,
+          ttl: 200,
+          viewValue:-1,
         }
       })
       return {
-        recordId: res.result.dataList[0].id,
+        recordId: res.result.dataList.id,
         domainId: domainId
       };
     }catch (e) {

From ac42d38b7a7c01b34b8f42d344e154ae65389afb Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sun, 8 Mar 2026 01:15:23 +0800
Subject: [PATCH 54/62] build: prepare to build

---
 packages/core/basic/build.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/basic/build.md b/packages/core/basic/build.md
index 70bd44af2..20c2a34a5 100644
--- a/packages/core/basic/build.md
+++ b/packages/core/basic/build.md
@@ -1 +1 @@
-23:18
+01:15

From 3bb29abe32c311e1cf840f97d485d1147411992a Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sun, 8 Mar 2026 01:17:39 +0800
Subject: [PATCH 55/62] v1.39.0

---
 CHANGELOG.md                                  | 28 +++++++++++++++++++
 lerna.json                                    |  2 +-
 packages/core/acme-client/CHANGELOG.md        |  4 +++
 packages/core/acme-client/package.json        |  4 +--
 packages/core/basic/CHANGELOG.md              | 10 +++++++
 packages/core/basic/package.json              |  2 +-
 packages/core/pipeline/CHANGELOG.md           |  4 +++
 packages/core/pipeline/package.json           |  6 ++--
 packages/libs/lib-huawei/CHANGELOG.md         |  4 +++
 packages/libs/lib-huawei/package.json         |  2 +-
 packages/libs/lib-iframe/CHANGELOG.md         |  4 +++
 packages/libs/lib-iframe/package.json         |  2 +-
 packages/libs/lib-jdcloud/CHANGELOG.md        |  4 +++
 packages/libs/lib-jdcloud/package.json        |  2 +-
 packages/libs/lib-k8s/CHANGELOG.md            |  4 +++
 packages/libs/lib-k8s/package.json            |  4 +--
 packages/libs/lib-server/CHANGELOG.md         |  6 ++++
 packages/libs/lib-server/package.json         | 12 ++++----
 packages/libs/midway-flyway-js/CHANGELOG.md   |  4 +++
 packages/libs/midway-flyway-js/package.json   |  2 +-
 packages/plugins/plugin-cert/CHANGELOG.md     |  4 +++
 packages/plugins/plugin-cert/package.json     | 10 +++----
 packages/plugins/plugin-lib/CHANGELOG.md      |  4 +++
 packages/plugins/plugin-lib/package.json      | 10 +++----
 packages/ui/certd-client/CHANGELOG.md         | 18 ++++++++++++
 packages/ui/certd-client/package.json         |  6 ++--
 packages/ui/certd-server/CHANGELOG.md         | 21 ++++++++++++++
 .../metadata/addon_oauth_microsoft.yaml       |  9 ++++--
 .../metadata/deploy_CertApply.yaml            |  2 +-
 .../deploy_CertApplyGetFormAliyun.yaml        |  2 +-
 .../metadata/deploy_CertApplyLego.yaml        |  4 +--
 .../metadata/deploy_CertApplyUpload.yaml      |  2 +-
 packages/ui/certd-server/package.json         | 28 +++++++++----------
 33 files changed, 177 insertions(+), 53 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c06cb30a..941af97f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
+
+### Bug Fixes
+
+* 修复部署到openwrt错误的bug ([2e3d0cc](https://github.com/certd/certd/commit/2e3d0cc57c16c48ad435bc8fde729bacaedde9f5))
+* 修复发件邮箱无法输入的bug ([27b0348](https://github.com/certd/certd/commit/27b0348e1d3d752f418f851965d6afbc26c0160c))
+* 修复复制流水线保存后丢失分组和排序号的问题 ([bc32648](https://github.com/certd/certd/commit/bc326489abc1d50a0930b4f47aa2d62d3a486798))
+* 修复获取群辉deviceid报错的bug ([79be392](https://github.com/certd/certd/commit/79be392775a2c91848dd5a66a2618adc4e4b48f6))
+* 修复京东云域名申请证书报错的bug ([d9c0130](https://github.com/certd/certd/commit/d9c0130b59997144a3c274d456635b800135e43f))
+* 修复偶尔下载证书报未授权的错误 ([316537e](https://github.com/certd/certd/commit/316537eb4dcbe5ec57784e8bf95ee3cdfd21dce7))
+* 修复dcdn多个域名同时部署时 可能会出现证书名称重复的bug ([78c2ced](https://github.com/certd/certd/commit/78c2ced43b1a73d142b0ed783b162b97f545ab06))
+* 优化dcdn部署上传多次证书 偶尔报 The CertName already exists的问题 ([72f850f](https://github.com/certd/certd/commit/72f850f675b500d12ebff2338d1b99d6fab476e1))
+* **cert-plugin:** 优化又拍云客户端错误处理逻辑，当域名已绑定证书时不再抛出异常。 ([92c9ac3](https://github.com/certd/certd/commit/92c9ac382692e6c84140ff787759ab6d39ccbe96))
+* esxi部署失败的bug ([1e44115](https://github.com/certd/certd/commit/1e441154617e6516a9a3610412bf597128c62696))
+
+### Features
+
+* 支持企业级管理模式，项目管理，细分权限 ([3734083](https://github.com/certd/certd/commit/37340838b6a61a94b86bfa13cf5da88b26f1315a))
+
+### Performance Improvements
+
+* 【破坏性更新】错误返回信息msg字段名统一改成message，与成功的返回结构一致 ([51ab6d6](https://github.com/certd/certd/commit/51ab6d6da1bb551b55b3a6a4a9a945c8d6ace806))
+* 当域名管理中没有域名时，创建流水线时不展开域名选择框 ([bb0afe1](https://github.com/certd/certd/commit/bb0afe1fa7b0fc52fde051d24fbe6be69d52f4cc))
+* 任务步骤页面增加串行执行提示说明 ([787f6ef](https://github.com/certd/certd/commit/787f6ef52893d8dc912ee2a7a5b8ce2b73c108c9))
+* 站点监控支持指定ip地址检查 ([83d81b6](https://github.com/certd/certd/commit/83d81b64b3adb375366039e07c87d1ad79121c13))
+* AI开发插件 skills 定义初步 ([1f68fad](https://github.com/certd/certd/commit/1f68faddb97a978c5a5e731a8895b4bb0587ad83))
+* http请求增加建立连接超时配置 ([3c85602](https://github.com/certd/certd/commit/3c85602ab1fc1953cdc06a6cd75a971d14119179))
+
 ## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
 
 ### Bug Fixes
diff --git a/lerna.json b/lerna.json
index c8a058702..a01dc07e0 100644
--- a/lerna.json
+++ b/lerna.json
@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.38.12"
+  "version": "1.39.0"
 }
diff --git a/packages/core/acme-client/CHANGELOG.md b/packages/core/acme-client/CHANGELOG.md
index a66e74b69..f5a0a0a03 100644
--- a/packages/core/acme-client/CHANGELOG.md
+++ b/packages/core/acme-client/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/publishlab/node-acme-client/compare/v1.38.12...v1.39.0) (2026-03-07)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.38.12](https://github.com/publishlab/node-acme-client/compare/v1.38.11...v1.38.12) (2026-02-18)
 
 **Note:** Version bump only for package @certd/acme-client
diff --git a/packages/core/acme-client/package.json b/packages/core/acme-client/package.json
index 924f60a81..1abcce7c6 100644
--- a/packages/core/acme-client/package.json
+++ b/packages/core/acme-client/package.json
@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.38.12",
+    "version": "1.39.0",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.38.12",
+        "@certd/basic": "^1.39.0",
         "@peculiar/x509": "^1.11.0",
         "asn1js": "^3.0.5",
         "axios": "^1.9.0",
diff --git a/packages/core/basic/CHANGELOG.md b/packages/core/basic/CHANGELOG.md
index cb5160ce3..fedba406a 100644
--- a/packages/core/basic/CHANGELOG.md
+++ b/packages/core/basic/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
+
+### Bug Fixes
+
+* esxi部署失败的bug ([1e44115](https://github.com/certd/certd/commit/1e441154617e6516a9a3610412bf597128c62696))
+
+### Performance Improvements
+
+* http请求增加建立连接超时配置 ([3c85602](https://github.com/certd/certd/commit/3c85602ab1fc1953cdc06a6cd75a971d14119179))
+
 ## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
 
 **Note:** Version bump only for package @certd/basic
diff --git a/packages/core/basic/package.json b/packages/core/basic/package.json
index 233194c38..071c6c13f 100644
--- a/packages/core/basic/package.json
+++ b/packages/core/basic/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.38.12",
+  "version": "1.39.0",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
diff --git a/packages/core/pipeline/CHANGELOG.md b/packages/core/pipeline/CHANGELOG.md
index 06b396f9d..6c38e66bc 100644
--- a/packages/core/pipeline/CHANGELOG.md
+++ b/packages/core/pipeline/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
+
+**Note:** Version bump only for package @certd/pipeline
+
 ## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
 
 **Note:** Version bump only for package @certd/pipeline
diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json
index 7fc05d669..a53922313 100644
--- a/packages/core/pipeline/package.json
+++ b/packages/core/pipeline/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.38.12",
+  "version": "1.39.0",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -18,8 +18,8 @@
     "compile": "tsc --skipLibCheck --watch"
   },
   "dependencies": {
-    "@certd/basic": "^1.38.12",
-    "@certd/plus-core": "^1.38.12",
+    "@certd/basic": "^1.39.0",
+    "@certd/plus-core": "^1.39.0",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
     "reflect-metadata": "^0.1.13"
diff --git a/packages/libs/lib-huawei/CHANGELOG.md b/packages/libs/lib-huawei/CHANGELOG.md
index 9925124b2..10dcb08df 100644
--- a/packages/libs/lib-huawei/CHANGELOG.md
+++ b/packages/libs/lib-huawei/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
 
 **Note:** Version bump only for package @certd/lib-huawei
diff --git a/packages/libs/lib-huawei/package.json b/packages/libs/lib-huawei/package.json
index f2151ef93..29ef615da 100644
--- a/packages/libs/lib-huawei/package.json
+++ b/packages/libs/lib-huawei/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-huawei",
   "private": false,
-  "version": "1.38.12",
+  "version": "1.39.0",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",
diff --git a/packages/libs/lib-iframe/CHANGELOG.md b/packages/libs/lib-iframe/CHANGELOG.md
index ddd2b03fe..bff016b71 100644
--- a/packages/libs/lib-iframe/CHANGELOG.md
+++ b/packages/libs/lib-iframe/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 ## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
 
 **Note:** Version bump only for package @certd/lib-iframe
diff --git a/packages/libs/lib-iframe/package.json b/packages/libs/lib-iframe/package.json
index 3c55e93f8..6f31efb29 100644
--- a/packages/libs/lib-iframe/package.json
+++ b/packages/libs/lib-iframe/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-iframe",
   "private": false,
-  "version": "1.38.12",
+  "version": "1.39.0",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
diff --git a/packages/libs/lib-jdcloud/CHANGELOG.md b/packages/libs/lib-jdcloud/CHANGELOG.md
index 16ea78683..9c2f67398 100644
--- a/packages/libs/lib-jdcloud/CHANGELOG.md
+++ b/packages/libs/lib-jdcloud/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
+
+**Note:** Version bump only for package @certd/jdcloud
+
 ## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
 
 **Note:** Version bump only for package @certd/jdcloud
diff --git a/packages/libs/lib-jdcloud/package.json b/packages/libs/lib-jdcloud/package.json
index a3d4af1f0..60113752e 100644
--- a/packages/libs/lib-jdcloud/package.json
+++ b/packages/libs/lib-jdcloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@certd/jdcloud",
-  "version": "1.38.12",
+  "version": "1.39.0",
   "description": "jdcloud openApi sdk",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
diff --git a/packages/libs/lib-k8s/CHANGELOG.md b/packages/libs/lib-k8s/CHANGELOG.md
index 93ea5de77..6f0b7733b 100644
--- a/packages/libs/lib-k8s/CHANGELOG.md
+++ b/packages/libs/lib-k8s/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 ## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
 
 **Note:** Version bump only for package @certd/lib-k8s
diff --git a/packages/libs/lib-k8s/package.json b/packages/libs/lib-k8s/package.json
index 0d70949e8..71489a222 100644
--- a/packages/libs/lib-k8s/package.json
+++ b/packages/libs/lib-k8s/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-k8s",
   "private": false,
-  "version": "1.38.12",
+  "version": "1.39.0",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -17,7 +17,7 @@
     "pub": "npm publish"
   },
   "dependencies": {
-    "@certd/basic": "^1.38.12",
+    "@certd/basic": "^1.39.0",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
diff --git a/packages/libs/lib-server/CHANGELOG.md b/packages/libs/lib-server/CHANGELOG.md
index d5d3458b3..1cba6f03f 100644
--- a/packages/libs/lib-server/CHANGELOG.md
+++ b/packages/libs/lib-server/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
+
+### Performance Improvements
+
+* 【破坏性更新】错误返回信息msg字段名统一改成message，与成功的返回结构一致 ([51ab6d6](https://github.com/certd/certd/commit/51ab6d6da1bb551b55b3a6a4a9a945c8d6ace806))
+
 ## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
 
 **Note:** Version bump only for package @certd/lib-server
diff --git a/packages/libs/lib-server/package.json b/packages/libs/lib-server/package.json
index 7c19870dc..7219669ff 100644
--- a/packages/libs/lib-server/package.json
+++ b/packages/libs/lib-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@certd/lib-server",
-  "version": "1.38.12",
+  "version": "1.39.0",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -28,11 +28,11 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.38.12",
-    "@certd/basic": "^1.38.12",
-    "@certd/pipeline": "^1.38.12",
-    "@certd/plugin-lib": "^1.38.12",
-    "@certd/plus-core": "^1.38.12",
+    "@certd/acme-client": "^1.39.0",
+    "@certd/basic": "^1.39.0",
+    "@certd/pipeline": "^1.39.0",
+    "@certd/plugin-lib": "^1.39.0",
+    "@certd/plus-core": "^1.39.0",
     "@midwayjs/cache": "3.14.0",
     "@midwayjs/core": "3.20.11",
     "@midwayjs/i18n": "3.20.13",
diff --git a/packages/libs/midway-flyway-js/CHANGELOG.md b/packages/libs/midway-flyway-js/CHANGELOG.md
index 2ffeea524..e270d4acf 100644
--- a/packages/libs/midway-flyway-js/CHANGELOG.md
+++ b/packages/libs/midway-flyway-js/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 ## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
 
 **Note:** Version bump only for package @certd/midway-flyway-js
diff --git a/packages/libs/midway-flyway-js/package.json b/packages/libs/midway-flyway-js/package.json
index 5c936eb15..5480ba9d3 100644
--- a/packages/libs/midway-flyway-js/package.json
+++ b/packages/libs/midway-flyway-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@certd/midway-flyway-js",
-  "version": "1.38.12",
+  "version": "1.39.0",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
diff --git a/packages/plugins/plugin-cert/CHANGELOG.md b/packages/plugins/plugin-cert/CHANGELOG.md
index cd4065b26..0d5f8518e 100644
--- a/packages/plugins/plugin-cert/CHANGELOG.md
+++ b/packages/plugins/plugin-cert/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
 ## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
 
 **Note:** Version bump only for package @certd/plugin-cert
diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json
index 234a3ca3f..0f6d4adde 100644
--- a/packages/plugins/plugin-cert/package.json
+++ b/packages/plugins/plugin-cert/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.38.12",
+  "version": "1.39.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -17,10 +17,10 @@
     "compile": "tsc --skipLibCheck --watch"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.38.12",
-    "@certd/basic": "^1.38.12",
-    "@certd/pipeline": "^1.38.12",
-    "@certd/plugin-lib": "^1.38.12",
+    "@certd/acme-client": "^1.39.0",
+    "@certd/basic": "^1.39.0",
+    "@certd/pipeline": "^1.39.0",
+    "@certd/plugin-lib": "^1.39.0",
     "psl": "^1.9.0",
     "punycode.js": "^2.3.1"
   },
diff --git a/packages/plugins/plugin-lib/CHANGELOG.md b/packages/plugins/plugin-lib/CHANGELOG.md
index a66e8026e..2aba3b7fd 100644
--- a/packages/plugins/plugin-lib/CHANGELOG.md
+++ b/packages/plugins/plugin-lib/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
 ## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
 
 **Note:** Version bump only for package @certd/plugin-lib
diff --git a/packages/plugins/plugin-lib/package.json b/packages/plugins/plugin-lib/package.json
index ae03e35ee..c49862dce 100644
--- a/packages/plugins/plugin-lib/package.json
+++ b/packages/plugins/plugin-lib/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-lib",
   "private": false,
-  "version": "1.38.12",
+  "version": "1.39.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -22,10 +22,10 @@
     "@alicloud/pop-core": "^1.7.10",
     "@alicloud/tea-util": "^1.4.11",
     "@aws-sdk/client-s3": "^3.964.0",
-    "@certd/acme-client": "^1.38.12",
-    "@certd/basic": "^1.38.12",
-    "@certd/pipeline": "^1.38.12",
-    "@certd/plus-core": "^1.38.12",
+    "@certd/acme-client": "^1.39.0",
+    "@certd/basic": "^1.39.0",
+    "@certd/pipeline": "^1.39.0",
+    "@certd/plus-core": "^1.39.0",
     "@kubernetes/client-node": "0.21.0",
     "ali-oss": "^6.22.0",
     "basic-ftp": "^5.0.5",
diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md
index 424c83373..7086b59a9 100644
--- a/packages/ui/certd-client/CHANGELOG.md
+++ b/packages/ui/certd-client/CHANGELOG.md
@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
+
+### Bug Fixes
+
+* 修复发件邮箱无法输入的bug ([27b0348](https://github.com/certd/certd/commit/27b0348e1d3d752f418f851965d6afbc26c0160c))
+* 修复复制流水线保存后丢失分组和排序号的问题 ([bc32648](https://github.com/certd/certd/commit/bc326489abc1d50a0930b4f47aa2d62d3a486798))
+* 修复获取群辉deviceid报错的bug ([79be392](https://github.com/certd/certd/commit/79be392775a2c91848dd5a66a2618adc4e4b48f6))
+* 修复偶尔下载证书报未授权的错误 ([316537e](https://github.com/certd/certd/commit/316537eb4dcbe5ec57784e8bf95ee3cdfd21dce7))
+
+### Features
+
+* 支持企业级管理模式，项目管理，细分权限 ([3734083](https://github.com/certd/certd/commit/37340838b6a61a94b86bfa13cf5da88b26f1315a))
+
+### Performance Improvements
+
+* 当域名管理中没有域名时，创建流水线时不展开域名选择框 ([bb0afe1](https://github.com/certd/certd/commit/bb0afe1fa7b0fc52fde051d24fbe6be69d52f4cc))
+* 任务步骤页面增加串行执行提示说明 ([787f6ef](https://github.com/certd/certd/commit/787f6ef52893d8dc912ee2a7a5b8ce2b73c108c9))
+
 ## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
 
 ### Bug Fixes
diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json
index ee72a866a..fd290604b 100644
--- a/packages/ui/certd-client/package.json
+++ b/packages/ui/certd-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.38.12",
+  "version": "1.39.0",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -106,8 +106,8 @@
     "zod-defaults": "^0.1.3"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.38.12",
-    "@certd/pipeline": "^1.38.12",
+    "@certd/lib-iframe": "^1.39.0",
+    "@certd/pipeline": "^1.39.0",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",
diff --git a/packages/ui/certd-server/CHANGELOG.md b/packages/ui/certd-server/CHANGELOG.md
index 9dc3239c7..383082656 100644
--- a/packages/ui/certd-server/CHANGELOG.md
+++ b/packages/ui/certd-server/CHANGELOG.md
@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
+
+### Bug Fixes
+
+* 修复部署到openwrt错误的bug ([2e3d0cc](https://github.com/certd/certd/commit/2e3d0cc57c16c48ad435bc8fde729bacaedde9f5))
+* 修复复制流水线保存后丢失分组和排序号的问题 ([bc32648](https://github.com/certd/certd/commit/bc326489abc1d50a0930b4f47aa2d62d3a486798))
+* 修复京东云域名申请证书报错的bug ([d9c0130](https://github.com/certd/certd/commit/d9c0130b59997144a3c274d456635b800135e43f))
+* 修复偶尔下载证书报未授权的错误 ([316537e](https://github.com/certd/certd/commit/316537eb4dcbe5ec57784e8bf95ee3cdfd21dce7))
+* 修复dcdn多个域名同时部署时 可能会出现证书名称重复的bug ([78c2ced](https://github.com/certd/certd/commit/78c2ced43b1a73d142b0ed783b162b97f545ab06))
+* 优化dcdn部署上传多次证书 偶尔报 The CertName already exists的问题 ([72f850f](https://github.com/certd/certd/commit/72f850f675b500d12ebff2338d1b99d6fab476e1))
+* **cert-plugin:** 优化又拍云客户端错误处理逻辑，当域名已绑定证书时不再抛出异常。 ([92c9ac3](https://github.com/certd/certd/commit/92c9ac382692e6c84140ff787759ab6d39ccbe96))
+* esxi部署失败的bug ([1e44115](https://github.com/certd/certd/commit/1e441154617e6516a9a3610412bf597128c62696))
+
+### Features
+
+* 支持企业级管理模式，项目管理，细分权限 ([3734083](https://github.com/certd/certd/commit/37340838b6a61a94b86bfa13cf5da88b26f1315a))
+
+### Performance Improvements
+
+* 站点监控支持指定ip地址检查 ([83d81b6](https://github.com/certd/certd/commit/83d81b64b3adb375366039e07c87d1ad79121c13))
+
 ## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
 
 **Note:** Version bump only for package @certd/ui-server
diff --git a/packages/ui/certd-server/metadata/addon_oauth_microsoft.yaml b/packages/ui/certd-server/metadata/addon_oauth_microsoft.yaml
index 272b60e83..0462d6098 100644
--- a/packages/ui/certd-server/metadata/addon_oauth_microsoft.yaml
+++ b/packages/ui/certd-server/metadata/addon_oauth_microsoft.yaml
@@ -7,18 +7,23 @@ showTest: false
 input:
   clientId:
     title: ClientId
-    helper: '[Azure Portal](https://portal.azure.com/)创建应用后获取'
+    helper: >-
+      [Microsoft Entra
+      ID](https://portal.azure.com/#view/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/~/RegisteredApps)创建应用后获取
     required: true
   clientSecretKey:
     title: ClientSecretKey
     component:
       placeholder: ClientSecretKey / appSecretKey
+    helper: 客户端凭据->证书与机密->客户端密码->新客户端密码
     required: true
   tenantId:
     title: TenantId
-    helper: 租户ID，留空使用/common端点（需要应用配置为多租户）
     component:
       placeholder: common 或 租户ID
+    helper: |-
+      根据受支持的账户类型填写 common 或 租户ID，默认为common(Microsoft个人账户)。 
+      租户ID获取: 概述 -> 目录(租户) ID 
     value: common
     required: false
 pluginType: addon
diff --git a/packages/ui/certd-server/metadata/deploy_CertApply.yaml b/packages/ui/certd-server/metadata/deploy_CertApply.yaml
index 24b375371..851a11497 100644
--- a/packages/ui/certd-server/metadata/deploy_CertApply.yaml
+++ b/packages/ui/certd-server/metadata/deploy_CertApply.yaml
@@ -37,7 +37,7 @@ input:
     helper: |-
       1、支持多个域名打到一个证书上，例如： foo.com，*.foo.com，*.bar.com
       2、子域名被通配符包含的不要填写，例如：www.foo.com已经被*.foo.com包含，不要填写www.foo.com
-      3、泛域名只能通配*号那一级（*.foo.com的证书不能用于xxx.yyy.foo.com、不能用于foo.com）
+      3、泛域名只能通配*号那一级（*.foo.com的证书不能用于foo.com且不能用于xxx.yyy.foo.com）
       4、输入一个，空格之后，再输入下一个 
       5、如果设置了子域托管解析（比如免费的二级域名托管在CF或者阿里云），请先[设置托管子域名](#/certd/pipeline/subDomain)
   email:
diff --git a/packages/ui/certd-server/metadata/deploy_CertApplyGetFormAliyun.yaml b/packages/ui/certd-server/metadata/deploy_CertApplyGetFormAliyun.yaml
index d6491a46b..c1f6291a2 100644
--- a/packages/ui/certd-server/metadata/deploy_CertApplyGetFormAliyun.yaml
+++ b/packages/ui/certd-server/metadata/deploy_CertApplyGetFormAliyun.yaml
@@ -34,7 +34,7 @@ input:
     helper: |-
       1、支持多个域名打到一个证书上，例如： foo.com，*.foo.com，*.bar.com
       2、子域名被通配符包含的不要填写，例如：www.foo.com已经被*.foo.com包含，不要填写www.foo.com
-      3、泛域名只能通配*号那一级（*.foo.com的证书不能用于xxx.yyy.foo.com、不能用于foo.com）
+      3、泛域名只能通配*号那一级（*.foo.com的证书不能用于foo.com且不能用于xxx.yyy.foo.com）
       4、输入一个，空格之后，再输入下一个 
       5、如果设置了子域托管解析（比如免费的二级域名托管在CF或者阿里云），请先[设置托管子域名](#/certd/pipeline/subDomain)
   email:
diff --git a/packages/ui/certd-server/metadata/deploy_CertApplyLego.yaml b/packages/ui/certd-server/metadata/deploy_CertApplyLego.yaml
index 7ed04d597..0d176c016 100644
--- a/packages/ui/certd-server/metadata/deploy_CertApplyLego.yaml
+++ b/packages/ui/certd-server/metadata/deploy_CertApplyLego.yaml
@@ -3,7 +3,7 @@ default:
   strategy:
     runStrategy: 0
   input:
-    renewDays: 35
+    renewDays: 15
     forceUpdate: false
 name: CertApplyLego
 icon: ph:certificate
@@ -37,7 +37,7 @@ input:
     helper: |-
       1、支持多个域名打到一个证书上，例如： foo.com，*.foo.com，*.bar.com
       2、子域名被通配符包含的不要填写，例如：www.foo.com已经被*.foo.com包含，不要填写www.foo.com
-      3、泛域名只能通配*号那一级（*.foo.com的证书不能用于xxx.yyy.foo.com、不能用于foo.com）
+      3、泛域名只能通配*号那一级（*.foo.com的证书不能用于foo.com且不能用于xxx.yyy.foo.com）
       4、输入一个，空格之后，再输入下一个 
       5、如果设置了子域托管解析（比如免费的二级域名托管在CF或者阿里云），请先[设置托管子域名](#/certd/pipeline/subDomain)
   email:
diff --git a/packages/ui/certd-server/metadata/deploy_CertApplyUpload.yaml b/packages/ui/certd-server/metadata/deploy_CertApplyUpload.yaml
index 853ed6350..21c4aead6 100644
--- a/packages/ui/certd-server/metadata/deploy_CertApplyUpload.yaml
+++ b/packages/ui/certd-server/metadata/deploy_CertApplyUpload.yaml
@@ -99,7 +99,7 @@ input:
     helper: |-
       1、支持多个域名打到一个证书上，例如： foo.com，*.foo.com，*.bar.com
       2、子域名被通配符包含的不要填写，例如：www.foo.com已经被*.foo.com包含，不要填写www.foo.com
-      3、泛域名只能通配*号那一级（*.foo.com的证书不能用于xxx.yyy.foo.com、不能用于foo.com）
+      3、泛域名只能通配*号那一级（*.foo.com的证书不能用于foo.com且不能用于xxx.yyy.foo.com）
       4、输入一个，空格之后，再输入下一个 
       5、如果设置了子域托管解析（比如免费的二级域名托管在CF或者阿里云），请先[设置托管子域名](#/certd/pipeline/subDomain)
   pfxPassword:
diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json
index c44df6380..133c82d28 100644
--- a/packages/ui/certd-server/package.json
+++ b/packages/ui/certd-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.38.12",
+  "version": "1.39.0",
   "description": "fast-server base midway",
   "private": true,
   "type": "module",
@@ -50,20 +50,20 @@
     "@aws-sdk/client-route-53": "^3.964.0",
     "@aws-sdk/client-s3": "^3.964.0",
     "@aws-sdk/client-sts": "^3.990.0",
-    "@certd/acme-client": "^1.38.12",
-    "@certd/basic": "^1.38.12",
-    "@certd/commercial-core": "^1.38.12",
+    "@certd/acme-client": "^1.39.0",
+    "@certd/basic": "^1.39.0",
+    "@certd/commercial-core": "^1.39.0",
     "@certd/cv4pve-api-javascript": "^8.4.2",
-    "@certd/jdcloud": "^1.38.12",
-    "@certd/lib-huawei": "^1.38.12",
-    "@certd/lib-k8s": "^1.38.12",
-    "@certd/lib-server": "^1.38.12",
-    "@certd/midway-flyway-js": "^1.38.12",
-    "@certd/pipeline": "^1.38.12",
-    "@certd/plugin-cert": "^1.38.12",
-    "@certd/plugin-lib": "^1.38.12",
-    "@certd/plugin-plus": "^1.38.12",
-    "@certd/plus-core": "^1.38.12",
+    "@certd/jdcloud": "^1.39.0",
+    "@certd/lib-huawei": "^1.39.0",
+    "@certd/lib-k8s": "^1.39.0",
+    "@certd/lib-server": "^1.39.0",
+    "@certd/midway-flyway-js": "^1.39.0",
+    "@certd/pipeline": "^1.39.0",
+    "@certd/plugin-cert": "^1.39.0",
+    "@certd/plugin-lib": "^1.39.0",
+    "@certd/plugin-plus": "^1.39.0",
+    "@certd/plus-core": "^1.39.0",
     "@google-cloud/publicca": "^1.3.0",
     "@huaweicloud/huaweicloud-sdk-cdn": "^3.1.185",
     "@huaweicloud/huaweicloud-sdk-core": "^3.1.185",

From 17023f6b55878a32bed3d781ff42ca2c45fed280 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sun, 8 Mar 2026 01:18:50 +0800
Subject: [PATCH 56/62] build: trigger build image

---
 trigger/build.trigger | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trigger/build.trigger b/trigger/build.trigger
index a296c616b..1970dc792 100644
--- a/trigger/build.trigger
+++ b/trigger/build.trigger
@@ -1 +1 @@
-23:21
+01:18

From 2e346e536932f33c8790bd586a8986e8644ade0f Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sun, 8 Mar 2026 01:19:01 +0800
Subject: [PATCH 57/62] build: publish

---
 docs/guide/changelogs/CHANGELOG.md          | 28 +++++++++++++++++++++
 packages/core/acme-client/package.json      |  2 +-
 packages/core/basic/package.json            |  2 +-
 packages/core/pipeline/package.json         |  2 +-
 packages/libs/lib-huawei/package.json       |  2 +-
 packages/libs/lib-iframe/package.json       |  2 +-
 packages/libs/lib-jdcloud/package.json      |  2 +-
 packages/libs/lib-k8s/package.json          |  2 +-
 packages/libs/lib-server/package.json       |  2 +-
 packages/libs/midway-flyway-js/package.json |  2 +-
 packages/plugins/plugin-cert/package.json   |  2 +-
 packages/plugins/plugin-lib/package.json    |  2 +-
 12 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/docs/guide/changelogs/CHANGELOG.md b/docs/guide/changelogs/CHANGELOG.md
index 2c06cb30a..941af97f9 100644
--- a/docs/guide/changelogs/CHANGELOG.md
+++ b/docs/guide/changelogs/CHANGELOG.md
@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
+
+### Bug Fixes
+
+* 修复部署到openwrt错误的bug ([2e3d0cc](https://github.com/certd/certd/commit/2e3d0cc57c16c48ad435bc8fde729bacaedde9f5))
+* 修复发件邮箱无法输入的bug ([27b0348](https://github.com/certd/certd/commit/27b0348e1d3d752f418f851965d6afbc26c0160c))
+* 修复复制流水线保存后丢失分组和排序号的问题 ([bc32648](https://github.com/certd/certd/commit/bc326489abc1d50a0930b4f47aa2d62d3a486798))
+* 修复获取群辉deviceid报错的bug ([79be392](https://github.com/certd/certd/commit/79be392775a2c91848dd5a66a2618adc4e4b48f6))
+* 修复京东云域名申请证书报错的bug ([d9c0130](https://github.com/certd/certd/commit/d9c0130b59997144a3c274d456635b800135e43f))
+* 修复偶尔下载证书报未授权的错误 ([316537e](https://github.com/certd/certd/commit/316537eb4dcbe5ec57784e8bf95ee3cdfd21dce7))
+* 修复dcdn多个域名同时部署时 可能会出现证书名称重复的bug ([78c2ced](https://github.com/certd/certd/commit/78c2ced43b1a73d142b0ed783b162b97f545ab06))
+* 优化dcdn部署上传多次证书 偶尔报 The CertName already exists的问题 ([72f850f](https://github.com/certd/certd/commit/72f850f675b500d12ebff2338d1b99d6fab476e1))
+* **cert-plugin:** 优化又拍云客户端错误处理逻辑，当域名已绑定证书时不再抛出异常。 ([92c9ac3](https://github.com/certd/certd/commit/92c9ac382692e6c84140ff787759ab6d39ccbe96))
+* esxi部署失败的bug ([1e44115](https://github.com/certd/certd/commit/1e441154617e6516a9a3610412bf597128c62696))
+
+### Features
+
+* 支持企业级管理模式，项目管理，细分权限 ([3734083](https://github.com/certd/certd/commit/37340838b6a61a94b86bfa13cf5da88b26f1315a))
+
+### Performance Improvements
+
+* 【破坏性更新】错误返回信息msg字段名统一改成message，与成功的返回结构一致 ([51ab6d6](https://github.com/certd/certd/commit/51ab6d6da1bb551b55b3a6a4a9a945c8d6ace806))
+* 当域名管理中没有域名时，创建流水线时不展开域名选择框 ([bb0afe1](https://github.com/certd/certd/commit/bb0afe1fa7b0fc52fde051d24fbe6be69d52f4cc))
+* 任务步骤页面增加串行执行提示说明 ([787f6ef](https://github.com/certd/certd/commit/787f6ef52893d8dc912ee2a7a5b8ce2b73c108c9))
+* 站点监控支持指定ip地址检查 ([83d81b6](https://github.com/certd/certd/commit/83d81b64b3adb375366039e07c87d1ad79121c13))
+* AI开发插件 skills 定义初步 ([1f68fad](https://github.com/certd/certd/commit/1f68faddb97a978c5a5e731a8895b4bb0587ad83))
+* http请求增加建立连接超时配置 ([3c85602](https://github.com/certd/certd/commit/3c85602ab1fc1953cdc06a6cd75a971d14119179))
+
 ## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
 
 ### Bug Fixes
diff --git a/packages/core/acme-client/package.json b/packages/core/acme-client/package.json
index 1abcce7c6..090cf549f 100644
--- a/packages/core/acme-client/package.json
+++ b/packages/core/acme-client/package.json
@@ -70,5 +70,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "49457505cdf8156fd9d936b8e9ace0b48e43a6b2"
+    "gitHead": "3bb29abe32c311e1cf840f97d485d1147411992a"
 }
diff --git a/packages/core/basic/package.json b/packages/core/basic/package.json
index 071c6c13f..2ee9578fe 100644
--- a/packages/core/basic/package.json
+++ b/packages/core/basic/package.json
@@ -47,5 +47,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "49457505cdf8156fd9d936b8e9ace0b48e43a6b2"
+  "gitHead": "3bb29abe32c311e1cf840f97d485d1147411992a"
 }
diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json
index a53922313..e529c1402 100644
--- a/packages/core/pipeline/package.json
+++ b/packages/core/pipeline/package.json
@@ -45,5 +45,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "49457505cdf8156fd9d936b8e9ace0b48e43a6b2"
+  "gitHead": "3bb29abe32c311e1cf840f97d485d1147411992a"
 }
diff --git a/packages/libs/lib-huawei/package.json b/packages/libs/lib-huawei/package.json
index 29ef615da..8dbc45088 100644
--- a/packages/libs/lib-huawei/package.json
+++ b/packages/libs/lib-huawei/package.json
@@ -24,5 +24,5 @@
     "prettier": "^2.8.8",
     "tslib": "^2.8.1"
   },
-  "gitHead": "49457505cdf8156fd9d936b8e9ace0b48e43a6b2"
+  "gitHead": "3bb29abe32c311e1cf840f97d485d1147411992a"
 }
diff --git a/packages/libs/lib-iframe/package.json b/packages/libs/lib-iframe/package.json
index 6f31efb29..417f6a052 100644
--- a/packages/libs/lib-iframe/package.json
+++ b/packages/libs/lib-iframe/package.json
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "49457505cdf8156fd9d936b8e9ace0b48e43a6b2"
+  "gitHead": "3bb29abe32c311e1cf840f97d485d1147411992a"
 }
diff --git a/packages/libs/lib-jdcloud/package.json b/packages/libs/lib-jdcloud/package.json
index 60113752e..21ae368f0 100644
--- a/packages/libs/lib-jdcloud/package.json
+++ b/packages/libs/lib-jdcloud/package.json
@@ -56,5 +56,5 @@
       "fetch"
     ]
   },
-  "gitHead": "49457505cdf8156fd9d936b8e9ace0b48e43a6b2"
+  "gitHead": "3bb29abe32c311e1cf840f97d485d1147411992a"
 }
diff --git a/packages/libs/lib-k8s/package.json b/packages/libs/lib-k8s/package.json
index 71489a222..9f5c4622d 100644
--- a/packages/libs/lib-k8s/package.json
+++ b/packages/libs/lib-k8s/package.json
@@ -32,5 +32,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "49457505cdf8156fd9d936b8e9ace0b48e43a6b2"
+  "gitHead": "3bb29abe32c311e1cf840f97d485d1147411992a"
 }
diff --git a/packages/libs/lib-server/package.json b/packages/libs/lib-server/package.json
index 7219669ff..e1ab382a6 100644
--- a/packages/libs/lib-server/package.json
+++ b/packages/libs/lib-server/package.json
@@ -64,5 +64,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "49457505cdf8156fd9d936b8e9ace0b48e43a6b2"
+  "gitHead": "3bb29abe32c311e1cf840f97d485d1147411992a"
 }
diff --git a/packages/libs/midway-flyway-js/package.json b/packages/libs/midway-flyway-js/package.json
index 5480ba9d3..f8fab7328 100644
--- a/packages/libs/midway-flyway-js/package.json
+++ b/packages/libs/midway-flyway-js/package.json
@@ -46,5 +46,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "49457505cdf8156fd9d936b8e9ace0b48e43a6b2"
+  "gitHead": "3bb29abe32c311e1cf840f97d485d1147411992a"
 }
diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json
index 0f6d4adde..ab117ad0f 100644
--- a/packages/plugins/plugin-cert/package.json
+++ b/packages/plugins/plugin-cert/package.json
@@ -38,5 +38,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "49457505cdf8156fd9d936b8e9ace0b48e43a6b2"
+  "gitHead": "3bb29abe32c311e1cf840f97d485d1147411992a"
 }
diff --git a/packages/plugins/plugin-lib/package.json b/packages/plugins/plugin-lib/package.json
index c49862dce..af28f4878 100644
--- a/packages/plugins/plugin-lib/package.json
+++ b/packages/plugins/plugin-lib/package.json
@@ -57,5 +57,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "49457505cdf8156fd9d936b8e9ace0b48e43a6b2"
+  "gitHead": "3bb29abe32c311e1cf840f97d485d1147411992a"
 }

From f77feefdb80297a8a97c57053b649102b61f7102 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sun, 8 Mar 2026 01:33:34 +0800
Subject: [PATCH 58/62] chore: github action update

---
 .github/workflows/deploy-demo.yml   | 2 +-
 .github/workflows/release-image.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml
index ad7960146..d30e9df40 100644
--- a/.github/workflows/deploy-demo.yml
+++ b/.github/workflows/deploy-demo.yml
@@ -43,7 +43,7 @@ jobs:
         with:
           time: '10' # for 60 seconds
       - name: deploy-certd-demo
-        uses: tyrrrz/action-http-request@master
+        uses: tyrrrz/action-http-request@prime
         with:
           # 通过webhook 触发 certd-demo来部署
           url: ${{ secrets.WEBHOOK_CERTD_DEMO }}
diff --git a/.github/workflows/release-image.yml b/.github/workflows/release-image.yml
index 436cedb13..37af2be98 100644
--- a/.github/workflows/release-image.yml
+++ b/.github/workflows/release-image.yml
@@ -118,7 +118,7 @@ jobs:
 #            greper/certd-agent:latest
 #            greper/certd-agent:${{steps.get_certd_version.outputs.result}}
       - name: deploy-certd-doc
-        uses: tyrrrz/action-http-request@master
+        uses: tyrrrz/action-http-request@prime
         with:
           url: ${{ secrets.WEBHOOK_CERTD_DOC }}
           method: POST

From 00c0dcc81de2451f20a5e77fe8edcd88b5f391c9 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sun, 8 Mar 2026 01:47:46 +0800
Subject: [PATCH 59/62] build: release

---
 trigger/release.trigger | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trigger/release.trigger b/trigger/release.trigger
index 36e9f7d7b..f5e4778d5 100644
--- a/trigger/release.trigger
+++ b/trigger/release.trigger
@@ -1 +1 @@
-00:12
+01:47

From d23c8b4a2a5f5ab17822c6ee1d4108ac7280b9d1 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sun, 8 Mar 2026 01:53:46 +0800
Subject: [PATCH 60/62] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E7=AE=A1=E7=90=86=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8C?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=A2=E5=A4=B1=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/certd-client/src/store/project/index.ts     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/ui/certd-client/src/store/project/index.ts b/packages/ui/certd-client/src/store/project/index.ts
index 09c1bb967..1122c9b9c 100644
--- a/packages/ui/certd-client/src/store/project/index.ts
+++ b/packages/ui/certd-client/src/store/project/index.ts
@@ -15,11 +15,18 @@ export type ProjectItem = {
 export const useProjectStore = defineStore("app.project", () => {
   const myProjects = ref([]);
   const inited = ref(false);
+  const currentProjectId = ref(); // 直接调用
+
+  function $reset() {
+    myProjects.value = [];
+    currentProjectId.value = "";
+    inited.value = false;
+  }
   const userStore = useUserStore();
   const userId = userStore.getUserInfo?.id;
   const lastProjectIdCacheKey = "currentProjectId:" + userId;
   const lastProjectId = LocalStorage.get(lastProjectIdCacheKey);
-  const currentProjectId = ref(lastProjectId); // 直接调用
+  currentProjectId.value = lastProjectId;
 
   const projects = computed(() => {
     return myProjects.value;
@@ -118,11 +125,6 @@ export const useProjectStore = defineStore("app.project", () => {
     return false;
   }
 
-  function $reset() {
-    myProjects.value = [];
-    currentProjectId.value = "";
-  }
-
   return {
     projects,
     myProjects,

From dc4f811eaab736d6ccd0479eca575924ff41d4d2 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sun, 8 Mar 2026 01:57:31 +0800
Subject: [PATCH 61/62] build: release

---
 trigger/release.trigger | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trigger/release.trigger b/trigger/release.trigger
index f5e4778d5..bc852d0a0 100644
--- a/trigger/release.trigger
+++ b/trigger/release.trigger
@@ -1 +1 @@
-01:47
+01:57

From 853fdc70a263b62d75c9ff3970607e6bf1c1593b Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sun, 8 Mar 2026 11:15:25 +0800
Subject: [PATCH 62/62] perf: install tip

---
 docs/guide/install/1panel/index.md | 9 +++++++--
 docs/guide/install/baota/index.md  | 4 +++-
 docs/guide/install/docker/index.md | 5 +++--
 docs/guide/start.md                | 5 +++++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/docs/guide/install/1panel/index.md b/docs/guide/install/1panel/index.md
index dfdba6840..b301b42a6 100644
--- a/docs/guide/install/1panel/index.md
+++ b/docs/guide/install/1panel/index.md
@@ -16,7 +16,6 @@ https://1panel.cn/docs/installation/online_installation/
 
    ![](./images/store-1.png)
 
-
    ![](./images/store-2.png)
 
 #### 1.2 访问测试：
@@ -40,6 +39,9 @@ admin/123456
 1. 打开`docker-compose.yaml`，整个内容复制下来    
    https://gitee.com/certd/certd/raw/v2/docker/run/docker-compose.yaml
 
+::: tip
+默认使用SQLite数据库，如果需要使用MySQL、PostgreSQL数据库，请参考[多数据库支持](./install/database.md)
+:::
 
 2. 然后到 `1Panel->容器->编排->新建编排`
    输入名称，粘贴`docker-compose.yaml`原文内容
@@ -49,7 +51,10 @@ admin/123456
    ![](./images/2.png)
 
 > 默认使用sqlite数据库，数据保存在`/data/certd`目录下，您可以手动备份该目录   
-> certd还支持`mysql`和`postgresql`数据库，[点我了解如何切换其他数据库](../database)
+
+
+
+
 
 #### 2.2 访问测试
 
diff --git a/docs/guide/install/baota/index.md b/docs/guide/install/baota/index.md
index bf173b930..57bb90c16 100644
--- a/docs/guide/install/baota/index.md
+++ b/docs/guide/install/baota/index.md
@@ -30,7 +30,9 @@
 点击确定，等待启动完成
 ![](./images/2.png)
 
-> certd默认使用sqlite数据库，另外支持`mysql`和`postgresql`数据库，[点我了解如何切换其他数据库](../database)
+::: tip
+默认安装使用SQLite数据库，如果需要使用MySQL、PostgreSQL数据库，请参考[多数据库支持](./install/database.md)
+:::
 
 
 ## 二、访问应用
diff --git a/docs/guide/install/docker/index.md b/docs/guide/install/docker/index.md
index 927504f44..341a16953 100644
--- a/docs/guide/install/docker/index.md
+++ b/docs/guide/install/docker/index.md
@@ -42,8 +42,9 @@ docker compose up -d
 > 如果提示 没有docker compose命令,请安装docker-compose   
 > https://docs.docker.com/compose/install/linux/   
 
-> certd默认使用sqlite数据库，另外还支持`mysql`和`postgresql`数据库，[点我了解如何切换其他数据库](../database)
-
+::: tip
+默认安装使用SQLite数据库，如果需要使用MySQL、PostgreSQL数据库，请参考[多数据库支持](./install/database.md)
+:::
 
 ### 3. 访问测试
 
diff --git a/docs/guide/start.md b/docs/guide/start.md
index 49ccd510d..cdca811aa 100644
--- a/docs/guide/start.md
+++ b/docs/guide/start.md
@@ -28,6 +28,11 @@ https://certd.handsfree.work/
 2. [Docker方式部署](./install/docker/)
 3. [源码方式部署](./install/source/)
 
+::: tip
+默认安装使用SQLite数据库，如果需要使用MySQL、PostgreSQL数据库，请参考[多数据库支持](./install/database.md)
+:::
+
+
 
 ### 2. 访问测试