lkddi/certd
1
0
Fork 0
mirror of https://github.com/certd/certd.git synced 2026-07-10 23:27:34 +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
2026-07-07 00:12:46 +08:00
parent c78898e4c1 d3e4677ea4
commit 3ffd8946f8
6 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/certd-client/src/views/certd/pipeline/cert-upload/use.tsx
+1 -1
View File
@@ -207,7 +207,7 @@ export function useCertUpload() {
const { id } = await api.Save({ const { id } = await api.Save({
title: pipeline.title, title: pipeline.title,
content: JSON.stringify(pipeline), content: JSON.stringify(pipeline),
keepHistoryCount: 30, keepHistoryCount: 100,
type: "cert_upload", type: "cert_upload",
groupId: form.groupId, groupId: form.groupId,
}); });
packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx
+1 -1
View File
@@ -605,7 +605,7 @@ export function useCertPipelineCreator({ formWrapperRef }: { formWrapperRef: Ref
const { id } = await api.Save({ const { id } = await api.Save({
title: pipeline.title, title: pipeline.title,
content: JSON.stringify(pipeline), content: JSON.stringify(pipeline),
keepHistoryCount: 30, keepHistoryCount: 100,
type: "cert", type: "cert",
groupId, groupId,
addToMonitorEnabled: form.addToMonitorEnabled, addToMonitorEnabled: form.addToMonitorEnabled,
packages/ui/certd-client/src/views/certd/pipeline/template/use.tsx
+1 -1
View File
@@ -160,7 +160,7 @@ export async function createPipelineByTemplate(opts: { templateId: number; title
return await templateApi.CreatePipelineByTemplate({ return await templateApi.CreatePipelineByTemplate({
title, title,
content: JSON.stringify(pipeline), content: JSON.stringify(pipeline),
keepHistoryCount: keepHistoryCount ?? 30, keepHistoryCount: keepHistoryCount ?? 100,
groupId, groupId,
templateId, templateId,
}); });
packages/ui/certd-server/src/controller/user/mine/mine-controller.ts
+1 -4
View File
@@ -55,16 +55,13 @@ export class MineController extends BaseController {
//@ts-ignore //@ts-ignore
user.needInitPassword = needInitPassword; user.needInitPassword = needInitPassword;
const { projectId } = await this.getProjectUserIdRead();
const userProjectQuery = this.accessService.buildUserProjectQuery(userId, projectId);
const existingAccess = await this.accessService.findOne({ const existingAccess = await this.accessService.findOne({
where: { type: "acmeAccount", subtype: "letsencrypt", ...userProjectQuery }, where: { type: "acmeAccount", subtype: "letsencrypt", userId },
}); });
if (!existingAccess) { if (!existingAccess) {
//@ts-ignore //@ts-ignore
user.needInitAccount = true; user.needInitAccount = true;
} }
return this.ok(user); return this.ok(user);
} }
packages/ui/certd-server/src/modules/login/service/passkey-service.ts
+2 -2
View File
@@ -30,8 +30,8 @@ export class PasskeyService extends BaseService<PasskeyEntity> {
rpName = siteInfo.title || rpName; rpName = siteInfo.title || rpName;
} }
const rpId = ctx.hostname; const origin = ctx.headers.origin || ctx.origin;
const origin = ctx.origin; const rpId = origin ? new URL(origin).hostname : ctx.hostname;
return { return {
rpName, rpName,
packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+1 -1
View File
@@ -1376,7 +1376,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
bean.status = "none"; bean.status = "none";
bean.type = "cert_auto"; bean.type = "cert_auto";
bean.disabled = false; bean.disabled = false;
bean.keepHistoryCount = 30; bean.keepHistoryCount = 100;
bean.projectId = req.projectId; bean.projectId = req.projectId;
await this.save(bean); await this.save(bean);