From 81d6c0ebdf5ab4960e02c41d458fa36a05a6d0a8 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Mon, 23 Sep 2024 11:27:53 +0800 Subject: [PATCH] chore: env --- packages/ui/certd-client/.env | 4 +- .../ui/certd-client/src/utils/util.env.ts | 44 +++++++------------ .../views/framework/home/page-cover/index.vue | 2 +- .../src/views/sys/settings/index.vue | 5 ++- .../basic/controller/settings-controller.ts | 23 +++------- .../src/modules/system/service/models.ts | 10 +++++ 6 files changed, 39 insertions(+), 49 deletions(-) diff --git a/packages/ui/certd-client/.env b/packages/ui/certd-client/.env index 455f429f..1bda3480 100644 --- a/packages/ui/certd-client/.env +++ b/packages/ui/certd-client/.env @@ -6,6 +6,6 @@ VITE_APP_SLOGAN=让你的证书永不过期 VITE_APP_COPYRIGHT_YEAR=2021-2024 VITE_APP_COPYRIGHT_NAME=handsfree.work VITE_APP_COPYRIGHT_URL=https://certd.handsfree.work -VITE_APP_LOGO_PATH=./images/logo/logo.svg +VITE_APP_LOGO=./images/logo/logo.svg VITE_APP_PROJECT_PATH=https://github.com/certd/certd -VITE_APP_ICP_NO= + diff --git a/packages/ui/certd-client/src/utils/util.env.ts b/packages/ui/certd-client/src/utils/util.env.ts index ac124983..621a4a97 100644 --- a/packages/ui/certd-client/src/utils/util.env.ts +++ b/packages/ui/certd-client/src/utils/util.env.ts @@ -1,37 +1,25 @@ // @ts-ignore import _ from "lodash-es"; -export function getEnvValue(key: string) { - // @ts-ignore - return import.meta.env["VITE_APP_" + key]; -} export class EnvConfig { - API: string; - MODE: string; - STORAGE: string; - TITLE: string; - SLOGAN: string; - COPYRIGHT_YEAR: string; - COPYRIGHT_NAME: string; - COPYRIGHT_URL: string; - LOGO_PATH: string; - PM_ENABLED: string; - ICP_NO: string; - constructor() { - this.init(); - } + MODE: string = import.meta.env.MODE; + API: string = import.meta.env.VITE_APP_API; + STORAGE: string = import.meta.env.VITE_APP_STORAGE; + TITLE: string = import.meta.env.VITE_APP_TITLE; + SLOGAN: string = import.meta.env.VITE_APP_SLOGAN; + COPYRIGHT_YEAR: string = import.meta.env.VITE_APP_COPYRIGHT_YEAR; + COPYRIGHT_NAME: string = import.meta.env.VITE_APP_COPYRIGHT_NAME; + COPYRIGHT_URL: string = import.meta.env.VITE_APP_COPYRIGHT_URL; + LOGO: string = import.meta.env.VITE_APP_LOGO; + PM_ENABLED: string = import.meta.env.VITE_APP_PM_ENABLED; + ICP_NO: string = import.meta.env.VITE_APP_ICP_NO; - init() { - // @ts-ignore - _.forEach(import.meta.env, (value, key) => { - if (key.startsWith("VITE_APP")) { - key = key.replace("VITE_APP_", ""); - // @ts-ignore - this[key] = value; + init(env: any) { + for (const key in this) { + if (this.hasOwnProperty(key)) { + this[key] = env[key]; } - }); - // @ts-ignore - this.MODE = import.meta.env.MODE; + } } get(key: string, defaultValue: string) { diff --git a/packages/ui/certd-client/src/views/framework/home/page-cover/index.vue b/packages/ui/certd-client/src/views/framework/home/page-cover/index.vue index e79d401d..5ecbd014 100644 --- a/packages/ui/certd-client/src/views/framework/home/page-cover/index.vue +++ b/packages/ui/certd-client/src/views/framework/home/page-cover/index.vue @@ -2,7 +2,7 @@
- + {{ envRef.TITLE }} v{{ version }}
diff --git a/packages/ui/certd-client/src/views/sys/settings/index.vue b/packages/ui/certd-client/src/views/sys/settings/index.vue index cd8893f3..3e998642 100644 --- a/packages/ui/certd-client/src/views/sys/settings/index.vue +++ b/packages/ui/certd-client/src/views/sys/settings/index.vue @@ -46,10 +46,12 @@ import { useSettingStore } from "/@/store/modules/settings"; interface FormState { registerEnabled: boolean; + managerOtherUserPipeline: boolean; } const formState = reactive>({ - registerEnabled: false + registerEnabled: false, + managerOtherUserPipeline: false }); async function loadSysPublicSettings() { @@ -61,7 +63,6 @@ async function loadSysPublicSettings() { loadSysPublicSettings(); const settingsStore = useSettingStore(); const onFinish = async (form: any) => { - console.log("Success:", form); await api.PublicSettingsSave(form); await settingsStore.loadSysSettings(); notification.success({ diff --git a/packages/ui/certd-server/src/modules/basic/controller/settings-controller.ts b/packages/ui/certd-server/src/modules/basic/controller/settings-controller.ts index 85dcfb1e..7d522373 100644 --- a/packages/ui/certd-server/src/modules/basic/controller/settings-controller.ts +++ b/packages/ui/certd-server/src/modules/basic/controller/settings-controller.ts @@ -1,23 +1,8 @@ -import { Rule, RuleType } from '@midwayjs/validate'; import { Controller, Get, Inject, Provide } from '@midwayjs/core'; import { BaseController } from '../../../basic/base-controller.js'; import { Constants } from '../../../basic/constants.js'; import { SysSettingsService } from '../../system/service/sys-settings-service.js'; -import { SysInstallInfo, SysPublicSettings } from '../../system/service/models.js'; - -export class SmsCodeReq { - @Rule(RuleType.number().required()) - phoneCode: number; - - @Rule(RuleType.string().required()) - mobile: string; - - @Rule(RuleType.string().required().max(10)) - randomStr: string; - - @Rule(RuleType.number().required().max(4)) - imgCode: string; -} +import { SysInstallInfo, SysPublicSettings, SysSiteInfo } from '../../system/service/models.js'; /** */ @@ -38,4 +23,10 @@ export class BasicSettingsController extends BaseController { const settings = await this.sysSettingsService.getSetting(SysInstallInfo); return this.ok(settings); } + + @Get('/siteInfo', { summary: Constants.per.guest }) + public async getSiteInfo() { + const settings = await this.sysSettingsService.getSetting(SysSiteInfo); + return this.ok(settings); + } } diff --git a/packages/ui/certd-server/src/modules/system/service/models.ts b/packages/ui/certd-server/src/modules/system/service/models.ts index 60f89de0..e1a8b294 100644 --- a/packages/ui/certd-server/src/modules/system/service/models.ts +++ b/packages/ui/certd-server/src/modules/system/service/models.ts @@ -38,3 +38,13 @@ export class SysLicenseInfo extends BaseSettings { static __access__ = 'private'; license?: string; } + +export class SysSiteInfo extends BaseSettings { + static __title__ = '站点信息'; + static __key__ = 'sys.site'; + static __access__ = 'public'; + TITLE?: string; + SLOGAN?: string; + LOGO?: string; + ICP_NO?: string; +}