@cicctencent/midwayjs-base 1.0.8 → 1.0.12

package/dist/middleware/apiResultFormatter.js

@@ -1,78 +0,0 @@
-"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;
-};
-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.ApiResultFormatterMiddleware = void 0;
-// @ts-ignore
-const core_1 = require("@midwayjs/core");
-let ApiResultFormatterMiddleware = class ApiResultFormatterMiddleware {
-    apiOption;
-    ignore(ctx) {
-        // 下面的路由将忽略此中间件
-        if (this.apiOption?.ignore) {
-            for (const ig of this.apiOption.ignore) {
-                if (typeof ig === 'string' && ctx.path === ig)
-                    return true;
-                if (ig?.test?.(ctx.path))
-                    return true;
-            }
-        }
-        return false;
-    }
-    resolve() {
-        return async (ctx, next) => {
-            const isApi = this.apiOption?.reg?.test(ctx.request.path);
-            //console.log(ctx.URL.toString(), isApi);
-            if (isApi) {
-                try {
-                    await next();
-                    const res = ctx.body;
-                    if (res !== '') {
-                        ctx.body = Object.assign({
-                            ret: 0,
-                            msg: 'success',
-                            data: null,
-                        }, typeof res?.ret === 'number' ? res : { data: res });
-                        //ctx.logger.info(ctx.request.rawBody, ctx.body);
-                    }
-                }
-                catch (err) {
-                    console.error(err);
-                    if (typeof err.ret === 'number') {
-                        ctx.body = err;
-                    }
-                    else {
-                        ctx.body = {
-                            ret: 1001,
-                            msg: err.message,
-                        };
-                    }
-                    ctx.logger.error(ctx.request.rawBody, ctx.body);
-                }
-                finally {
-                    if (ctx.status !== 302)
-                        ctx.status = 200;
-                }
-            }
-            else {
-                await next();
-            }
-        };
-    }
-};
-exports.ApiResultFormatterMiddleware = ApiResultFormatterMiddleware;
-__decorate([
-    (0, core_1.Config)('apiOption'),
-    __metadata("design:type", Object)
-], ApiResultFormatterMiddleware.prototype, "apiOption", void 0);
-exports.ApiResultFormatterMiddleware = ApiResultFormatterMiddleware = __decorate([
-    (0, core_1.Middleware)()
-], ApiResultFormatterMiddleware);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpUmVzdWx0Rm9ybWF0dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21pZGRsZXdhcmUvYXBpUmVzdWx0Rm9ybWF0dGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLGFBQWE7QUFDYix5Q0FBaUU7QUFJMUQsSUFBTSw0QkFBNEIsR0FBbEMsTUFBTSw0QkFBNEI7SUFJckMsU0FBUyxDQUFNO0lBRWYsTUFBTSxDQUFDLEdBQVk7UUFDZixlQUFlO1FBQ2YsSUFBRyxJQUFJLENBQUMsU0FBUyxFQUFFLE1BQU0sRUFBRSxDQUFDO1lBQ3hCLEtBQUksTUFBTSxFQUFFLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztnQkFDcEMsSUFBRyxPQUFPLEVBQUUsS0FBSyxRQUFRLElBQUksR0FBRyxDQUFDLElBQUksS0FBSyxFQUFFO29CQUFFLE9BQU8sSUFBSSxDQUFDO2dCQUMxRCxJQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDO29CQUFFLE9BQU8sSUFBSSxDQUFDO1lBQ3pDLENBQUM7UUFDTCxDQUFDO1FBQ0QsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUVELE9BQU87UUFDSCxPQUFPLEtBQUssRUFBRSxHQUFZLEVBQUUsSUFBa0IsRUFBRSxFQUFFO1lBQzlDLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxTQUFTLEVBQUUsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzFELHlDQUF5QztZQUN6QyxJQUFJLEtBQUssRUFBRSxDQUFDO2dCQUNSLElBQUksQ0FBQztvQkFDRCxNQUFNLElBQUksRUFBRSxDQUFDO29CQUNiLE1BQU0sR0FBRyxHQUFRLEdBQUcsQ0FBQyxJQUFJLENBQUM7b0JBQzFCLElBQUcsR0FBRyxLQUFLLEVBQUUsRUFBRSxDQUFDO3dCQUNaLEdBQUcsQ0FBQyxJQUFJLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FDcEI7NEJBQ0ksR0FBRyxFQUFFLENBQUM7NEJBQ04sR0FBRyxFQUFFLFNBQVM7NEJBQ2QsSUFBSSxFQUFFLElBQUk7eUJBQ2IsRUFDRCxPQUFPLEdBQUcsRUFBRSxHQUFHLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxDQUNyRCxDQUFDO3dCQUNGLGlEQUFpRDtvQkFDckQsQ0FBQztnQkFDTCxDQUFDO2dCQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7b0JBQ1gsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztvQkFDbkIsSUFBSSxPQUFPLEdBQUcsQ0FBQyxHQUFHLEtBQUssUUFBUSxFQUFFLENBQUM7d0JBQzlCLEdBQUcsQ0FBQyxJQUFJLEdBQUcsR0FBRyxDQUFDO29CQUNuQixDQUFDO3lCQUFNLENBQUM7d0JBQ0osR0FBRyxDQUFDLElBQUksR0FBRzs0QkFDUCxHQUFHLEVBQUUsSUFBSTs0QkFDVCxHQUFHLEVBQUUsR0FBRyxDQUFDLE9BQU87eUJBQ25CLENBQUM7b0JBQ04sQ0FBQztvQkFDRCxHQUFHLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ3BELENBQUM7d0JBQ08sQ0FBQztvQkFDTCxJQUFHLEdBQUcsQ0FBQyxNQUFNLEtBQUssR0FBRzt3QkFBRSxHQUFHLENBQUMsTUFBTSxHQUFHLEdBQUcsQ0FBQztnQkFDNUMsQ0FBQztZQUNMLENBQUM7aUJBQU0sQ0FBQztnQkFDSixNQUFNLElBQUksRUFBRSxDQUFDO1lBQ2pCLENBQUM7UUFDTCxDQUFDLENBQUM7SUFDTixDQUFDO0NBQ0osQ0FBQTtBQXhEWSxvRUFBNEI7QUFJckM7SUFEQyxJQUFBLGFBQU0sRUFBQyxXQUFXLENBQUM7OytEQUNMO3VDQUpOLDRCQUE0QjtJQUR4QyxJQUFBLGlCQUFVLEdBQUU7R0FDQSw0QkFBNEIsQ0F3RHhDIn0=

