feat:Extraction of configuration parameters
This commit is contained in:
1 parent
bfbc5081ea
commit
8a1614f64d
34 files changed
+99
-79
No files matched your search
+5
-2
@@ -8,7 +8,8 @@ import (
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/spf13/viper"
|
||||
"go-admin/database"
|
||||
"go-admin/global/orm"
|
||||
"go-admin/global"
|
||||
mycasbin "go-admin/pkg/casbin"
|
||||
"go-admin/router"
|
||||
"go-admin/tools"
|
||||
"go-admin/tools/config"
|
||||
@@ -56,6 +57,8 @@ import (
|
||||
//3. 初始化数据库链接
|
||||
database.Setup(config.DatabaseConfig.Driver)
|
||||
|
||||
mycasbin.Setup()
|
||||
|
||||
}
|
||||
|
||||
func run() error {
|
||||
@@ -68,7 +71,7 @@ func run() error {
|
||||
|
||||
r := router.InitRouter()
|
||||
|
||||
defer orm.Eloquent.Close()
|
||||
defer global.Eloquent.Close()
|
||||
|
||||
srv := &http.Server{
|
||||
Addr: config.ApplicationConfig.Host + ":" + config.ApplicationConfig.Port,
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"fmt"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"go-admin/database"
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"go-admin/models"
|
||||
"go-admin/models/gorm"
|
||||
"go-admin/tools"
|
||||
|
||||
+1
-1
@@ -20,6 +20,6 @@ settings:
|
||||
database:
|
||||
driver: mysql # mysql,sqlite3, pgsql
|
||||
dbname: dbname
|
||||
source: user:password@/tcp(127.0.0.1:3306)/dbname?charset=utf8&parseTime=True&loc=Local
|
||||
source: user:password@tcp(127.0.0.1:3306)/dbname?charset=utf8&parseTime=True&loc=Local
|
||||
# source: sqlite3.db
|
||||
# source: host=myhost port=myport user=gorm dbname=gorm password=mypassword
|
||||
@@ -8,10 +8,11 @@ func Setup(driver string) {
|
||||
db.Setup()
|
||||
}
|
||||
|
||||
if dbType == "sqlite3" {
|
||||
var db = new(SqLite)
|
||||
db.Setup()
|
||||
}
|
||||
//TODO: 如果需要sqlite3请开启下面注释
|
||||
//if dbType == "sqlite3" {
|
||||
// var db = new(SqLite)
|
||||
// db.Setup()
|
||||
//}
|
||||
|
||||
if dbType == "pgsql" {
|
||||
var db = new(PgSql)
|
||||
|
||||
@@ -6,4 +6,5 @@ type Database interface {
|
||||
Setup()
|
||||
Open(dbType string, conn string) (db *gorm.DB, err error)
|
||||
GetConnect() string
|
||||
GetDriver() string
|
||||
}
|
||||
+16
-9
@@ -4,7 +4,7 @@ import (
|
||||
_ "github.com/go-sql-driver/mysql" //加载mysql
|
||||
"github.com/jinzhu/gorm"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"go-admin/global/orm"
|
||||
"go-admin/global"
|
||||
"go-admin/tools/config"
|
||||
)
|
||||
|
||||
@@ -14,19 +14,22 @@ type Mysql struct {
|
||||
func (e *Mysql) Setup() {
|
||||
var err error
|
||||
var db Database
|
||||
|
||||
db = new(Mysql)
|
||||
orm.Source = db.GetConnect()
|
||||
log.Info(orm.Source)
|
||||
orm.Eloquent, err = db.Open(orm.Driver, orm.Source)
|
||||
global.Source = db.GetConnect()
|
||||
log.Info(global.Source)
|
||||
global.Eloquent, err = db.Open(db.GetDriver(), db.GetConnect())
|
||||
if err != nil {
|
||||
log.Fatalf("%s connect error %v", orm.Driver, err)
|
||||
log.Fatalf("%s connect error %v", db.GetDriver(), err)
|
||||
} else {
|
||||
log.Printf("%s connect success!", orm.Driver)
|
||||
log.Printf("%s connect success!", db.GetDriver())
|
||||
}
|
||||
if orm.Eloquent.Error != nil {
|
||||
log.Fatalf("database error %v", orm.Eloquent.Error)
|
||||
|
||||
if global.Eloquent.Error != nil {
|
||||
log.Fatalf("database error %v", global.Eloquent.Error)
|
||||
}
|
||||
orm.Eloquent.LogMode(true)
|
||||
|
||||
global.Eloquent.LogMode(true)
|
||||
}
|
||||
|
||||
// 打开数据库连接
|
||||
@@ -38,3 +41,7 @@ func (e *Mysql) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
||||
func (e *Mysql) GetConnect() string {
|
||||
return config.DatabaseConfig.Source
|
||||
}
|
||||
|
||||
func (e *Mysql) GetDriver() string {
|
||||
return config.DatabaseConfig.Driver
|
||||
}
|
||||
+13
-13
@@ -2,9 +2,8 @@ package database
|
||||
|
||||
import (
|
||||
"github.com/jinzhu/gorm"
|
||||
_ "github.com/jinzhu/gorm/dialects/sqlite"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"go-admin/global/orm"
|
||||
"go-admin/global"
|
||||
"go-admin/tools/config"
|
||||
)
|
||||
|
||||
@@ -12,26 +11,24 @@ type PgSql struct {
|
||||
}
|
||||
|
||||
func (e *PgSql) Setup() {
|
||||
|
||||
var err error
|
||||
var db Database
|
||||
|
||||
db = new(PgSql)
|
||||
orm.Source = db.GetConnect()
|
||||
log.Info(orm.Source)
|
||||
orm.Eloquent, err = db.Open(orm.Driver, orm.Source)
|
||||
|
||||
global.Source = db.GetConnect()
|
||||
log.Info(global.Source)
|
||||
global.Eloquent, err = db.Open(db.GetDriver(), db.GetConnect())
|
||||
if err != nil {
|
||||
log.Fatalf("%s connect error %v", orm.Driver, err)
|
||||
log.Fatalf("%s connect error %v", db.GetDriver(), err)
|
||||
} else {
|
||||
log.Printf("%s connect success!", orm.Driver)
|
||||
log.Printf("%s connect success!", db.GetDriver())
|
||||
}
|
||||
|
||||
if orm.Eloquent.Error != nil {
|
||||
log.Fatalf("database error %v", orm.Eloquent.Error)
|
||||
if global.Eloquent.Error != nil {
|
||||
log.Fatalf("database error %v", global.Eloquent.Error)
|
||||
}
|
||||
|
||||
orm.Eloquent.LogMode(true)
|
||||
global.Eloquent.LogMode(true)
|
||||
}
|
||||
|
||||
// 打开数据库连接
|
||||
@@ -41,6 +38,9 @@ func (*PgSql) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
||||
}
|
||||
|
||||
func (e *PgSql) GetConnect() string {
|
||||
|
||||
return config.DatabaseConfig.Source
|
||||
}
|
||||
|
||||
func (e *PgSql) GetDriver() string {
|
||||
return config.DatabaseConfig.Driver
|
||||
}
|
||||
+15
-10
@@ -1,10 +1,12 @@
|
||||
// +build sqlite3
|
||||
|
||||
package database
|
||||
|
||||
import (
|
||||
"github.com/jinzhu/gorm"
|
||||
_ "github.com/jinzhu/gorm/dialects/sqlite"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"go-admin/global/orm"
|
||||
"go-admin/global"
|
||||
"go-admin/tools/config"
|
||||
)
|
||||
|
||||
@@ -12,26 +14,25 @@ type SqLite struct {
|
||||
}
|
||||
|
||||
func (e *SqLite) Setup() {
|
||||
|
||||
var err error
|
||||
var db Database
|
||||
|
||||
db = new(SqLite)
|
||||
orm.Source = db.GetConnect()
|
||||
log.Info(orm.Source)
|
||||
orm.Eloquent, err = db.Open(orm.Driver, orm.Source)
|
||||
global.Source = db.GetConnect()
|
||||
log.Info(global.Source)
|
||||
global.Eloquent, err = db.Open(db.GetDriver(), db.GetConnect())
|
||||
|
||||
if err != nil {
|
||||
log.Fatalf("%s connect error %v", orm.Driver, err)
|
||||
log.Fatalf("%s connect error %v", db.GetDriver(), err)
|
||||
} else {
|
||||
log.Printf("%s connect success!", orm.Driver)
|
||||
log.Printf("%s connect success!", db.GetDriver())
|
||||
}
|
||||
|
||||
if orm.Eloquent.Error != nil {
|
||||
log.Fatalf("database error %v", orm.Eloquent.Error)
|
||||
if global.Eloquent.Error != nil {
|
||||
log.Fatalf("database error %v", global.Eloquent.Error)
|
||||
}
|
||||
|
||||
orm.Eloquent.LogMode(true)
|
||||
global.Eloquent.LogMode(true)
|
||||
}
|
||||
|
||||
// 打开数据库连接
|
||||
@@ -42,4 +43,8 @@ func (*SqLite) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
||||
|
||||
func (e *SqLite) GetConnect() string {
|
||||
return config.DatabaseConfig.Source
|
||||
}
|
||||
|
||||
func (e *SqLite) GetDriver() string {
|
||||
return config.DatabaseConfig.Driver
|
||||
}
|
||||
+7
-1
@@ -1,10 +1,16 @@
|
||||
package global
|
||||
|
||||
import (
|
||||
"github.com/casbin/casbin/v2"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/jinzhu/gorm"
|
||||
)
|
||||
|
||||
var GinEngine *gin.Engine
|
||||
|
||||
var Eloquent *gorm.DB
|
||||
var Eloquent *gorm.DB
|
||||
var Source string
|
||||
var Driver string
|
||||
var DBName string
|
||||
|
||||
var CasbinEnforcer *casbin.Enforcer
|
||||
@@ -1,10 +0,0 @@
|
||||
package orm
|
||||
|
||||
import (
|
||||
"github.com/jinzhu/gorm"
|
||||
)
|
||||
|
||||
var Eloquent *gorm.DB
|
||||
var Source string
|
||||
var Driver string
|
||||
var DBName string
|
||||
@@ -19,6 +19,7 @@ require (
|
||||
github.com/json-iterator/go v1.1.8 // indirect
|
||||
github.com/mailru/easyjson v0.7.1 // indirect
|
||||
github.com/mattn/go-isatty v0.0.10 // indirect
|
||||
github.com/mattn/go-sqlite3 v1.14.0 // indirect
|
||||
github.com/mojocn/base64Captcha v1.3.1
|
||||
github.com/mssola/user_agent v0.5.1
|
||||
github.com/pkg/errors v0.8.1
|
||||
|
||||
@@ -9,6 +9,7 @@ github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go
|
||||
github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
|
||||
github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
|
||||
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
|
||||
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
|
||||
github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=
|
||||
github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
|
||||
github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
|
||||
@@ -24,6 +25,7 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
|
||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
|
||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
||||
github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
|
||||
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
|
||||
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
|
||||
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
|
||||
@@ -195,6 +197,8 @@ github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW1
|
||||
github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
|
||||
github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
|
||||
github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
|
||||
github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA=
|
||||
github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
|
||||
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
|
||||
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
|
||||
@@ -331,6 +335,7 @@ golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTk
|
||||
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
||||
golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
|
||||
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
@@ -350,6 +355,7 @@ golang.org/x/net v0.0.0-20190611141213-3f473d35a33a/go.mod h1:z5CRVTTTmAJ677TzLL
|
||||
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
|
||||
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"errors"
|
||||
orm "go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"go-admin/tools"
|
||||
_ "time"
|
||||
)
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"go-admin/tools"
|
||||
_ "time"
|
||||
)
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"go-admin/tools"
|
||||
)
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"go-admin/tools"
|
||||
)
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"io/ioutil"
|
||||
"strings"
|
||||
)
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"go-admin/tools"
|
||||
)
|
||||
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"time"
|
||||
)
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"go-admin/tools"
|
||||
)
|
||||
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"time"
|
||||
)
|
||||
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"go-admin/tools"
|
||||
)
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"github.com/pkg/errors"
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"go-admin/tools"
|
||||
)
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
)
|
||||
|
||||
//sys_role_dept
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"go-admin/tools"
|
||||
)
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package models
|
||||
import (
|
||||
"errors"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"go-admin/tools"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
"strings"
|
||||
|
||||
@@ -3,7 +3,7 @@ package tools
|
||||
import (
|
||||
"errors"
|
||||
"github.com/jinzhu/gorm"
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
config2 "go-admin/tools/config"
|
||||
)
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package tools
|
||||
import (
|
||||
"errors"
|
||||
"github.com/jinzhu/gorm"
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
config2 "go-admin/tools/config"
|
||||
)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package tools
|
||||
|
||||
import (
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"go-admin/models"
|
||||
)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package tools
|
||||
|
||||
import (
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"go-admin/models"
|
||||
)
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
gormAdapter "github.com/casbin/gorm-adapter/v2"
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"go-admin/global/orm"
|
||||
"go-admin/global"
|
||||
)
|
||||
|
||||
// Initialize the model from a string.
|
||||
@@ -24,10 +24,10 @@ e = some(where (p.eft == allow))
|
||||
m = r.sub == p.sub && (keyMatch2(r.obj, p.obj) || keyMatch(r.obj, p.obj)) && (r.act == p.act || p.act == "*")
|
||||
`
|
||||
|
||||
var CasbinEnforcer *casbin.Enforcer
|
||||
|
||||
func init() {
|
||||
Apter, err := gormAdapter.NewAdapterByDB(orm.Eloquent)
|
||||
|
||||
func Setup() {
|
||||
Apter, err := gormAdapter.NewAdapterByDB(global.Eloquent)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
@@ -39,12 +39,12 @@ func init() {
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
CasbinEnforcer = e
|
||||
global.CasbinEnforcer = e
|
||||
}
|
||||
|
||||
func Casbin() (*casbin.Enforcer, error) {
|
||||
if err := CasbinEnforcer.LoadPolicy(); err == nil {
|
||||
return CasbinEnforcer, err
|
||||
if err := global.CasbinEnforcer.LoadPolicy(); err == nil {
|
||||
return global.CasbinEnforcer, err
|
||||
} else {
|
||||
log.Printf("casbin rbac_model or policy init error, message: %v \r\n", err.Error())
|
||||
return nil, err
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"go-admin/tools"
|
||||
_ "time"
|
||||
)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"go-admin/global/orm"
|
||||
orm "go-admin/global"
|
||||
"go-admin/utils"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -12,7 +12,7 @@ func InitDatabase(cfg *viper.Viper) *Database {
|
||||
|
||||
db := &Database{
|
||||
Driver: cfg.GetString("driver"),
|
||||
Source: cfg.GetString("dbname"),
|
||||
Source: cfg.GetString("source"),
|
||||
DBName: cfg.GetString("dbname"),
|
||||
}
|
||||
return db
|
||||
|
||||
Reference in new issue
Block a user