estel/gva
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: casbin gorm-adapter has no sqlite3 support

Browse Source 
Signed-off-by: closetool <c299999999@qq.com>
This commit is contained in:
closetool
2021-04-04 21:32:23 +08:00
parent 4faa807c53
commit 146b0b2925
33 changed files with 229 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/utils/constant.go
View File

@@ -1,6 +1,6 @@
package utils
const (
ConfigEnv = "GVA_CONFIG"
ConfigEnv = "GVA_CONFIG"
ConfigFile = "config.yaml"
)

2
server/utils/directory.go
View File

@@ -39,7 +39,7 @@ func CreateDir(dirs ...string) (err error) {
global.GVA_LOG.Debug("create directory" + v)
err = os.MkdirAll(v, os.ModePerm)
if err != nil {
global.GVA_LOG.Error("create directory"+ v, zap.Any(" error:", err))
global.GVA_LOG.Error("create directory"+v, zap.Any(" error:", err))
}
}
}

2
server/utils/rotatelogs_unix.go
View File

@@ -27,4 +27,4 @@ func GetWriteSyncer() (zapcore.WriteSyncer, error) {
return zapcore.NewMultiWriteSyncer(zapcore.AddSync(os.Stdout), zapcore.AddSync(fileWriter)), err
}
return zapcore.AddSync(fileWriter), err
}
}

2
server/utils/rotatelogs_windows.go
View File

@@ -24,4 +24,4 @@ func GetWriteSyncer() (zapcore.WriteSyncer, error) {
return zapcore.NewMultiWriteSyncer(zapcore.AddSync(os.Stdout), zapcore.AddSync(fileWriter)), err
}
return zapcore.AddSync(fileWriter), err
}
}

9
server/utils/server.go
View File

@@ -35,7 +35,6 @@ type Cpu struct {
Cores int `json:"cores"`
}
type Rrm struct {
UsedMB int `json:"usedMb"`
TotalMB int `json:"totalMb"`
@@ -89,9 +88,9 @@ func InitCPU() (c Cpu, err error) {
//@return: r Rrm, err error
func InitRAM() (r Rrm, err error) {
if u, err := mem.VirtualMemory(); err != nil{
if u, err := mem.VirtualMemory(); err != nil {
return r, err
}else {
} else {
r.UsedMB = int(u.Used) / MB
r.TotalMB = int(u.Total) / MB
r.UsedPercent = int(u.UsedPercent)
@@ -105,7 +104,7 @@ func InitRAM() (r Rrm, err error) {
//@return: d Disk, err error
func InitDisk() (d Disk, err error) {
if u, err := disk.Usage("/"); err != nil{
if u, err := disk.Usage("/"); err != nil {
return d, err
} else {
d.UsedMB = int(u.Used) / MB
@@ -115,4 +114,4 @@ func InitDisk() (d Disk, err error) {
d.UsedPercent = int(u.UsedPercent)
}
return d, nil
}
}

1
server/utils/upload/local.go
View File

@@ -1,4 +1,5 @@
package upload
import (
"errors"
"gin-vue-admin/global"

6
server/utils/upload/qiniu.go
View File

@@ -60,7 +60,7 @@ func (*Qiniu) DeleteFile(key string) error {
mac := qbox.NewMac(global.GVA_CONFIG.Qiniu.AccessKey, global.GVA_CONFIG.Qiniu.SecretKey)
cfg := qiniuConfig()
bucketManager := storage.NewBucketManager(mac, cfg)
if err := bucketManager.Delete(global.GVA_CONFIG.Qiniu.Bucket, key); err != nil{
if err := bucketManager.Delete(global.GVA_CONFIG.Qiniu.Bucket, key); err != nil {
global.GVA_LOG.Error("function bucketManager.Delete() Filed", zap.Any("err", err.Error()))
return errors.New("function bucketManager.Delete() Filed, err:" + err.Error())
}
@@ -76,7 +76,7 @@ func (*Qiniu) DeleteFile(key string) error {
func qiniuConfig() *storage.Config {
cfg := storage.Config{
UseHTTPS: global.GVA_CONFIG.Qiniu.UseHTTPS,
UseHTTPS: global.GVA_CONFIG.Qiniu.UseHTTPS,
UseCdnDomains: global.GVA_CONFIG.Qiniu.UseCdnDomains,
}
switch global.GVA_CONFIG.Qiniu.Zone { // 根据配置文件进行初始化空间对应的机房
@@ -92,4 +92,4 @@ func qiniuConfig() *storage.Config {
cfg.Zone = &storage.ZoneXinjiapo
}
return &cfg
}
}