chore: project finished

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()

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: '创建时间',

packages/ui/certd-client/src/api/service.ts

@@ -155,8 +155,8 @@ 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.currentProjectId;
+      configDefault.params.projectId = projectStore.currentProject?.id;
     }
     return service(configDefault);
   };

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,17 +28,24 @@
 import { computed, onMounted } from "vue";
 import { useProjectStore } from "/@/store/project";
 import { useDicts } from "/@/views/certd/dicts";
+import { useRouter } from "vue-router";
 defineOptions({
   name: "ProjectSelector",
 });
 
 const projectStore = useProjectStore();
 onMounted(async () => {
-  await projectStore.reload();
+  await projectStore.init();
   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();
 }

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",
@@ -820,6 +821,7 @@ export default {
       write: "Write",
       admin: "Admin",
     },
+    projectMemberStatus: "Member Status",
   },
   project: {
     noProjectJoined: "You haven't joined any projects yet",
@@ -834,6 +836,9 @@ 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?",
+    viewDetail: "View Detail",
   },
   addonSelector: {
     select: "Select",

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

@@ -225,6 +225,7 @@ export default {
     myProjectManager: "我的项目",
     myProjectDetail: "项目详情",
     projectJoin: "加入项目",
+    currentProject: "当前项目",
   },
   certificateRepo: {
     title: "证书仓库",
@@ -832,10 +833,11 @@ export default {
     projectDetailDescription: "管理项目成员",
     projectPermission: "权限",
     permission: {
-      read: "读取",
+      read: "查看",
-      write: "写入",
+      write: "修改",
       admin: "管理员",
     },
+    projectMemberStatus: "成员状态",
   },
   project: {
     noProjectJoined: "您还没有加入任何项目",
@@ -850,5 +852,8 @@ export default {
     leave: "退出项目",
     leaveSuccess: "退出项目成功",
     leaveFailed: "退出项目失败，请稍后重试",
+    applyJoinConfirm: "确认加入项目？",
+    leaveConfirm: "确认退出项目？",
+    viewDetail: "查看详情",
   },
 };

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: "",

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;

packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts

@@ -94,6 +94,7 @@ export function useCrudPermission({ permission }: UseCrudPermissionProps) {
             edit: { show: hasActionPermission(editPermission) },
             remove: { show: hasActionPermission(removePermission) },
             view: { show: hasActionPermission(viewPermission) },
+            copy: { show: hasActionPermission(addPermission) },
           },
         },
       },

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,
           };
         }

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 = [
   {
@@ -25,21 +23,25 @@ export const certdResources = [
             const projectStore = useProjectStore();
             return projectStore.isEnterprise;
           },
+          isMenu: false,
           icon: "ion:apps",
-          permission: "sys:settings:edit",
           keepAlive: true,
+          auth: true,
         },
       },
       {
-        title: "certd.sysResources.myProjectDetail",
+        title: "certd.sysResources.currentProject",
-        name: "MyProjectDetail",
+        name: "CurrentProject",
         path: "/certd/project/detail",
         component: "/certd/project/detail/index.vue",
         meta: {
-          isMenu: false,
+          show: () => {
-          show: true,
+            const projectStore = useProjectStore();
+            return projectStore.isEnterprise;
+          },
+          isMenu: true,
           icon: "ion:apps",
-          permission: "sys:settings:edit",
+          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,
         },
       },
       {

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,
             },
           },
           {

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,10 @@ 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 lastProjectIdCacheKey = "currentProjectId:" + userId;
+  const lastProjectId = LocalStorage.get(lastProjectIdCacheKey);
   const currentProjectId = ref(lastProjectId); // 直接调用
 
   const projects = computed(() => {
@@ -60,20 +64,18 @@ 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("切换项目成功");
     }
   }
 
   async function reload() {
-    debugger;
     inited.value = false;
     await init();
   }
 
   async function init() {
-    debugger;
     if (!inited.value) {
       await loadMyProjects();
       inited.value = true;

packages/ui/certd-client/src/views/certd/dicts.ts

@@ -1,17 +1,18 @@
 import { dict } from "@fast-crud/fast-crud";
 import { GetMyProjectList } from "./project/api";
+import { request } from "/@/api/service";
 
 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",
     },
@@ -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;

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,
               });

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,11 @@ export async function GetUserSimpleByIds(query: any) {
     data: query,
   });
 }
