@certd/lib-server 1.40.5 → 1.41.0

package/dist/basic/base-controller.d.ts

@@ -52,3 +52,4 @@ export declare abstract class BaseController {
         userId: any;
     }>;
 }
+//# sourceMappingURL=base-controller.d.ts.map

package/dist/basic/base-controller.js

@@ -61,7 +61,7 @@ export class BaseController {
     }
     async getProjectId(permission) {
         if (!isEnterprise()) {
-            return null;
+            return undefined;
         }
         let projectIdStr = this.ctx.headers["project-id"];
         if (!projectIdStr) {

package/dist/basic/base-service.d.ts

@@ -1,4 +1,4 @@
-import { FindOneOptions, Repository, SelectQueryBuilder } from 'typeorm';
+import { EntityTarget, FindOneOptions, Repository, SelectQueryBuilder } from 'typeorm';
 import { TypeORMDataSourceManager } from '@midwayjs/typeorm';
 import { EntityManager } from 'typeorm/entity-manager/EntityManager.js';
 import { FindManyOptions } from 'typeorm';
@@ -17,6 +17,9 @@ export type ListReq<T = any> = {
     buildQuery?: (bq: SelectQueryBuilder<any>) => void;
     select?: any;
 };
+export type ServiceContext = {
+    manager?: EntityManager;
+};
 /**
  * 服务基类
  */
@@ -24,6 +27,16 @@ export declare abstract class BaseService<T> {
     dataSourceManager: TypeORMDataSourceManager;
     abstract getRepository(): Repository<T>;
     transaction(callback: (entityManager: EntityManager) => Promise<any>): Promise<unknown>;
+    /**
+     * 如果 ctx 有 manager 则复用已有事务，否则开启新事务
+     */
+    protected transactionWithCtx<T>(ctx: ServiceContext, callback: (manager: EntityManager) => Promise<T>): Promise<T>;
+    protected getRepo<E>(ctx: ServiceContext, entity: EntityTarget<E>): Repository<E>;
+    protected buildUserProjectQuery(userId: number, projectId?: number): {
+        [key: string]: any;
+        userId: number;
+        projectId?: number;
+    };
     /**
      * 获得单个ID
      * @param id ID
@@ -89,3 +102,4 @@ export declare abstract class BaseService<T> {
     findOne(options: FindOneOptions<T>): Promise<T>;
 }
 export declare function checkUserProjectParam(userId: number, projectId: number): boolean;
+//# sourceMappingURL=base-service.d.ts.map

package/dist/basic/base-service.js

@@ -21,6 +21,31 @@ export class BaseService {
         const dataSource = this.dataSourceManager.getDataSource('default');
         return await dataSource.transaction(callback);
     }
+    /**
+     * 如果 ctx 有 manager 则复用已有事务，否则开启新事务
+     */
+    async transactionWithCtx(ctx, callback) {
+        if (ctx.manager) {
+            return await callback(ctx.manager);
+        }
+        return (await this.transaction(callback));
+    }
+    getRepo(ctx, entity) {
+        if (ctx.manager) {
+            return ctx.manager.getRepository(entity);
+        }
+        const dataSource = this.dataSourceManager.getDataSource('default');
+        return dataSource.getRepository(entity);
+    }
+    buildUserProjectQuery(userId, projectId) {
+        const query = {
+            userId,
+        };
+        if (projectId != null) {
+            query.projectId = projectId;
+        }
+        return query;
+    }
     /**
      * 获得单个ID
      * @param id ID
@@ -224,12 +249,12 @@ export class BaseService {
     async batchDelete(ids, userId, projectId) {
         ids = this.filterIds(ids);
         if (userId != null) {
+            const userProjectQuery = this.buildUserProjectQuery(userId, projectId);
             const list = await this.getRepository().find({
                 where: {
                     // @ts-ignore
                     id: In(ids),
-                    userId,
-                    projectId,
+                    ...userProjectQuery,
                 },
             });
             // @ts-ignore

package/dist/basic/constants.d.ts

@@ -6,6 +6,7 @@ export declare const Constants: {
     per: {
         guest: string;
         anonymous: string;
+        guestOptionalAuth: string;
         authOnly: string;
         loginOnly: string;
         open: string;
@@ -115,3 +116,4 @@ export declare const Constants: {
     systemUserId: number;
     enterpriseUserId: number;
 };
+//# sourceMappingURL=constants.d.ts.map

package/dist/basic/constants.js

@@ -8,6 +8,8 @@ export const Constants = {
         guest: '_guest_',
         //无需登录
         anonymous: '_guest_',
+        //无需登录，有 token 时解析当前用户
+        guestOptionalAuth: '_guestOptionalAuth_',
         //仅需要登录
         authOnly: '_authOnly_',
         //仅需要登录

package/dist/basic/crud-controller.d.ts

@@ -37,3 +37,4 @@ export declare abstract class CrudController<T> extends BaseController {
         message: string;
     }>;
 }
+//# sourceMappingURL=crud-controller.d.ts.map

package/dist/basic/enum-item.d.ts

@@ -4,3 +4,4 @@ export declare class EnumItem {
     color: string;
     constructor(value: any, label: any, color: any);
 }
+//# sourceMappingURL=enum-item.d.ts.map

package/dist/basic/exception/auth-exception.d.ts

@@ -9,3 +9,4 @@ export declare class AuthException extends BaseException {
 export declare class Need2FAException extends TextException {
     constructor(message: string, data: any);
 }
+//# sourceMappingURL=auth-exception.d.ts.map

package/dist/basic/exception/base-exception.d.ts

@@ -6,3 +6,4 @@ export declare class BaseException extends Error {
     data?: any;
     constructor(name: string, code: number, message: string, data?: any);
 }
+//# sourceMappingURL=base-exception.d.ts.map

package/dist/basic/exception/code-error-exception.d.ts

@@ -5,3 +5,4 @@ import { BaseException } from './base-exception.js';
 export declare class CodeErrorException extends BaseException {
     constructor(message: any);
 }
+//# sourceMappingURL=code-error-exception.d.ts.map

package/dist/basic/exception/common-exception.d.ts

@@ -15,3 +15,4 @@ export declare class CodeException extends BaseException {
 export declare class TextException extends BaseException {
     constructor(name: any, code: any, message: any, data?: any);
 }
+//# sourceMappingURL=common-exception.d.ts.map

package/dist/basic/exception/index.d.ts

@@ -10,3 +10,4 @@ export * from './param-exception.js';
 export * from './site-off-exception.js';
 export * from './login-error-exception.js';
 export * from './code-error-exception.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/basic/exception/login-error-exception.d.ts

@@ -6,3 +6,4 @@ export declare class LoginErrorException extends BaseException {
     leftCount: number;
     constructor(message: any, leftCount: number);
 }
+//# sourceMappingURL=login-error-exception.d.ts.map

package/dist/basic/exception/not-found-exception.d.ts

@@ -5,3 +5,4 @@ import { BaseException } from './base-exception.js';
 export declare class NotFoundException extends BaseException {
     constructor(message: any);
 }
+//# sourceMappingURL=not-found-exception.d.ts.map

package/dist/basic/exception/param-exception.d.ts

@@ -5,3 +5,4 @@ import { BaseException } from './base-exception.js';
 export declare class ParamException extends BaseException {
     constructor(message: any);
 }
+//# sourceMappingURL=param-exception.d.ts.map

package/dist/basic/exception/permission-exception.d.ts

@@ -5,3 +5,4 @@ import { BaseException } from './base-exception.js';
 export declare class PermissionException extends BaseException {
     constructor(message?: string);
 }
+//# sourceMappingURL=permission-exception.d.ts.map

package/dist/basic/exception/preview-exception.d.ts

@@ -5,3 +5,4 @@ import { BaseException } from './base-exception.js';
 export declare class PreviewException extends BaseException {
     constructor(message: any);
 }
+//# sourceMappingURL=preview-exception.d.ts.map

package/dist/basic/exception/site-off-exception.d.ts

@@ -4,3 +4,4 @@ import { BaseException } from './base-exception.js';
 export declare class SiteOffException extends BaseException {
     constructor(message: any);
 }
+//# sourceMappingURL=site-off-exception.d.ts.map

package/dist/basic/exception/validation-exception.d.ts

@@ -5,3 +5,4 @@ import { BaseException } from './base-exception.js';
 export declare class ValidateException extends BaseException {
     constructor(message: any);
 }
+//# sourceMappingURL=validation-exception.d.ts.map

package/dist/basic/exception/vip-exception.d.ts

@@ -8,3 +8,4 @@ export declare class NeedVIPException extends BaseException {
 export declare class NeedSuiteException extends BaseException {
     constructor(message: any);
 }
+//# sourceMappingURL=vip-exception.d.ts.map

package/dist/basic/index.d.ts

@@ -6,3 +6,4 @@ export * from './exception/index.js';
 export * from './result.js';
 export * from './base-service.js';
 export * from "./mode.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/basic/mode.d.ts

@@ -1,3 +1,4 @@
 export declare function setAdminMode(mode?: string): void;
 export declare function getAdminMode(): string;
 export declare function isEnterprise(): boolean;
+//# sourceMappingURL=mode.d.ts.map

package/dist/basic/result.d.ts

@@ -6,3 +6,4 @@ export declare class Result<T> {
     static error(code: number, message: any, data?: any): Result<unknown>;
     static success(message: any, data?: any): Result<unknown>;
 }
+//# sourceMappingURL=result.d.ts.map

package/dist/configuration.d.ts

@@ -2,3 +2,4 @@ import type { IMidwayContainer } from '@midwayjs/core';
 export declare class LibServerConfiguration {
     onReady(container: IMidwayContainer): Promise<void>;
 }
+//# sourceMappingURL=configuration.d.ts.map

package/dist/index.d.ts

@@ -6,3 +6,4 @@ export * from './system/index.js';
 export * from './user/index.js';
 export { LibServerConfiguration as Configuration } from './configuration.js';
 export declare const libServerEntities: (typeof SysSettingsEntity | typeof AccessEntity | typeof AddonEntity)[];
+//# sourceMappingURL=index.d.ts.map

package/dist/system/basic/index.d.ts

@@ -3,3 +3,4 @@ export * from './service/file-service.js';
 export * from './service/encryptor.js';
 export * from './service/ocr-service.js';
 export * from './service/executor-queue.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/system/basic/service/encryptor.d.ts

@@ -4,3 +4,4 @@ export declare class Encryptor {
     encrypt(text: string): string;
     decrypt(encryptedText: string): string;
 }
+//# sourceMappingURL=encryptor.d.ts.map

package/dist/system/basic/service/executor-queue.d.ts

@@ -21,3 +21,4 @@ export declare class ExecutorQueue {
     addTask(userId: number, task: TaskItem): void;
 }
 export declare const executorQueue: ExecutorQueue;
+//# sourceMappingURL=executor-queue.d.ts.map

package/dist/system/basic/service/file-service.d.ts

@@ -7,5 +7,6 @@ export declare const uploadTmpFileCacheKey = "tmpfile_key_";
  */
 export declare class FileService {
     saveFile(userId: number, tmpCacheKey: any, permission: 'public' | 'private'): Promise<any>;
-    getFile(key: string, userId?: number): string;
+    getFile(key: string, userId?: number, allowAnyPrivateUser?: boolean): string;
 }
+//# sourceMappingURL=file-service.d.ts.map

package/dist/system/basic/service/file-service.js

@@ -54,7 +54,7 @@ let FileService = class FileService {
         }
         return key;
     }
-    getFile(key, userId) {
+    getFile(key, userId, allowAnyPrivateUser = false) {
         if (!key) {
             throw new ParamException('参数错误');
         }
@@ -68,7 +68,7 @@ let FileService = class FileService {
         const keyArr = key.split('/');
         const permission = keyArr[1];
         const userIdMd5 = keyArr[2];
-        if (permission !== 'public') {
+        if (permission !== 'public' && !allowAnyPrivateUser) {
             //非公开文件需要验证用户
             const userIdStr = Buffer.from(Buffer.from(userIdMd5, 'hex').toString('base64')).toString();
             const userIdInt = parseInt(userIdStr, 10);

package/dist/system/basic/service/ocr-service.d.ts

@@ -10,3 +10,4 @@ export declare class OcrService implements IOcrService {
         texts: string[];
     }>;
 }
+//# sourceMappingURL=ocr-service.d.ts.map

package/dist/system/basic/service/plus-service.d.ts

@@ -20,3 +20,4 @@ export declare class PlusService {
     getTodayOrderCount(): Promise<any>;
     requestWithToken(config: HttpRequestConfig): Promise<any>;
 }
+//# sourceMappingURL=plus-service.d.ts.map

package/dist/system/index.d.ts

@@ -1,2 +1,3 @@
 export * from './settings/index.js';
 export * from './basic/index.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/system/settings/entity/sys-settings.d.ts

@@ -9,3 +9,4 @@ export declare class SysSettingsEntity {
     createTime: Date;
     updateTime: Date;
 }
+//# sourceMappingURL=sys-settings.d.ts.map

package/dist/system/settings/index.d.ts

@@ -1,3 +1,4 @@
 export * from './service/sys-settings-service.js';
 export * from './service/models.js';
 export * from './entity/sys-settings.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/system/settings/service/models.d.ts

@@ -200,3 +200,4 @@ export declare class SysSafeSetting extends BaseSettings {
     static __access__: string;
     hidden: SiteHidden;
 }
+//# sourceMappingURL=models.d.ts.map

package/dist/system/settings/service/sys-settings-service.d.ts

@@ -27,3 +27,4 @@ export declare class SysSettingsService extends BaseService<SysSettingsEntity> {
     backupSecret(): Promise<void>;
     getSecret(): Promise<SysSecret>;
 }
+//# sourceMappingURL=sys-settings-service.d.ts.map

package/dist/user/access/entity/access.d.ts

@@ -7,9 +7,11 @@ export declare class AccessEntity {
     userId: number;
     name: string;
     type: string;
+    subtype: string;
     setting: string;
     encryptSetting: string;
     projectId: number;
     createTime: Date;
     updateTime: Date;
 }
+//# sourceMappingURL=access.d.ts.map

package/dist/user/access/entity/access.js

@@ -17,6 +17,7 @@ let AccessEntity = class AccessEntity {
     userId; // 0为系统级别, -1为企业，大于1为用户
     name;
     type;
+    subtype;
     setting;
     encryptSetting;
     projectId;
@@ -43,6 +44,10 @@ __decorate([
     Column({ comment: '类型', length: 100 }),
     __metadata("design:type", String)
 ], AccessEntity.prototype, "type", void 0);
+__decorate([
+    Column({ name: 'subtype', comment: '子类型', length: 100, nullable: true }),
+    __metadata("design:type", String)
+], AccessEntity.prototype, "subtype", void 0);
 __decorate([
     Column({ name: 'setting', comment: '设置', length: 10240, nullable: true }),
     __metadata("design:type", String)

package/dist/user/access/index.d.ts

@@ -3,3 +3,4 @@ export * from './service/access-service.js';
 export * from './service/access-sys-getter.js';
 export * from './service/access-getter.js';
 export * from './service/encrypt-service.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/user/access/service/access-getter.d.ts

@@ -1,4 +1,4 @@
-import { IAccessService } from '@certd/pipeline';
+import { IAccessService } from "@certd/pipeline";
 export declare class AccessGetter implements IAccessService {
     userId: number;
     projectId?: number;
@@ -7,3 +7,4 @@ export declare class AccessGetter implements IAccessService {
     getById<T = any>(id: any): Promise<T>;
     getCommonById<T = any>(id: any): Promise<T>;
 }
+//# sourceMappingURL=access-getter.d.ts.map

package/dist/user/access/service/access-service.d.ts

@@ -1,7 +1,7 @@
 import { Repository } from "typeorm";
-import { BaseService, PageReq } from '../../../index.js';
-import { AccessEntity } from '../entity/access.js';
-import { EncryptService } from './encrypt-service.js';
+import { BaseService, PageReq } from "../../../index.js";
+import { AccessEntity } from "../entity/access.js";
+import { EncryptService } from "./encrypt-service.js";
 /**
  * 授权
  */
@@ -28,6 +28,8 @@ export declare class AccessService extends BaseService<AccessEntity> {
     getSimpleInfo(id: number): Promise<{
         id: number;
         name: string;
+        type: string;
+        subtype: string;
         userId: number;
         projectId: number;
     }>;
@@ -52,3 +54,4 @@ export declare class AccessService extends BaseService<AccessEntity> {
      */
     copyTo(accessId: number, projectId?: number): Promise<any>;
 }
+//# sourceMappingURL=access-service.d.ts.map

package/dist/user/access/service/access-service.js

@@ -7,14 +7,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
-import { InjectEntityModel } from '@midwayjs/typeorm';
+import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
+import { InjectEntityModel } from "@midwayjs/typeorm";
 import { In, Repository } from "typeorm";
-import { AccessGetter, BaseService, PermissionException, ValidateException } from '../../../index.js';
-import { AccessEntity } from '../entity/access.js';
-import { accessRegistry, newAccess } from '@certd/pipeline';
-import { EncryptService } from './encrypt-service.js';
-import { logger, utils } from '@certd/basic';
+import { AccessGetter, BaseService, PermissionException, ValidateException } from "../../../index.js";
+import { AccessEntity } from "../entity/access.js";
+import { accessRegistry, newAccess } from "@certd/pipeline";
+import { EncryptService } from "./encrypt-service.js";
+import { logger, utils } from "@certd/basic";
 /**
  * 授权
  */
@@ -39,10 +39,10 @@ let AccessService = class AccessService extends BaseService {
         if (param._copyFrom) {
             oldEntity = await this.info(param._copyFrom);
             if (oldEntity == null) {
-                throw new ValidateException('该授权配置不存在,请确认是否已被删除');
+                throw new ValidateException("该授权配置不存在,请确认是否已被删除");
             }
             if (oldEntity.userId !== param.userId) {
-                throw new ValidateException('您无权查看该授权配置');
+                throw new ValidateException("您无权查看该授权配置");
             }
         }
         delete param._copyFrom;
@@ -61,17 +61,20 @@ let AccessService = class AccessService extends BaseService {
             return;
         }
         const json = JSON.parse(setting);
+        if (accessDefine.subtype) {
+            param.subtype = json[accessDefine.subtype] || null;
+        }
         let oldSetting = {};
         let encryptSetting = {};
-        const firstEncrypt = !oldSettingEntity || !oldSettingEntity.encryptSetting || oldSettingEntity.encryptSetting === '{}';
+        const firstEncrypt = !oldSettingEntity || !oldSettingEntity.encryptSetting || oldSettingEntity.encryptSetting === "{}";
         if (oldSettingEntity) {
-            oldSetting = JSON.parse(oldSettingEntity.setting || '{}');
-            encryptSetting = JSON.parse(oldSettingEntity.encryptSetting || '{}');
+            oldSetting = JSON.parse(oldSettingEntity.setting || "{}");
+            encryptSetting = JSON.parse(oldSettingEntity.encryptSetting || "{}");
         }
         for (const key in json) {
             //加密
             let value = json[key];
-            if (value && typeof value === 'string') {
+            if (value && typeof value === "string") {
                 //去除前后空格
                 value = value.trim();
                 json[key] = value;
@@ -80,7 +83,7 @@ let AccessService = class AccessService extends BaseService {
             if (!accessInputDefine) {
                 continue;
             }
-            if (!accessInputDefine.encrypt || !value || typeof value !== 'string') {
+            if (!accessInputDefine.encrypt || !value || typeof value !== "string") {
                 //定义无需加密、value为空、不是字符串 这些不需要加密
                 encryptSetting[key] = {
                     value: value,
@@ -94,7 +97,7 @@ let AccessService = class AccessService extends BaseService {
                 const subIndex = Math.min(2, length);
                 let starLength = length - subIndex * 2;
                 starLength = Math.max(2, starLength);
-                const starString = '*'.repeat(starLength);
+                const starString = "*".repeat(starLength);
                 json[key] = value.substring(0, subIndex) + starString + value.substring(value.length - subIndex);
                 encryptSetting[key] = {
                     value: this.encryptService.encrypt(value),
@@ -113,7 +116,7 @@ let AccessService = class AccessService extends BaseService {
     async update(param) {
         const oldEntity = await this.info(param.id);
         if (oldEntity == null) {
-            throw new ValidateException('该授权配置不存在,请确认是否已被删除');
+            throw new ValidateException("该授权配置不存在,请确认是否已被删除");
         }
         this.encryptSetting(param, oldEntity);
         delete param.keyId;
@@ -122,11 +125,11 @@ let AccessService = class AccessService extends BaseService {
     async updateAccess(access) {
         const oldEntity = await this.info(access.id);
         if (oldEntity == null) {
-            throw new ValidateException('该授权配置不存在,请确认是否已被删除');
+            throw new ValidateException("该授权配置不存在,请确认是否已被删除");
         }
         const setting = this.decryptAccessEntity(oldEntity);
         for (const key of Object.keys(access)) {
-            if (key === 'id') {
+            if (key === "id") {
                 continue;
             }
             setting[key] = access[key];
@@ -140,11 +143,13 @@ let AccessService = class AccessService extends BaseService {
     async getSimpleInfo(id) {
         const entity = await this.info(id);
         if (entity == null) {
-            throw new ValidateException('该授权配置不存在,请确认是否已被删除');
+            throw new ValidateException("该授权配置不存在,请确认是否已被删除");
         }
         return {
             id: entity.id,
             name: entity.name,
+            type: entity.type,
+            subtype: entity.subtype,
             userId: entity.userId,
             projectId: entity.projectId,
         };
@@ -156,14 +161,14 @@ let AccessService = class AccessService extends BaseService {
         }
         if (checkUserId) {
             if (userId == null) {
-                throw new ValidateException('userId不能为空');
+                throw new ValidateException("userId不能为空");
             }
             if (userId !== entity.userId) {
-                throw new PermissionException('您对该Access授权无访问权限');
+                throw new PermissionException("您对该Access授权无访问权限");
             }
         }
         if (projectId != null && projectId !== entity.projectId) {
-            throw new PermissionException('您对该Access授权无访问权限');
+            throw new PermissionException("您对该Access授权无访问权限");
         }
         // const access = accessRegistry.get(entity.type);
         const setting = this.decryptAccessEntity(entity);
@@ -179,7 +184,7 @@ let AccessService = class AccessService extends BaseService {
     }
     decryptAccessEntity(entity) {
         let setting = {};
-        if (entity.encryptSetting && entity.encryptSetting !== '{}') {
+        if (entity.encryptSetting && entity.encryptSetting !== "{}") {
             setting = JSON.parse(entity.encryptSetting);
             for (const key in setting) {
                 //解密
@@ -209,16 +214,17 @@ let AccessService = class AccessService extends BaseService {
         if (userId == null) {
             return [];
         }
+        const userProjectQuery = this.buildUserProjectQuery(userId, projectId);
         return await this.repository.find({
             where: {
                 id: In(ids),
-                userId,
-                projectId,
+                ...userProjectQuery,
             },
             select: {
                 id: true,
                 name: true,
                 type: true,
+                subtype: true,
                 userId: true,
                 projectId: true,
             },

package/dist/user/access/service/access-sys-getter.d.ts

@@ -6,3 +6,4 @@ export declare class AccessSysGetter implements IAccessService {
     getById<T = any>(id: any): Promise<any>;
     getCommonById<T = any>(id: any): Promise<any>;
 }
+//# sourceMappingURL=access-sys-getter.d.ts.map

package/dist/user/access/service/encrypt-service.d.ts

@@ -9,3 +9,4 @@ export declare class EncryptService {
     encrypt(text: string): string;
     decrypt(encryptedText: string): string;
 }
+//# sourceMappingURL=encrypt-service.d.ts.map

package/dist/user/addon/api/api.d.ts

@@ -57,3 +57,4 @@ export interface IAddonGetter {
     getById<T = any>(id: any): Promise<T>;
     getCommonById<T = any>(id: any): Promise<T>;
 }
+//# sourceMappingURL=api.d.ts.map

package/dist/user/addon/api/decorator.d.ts

@@ -4,3 +4,4 @@ export declare const ADDON_INPUT_KEY = "pipeline:addon:input";
 export declare function IsAddon(define: AddonDefine): ClassDecorator;
 export declare function AddonInput(input?: AddonInputDefine): PropertyDecorator;
 export declare function newAddon(addonType: string, type: string, input: any, ctx: AddonContext): Promise<any>;
+//# sourceMappingURL=decorator.d.ts.map

package/dist/user/addon/api/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./api.js";
 export * from "./registry.js";
 export * from "./decorator.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/user/addon/api/registry.d.ts

@@ -1 +1,2 @@
 export declare const addonRegistry: import("@certd/pipeline").Registry<unknown>;
+//# sourceMappingURL=registry.d.ts.map

package/dist/user/addon/entity/addon.d.ts

@@ -14,3 +14,4 @@ export declare class AddonEntity {
     createTime: Date;
     updateTime: Date;
 }
+//# sourceMappingURL=addon.d.ts.map

package/dist/user/addon/index.d.ts

@@ -1,3 +1,4 @@
 export * from './api/index.js';
 export * from './entity/addon.js';
 export * from './service/addon-service.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/user/addon/service/addon-service.d.ts

@@ -58,3 +58,4 @@ export declare class AddonService extends BaseService<AddonEntity> {
         projectId?: number;
     }): Promise<AddonEntity>;
 }
+//# sourceMappingURL=addon-service.d.ts.map

package/dist/user/addon/service/addon-service.js

@@ -91,11 +91,11 @@ let AddonService = class AddonService extends BaseService {
         if (userId == null) {
             return [];
         }
+        const userProjectQuery = this.buildUserProjectQuery(userId, projectId);
         return await this.repository.find({
             where: {
                 id: In(ids),
-                userId,
-                projectId
+                ...userProjectQuery,
             },
             select: {
                 id: true,
@@ -109,11 +109,11 @@ let AddonService = class AddonService extends BaseService {
         });
     }
     async getDefault(userId, addonType, projectId) {
+        const userProjectQuery = this.buildUserProjectQuery(userId, projectId);
         const res = await this.repository.findOne({
             where: {
-                userId,
                 addonType,
-                projectId
+                ...userProjectQuery,
             },
             order: {
                 isDefault: "DESC"
@@ -144,19 +144,15 @@ let AddonService = class AddonService extends BaseService {
         if (userId == null) {
             throw new ValidateException("userId不能为空");
         }
-        await this.repository.update({
-            userId,
+        const userProjectQuery = this.buildUserProjectQuery(userId, projectId);
+        const query = {
             addonType,
-            projectId
-        }, {
+            ...userProjectQuery,
+        };
+        await this.repository.update(query, {
             isDefault: false
         });
-        await this.repository.update({
-            id,
-            userId,
-            addonType,
-            projectId
-        }, {
+        await this.repository.update({ ...query, id }, {
             isDefault: true
         });
     }
@@ -182,12 +178,12 @@ let AddonService = class AddonService extends BaseService {
         return this.buildAddonInstanceConfig(res);
     }
     async getOneByType(req) {
+        const userProjectQuery = this.buildUserProjectQuery(req.userId, req.projectId);
         return await this.repository.findOne({
             where: {
                 addonType: req.addonType,
                 type: req.type,
-                userId: req.userId,
-                projectId: req.projectId
+                ...userProjectQuery,
             }
         });
     }

package/dist/user/index.d.ts

@@ -1,2 +1,3 @@
 export * from './access/index.js';
 export * from './addon/index.js';
+//# sourceMappingURL=index.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/lib-server",
-  "version": "1.40.5",
+  "version": "1.41.0",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -29,11 +29,11 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.40.5",
-    "@certd/basic": "^1.40.5",
-    "@certd/pipeline": "^1.40.5",
-    "@certd/plugin-lib": "^1.40.5",
-    "@certd/plus-core": "^1.40.5",
+    "@certd/acme-client": "^1.41.0",
+    "@certd/basic": "^1.41.0",
+    "@certd/pipeline": "^1.41.0",
+    "@certd/plugin-lib": "^1.41.0",
+    "@certd/plus-core": "^1.41.0",
     "@midwayjs/cache": "3.14.0",
     "@midwayjs/core": "3.20.11",
     "@midwayjs/i18n": "3.20.13",
@@ -69,5 +69,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "7ceb0f6306b8b5e9ab875b9f7c41cc7d56209ea4"
+  "gitHead": "d368f9666abf71d7f56891b6cbedeb618b82701c"
 }