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 c0079e2f..26a5cfd8 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 @@ -1,7 +1,8 @@ import { Config, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core'; -import { AppKey, getPlusInfo, PlusRequestService, verify } from '@certd/plus-core'; +import { AppKey, PlusRequestService, verify } from '@certd/plus-core'; import { logger } from '@certd/basic'; import { SysInstallInfo, SysLicenseInfo, SysSettingsService } from '../../settings/index.js'; + @Provide() @Scope(ScopeEnum.Singleton) export class PlusService { @@ -69,6 +70,18 @@ export class PlusService { }); } + async bindUrl(subjectId: string, url: string) { + const plusRequestService = await this.getPlusRequestService(); + return await plusRequestService.request({ + url: '/activation/subject/urlBind', + data: { + subjectId, + appKey: AppKey, + url, + }, + }); + } + async register() { const plusRequestService = await this.getPlusRequestService(); const licenseInfo: SysLicenseInfo = await this.sysSettingsService.getSetting(SysLicenseInfo); @@ -89,34 +102,4 @@ export class PlusService { } } } - - async bindUrl(subjectId: string, url: string) { - const plusRequestService = await this.getPlusRequestService(); - return await plusRequestService.request({ - url: '/activation/subject/urlBind', - data: { - subjectId, - appKey: AppKey, - url, - }, - }); - } - - async register() { - if (getPlusInfo().secret) { - return; - } - const plusRequestService = await this.getPlusRequestService(); - const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo); - const res = await plusRequestService.requestWithoutSign({ - url: '/activation/subject/register', - method: 'post', - data: { - appKey: AppKey, - subjectId: installInfo.siteId, - installTime: installInfo.installTime, - }, - }); - await this.updateLicense(res.license); - } } diff --git a/packages/ui/certd-client/vite.config.ts b/packages/ui/certd-client/vite.config.ts index 5cf79419..98434685 100644 --- a/packages/ui/certd-client/vite.config.ts +++ b/packages/ui/certd-client/vite.config.ts @@ -17,7 +17,6 @@ process.env.VITE_APP_BUILD_TIME = require("dayjs")().format("YYYY-M-D HH:mm:ss") import { theme } from "ant-design-vue"; import * as https from "node:https"; - const { defaultAlgorithm, defaultSeed } = theme; const mapToken = defaultAlgorithm(defaultSeed);