package/dist/middleware/detect.middleware.d.ts

@@ -1,5 +0,0 @@
-import { IMiddleware } from '@midwayjs/core';
-import { NextFunction, Context } from '@midwayjs/koa';
-export declare class DetectMiddleware implements IMiddleware<Context, NextFunction> {
-    resolve(): (ctx: Context, next: NextFunction) => Promise<any>;
-}

package/dist/middleware/detect.middleware.js

@@ -1,61 +0,0 @@
-"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.DetectMiddleware = void 0;
-const core_1 = require("@midwayjs/core");
-let DetectMiddleware = class DetectMiddleware {
-    resolve() {
-        return async (ctx, next) => {
-            const UA = ctx.get('user-agent') || '';
-            const IS_MOBILE = /Mobile/i.test(UA);
-            const VER_MQQ = UA.match(/QQ\/([\d.]+)/i) && UA.match(/QQ\/([\d.]+)/i)?.[1];
-            const IS_MQQ = Boolean(VER_MQQ);
-            // 微信版本号可能分4段，影响业务代码里使用semver比较版本号（会报错），如果业务需要4段版本号可以自己从ua里取
-            const VER_WEIXIN = UA.match(/MicroMessenger\/([\d.]+)/i) &&
-                UA.match(/MicroMessenger\/([\d.]+)/i)?.[1]
-                    .split('.')
-                    .slice(0, 3)
-                    .join('.');
-            const IS_WEIXIN = Boolean(VER_WEIXIN);
-            // 是否是开发者工具
-            const IS_WECHATTOOLS = /wechatdevtools\//i.test(UA);
-            // @ts-ignore
-            const IS_PCWEIXIN = /(Windows|Mac)Wechat/i.test(UA);
-            // 是否是企业微信
-            const IS_WXWORK = /wxwork\//i.test(UA);
-            // @ts-ignore
-            const VER_MINA = /miniProgram/i.test(UA);
-            const IS_MINA = Boolean(VER_MINA);
-            let requestIP = (ctx.request.header['x-forwarded-for'] ||
-                ctx.request.ip || '').toString();
-            if (requestIP.includes(','))
-                requestIP = requestIP.split(',')[0];
-            const clientIP = (ctx.request.header['x-client-ip'] || requestIP).toString();
-            const hostname = ctx.get('tencent-acceleration-domain-name') || ctx.request.hostname;
-            // 环境变量
-            ctx.detect = {
-                IS_MOBILE,
-                IS_MQQ,
-                IS_WEIXIN,
-                IS_WECHATTOOLS,
-                IS_PCWEIXIN,
-                IS_WXWORK,
-                IS_MINA,
-                CLIENTIP: clientIP,
-                REQUESTIP: requestIP,
-                HOSTNAME: hostname,
-            };
-            return next();
-        };
-    }
-};
-exports.DetectMiddleware = DetectMiddleware;
-exports.DetectMiddleware = DetectMiddleware = __decorate([
-    (0, core_1.Middleware)()
-], DetectMiddleware);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGV0ZWN0Lm1pZGRsZXdhcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWlkZGxld2FyZS9kZXRlY3QubWlkZGxld2FyZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSx5Q0FBeUQ7QUFJbEQsSUFBTSxnQkFBZ0IsR0FBdEIsTUFBTSxnQkFBZ0I7SUFDekIsT0FBTztRQUNILE9BQU8sS0FBSyxFQUFFLEdBQVksRUFBRSxJQUFrQixFQUFFLEVBQUU7WUFDOUMsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDdkMsTUFBTSxTQUFTLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNyQyxNQUFNLE9BQU8sR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUMsZUFBZSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM1RSxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDaEMsNERBQTREO1lBQzVELE1BQU0sVUFBVSxHQUNaLEVBQUUsQ0FBQyxLQUFLLENBQUMsMkJBQTJCLENBQUM7Z0JBQ3JDLEVBQUUsQ0FBQyxLQUFLLENBQUMsMkJBQTJCLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztxQkFDckMsS0FBSyxDQUFDLEdBQUcsQ0FBQztxQkFDVixLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQztxQkFDWCxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDbkIsTUFBTSxTQUFTLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBRXRDLFdBQVc7WUFDWCxNQUFNLGNBQWMsR0FBRyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDcEQsYUFBYTtZQUNiLE1BQU0sV0FBVyxHQUFHLHNCQUFzQixDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNwRCxVQUFVO1lBQ1YsTUFBTSxTQUFTLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUN2QyxhQUFhO1lBQ2IsTUFBTSxRQUFRLEdBQUcsY0FBYyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUN6QyxNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7WUFFbEMsSUFBSSxTQUFTLEdBQUcsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQztnQkFDdEQsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDakMsSUFBRyxTQUFTLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQztnQkFBRSxTQUFTLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUVoRSxNQUFNLFFBQVEsR0FBRyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxJQUFJLFNBQVMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBRTdFLE1BQU0sUUFBUSxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMsa0NBQWtDLENBQUMsSUFBSSxHQUFHLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQztZQUVyRixPQUFPO1lBQ1AsR0FBRyxDQUFDLE1BQU0sR0FBRztnQkFDVCxTQUFTO2dCQUNULE1BQU07Z0JBQ04sU0FBUztnQkFDVCxjQUFjO2dCQUNkLFdBQVc7Z0JBQ1gsU0FBUztnQkFDVCxPQUFPO2dCQUNQLFFBQVEsRUFBRSxRQUFRO2dCQUNsQixTQUFTLEVBQUUsU0FBUztnQkFDcEIsUUFBUSxFQUFFLFFBQVE7YUFDckIsQ0FBQTtZQUNELE9BQU8sSUFBSSxFQUFFLENBQUM7UUFDbEIsQ0FBQyxDQUFDO0lBQ04sQ0FBQztDQUNKLENBQUE7QUFsRFksNENBQWdCOzJCQUFoQixnQkFBZ0I7SUFENUIsSUFBQSxpQkFBVSxHQUFFO0dBQ0EsZ0JBQWdCLENBa0Q1QiJ9

