@cicctencent/midwayjs-base 1.0.34 → 1.0.36

package/dist/types/middleware/apiResultFormatter.js

@@ -0,0 +1,83 @@
+"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;
+const core_1 = require("@midwayjs/core");
+const stream_1 = require("stream");
+let ApiResultFormatterMiddleware = class ApiResultFormatterMiddleware {
+    ignore(ctx) {
+        const koaCtx = ctx;
+        if (this.apiOption?.ignore) {
+            for (const ig of this.apiOption.ignore) {
+                if (typeof ig === 'string' && koaCtx.path === ig)
+                    return true;
+                if (ig?.test?.(koaCtx.path))
+                    return true;
+            }
+        }
+        return false;
+    }
+    resolve() {
+        return async (ctx, next) => {
+            const koaCtx = ctx;
+            const isApi = this.apiOption?.reg?.test(koaCtx.request.path);
+            if (isApi) {
+                try {
+                    await next();
+                    const res = koaCtx.body;
+                    if (this.canFormat(res)) {
+                        koaCtx.body = Object.assign({
+                            ret: 0,
+                            msg: 'success',
+                            data: null,
+                        }, typeof res?.ret === 'number' ? res : { data: res });
+                    }
+                }
+                catch (err) {
+                    console.error(err);
+                    if (typeof err?.ret === 'number') {
+                        koaCtx.body = err;
+                    }
+                    else {
+                        koaCtx.body = {
+                            ret: 1001,
+                            msg: err?.message || 'Error',
+                        };
+                    }
+                    koaCtx.logger.error(koaCtx.request.rawBody, koaCtx.body);
+                }
+                finally {
+                    if (koaCtx.status !== 302)
+                        koaCtx.status = 200;
+                }
+            }
+            else {
+                await next();
+            }
+        };
+    }
+    canFormat(data) {
+        return (data !== '' &&
+            !Buffer.isBuffer(data) &&
+            !(data instanceof stream_1.Stream ||
+                data instanceof Uint8Array ||
+                data instanceof Blob));
+    }
+};
+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=apiResultFormatter.js.map

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

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

package/dist/types/middleware/detect.middleware.js

@@ -0,0 +1,58 @@
+"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 koaCtx = ctx;
+            const UA = koaCtx.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);
+            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);
+            const IS_PCWEIXIN = /(Windows|Mac)Wechat/i.test(UA);
+            const IS_WXWORK = /wxwork\//i.test(UA);
+            const VER_MINA = /miniProgram/i.test(UA);
+            const IS_MINA = Boolean(VER_MINA);
+            let requestIP = (koaCtx.request.header['x-forwarded-for'] ||
+                koaCtx.request.ip ||
+                '').toString();
+            if (requestIP.includes(','))
+                requestIP = requestIP.split(',')[0];
+            const clientIP = (koaCtx.request.header['x-client-ip'] || requestIP).toString();
+            const hostname = koaCtx.get('tencent-acceleration-domain-name') ||
+                koaCtx.request.hostname;
+            koaCtx.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=detect.middleware.js.map

package/dist/types/middleware/requestInit.d.ts

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

package/dist/types/middleware/requestInit.js

