chore: project

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

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

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

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>

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

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