From 50c56d134e56cf3e855b616b16a258c87093170a Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Mon, 14 Oct 2024 10:57:12 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E5=90=AF=E5=8A=A8=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=92=8C=E7=AB=99=E7=82=B9id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certd/access/access-selector/index.vue    |  2 +-
 .../certd-client/src/views/sys/plugin/api.ts  |  4 +++-
 .../src/views/sys/plugin/config.vue           | 19 +++++++++++----
 .../src/modules/auto/auto-init-site.ts        | 10 +-------
 .../certd-server/src/modules/auto/auto-z.ts   | 22 ++++++++++++++++++
 .../plugin/service/plugin-config-service.ts   | 23 ++++++++++++-------
 packages/ui/certd-server/src/utils/version.ts |  7 ++++++
 7 files changed, 64 insertions(+), 23 deletions(-)
 create mode 100644 packages/ui/certd-server/src/modules/auto/auto-z.ts
 create mode 100644 packages/ui/certd-server/src/utils/version.ts

diff --git a/packages/ui/certd-client/src/views/certd/access/access-selector/index.vue b/packages/ui/certd-client/src/views/certd/access/access-selector/index.vue
index a1a006cf..b33bdc53 100644
--- a/packages/ui/certd-client/src/views/certd/access/access-selector/index.vue
+++ b/packages/ui/certd-client/src/views/certd/access/access-selector/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="access-selector">
     <span v-if="target.name" class="mr-5 cd-flex-inline">
-      <span class="mr-5">{{ target.name }}</span>
+      <a-tag class="mr-5" color="green">{{ target.name }}</a-tag>
       <fs-icon class="cd-icon-button" icon="ion:close-circle-outline" @click="clear"></fs-icon>
     </span>
     <span v-else class="mlr-5 text-gray">{{ placeholder }}</span>
