chore: lib-server

2026-05-16 05:07:32 +08:00 · 2024-10-03 22:03:49 +08:00
parent a13203fb3f
commit a4e2cc54e6
101 changed files with 936 additions and 223 deletions
@@ -1,9 +1,9 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
-import { BaseController } from '../../basic/base-controller.js';
+import { BaseController } from '@certd/lib-server';
 import { PlusService } from '../basic/service/plus-service.js';
 import { AppKey } from '@certd/pipeline';
-import { SysSettingsService } from '../system/service/sys-settings-service.js';
-import { SysInstallInfo } from '../system/service/models.js';
+import { SysSettingsService } from '@certd/lib-server';
+import { SysInstallInfo } from '@certd/lib-server';

 export type PreBindUserReq = {
  userId: number;
@@ -1,5 +1,5 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { CrudController } from '../../../basic/crud-controller.js';
+import { CrudController } from '@certd/lib-server';
 import { PermissionService } from '../service/permission-service.js';

 /**
@@ -1,5 +1,5 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { CrudController } from '../../../basic/crud-controller.js';
+import { CrudController } from '@certd/lib-server';
 import { RoleService } from '../service/role-service.js';

 /**
@@ -1,9 +1,9 @@
 import { Provide, Controller, Post, Inject, Body, Query, ALL } from '@midwayjs/core';
 import { UserService } from '../service/user-service.js';
-import { CrudController } from '../../../basic/crud-controller.js';
+import { CrudController } from '@certd/lib-server';
 import { RoleService } from '../service/role-service.js';
 import { PermissionService } from '../service/permission-service.js';
-import { Constants } from '../../../basic/constants.js';
+import { Constants } from '@certd/lib-server';

 /**
 * 系统用户
@@ -1,4 +1,4 @@
-import { EnumItem } from '../../../basic/enum-item.js';
+import { EnumItem } from '@certd/lib-server';
 import * as _ from 'lodash-es';
 class ResourceTypes {
  MENU = new EnumItem('menu', '菜单', 'blue');
@@ -1,6 +1,6 @@
 import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { RoleService } from './role-service.js';
-import { BaseService } from '../../../basic/base-service.js';
+import { BaseService } from '@certd/lib-server';

 /**
 * 权限校验
@@ -1,7 +1,7 @@
 import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { Repository } from 'typeorm';
-import { BaseService } from '../../../basic/base-service.js';
+import { BaseService } from '@certd/lib-server';
 import { PermissionEntity } from '../entity/permission.js';

 /**
@@ -1,7 +1,7 @@
 import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { Repository } from 'typeorm';
-import { BaseService } from '../../../basic/base-service.js';
+import { BaseService } from '@certd/lib-server';
 import { RolePermissionEntity } from '../entity/role-permission.js';

 /**
@@ -1,7 +1,7 @@
 import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { In, Repository } from 'typeorm';
-import { BaseService } from '../../../basic/base-service.js';
+import { BaseService } from '@certd/lib-server';
 import { RoleEntity } from '../entity/role.js';
 import { UserRoleService } from './user-role-service.js';
 import { RolePermissionEntity } from '../entity/role-permission.js';
@@ -50,12 +50,7 @@ export class RoleService extends BaseService<RoleEntity> {
  async getPermissionByRoleIds(roleIds: any) {
    return await this.permissionService.repository
      .createQueryBuilder('permission')
-      .innerJoinAndSelect(
-        RolePermissionEntity,
-        'rp',
-        'rp.permissionId = permission.id and rp.roleId in (:...roleIds)',
-        { roleIds }
-      )
+      .innerJoinAndSelect(RolePermissionEntity, 'rp', 'rp.permissionId = permission.id and rp.roleId in (:...roleIds)', { roleIds })
      .getMany();
  }

@@ -119,9 +114,7 @@ export class RoleService extends BaseService<RoleEntity> {
    return permissionSet;
  }

-  async getCachedPermissionSetByRoleIds(
-    roleIds: number[]
-  ): Promise<Set<string>> {
+  async getCachedPermissionSetByRoleIds(roleIds: number[]): Promise<Set<string>> {
    const roleIdsKey = roleIds.join(',');
    let permissionSet = this.permissionCache.get(roleIdsKey);
    if (permissionSet) {
@@ -1,7 +1,7 @@
 import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { Repository } from 'typeorm';
-import { BaseService } from '../../../basic/base-service.js';
+import { BaseService } from '@certd/lib-server';
 import { UserRoleEntity } from '../entity/user-role.js';

 /**
@@ -16,6 +16,4 @@ export class UserRoleService extends BaseService<UserRoleEntity> {
  getRepository() {
    return this.repository;
  }
-
-
 }
@@ -4,16 +4,16 @@ import { Repository } from 'typeorm';
 import { UserEntity } from '../entity/user.js';
 import * as _ from 'lodash-es';
 import md5 from 'md5';
-import { CommonException } from '../../../basic/exception/common-exception.js';
-import { BaseService } from '../../../basic/base-service.js';
+import { CommonException } from '@certd/lib-server';
+import { BaseService } from '@certd/lib-server';
 import { RoleService } from './role-service.js';
 import { PermissionService } from './permission-service.js';
 import { UserRoleService } from './user-role-service.js';
-import { Constants } from '../../../basic/constants.js';
+import { Constants } from '@certd/lib-server';
 import { UserRoleEntity } from '../entity/user-role.js';
 import bcrypt from 'bcryptjs';
-import { SysSettingsService } from '../../system/service/sys-settings-service.js';
-import { SysInstallInfo } from '../../system/service/models.js';
+import { SysSettingsService } from '@certd/lib-server';
+import { SysInstallInfo } from '@certd/lib-server';
 import { RandomUtil } from '../../../utils/random.js';

 /**
@@ -1,12 +1,11 @@
 import { Autoload, Config, Init, Inject, Scope, ScopeEnum } from '@midwayjs/core';
-import { logger } from '../../utils/logger.js';
+import { logger } from '@certd/pipeline';
 import { UserService } from '../authority/service/user-service.js';
-import { SysSettingsService } from '../system/service/sys-settings-service.js';
+import { SysSettingsService } from '@certd/lib-server';
 import { nanoid } from 'nanoid';
-import { SysInstallInfo, SysPrivateSettings } from '../system/service/models.js';
+import { SysInstallInfo, SysPrivateSettings } from '@certd/lib-server';
 import crypto from 'crypto';
 import { PlusService } from '../basic/service/plus-service.js';
-import { isComm } from '@certd/plus-core';

 export type InstallInfo = {
  installTime: number;
@@ -58,15 +57,6 @@ export class AutoInitSite {
    // 授权许可
    await this.plusService.verify();

-    if (isComm()) {
-      //加载商业版代码
-      try {
-        await import('@certd/commercial-core');
-      } catch (e) {
-        logger.error('加载商业版代码失败，请尝试升级版本', e);
-      }
-    }
-
    logger.info('初始化站点完成');
  }

@@ -1,7 +1,7 @@
 import { Autoload, Config, Init, Inject, Scope, ScopeEnum } from '@midwayjs/core';
 import { PipelineService } from '../pipeline/service/pipeline-service.js';
-import { logger } from '../../utils/logger.js';
-import { SysSettingsService } from '../system/service/sys-settings-service.js';
+import { logger } from '@certd/pipeline';
+import { SysSettingsService } from '@certd/lib-server';

@Autoload()
@Scope(ScopeEnum.Singleton)
@@ -2,10 +2,10 @@ import { Rule, RuleType } from '@midwayjs/validate';
 import { ALL, Inject } from '@midwayjs/core';
 import { Body } from '@midwayjs/core';
 import { Controller, Post, Provide } from '@midwayjs/core';
-import { BaseController } from '../../../basic/base-controller.js';
+import { BaseController } from '@certd/lib-server';
 import { CodeService } from '../service/code-service.js';
 import { EmailService } from '../service/email-service.js';
-import { Constants } from '../../../basic/constants.js';
+import { Constants } from '@certd/lib-server';
 export class SmsCodeReq {
  @Rule(RuleType.number().required())
  phoneCode: number;
@@ -1,7 +1,7 @@
 import { Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
-import { BaseController } from '../../../basic/base-controller.js';
+import { BaseController } from '@certd/lib-server';
 import { EmailService } from '../service/email-service.js';
-import { Constants } from '../../../basic/constants.js';
+import { Constants } from '@certd/lib-server';

 /**
 */
@@ -1,7 +1,7 @@
 import { MidwayEnvironmentService } from '@midwayjs/core';
 import { Controller, Get, Inject, Provide } from '@midwayjs/core';
-import { logger } from '../../../utils/logger.js';
-import { Constants } from '../../../basic/constants.js';
+import { logger } from '@certd/pipeline';
+import { Constants } from '@certd/lib-server';

@Provide()
@Controller('/home')
@@ -1,8 +1,8 @@
 import { Config, Controller, Get, Inject, Provide } from '@midwayjs/core';
-import { BaseController } from '../../../basic/base-controller.js';
-import { Constants } from '../../../basic/constants.js';
-import { SysSettingsService } from '../../system/service/sys-settings-service.js';
-import { SysInstallInfo, SysPublicSettings, SysSiteInfo } from '../../system/service/models.js';
+import { BaseController } from '@certd/lib-server';
+import { Constants } from '@certd/lib-server';
+import { SysSettingsService } from '@certd/lib-server';
+import { SysInstallInfo, SysPublicSettings, SysSiteInfo } from '@certd/lib-server';
 import { AppKey } from '@certd/pipeline';

 /**
@@ -3,7 +3,7 @@ import type { EmailSend } from '@certd/pipeline';
 import { IEmailService, isPlus } from '@certd/pipeline';
 import nodemailer from 'nodemailer';
 import type SMTPConnection from 'nodemailer/lib/smtp-connection';
-import { logger } from '../../../utils/logger.js';
+import { logger } from '@certd/pipeline';
 import { UserSettingsService } from '../../mine/service/user-settings-service.js';
 import { PlusService } from './plus-service.js';

@@ -1,8 +1,8 @@
 import { Config, Init, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
-import { SysSettingsService } from '../../system/service/sys-settings-service.js';
-import { SysInstallInfo, SysLicenseInfo } from '../../system/service/models.js';
+import { SysSettingsService } from '@certd/lib-server';
+import { SysInstallInfo, SysLicenseInfo } from '@certd/lib-server';
 import { AppKey, http, PlusRequestService, verify } from '@certd/pipeline';
-import { logger } from '../../../utils/logger.js';
+import { logger } from '@certd/pipeline';

@Provide()
@Scope(ScopeEnum.Singleton)
@@ -1,14 +1,7 @@
-import {
-  Body,
-  Controller,
-  Inject,
-  Post,
-  Provide,
-  ALL,
-} from '@midwayjs/core';
+import { Body, Controller, Inject, Post, Provide, ALL } from '@midwayjs/core';
 import { LoginService } from '../service/login-service.js';
-import { BaseController } from '../../../basic/base-controller.js';
-import { Constants } from '../../../basic/constants.js';
+import { BaseController } from '@certd/lib-server';
+import { Constants } from '@certd/lib-server';

 /**
 */
@@ -20,7 +13,7 @@ export class LoginController extends BaseController {
  @Post('/login', { summary: Constants.per.guest })
  public async login(
    @Body(ALL)
-    user
+    user: any
  ) {
    const token = await this.loginService.login(user);

@@ -1,16 +1,9 @@
-import {
-  ALL,
-  Body,
-  Controller,
-  Inject,
-  Post,
-  Provide,
-} from '@midwayjs/core';
-import { BaseController } from '../../../basic/base-controller.js';
-import { Constants } from '../../../basic/constants.js';
+import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
+import { BaseController } from '@certd/lib-server';
+import { Constants } from '@certd/lib-server';
 import { UserService } from '../../authority/service/user-service.js';
 import { UserEntity } from '../../authority/entity/user.js';
-import { SysSettingsService } from '../../system/service/sys-settings-service.js';
+import { SysSettingsService } from '@certd/lib-server';

 /**
 */
@@ -1,11 +1,11 @@
 import { Config, Inject, Provide } from '@midwayjs/core';
 import { UserService } from '../../authority/service/user-service.js';
 import jwt from 'jsonwebtoken';
-import { CommonException } from '../../../basic/exception/common-exception.js';
+import { CommonException } from '@certd/lib-server';
 import { RoleService } from '../../authority/service/role-service.js';
 import { UserEntity } from '../../authority/entity/user.js';
-import { SysSettingsService } from '../../system/service/sys-settings-service.js';
-import { SysPrivateSettings } from '../../system/service/models.js';
+import { SysSettingsService } from '@certd/lib-server';
+import { SysPrivateSettings } from '@certd/lib-server';

 /**
 * 系统用户
@@ -1,6 +1,6 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
-import { BaseController } from '../../../basic/base-controller.js';
-import { Constants } from '../../../basic/constants.js';
+import { BaseController } from '@certd/lib-server';
+import { Constants } from '@certd/lib-server';
 import { UserService } from '../../authority/service/user-service.js';
 import { getPlusInfo } from '@certd/pipeline';
 import { RoleService } from '../../authority/service/role-service.js';
@@ -7,8 +7,8 @@ import {
  Provide,
  Query,
 } from '@midwayjs/core';
-import { CrudController } from '../../../basic/crud-controller.js';
-import { Constants } from '../../../basic/constants.js';
+import { CrudController } from '@certd/lib-server';
+import { Constants } from '@certd/lib-server';
 import { UserSettingsService } from '../service/user-settings-service.js';
 import { UserSettingsEntity } from '../entity/user-settings.js';

@@ -1,7 +1,7 @@
 import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { Repository } from 'typeorm';
-import { BaseService } from '../../../basic/base-service.js';
+import { BaseService } from '@certd/lib-server';
 import { UserSettingsEntity } from '../entity/user-settings.js';

 /**
@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { CrudController } from '../../../basic/crud-controller.js';
+import { CrudController } from '@certd/lib-server';
 import { AccessService } from '../service/access-service.js';
-import { Constants } from '../../../basic/constants.js';
+import { Constants } from '@certd/lib-server';

 /**
 * 授权
@@ -12,7 +12,7 @@ export class AccessController extends CrudController<AccessService> {
  @Inject()
  service: AccessService;

-  getService() {
+  getService(): AccessService {
    return this.service;
  }

@@ -1,7 +1,7 @@
 import { ALL, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { DnsProviderService } from '../service/dns-provider-service.js';
-import { BaseController } from '../../../basic/base-controller.js';
-import { Constants } from '../../../basic/constants.js';
+import { BaseController } from '@certd/lib-server';
+import { Constants } from '@certd/lib-server';

 /**
 * 插件
@@ -1,5 +1,5 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
-import { Constants } from '../../../basic/constants.js';
+import { Constants } from '@certd/lib-server';
 import {
  AccessRequestHandleReq,
  http,
@@ -12,7 +12,7 @@ import {
  TaskInstanceContext,
  utils,
 } from '@certd/pipeline';
-import { BaseController } from '../../../basic/base-controller.js';
+import { BaseController } from '@certd/lib-server';
 import { AccessService } from '../service/access-service.js';
 import { EmailService } from '../../basic/service/email-service.js';

@@ -1,18 +1,15 @@
 import { ALL, Body, Controller, Get, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { CrudController } from '../../../basic/crud-controller.js';
+import { CommonException, Constants, CrudController, PermissionException } from '@certd/lib-server';
 import { PipelineEntity } from '../entity/pipeline.js';
 import { HistoryService } from '../service/history-service.js';
 import { HistoryLogService } from '../service/history-log-service.js';
 import { HistoryEntity } from '../entity/history.js';
 import { HistoryLogEntity } from '../entity/history-log.js';
-import { Constants } from '../../../basic/constants.js';
 import { PipelineService } from '../service/pipeline-service.js';
-import { CommonException } from '../../../basic/exception/common-exception.js';
-import { PermissionException } from '../../../basic/exception/permission-exception.js';
 import * as fs from 'fs';
-import { logger } from '../../../utils/logger.js';
+import { logger } from '@certd/pipeline';
 import { AuthService } from '../../authority/service/auth-service.js';
-import { SysSettingsService } from '../../system/service/sys-settings-service.js';
+import { SysSettingsService } from '@certd/lib-server';

 /**
 * 证书
@@ -33,7 +30,7 @@ export class HistoryController extends CrudController<HistoryService> {
  @Inject()
  sysSettingsService: SysSettingsService;

-  getService() {
+  getService(): HistoryService {
    return this.service;
  }

@@ -1,11 +1,11 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { CrudController } from '../../../basic/crud-controller.js';
+import { CrudController } from '@certd/lib-server';
 import { PipelineService } from '../service/pipeline-service.js';
 import { PipelineEntity } from '../entity/pipeline.js';
-import { Constants } from '../../../basic/constants.js';
+import { Constants } from '@certd/lib-server';
 import { HistoryService } from '../service/history-service.js';
 import { AuthService } from '../../authority/service/auth-service.js';
-import { SysSettingsService } from '../../system/service/sys-settings-service.js';
+import { SysSettingsService } from '@certd/lib-server';

 /**
 * 证书
@@ -1,7 +1,7 @@
 import { ALL, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { BaseController } from '../../../basic/base-controller.js';
+import { BaseController } from '@certd/lib-server';
 import { PluginService } from '../service/plugin-service.js';
-import { Constants } from '../../../basic/constants.js';
+import { Constants } from '@certd/lib-server';

 /**
 * 插件
@@ -1,11 +1,11 @@
 import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { Repository } from 'typeorm';
-import { BaseService } from '../../../basic/base-service.js';
+import { BaseService } from '@certd/lib-server';
 import { AccessEntity } from '../entity/access.js';
 import { AccessDefine, accessRegistry, IAccessService, newAccess } from '@certd/pipeline';
 import { EncryptService } from './encrypt-service.js';
-import { ValidateException } from '../../../basic/exception/validation-exception.js';
+import { ValidateException } from '@certd/lib-server';

 /**
 * 授权
@@ -1,7 +1,7 @@
 import { Init, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import crypto from 'crypto';
-import { SysSettingsService } from '../../system/service/sys-settings-service.js';
-import { SysPrivateSettings } from '../../system/service/models.js';
+import { SysSettingsService } from '@certd/lib-server';
+import { SysPrivateSettings } from '@certd/lib-server';

 /**
 * 授权
@@ -1,7 +1,7 @@
 import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { In, Repository } from 'typeorm';
-import { BaseService } from '../../../basic/base-service.js';
+import { BaseService } from '@certd/lib-server';
 import { HistoryLogEntity } from '../entity/history-log.js';

 /**
@@ -1,14 +1,14 @@
 import { Config, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { In, Repository } from 'typeorm';
-import { BaseService } from '../../../basic/base-service.js';
+import { BaseService } from '@certd/lib-server';
 import { HistoryEntity } from '../entity/history.js';
 import { PipelineEntity } from '../entity/pipeline.js';
 import { HistoryDetail } from '../entity/vo/history-detail.js';
 import { HistoryLogService } from './history-log-service.js';
 import { FileItem, Pipeline, RunnableCollection } from '@certd/pipeline';
 import { FileStore } from '@certd/pipeline';
-import { logger } from '../../../utils/logger.js';
+import { logger } from '@certd/pipeline';

 /**
 * 证书申请
@@ -1,7 +1,7 @@
 import { Config, Inject, Provide, Scope, ScopeEnum, sleep } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { In, Repository } from 'typeorm';
-import { BaseService } from '../../../basic/base-service.js';
+import { BaseService } from '@certd/lib-server';
 import { PipelineEntity } from '../entity/pipeline.js';
 import { PipelineDetail } from '../entity/vo/pipeline-detail.js';
 import { Executor, isPlus, Pipeline, ResultType, RunHistory, UserInfo } from '@certd/pipeline';
@@ -13,9 +13,9 @@ import { HistoryService } from './history-service.js';
 import { HistoryEntity } from '../entity/history.js';
 import { HistoryLogEntity } from '../entity/history-log.js';
 import { HistoryLogService } from './history-log-service.js';
-import { logger } from '../../../utils/logger.js';
+import { logger } from '@certd/pipeline';
 import { EmailService } from '../../basic/service/email-service.js';
-import { NeedVIPException } from '../../../basic/exception/vip-exception.js';
+import { NeedVIPException } from '@certd/lib-server';
 import { UserService } from '../../authority/service/user-service.js';

 const runningTasks: Map<string | number, Executor> = new Map();
@@ -1,7 +1,7 @@
 import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { In, Repository } from 'typeorm';
-import { BaseService } from '../../../basic/base-service.js';
+import { BaseService } from '@certd/lib-server';
 import { StorageEntity } from '../entity/storage.js';

 /**
@@ -1,9 +1,9 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
-import { SysSettingsService } from '../service/sys-settings-service.js';
-import { BaseController } from '../../../basic/base-controller.js';
+import { SysSettingsService } from '@certd/lib-server';
+import { BaseController } from '@certd/lib-server';
 import { AppKey } from '@certd/pipeline';
-import { SysInstallInfo } from '../service/models.js';
-import { logger } from '../../../utils/logger.js';
+import { SysInstallInfo } from '@certd/lib-server';
+import { logger } from '@certd/pipeline';
 import { PlusService } from '../../basic/service/plus-service.js';

 /**
@@ -0,0 +1,55 @@
+import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
+import { SysSettingsService } from '@certd/lib-server';
+import { BaseController } from '@certd/lib-server';
+import { AppKey } from '@certd/pipeline';
+import { SysInstallInfo } from '@certd/lib-server';
+import { logger } from '@certd/pipeline';
+import { PlusService } from '../../basic/service/plus-service.js';
+
+/**
+ */
+@Provide()
+@Controller('/api/sys/site')
+export class SysPlusController extends BaseController {
+  @Inject()
+  sysSettingsService: SysSettingsService;
+
+  @Inject()
+  plusService: PlusService;
+
+  @Post('/active', { summary: 'sys:settings:edit' })
+  async active(@Body(ALL) body) {
+    const { code } = body;
+    const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
+    const siteId = installInfo.siteId;
+    const formData = {
+      appKey: AppKey,
+      code,
+      subjectId: siteId,
+    };
+
+    const res: any = await this.plusService.active(formData);
+
+    if (res.code > 0) {
+      logger.error('激活失败', res.message);
+      return this.fail(res.message, 1);
+    }
+    const license = res.data.license;
+
+    await this.plusService.updateLicense(license);
+
+    return this.ok(true);
+  }
+  @Post('/bindUrl', { summary: 'sys:settings:edit' })
+  async bindUrl(@Body(ALL) body: { url: string }) {
+    const { url } = body;
+
+    const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
+    await this.plusService.bindUrl(installInfo.siteId, url);
+
+    installInfo.bindUrl = url;
+    await this.sysSettingsService.saveSetting(installInfo);
+
+    return this.ok(true);
+  }
+}
@@ -1,8 +1,8 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { CrudController } from '../../../basic/crud-controller.js';
-import { SysSettingsService } from '../service/sys-settings-service.js';
+import { CrudController } from '@certd/lib-server';
+import { SysSettingsService } from '@certd/lib-server';
 import { SysSettingsEntity } from '../entity/sys-settings.js';
-import { SysPublicSettings } from '../service/models.js';
+import { SysPublicSettings } from '@certd/lib-server';
 import * as _ from 'lodash-es';
 import { PipelineService } from '../../pipeline/service/pipeline-service.js';

@@ -1,54 +0,0 @@
-export class BaseSettings {
-  static __key__: string;
-  static __title__: string;
-  static __access__ = 'private';
-
-  static getCacheKey() {
-    return 'settings.' + this.__key__;
-  }
-}
-export class SysPublicSettings extends BaseSettings {
-  static __key__ = 'sys.public';
-  static __title__ = '系统公共设置';
-  static __access__ = 'public';
-  registerEnabled = false;
-  managerOtherUserPipeline = false;
-  // triggerOnStartup = false;
-}
-
-export class SysPrivateSettings extends BaseSettings {
-  static __title__ = '系统私有设置';
-  static __access__ = 'private';
-  static __key__ = 'sys.private';
-  jwtKey?: string;
-  encryptSecret?: string;
-}
-
-export class SysInstallInfo extends BaseSettings {
-  static __title__ = '系统安装信息';
-  static __key__ = 'sys.install';
-  static __access__ = 'private';
-  installTime: number;
-  siteId?: string;
-  bindUserId?: number;
-  bindUrl?: string;
-  accountServerBaseUrl?: string;
-  appKey?: string;
-}
-
-export class SysLicenseInfo extends BaseSettings {
-  static __title__ = '授权许可信息';
-  static __key__ = 'sys.license';
-  static __access__ = 'private';
-  license?: string;
-}
-
-export class SysSiteInfo extends BaseSettings {
-  static __title__ = '站点信息';
-  static __key__ = 'sys.site';
-  static __access__ = 'public';
-  TITLE?: string;
-  SLOGAN?: string;
-  LOGO?: string;
-  ICP_NO?: string;
-}
@@ -1,131 +0,0 @@
-import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
-import { InjectEntityModel } from '@midwayjs/typeorm';
-import { Repository } from 'typeorm';
-import { BaseService } from '../../../basic/base-service.js';
-import { SysSettingsEntity } from '../entity/sys-settings.js';
-import { CacheManager } from '@midwayjs/cache';
-import { BaseSettings, SysPublicSettings } from './models.js';
-import * as _ from 'lodash-es';
-
-export type SysPrivateSettings = NonNullable<unknown>;
-
-/**
- * 设置
- */
-@Provide()
-@Scope(ScopeEnum.Singleton)
-export class SysSettingsService extends BaseService<SysSettingsEntity> {
-  @InjectEntityModel(SysSettingsEntity)
-  repository: Repository<SysSettingsEntity>;
-
-  @Inject()
-  cache: CacheManager; // 依赖注入CacheManager
-
-  getRepository() {
-    return this.repository;
-  }
-
-  async getById(id: any): Promise<SysSettingsEntity | null> {
-    const entity = await this.info(id);
-    if (!entity) {
-      return null;
-    }
-    const setting = JSON.parse(entity.setting);
-    return {
-      id: entity.id,
-      ...setting,
-    };
-  }
-
-  async getByKey(key: string): Promise<SysSettingsEntity | null> {
-    if (!key) {
-      return null;
-    }
-    return await this.repository.findOne({
-      where: {
-        key,
-      },
-    });
-  }
-
-  async getSettingByKey(key: string): Promise<any | null> {
-    const entity = await this.getByKey(key);
-    if (!entity) {
-      return null;
-    }
-    return JSON.parse(entity.setting);
-  }
-
-  async save(bean: SysSettingsEntity) {
-    const entity = await this.repository.findOne({
-      where: {
-        key: bean.key,
-      },
-    });
-    if (entity) {
-      entity.setting = bean.setting;
-      await this.repository.save(entity);
-    } else {
-      bean.title = bean.key;
-      await this.repository.save(bean);
-    }
-  }
-
-  async getSetting<T>(type: any): Promise<T> {
-    const key = type.__key__;
-    const cacheKey = type.getCacheKey();
-    const settings: T = await this.cache.get(cacheKey);
-    if (settings) {
-      return settings;
-    }
-    let newSetting: T = new type();
-    const savedSettings = await this.getSettingByKey(key);
-    newSetting = _.merge(newSetting, savedSettings);
-    await this.cache.set(cacheKey, newSetting);
-    return newSetting;
-  }
-
-  async saveSetting<T extends BaseSettings>(bean: T) {
-    const type: any = bean.constructor;
-    const key = type.__key__;
-    const cacheKey = type.getCacheKey();
-
-    const entity = await this.getByKey(key);
-    if (entity) {
-      entity.setting = JSON.stringify(bean);
-      await this.repository.save(entity);
-    } else {
-      const newEntity = new SysSettingsEntity();
-      newEntity.key = key;
-      newEntity.title = type.__title__;
-      newEntity.setting = JSON.stringify(bean);
-      newEntity.access = type.__access__;
-      await this.repository.save(newEntity);
-    }
-
-    await this.cache.set(cacheKey, bean);
-  }
-
-  async getPublicSettings(): Promise<SysPublicSettings> {
-    return await this.getSetting(SysPublicSettings);
-  }
-
-  async savePublicSettings(bean: SysPublicSettings) {
-    await this.saveSetting(bean);
-  }
-
-  async savePrivateSettings(bean: SysPrivateSettings) {
-    this.saveSetting(bean);
-  }
-
-  async updateByKey(key: string, setting: any) {
-    const entity = await this.getByKey(key);
-    if (entity) {
-      entity.setting = JSON.stringify(setting);
-      await this.repository.save(entity);
-    } else {
-      throw new Error('该设置不存在');
-    }
-    await this.cache.del(`settings.${key}`);
-  }
-}