@@ -0,0 +1,139 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RequestInitMiddleware = void 0;
+const core_1 = require("@midwayjs/core");
+const uuid_1 = require("uuid");
+const ip = __importStar(require("ip"));
+const logger_1 = __importDefault(require("@fefeding/common/dist/utils/logger"));
+let RequestInitMiddleware = class RequestInitMiddleware {
+    constructor() {
+        this.staticExtensions = [
+            '.js',
+            '.css',
+            '.jpg',
+            '.png',
+            '.ico',
+            '.svg',
+            '.woff',
+            '.woff2',
+            '.ttf',
+            '.eot',
+            '.map',
+        ];
+    }
+    ignore(ctx) {
+        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 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, '');
+            koaCtx.request_id = request_id;
+            const logger = new logger_1.default({
+                remoteUrl: this.loggerConfig?.remoteUrl,
+                serviceName: process.env.SERVICE_NAME,
+                logLevel: this.loggerConfig?.level,
+                requestId: koaCtx.request_id || '',
+                loginId: koaCtx.currentSession?.loginId || '',
+                userId: (koaCtx.currentSession?.userId || '').toString(),
+                clientIP: koaCtx.detect?.CLIENTIP || koaCtx.ip || '',
+                serverIP: ip.address() || '',
+                url: koaCtx.url,
+            });
+            koaCtx.logger = logger;
+            const startTime = Date.now();
+            try {
+                const result = await next();
+                const logData = {
+                    requestId: koaCtx.request_id,
+                    method: koaCtx.method,
+                    status: koaCtx.status,
+                    result,
+                    responseTime: Date.now() - startTime,
+                };
+                if (typeof logData.result === 'string') {
+                    logData.result = logData.result.substring(0, 500);
+                }
+                return result;
+            }
+            catch (error) {
+                logger.error('Request failed', {
+                    requestId: koaCtx.request_id,
+                    method: koaCtx.method,
+                    url: koaCtx.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=requestInit.js.map

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

@@ -0,0 +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 {
+    getLoginSession(id: string): Promise<Session | null>;
+    logout(id: string): Promise<any>;
+    loginByCode(code: string): Promise<any>;
+    loginByWx(loginParams: LoginByWxReq): Promise<LoginByWxRsp>;
+    loginByAccount(loginParams: LoginByAccountReq): Promise<LoginByAccountRsp>;
+}

package/dist/types/service/session.service.js

@@ -0,0 +1,56 @@
+"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;
+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 {
+    async getLoginSession(id) {
+        const req = new session_1.GetLoginSessionReq();
+        req.id = id;
+        const res = await this.requestBaseApi(req);
+        return res?.data || null;
+    }
+    async logout(id) {
+        const req = new session_1.LogoutReq();
+        req.id = id;
+        const res = await this.requestBaseApi(req);
+        this.ctx.currentSession = null;
+        return res;
+    }
+    async loginByCode(code) {
+        const res = await this.requestBaseApi('/api/session/loginByAuthCode', {
+            data: {
+                code,
+            },
+        });
+        if (res.ret === 0)
+            return res.data;
+        return null;
+    }
+    async loginByWx(loginParams) {
+        const req = new session_1.LoginByWxReq();
+        req.fromJSON(loginParams);
+        const res = await this.requestBaseApi(req);
+        return res;
+    }
+    async loginByAccount(loginParams) {
+        loginParams.appId = '0';
+        const req = new session_1.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);
+//# sourceMappingURL=session.service.js.map

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

@@ -0,0 +1,37 @@
+import * as fs from 'fs';
+import { BaseService } from '../types/base.service';
+interface TencentCredentialConfig {
+    secretId: string;
+    secretKey: string;
+}
+export declare class TencentService extends BaseService {
+    tencentCredentialConfig: TencentCredentialConfig | {
+        [client: string]: TencentCredentialConfig;
+    };
+    cosFileOption: {
+        [key: string]: {
+            Bucket: string;
+            Region: string;
+            Key?: string;
+            Headers?: any;
+            Domain?: string;
+            Protocol?: string;
+            CompatibilityMode?: boolean;
+            url?: string;
+        };
+    };
+    cosClient(name: string, option?: any): any;
+    uploadCosFile(key: string, filePath: string, cos?: string, headers?: {}, client?: string): Promise<{
+        ETag: string;
+        Location: string;
+        url?: string;
+    }>;
+    uploadCosData(key: string, body: string | fs.ReadStream | any, cos?: string, headers?: {}, client?: string): Promise<{
+        ETag: string;
+        Location: string;
+        url?: string;
+    }>;
+    getCosFileUrl(key: string, cos?: string, client?: string): Promise<string>;
+    getFile(key: string, cos?: string, client?: string): Promise<any>;
+}
+export {};

package/dist/types/service/tencent.service.js

@@ -0,0 +1,132 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+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;
+const core_1 = require("@midwayjs/core");
+const fs = __importStar(require("fs"));
+const url = __importStar(require("url"));
+const TxCos = __importStar(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 {
+    cosClient(name, option) {
+        const config = this.tencentCredentialConfig[name] ||
+            this.tencentCredentialConfig;
+        const clientOption = {
+            SecretId: config.secretId,
+            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)) {
+            body = JSON.stringify(body);
+        }
+        headers = {
+            ...option.Headers,
+            ...headers,
+        };
+        const res = (await TxCos.putObject({
+            ...option,
+            Key: key,
+            Body: body,
+            Headers: headers,
+        }, this.cosClient(client, option)));
+        if (option.url) {
+            res.url = new url.URL(key, option.url).toString();
+        }
+        return res;
+    }
+    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, option)));
+        return url;
+    }
+    async getFile(key, cos = 'default', client = 'default') {
+        if (!key) {
+            throw Error('指定文件地址');
+        }
+        const option = this.cosFileOption[cos];
+        const url = await TxCos.getFile({
+            ...option,
+            Key: key,
+            Sign: true,
+        }, this.cosClient(client, option));
+        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=tencent.service.js.map

package/dist/types/{base.controller.js → types/base.controller.js}

@@ -10,11 +10,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseController = void 0;
-// @ts-ignore
 const core_1 = require("@midwayjs/core");
 class BaseController {
-    app;
-    ctx;
 }
 exports.BaseController = BaseController;
 __decorate([
@@ -25,4 +22,4 @@ __decorate([
     (0, core_1.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 → 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/types/base.model.service.js

@@ -0,0 +1,76 @@
+"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 {
+    async save(entity, qryRunner) {
+        if (this.ctx?.currentSession?.loginId) {
+            entity.updater = this.ctx.currentSession.loginId;
+        }
+        if (qryRunner) {
+            return await qryRunner.manager.save(entity);
+        }
+        const res = await this.model.save(entity);
+        return res;
+    }
+    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: updater,
+            ...it,
+            updater,
+        }));
+        const models = await this.model.save(entities);
+        return isArray ? models : models[0];
+    }
+    async update(data, repo) {
+        let entities;
+        let isArray = false;
+        if (Array.isArray(data)) {
+            isArray = true;
+            entities = data;
+        }
+        else {
+            entities = [data];
+        }
+        const updater = this.ctx.currentSession?.loginId;
+        repo = repo || this.model;
+        const models = await repo.save(entities.map(o => {
+            return this.model.create({
+                ...o,
+                updater,
+            });
+        }));
+        return isArray ? models : models[0];
+    }
+    async delete(data, repo) {
+        repo = repo || this.model;
+        if (Array.isArray(data)) {
+            for (const m of data) {
+                await this.delete(m, repo);
+            }
+            return data;
+        }
+        else {
+            data.valid = enumType_1.EValid.Unvalid;
+            return await repo.save(data);
+        }
+    }
+    async findAndCount(where, options) {
+        const { select, order = { createTime: 'DESC' }, page = 1, size = 20, relations, } = options || {};
+        const skip = (Number(page) - 1) * Number(size);
+        let take = Number(size);
+        if (take > 10000)
+            take = 10000;
+        console.log('find count', where, skip, take);
+        const [rows, count] = await Promise.all([
+            this.model.find({ where, select, order, skip, take, relations }),
+            this.model.countBy(where),
+        ]);
+        return { rows, count };
+    }
+}
+exports.BaseModelService = BaseModelService;
+//# sourceMappingURL=base.model.service.js.map

package/dist/types/{base.service.d.ts → 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;