From 3dfeeec899d7d0d7292695ce410f78548e076c03 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Sat, 7 Dec 2024 15:19:28 +0800 Subject: [PATCH 01/15] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dcname=E6=8E=92?= =?UTF-8?q?=E6=9F=A5=E6=96=B9=E6=B3=95=20nslookup=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=BB=91=E8=89=B2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/domains-verify-plan-editor/cname-tip.vue | 10 +++++++++- .../ui/certd-client/src/components/tutorial/index.vue | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) 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 ee16a5d27..a044c9e96 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 @@ -7,7 +7,7 @@
2. 要添加的是CNAME类型的记录,不是TXT
3. 核对记录值是否是:{{ record.recordValue }}
- 4. 运行命令 nslookup -qa=txt {{ record.hostRecord }}{{ record.domain }} 查看解析配置是否正确 + 4. 运行命令 nslookup -qa=txt {{ record.hostRecord }}.{{ mainDomain }} 查看解析是否正确
@@ -16,7 +16,15 @@ diff --git a/packages/ui/certd-client/src/components/tutorial/index.vue b/packages/ui/certd-client/src/components/tutorial/index.vue index d7f196e0a..6cf2778d9 100644 --- a/packages/ui/certd-client/src/components/tutorial/index.vue +++ b/packages/ui/certd-client/src/components/tutorial/index.vue @@ -12,7 +12,7 @@ const slots = defineSlots(); @@ -22,9 +21,13 @@ const props = defineProps<{ record: any; }>(); const mainDomain = computed(() => { - if (props.record.domain) { + if (props?.record?.domain) { return psl.parse(props.record.domain).domain; } return ""; }); + +const nslookupCmd = computed(() => { + return `nslookup -qa=txt ${props.record.hostRecord}.${mainDomain.value}`; +}); From 6c9f9940e33fdabfceceda017187002fb0646df2 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Sat, 7 Dec 2024 16:16:50 +0800 Subject: [PATCH 03/15] chore: --- .../cert/domains-verify-plan-editor/cname-tip.vue | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) 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 69bfb6475..64fab8004 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 @@ -16,18 +16,11 @@ From 4042577c0b50f2f67e841329c8de70b352a3f320 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Sun, 8 Dec 2024 02:30:25 +0800 Subject: [PATCH 04/15] chore: --- packages/ui/certd-client/src/style/antdv4.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/ui/certd-client/src/style/antdv4.less b/packages/ui/certd-client/src/style/antdv4.less index 241f82921..60b29f97c 100644 --- a/packages/ui/certd-client/src/style/antdv4.less +++ b/packages/ui/certd-client/src/style/antdv4.less @@ -37,3 +37,7 @@ margin-right: 3px; } } + +.fs-search .ant-row{ + +} From 8b9c47daf194515006689a212ae9cf586bdf5993 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Mon, 9 Dec 2024 00:12:15 +0800 Subject: [PATCH 05/15] =?UTF-8?q?perf:=20favicon=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/system/basic/service/plus-service.ts | 4 +-- packages/ui/certd-client/index.html | 2 +- .../src/components/vip-button/index.vue | 7 +++-- .../src/views/sys/account/index.vue | 12 ++++---- .../src/controller/basic/app-controller.ts | 28 +++++++++++++++++-- .../controller/sys/plus/plus-controller.ts | 4 +-- 6 files changed, 42 insertions(+), 15 deletions(-) diff --git a/packages/libs/lib-server/src/system/basic/service/plus-service.ts b/packages/libs/lib-server/src/system/basic/service/plus-service.ts index 4d780202a..78d3b7b3d 100644 --- a/packages/libs/lib-server/src/system/basic/service/plus-service.ts +++ b/packages/libs/lib-server/src/system/basic/service/plus-service.ts @@ -38,9 +38,9 @@ export class PlusService { return installInfo.siteId; } - async active(code: string) { + async active(code: string, inviteCode?: string) { const plusRequestService = await this.getPlusRequestService(); - return await plusRequestService.active(code); + return await plusRequestService.active(code, inviteCode); } async updateLicense(license: string) { diff --git a/packages/ui/certd-client/index.html b/packages/ui/certd-client/index.html index 50b10d1ab..2130a2f4d 100644 --- a/packages/ui/certd-client/index.html +++ b/packages/ui/certd-client/index.html @@ -2,7 +2,7 @@ - + Loading 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 747775670..ca7d0e23a 100644 --- a/packages/ui/certd-client/src/components/vip-button/index.vue +++ b/packages/ui/certd-client/src/components/vip-button/index.vue @@ -118,7 +118,8 @@ const expiredDays = computed(() => { }); const formState = reactive({ - code: "" + code: "", + inviteCode: "" }); const router = useRouter(); @@ -268,7 +269,7 @@ function openUpgrade() { activationCodeGetWay = ( - 爱发电赞助“VIP会员”后获取专业版 + 爱发电赞助“VIP会员(¥29.9)”后获取一年期专业版激活码 商业版请直接联系作者 @@ -327,6 +328,8 @@ function openUpgrade() { + +
diff --git a/packages/ui/certd-client/src/views/sys/account/index.vue b/packages/ui/certd-client/src/views/sys/account/index.vue index 4b4042868..5cc70b778 100644 --- a/packages/ui/certd-client/src/views/sys/account/index.vue +++ b/packages/ui/certd-client/src/views/sys/account/index.vue @@ -1,11 +1,11 @@