mirrors/certd
1
0
Fork 0
mirror of https://github.com/certd/certd.git synced 2025-11-25 09:10:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复某些情况下bindUrl失败的bug

Browse Source
This commit is contained in:
xiaojunnuo
2024-10-11 03:13:34 +08:00
parent 4244569211
commit 91fc1cd735
4 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/libs/lib-server/src/system/basic/service/plus-service.ts
View File

@@ -1,4 +1,4 @@
import { Config, Init, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
import { Config, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
import { AppKey, PlusRequestService, verify } from '@certd/pipeline';
import { logger } from '@certd/basic';
import { SysInstallInfo, SysLicenseInfo, SysSettingsService } from '../../settings/index.js';
@@ -11,26 +11,26 @@ export class PlusService {
@Config('plus.server.baseUrls')
plusServerBaseUrls: string[];
plusRequestService: PlusRequestService;
@Init()
async init() {
async getPlusRequestService() {
const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
this.plusRequestService = new PlusRequestService({
return new PlusRequestService({
plusServerBaseUrls: this.plusServerBaseUrls,
subjectId: installInfo.siteId,
});
}
async requestWithoutSign(config: any) {
return await this.plusRequestService.requestWithoutSign(config);
const plusRequestService = await this.getPlusRequestService();
return await plusRequestService.requestWithoutSign(config);
}
async request(config: any) {
return await this.plusRequestService.request(config);
const plusRequestService = await this.getPlusRequestService();
return await plusRequestService.request(config);
}
async active(formData: { code: any; appKey: string; subjectId: string }) {
return await this.plusRequestService.requestWithoutSign({
const plusRequestService = await this.getPlusRequestService();
return await plusRequestService.requestWithoutSign({
url: '/activation/active',
method: 'post',
data: formData,
@@ -55,16 +55,18 @@ export class PlusService {
const licenseInfo: SysLicenseInfo = await this.sysSettingsService.getSetting(SysLicenseInfo);
const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
const plusRequestService = await this.getPlusRequestService();
return await verify({
subjectId: installInfo.siteId,
license: licenseInfo.license,
plusRequestService: this.plusRequestService,
plusRequestService: plusRequestService,
bindUrl: installInfo?.bindUrl,
});
}
async bindUrl(subjectId: string, url: string) {
return await this.plusRequestService.request({
const plusRequestService = await this.getPlusRequestService();
return await plusRequestService.request({
url: '/activation/subject/urlBind',
data: {
subjectId,