From 863e74dd2e3912f950ff5025b5ed0070aeb37035 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 16 May 2025 23:50:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=BB=BA?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=BF=9D=E5=AD=98=E4=B8=A2=E5=A4=B1=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2=E7=AD=96=E7=95=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.request.ts      |  7 +++++++
 .../ui/certd-client/src/layout/layout-basic.vue    |  1 -
 .../src/vben/layout-ui/vben-layout.vue             |  2 +-
 .../pipeline/component/task-view/index.vue         |  8 +++++---
 .../ui/certd-client/src/views/sys/plugin/crud.tsx  | 14 ++++++++------
 .../src/controller/sys/plugin/plugin-controller.ts |  3 ---
 .../src/modules/plugin/service/plugin-service.ts   |  5 ++++-
 7 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/packages/core/basic/src/utils/util.request.ts b/packages/core/basic/src/utils/util.request.ts
index f1da0a5f..09582ec1 100644
--- a/packages/core/basic/src/utils/util.request.ts
+++ b/packages/core/basic/src/utils/util.request.ts
@@ -91,6 +91,13 @@ export function createAxiosService({ logger }: { logger: Logger }) {
   // 请求拦截
   service.interceptors.request.use(
     (config: any) => {
+      if (config.logParams == null) {
+        config.logParams = false;
+      }
+      if (config.logRes == null) {
+        config.logRes = false;
+      }
+
       logger.info(`http request:${config.url}，method:${config.method}`);
       if (config.logParams !== false && config.params) {
         logger.info(`params:${JSON.stringify(config.params)}`);
diff --git a/packages/ui/certd-client/src/layout/layout-basic.vue b/packages/ui/certd-client/src/layout/layout-basic.vue
index d223fa02..0a549702 100644
--- a/packages/ui/certd-client/src/layout/layout-basic.vue
+++ b/packages/ui/certd-client/src/layout/layout-basic.vue
@@ -84,7 +84,6 @@ provide("fn:ai.open", openChat);
     </template>
     <template #footer>
       <PageFooter></PageFooter>
-
       <MaxKBChat v-if="settingsStore.sysPublic.aiChatEnabled !== false" ref="chatBox" />
     </template>
   </BasicLayout>
diff --git a/packages/ui/certd-client/src/vben/layout-ui/vben-layout.vue b/packages/ui/certd-client/src/vben/layout-ui/vben-layout.vue
index 726cc744..d46d29b2 100644
--- a/packages/ui/certd-client/src/vben/layout-ui/vben-layout.vue
+++ b/packages/ui/certd-client/src/vben/layout-ui/vben-layout.vue
@@ -488,7 +488,7 @@ const idMainContent = ELEMENT_ID_MAIN_CONTENT;
         </template>
       </LayoutContent>
 
-      <LayoutFooter v-if="footerEnable" class="hidden md:block" :fixed="footerFixed" :height="footerHeight" :show="!isFullContent" :width="footerWidth" :z-index="zIndex">
+      <LayoutFooter v-if="footerEnable" class="hidden md:block" :fixed="footerFixed" :height="footerHeight" :show="!isFullContent" :width="footerWidth" :z-index="zIndex + 2">
         <slot name="footer"></slot>
       </LayoutFooter>
     </div>
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-view/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-view/index.vue
index 64352e03..b4e84ec0 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-view/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-view/index.vue
@@ -23,7 +23,7 @@
       </a-tab-pane>
     </a-tabs>
     <template #footer>
-      <fs-button key="aiChat" type="primary" icon="ion:color-wand-outline" @click="taskModal.onAiChat">AI分析</fs-button>
+      <fs-button v-if="settingsStore.sysPublic.aiChatEnabled !== false" key="aiChat" type="primary" icon="ion:color-wand-outline" @click="taskModal.onAiChat">AI分析</fs-button>
       <fs-button key="cancel" icon="ion:close-circle-outline" @click="taskModal.onOk">关闭</fs-button>
       <fs-button key="submit" icon="ion:checkmark-circle-outline" type="primary" @click="taskModal.onOk">确定</fs-button>
     </template>
@@ -35,7 +35,7 @@ import { computed, inject, nextTick, Ref, ref, watch } from "vue";
 import { RunHistory } from "../../type";
 import PiStatusShow from "/@/views/certd/pipeline/pipeline/component/status-show.vue";
 import { usePreferences } from "/@/vben/preferences";
-
+import { useSettingStore } from "/@/store/settings/index";
 export default {
   name: "PiTaskView",
   components: { PiStatusShow },
@@ -70,7 +70,7 @@ export default {
       for (let log of logs) {
         logText += log + "\n";
       }
-      const maxLength = 5000;
+      const maxLength = 2500;
       if (logText.length > maxLength) {
         logText = logText.substring(logText.length - maxLength);
       }
@@ -172,6 +172,7 @@ export default {
       taskModal.value.open = false;
     }
 
+    const settingsStore = useSettingStore();
     return {
       detail,
       taskModal,
@@ -180,6 +181,7 @@ export default {
       taskViewClose,
       tabPosition,
       triggerRun,
+      settingsStore,
     };
   },
 };
diff --git a/packages/ui/certd-client/src/views/sys/plugin/crud.tsx b/packages/ui/certd-client/src/views/sys/plugin/crud.tsx
index 1565ab16..938a9dd4 100644
--- a/packages/ui/certd-client/src/views/sys/plugin/crud.tsx
+++ b/packages/ui/certd-client/src/views/sys/plugin/crud.tsx
@@ -204,12 +204,14 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
       },
       form: {
         onSuccess(opts: any) {
-          router.push({
-            name: "SysPluginEdit",
-            query: {
-              id: opts.res.id,
-            },
-          });
+          if (opts.res?.id) {
+            router.push({
+              name: "SysPluginEdit",
+              query: {
+                id: opts.res.id,
+              },
+            });
+          }
         },
       },
       columns: {
diff --git a/packages/ui/certd-server/src/controller/sys/plugin/plugin-controller.ts b/packages/ui/certd-server/src/controller/sys/plugin/plugin-controller.ts
index 6ff73443..14310dd3 100644
--- a/packages/ui/certd-server/src/controller/sys/plugin/plugin-controller.ts
+++ b/packages/ui/certd-server/src/controller/sys/plugin/plugin-controller.ts
@@ -44,9 +44,6 @@ export class PluginController extends CrudController<PluginService> {
   async update(@Body(ALL) bean: any) {
 
     const res = await super.update(bean);
-      // 更新插件配置
-    const info = await this.service.info(bean.id)
-    await this.service.registerPlugin(info)
     return res
   }
 
diff --git a/packages/ui/certd-server/src/modules/plugin/service/plugin-service.ts b/packages/ui/certd-server/src/modules/plugin/service/plugin-service.ts
index c4908734..30e5eace 100644
--- a/packages/ui/certd-server/src/modules/plugin/service/plugin-service.ts
+++ b/packages/ui/certd-server/src/modules/plugin/service/plugin-service.ts
@@ -350,12 +350,15 @@ export class PluginService extends BaseService<PluginEntity> {
 
   async registerPlugin(plugin: PluginEntity) {
     const metadata = plugin.metadata ? yaml.load(plugin.metadata) : {};
+    const extra = plugin.extra ? yaml.load(plugin.extra) : {};
     const item = {
       ...plugin,
-      ...metadata
+      ...metadata,
+      ...extra
     };
     delete item.metadata;
     delete item.content;
+    delete item.extra;
     if (item.author) {
       item.name = item.author + "/" + item.name;
     }