diff --git a/packages/ui/certd-client/.env b/packages/ui/certd-client/.env index d4e9e56e..f9fcd907 100644 --- a/packages/ui/certd-client/.env +++ b/packages/ui/certd-client/.env @@ -1,12 +1,12 @@ -VITE_APP_API=/api +VITE_APP_API=api #登录与权限关闭 VITE_APP_PM_ENABLED=true VITE_APP_TITLE=Certd VITE_APP_SLOGAN=让你的证书永不过期 -VITE_APP_COPYRIGHT_YEAR=2021-2024 +VITE_APP_COPYRIGHT_YEAR=2021-2025 VITE_APP_COPYRIGHT_NAME=handsfree.work VITE_APP_COPYRIGHT_URL=https://certd.handsfree.work -VITE_APP_LOGO=/static/images/logo/logo.svg -VITE_APP_LOGIN_LOGO=/static/images/logo/rect-black.svg +VITE_APP_LOGO=static/images/logo/logo.svg +VITE_APP_LOGIN_LOGO=static/images/logo/rect-black.svg VITE_APP_PROJECT_PATH=https://github.com/certd/certd VITE_APP_NAMESPACE=fs \ No newline at end of file diff --git a/packages/ui/certd-client/.env.production b/packages/ui/certd-client/.env.production index dde579e5..0eeba503 100644 --- a/packages/ui/certd-client/.env.production +++ b/packages/ui/certd-client/.env.production @@ -1,3 +1,3 @@ -VITE_APP_API=/api +VITE_APP_API=api #登录与权限开启 VITE_APP_PM_ENABLED=true diff --git a/packages/ui/certd-client/index.html b/packages/ui/certd-client/index.html index 2130a2f4..1740a304 100644 --- a/packages/ui/certd-client/index.html +++ b/packages/ui/certd-client/index.html @@ -2,11 +2,11 @@ - + Loading - - + +
diff --git a/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-tip.vue b/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-tip.vue index 64fab800..2b58f807 100644 --- a/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-tip.vue +++ b/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-tip.vue @@ -21,6 +21,6 @@ const props = defineProps<{ }>(); const nslookupCmd = computed(() => { - return `nslookup -qa=txt _acme-challenge.${props.record.domain}`; + return `nslookup -q=txt _acme-challenge.${props.record.domain}`; }); diff --git a/packages/ui/certd-client/src/store/settings/index.ts b/packages/ui/certd-client/src/store/settings/index.ts index 3222f557..d1e2ec29 100644 --- a/packages/ui/certd-client/src/store/settings/index.ts +++ b/packages/ui/certd-client/src/store/settings/index.ts @@ -161,10 +161,10 @@ export const useSettingStore = defineStore({ //@ts-ignore if (this.isComm) { if (siteInfo.logo) { - siteInfo.logo = `/api/basic/file/download?key=${siteInfo.logo}`; + siteInfo.logo = `api/basic/file/download?key=${siteInfo.logo}`; } if (siteInfo.loginLogo) { - siteInfo.loginLogo = `/api/basic/file/download?key=${siteInfo.loginLogo}`; + siteInfo.loginLogo = `api/basic/file/download?key=${siteInfo.loginLogo}`; } } this.siteInfo = _.merge({}, defaultSiteInfo, siteInfo); diff --git a/packages/ui/certd-client/src/views/certd/mine/user-profile.vue b/packages/ui/certd-client/src/views/certd/mine/user-profile.vue index dd90050c..72d048bd 100644 --- a/packages/ui/certd-client/src/views/certd/mine/user-profile.vue +++ b/packages/ui/certd-client/src/views/certd/mine/user-profile.vue @@ -7,7 +7,7 @@ {{ userInfo.username }} - + {{ userInfo.username }} diff --git a/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue b/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue index c0cc510c..a542d407 100644 --- a/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue +++ b/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue @@ -3,7 +3,7 @@
- + {{ userInfo.username }} diff --git a/packages/ui/certd-client/src/views/framework/login/image-code.vue b/packages/ui/certd-client/src/views/framework/login/image-code.vue index f24a6c96..9ac1dae8 100644 --- a/packages/ui/certd-client/src/views/framework/login/image-code.vue +++ b/packages/ui/certd-client/src/views/framework/login/image-code.vue @@ -28,7 +28,7 @@ function onChange(value: string) { const imageCodeUrl = ref(); function resetImageCode() { const randomStr = nanoid(10); - let url = "/api/basic/code/captcha"; + let url = "api/basic/code/captcha"; imageCodeUrl.value = url + "?randomStr=" + randomStr; emit("update:randomStr", randomStr); } diff --git a/packages/ui/certd-client/src/views/sys/authority/user/crud.tsx b/packages/ui/certd-client/src/views/sys/authority/user/crud.tsx index 5fe4af49..f851731f 100644 --- a/packages/ui/certd-client/src/views/sys/authority/user/crud.tsx +++ b/packages/ui/certd-client/src/views/sys/authority/user/crud.tsx @@ -164,7 +164,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti width: "auto", }, buildUrl(key: string) { - return `/api/basic/file/download?&key=` + key; + return `api/basic/file/download?&key=` + key; }, }, }, @@ -190,7 +190,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti }, }, buildUrl(key: string) { - return `/api/basic/file/download?&key=` + key; + return `api/basic/file/download?&key=` + key; }, }, }, diff --git a/packages/ui/certd-client/vite.config.ts b/packages/ui/certd-client/vite.config.ts index 2bf69c22..33322f01 100644 --- a/packages/ui/certd-client/vite.config.ts +++ b/packages/ui/certd-client/vite.config.ts @@ -21,9 +21,9 @@ export default ({ command, mode }) => { const env = loadEnv(mode, process.cwd()); const devServerFs: any = {}; const devAlias: any[] = []; - const base = "/"; + const base = "./"; // if (mode.startsWith("dev")) { - // base = "/dev"; + // base = "./"; // } return { base: base, @@ -36,6 +36,7 @@ export default ({ command, mode }) => { data: { title: env.VITE_APP_TITLE, projectPath: env.VITE_APP_PROJECT_PATH, + version: env.VITE_APP_VERSION, }, }, }), diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/dns-provider/aliyun-dns-provider.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/dns-provider/aliyun-dns-provider.ts index 8849cbc7..a3131b57 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/dns-provider/aliyun-dns-provider.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/dns-provider/aliyun-dns-provider.ts @@ -87,15 +87,13 @@ export class AliyunDnsProvider extends AbstractDnsProvider { // } async createRecord(options: CreateRecordOptions): Promise { - const { fullRecord, value, type, domain } = options; + const { fullRecord,hostRecord, value, type, domain } = options; this.logger.info('添加域名解析：', fullRecord, value, domain); // const domain = await this.matchDomain(fullRecord); - const rr = fullRecord.replace('.' + domain, ''); - const params = { RegionId: 'cn-hangzhou', DomainName: domain, - RR: rr, + RR: hostRecord, Type: type, Value: value, // Line: 'oversea' // 海外