perf: 新增代理设置功能

packages/ui/certd-client/src/api/modules/api.basic.ts

@@ -8,11 +8,11 @@ export type SiteEnv = {
   };
 };
 export type SiteInfo = {
-  title: string;
-  slogan: string;
-  logo: string;
-  loginLogo: string;
-  icpNo: string;
+  title?: string;
+  slogan?: string;
+  logo?: string;
+  loginLogo?: string;
+  icpNo?: string;
   licenseTo?: string;
   licenseToUrl?: string;
 };

packages/ui/certd-client/src/layout/layout-framework.vue

@@ -77,10 +77,10 @@
             <a :href="siteInfo.licenseToUrl || ''">{{ siteInfo.licenseTo }}</a>
           </template>
 
-          <template v-if="siteInfo.icpNo">
+          <template v-if="sysPublic.icpNo">
             <a-divider type="vertical" />
             <span>
-              <a href="https://beian.miit.gov.cn/" target="_blank">{{ siteInfo.icpNo }}</a>
+              <a href="https://beian.miit.gov.cn/" target="_blank">{{ sysPublic.icpNo }}</a>
             </span>
           </template>
         </div>
@@ -140,6 +140,9 @@ const userStore = useUserStore();
 
 const settingStore = useSettingStore();
 
+const sysPublic = computed(() => {
+  return settingStore.sysPublic;
+});
 const siteInfo = computed(() => {
   return settingStore.siteInfo;
 });

packages/ui/certd-client/src/layout/layout-outside.vue

@@ -27,9 +27,9 @@
               <a-divider type="vertical" />
               <a :href="siteInfo.licenseToUrl" target="_blank">{{ siteInfo.licenseTo }}</a>
             </span>
-            <span v-if="siteInfo.icpNo">
+            <span v-if="sysPublic.icpNo">
               <a-divider type="vertical" />
-              <a href="https://beian.miit.gov.cn/" target="_blank">{{ siteInfo.icpNo }}</a>
+              <a href="https://beian.miit.gov.cn/" target="_blank">{{ sysPublic.icpNo }}</a>
             </span>
           </div>
         </div>
@@ -40,13 +40,17 @@
 <script lang="ts" setup>
 import { env } from "/@/utils/util.env";
 import { computed, ref, Ref } from "vue";
-import { SiteInfo, useSettingStore } from "/@/store/modules/settings";
+import { useSettingStore } from "/@/store/modules/settings";
+import { SiteInfo, SysPublicSetting } from "/@/api/modules/api.basic";
 
 const envRef = ref(env);
 const settingStore = useSettingStore();
 const siteInfo: Ref<SiteInfo> = computed(() => {
   return settingStore.siteInfo;
 });
+const sysPublic: Ref<SysPublicSetting> = computed(() => {
+  return settingStore.sysPublic;
+});
 </script>
 
 <style lang="less">

packages/ui/certd-client/src/store/modules/settings.ts

@@ -44,12 +44,11 @@ const defaultThemeConfig = {
   mode: "light"
 };
 const SETTING_THEME_KEY = "SETTING_THEME";
