Compare commits

..

No commits in common. "main" and "v0.0.90" have entirely different histories.

5 changed files with 6 additions and 46 deletions

View File

@ -111,11 +111,11 @@ func InitLoggerConf(cfg *LogConf) *LogConf {
return &LogConf{
Name: strings.ToLower(vars.ServiceKey),
Level: vars.LogLevel(vars.DEBUG),
Dir: "./logs/",
Endpoint: "",
Console: true,
File: true,
Remote: false,
Dir: cfg.Dir,
Endpoint: cfg.Endpoint,
Console: cfg.Console,
File: cfg.File,
Remote: cfg.Remote,
}
}
return cfg

View File

@ -133,13 +133,3 @@ func NewPostgres(dsn []string, options *types.SqlOptions) (gormDb *gorm.DB, err
return gormDb, nil
}
// AppendMigrate 调用此函数后,会在数据库初始化时自动迁移表结构
//
// - table: 需要自动迁移的表
func AppendMigrate(table any) {
if MigrateTables == nil {
MigrateTables = make([]any, 0)
}
MigrateTables = append(MigrateTables, table)
}

View File

@ -11,7 +11,6 @@ import (
// HTTP请求头相关错误码起始码:1000
var (
AllErrors = make(map[int]string)
ErrHeaderRequestId = NewError(1001, "Header Request-Id Not Found") // 请求ID头缺失
ErrHeaderAuthorization = NewError(1002, "Header Authorization Not Found") // 授权头缺失
ErrHeaderSecretKey = NewError(1003, "Header Secret-Key Not Found") // 密钥头缺失
@ -82,7 +81,6 @@ var (
// code: 错误码
// msg: 错误消息
func NewError(code int, msg string) error {
AllErrors[code] = msg
return status.New(codes.Code(code), msg).Err()
}
@ -90,7 +88,6 @@ func NewError(code int, msg string) error {
// code: 错误码
// msg: 错误消息
func ErrFatal(code int, msg string) error {
AllErrors[code] = msg
return status.New(codes.Code(code), msg).Err()
}
@ -98,6 +95,5 @@ func ErrFatal(code int, msg string) error {
// code: 错误码
// msg: 错误消息,会自动转换为大写
func ErrNotFound(code int, msg string) error {
AllErrors[code] = strings.ToUpper(msg)
return status.New(codes.Code(code), strings.ToUpper(msg)).Err()
}

View File

@ -70,7 +70,7 @@ func NewLogger(cfg *conf.LogConf) (*Logger, error) {
multiWriter := io.MultiWriter(consoleWriter, fileWriter)
logger := &Logger{
level: cfg.Level,
level: vars.LogLevel(cfg.Level),
fileWriter: fileWriter,
consoleWriter: consoleWriter,
logDir: cfg.Dir,

View File

@ -1,26 +0,0 @@
package with
import (
"strings"
"git.apinb.com/bsm-sdk/core/conf"
"git.apinb.com/bsm-sdk/core/logger"
"git.apinb.com/bsm-sdk/core/vars"
)
// 初始化Logger配置
func Logger(cfg *conf.LogConf) {
if cfg == nil {
cfg = &conf.LogConf{
Name: strings.ToLower(vars.ServiceKey),
Level: vars.LogLevel(vars.DEBUG),
Dir: "./logs/",
Endpoint: "",
Console: true,
File: true,
Remote: false,
}
}
logger.InitLogger(cfg)
}