package/dist/middleware/requestInit.d.ts

@@ -1,8 +0,0 @@
-import { IMiddleware } from '@midwayjs/core';
-import { NextFunction, Context } from '@midwayjs/koa';
-export declare class RequestInitMiddleware implements IMiddleware<Context, NextFunction> {
-    loggerConfig: any;
-    private staticExtensions;
-    ignore(ctx: Context): boolean;
-    resolve(): (ctx: Context, next: NextFunction) => Promise<any>;
-}

package/dist/middleware/requestInit.js

@@ -1,100 +0,0 @@
-"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;
-};
-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");
-let RequestInitMiddleware = class RequestInitMiddleware {
-    loggerConfig;
-    // 静态文件扩展名列表
-    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;
-    }
-    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', {
-                    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({
-                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 || '',
-                serverIP: ip.address() || '',
-                url: ctx.url,
-            });
-            // 将logger挂载到ctx上
-            ctx.logger = logger;
-            // 记录请求开始时间
-            const startTime = Date.now();
-            try {
-                // 继续处理请求
-                let result = await next();
-                const logData = {
-                    requestId: ctx.request_id,
-                    method: ctx.method,
-                    status: ctx.status,
-                    result,
-                    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,
-                    error: {
-                        name: error.name,
-                        message: error.message,
-                        stack: error.stack
-                    },
-                    responseTime: Date.now() - startTime
-                });
-                // 将错误继续抛出，由全局异常处理器处理
-                throw error;
-            }
-        };
-    }
-};
-exports.RequestInitMiddleware = RequestInitMiddleware;
-__decorate([
-    (0, core_1.Config)('logger'),
-    __metadata("design:type", Object)
-], RequestInitMiddleware.prototype, "loggerConfig", void 0);
-exports.RequestInitMiddleware = RequestInitMiddleware = __decorate([
-    (0, core_1.Middleware)()
-], RequestInitMiddleware);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxdWVzdEluaXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWlkZGxld2FyZS9yZXF1ZXN0SW5pdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSx5Q0FBaUU7QUFFakUsK0JBQWtDO0FBQ2xDLHlCQUF5QjtBQUN6QiwrREFBd0Q7QUFHakQsSUFBTSxxQkFBcUIsR0FBM0IsTUFBTSxxQkFBcUI7SUFFOUIsWUFBWSxDQUFNO0lBQ2xCLFlBQVk7SUFDSixnQkFBZ0IsR0FBRztRQUN2QixLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU07UUFDN0MsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU07S0FDNUMsQ0FBQztJQUNGLE1BQU0sQ0FBQyxHQUFZO1FBQ2YsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUNwRCxHQUFHLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FDckMsQ0FBQztRQUNGLGVBQWU7UUFDZixPQUFPLFlBQVksSUFBSSxHQUFHLENBQUMsSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUM7SUFDdkQsQ0FBQztJQUNILE9BQU87UUFDSCxPQUFPLEtBQUssRUFBRSxHQUFZLEVBQUUsSUFBa0IsRUFBRSxFQUFFO1lBQzlDLE1BQU0sSUFBSSxHQUFHLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFRLENBQUM7WUFDN0MsSUFBSSxVQUFVLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxJQUFJLElBQUksQ0FBQyxVQUFVO2dCQUN0RSxHQUFHLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FB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

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