+
+export async function ApproveJoin(form: any) {
+  return await request({
+    url: "/enterprise/project/approveJoin",
+    method: "post",
+    data: form,
+  });
+}

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 { hasActionPermission } = context;
-  const { userDict } = useDicts();
+  const { userDict, projectMemberStatusDict, projectPermissionDict } = useDicts();
+  const { openApproveDialog } = useApprove();
 
   return {
     crudOptions: {
@@ -107,7 +109,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           search: {
             show: true,
           },
-          form: {},
+          form: {
+            show: true,
+            rules: [{ required: true, message: "请选择用户" }],
+          },
           editForm: {
             show: false,
           },
@@ -118,23 +123,64 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         permission: {
           title: t("certd.ent.projectPermission"),
           type: "dict-select",
-          dict: dict({
+          dict: projectPermissionDict,
-            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,
+            rules: [{ required: true, message: "请选择权限" }],
           },
           column: {
             width: 200,
           },
         },
+        status: {
+          title: t("certd.ent.projectMemberStatus"),
+          type: "dict-select",
+          dict: projectMemberStatusDict,
+          search: {
+            show: true,
+          },
+          form: {
+            show: true,
+            rules: [{ required: true, message: "请选择状态" }],
+          },
+          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) => {
+                          form.userId = row.userId;
+                          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",

packages/ui/certd-client/src/views/certd/project/detail/index.vue

@@ -2,9 +2,13 @@
   <fs-page class="page-project-detail">
     <template #header>
       <div class="title">
-        {{ t("certd.ent.projectDetailManager") }}
+        当前项目 ：{{ project?.name }}
-        <span class="sub">
+        <span class="sub flex-inline items-center">
-          {{ t("certd.ent.projectDetailDescription") }}
+          管理员：<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 +23,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 +43,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 +96,12 @@ const handleBatchDelete = () => {
 };
 
 // 页面打开后获取列表数据
-onMounted(() => {
+onMounted(async () => {
+  if (!projectId) {
+    message.error("您还未选择项目");
+    return;
+  }
+  await loadProjectDetail();
   crudExpose.doRefresh();
 });
 onActivated(async () => {

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,
+  };
+}

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,22 +17,25 @@
           <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>
+                <div class="text-md font-bold title">{{ project.name }}</div>
-                <p class="text-gray-500 text-sm">{{ formatDate(project.createTime) }}</p>
+                <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 justify-between items-center">
+              <div class="flex-col items-start">
-                <div v-if="project.status">
+                <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>
-                  <fs-values-format :model-value="project.status" :dict="projectMemberStatusDict"></fs-values-format>
+                <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 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 === '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") }}
               </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,18 +55,30 @@ 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";
+import { useRouter } from "vue-router";
+import { useUserStore } from "/@/store/user";
 
 defineOptions({
   name: "ProjectJoin",
 });
 const { t } = useI18n();
 
-const { projectMemberStatusDict, projectPermissionDict } = useDicts();
+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 {
@@ -145,7 +164,6 @@ async function leaveProject(projectId: number) {
       .title {
         font-size: 16px;
         font-weight: bold;
-        margin-bottom: 8px;
       }
     }
   }

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: {
@@ -105,7 +108,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           search: {
             show: true,
           },
-          form: {},
+          form: {
+            rules: [{ required: true, message: "请选择用户" }],
+          },
           editForm: {
             show: false,
           },
@@ -128,11 +133,34 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
           form: {
             show: true,
+            rules: [{ required: true, message: "请选择权限" }],
           },
           column: {
             width: 200,
           },
         },
+        status: {
+          title: t("certd.ent.projectMemberStatus"),
+          type: "dict-select",
+          dict: projectMemberStatusDict,
+          search: {
+            show: true,
+          },
+          form: {
+            show: true,
+            rules: [{ required: true, message: "请选择状态" }],
+          },
+          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",

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" title="当前为SaaS管理模式，项目管理需要切换到企业模式" :open="true"></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) {

packages/ui/certd-client/src/views/sys/enterprise/project/intro.vue

@@ -0,0 +1,86 @@
+<template>
+  <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">
+          <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 { 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();
+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>

packages/ui/certd-client/src/views/sys/settings/tabs/mode.vue

@@ -2,13 +2,22 @@
   <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="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 }">
         <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>
 
@@ -22,22 +31,25 @@ 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: [
-    {
-      label: t("certd.sys.setting.enterpriseMode"),
-      value: "enterprise",
-    },
     {
       label: t("certd.sys.setting.saasMode"),
       value: "saas",
     },
+    {
+      label: t("certd.sys.setting.enterpriseMode"),
+      value: "enterprise",
+    },
   ],
 });
 

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);
+    }
 }

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;

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" })

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);
+  }
+
+}

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 

packages/ui/certd-server/src/controller/user/enterprise/project-member-controller.ts

@@ -0,0 +1,118 @@
+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,
+    });
+    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 })
+  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({});
+  }
+}

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);
   }

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();

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,
       },
     });
   }

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) {
+  async update(bean: ProjectEntity) {
-    const res= await super.update(bean)
+    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[]> {
+  async getAllWithStatus(userId: number): Promise<ProjectMemberItem[]> {
-    let projectList:any = await this.find({
+    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){
+    if (!savedPermission) {
-        const project = await this.findOne({
+      const project = await this.findOne({
-          select: ['id', 'userId', 'adminId', 'disabled'],
+        select: ['id', 'userId', 'adminId', 'disabled'],
-          where: {
+        where: {
-            id: projectId,
+          id: projectId,
-          },
+        },
-        });
+      });
-        if (!project) {
+      if (!project) {
-          throw new Error('项目不存在');
+        throw new Error('项目不存在');
+      }
+      if (project.adminId === userId) {
+        //创建者拥有管理权限
+        savedPermission = 'admin';
+      } else {
+        if (project.disabled) {
+          throw new Error('项目已禁用');
         }
-        if (project.adminId === userId) {
+        const member = await this.projectMemberService.getMember(projectId, userId);
-          //创建者拥有管理权限
+        if (!member || member.status !== 'approved') {
-          savedPermission = 'admin';
+          throw new Error(`用户${userId}还不是项目${projectId}的成员`);
-        }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;
         }
+        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,

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts

@@ -83,6 +83,7 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
       this.logger.info(`[${domainName}]开始部署`)
       const params = await this.buildParams(domainName);
       await this.doRequest(client, params);
+      await this.ctx.utils.sleep(1000);
       this.logger.info(`[${domainName}]部署成功`)
     }
 

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
    */

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: {

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;
   }