Merge branch 'v2' into v2-dev

# Conflicts:
#	packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/notification-form/index.vue
#	packages/ui/certd-server/src/plugins/plugin-other/plugins/plugin-restart.ts

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

@@ -0,0 +1,8 @@
+<template>
+  <div class="cd-page-account">
+      <iframe  >
+
+      </iframe>
+
+  </div>
+</template>

packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx

@@ -2,10 +2,11 @@ import { compute, CreateCrudOptionsRet, dict } from "@fast-crud/fast-crud";
 import { PluginGroup } from "@certd/pipeline";
 import { useReference } from "/@/use/use-refrence";
 import _ from "lodash-es";
+import { useUserStore } from "/@/store/modules/user";
 
 export default function (certPluginGroup: PluginGroup, formWrapperRef: any): CreateCrudOptionsRet {
   const inputs: any = {};
-
+  const userStore = useUserStore();
   for (const plugin of certPluginGroup.plugins) {
     for (const inputKey in plugin.input) {
       if (inputs[inputKey]) {
@@ -101,9 +102,12 @@ export default function (certPluginGroup: PluginGroup, formWrapperRef: any): Cre
             order: 101,
             helper: {
               render: () => {
+                if (userStore.isPlus) {
+                  return "";
+                }
                 return (
                   <div>
-                    需要配置<router-link to={{ path: "/certd/settings/email" }}>邮件服务器</router-link>才能发送邮件
+                    需要配置<router-link to={{ path: "/certd/settings/email" }}>邮件服务器</router-link>才能发送邮件(专业版请忽略)
                   </div>
                 );
               }

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

@@ -9,7 +9,7 @@
   >
     <template #title>
       <div>
-        编辑触发器
+        编辑通知
         <a-button v-if="mode === 'edit'" @click="notificationDelete()">
           <template #icon><DeleteOutlined /></template>
         </a-button>

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/notification-form/pi-notification-form-email.vue

@@ -16,13 +16,14 @@
       }"
     />
 
-    <a-alert class="m-1" type="info">
+    <a-alert v-if="!userStore.isPlus" class="m-1" type="info">
       <template #message> 还没有配置邮件服务器？<router-link :to="{ path: '/certd/settings/email' }">现在就去</router-link> </template>
     </a-alert>
   </div>
 </template>
 <script lang="ts" setup>
 import { Ref, ref, watch } from "vue";
+import { useUserStore } from "/@/store/modules/user";
 
 const props = defineProps({
   options: {
@@ -31,6 +32,8 @@ const props = defineProps({
   }
 });
 
+const userStore = useUserStore();
+
 const optionsFormState: Ref<any> = ref({});
 
 watch(

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

@@ -19,6 +19,10 @@
         <a-form-item label="管理其他用户流水线" name="managerOtherUserPipeline">
           <a-switch v-model:checked="formState.managerOtherUserPipeline" />
         </a-form-item>
+        <!--        <a-form-item label="启动后触发流水线" name="triggerOnStartup">-->
+        <!--          <a-switch v-model:checked="formState.triggerOnStartup" />-->
+        <!--          <div class="helper">启动后自动触发一次所有已启用的流水线</div>-->
+        <!--        </a-form-item>-->
         <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
           <a-button type="primary" html-type="submit">保存</a-button>
         </a-form-item>