lkddi/certd
1
0
Fork 0
mirror of https://github.com/certd/certd.git synced 2026-04-23 19:57:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev

Browse Source
This commit is contained in:
xiaojunnuo
2025-12-10 14:17:20 +08:00
parent bbe7e5f96d 2bfad9fc65
commit fe1e2c3b62
23 changed files with 104 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+1 -1
View File
@@ -631,7 +631,7 @@ export default {
autoHideTime: "Auto Hide Time",
autoHideTimeHelper: "Minutes without requests before auto hiding",
hideOpenApi: "Hide Open API",
hideOpenApiHelper: "Whether to hide open APIs; whether to expose /api/v1 prefixed endpoints",
hideOpenApiHelper: "Whether to hide open APIs; whether to hide /api/v1 prefixed endpoints",
hideSiteImmediately: "Hide Site Immediately",
hideImmediately: "Hide Immediately",
confirmHideSiteTitle: "Are you sure to hide the site immediately?",
packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+1 -1
View File
@@ -635,7 +635,7 @@ export default {
autoHideTime: "自动隐藏时间",
autoHideTimeHelper: "多少分钟内无请求自动隐藏",
hideOpenApi: "隐藏开放接口",
hideOpenApiHelper: "是否隐藏开放接口，是否放开/api/v1开头的接口",
hideOpenApiHelper: "是否隐藏开放接口，是否同时隐藏/api/v1开头的接口",
hideSiteImmediately: "立即隐藏站点",
hideImmediately: "立即隐藏",
confirmHideSiteTitle: "确定要立即隐藏站点吗？",
packages/ui/certd-client/src/views/certd/addon/addon-selector/index.vue
+1
View File
@@ -21,6 +21,7 @@
},
},
}"
:disabled="disabled"
:show-current="false"
:show-select="false"
:dialog="{ width: 960 }"
packages/ui/certd-client/src/views/sys/settings/tabs/oauth.vue
+9 -2
View File
@@ -7,7 +7,7 @@
<vip-button class="ml-5" mode="button"></vip-button>
</div>
</a-form-item>
<a-form-item v-if="formState.public.oauthEnabled" :label="t('certd.sys.setting.oauthProviders')" :name="['public', 'oauthProviders']">
<a-form-item :label="t('certd.sys.setting.oauthProviders')" :name="['public', 'oauthProviders']">
<div class="flex flex-wrap">
<table class="w-full table-auto border-collapse border border-gray-400">
<thead>
@@ -31,7 +31,14 @@
</fs-copyable>
</td>
<td class="border border-gray-300 px-4 py-2">
<AddonSelector v-model:model-value="item.addonId" addon-type="oauth" from="sys" :type="item.name" :placeholder="t('certd.sys.setting.oauthProviderSelectorPlaceholder')" />
<AddonSelector
v-model:model-value="item.addonId"
:disabled="!formState.public.oauthEnabled"
addon-type="oauth"
from="sys"
:type="item.name"
:placeholder="t('certd.sys.setting.oauthProviderSelectorPlaceholder')"
/>
</td>
</tr>
</tbody>
packages/ui/certd-server/db/migration-mysql/v10035__transform_fix.sql
+2
View File
@@ -0,0 +1,2 @@
ALTER TABLE `sys_settings` MODIFY COLUMN `setting` longtext NULL;
ALTER TABLE `user_settings` MODIFY COLUMN `setting` longtext NULL;
packages/ui/certd-server/db/migration-pg/v10035__transform_fix.sql
View File
packages/ui/certd-server/db/migration/v10035__transform_fix.sql
+20
View File
@@ -0,0 +1,20 @@
update cd_access set create_time = '2024-08-08 00:00:00.000' where create_time < '999999999999999999999';
update cd_access set update_time = '2024-08-08 00:00:00.000' where update_time < '999999999999999999999';
update pi_history set create_time = '2024-08-08 00:00:00.000' where create_time < '999999999999999999999';
update pi_history set update_time = '2024-08-08 00:00:00.000' where update_time < '999999999999999999999';
update pi_history_log set create_time = '2024-08-08 00:00:00.000' where create_time < '999999999999999999999';
update pi_history_log set update_time = '2024-08-08 00:00:00.000' where update_time < '999999999999999999999';
update pi_pipeline set create_time = '2024-08-08 00:00:00.000' where create_time < '999999999999999999999';
update pi_pipeline set update_time = '2024-08-08 00:00:00.000' where update_time < '999999999999999999999';
update sys_permission set create_time = '2024-08-08 00:00:00.000' where create_time < '999999999999999999999';
update sys_permission set update_time = '2024-08-08 00:00:00.000' where update_time < '999999999999999999999';
update sys_role set create_time = '2024-08-08 00:00:00.000' where create_time < '999999999999999999999';
update sys_role set update_time = '2024-08-08 00:00:00.000' where update_time < '999999999999999999999';
update sys_user set create_time = '2024-08-08 00:00:00.000' where create_time < '999999999999999999999';
update sys_user set update_time = '2024-08-08 00:00:00.000' where update_time < '999999999999999999999';
packages/ui/certd-server/src/plugins/plugin-west/access.ts
+6
View File
@@ -158,6 +158,9 @@ export class WestAccess extends BaseAccess {
},
});
if (res.msg !== 'success') {
if(res.msg.includes('500 already exists')){
return res;
}
throw new Error(`${JSON.stringify(res.msg)}`);
}
return res;
@@ -253,6 +256,9 @@ token=md5(zhangsan + 5dh232kfg!* + 1554691950854)=cfcd208495d565ef66e7dff9f98764
});
this.ctx.logger.info(`request ${url} ${method} res:${JSON.stringify(res)}`);
if (res.msg !== 'success' && res.result!= 200) {
if(res.msg.includes('500 already exists')){
return res;
}
throw new Error(`${JSON.stringify(res.msg)}`);
}
return res;
packages/ui/certd-server/src/plugins/plugin-west/dns-provider-domain.ts
+6 -1
View File
@@ -73,11 +73,16 @@ export class WestDnsProviderDomain extends AbstractDnsProvider<westRecord> {
}
//这里调用删除txt dns解析记录接口
const record_id = record?.body?.record_id;
if (!record_id) {
this.logger.info('record_id不存在');
return;
}
// 准备要发送到API的请求体
const requestBody = {
act: 'dnsrec.remove', // API动作类型
domain: domain, // 域名
record_id: record.body.record_id,
record_id: record_id,
hostname: fullRecord, // 完整的记录名
record_type: 'TXT', // DNS记录类型
record_line: '', // 记录线路
packages/ui/certd-server/src/plugins/plugin-west/dns-provider.ts
+6 -2
View File
@@ -107,12 +107,16 @@ export class WestDnsProvider extends AbstractDnsProvider<westRecord> {
return;
}
//这里调用删除txt dns解析记录接口
const record_id = record.data?.id;
if (!record_id) {
this.logger.info('record_id不存在');
return;
}
// 准备要发送到API的请求体
const requestBody = {
act: 'deldnsrecord', // API动作类型
domain: domain, // 域名
id: record.data?.id,
id: record_id,
};
const url = '/v2/domain/';