@@ -1,39 +0,0 @@
-import { MidwayCache } from '@midwayjs/cache-manager';
-import { BaseService } from '../base/base.service';
-import { Session, LoginByWxReq, LoginByWxRsp, LoginByAccountReq, LoginByAccountRsp } from '@fefeding/common/dist/models/account/session';
-export declare class SessionService extends BaseService {
-    sessionCache: MidwayCache;
-    sessionOption: {
-        timeout: number;
-        secretKey: string;
-    };
-    /**
-     * 根据ID获取session
-     * 并判断session是否在有效期
-     * @param id token唯一
-     */
-    getLoginSession(id: string): Promise<Session>;
-    /**
-     * 下线
-     * @param id 需要下线的id或者session
-     */
-    logout(id: string): Promise<any>;
-    /**
-     * 登录接口
-     * @param loginParams 登录参数
-     * @returns
-     */
-    loginByWx(loginParams: LoginByWxReq): Promise<LoginByWxRsp>;
-    /**
-     * 帐号登陆
-     * @param loginParams
-     * @returns
-     */
-    loginByAccount(loginParams: LoginByAccountReq): Promise<LoginByAccountRsp>;
-    /**
-     * 用临时码登陆
-     * @param code 登陆临时码
-     * @returns
-     */
-    loginByCode(code: string): Promise<import("@fefeding/common/dist/models/base/response").default<any>>;
-}

