From b9bddbfabb5664365f1232e9432532187c98006c Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sun, 1 Sep 2024 04:49:26 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=94=AF=E6=8C=81ftp=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/ftp/docker-compose.yaml                | 14 +++
 .../src/components/vip-button/index.vue       | 86 ++++++++++++-------
 .../src/layout/layout-framework.vue           |  2 +-
 .../src/views/certd/access/common.tsx         | 16 +++-
 .../pipeline/component/step-form/index.vue    | 10 ++-
 packages/ui/certd-server/package.json         |  7 +-
 .../pipeline/service/access-service.ts        |  3 +-
 .../system/service/sys-settings-service.ts    | 15 ++--
 8 files changed, 105 insertions(+), 48 deletions(-)
 create mode 100644 docker/ftp/docker-compose.yaml

diff --git a/docker/ftp/docker-compose.yaml b/docker/ftp/docker-compose.yaml
new file mode 100644
index 00000000..da017d36
--- /dev/null
+++ b/docker/ftp/docker-compose.yaml
@@ -0,0 +1,14 @@
+version: '3.3'
+services:
+  ftp:
+    # 镜像                                                  #  ↓↓↓↓↓ --- 1、 镜像版本号，建议改成固定版本号【可选】
+    image: gists/pure-ftpd
+    container_name: ftp # 容器名
+    restart: unless-stopped # 自动重启
+    volumes:
+      - /data/ftp2/:/home/ftpuser
+    ports: # 端口映射
+      - "21:21"
+      - "30000-30009:30000-30009"
+    environment: # 环境变量
+      - TZ=Asia/Shanghai
diff --git a/packages/ui/certd-client/src/components/vip-button/index.vue b/packages/ui/certd-client/src/components/vip-button/index.vue
index 46dd4da6..f8b7a6b9 100644
--- a/packages/ui/certd-client/src/components/vip-button/index.vue
+++ b/packages/ui/certd-client/src/components/vip-button/index.vue
@@ -1,20 +1,13 @@
 <template>
-  <div class="layout-vip isPlus">
+  <div class="layout-vip isPlus" @click="openUpgrade">
     <contextHolder />
-    <fs-icon icon="mingcute:vip-1-line"></fs-icon>
-    <div class="text">
-      <template v-if="userStore.isPlus">
-        <a-tooltip>
-          <template #title> 到期时间：{{ expireTime }} </template>
-          <span @click="openUpgrade">{{ texts.plus }}</span>
-        </a-tooltip>
-      </template>
-      <template v-else>
-        <a-tooltip>
-          <template #title> 升级专业版，享受更多VIP特权 </template>
-          <span @click="openUpgrade"> {{ texts.free }} {{ expiredDays }} </span>
-        </a-tooltip>
-      </template>
+    <fs-icon icon="mingcute:vip-1-line" :title="text.title" />
+
+    <div v-if="mode !== 'icon'" class="text">
+      <a-tooltip>
+        <template #title> {{ text.title }}</template>
+        <span>{{ text.name }}</span>
+      </a-tooltip>
     </div>
   </div>
 </template>
@@ -26,24 +19,53 @@ import { message, Modal } from "ant-design-vue";
 import * as api from "./api";
 import { useSettingStore } from "/@/store/modules/settings";
 
