@saihu/common 1.1.68 → 1.1.70

package/dist/consts/common.consts.d.ts

@@ -3,6 +3,6 @@ export declare const LOGIN_USER_KEY = "login_user:";
 export declare const COMMON_MODULE_OPTIONS = "COMMON_MODULE_OPTIONS";
 export declare const REDIS_SERVICE = "REDIS_SERVICE";
 export declare const RABBITMQ_SERVICE = "RABBITMQ_SERVICE";
-export declare const OPER_LOG_QUEUE = "oper_log_queue";
+export declare const OPER_LOG_QUEUE = "q.oper.log.created.im-id";
 export declare const OPER_LOG_EXCHANGE = "oper_log_exchange";
 //# sourceMappingURL=common.consts.d.ts.map

package/dist/consts/common.consts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.consts.d.ts","sourceRoot":"","sources":["../../src/consts/common.consts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,aAAa,IAAI,CAAC;AAC/B,eAAO,MAAM,cAAc,gBAAgB,CAAC;AAC5C,eAAO,MAAM,qBAAqB,0BAA0B,CAAC;AAC7D,eAAO,MAAM,aAAa,kBAAkB,CAAC;AAC7C,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AACnD,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAC/C,eAAO,MAAM,iBAAiB,sBAAsB,CAAC"}
+{"version":3,"file":"common.consts.d.ts","sourceRoot":"","sources":["../../src/consts/common.consts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,IAAI,CAAC;AAC/B,eAAO,MAAM,cAAc,gBAAgB,CAAC;AAC5C,eAAO,MAAM,qBAAqB,0BAA0B,CAAC;AAC7D,eAAO,MAAM,aAAa,kBAAkB,CAAC;AAC7C,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AACnD,eAAO,MAAM,cAAc,6BAA6B,CAAC;AACzD,eAAO,MAAM,iBAAiB,sBAAsB,CAAC"}

package/dist/consts/common.consts.js

@@ -6,5 +6,5 @@ exports.LOGIN_USER_KEY = 'login_user:';
 exports.COMMON_MODULE_OPTIONS = 'COMMON_MODULE_OPTIONS';
 exports.REDIS_SERVICE = 'REDIS_SERVICE';
 exports.RABBITMQ_SERVICE = 'RABBITMQ_SERVICE';
-exports.OPER_LOG_QUEUE = 'oper_log_queue';
+exports.OPER_LOG_QUEUE = 'q.oper.log.created.im-id';
 exports.OPER_LOG_EXCHANGE = 'oper_log_exchange';

package/dist/consts/index.d.ts

@@ -1,2 +1,2 @@
-export * from "./common.consts";
+export * from './common.consts';
 //# sourceMappingURL=index.d.ts.map

package/dist/filters/index.d.ts

@@ -1,4 +1,3 @@
 export * from './base-error.filter';
-export * from './base-error-rpc.filter';
 export * from './validation-exception.filter';
 //# sourceMappingURL=index.d.ts.map

package/dist/filters/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/filters/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/filters/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC"}

package/dist/filters/index.js

@@ -15,5 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./base-error.filter"), exports);
-__exportStar(require("./base-error-rpc.filter"), exports);
 __exportStar(require("./validation-exception.filter"), exports);

package/dist/interceptors/operlog.interceptor.d.ts

@@ -1,8 +1,8 @@
-import { NestInterceptor, ExecutionContext, CallHandler } from "@nestjs/common";
-import { Reflector } from "@nestjs/core";
-import { Observable } from "rxjs";
-import { CommonModuleOptions } from "../interfaces/options.interface";
-import { RabbitmqService } from "../interfaces/service.interface";
+import { NestInterceptor, ExecutionContext, CallHandler } from '@nestjs/common';
+import { Reflector } from '@nestjs/core';
+import { Observable } from 'rxjs';
+import { CommonModuleOptions } from '../interfaces/options.interface';
+import { RabbitmqService } from '../interfaces/service.interface';
 export declare class OperlogInterceptor implements NestInterceptor {
     private reflector;
     private readonly rabbitmqService;

package/dist/interceptors/operlog.interceptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operlog.interceptor.d.ts","sourceRoot":"","sources":["../../src/interceptors/operlog.interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EACf,gBAAgB,EAChB,WAAW,EAGZ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAKtE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAIlE,qBACa,kBAAmB,YAAW,eAAe;IAMtD,OAAO,CAAC,SAAS;IACS,OAAO,CAAC,QAAQ,CAAC,eAAe;IAC3B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAPzD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAC9D,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,SAAS,CAAW;gBAGlB,SAAS,EAAE,SAAS,EACe,eAAe,EAAE,eAAe,EAC3B,OAAO,EAAE,mBAAmB;IAa9E,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC;IAqExE,OAAO,CAAC,WAAW;IAiCnB;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAWzB"}
+{"version":3,"file":"operlog.interceptor.d.ts","sourceRoot":"","sources":["../../src/interceptors/operlog.interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EACf,gBAAgB,EAChB,WAAW,EAGZ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAKtE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAIlE,qBACa,kBAAmB,YAAW,eAAe;IAMtD,OAAO,CAAC,SAAS;IACS,OAAO,CAAC,QAAQ,CAAC,eAAe;IAE1D,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAC9D,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,SAAS,CAAW;gBAGlB,SAAS,EAAE,SAAS,EACe,eAAe,EAAE,eAAe,EAE1D,OAAO,EAAE,mBAAmB;IAa/C,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC;IAqExE,OAAO,CAAC,WAAW;IAiCnB;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAWzB"}

package/dist/interceptors/operlog.interceptor.js

@@ -38,7 +38,7 @@ let OperlogInterceptor = OperlogInterceptor_1 = class OperlogInterceptor {
             return next.handle();
         }
         // 首先检查是否是 HTTP 请求
-        if (context.getType() !== "http") {
+        if (context.getType() !== 'http') {
             return next.handle();
         }
         const startTime = Date.now();
@@ -59,21 +59,21 @@ let OperlogInterceptor = OperlogInterceptor_1 = class OperlogInterceptor {
             return next.handle();
         }
         const method = request.method;
-        const userAgent = request.get("user-agent") || "";
+        const userAgent = request.get('user-agent') || '';
         const requestParams = this.getRequestParams(request);
         const operLog = {
             title: this.options.name,
-            method: controllerClass + "." + handler.name,
+            method: controllerClass + '.' + handler.name,
             request_method: method,
             user_agent: userAgent,
-            oper_name: (user === null || user === void 0 ? void 0 : user.name) || (user === null || user === void 0 ? void 0 : user.moniker) || "",
-            dept_name: (user === null || user === void 0 ? void 0 : user.dept_id) || "",
+            oper_name: (user === null || user === void 0 ? void 0 : user.name) || (user === null || user === void 0 ? void 0 : user.moniker) || '',
+            dept_name: (user === null || user === void 0 ? void 0 : user.dept_id) || '',
             oper_url: url,
             oper_ip: clientIp,
             oper_param: JSON.stringify(requestParams),
-            json_result: "",
+            json_result: '',
             status: 0,
-            error_msg: "",
+            error_msg: '',
             oper_time: startTime,
             cost_time: 0,
         };
@@ -95,9 +95,9 @@ let OperlogInterceptor = OperlogInterceptor_1 = class OperlogInterceptor {
     getClientIp(request) {
         try {
             // 尝试从多个可能的头部获取 IP 地址
-            const possibleHeaders = ["x-forwarded-for"];
+            const possibleHeaders = ['x-forwarded-for'];
             let clientIp = request.ip ||
-                (request.connection ? request.connection.remoteAddress || "" : "");
+                (request.connection ? request.connection.remoteAddress || '' : '');
             // 检查各种可能的头部
             for (const header of possibleHeaders) {
                 if (request.headers[header]) {
@@ -106,18 +106,18 @@ let OperlogInterceptor = OperlogInterceptor_1 = class OperlogInterceptor {
                 }
             }
             // 处理 IP 数组（如 x-forwarded-for: client, proxy1, proxy2）
-            if (clientIp && typeof clientIp === "string" && clientIp.includes(",")) {
-                clientIp = clientIp.split(",")[0].trim();
+            if (clientIp && typeof clientIp === 'string' && clientIp.includes(',')) {
+                clientIp = clientIp.split(',')[0].trim();
             }
             // 移除 IPv6 前缀（如果存在）
-            if (clientIp && clientIp.substr(0, 7) === "::ffff:") {
+            if (clientIp && clientIp.substr(0, 7) === '::ffff:') {
                 clientIp = clientIp.substr(7);
             }
             return clientIp;
         }
         catch (error) {
-            this.logger.error("Failed to get client IP:", error);
-            return "";
+            this.logger.error('Failed to get client IP:', error);
+            return '';
         }
     }
     /**

package/dist/logger/saihu-logger.service.js

@@ -17,7 +17,7 @@ class SaihuLogger {
             'MicroserviceConfiguration',
             'RabbitMQModule',
             'WebSocketsController',
-            'ExceptionsHandler', // ← Add this
+            // 'ExceptionsHandler', // ← Add this
         ];
         return hiddenContexts.some((hidden) => context.includes(hidden));
     }

package/dist/messaging/topology.js

@@ -93,7 +93,7 @@ exports.ExchangeTypes = {
     [Exchanges.IM_DATA]: 'topic',
     [Exchanges.IM_INVENTORY]: 'topic',
     [Exchanges.MASTER_DATA]: 'topic',
-    [Exchanges.OPER_LOG_EXCHANGE]: 'direct',
+    [Exchanges.OPER_LOG_EXCHANGE]: 'topic',
     [Exchanges.IM_SALES_ORDER]: 'topic',
     [Exchanges.SCM_DATA]: 'topic',
     [Exchanges.IM_PROCUREMENT_ORDER_DLX]: 'topic',

package/dist/services/rabbitmq.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rabbitmq.service.d.ts","sourceRoot":"","sources":["../../src/services/rabbitmq.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,eAAe,EAGhB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAMtE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAElE,qBACa,mBACX,YAAW,eAAe,EAAE,YAAY,EAAE,eAAe;IAUvD,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;IAC/D,OAAO,CAAC,UAAU,CAAgC;IAClD,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,SAAS,CAAU;gBAIR,OAAO,EAAE,mBAAmB;IAKzC,YAAY;IAMZ,eAAe;IAIf,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAY3B,cAAc,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;CAkBrD"}
+{"version":3,"file":"rabbitmq.service.d.ts","sourceRoot":"","sources":["../../src/services/rabbitmq.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,eAAe,EAGhB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAGlE,qBACa,mBACX,YAAW,eAAe,EAAE,YAAY,EAAE,eAAe;IAUvD,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;IAC/D,OAAO,CAAC,UAAU,CAAgC;IAClD,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,SAAS,CAAU;gBAIR,OAAO,EAAE,mBAAmB;IAKzC,YAAY;IAMZ,eAAe;IAIf,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAY3B,cAAc,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;CAkBrD"}

package/dist/services/rabbitmq.service.js

@@ -50,6 +50,7 @@ exports.RabbitmqServiceImpl = void 0;
 const common_1 = require("@nestjs/common");
 const amqp = __importStar(require("amqplib"));
 const common_consts_1 = require("../consts/common.consts");
+const messaging_1 = require("../messaging");
 let RabbitmqServiceImpl = RabbitmqServiceImpl_1 = class RabbitmqServiceImpl {
     constructor(options) {
         this.options = options;
@@ -110,7 +111,7 @@ let RabbitmqServiceImpl = RabbitmqServiceImpl_1 = class RabbitmqServiceImpl {
         }
         try {
             const messageBuffer = Buffer.from(JSON.stringify(message));
-            return this.channel.publish(common_consts_1.OPER_LOG_EXCHANGE, common_consts_1.OPER_LOG_QUEUE, messageBuffer);
+            return this.channel.publish(messaging_1.Exchanges.OPER_LOG_EXCHANGE, messaging_1.RoutingKeys[messaging_1.Exchanges.OPER_LOG_EXCHANGE].OPER_LOG_CREATED, messageBuffer);
         }
         catch (error) {
             this.logger.error('Failed to publish message to RabbitMQ:', error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saihu/common",
-  "version": "1.1.68",
+  "version": "1.1.70",
   "description": "Common utilities for NestJS applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -33,6 +33,7 @@
     "@nestjs/config": "^4.0.2",
     "@nestjs/core": "^11.1.1",
     "@nestjs/jwt": "^11.0.0",
+    "@nestjs/microservices": "^11.1.6",
     "amqp-connection-manager": "^5.0.0",
     "amqplib": "^0.10.9",
     "class-transformer": "^0.5.1",