package/dist/service/session.service.js

@@ -1,93 +0,0 @@
-"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;
-};
-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.SessionService = void 0;
-// @ts-ignore
-const core_1 = require("@midwayjs/core");
-const cache_manager_1 = require("@midwayjs/cache-manager");
-const base_service_1 = require("../base/base.service");
-const session_1 = require("@fefeding/common/dist/models/account/session");
-let SessionService = class SessionService extends base_service_1.BaseService {
-    sessionCache;
-    sessionOption;
-    /**
-     * 根据ID获取session
-     * 并判断session是否在有效期
-     * @param id token唯一
-     */
-    async getLoginSession(id) {
-        const req = new session_1.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();
-        req.id = id;
-        const res = await this.requestBaseApi(req);
-        this.ctx.currentSession = null;
-        return res;
-    }
-    /**
-     * 登录接口
-     * @param loginParams 登录参数
-     * @returns
-     */
-    async loginByWx(loginParams) {
-        const req = new session_1.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();
-        req.fromJSON(loginParams);
-        const res = await this.requestBaseApi(req);
-        return res;
-    }
-    /**
-     * 用临时码登陆
-     * @param code 登陆临时码
-     * @returns
-     */
-    async loginByCode(code) {
-        const res = await this.requestBaseApi('/api/session/loginByAuthCode', {
-            data: {
-                code
-            }
-        });
-        return res;
-    }
-};
-exports.SessionService = SessionService;
-__decorate([
-    (0, core_1.InjectClient)(cache_manager_1.CachingFactory, 'session'),
-    __metadata("design:type", Object)
-], SessionService.prototype, "sessionCache", void 0);
-__decorate([
-    (0, core_1.Config)('session'),
-    __metadata("design:type", Object)
-], SessionService.prototype, "sessionOption", void 0);
-exports.SessionService = SessionService = __decorate([
-    (0, core_1.Provide)(),
-    (0, core_1.Scope)(core_1.ScopeEnum.Request, { allowDowngrade: true })
-], SessionService);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Vzc2lvbi5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2Uvc2Vzc2lvbi5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLGFBQWE7QUFDYix5Q0FBaUY7QUFDakYsMkRBQXNFO0FBQ3RFLHVEQUFtRDtBQUNuRCwwRUFBdU07QUFJaE0sSUFBTSxjQUFjLEdBQXBCLE1BQU0sY0FBZSxTQUFRLDBCQUFXO0lBRzNDLFlBQVksQ0FBYztJQUcxQixhQUFhLENBR1o7SUFFRDs7OztPQUlHO0lBQ0gsS0FBSyxDQUFDLGVBQWUsQ0FBQyxFQUFVO1FBQzVCLE1BQU0sR0FBRyxHQUFHLElBQUksNEJBQWtCLEVBQUUsQ0FBQztRQUNyQyxHQUFHLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQztRQUNaLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBcUIsR0FBRyxDQUFDLENBQUM7UUFDL0QsT0FBTyxHQUFHLEVBQUUsSUFBSSxJQUFJLElBQUksQ0FBQztJQUM3QixDQUFDO0lBQ0Q7OztPQUdHO0lBQ0gsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFVO1FBQ25CLE1BQU0sR0FBRyxHQUFHLElBQUksbUJBQVMsRUFBRSxDQUFDO1FBQzVCLEdBQUcsQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO1FBQ1osTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFZLEdBQUcsQ0FBQyxDQUFDO1FBQ3RELElBQUksQ0FBQyxHQUFHLENBQUMsY0FBYyxHQUFHLElBQUksQ0FBQztRQUMvQixPQUFPLEdBQUcsQ0FBQztJQUNmLENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsS0FBSyxDQUFDLFNBQVMsQ0FBQyxXQUF5QjtRQUNyQyxNQUFNLEdBQUcsR0FBRyxJQUFJLHNCQUFZLEVBQUUsQ0FBQztRQUMvQixHQUFHLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQzFCLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBZSxHQUFHLENBQUMsQ0FBQztRQUN6RCxPQUFPLEdBQUcsQ0FBQztJQUNmLENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsS0FBSyxDQUFDLGNBQWMsQ0FBQyxXQUE4QjtRQUMvQyxXQUFXLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQyxDQUFBLGtEQUFrRDtRQUUxRSxNQUFNLEdBQUcsR0FBRyxJQUFJLDJCQUFpQixFQUFFLENBQUM7UUFDcEMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUMxQixNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxjQUFjLENBQW9CLEdBQUcsQ0FBQyxDQUFDO1FBQzlELE9BQU8sR0FBRyxDQUFDO0lBQ2YsQ0FBQztJQUVEOzs7O09BSUc7SUFDSCxLQUFLLENBQUMsV0FBVyxDQUFDLElBQVk7UUFDMUIsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLDhCQUE4QixFQUFFO1lBQ2xFLElBQUksRUFBRTtnQkFDRixJQUFJO2FBQ1A7U0FDSixDQUFDLENBQUM7UUFDSCxPQUFPLEdBQUcsQ0FBQztJQUNmLENBQUM7Q0FDSixDQUFBO0FBekVZLHdDQUFjO0FBR3ZCO0lBREMsSUFBQSxtQkFBWSxFQUFDLDhCQUFjLEVBQUUsU0FBUyxDQUFDOztvREFDZDtBQUcxQjtJQURDLElBQUEsYUFBTSxFQUFDLFNBQVMsQ0FBQzs7cURBSWpCO3lCQVRRLGNBQWM7SUFGMUIsSUFBQSxjQUFPLEdBQUU7SUFDVCxJQUFBLFlBQUssRUFBQyxnQkFBUyxDQUFDLE9BQU8sRUFBRSxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUUsQ0FBQztHQUN0QyxjQUFjLENBeUUxQiJ9

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

