@cicctencent/midwayjs-base 1.0.37 → 1.0.39

package/dist/guard/auth.js

@@ -1,3 +1,4 @@
+"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);
@@ -7,78 +8,73 @@ 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 { App, Config, Guard, Init } from '@midwayjs/core';
-import { getCheckLogin } from '../lib/decorator';
-import { getAuthToken, setAuthToken, decodeJWT } from '../lib/utils';
-import { DEFAULT_SESSION_SERVICE_KEY, } from '../types/session.service.interface';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthGuard = void 0;
+const core_1 = require("@midwayjs/core");
+const decorator_1 = require("../lib/decorator");
+const utils_1 = require("../lib/utils");
+const session_service_interface_1 = require("../types/session.service.interface");
+const error_code_1 = require("../constants/error-code");
 let AuthGuard = class AuthGuard {
     async init() {
         const appContext = this.app.getApplicationContext();
-        console.log('init auth guard');
-        this.sessionService = await appContext.getAsync(DEFAULT_SESSION_SERVICE_KEY);
-        if (this.sessionService?.sessionOption?.serviceKey &&
-            this.sessionService?.sessionOption.serviceKey !==
-                DEFAULT_SESSION_SERVICE_KEY) {
-            const sessionServiceObj = await appContext.getAsync(this.sessionService.sessionOption.serviceKey);
-            if (sessionServiceObj) {
-                console.log('use custom session service for auth guard', this.sessionService.sessionOption.serviceKey);
-                this.sessionService = sessionServiceObj;
+        this.sessionService = await appContext.getAsync(session_service_interface_1.DEFAULT_SESSION_SERVICE_KEY);
+        const customKey = this.sessionService?.sessionOption?.serviceKey;
+        if (customKey && customKey !== session_service_interface_1.DEFAULT_SESSION_SERVICE_KEY) {
+            const customService = await appContext.getAsync(customKey);
+            if (customService) {
+                this.sessionService = customService;
             }
         }
     }
+    isPathIgnored(path) {
+        const ignores = this.authOption?.ignores;
+        if (!ignores)
+            return false;
+        if (ignores === '*')
+            return true;
+        if (typeof ignores === 'string') {
+            return ignores === path;
+        }
+        if (Array.isArray(ignores)) {
+            return ignores.some(rule => rule === '*' ||
+                (rule instanceof RegExp ? rule.test(path) : rule === path));
+        }
+        return false;
+    }
     checkNeedAuth(context, supplierClz, methodName) {
-        if (this.authOption?.ignores) {
-            if (this.authOption.ignores === '*' ||
-                this.authOption.ignores === context.path) {
-                return false;
-            }
-            if (Array.isArray(this.authOption.ignores)) {
-                if (this.authOption.ignores.includes('*'))
-                    return false;
-                for (const t of this.authOption.ignores) {
-                    if (t instanceof RegExp) {
-                        if (t.test(context.path))
-                            return false;
-                    }
-                    else if (typeof t === 'string') {
-                        if (t === context.path)
-                            return false;
-                    }
-                }
-            }
+        if (this.isPathIgnored(context.path)) {
+            return false;
         }
-        const needAuth = getCheckLogin(supplierClz, methodName);
-        return needAuth;
+        return (0, decorator_1.getCheckLogin)(supplierClz, methodName) === true;
     }
     async canActivate(context, supplierClz, methodName) {
         const needAuth = this.checkNeedAuth(context, supplierClz, methodName);
-        const token = getAuthToken(context);
+        const token = (0, utils_1.getAuthToken)(context);
         if (token)
             context.auth_token = token;
-        const ret = await this.checkAuth(context, token, needAuth);
-        return ret;
+        await this.checkAuth(context, token, needAuth);
+        return true;
     }
     async checkAuth(context, token, needAuth) {
         this.sessionService.ctx = context;
-        const authRet = 50001;
         let errRes = null;
+        let session = null;
         try {
-            let session = null;
             const authCode = context.URL.searchParams.get('auth_code');
             if (authCode) {
                 session = await this.sessionService.loginByCode(authCode);
                 if (session) {
-                    setAuthToken(context, session.id);
+                    (0, utils_1.setAuthToken)(context, session.id);
                 }
                 context.URL.searchParams.delete('auth_code');
                 context.URL.hostname = context.detect?.HOSTNAME || context.hostname;
-                const url = context.URL.toString();
-                context.redirect(url);
-                return true;
+                context.redirect(context.URL.toString());
+                return;
             }
-            if (token && !errRes && !session) {
+            if (token) {
                 if (token.startsWith('Bearer ')) {
-                    const jwtData = decodeJWT(token.replace('Bearer ', ''), this.sessionService?.sessionOption?.secretKey || 'fefeding');
+                    const jwtData = (0, utils_1.decodeJWT)(token.replace('Bearer ', ''), this.sessionService?.sessionOption?.secretKey || 'fefeding');
                     if (jwtData) {
                         session = jwtData;
                     }
@@ -86,58 +82,58 @@ let AuthGuard = class AuthGuard {
                 else {
                     session = await this.sessionService.getLoginSession(token);
                 }
-                if (!session || !session.id) {
-                    setAuthToken(context, '');
+                if (!session?.id) {
+                    (0, utils_1.setAuthToken)(context, '');
                     errRes = {
-                        ret: authRet,
+                        ret: error_code_1.ErrorCode.TOKEN_EXPIRED,
                         msg: 'token不存在或已过期',
                     };
                 }
             }
             if (!session) {
                 errRes = {
-                    ret: authRet,
+                    ret: error_code_1.ErrorCode.AUTH_REQUIRED,
                     msg: '需要登陆态',
                 };
             }
             context.currentSession = session;
-            if (session && context.logger?.setOptions) {
-                context.logger.setOptions({
-                    loginId: session?.loginId || '',
-                    userId: (session?.userId || '').toString(),
-                });
+            if (session && context.logger) {
+                if (typeof context.logger.setOptions === 'function') {
+                    context.logger.setOptions({
+                        loginId: session.loginId || '',
+                        userId: (session.userId || '').toString(),
+                    });
+                }
             }
         }
         catch (e) {
             errRes = {
-                ret: e?.ret || authRet,
+                ret: e?.ret || error_code_1.ErrorCode.SYSTEM_ERROR,
                 msg: e?.msg || e?.message || 'auth error',
             };
-            console.error(e);
+            context.logger?.error('Auth check error:', e);
         }
         if (errRes && needAuth) {
             this.authError(context, errRes);
         }
-        return true;
     }
     authError(context, error) {
         const isApi = this.apiOption?.reg?.test(context.path);
         if (isApi) {
             context.status = 200;
-            context.res.write('', 'utf8');
-            throw error;
+            throw new error_code_1.BizError(error.ret, error.msg);
         }
         else {
             const loginUrl = `${this.ssoOption?.baseUrl || this.koa?.globalPrefix || ''}/login`;
             if (!/\/login\/?(\?|$|#)/.test(context.URL.pathname)) {
                 const URL = context.URL;
-                if (context.detect?.HOSTNAME &&
-                    URL.hostname !== context.detect?.HOSTNAME)
+                if (context.detect?.HOSTNAME && URL.hostname !== context.detect.HOSTNAME) {
                     URL.hostname = context.detect.HOSTNAME;
+                }
                 URL.searchParams.delete('jv_auth_code');
                 URL.searchParams.delete('token');
                 URL.searchParams.delete('auth_code');
-                const redirectUrl = context.URL.toString();
+                const redirectUrl = URL.toString();
                 context.redirect(`${loginUrl}?url=${encodeURIComponent(redirectUrl)}&appid=${this.ssoOption?.appId || 0}`);
             }
             else {
@@ -146,34 +142,34 @@ let AuthGuard = class AuthGuard {
         }
     }
 };
+exports.AuthGuard = AuthGuard;
 __decorate([
-    App(),
+    (0, core_1.App)(),
     __metadata("design:type", Object)
 ], AuthGuard.prototype, "app", void 0);
 __decorate([
-    Config('sso'),
+    (0, core_1.Config)('sso'),
     __metadata("design:type", Object)
 ], AuthGuard.prototype, "ssoOption", void 0);
 __decorate([
-    Config('auth'),
+    (0, core_1.Config)('auth'),
     __metadata("design:type", Object)
 ], AuthGuard.prototype, "authOption", void 0);
 __decorate([
-    Config('apiOption'),
+    (0, core_1.Config)('apiOption'),
     __metadata("design:type", Object)
 ], AuthGuard.prototype, "apiOption", void 0);
 __decorate([
-    Config('koa'),
+    (0, core_1.Config)('koa'),
     __metadata("design:type", Object)
 ], AuthGuard.prototype, "koa", void 0);
 __decorate([
-    Init(),
+    (0, core_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], AuthGuard.prototype, "init", null);
-AuthGuard = __decorate([
-    Guard()
+exports.AuthGuard = AuthGuard = __decorate([
+    (0, core_1.Guard)()
 ], AuthGuard);
-export { AuthGuard };
 //# sourceMappingURL=auth.js.map

package/dist/index.d.ts

@@ -5,6 +5,7 @@ export * as jwt from './lib/jwt';
 export * as decorators from './lib/decorator';
 export * from '@fefeding/common/dist/models/base/enumType';
 export { BaseORM as BaseEntity } from '@fefeding/common/dist/models/base/baseORM';
+export * from './constants/error-code';
 export * from './middleware/apiResultFormatter';
 export * from './middleware/requestInit';
 export * from './middleware/detect.middleware';
@@ -16,3 +17,4 @@ export * from './types/base.controller';
 export * from './types/session.service.interface';
 export * from './service/session.service';
 export * from './service/tencent.service';
+export * from './filter/default.filter';

package/dist/index.js

@@ -1,19 +1,62 @@
-export * as koa from '@midwayjs/koa';
-export { BaseConfiguration as Configuration } from './configuration';
-export * as utils from './lib/utils';
-export * as jwt from './lib/jwt';
-export * as decorators from './lib/decorator';
-export * from '@fefeding/common/dist/models/base/enumType';
-export { BaseORM as BaseEntity } from '@fefeding/common/dist/models/base/baseORM';
-export * from './middleware/apiResultFormatter';
-export * from './middleware/requestInit';
-export * from './middleware/detect.middleware';
-export * from './guard/api';
-export * from './guard/auth';
-export * from './types/base.service';
-export * from './types/base.model.service';
-export * from './types/base.controller';
-export * from './types/session.service.interface';
-export * from './service/session.service';
-export * from './service/tencent.service';
+"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 __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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseEntity = exports.decorators = exports.jwt = exports.utils = exports.Configuration = exports.koa = void 0;
+exports.koa = __importStar(require("@midwayjs/koa"));
+var configuration_1 = require("./configuration");
+Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.BaseConfiguration; } });
+exports.utils = __importStar(require("./lib/utils"));
+exports.jwt = __importStar(require("./lib/jwt"));
+exports.decorators = __importStar(require("./lib/decorator"));
+__exportStar(require("@fefeding/common/dist/models/base/enumType"), exports);
+var baseORM_1 = require("@fefeding/common/dist/models/base/baseORM");
+Object.defineProperty(exports, "BaseEntity", { enumerable: true, get: function () { return baseORM_1.BaseORM; } });
+__exportStar(require("./constants/error-code"), exports);
+__exportStar(require("./middleware/apiResultFormatter"), exports);
+__exportStar(require("./middleware/requestInit"), exports);
+__exportStar(require("./middleware/detect.middleware"), exports);
+__exportStar(require("./guard/api"), exports);
+__exportStar(require("./guard/auth"), exports);
+__exportStar(require("./types/base.service"), exports);
+__exportStar(require("./types/base.model.service"), exports);
+__exportStar(require("./types/base.controller"), exports);
+__exportStar(require("./types/session.service.interface"), exports);
+__exportStar(require("./service/session.service"), exports);
+__exportStar(require("./service/tencent.service"), exports);
+__exportStar(require("./filter/default.filter"), exports);
 //# sourceMappingURL=index.js.map

package/dist/lib/decorator.d.ts

@@ -1,5 +1,5 @@
 export declare function checkApiToken(need?: boolean): MethodDecorator;
-export declare function getApiToken(target: any, propertyKey: string | symbol): any;
+export declare function getApiToken(target: any, propertyKey: string | symbol): boolean;
 export declare function checkLogin(need?: boolean): MethodDecorator;
 export declare function getCheckLogin(target: any, propertyKey: string | symbol): any;
 export declare function checkIP(need?: boolean): MethodDecorator;

package/dist/lib/decorator.js

@@ -1,37 +1,47 @@
-import { savePropertyMetadata, getPropertyMetadata } from '@midwayjs/core';
-import decorators from '@fefeding/common/dist/utils/decorator';
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkApiToken = checkApiToken;
+exports.getApiToken = getApiToken;
+exports.checkLogin = checkLogin;
+exports.getCheckLogin = getCheckLogin;
+exports.checkIP = checkIP;
+exports.getCheckIP = getCheckIP;
+const core_1 = require("@midwayjs/core");
+const decorator_1 = __importDefault(require("@fefeding/common/dist/utils/decorator"));
 const CheckIPKey = 'decorator:CheckIPKey';
-export function checkApiToken(need = true) {
+function checkApiToken(need = true) {
     return (target, propertyKey) => {
-        savePropertyMetadata(decorators.apiTokenMetadataKey, need, target, propertyKey);
+        (0, core_1.savePropertyMetadata)(decorator_1.default.apiTokenMetadataKey, need, target, propertyKey);
     };
 }
-export function getApiToken(target, propertyKey) {
+function getApiToken(target, propertyKey) {
     try {
-        const value = getPropertyMetadata(decorators.apiTokenMetadataKey, target, propertyKey);
-        return value;
+        const value = (0, core_1.getPropertyMetadata)(decorator_1.default.apiTokenMetadataKey, target, propertyKey);
+        return value === true;
     }
-    catch (e) {
-        console.log(e);
+    catch {
         return false;
     }
 }
-export function checkLogin(need = true) {
+function checkLogin(need = true) {
     return (target, propertyKey) => {
-        savePropertyMetadata(decorators.apiAuthMetadataKey, need, target, propertyKey);
+        (0, core_1.savePropertyMetadata)(decorator_1.default.apiAuthMetadataKey, need, target, propertyKey);
     };
 }
-export function getCheckLogin(target, propertyKey) {
-    const value = getPropertyMetadata(decorators.apiAuthMetadataKey, target, propertyKey);
+function getCheckLogin(target, propertyKey) {
+    const value = (0, core_1.getPropertyMetadata)(decorator_1.default.apiAuthMetadataKey, target, propertyKey);
     return value;
 }
-export function checkIP(need = true) {
+function checkIP(need = true) {
     return (target, propertyKey) => {
-        savePropertyMetadata(CheckIPKey, need, target, propertyKey);
+        (0, core_1.savePropertyMetadata)(CheckIPKey, need, target, propertyKey);
     };
 }
-export function getCheckIP(target, propertyKey) {
-    const value = getPropertyMetadata(CheckIPKey, target, propertyKey);
+function getCheckIP(target, propertyKey) {
+    const value = (0, core_1.getPropertyMetadata)(CheckIPKey, target, propertyKey);
     return value;
 }
 //# sourceMappingURL=decorator.js.map

package/dist/lib/jwt.js

@@ -1,5 +1,42 @@
-import * as jwt from 'jsonwebtoken';
-export function decodeJWT(token, secretKey, options) {
+"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 __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;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeJWT = decodeJWT;
+exports.encodeJWT = encodeJWT;
+const jwt = __importStar(require("jsonwebtoken"));
+function decodeJWT(token, secretKey, options) {
     try {
         const decoded = jwt.verify(token, secretKey, {
             algorithms: ['HS256'],
@@ -12,7 +49,7 @@ export function decodeJWT(token, secretKey, options) {
         return null;
     }
 }
-export function encodeJWT(data, secretKey, options) {
+function encodeJWT(data, secretKey, options) {
     const token = jwt.sign(data, secretKey, {
         algorithm: 'HS256',
         ...(options || {}),

package/dist/lib/request.js

@@ -1,3 +1,7 @@
-import { requestApi, requestServer } from '@fefeding/common/dist/utils/axios';
-export { requestApi, requestServer };
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requestServer = exports.requestApi = void 0;
+const axios_1 = require("@fefeding/common/dist/utils/axios");
+Object.defineProperty(exports, "requestApi", { enumerable: true, get: function () { return axios_1.requestApi; } });
+Object.defineProperty(exports, "requestServer", { enumerable: true, get: function () { return axios_1.requestServer; } });
 //# sourceMappingURL=request.js.map

package/dist/lib/utils.js

@@ -1,6 +1,28 @@
-export * from './jwt';
-import { loadEnv } from '../config/env';
-export function checkUrlHost(url, host) {
+"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadEnv = void 0;
+exports.checkUrlHost = checkUrlHost;
+exports.getDefaultTemplate = getDefaultTemplate;
+exports.getAuthToken = getAuthToken;
+exports.setAuthToken = setAuthToken;
+__exportStar(require("./jwt"), exports);
+const env_1 = require("../config/env");
+Object.defineProperty(exports, "loadEnv", { enumerable: true, get: function () { return env_1.loadEnv; } });
+function checkUrlHost(url, host) {
     if (/^\/[^\/]{1,}/.test(url))
         return true;
     if (Array.isArray(host)) {
@@ -13,7 +35,7 @@ export function checkUrlHost(url, host) {
     const reg = new RegExp('^(http(s)?:)?//' + host);
     return reg.test(url);
 }
-export function getDefaultTemplate(ctx, file = 'index.html', data = {}) {
+function getDefaultTemplate(ctx, file = 'index.html', data = {}) {
     const viteTarget = process.env.VITE_PORT;
     const config = ctx.app.getConfig();
     const prefix = config.koa.globalPrefix;
@@ -34,7 +56,7 @@ export function getDefaultTemplate(ctx, file = 'index.html', data = {}) {
     };
     return ctx.render(file, option);
 }
-export function getAuthToken(ctx, option) {
+function getAuthToken(ctx, option) {
     const body = (ctx.request.body || {});
     const token = ctx.URL.searchParams.get('token') ||
         ctx.request.header['x-auth-token'] ||
@@ -46,12 +68,11 @@ export function getAuthToken(ctx, option) {
         body.token;
     return token;
 }
-export function setAuthToken(ctx, token, option) {
+function setAuthToken(ctx, token, option) {
     ctx.cookies.set('token', token, {
         httpOnly: true,
         maxAge: 1000 * 60 * 60 * 24 * 30,
         ...(option || {}),
     });
 }
-export { loadEnv };
 //# sourceMappingURL=utils.js.map

package/dist/middleware/apiResultFormatter.js

@@ -1,3 +1,4 @@
+"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);
@@ -7,8 +8,11 @@ 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 { Middleware, Config, } from '@midwayjs/core';
-import { Stream } from 'stream';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApiResultFormatterMiddleware = void 0;
+const core_1 = require("@midwayjs/core");
+const stream_1 = require("stream");
+const error_code_1 = require("../constants/error-code");
 let ApiResultFormatterMiddleware = class ApiResultFormatterMiddleware {
     ignore(ctx) {
         const koaCtx = ctx;
@@ -39,17 +43,16 @@ let ApiResultFormatterMiddleware = class ApiResultFormatterMiddleware {
                     }
                 }
                 catch (err) {
-                    console.error(err);
-                    if (typeof err?.ret === 'number') {
-                        koaCtx.body = err;
+                    if (err instanceof error_code_1.BizError || typeof err?.ret === 'number') {
+                        koaCtx.body = err instanceof error_code_1.BizError ? err.toJSON() : err;
                     }
                     else {
                         koaCtx.body = {
-                            ret: 1001,
-                            msg: err?.message || 'Error',
+                            ret: error_code_1.ErrorCode.SYSTEM_ERROR,
+                            msg: err?.message || '系统错误',
                         };
                     }
-                    koaCtx.logger.error(koaCtx.request.rawBody, koaCtx.body);
+                    koaCtx.logger.error('API error:', koaCtx.request.rawBody, koaCtx.body);
                 }
                 finally {
                     if (koaCtx.status !== 302)
@@ -64,17 +67,17 @@ let ApiResultFormatterMiddleware = class ApiResultFormatterMiddleware {
     canFormat(data) {
         return (data !== '' &&
             !Buffer.isBuffer(data) &&
-            !(data instanceof Stream ||
+            !(data instanceof stream_1.Stream ||
                 data instanceof Uint8Array ||
                 data instanceof Blob));
     }
 };
+exports.ApiResultFormatterMiddleware = ApiResultFormatterMiddleware;
 __decorate([
-    Config('apiOption'),
+    (0, core_1.Config)('apiOption'),
     __metadata("design:type", Object)
 ], ApiResultFormatterMiddleware.prototype, "apiOption", void 0);
-ApiResultFormatterMiddleware = __decorate([
-    Middleware()
+exports.ApiResultFormatterMiddleware = ApiResultFormatterMiddleware = __decorate([
+    (0, core_1.Middleware)()
 ], ApiResultFormatterMiddleware);
-export { ApiResultFormatterMiddleware };
 //# sourceMappingURL=apiResultFormatter.js.map

package/dist/middleware/detect.middleware.js

@@ -1,10 +1,13 @@
+"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;
 };
-import { Middleware } from '@midwayjs/core';
+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) => {
@@ -48,8 +51,8 @@ let DetectMiddleware = class DetectMiddleware {
         };
     }
 };
-DetectMiddleware = __decorate([
-    Middleware()
+exports.DetectMiddleware = DetectMiddleware;
+exports.DetectMiddleware = DetectMiddleware = __decorate([
+    (0, core_1.Middleware)()
 ], DetectMiddleware);
-export { DetectMiddleware };
 //# sourceMappingURL=detect.middleware.js.map