diff --git a/packages/ui/certd-client/src/views/sys/plugin/api.ts b/packages/ui/certd-client/src/views/sys/plugin/api.ts
index 40916053..05916dd0 100644
--- a/packages/ui/certd-client/src/views/sys/plugin/api.ts
+++ b/packages/ui/certd-client/src/views/sys/plugin/api.ts
@@ -78,7 +78,9 @@ export type CertApplyPluginSysInput = {
   googleCommonEabAccessId: number;
 };
 export type PluginSysSetting<T> = {
-  input?: T;
+  sysSetting: {
+    input?: T;
+  };
 };
 export type CommPluginConfig = {
   CertApply?: PluginSysSetting<CertApplyPluginSysInput>;
diff --git a/packages/ui/certd-client/src/views/sys/plugin/config.vue b/packages/ui/certd-client/src/views/sys/plugin/config.vue
index 97fbdfde..dc4565c4 100644
--- a/packages/ui/certd-client/src/views/sys/plugin/config.vue
+++ b/packages/ui/certd-client/src/views/sys/plugin/config.vue
@@ -6,9 +6,16 @@
 
     <div class="sys-plugin-config settings-form">
       <a-form :model="formState" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off" @finish="onFinish" @finish-failed="onFinishFailed">
-        <a-form-item label="公共Google EAB授权" :name="['CertApply', 'input', 'googleCommonEabAccessId']">
-          <access-selector v-model:model-value="formState.CertApply.input.googleCommonEabAccessId" type="eab" from="sys"></access-selector>
-          <div class="helper">设置公共Google EAB授权给用户使用，避免用户自己去翻墙获取Google EAB授权</div>
+        <a-form-item label="公共Google EAB授权" :name="['CertApply', 'sysSetting', 'input', 'googleCommonEabAccessId']">
+          <access-selector v-model:model-value="formState.CertApply.sysSetting.input.googleCommonEabAccessId" type="eab" from="sys"></access-selector>
+          <div class="helper">
+            <div>设置公共Google EAB授权给用户使用，避免用户自己去翻墙获取Google EAB授权</div>
+            <div>
+              <a href="https://gitee.com/certd/certd/blob/v2/doc/google/google.md#21-%E7%9B%B4%E6%8E%A5%E8%8E%B7%E5%8F%96eab-%E6%8E%A8%E8%8D%90">
+                获取Google EAB授权方法
+              </a>
+            </div>
+          </div>
         </a-form-item>
 
         <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
@@ -31,7 +38,11 @@ defineOptions({
 });
 const formState = reactive<Partial<CommPluginConfig>>({
   CertApply: {
-    input: {}
+    sysSetting: {
+      input: {
+        googleCommonEabAccessId: null
+      }
+    }
   }
 });
 
diff --git a/packages/ui/certd-server/src/modules/auto/auto-init-site.ts b/packages/ui/certd-server/src/modules/auto/auto-init-site.ts
index 0fc2d6ab..6f861b65 100644
--- a/packages/ui/certd-server/src/modules/auto/auto-init-site.ts
+++ b/packages/ui/certd-server/src/modules/auto/auto-init-site.ts
@@ -1,16 +1,10 @@
 import { Autoload, Config, Init, Inject, Scope, ScopeEnum } from '@midwayjs/core';
 import { logger } from '@certd/pipeline';
 import { UserService } from '../sys/authority/service/user-service.js';
-import { PlusService, SysSettingsService } from '@certd/lib-server';
+import { PlusService, SysInstallInfo, SysPrivateSettings, SysSettingsService } from '@certd/lib-server';
 import { nanoid } from 'nanoid';
-import { SysInstallInfo, SysPrivateSettings } from '@certd/lib-server';
 import crypto from 'crypto';
 
-export type InstallInfo = {
-  installTime: number;
-  instanceId?: string;
-};
-
 @Autoload()
 @Scope(ScopeEnum.Singleton)
 export class AutoInitSite {
@@ -59,8 +53,6 @@ export class AutoInitSite {
     }
 
     logger.info('初始化站点完成');
-    // const pkg = require('../../../package.json');
-    // logger.info(`当前版本为：${pkg.version}`);
   }
 
   async startOptimizeDb() {
diff --git a/packages/ui/certd-server/src/modules/auto/auto-z.ts b/packages/ui/certd-server/src/modules/auto/auto-z.ts
new file mode 100644
index 00000000..fa8458b9
--- /dev/null
+++ b/packages/ui/certd-server/src/modules/auto/auto-z.ts
@@ -0,0 +1,22 @@
+import { Autoload, Init, Inject, Scope, ScopeEnum } from '@midwayjs/core';
+import { logger } from '@certd/pipeline';
+import { SysInstallInfo, SysSettingsService } from '@certd/lib-server';
+import { getVersion } from '../../utils/version.js';
+
+@Autoload()
+@Scope(ScopeEnum.Singleton)
+export class AutoZPrint {
+  @Inject()
+  sysSettingsService: SysSettingsService;
+
+  @Init()
+  async init() {
+    const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
+    logger.info('=========================================');
+    logger.info('当前站点ID:', installInfo.siteId);
+    const version = await getVersion();
+    logger.info(`当前版本:${version}`);
+    logger.info('服务启动完成');
+    logger.info('=========================================');
+  }
+}
diff --git a/packages/ui/certd-server/src/modules/plugin/service/plugin-config-service.ts b/packages/ui/certd-server/src/modules/plugin/service/plugin-config-service.ts
index 99b3f24b..436f7923 100644
--- a/packages/ui/certd-server/src/modules/plugin/service/plugin-config-service.ts
+++ b/packages/ui/certd-server/src/modules/plugin/service/plugin-config-service.ts
@@ -34,20 +34,27 @@ export class PluginConfigService {
     return configs;
   }
 
-  async saveCommPluginConfig(body: CommPluginConfig) {
-    const certApplyConfig = body.CertApply;
-    const CertApply = await this.pluginService.getRepository().findOne({
-      where: { name: 'CertApply' },
+  async saveCommPluginConfig(config: CommPluginConfig) {
+    await this.savePluginConfig('CertApply', config.CertApply);
+  }
+
+  async savePluginConfig(name: string, config: PluginConfig) {
+    const sysSetting = config?.sysSetting;
+    if (!sysSetting) {
+      throw new Error(`${name}.sysSetting is required`);
+    }
+    const pluginEntity = await this.pluginService.getRepository().findOne({
+      where: { name },
     });
-    if (!CertApply) {
+    if (!pluginEntity) {
       await this.pluginService.add({
-        name: 'CertApply',
-        sysSetting: JSON.stringify(certApplyConfig),
+        name,
+        sysSetting: JSON.stringify(sysSetting),
         type: 'builtIn',
         disabled: false,
       });
     } else {
-      await this.pluginService.getRepository().update({ name: 'CertApply' }, { sysSetting: JSON.stringify(certApplyConfig) });
+      await this.pluginService.getRepository().update({ name }, { sysSetting: JSON.stringify(sysSetting) });
     }
   }
 
diff --git a/packages/ui/certd-server/src/utils/version.ts b/packages/ui/certd-server/src/utils/version.ts
new file mode 100644
index 00000000..4fce818e
--- /dev/null
+++ b/packages/ui/certd-server/src/utils/version.ts
@@ -0,0 +1,7 @@
+import fs from 'fs';
+
+export async function getVersion() {
+  const pkg = await fs.promises.readFile('../../../package.json');
+  const pkgJson = JSON.parse(pkg.toString());
+  return pkgJson.version;
+}