@@ -1,38 +0,0 @@
-import * as fs from 'fs';
-import { BaseService } from '../base/base.service';
-interface TencentCredentialConfig {
-    secretId: string;
-    secretKey: string;
-}
-export declare class TencentService extends BaseService {
-    tencentCredentialConfig: TencentCredentialConfig | {
-        [client: string]: TencentCredentialConfig;
-    };
-    cosFileOption: {
-        [key: string]: {
-            /** 存储桶的名称，格式为<bucketname-appid>，例如examplebucket-1250000000 */
-            Bucket: string;
-            Region: string;
-            Key?: string;
-            Headers?: any;
-            url?: string;
-        };
-    };
-    cosClient(name: string): COS;
-    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>;
-}
-export {};

package/dist/service/tencent.service.js

@@ -1,87 +0,0 @@
-"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;
-};
-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("../base/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密钥管理}获取 */
-            SecretId: config.secretId,
-            /** 固定密钥的 SecretKey，可从{@link https://console.cloud.tencent.com/cam/capi|API密钥管理}获取 */
-            SecretKey: config.secretKey,
-        });
-        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)) {
-            body = JSON.stringify(body);
-        }
-        headers = {
-            ...option.Headers,
-            ...headers,
-        };
-        const res = await TxCos.putObject({
-            ...option,
-            Key: key,
-            Body: body,
-            Headers: headers
-        }, this.cosClient(client));
-        if (option.url) {
-            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({
-            ...option,
-            Key: key,
-            Sign: true,
-        }, this.cosClient(client));
-        return url;
-    }
-};
-exports.TencentService = TencentService;
-__decorate([
-    (0, core_1.Config)('tencentCredential'),
-    __metadata("design:type", Object)
-], TencentService.prototype, "tencentCredentialConfig", void 0);
-__decorate([
-    (0, core_1.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);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVuY2VudC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2UvdGVuY2VudC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLGFBQWE7QUFDYix5Q0FBZ0Y7QUFDaEYseUJBQXlCO0FBQ3pCLDJCQUEyQjtBQUMzQiwyREFBMkQ7QUFDM0QsbUNBQXVDO0FBQ3ZDLHVEQUFtRDtBQVM1QyxJQUFNLGNBQWMsR0FBcEIsTUFBTSxjQUFlLFNBQVEsMEJBQVc7SUFHM0MsdUJBQXVCLENBRXJCO0lBR0YsYUFBYSxDQWFaO0lBQ0QsV0FBVztJQUNYLFNBQVMsQ0FBQyxJQUFZO1FBQ2xCLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsdUJBQXVCLENBQUM7UUFDbEYsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLFlBQVksQ0FBQztZQUM5QixvRkFBb0Y7WUFDcEYsUUFBUSxFQUFFLE1BQU0sQ0FBQyxRQUFRO1lBQ3pCLHFGQUFxRjtZQUNyRixTQUFTLEVBQUUsTUFBTSxDQUFDLFNBQVM7U0FDOUIsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxNQUFNLENBQUM7SUFDbEIsQ0FBQztJQUVELE9BQU87SUFDUCxLQUFLLENBQUMsYUFBYSxDQUFDLEdBQVcsRUFBRSxRQUFnQixFQUFFLEdBQUcsR0FBQyxTQUFTLEVBQUUsT0FBTyxHQUFHLEVBQUUsRUFBRSxNQUFNLEdBQUcsU0FBUztRQUM5RixNQUFNLElBQUksR0FBRyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsUUFBUSxDQUFDLENBQUM7UUFFM0MsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUMvRCxDQUFDO0lBRUQsU0FBUztJQUNULEtBQUssQ0FBQyxhQUFhLENBQUMsR0FBVyxFQUFFLElBQStCLEVBQUUsR0FBRyxHQUFDLFNBQVMsRUFBRSxPQUFPLEdBQUcsRUFBRSxFQUFFLE1BQU0sR0FBRyxTQUFTO1FBQzdHLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDdkMsSUFBRyxJQUFBLHNCQUFhLEVBQUMsSUFBSSxDQUFDLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQzVDLElBQUksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hDLENBQUM7UUFDRCxPQUFPLEdBQUc7WUFDTixHQUFHLE1BQU0sQ0FBQyxPQUFPO1lBQ2pCLEdBQUcsT0FBTztTQUNiLENBQUM7UUFDRixNQUFNLEdBQUcsR0FBRyxNQUFNLEtBQUssQ0FBQyxTQUFTLENBQUM7WUFDOUIsR0FBRyxNQUFNO1lBQ1QsR0FBRyxFQUFFLEdBQUc7WUFDUixJQUFJLEVBQUUsSUFBSTtZQUNWLE9BQU8sRUFBRSxPQUFPO1NBQ25CLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FNeEIsQ0FBQztRQUVGLElBQUcsTUFBTSxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ1osR0FBRyxDQUFDLEdBQUcsR0FBRyxDQUFDLElBQUksR0FBRyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDeEQsQ0FBQztRQUVELE9BQU8sR0FBRyxDQUFDO0lBQ2YsQ0FBQztJQUVELG1CQUFtQjtJQUNuQixLQUFLLENBQUMsYUFBYSxDQUFDLEdBQVcsRUFBRSxHQUFHLEdBQUMsU0FBUyxFQUFFLE1BQU0sR0FBRyxTQUFTO1FBRTlELElBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNOLE1BQU0sS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzFCLENBQUM7UUFDRCxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3ZDLE1BQU0sR0FBRyxHQUFHLE1BQU0sS0FBSyxDQUFDLFlBQVksQ0FBQztZQUNqQyxHQUFHLE1BQU07WUFDVCxHQUFHLEVBQUUsR0FBRztZQUNSLElBQUksRUFBRSxJQUFJO1NBQ2IsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFXLENBQUM7UUFFckMsT0FBTyxHQUFHLENBQUM7SUFDZixDQUFDO0NBRUosQ0FBQTtBQXZGWSx3Q0FBYztBQUd2QjtJQURDLElBQUEsYUFBTSxFQUFDLG1CQUFtQixDQUFDOzsrREFHMUI7QUFHRjtJQURDLElBQUEsYUFBTSxFQUFDLGtCQUFrQixDQUFDOztxREFjMUI7eUJBckJRLGNBQWM7SUFGMUIsSUFBQSxjQUFPLEdBQUU7SUFDVCxJQUFBLFlBQUssRUFBQyxnQkFBUyxDQUFDLE9BQU8sRUFBRSxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUUsQ0FBQztHQUN0QyxjQUFjLENBdUYxQiJ9