feat: add global & logger
This commit is contained in:
1 parent
7db16d04dd
commit
b77f4b5a1b
43 files changed
+200
-181
No files matched your search
@@ -1,22 +1,19 @@
|
||||
package mycasbin
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/casbin/casbin/v2"
|
||||
gormadapter "github.com/casbin/gorm-adapter/v2"
|
||||
"github.com/go-kit/kit/endpoint"
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
"go-admin/database"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"go-admin/global/orm"
|
||||
"go-admin/tools/config"
|
||||
)
|
||||
|
||||
var Em endpoint.Middleware
|
||||
|
||||
func Casbin() (*casbin.Enforcer, error) {
|
||||
conn := database.GetMysqlConnect()
|
||||
if config.DatabaseConfig.Dbtype == "sqlite3" {
|
||||
conn = config.DatabaseConfig.Host
|
||||
}
|
||||
conn := orm.MysqlConn
|
||||
Apter, err := gormadapter.NewAdapter(config.DatabaseConfig.Dbtype, conn, true)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -28,7 +25,7 @@ func Casbin() (*casbin.Enforcer, error) {
|
||||
if err := e.LoadPolicy(); err == nil {
|
||||
return e, err
|
||||
} else {
|
||||
fmt.Printf("casbin rbac_model or policy init error, message: %v \r\n", err.Error())
|
||||
log.Printf("casbin rbac_model or policy init error, message: %v \r\n", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,7 @@ package cronjob
|
||||
|
||||
import (
|
||||
"github.com/robfig/cron/v3"
|
||||
"log"
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
func TestJob(c *cron.Cron) {
|
||||
|
||||
+1
-13
@@ -1,9 +1,7 @@
|
||||
package logger
|
||||
|
||||
import (
|
||||
"io"
|
||||
"log"
|
||||
"os"
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -12,14 +10,4 @@ var (
|
||||
Error * log.Logger
|
||||
)
|
||||
|
||||
func init(){
|
||||
errFile,err:=os.OpenFile("errors.log",os.O_CREATE|os.O_WRONLY|os.O_APPEND,0666)
|
||||
if err!=nil{
|
||||
log.Fatalln("打开日志文件失败:",err)
|
||||
}
|
||||
|
||||
Info = log.New(os.Stdout,"Info:",log.Ldate | log.Ltime | log.Lshortfile)
|
||||
Warning = log.New(os.Stdout,"Warning:",log.Ldate | log.Ltime | log.Lshortfile)
|
||||
Error = log.New(io.MultiWriter(os.Stderr,errFile),"Error:",log.Ldate | log.Ltime | log.Lshortfile)
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user