diff --git a/lib/base/http/TraceDio.dart b/lib/base/http/TraceDio.dart index b6f0214..4960df0 100644 --- a/lib/base/http/TraceDio.dart +++ b/lib/base/http/TraceDio.dart @@ -1,3 +1,5 @@ +import 'dart:convert'; + import 'package:EasyDartModule/base/logger/Logger.dart'; import 'package:dio/dio.dart'; import 'package:shelf/shelf.dart' as sf; @@ -41,8 +43,11 @@ class TraceDio { options.headers['X-Span-ID'] = spanId; } // 记录请求日志 - _logger?.info('发送请求: ${options.method} ${options.uri}', - tag: "DIO", traceId: traceId, spanId: spanId); + _logger?.info( + '发送请求: ${options.method} ${options.uri} ${options.data != null ? jsonEncode(options.data) : ""}', + tag: "DIO", + traceId: traceId, + spanId: spanId); return handler.next(options); // 继续请求 }, onResponse: (response, handler) { diff --git a/lib/base/logger/Logger.dart b/lib/base/logger/Logger.dart index 8ff8760..ebceeb2 100644 --- a/lib/base/logger/Logger.dart +++ b/lib/base/logger/Logger.dart @@ -38,7 +38,11 @@ abstract class Logger { class LoggerConfig { String host; String serviceName; + Map? lables; bool print; LoggerConfig( - {required this.host, required this.serviceName, this.print = false}); + {required this.host, + required this.serviceName, + this.print = false, + this.lables}); } diff --git a/lib/base/logger/impl/LokiLogger.dart b/lib/base/logger/impl/LokiLogger.dart index 722ee02..2c70d52 100644 --- a/lib/base/logger/impl/LokiLogger.dart +++ b/lib/base/logger/impl/LokiLogger.dart @@ -50,13 +50,13 @@ class LokiLogger implements Logger { var lable = data["lable"]; var time = data["time"]; //合并日志 - if (lable.length == 1) { - //只有默认标签 - labels = lable; - logs.add([time, log]); - } else { - //有多个标签按照不同标签进行合并 - } + // if (lable.length == 1) { + //只有默认标签 + labels = lable; + logs.add([time, log]); + // } else { + //有多个标签按照不同标签进行合并 + // } } if (labels != null) { var data = jsonEncode({ @@ -162,7 +162,12 @@ class LokiLogger implements Logger { var now = DateTime.now(); // 转换为纳秒 int nanoseconds = now.microsecondsSinceEpoch * 1000; - var lableMap = {"service_name": _config.serviceName}; + var lableMap = { + "service_name": _config.serviceName, + }; + if (_config.lables != null) { + lableMap.addAll(_config.lables!); + } if (lable != null) { lableMap.addAll(lable); } diff --git a/lib/base/redis/redis.dart b/lib/base/redis/redis.dart index f46f8d3..543ce48 100644 --- a/lib/base/redis/redis.dart +++ b/lib/base/redis/redis.dart @@ -1,5 +1,3 @@ -import 'dart:typed_data'; - import 'package:redis/redis.dart'; class Redis {