Merge branch 'master' into dev

Author: wenjianzhang

sdk/api/api.go

@@ -4,16 +4,19 @@ import (
 	"errors"
 	"fmt"
 
+	"net/http"
+
 	vd "github.com/bytedance/go-tagexpr/v2/validator"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 	"github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/sdk"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"github.com/go-admin-team/go-admin-core/sdk/service"
+	"github.com/go-admin-team/go-admin-core/storage"
 	"github.com/go-admin-team/go-admin-core/tools/language"
 	"gorm.io/gorm"
-	"net/http"
 )
 
 var DefaultLanguage = "zh-CN"
@@ -23,6 +26,7 @@ type Api struct {
 	Logger  *logger.Helper
 	Orm     *gorm.DB
 	Errors  error
+	Cache   storage.AdapterCache
 }
 
 func (e *Api) AddError(err error) {
@@ -107,6 +111,8 @@ func (e *Api) MakeOrm() *Api {
 func (e *Api) MakeService(c *service.Service) *Api {
 	c.Log = e.Logger
 	c.Orm = e.Orm
+	c.Cache = sdk.Runtime.GetCacheAdapter()
+	e.Cache = c.Cache
 	return e
 }
 

sdk/api/binding.go

@@ -1,7 +1,6 @@
 package api
 
 import (
-	"fmt"
 	"github.com/gin-gonic/gin/binding"
 	"reflect"
 	"strings"
@@ -49,7 +48,7 @@ func (e *bindConstructor) GetBindingForGin(d interface{}) []binding.Binding {
 		}
 	}
 	for e := range mp {
-		gbs=append(gbs, mp[e])
+		gbs = append(gbs, mp[e])
 	}
 	return gbs
 }
@@ -59,7 +58,7 @@ func (e *bindConstructor) resolve(d interface{}) []uint8 {
 	qType := reflect.TypeOf(d).Elem()
 	var tag reflect.StructTag
 	var ok bool
-	fmt.Println(qType.Kind())
+
 	for i := 0; i < qType.NumField(); i++ {
 		tag = qType.Field(i).Tag
 		if _, ok = tag.Lookup("json"); ok {

sdk/pkg/casbin/mycasbin.go

@@ -38,10 +38,11 @@ var (
 
 func Setup(db *gorm.DB, _ string) *casbin.SyncedEnforcer {
 	once.Do(func() {
-		Apter, err := gormAdapter.NewAdapterByDB(db)
-		if err != nil {
+		Apter, err := gormAdapter.NewAdapterByDBUseTableName(db, "sys", "casbin_rule")
+		if err != nil && err.Error() != "invalid DDL" {
 			panic(err)
 		}
+
 		m, err := model.NewModelFromString(text)
 		if err != nil {
 			panic(err)

sdk/pkg/logger/log.go

@@ -46,7 +46,7 @@ func SetupLogger(opts ...Option) logger.Logger {
 
 	switch op.driver {
 	case "zap":
-		log.DefaultLogger, err = zap.NewLogger(logger.WithLevel(level), logger.WithOutput(output), zap.WithCallerSkip(2))
+		log.DefaultLogger, err = zap.NewLogger(logger.WithLevel(level), zap.WithOutput(output), zap.WithCallerSkip(2))
 		if err != nil {
 			log.Fatalf("new zap logger error, %s", err.Error())
 		}

sdk/pkg/utils/file.go

@@ -64,6 +64,7 @@ func MkDir(src string) error {
 // Open 打开文件
 func Open(name string, flag int, perm os.FileMode) (*os.File, error) {
 	f, err := os.OpenFile(name, flag, perm)
+	defer f.Close()
 	if err != nil {
 		return nil, err
 	}
@@ -74,7 +75,7 @@ func Open(name string, flag int, perm os.FileMode) (*os.File, error) {
 // GetImgType 获取Img文件类型
 func GetImgType(p string) (string, error) {
 	file, err := os.Open(p)
-
+	defer file.Close()
 	if err != nil {
 		log.Println(err)
 		os.Exit(1)
@@ -105,7 +106,7 @@ func GetImgType(p string) (string, error) {
 // GetType 获取文件类型
 func GetType(p string) (string, error) {
 	file, err := os.Open(p)
-
+	defer file.Close()
 	if err != nil {
 		log.Println(err)
 		os.Exit(1)
@@ -125,4 +126,4 @@ func GetType(p string) (string, error) {
 	//var list = strings.Split(filetype, "/")
 	//filetype = list[0] + "/" + ext
 	return filetype, nil
-}
+}

sdk/service/service.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/storage"
 	"gorm.io/gorm"
 )
 
@@ -13,6 +14,7 @@ type Service struct {
 	MsgID string
 	Log   *logger.Helper
 	Error error
+	Cache storage.AdapterCache
 }
 
 func (db *Service) AddError(err error) error {

tools/search/query.go

@@ -33,6 +33,12 @@ func ResolveSearchQuery(driver string, q interface{}, condition Condition) {
 	var tag string
 	var ok bool
 	var t *resolveSearchTag
+
+	var sep = "`"
+	if driver == Postgres {
+		sep = "\""
+	}
+
 	for i := 0; i < qType.NumField(); i++ {
 		tag, ok = "", false
 		tag, ok = qType.Field(i).Tag.Lookup(FromQueryTag)