-const defaultSiteInfo = {
+const defaultSiteInfo: SiteInfo = {
   title: env.TITLE || "Certd",
   slogan: env.SLOGAN || "让你的证书永不过期",
   logo: env.LOGO || "/static/images/logo/logo.svg",
   loginLogo: env.LOGIN_LOGO || "/static/images/logo/rect-block.svg",
-  icpNo: env.ICP_NO,
   licenseTo: "",
   licenseToUrl: ""
 };
@@ -69,7 +68,7 @@ export const useSettingStore = defineStore({
     sysPublic: {
       registerEnabled: false,
       managerOtherUserPipeline: false,
-      icpNo: ""
+      icpNo: env.ICP_NO || ""
     },
     installInfo: {
       siteId: "",
@@ -148,11 +147,6 @@ export const useSettingStore = defineStore({
           siteInfo.loginLogo = `/api/basic/file/download?key=${siteInfo.loginLogo}`;
         }
       }
-
-      const sysPublic = this.getSysPublic;
-      if (sysPublic.icpNo) {
-        siteInfo.icpNo = sysPublic.icpNo;
-      }
       this.siteInfo = _.merge({}, defaultSiteInfo, siteInfo);
     },
     async checkUrlBound() {

packages/ui/certd-client/src/views/sys/settings/api.ts

@@ -1,6 +1,18 @@
 // @ts-ignore
 import { request } from "/@/api/service";
 const apiPrefix = "/sys/settings";
+export type SysSettings = { public: SysPublicSetting; private: SysPrivateSetting };
+
+export type SysPublicSetting = {
+  registerEnabled?: boolean;
+  managerOtherUserPipeline?: boolean;
+  icpNo?: string;
+};
+
+export type SysPrivateSetting = {
+  httpProxy?: string;
+  httpsProxy?: string;
+};
 
 export const SettingKeys = {
   SysPublic: "sys.public",
@@ -8,13 +20,17 @@ export const SettingKeys = {
   SysEmail: "sys.email"
 };
 export async function SettingsGet(key: string) {
-  return await request({
+  const res = await request({
     url: apiPrefix + "/get",
     method: "post",
     params: {
       key
     }
   });
+  if (!res) {
+    return {};
+  }
+  return JSON.parse(res.setting);
 }
 
 export async function SettingsSave(key: string, setting: any) {
@@ -35,17 +51,24 @@ export async function EmailSettingsGet() {
   });
 }
 
-export async function PublicSettingsSave(setting: any) {
-  return await request({
-    url: apiPrefix + "/savePublicSettings",
-    method: "post",
-    data: setting
-  });
-}
-
 export async function stopOtherUserTimer() {
   return await request({
     url: apiPrefix + "/stopOtherUserTimer",
     method: "post"
   });
 }
+
+export async function SysSettingsGet(): Promise<SysSettings> {
+  return await request({
+    url: apiPrefix + "/getSysSettings",
+    method: "post"
+  });
+}
+
+export async function SysSettingsSave(data: SysSettings) {
+  return await request({
+    url: apiPrefix + "/saveSysSettings",
+    method: "post",
+    data: data
+  });
+}

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

@@ -13,29 +13,28 @@
         @finish="onFinish"
         @finish-failed="onFinishFailed"
       >
-        <a-form-item label="开启自助注册" name="registerEnabled">
-          <a-switch v-model:checked="formState.registerEnabled" />
+        <a-form-item label="开启自助注册" :name="['public', 'registerEnabled']">
+          <a-switch v-model:checked="formState.public.registerEnabled" />
         </a-form-item>
-        <a-form-item label="管理其他用户流水线" name="managerOtherUserPipeline">
-          <a-switch v-model:checked="formState.managerOtherUserPipeline" />
+        <a-form-item label="管理其他用户流水线" :name="['public', 'managerOtherUserPipeline']">
+          <a-switch v-model:checked="formState.public.managerOtherUserPipeline" />
         </a-form-item>
-        <a-form-item label="ICP备案号" name="icpNo">
-          <a-input v-model:value="formState.icpNo" />
+        <a-form-item label="ICP备案号" :name="['public', 'icpNo']">
+          <a-input v-model:value="formState.public.icpNo" placeholder="粤ICP备xxxxxxx号" />
+        </a-form-item>
+
+        <a-form-item label="HTTP代理" :name="['private', 'httpProxy']" :rules="urlRules">
+          <a-input v-model:value="formState.private.httpProxy" placeholder="http://192.168.1.2:18010/" />
+        </a-form-item>
+
+        <a-form-item label="HTTPS代理" :name="['private', 'httpsProxy']" :rules="urlRules">
+          <a-input v-model:value="formState.private.httpsProxy" placeholder="http://192.168.1.2:18010/" />
+          <div class="helper">一般这两个代理填一样的</div>
         </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 :loading="saveLoading" type="primary" html-type="submit">保存</a-button>
         </a-form-item>
       </a-form>
-
-      <!--      <a-descriptions label="系统维护操作">-->
-      <!--        <a-descriptions-item label="自动化任务">-->
-      <!--          <a-button @click="stopOtherUserTimer">停止所有其他用户的定时任务</a-button>-->
-      <!--        </a-descriptions-item>-->
-      <!--      </a-descriptions>-->
     </div>
   </fs-page>
 </template>
@@ -43,42 +42,41 @@
 <script setup lang="ts">
 import { reactive, ref } from "vue";
 import * as api from "./api";
-import { PublicSettingsSave, SettingKeys } from "./api";
+import { SysSettings } from "./api";
 import { notification } from "ant-design-vue";
 import { useSettingStore } from "/@/store/modules/settings";
+import { merge } from "lodash-es";
 
 defineOptions({
   name: "SysSettings"
 });
 
-interface FormState {
-  registerEnabled: boolean;
-  managerOtherUserPipeline: boolean;
-  icpNo: string;
-}
-
-const formState = reactive<Partial<FormState>>({
-  registerEnabled: false,
-  managerOtherUserPipeline: false,
-  icpNo: ""
+const formState = reactive<Partial<SysSettings>>({
+  public: {
+    registerEnabled: false,
+    managerOtherUserPipeline: false,
+    icpNo: ""
+  },
+  private: {}
 });
 
-async function loadSysPublicSettings() {
-  const data: any = await api.SettingsGet(SettingKeys.SysPublic);
-  if (data == null) {
-    return;
-  }
-  const setting = JSON.parse(data.setting);
-  Object.assign(formState, setting);
+const urlRules = ref({
+  type: "url",
+  message: "请输入正确的URL"
+});
+
+async function loadSysSettings() {
+  const data: any = await api.SysSettingsGet();
+  merge(formState, data);
 }
 
 const saveLoading = ref(false);
-loadSysPublicSettings();
+loadSysSettings();
 const settingsStore = useSettingStore();
 const onFinish = async (form: any) => {
   try {
     saveLoading.value = true;
-    await api.PublicSettingsSave(form);
+    await api.SysSettingsSave(form);
     await settingsStore.loadSysSettings();
     notification.success({
       message: "保存成功"