add JRZQ09J8、FLXGDEA8、FLXGDEA9、JRZQ1D09
add external_services log
This commit is contained in:
@@ -35,6 +35,7 @@ import (
|
||||
"tyapi-server/internal/infrastructure/external/tianyancha"
|
||||
"tyapi-server/internal/infrastructure/external/westdex"
|
||||
"tyapi-server/internal/infrastructure/external/yushan"
|
||||
"tyapi-server/internal/infrastructure/external/zhicha"
|
||||
"tyapi-server/internal/infrastructure/http/handlers"
|
||||
"tyapi-server/internal/infrastructure/http/routes"
|
||||
shared_database "tyapi-server/internal/shared/database"
|
||||
@@ -82,37 +83,44 @@ func NewContainer() *Container {
|
||||
fx.Provide(
|
||||
// 日志器 - 提供自定义Logger和*zap.Logger
|
||||
func(cfg *config.Config) (logger.Logger, error) {
|
||||
// 将 config.LoggerConfig 转换为 logger.Config
|
||||
// 转换 LevelConfigs 类型
|
||||
levelConfigs := make(map[string]interface{})
|
||||
for key, value := range cfg.Logger.LevelConfigs {
|
||||
levelConfigs[key] = value
|
||||
}
|
||||
|
||||
logCfg := logger.Config{
|
||||
Level: cfg.Logger.Level,
|
||||
Format: cfg.Logger.Format,
|
||||
Output: cfg.Logger.Output,
|
||||
LogDir: cfg.Logger.LogDir,
|
||||
MaxSize: cfg.Logger.MaxSize,
|
||||
MaxBackups: cfg.Logger.MaxBackups,
|
||||
MaxAge: cfg.Logger.MaxAge,
|
||||
Compress: cfg.Logger.Compress,
|
||||
UseDaily: cfg.Logger.UseDaily,
|
||||
UseColor: cfg.Logger.UseColor,
|
||||
EnableLevelSeparation: cfg.Logger.EnableLevelSeparation,
|
||||
LevelConfigs: levelConfigs,
|
||||
Development: cfg.App.Env == "development",
|
||||
}
|
||||
|
||||
// 初始化全局日志器
|
||||
if err := logger.InitGlobalLogger(logCfg); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if cfg.Logger.EnableLevelSeparation {
|
||||
// 使用按级别分文件的日志器
|
||||
levelConfig := logger.LevelLoggerConfig{
|
||||
BaseConfig: logger.Config{
|
||||
Level: cfg.Logger.Level,
|
||||
Format: cfg.Logger.Format,
|
||||
Output: cfg.Logger.Output,
|
||||
LogDir: cfg.Logger.LogDir,
|
||||
MaxSize: cfg.Logger.MaxSize,
|
||||
MaxBackups: cfg.Logger.MaxBackups,
|
||||
MaxAge: cfg.Logger.MaxAge,
|
||||
Compress: cfg.Logger.Compress,
|
||||
UseDaily: cfg.Logger.UseDaily,
|
||||
},
|
||||
BaseConfig: logCfg,
|
||||
EnableLevelSeparation: true,
|
||||
LevelConfigs: convertLevelConfigs(cfg.Logger.LevelConfigs),
|
||||
}
|
||||
return logger.NewLevelLogger(levelConfig)
|
||||
} else {
|
||||
// 使用普通日志器
|
||||
logCfg := logger.Config{
|
||||
Level: cfg.Logger.Level,
|
||||
Format: cfg.Logger.Format,
|
||||
Output: cfg.Logger.Output,
|
||||
LogDir: cfg.Logger.LogDir,
|
||||
MaxSize: cfg.Logger.MaxSize,
|
||||
MaxBackups: cfg.Logger.MaxBackups,
|
||||
MaxAge: cfg.Logger.MaxAge,
|
||||
Compress: cfg.Logger.Compress,
|
||||
UseDaily: cfg.Logger.UseDaily,
|
||||
}
|
||||
return logger.NewLogger(logCfg)
|
||||
}
|
||||
},
|
||||
@@ -130,9 +138,8 @@ func NewContainer() *Container {
|
||||
return infoLogger
|
||||
}
|
||||
}
|
||||
// 如果类型转换失败,创建一个默认的zap logger
|
||||
defaultLogger, _ := zap.NewProduction()
|
||||
return defaultLogger
|
||||
// 如果类型转换失败,使用全局日志器
|
||||
return logger.GetGlobalLogger()
|
||||
},
|
||||
),
|
||||
|
||||
@@ -304,19 +311,19 @@ func NewContainer() *Container {
|
||||
sharedhttp.NewResponseBuilder,
|
||||
validator.NewRequestValidator,
|
||||
// WestDexService - 需要从配置中获取参数
|
||||
func(cfg *config.Config) *westdex.WestDexService {
|
||||
return westdex.NewWestDexService(
|
||||
cfg.WestDex.URL,
|
||||
cfg.WestDex.Key,
|
||||
cfg.WestDex.SecretId,
|
||||
cfg.WestDex.SecretSecondId,
|
||||
)
|
||||
func(cfg *config.Config) (*westdex.WestDexService, error) {
|
||||
return westdex.NewWestDexServiceWithConfig(cfg)
|
||||
},
|
||||
// ZhichaService - 智查金控服务
|
||||
func(cfg *config.Config) (*zhicha.ZhichaService, error) {
|
||||
return zhicha.NewZhichaServiceWithConfig(cfg)
|
||||
},
|
||||
func(cfg *config.Config) *yushan.YushanService {
|
||||
return yushan.NewYushanService(
|
||||
cfg.Yushan.URL,
|
||||
cfg.Yushan.APIKey,
|
||||
cfg.Yushan.AcctID,
|
||||
nil, // 暂时不传入logger,使用无日志版本
|
||||
)
|
||||
},
|
||||
// TianYanChaService - 天眼查服务
|
||||
@@ -815,6 +822,7 @@ func convertLevelConfigs(configs map[string]config.LevelFileConfig) map[zapcore.
|
||||
"panic": zapcore.PanicLevel,
|
||||
}
|
||||
|
||||
// 只转换配置文件中存在的级别
|
||||
for levelStr, config := range configs {
|
||||
if level, exists := levelMap[levelStr]; exists {
|
||||
result[level] = logger.LevelFileConfig{
|
||||
|
||||
Reference in New Issue
Block a user