diff --git a/app/admin/apis/sysjob/sysjob.go b/app/admin/apis/sysjob/sysjob.go index 76c5076..6435ad0 100644 --- a/app/admin/apis/sysjob/sysjob.go +++ b/app/admin/apis/sysjob/sysjob.go @@ -22,7 +22,7 @@ type SysJob struct { // RemoveJobForService 调用service实现 func (e *SysJob) RemoveJobForService(c *gin.Context) { - msgID := e.GenerateMsgIDFromContext(c) + msgID := apis.GenerateMsgIDFromContext(c) db, err := e.GetOrm(c) if err != nil { log.Errorf("msgID[%s] error:%#v", msgID, err) @@ -49,7 +49,7 @@ func (e *SysJob) RemoveJobForService(c *gin.Context) { // StartJobForService 启动job service实现 func (e *SysJob) StartJobForService(c *gin.Context) { - msgID := e.GenerateMsgIDFromContext(c) + msgID := apis.GenerateMsgIDFromContext(c) db, err := e.GetOrm(c) if err != nil { log.Errorf("msgID[%s] error:%#v", msgID, err) diff --git a/app/admin/middleware/init.go b/app/admin/middleware/init.go index 950a2ab..b119897 100644 --- a/app/admin/middleware/init.go +++ b/app/admin/middleware/init.go @@ -8,7 +8,8 @@ func InitMiddleware(r *gin.Engine) { // 日志处理 r.Use(LoggerToFile()) // 自定义错误处理 - r.Use(CustomError) + //todo 上线改回 + //r.Use(CustomError) // NoCache is a middleware function that appends headers r.Use(NoCache) // 跨域处理 diff --git a/app/admin/router/initrouter.go b/app/admin/router/initrouter.go index 665c70b..2ed811f 100644 --- a/app/admin/router/initrouter.go +++ b/app/admin/router/initrouter.go @@ -2,16 +2,30 @@ package router import ( "github.com/gin-gonic/gin" - "go-admin/app/admin/middleware" "go-admin/app/admin/middleware/handler" "go-admin/common/global" + "go-admin/common/log" _ "go-admin/pkg/jwtauth" "go-admin/tools" "go-admin/tools/config" + "os" ) -func InitRouter(r *gin.Engine) *gin.Engine { +func InitRouter() { + var r *gin.Engine + h := global.Cfg.GetEngine() + if h == nil { + h = gin.New() + global.Cfg.SetEngine(h) + } + switch h.(type) { + case *gin.Engine: + r = h.(*gin.Engine) + default: + log.Fatal("not support other engine") + os.Exit(-1) + } if config.SslConfig.Enable { r.Use(handler.TlsHandler()) } @@ -29,5 +43,5 @@ func InitRouter(r *gin.Engine) *gin.Engine { // TODO: 这里可存放业务路由,里边并无实际路由只有演示代码 InitExamplesRouter(r, authMiddleware) - return r + //return r } diff --git a/cmd/api/server.go b/cmd/api/server.go index 1f8d1aa..3dbbb81 100644 --- a/cmd/api/server.go +++ b/cmd/api/server.go @@ -3,6 +3,7 @@ package api import ( "context" "fmt" + "go-admin/app/admin/router" "io/ioutil" "net/http" "os" @@ -13,7 +14,6 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "go-admin/app/admin/router" "go-admin/app/jobs" "go-admin/common/database" "go-admin/common/global" @@ -41,7 +41,7 @@ var ( } ) -var echoTimes int +var AppRouters = make([]func(), 0) func init() { StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file") @@ -74,18 +74,11 @@ func run() error { engine = gin.New() } - var r *gin.Engine - switch engine.(type) { - case *gin.Engine: - r = engine.(*gin.Engine) - default: - panic("not support this engine") + AppRouters = append(AppRouters, router.InitRouter) + for _, f := range AppRouters { + f() } - r = router.InitRouter(r) - //defer global.Eloquent.Close() - global.Cfg.SetEngine(r) - srv := &http.Server{ Addr: config.ApplicationConfig.Host + ":" + config.ApplicationConfig.Port, Handler: global.Cfg.GetEngine(), diff --git a/common/apis/api.go b/common/apis/api.go index e5932bc..c7c3dc2 100644 --- a/common/apis/api.go +++ b/common/apis/api.go @@ -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 { diff --git a/common/log/log.go b/common/log/log.go index 131d694..d1b9cf8 100644 --- a/common/log/log.go +++ b/common/log/log.go @@ -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...) } diff --git a/common/models/user.go b/common/models/user.go new file mode 100644 index 0000000..0ecc338 --- /dev/null +++ b/common/models/user.go @@ -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 +} diff --git a/pkg/security.go b/pkg/security.go new file mode 100644 index 0000000..3f0f162 --- /dev/null +++ b/pkg/security.go @@ -0,0 +1,57 @@ +package pkg + +import ( + "encoding/hex" + "math/rand" + + "golang.org/x/crypto/scrypt" +) + +func generateRandString(length int) string { + var chars = []byte("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_=+,.?/:;{}[]`~") + clen := len(chars) + if clen < 2 || clen > 256 { + panic("Wrong charset length for NewLenChars()") + } + maxrb := 255 - (256 % clen) + b := make([]byte, length) + r := make([]byte, length+(length/4)) // storage for random bytes. + i := 0 + for { + if _, err := rand.Read(r); err != nil { + panic("Error reading random bytes: " + err.Error()) + } + for _, rb := range r { + c := int(rb) + if c > maxrb { + continue // Skip this number to avoid modulo bias. + } + b[i] = chars[c%clen] + i++ + if i == length { + return string(b) + } + } + } +} + +// GenerateRandomKey20 生成20位随机字符串 +func GenerateRandomKey20() string { + return generateRandString(20) +} + +// GenerateRandomKey16 生成6为随机字符串 +func GenerateRandomKey16() string { + return generateRandString(6) +} + +// SetPassword 根据明文密码和加盐值生成密码 +func SetPassword(password string, salt string) (verify string, err error) { + var rb []byte + rb, err = scrypt.Key([]byte(password), []byte(salt), 16384, 8, 1, 32) + if err != nil { + return + } + verify = hex.EncodeToString(rb) + return +}