Merge branch 'dev' of https://github.com/go-admin-team/go-admin into dev
This commit is contained in:
commit
a1a41f0a86
7 files changed
+16
-45
No files matched your search
@@ -37,7 +37,7 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) {
|
||||
c.Registers[i].Policy,
|
||||
c.Registers[i].Tables)
|
||||
}
|
||||
resolverConfig := toolsDB.NewConfigure(c.Source, c.MaxIdleConns, c.MaxOpenConns, c.ConnMaxIdleTime, c.ConnMaxLifetime, registers)
|
||||
resolverConfig := toolsDB.NewConfigure(c.Source, c.MaxIdleConns, c.MaxOpenConns, c.ConnMaxIdleTime, c.ConnMaxLifeTime, registers)
|
||||
db, err := resolverConfig.Init(&gorm.Config{
|
||||
NamingStrategy: schema.NamingStrategy{
|
||||
SingularTable: true,
|
||||
|
||||
@@ -20,6 +20,11 @@ import (
|
||||
|
||||
var store = base64Captcha.DefaultMemStore
|
||||
|
||||
// SetStore 设置store
|
||||
func SetStore(s base64Captcha.Store) {
|
||||
store = s
|
||||
}
|
||||
|
||||
func PayloadFunc(data interface{}) jwt.MapClaims {
|
||||
if v, ok := data.(map[string]interface{}); ok {
|
||||
u, _ := v["user"].(SysUser)
|
||||
|
||||
Reference in new issue
Block a user