日志生效,

调整路由注册方式
This commit is contained in:
linwenxiang committed 2020-09-21 23:23:40 +08:00
1 parent 2fe2c96e82
commit 7d8a267da7
8 files changed
+148 -33

No files matched your search

+7 -3
View File
@@ -12,9 +12,13 @@ import (
type Api struct {
}
// GetOrm 获取orm连接
func (e *Api) GetOrm(c *gin.Context) (*gorm.DB, error) {
msgID := e.GenerateMsgIDFromContext(c)
return GetOrm(c)
}
// GetOrm 获取orm连接
func GetOrm(c *gin.Context) (*gorm.DB, error) {
msgID := GenerateMsgIDFromContext(c)
idb, exist := c.Get("db")
if !exist {
return nil, errors.New(fmt.Sprintf("msgID[%s], db connect not exist", msgID))
@@ -29,7 +33,7 @@ func (e *Api) GetOrm(c *gin.Context) (*gorm.DB, error) {
}
// GenerateMsgIDFromContext 生成msgID
func (e *Api) GenerateMsgIDFromContext(c *gin.Context) string {
func GenerateMsgIDFromContext(c *gin.Context) string {
var msgID string
data, ok := c.Get("msgID")
if !ok {
+16 -12
View File
@@ -2,62 +2,66 @@ package log
import "go-admin/logger"
func SetLevel() {
}
// Trace trace级日志输出
func Trace(args ...interface{}) {
logger.DefaultLogger.Log(logger.TraceLevel, args...)
logger.Trace(args...)
}
// Trace trace级日志输出
func Tracef(format string, args ...interface{}) {
logger.DefaultLogger.Logf(logger.TraceLevel, format, args...)
logger.Tracef(format, args...)
}
// Debug debug级日志输出
func Debug(args ...interface{}) {
logger.DefaultLogger.Log(logger.TraceLevel, args...)
logger.Debug(args...)
}
// Debugf debug级日志输出
func Debugf(format string, args ...interface{}) {
logger.DefaultLogger.Logf(logger.TraceLevel, format, args...)
logger.Debugf(format, args...)
}
// Info info级日志输出
func Info(args ...interface{}) {
logger.DefaultLogger.Log(logger.TraceLevel, args...)
logger.Info(args...)
}
// Infof info级日志输出
func Infof(format string, args ...interface{}) {
logger.DefaultLogger.Logf(logger.TraceLevel, format, args...)
logger.Infof(format, args...)
}
// Warn warn级日志输出
func Warn(args ...interface{}) {
logger.DefaultLogger.Log(logger.TraceLevel, args...)
logger.Warn(args...)
}
// Warnf warn级日志输出
func Warnf(format string, args ...interface{}) {
logger.DefaultLogger.Logf(logger.TraceLevel, format, args...)
logger.Warnf(format, args...)
}
// Error error级日志输出
func Error(args ...interface{}) {
logger.DefaultLogger.Log(logger.TraceLevel, args...)
logger.Error(args...)
}
// Errorf error级日志输出
func Errorf(format string, args ...interface{}) {
logger.DefaultLogger.Logf(logger.TraceLevel, format, args...)
logger.Errorf(format, args...)
}
// Fatal fatal级日志输出
func Fatal(args ...interface{}) {
logger.DefaultLogger.Log(logger.TraceLevel, args...)
logger.Fatal(args...)
}
// Fatalf fatal级日志输出
func Fatalf(format string, args ...interface{}) {
logger.DefaultLogger.Logf(logger.TraceLevel, format, args...)
logger.Fatalf(format, args...)
}
+42
View File
@@ -0,0 +1,42 @@
package models
import (
"gorm.io/gorm"
"go-admin/pkg"
)
// BaseUser 密码登录基础用户
type BaseUser struct {
Username string `json:"username" gorm:"type:varchar(100);comment:用户名"`
Salt string `json:"-" gorm:"type:varchar(255);comment:加盐;<-"`
PasswordHash string `json:"-" gorm:"type:varchar(128);comment:密码hash;<-"`
Password string `json:"password" gorm:"-"`
}
// SetPassword 设置密码
func (u *BaseUser) SetPassword(value string) {
u.Password = value
u.generateSalt()
u.PasswordHash = u.GetPasswordHash()
}
// GetPasswordHash 获取密码hash
func (u *BaseUser) GetPasswordHash() string {
passwordHash, err := pkg.SetPassword(u.Password, u.Salt)
if err != nil {
return ""
}
return passwordHash
}
// generateSalt 生成加盐值
func (u *BaseUser) generateSalt() {
u.Salt = pkg.GenerateRandomKey16()
}
// Verify 验证密码
func (u *BaseUser) Verify(db *gorm.DB, tableName string) bool {
db.Table(tableName).Where("username = ?", u.Username).First(u)
return u.GetPasswordHash() == u.PasswordHash
}