-const props = defineProps<{
-  mode?: "button" | "nav";
-}>();
-type Texts = {
-  plus: string;
-  free: string;
+const props = withDefaults(
+  defineProps<{
+    mode?: "button" | "nav" | "icon";
+  }>(),
+  {
+    mode: "button"
+  }
+);
+type Text = {
+  name: string;
+  title?: string;
 };
-const texts = computed<Texts>(() => {
-  if (props.mode === "button") {
-    return {
-      plus: "专业版已开通",
-      free: "此为专业版功能"
-    };
+const text = computed<Text>(() => {
+  const map = {
+    isPlus: {
+      button: {
+        name: "专业版已开通",
+        title: "到期时间：" + expireTime.value
+      },
+      icon: {
+        name: "",
+        title: "专业版已开通"
+      },
+      nav: {
+        name: "专业版",
+        title: "到期时间：" + expireTime.value
+      }
+    },
+    free: {
+      button: {
+        name: "此为专业版功能",
+        title: "升级专业版，享受更多VIP特权"
+      },
+      icon: {
+        name: "",
+        title: "此为专业版功能"
+      },
+      nav: {
+        name: "免费版",
+        title: "升级专业版，享受更多VIP特权"
+      }
+    }
+  };
+  if (userStore.isPlus) {
+    return map.isPlus[props.mode];
   } else {
-    return {
-      plus: "专业版",
-      free: "免费版"
-    };
+    return map.free[props.mode];
   }
 });
 
@@ -86,6 +108,7 @@ async function doActive() {
 const settingStore = useSettingStore();
 const computedSiteId = computed(() => settingStore.installInfo?.siteId);
 const [modal, contextHolder] = Modal.useModal();
+
 function openUpgrade() {
   const placeholder = "请输入激活码";
   modal.confirm({
@@ -137,6 +160,7 @@ function openUpgrade() {
   justify-content: center;
   height: 100%;
   cursor: pointer;
+
   &.isPlus {
     color: #c5913f;
   }
diff --git a/packages/ui/certd-client/src/layout/layout-framework.vue b/packages/ui/certd-client/src/layout/layout-framework.vue
index 0a84e037..9dbfc3a1 100644
--- a/packages/ui/certd-client/src/layout/layout-framework.vue
+++ b/packages/ui/certd-client/src/layout/layout-framework.vue
@@ -18,7 +18,7 @@
             <MenuFoldOutlined v-else />
           </div>
           <fs-menu class="header-menu" mode="horizontal" :expand-selected="false" :selectable="false" :menus="frameworkMenus" />
-          <vip-button class="flex-center header-btn"></vip-button>
+          <vip-button class="flex-center header-btn" mode="nav" />
         </div>
         <div class="header-right header-buttons">
           <!--          <button-->
diff --git a/packages/ui/certd-client/src/views/certd/access/common.tsx b/packages/ui/certd-client/src/views/certd/access/common.tsx
index 2d3209eb..a1c8c90f 100644
--- a/packages/ui/certd-client/src/views/certd/access/common.tsx
+++ b/packages/ui/certd-client/src/views/certd/access/common.tsx
@@ -16,7 +16,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any) {
     }
   };
 
-  function buildDefineFields(define: any) {
+  function buildDefineFields(define: any, form: any) {
     const formWrapperRef = crudExpose.getFormWrapperRef();
     const columnsRef = toRef(formWrapperRef.formOptions, "columns");
 
@@ -32,7 +32,12 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any) {
         ...value,
         key
       };
-      columnsRef.value[key] = _.merge({ title: key }, defaultPluginConfig, field);
+      const column = _.merge({ title: key }, defaultPluginConfig, field);
+      if (column.value != null && _.get(form, key) == null) {
+        //设置默认值
+        _.set(form, key, column.value);
+      }
+      columnsRef.value[key] = column;
       console.log("form", columnsRef.value);
     });
   }
@@ -55,13 +60,16 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any) {
         rules: [{ required: true, message: "请选择类型" }],
         valueChange: {
           immediate: true,
-          async handle({ value, mode, form }) {
+          async handle({ value, mode, form, immediate }) {
             if (value == null) {
               return;
             }
             const define = await api.GetProviderDefine(value);
             console.log("define", define);
-            buildDefineFields(define);
+            if (!immediate) {
+              form.access = {};
+            }
+            buildDefineFields(define, form);
           }
         }
       },
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue
index 8d0b45e7..a207636c 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue
@@ -25,6 +25,7 @@
                     <template #title>
                       <a-avatar :src="item.icon || '/images/plugin.png'" />
                       <span class="title">{{ item.title }}</span>
+                      <vip-button v-if="item.needPlus" mode="icon" />
                     </template>
                     <template #description>
                       <span :title="item.desc">{{ item.desc }}</span>
@@ -81,6 +82,7 @@ import _ from "lodash-es";
 import { nanoid } from "nanoid";
 import { CopyOutlined } from "@ant-design/icons-vue";
 import { PluginGroups } from "/@/views/certd/pipeline/pipeline/type";
+import { useUserStore } from "/@/store/modules/user";
 
 export default {
   name: "PiStepForm",
@@ -98,6 +100,7 @@ export default {
      * @returns
      */
     function useStepForm() {
+      const useStore = useUserStore();
       const getPluginGroups: any = inject("getPluginGroups");
       const pluginGroups: PluginGroups = getPluginGroups();
       const mode: Ref = ref("add");
@@ -117,6 +120,10 @@ export default {
       });
 
       const stepTypeSelected = (item: any) => {
+        if (item.needPlus && !useStore.isPlus) {
+          message.warn("此插件需要开通专业版才能使用");
+          throw new Error("此插件需要开通专业版才能使用");
+        }
         currentStep.value.type = item.name;
         currentStep.value.title = item.title;
         console.log("currentStepTypeChanged:", currentStep.value);
@@ -128,6 +135,7 @@ export default {
           message.warn("请先选择类型");
           return;
         }
+
         // 给step的input设置默认值
         changeCurrentPlugin(currentStep.value);
 
@@ -347,7 +355,7 @@ export default {
       overflow-y: hidden;
 
       .ant-card-meta-description {
-        font-size: 10px;
+        font-size: 12px;
         line-height: 20px;
         height: 40px;
         color: #7f7f7f;
diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json
index 43c4d9ae..5bbc587d 100644
--- a/packages/ui/certd-server/package.json
+++ b/packages/ui/certd-server/package.json
@@ -29,7 +29,7 @@
     "@certd/pipeline": "^1.24.0",
     "@certd/plugin-cert": "^1.24.0",
     "@certd/plugin-plus": "^1.24.0",
-    "@koa/cors": "^3.4.3",
+    "@koa/cors": "^5.0.0",
     "@midwayjs/bootstrap": "^3.16.2",
     "@midwayjs/cache": "^3.14.0",
     "@midwayjs/core": "^3.16.2",
@@ -41,6 +41,7 @@
     "@midwayjs/typeorm": "^3.16.4",
     "@midwayjs/validate": "^3.16.4",
     "axios": "^1.7.2",
+    "basic-ftp": "^5.0.5",
     "bcryptjs": "^2.4.3",
     "better-sqlite3": "^11.1.2",
     "cache-manager": "^3.6.3",
@@ -50,7 +51,7 @@
     "https-proxy-agent": "^7.0.4",
     "iconv-lite": "^0.6.3",
     "js-yaml": "^4.1.0",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.0",
     "koa-send": "^5.0.1",
     "kubernetes-client": "^9.0.0",
     "lodash-es": "^4.17.21",
@@ -65,7 +66,7 @@
     "ssh2": "^1.15.0",
     "svg-captcha": "^1.4.0",
     "tencentcloud-sdk-nodejs": "^4.0.44",
-    "typeorm": "^0.3.11"
+    "typeorm": "0.3.15"
   },
   "devDependencies": {
     "@midwayjs/mock": "^3.16.4",
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/access-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/access-service.ts
index 24669204..64df6e37 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/access-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/access-service.ts
@@ -75,7 +75,8 @@ export class AccessService extends BaseService<AccessEntity> implements IAccessS
         //星号保护
         const length = value.length;
         const subIndex = Math.min(2, length);
-        const starLength = length - subIndex * 2;
+        let starLength = length - subIndex * 2;
+        starLength = Math.max(2, starLength);
         const starString = '*'.repeat(starLength);
         json[key] = value.substring(0, subIndex) + starString + value.substring(value.length - subIndex);
         encryptSetting[key] = {
diff --git a/packages/ui/certd-server/src/modules/system/service/sys-settings-service.ts b/packages/ui/certd-server/src/modules/system/service/sys-settings-service.ts
index cac4df43..993d57c0 100644
--- a/packages/ui/certd-server/src/modules/system/service/sys-settings-service.ts
+++ b/packages/ui/certd-server/src/modules/system/service/sys-settings-service.ts
@@ -74,14 +74,15 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
   async getSetting<T>(type: any): Promise<T> {
     const key = type.__key__;
     const cacheKey = type.getCacheKey();
-    let settings: T = await this.cache.get(cacheKey);
-    let settingInstance: T = new type();
-    if (settings == null) {
-      settings = await this.getSettingByKey(key);
-      settingInstance = _.merge(settingInstance, settings);
-      await this.cache.set(key, settingInstance);
+    const settings: T = await this.cache.get(cacheKey);
+    if (settings) {
+      return settings;
     }
-    return settingInstance;
+    let newSetting: T = new type();
+    const savedSettings = await this.getSettingByKey(key);
+    newSetting = _.merge(newSetting, savedSettings);
+    await this.cache.set(cacheKey, newSetting);
+    return newSetting;
   }
 
   async saveSetting<T extends BaseSettings>(bean: T) {