@cicctencent/midwayjs-base 1.0.35 → 1.0.37

package/dist/middleware/requestInit.js

@@ -1,4 +1,3 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -8,93 +7,94 @@ 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);
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequestInitMiddleware = void 0;
-const core_1 = require("@midwayjs/core");
-const uuid_1 = require("uuid");
-const ip = require("ip");
-const logger_1 = require("@fefeding/common/dist/utils/logger");
+import { Middleware, Config, } from '@midwayjs/core';
+import { v4 as UUID } from 'uuid';
+import * as ip from 'ip';
+import Logger from '@fefeding/common/dist/utils/logger';
 let RequestInitMiddleware = class RequestInitMiddleware {
-    loggerConfig;
-    // 静态文件扩展名列表
-    staticExtensions = [
-        '.js', '.css', '.jpg', '.png', '.ico', '.svg',
-        '.woff', '.woff2', '.ttf', '.eot', '.map'
-    ];
+    constructor() {
+        this.staticExtensions = [
+            '.js',
+            '.css',
+            '.jpg',
+            '.png',
+            '.ico',
+            '.svg',
+            '.woff',
+            '.woff2',
+            '.ttf',
+            '.eot',
+            '.map',
+        ];
+    }
     ignore(ctx) {
-        const isStaticFile = this.staticExtensions.some(ext => ctx.path.toLowerCase().endsWith(ext));
-        // 下面的路由将忽略此中间件
-        return isStaticFile || ctx.path === '/' || !ctx.path;
+        const koaCtx = ctx;
+        const isStaticFile = this.staticExtensions.some(ext => koaCtx.path.toLowerCase().endsWith(ext));
+        return isStaticFile || koaCtx.path === '/' || !koaCtx.path;
     }
     resolve() {
         return async (ctx, next) => {
-            const body = (ctx.request.body || {});
-            let request_id = ctx.URL.searchParams.get('request_id') || body.request_id ||
-                ctx.request.header['x-request-id'] ||
-                ctx.cookies.get('request_id', {
+            const koaCtx = ctx;
+            const body = (koaCtx.request.body || {});
+            let request_id = koaCtx.URL.searchParams.get('request_id') ||
+                body.request_id ||
+                koaCtx.request.header['x-request-id'] ||
+                koaCtx.cookies.get('request_id', {
                     signed: false,
                 });
             if (!request_id)
-                request_id = (0, uuid_1.v4)().replace(/-/g, '');
-            ctx.request_id = request_id;
-            //console.log('request start', request_id, ctx.url);
-            const logger = new logger_1.default({
+                request_id = UUID().replace(/-/g, '');
+            koaCtx.request_id = request_id;
+            const logger = new Logger({
                 remoteUrl: this.loggerConfig?.remoteUrl,
                 serviceName: process.env.SERVICE_NAME,
                 logLevel: this.loggerConfig?.level,
-                requestId: ctx.request_id || '',
-                loginId: ctx.currentSession?.loginId || '',
-                userId: (ctx.currentSession?.userId || '').toString(),
-                clientIP: ctx.detect?.CLIENTIP || ctx.ip || '',
+                requestId: koaCtx.request_id || '',
+                loginId: koaCtx.currentSession?.loginId || '',
+                userId: (koaCtx.currentSession?.userId || '').toString(),
+                clientIP: koaCtx.detect?.CLIENTIP || koaCtx.ip || '',
                 serverIP: ip.address() || '',
-                url: ctx.url,
+                url: koaCtx.url,
             });
-            // 将logger挂载到ctx上
-            ctx.logger = logger;
-            // 记录请求开始时间
+            koaCtx.logger = logger;
             const startTime = Date.now();
             try {
-                // 继续处理请求
-                let result = await next();
+                const result = await next();
                 const logData = {
-                    requestId: ctx.request_id,
-                    method: ctx.method,
-                    status: ctx.status,
+                    requestId: koaCtx.request_id,
+                    method: koaCtx.method,
+                    status: koaCtx.status,
                     result,
-                    responseTime: Date.now() - startTime
+                    responseTime: Date.now() - startTime,
                 };
                 if (typeof logData.result === 'string') {
                     logData.result = logData.result.substring(0, 500);
                 }
-                // 记录成功响应
-                //logger.info('Request completed', logData);
                 return result;
             }
             catch (error) {
-                // 记录错误响应
                 logger.error('Request failed', {
-                    requestId: ctx.request_id,
-                    method: ctx.method,
-                    url: ctx.href,
+                    requestId: koaCtx.request_id,
+                    method: koaCtx.method,
+                    url: koaCtx.href,
                     error: {
-                        name: error.name,
-                        message: error.message,
-                        stack: error.stack
+                        name: error?.name,
+                        message: error?.message,
+                        stack: error?.stack,
                     },
-                    responseTime: Date.now() - startTime
+                    responseTime: Date.now() - startTime,
                 });
-                // 将错误继续抛出，由全局异常处理器处理
                 throw error;
             }
         };
     }
 };
-exports.RequestInitMiddleware = RequestInitMiddleware;
 __decorate([
-    (0, core_1.Config)('logger'),
+    Config('logger'),
     __metadata("design:type", Object)
 ], RequestInitMiddleware.prototype, "loggerConfig", void 0);
-exports.RequestInitMiddleware = RequestInitMiddleware = __decorate([
-    (0, core_1.Middleware)()
+RequestInitMiddleware = __decorate([
+    Middleware()
 ], RequestInitMiddleware);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxdWVzdEluaXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWlkZGxld2FyZS9yZXF1ZXN0SW5pdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSx5Q0FBaUU7QUFFakUsK0JBQWtDO0FBQ2xDLHlCQUF5QjtBQUN6QiwrREFBd0Q7QUFHakQsSUFBTSxxQkFBcUIsR0FBM0IsTUFBTSxxQkFBcUI7SUFFOUIsWUFBWSxDQUFNO0lBQ2xCLFlBQVk7SUFDSixnQkFBZ0IsR0FBRztRQUN2QixLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU07UUFDN0MsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU07S0FDNUMsQ0FBQztJQUNGLE1BQU0sQ0FBQyxHQUFZO1FBQ2YsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUNwRCxHQUFHLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FDckMsQ0FBQztRQUNGLGVBQWU7UUFDZixPQUFPLFlBQVksSUFBSSxHQUFHLENBQUMsSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUM7SUFDdkQsQ0FBQztJQUNILE9BQU87UUFDSCxPQUFPLEtBQUssRUFBRSxHQUFZLEVBQUUsSUFBa0IsRUFBRSxFQUFFO1lBQzlDLE1BQU0sSUFBSSxHQUFHLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFRLENBQUM7WUFDN0MsSUFBSSxVQUFVLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxJQUFJLElBQUksQ0FBQyxVQUFVO2dCQUN0RSxHQUFHLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FB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
+export { RequestInitMiddleware };
+//# sourceMappingURL=requestInit.js.map

package/dist/service/session.service.d.ts

@@ -1,33 +1,9 @@
 import { ISessionService } from '../types/session.service.interface';
 import { Session, LoginByWxReq, LoginByWxRsp, LoginByAccountReq, LoginByAccountRsp } from '@fefeding/common/dist/models/account/session';
 export declare class SessionService extends ISessionService {
-    /**
-     * 根据ID获取session
-     * 并判断session是否在有效期
-     * @param id token唯一
-     */
-    getLoginSession(id: string): Promise<Session>;
-    /**
-     * 下线
-     * @param id 需要下线的id或者session
-     */
+    getLoginSession(id: string): Promise<Session | null>;
     logout(id: string): Promise<any>;
-    /**
-     * 用临时码登陆
-     * @param code 登陆临时码
-     * @returns
-     */
     loginByCode(code: string): Promise<any>;
-    /**
-     * 登录接口
-     * @param loginParams 登录参数
-     * @returns
-     */
     loginByWx(loginParams: LoginByWxReq): Promise<LoginByWxRsp>;
-    /**
-     * 帐号登陆
-     * @param loginParams
-     * @returns
-     */
     loginByAccount(loginParams: LoginByAccountReq): Promise<LoginByAccountRsp>;
 }

package/dist/service/session.service.js

@@ -1,81 +1,53 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SessionService = void 0;
-// @ts-ignore
-const core_1 = require("@midwayjs/core");
-const session_service_interface_1 = require("../types/session.service.interface");
-const session_1 = require("@fefeding/common/dist/models/account/session");
-let SessionService = class SessionService extends session_service_interface_1.ISessionService {
-    /**
-     * 根据ID获取session
-     * 并判断session是否在有效期
-     * @param id token唯一
-     */
+import { Provide, Scope, ScopeEnum, } from '@midwayjs/core';
+import { DEFAULT_SESSION_SERVICE_KEY, ISessionService, } from '../types/session.service.interface';
+import { GetLoginSessionReq, LogoutReq, LoginByWxReq, LoginByAccountReq, } from '@fefeding/common/dist/models/account/session';
+let SessionService = class SessionService extends ISessionService {
     async getLoginSession(id) {
-        const req = new session_1.GetLoginSessionReq();
+        const req = new GetLoginSessionReq();
         req.id = id;
         const res = await this.requestBaseApi(req);
         return res?.data || null;
     }
-    /**
-     * 下线
-     * @param id 需要下线的id或者session
-     */
     async logout(id) {
-        const req = new session_1.LogoutReq();
+        const req = new LogoutReq();
         req.id = id;
         const res = await this.requestBaseApi(req);
         this.ctx.currentSession = null;
         return res;
     }
-    /**
-     * 用临时码登陆
-     * @param code 登陆临时码
-     * @returns
-     */
     async loginByCode(code) {
         const res = await this.requestBaseApi('/api/session/loginByAuthCode', {
             data: {
-                code
-            }
+                code,
+            },
         });
         if (res.ret === 0)
             return res.data;
         return null;
     }
-    /**
-     * 登录接口
-     * @param loginParams 登录参数
-     * @returns
-     */
     async loginByWx(loginParams) {
-        const req = new session_1.LoginByWxReq();
+        const req = new LoginByWxReq();
         req.fromJSON(loginParams);
         const res = await this.requestBaseApi(req);
         return res;
     }
-    /**
-     * 帐号登陆
-     * @param loginParams
-     * @returns
-     */
     async loginByAccount(loginParams) {
-        loginParams.appId = '0'; //this.baseServiceOption.appId?.toString() || '0';	
-        const req = new session_1.LoginByAccountReq();
+        loginParams.appId = '0';
+        const req = new LoginByAccountReq();
         req.fromJSON(loginParams);
         const res = await this.requestBaseApi(req);
         return res;
     }
 };
-exports.SessionService = SessionService;
-exports.SessionService = SessionService = __decorate([
-    (0, core_1.Provide)(session_service_interface_1.DEFAULT_SESSION_SERVICE_KEY),
-    (0, core_1.Scope)(core_1.ScopeEnum.Request, { allowDowngrade: true })
+SessionService = __decorate([
+    Provide(DEFAULT_SESSION_SERVICE_KEY),
+    Scope(ScopeEnum.Request, { allowDowngrade: true })
 ], SessionService);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Vzc2lvbi5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2Uvc2Vzc2lvbi5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLGFBQWE7QUFDYix5Q0FBaUY7QUFDakYsa0ZBQWtHO0FBQ2xHLDBFQUF1TTtBQUloTSxJQUFNLGNBQWMsR0FBcEIsTUFBTSxjQUFlLFNBQVEsMkNBQWU7SUFDL0M7Ozs7T0FJRztJQUNILEtBQUssQ0FBQyxlQUFlLENBQUMsRUFBVTtRQUM1QixNQUFNLEdBQUcsR0FBRyxJQUFJLDRCQUFrQixFQUFFLENBQUM7UUFDckMsR0FBRyxDQUFDLEVBQUUsR0FBRyxFQUFFLENBQUM7UUFDWixNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxjQUFjLENBQXFCLEdBQUcsQ0FBQyxDQUFDO1FBQy9ELE9BQU8sR0FBRyxFQUFFLElBQUksSUFBSSxJQUFJLENBQUM7SUFDN0IsQ0FBQztJQUNEOzs7T0FHRztJQUNILEtBQUssQ0FBQyxNQUFNLENBQUMsRUFBVTtRQUNuQixNQUFNLEdBQUcsR0FBRyxJQUFJLG1CQUFTLEVBQUUsQ0FBQztRQUM1QixHQUFHLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQztRQUNaLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBWSxHQUFHLENBQUMsQ0FBQztRQUN0RCxJQUFJLENBQUMsR0FBRyxDQUFDLGNBQWMsR0FBRyxJQUFJLENBQUM7UUFDL0IsT0FBTyxHQUFHLENBQUM7SUFDZixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILEtBQUssQ0FBQyxXQUFXLENBQUMsSUFBWTtRQUMxQixNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxjQUFjLENBQUMsOEJBQThCLEVBQUU7WUFDbEUsSUFBSSxFQUFFO2dCQUNGLElBQUk7YUFDUDtTQUNKLENBQUMsQ0FBQztRQUNILElBQUcsR0FBRyxDQUFDLEdBQUcsS0FBSyxDQUFDO1lBQUUsT0FBTyxHQUFHLENBQUMsSUFBSSxDQUFDO1FBQ2xDLE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsS0FBSyxDQUFDLFNBQVMsQ0FBQyxXQUF5QjtRQUNyQyxNQUFNLEdBQUcsR0FBRyxJQUFJLHNCQUFZLEVBQUUsQ0FBQztRQUMvQixHQUFHLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQzFCLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBZSxHQUFHLENBQUMsQ0FBQztRQUN6RCxPQUFPLEdBQUcsQ0FBQztJQUNmLENBQUM7SUFDRDs7OztPQUlHO0lBQ0gsS0FBSyxDQUFDLGNBQWMsQ0FBQyxXQUE4QjtRQUMvQyxXQUFXLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQyxDQUFBLG1EQUFtRDtRQUUzRSxNQUFNLEdBQUcsR0FBRyxJQUFJLDJCQUFpQixFQUFFLENBQUM7UUFDcEMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUMxQixNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxjQUFjLENBQW9CLEdBQUcsQ0FBQyxDQUFDO1FBQzlELE9BQU8sR0FBRyxDQUFDO0lBQ2YsQ0FBQztDQUNKLENBQUE7QUEvRFksd0NBQWM7eUJBQWQsY0FBYztJQUYxQixJQUFBLGNBQU8sRUFBQyx1REFBMkIsQ0FBQztJQUNwQyxJQUFBLFlBQUssRUFBQyxnQkFBUyxDQUFDLE9BQU8sRUFBRSxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUUsQ0FBQztHQUN0QyxjQUFjLENBK0QxQiJ9
+export { SessionService };
+//# sourceMappingURL=session.service.js.map

package/dist/service/tencent.service.d.ts

@@ -10,36 +10,28 @@ export declare class TencentService extends BaseService {
     };
     cosFileOption: {
         [key: string]: {
-            /** 存储桶的名称，格式为<bucketname-appid>，例如examplebucket-1250000000 */
             Bucket: string;
             Region: string;
             Key?: string;
             Headers?: any;
+            Domain?: string;
+            Protocol?: string;
+            CompatibilityMode?: boolean;
             url?: string;
         };
     };
-    cosClient(name: string): any;
+    cosClient(name: string, option?: any): any;
     uploadCosFile(key: string, filePath: string, cos?: string, headers?: {}, client?: string): Promise<{
-        /** 对象的实体标签（Entity Tag），是对象被创建时标识对象内容的信息标签，可用于检查对象的内容是否发生变化，例如"8e0b617ca298a564c3331da28dcb50df"。此头部并不一定返回对象的 MD5 值，而是根据对象上传和加密方式而有所不同 */
         ETag: string;
-        /** 创建的存储桶访问地址，不带 https:// 前缀，例如 examplebucket-1250000000.cos.ap-guangzhou.myqcloud.com/images/1.jpg */
         Location: string;
         url?: string;
     }>;
     uploadCosData(key: string, body: string | fs.ReadStream | any, cos?: string, headers?: {}, client?: string): Promise<{
-        /** 对象的实体标签（Entity Tag），是对象被创建时标识对象内容的信息标签，可用于检查对象的内容是否发生变化，例如"8e0b617ca298a564c3331da28dcb50df"。此头部并不一定返回对象的 MD5 值，而是根据对象上传和加密方式而有所不同 */
         ETag: string;
-        /** 创建的存储桶访问地址，不带 https:// 前缀，例如 examplebucket-1250000000.cos.ap-guangzhou.myqcloud.com/images/1.jpg */
         Location: string;
         url?: string;
     }>;
     getCosFileUrl(key: string, cos?: string, client?: string): Promise<string>;
-    /**
-     * 获取文件
-     * @param key 文件key
-     * @param cos
-     * @param client
-     */
-    getFile(key: string, cos?: string, client?: string): Promise<COS.GetObjectResult>;
+    getFile(key: string, cos?: string, client?: string): Promise<any>;
 }
 export {};

package/dist/service/tencent.service.js

@@ -1,4 +1,3 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -8,74 +7,66 @@ 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);
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TencentService = void 0;
-// @ts-ignore
-const core_1 = require("@midwayjs/core");
-const fs = require("fs");
-const url = require("url");
-const TxCos = require("@fefeding/common/dist/utils/txCos");
-const lodash_1 = require("lodash");
-const base_service_1 = require("../types/base.service");
-let TencentService = class TencentService extends base_service_1.BaseService {
-    tencentCredentialConfig;
-    cosFileOption;
-    // 生成client
-    cosClient(name) {
-        const config = this.tencentCredentialConfig[name] || this.tencentCredentialConfig;
-        const client = TxCos.createClient({
-            /** 固定密钥的 SecretId，可从{@link https://console.cloud.tencent.com/cam/capi|API密钥管理}获取 */
+import { Config, Provide, ScopeEnum, Scope } from '@midwayjs/core';
+import * as fs from 'fs';
+import * as url from 'url';
+import * as TxCos from '@fefeding/common/dist/utils/txCos';
+import { isPlainObject } from 'lodash';
+import { BaseService } from '../types/base.service';
+let TencentService = class TencentService extends BaseService {
+    cosClient(name, option) {
+        const config = this.tencentCredentialConfig[name] ||
+            this.tencentCredentialConfig;
+        const clientOption = {
             SecretId: config.secretId,
-            /** 固定密钥的 SecretKey，可从{@link https://console.cloud.tencent.com/cam/capi|API密钥管理}获取 */
             SecretKey: config.secretKey,
-        });
+            CompatibilityMode: true,
+        };
+        if (option?.Domain)
+            clientOption.Domain = option.Domain;
+        if (option?.Protocol)
+            clientOption.Protocol = option.Protocol;
+        if (option?.CompatibilityMode !== undefined)
+            clientOption.CompatibilityMode = option.CompatibilityMode;
+        const client = TxCos.createClient(clientOption);
         return client;
     }
-    // 上传文件
     async uploadCosFile(key, filePath, cos = 'default', headers = {}, client = 'default') {
         const body = fs.createReadStream(filePath);
         return this.uploadCosData(key, body, cos, headers, client);
     }
-    // 上传文件内容
     async uploadCosData(key, body, cos = 'default', headers = {}, client = 'default') {
         const option = this.cosFileOption[cos];
-        if ((0, lodash_1.isPlainObject)(body) || Array.isArray(body)) {
+        if (isPlainObject(body) || Array.isArray(body)) {
             body = JSON.stringify(body);
         }
         headers = {
             ...option.Headers,
             ...headers,
         };
-        const res = await TxCos.putObject({
+        const res = (await TxCos.putObject({
             ...option,
             Key: key,
             Body: body,
-            Headers: headers
-        }, this.cosClient(client));
+            Headers: headers,
+        }, this.cosClient(client, option)));
         if (option.url) {
-            res.url = (new url.URL(key, option.url)).toString();
+            res.url = new url.URL(key, option.url).toString();
         }
         return res;
     }
-    // 获取文件访问url，带有临时签名
     async getCosFileUrl(key, cos = 'default', client = 'default') {
         if (!key) {
             throw Error('指定文件地址');
         }
         const option = this.cosFileOption[cos];
-        const url = await TxCos.getObjectUrl({
+        const url = (await TxCos.getObjectUrl({
             ...option,
             Key: key,
             Sign: true,
-        }, this.cosClient(client));
+        }, this.cosClient(client, option)));
         return url;
     }
-    /**
-     * 获取文件
-     * @param key 文件key
-     * @param cos
-     * @param client
-     */
     async getFile(key, cos = 'default', client = 'default') {
         if (!key) {
             throw Error('指定文件地址');
@@ -85,21 +76,21 @@ let TencentService = class TencentService extends base_service_1.BaseService {
             ...option,
             Key: key,
             Sign: true,
-        }, this.cosClient(client));
+        }, this.cosClient(client, option));
         return url;
     }
 };
-exports.TencentService = TencentService;
 __decorate([
-    (0, core_1.Config)('tencentCredential'),
+    Config('tencentCredential'),
     __metadata("design:type", Object)
 ], TencentService.prototype, "tencentCredentialConfig", void 0);
 __decorate([
-    (0, core_1.Config)('tencentCosOption'),
+    Config('tencentCosOption'),
     __metadata("design:type", Object)
 ], TencentService.prototype, "cosFileOption", void 0);
-exports.TencentService = TencentService = __decorate([
-    (0, core_1.Provide)(),
-    (0, core_1.Scope)(core_1.ScopeEnum.Request, { allowDowngrade: true })
+TencentService = __decorate([
+    Provide(),
+    Scope(ScopeEnum.Request, { allowDowngrade: true })
 ], TencentService);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVuY2VudC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2UvdGVuY2VudC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLGFBQWE7QUFDYix5Q0FBZ0Y7QUFDaEYseUJBQXlCO0FBQ3pCLDJCQUEyQjtBQUMzQiwyREFBMkQ7QUFDM0QsbUNBQXVDO0FBQ3ZDLHdEQUFvRDtBQVM3QyxJQUFNLGNBQWMsR0FBcEIsTUFBTSxjQUFlLFNBQVEsMEJBQVc7SUFHM0MsdUJBQXVCLENBRXJCO0lBR0YsYUFBYSxDQWFaO0lBQ0QsV0FBVztJQUNYLFNBQVMsQ0FBQyxJQUFZO1FBQ2xCLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsdUJBQXVCLENBQUM7UUFDbEYsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLFlBQVksQ0FBQztZQUM5QixvRkFBb0Y7WUFDcEYsUUFBUSxFQUFFLE1BQU0sQ0FBQyxRQUFRO1lBQ3pCLHFGQUFxRjtZQUNyRixTQUFTLEVBQUUsTUFBTSxDQUFDLFNBQVM7U0FDOUIsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxNQUFhLENBQUM7SUFDekIsQ0FBQztJQUVELE9BQU87SUFDUCxLQUFLLENBQUMsYUFBYSxDQUFDLEdBQVcsRUFBRSxRQUFnQixFQUFFLEdBQUcsR0FBQyxTQUFTLEVBQUUsT0FBTyxHQUFHLEVBQUUsRUFBRSxNQUFNLEdBQUcsU0FBUztRQUM5RixNQUFNLElBQUksR0FBRyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsUUFBUSxDQUFDLENBQUM7UUFFM0MsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUMvRCxDQUFDO0lBRUQsU0FBUztJQUNULEtBQUssQ0FBQyxhQUFhLENBQUMsR0FBVyxF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
+export { TencentService };
+//# sourceMappingURL=tencent.service.js.map

package/dist/types/base.controller.js

@@ -1,4 +1,3 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -8,21 +7,15 @@ 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);
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseController = void 0;
-// @ts-ignore
-const core_1 = require("@midwayjs/core");
-class BaseController {
-    app;
-    ctx;
+import { App, Inject } from '@midwayjs/core';
+export class BaseController {
 }
-exports.BaseController = BaseController;
 __decorate([
-    (0, core_1.App)(),
+    App(),
     __metadata("design:type", Object)
 ], BaseController.prototype, "app", void 0);
 __decorate([
-    (0, core_1.Inject)(),
+    Inject(),
     __metadata("design:type", Object)
 ], BaseController.prototype, "ctx", void 0);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5jb250cm9sbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R5cGVzL2Jhc2UuY29udHJvbGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFDQSxhQUFhO0FBQ2IseUNBQTZDO0FBSTdDLE1BQXNCLGNBQWM7SUFFdEIsR0FBRyxDQUFjO0lBR2pCLEdBQUcsQ0FBVTtDQUMxQjtBQU5ELHdDQU1DO0FBSmE7SUFEVCxJQUFBLFVBQUcsR0FBRTs7MkNBQ3FCO0FBR2pCO0lBRFQsSUFBQSxhQUFNLEdBQUU7OzJDQUNjIn0=
+//# sourceMappingURL=base.controller.js.map

package/dist/types/base.model.service.d.ts

@@ -10,17 +10,9 @@ export interface Options<Entity> {
 }
 export declare abstract class BaseModelService<K extends BaseEntity> extends BaseService {
     protected abstract model: Repository<K>;
-    /**
-     * 保存
-     * @param u 对象orm
-     */
     save(entity: K, qryRunner?: QueryRunner): Promise<K>;
-    /** update 和 create都可以用insert */
     insert(data: DeepPartial<K> | DeepPartial<K>[]): Promise<K | K[]>;
-    update(data: DeepPartial<K> | DeepPartial<K>[], repo?: Repository<K>): Promise<K>;
-    /**
-     * 删除对象
-     */
+    update(data: DeepPartial<K> | DeepPartial<K>[], repo?: Repository<K>): Promise<K | K[]>;
     delete(data: DeepPartial<K> | DeepPartial<K>[], repo?: Repository<K>): Promise<K | DeepPartial<K>[]>;
     findAndCount(where: FindOptionsWhere<K> | FindOptionsWhere<K>[], options?: Options<K>): Promise<{
         rows: K[];

package/dist/types/base.model.service.js

@@ -1,13 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseModelService = void 0;
-const base_service_1 = require("./base.service");
-const enumType_1 = require("@fefeding/common/dist/models/base/enumType");
-class BaseModelService extends base_service_1.BaseService {
-    /**
-     * 保存
-     * @param u 对象orm
-     */
+import { BaseService } from './base.service';
+import { EValid } from '@fefeding/common/dist/models/base/enumType';
+export class BaseModelService extends BaseService {
     async save(entity, qryRunner) {
         if (this.ctx?.currentSession?.loginId) {
             entity.updater = this.ctx.currentSession.loginId;
@@ -18,12 +11,10 @@ class BaseModelService extends base_service_1.BaseService {
         const res = await this.model.save(entity);
         return res;
     }
-    /** update 和 create都可以用insert */
     async insert(data) {
         const isArray = Array.isArray(data);
         const updater = this.ctx.currentSession?.loginId;
         const entities = (isArray ? data : [data]).map(it => this.model.create({
-            /** creator 优先用it的，updater优先用当前用户的 */
             creator: updater,
             ...it,
             updater,
@@ -51,9 +42,6 @@ class BaseModelService extends base_service_1.BaseService {
         }));
         return isArray ? models : models[0];
     }
-    /**
-     * 删除对象
-     */
     async delete(data, repo) {
         repo = repo || this.model;
         if (Array.isArray(data)) {
@@ -63,8 +51,7 @@ class BaseModelService extends base_service_1.BaseService {
             return data;
         }
         else {
-            // 标记为已删除
-            data.valid = enumType_1.EValid.Unvalid;
+            data.valid = EValid.Unvalid;
             return await repo.save(data);
         }
     }
@@ -82,5 +69,4 @@ class BaseModelService extends base_service_1.BaseService {
         return { rows, count };
     }
 }
-exports.BaseModelService = BaseModelService;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5tb2RlbC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R5cGVzL2Jhc2UubW9kZWwuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFXQSxpREFBNkM7QUFDN0MseUVBQW9FO0FBY3BFLE1BQXNCLGdCQUF1QyxTQUFRLDBCQUFXO0lBRzVFOzs7T0FHRztJQUNILEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBUyxFQUFFLFNBQXVCO1FBQ3pDLElBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxjQUFjLEVBQUUsT0FBTyxFQUFFLENBQUM7WUFDbkMsTUFBTSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQUM7UUFDckQsQ0FBQztRQUNELElBQUcsU0FBUyxFQUFFLENBQUM7WUFDWCxPQUFPLE1BQU0sU0FBUyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDaEQsQ0FBQztRQUNELE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDMUMsT0FBTyxHQUFHLENBQUM7SUFDZixDQUFDO0lBRUQsZ0NBQWdDO0lBQ3pCLEtBQUssQ0FBQyxNQUFNLENBQ2YsSUFBdUM7UUFFdkMsTUFBTSxPQUFPLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNwQyxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRSxPQUFPLENBQUM7UUFDakQsTUFBTSxRQUFRLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUNoRCxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQztZQUNkLHFDQUFx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
+//# sourceMappingURL=base.model.service.js.map

package/dist/types/base.service.d.ts

@@ -13,16 +13,7 @@ export declare abstract class BaseService {
     apiOption: {
         key: string;
     };
-    /**
-     * 是否是管理员帐号
-     * @param account
-     */
-    checkManager(account?: string): Promise<boolean>;
-    /**
-     * 基础服务请求
-     * @param req
-     * @param option
-     */
+    checkManager(account?: string): Promise<boolean | "" | undefined>;
     requestBaseApi<T extends response>(req: request | string, option?: AxiosRequestConfig): Promise<T>;
     requestBaseServer<T extends any>(req: request | string, option?: AxiosRequestConfig & {
         accessKey?: string;