合并官方

.deepsource.toml

@@ -0,0 +1,8 @@
+version = 1
+
+[[analyzers]]
+name = "go"
+enabled = true
+
+  [analyzers.meta]
+  import_paths = ["github.com/GoAdminGroup/go-admin"]

Makefile

@@ -117,10 +117,11 @@ cilint:
 golint:
 	GO111MODULE=off golint ./...
 
-## form tmpl build
-
-build-form-tmpl:
+build-tmpl:
+    ## form tmpl build
 	adm compile tpl --src ./template/types/tmpls/ --dist ./template/types/tmpl.go --package types --var tmpls
+    ## generator tmpl build
+	adm compile tpl --src ./plugins/admin/modules/table/tmpl --dist ./plugins/admin/modules/table/tmpl.go --package table --var tmpls
 
 ## cli version update
 

README_CN.md

@@ -178,6 +178,6 @@ inspired by [laravel-admin](https://github.com/z-song/laravel-admin)
 
 留下您的github/gitee用户名，我们将会展示在[捐赠名单](DONATION.md)中。
 
-> 目前GoAdmin项目捐赠达666元，联系[作者](http://quick.go-admin.cn/resource/wechat_qrcode.jpg)可进vip用户群，vip群中您的问题将得到优先解答，同时也会根据您的需求进行分析和优先安排，vip群也会提供其他关于golang的福利。
+> 恰饭所需，作者精力时间有限，目前GoAdmin项目捐赠达666元，联系[作者](http://quick.go-admin.cn/resource/wechat_qrcode.jpg)可进vip用户群，vip群中您的问题将得到优先解答，同时也会根据您的需求进行分析和优先安排，vip群也会提供其他关于golang的福利。🙏
 
 <img src="http://quick.go-admin.cn/official/assets/imgs/shoukuan.jpg" width="650" />

adapter/adapter.go

@@ -165,7 +165,7 @@ func (base *BaseAdapter) GetContent(ctx interface{}, getPanelFn types.GetPanelFn
 	tmpl, tmplName := template.Default().GetTemplate(newBase.IsPjax())
 
 	buf := new(bytes.Buffer)
-	hasError = tmpl.ExecuteTemplate(buf, tmplName, types.NewPage(types.NewPageParam{
+	hasError = tmpl.ExecuteTemplate(buf, tmplName, types.NewPage(&types.NewPageParam{
 		User:         user,
 		Menu:         menu.GetGlobalMenu(user, wf.GetConnection()).SetActiveClass(config.URLRemovePrefix(newBase.Path())),
 		Panel:        panel.GetContent(config.IsProductionEnvironment()),

adapter/beego/beego.go

@@ -81,9 +81,9 @@ func (bee *Beego) AddHandler(method, path string, handlers gctx.Handlers) {
 	bee.app.Handlers.AddMethod(method, path, func(c *context.Context) {
 		for key, value := range c.Input.Params() {
 			if c.Request.URL.RawQuery == "" {
-				c.Request.URL.RawQuery += strings.Replace(key, ":", "", -1) + "=" + value
+				c.Request.URL.RawQuery += strings.ReplaceAll(key, ":", "") + "=" + value
 			} else {
-				c.Request.URL.RawQuery += "&" + strings.Replace(key, ":", "", -1) + "=" + value
+				c.Request.URL.RawQuery += "&" + strings.ReplaceAll(key, ":", "") + "=" + value
 			}
 		}
 		ctx := gctx.NewContext(c.Request)

adapter/buffalo/buffalo.go

@@ -97,9 +97,9 @@ func (bu *Buffalo) AddHandler(method, path string, handlers context.Handlers) {
 
 		for key, param := range params {
 			if c.Request().URL.RawQuery == "" {
-				c.Request().URL.RawQuery += strings.Replace(key, ":", "", -1) + "=" + param[0]
+				c.Request().URL.RawQuery += strings.ReplaceAll(key, ":", "") + "=" + param[0]
 			} else {
-				c.Request().URL.RawQuery += "&" + strings.Replace(key, ":", "", -1) + "=" + param[0]
+				c.Request().URL.RawQuery += "&" + strings.ReplaceAll(key, ":", "") + "=" + param[0]
 			}
 		}
 

adapter/chi/chi.go

@@ -104,9 +104,9 @@ func (ch *Chi) AddHandler(method, path string, handlers context.Handlers) {
 
 		for i := 0; i < len(params.Values); i++ {
 			if r.URL.RawQuery == "" {
-				r.URL.RawQuery += strings.Replace(params.Keys[i], ":", "", -1) + "=" + params.Values[i]
+				r.URL.RawQuery += strings.ReplaceAll(params.Keys[i], ":", "") + "=" + params.Values[i]
 			} else {
-				r.URL.RawQuery += "&" + strings.Replace(params.Keys[i], ":", "", -1) + "=" + params.Values[i]
+				r.URL.RawQuery += "&" + strings.ReplaceAll(params.Keys[i], ":", "") + "=" + params.Values[i]
 			}
 		}
 

adapter/echo/echo.go

@@ -83,9 +83,9 @@ func (e *Echo) AddHandler(method, path string, handlers context.Handlers) {
 
 		for _, key := range c.ParamNames() {
 			if c.Request().URL.RawQuery == "" {
-				c.Request().URL.RawQuery += strings.Replace(key, ":", "", -1) + "=" + c.Param(key)
+				c.Request().URL.RawQuery += strings.ReplaceAll(key, ":", "") + "=" + c.Param(key)
 			} else {
-				c.Request().URL.RawQuery += "&" + strings.Replace(key, ":", "", -1) + "=" + c.Param(key)
+				c.Request().URL.RawQuery += "&" + strings.ReplaceAll(key, ":", "") + "=" + c.Param(key)
 			}
 		}
 

adapter/fasthttp/fasthttp.go

@@ -93,9 +93,9 @@ func (fast *Fasthttp) AddHandler(method, path string, handlers context.Handlers)
 
 		for key, value := range params {
 			if httpreq.URL.RawQuery == "" {
-				httpreq.URL.RawQuery += strings.Replace(key, ":", "", -1) + "=" + value
+				httpreq.URL.RawQuery += strings.ReplaceAll(key, ":", "") + "=" + value
 			} else {
-				httpreq.URL.RawQuery += "&" + strings.Replace(key, ":", "", -1) + "=" + value
+				httpreq.URL.RawQuery += "&" + strings.ReplaceAll(key, ":", "") + "=" + value
 			}
 		}
 

adapter/gf/gf.go

@@ -16,6 +16,7 @@ import (
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/engine"
 	"github.com/GoAdminGroup/go-admin/modules/config"
+	"github.com/GoAdminGroup/go-admin/modules/utils"
 	"github.com/GoAdminGroup/go-admin/plugins"
 	"github.com/GoAdminGroup/go-admin/plugins/admin/models"
 	"github.com/GoAdminGroup/go-admin/plugins/admin/modules/constant"
@@ -91,8 +92,7 @@ func (gf *Gf) AddHandler(method, path string, handlers context.Handlers) {
 		params = append(params, reg2.FindAllString(newPath, -1)...)
 
 		for _, param := range params {
-			p := strings.Replace(param, ":", "", -1)
-			p = strings.Replace(p, "/", "", -1)
+			p := utils.ReplaceAll(param, ":", "", "/", "")
 
 			if c.Request.URL.RawQuery == "" {
 				c.Request.URL.RawQuery += p + "=" + c.GetRequestString(p)

adapter/gin/gin.go

@@ -82,9 +82,9 @@ func (gins *Gin) AddHandler(method, path string, handlers context.Handlers) {
 
 		for _, param := range c.Params {
 			if c.Request.URL.RawQuery == "" {
-				c.Request.URL.RawQuery += strings.Replace(param.Key, ":", "", -1) + "=" + param.Value
+				c.Request.URL.RawQuery += strings.ReplaceAll(param.Key, ":", "") + "=" + param.Value
 			} else {
-				c.Request.URL.RawQuery += "&" + strings.Replace(param.Key, ":", "", -1) + "=" + param.Value
+				c.Request.URL.RawQuery += "&" + strings.ReplaceAll(param.Key, ":", "") + "=" + param.Value
 			}
 		}
 
@@ -129,7 +129,6 @@ func (gins *Gin) Redirect() {
 
 // SetContentType implements the method Adapter.SetContentType.
 func (gins *Gin) SetContentType() {
-	return
 }
 
 // Write implements the method Adapter.Write.

adapter/gorilla/gorilla.go

@@ -97,9 +97,9 @@ func (g *Gorilla) AddHandler(method, path string, handlers context.Handlers) {
 
 		for key, param := range params {
 			if r.URL.RawQuery == "" {
-				r.URL.RawQuery += strings.Replace(key, ":", "", -1) + "=" + param
+				r.URL.RawQuery += strings.ReplaceAll(key, ":", "") + "=" + param
 			} else {
-				r.URL.RawQuery += "&" + strings.Replace(key, ":", "", -1) + "=" + param
+				r.URL.RawQuery += "&" + strings.ReplaceAll(key, ":", "") + "=" + param
 			}
 		}
 

adapter/iris/iris.go

@@ -88,9 +88,9 @@ func (is *Iris) AddHandler(method, path string, handlers context.Handlers) {
 
 		for key, value := range params {
 			if c.Request().URL.RawQuery == "" {
-				c.Request().URL.RawQuery += strings.Replace(key, ":", "", -1) + "=" + value
+				c.Request().URL.RawQuery += strings.ReplaceAll(key, ":", "") + "=" + value
 			} else {
-				c.Request().URL.RawQuery += "&" + strings.Replace(key, ":", "", -1) + "=" + value
+				c.Request().URL.RawQuery += "&" + strings.ReplaceAll(key, ":", "") + "=" + value
 			}
 		}
 

adm/add.go

@@ -218,6 +218,4 @@ func insertPermissionInfoDB(conn db.Connection, name, slug, httpMethod, httpPath
 	if db.CheckError(err, db.INSERT) {
 		panic(err)
 	}
-
-	return
 }

adm/compile_assets.go

@@ -36,14 +36,14 @@ var AssetPaths = map[string]string{
 		}
 
 		for _, name := range fileNames {
-			listContent += `	"` + rootPathArr[1] + strings.Replace(name, rootPath, "", -1)[1:] + `",
+			listContent += `	"` + rootPathArr[1] + strings.ReplaceAll(name, rootPath, "")[1:] + `",
 `
 			ext := filepath.Ext(name)
 			if ext == ".css" || ext == ".js" {
 				fileName := filepath.Base(name)
 				reg, _ := regexp.Compile(".min.(.*?)" + ext)
 				pathsContent += `	"` + reg.ReplaceAllString(fileName, ".min"+ext) + `":"` +
-					rootPathArr[1] + strings.Replace(name, rootPath, "", -1)[1:] + `",
+					rootPathArr[1] + strings.ReplaceAll(name, rootPath, "")[1:] + `",
 `
 			}
 		}
@@ -55,6 +55,9 @@ var AssetPaths = map[string]string{
 }`
 
 		err = ioutil.WriteFile(outputPath+"/assets_list.go", []byte(listContent), 0644)
+		if err != nil {
+			return
+		}
 		err = ioutil.WriteFile(outputPath+"/assets_path.go", []byte(pathsContent), 0644)
 		if err != nil {
 			return

adm/compile_tmpl.go

@@ -47,7 +47,7 @@ func getContentFromDir(content, dirPath, rootPath string) string {
 
 		if suffix == ".tmpl" {
 			fmt.Println(dirPath + f.Name())
-			content += `"` + strings.Replace(dirPath, rootPath, "", -1) + onlyName + `":` + "`" + str + "`,"
+			content += `"` + strings.ReplaceAll(dirPath, rootPath, "") + onlyName + `":` + "`" + str + "`,"
 		}
 	}
 

adm/db.go

@@ -21,18 +21,18 @@ type dbInfo struct {
 }
 
 func initSurvey() {
-	survey.SelectQuestionTemplate = strings.Replace(survey.SelectQuestionTemplate,
-		"type to filter", "type to filter, enter to select", -1)
-	survey.MultiSelectQuestionTemplate = strings.Replace(survey.MultiSelectQuestionTemplate,
-		"enter to select", "space to select", -1)
+	survey.SelectQuestionTemplate = strings.ReplaceAll(survey.SelectQuestionTemplate,
+		"type to filter", "type to filter, enter to select")
+	survey.MultiSelectQuestionTemplate = strings.ReplaceAll(survey.MultiSelectQuestionTemplate,
+		"enter to select", "space to select")
 
-	survey.SelectQuestionTemplate = strings.Replace(survey.SelectQuestionTemplate,
+	survey.SelectQuestionTemplate = strings.ReplaceAll(survey.SelectQuestionTemplate,
 		"Use arrows to move, type to filter, enter to select",
-		getWord("Use arrows to move, type to filter, enter to select"), -1)
+		getWord("Use arrows to move, type to filter, enter to select"))
 
-	survey.MultiSelectQuestionTemplate = strings.Replace(survey.MultiSelectQuestionTemplate,
+	survey.MultiSelectQuestionTemplate = strings.ReplaceAll(survey.MultiSelectQuestionTemplate,
 		"Use arrows to move, space to select, type to filter",
-		getWord("Use arrows to move, space to select, type to filter"), -1)
+		getWord("Use arrows to move, space to select, type to filter"))
 }
 
 func getDBInfoFromINIConfig(cfg *ini.File, connection string) *dbInfo {

adm/generate.go

@@ -96,7 +96,8 @@ func generating(cfgFile, connName string) {
 		}
 		tables = append([]string{"[" + getWord("select all") + "]"}, tables...)
 
-		survey.SelectQuestionTemplate = strings.Replace(survey.SelectQuestionTemplate, "<enter> to select", "<space> to select", -1)
+		survey.SelectQuestionTemplate = strings.ReplaceAll(survey.SelectQuestionTemplate, "<enter> to select",
+			"<space> to select")
 
 		chooseTables = selects(tables)
 		if len(chooseTables) == 0 {

adm/minify.go

@@ -22,52 +22,48 @@ func cssMinifier(inputDir, outputFile string, hash bool) {
 	err := removeOutputFile(outputFile)
 	if err != nil {
 		log.Panicln("removeOutputFileError", err)
-		return
 	}
 
 	files, err := getInputFiles(inputDir)
 	if err != nil {
 		log.Panicln("getInputFilesError", err)
-		return
 	}
 
 	notMinifiedString, err := combineFiles(files, inputDir)
 	if err != nil {
 		log.Panicln("combineFilesError", err)
-		return
 	}
 
 	minifiedString, err := makeMini(notMinifiedString, "text/css")
 	if err != nil {
 		log.Panicln("doTheMinifyingError", err)
-		return
 	}
 
 	if hash && filepath.Ext(outputFile) == ".css" {
 		m5 := md5.New()
-		m5.Write([]byte(minifiedString))
+		_, err := m5.Write([]byte(minifiedString))
+		if err != nil {
+			log.Panicln("combineFilesError", err)
+		}
 		m5res := hex.EncodeToString(m5.Sum(nil))
-		outputFile = strings.Replace(outputFile, ".css", "."+m5res[len(m5res)-10:]+".css", -1)
+		outputFile = strings.ReplaceAll(outputFile, ".css", "."+m5res[len(m5res)-10:]+".css")
 	}
 
 	err = writeOutputFile(minifiedString, outputFile)
 	if err != nil {
 		log.Panicln("writeOutputFileError", err)
-		return
 	}
 }
 
 func jsMinifier(inputDir, outputFile string, hash bool) {
 	err := removeOutputFile(outputFile)
 	if err != nil {
 		log.Panicln("removeOutputFileError", err)
-		return
 	}
 
 	files, err := getInputFiles(inputDir)
 	if err != nil {
 		log.Panicln("getInputFilesError", err)
-		return
 	}
 
 	var b bytes.Buffer
@@ -81,7 +77,7 @@ func jsMinifier(inputDir, outputFile string, hash bool) {
 		filePath := inputDir + name
 		fileTxt, err := ioutil.ReadFile(filePath)
 		if err != nil {
-			return
+			checkError(err)
 		}
 
 		fmt.Println("file path", filePath)
@@ -91,26 +87,28 @@ func jsMinifier(inputDir, outputFile string, hash bool) {
 
 		minifiedString, err := m.Bytes("text/javascript", fileTxt)
 		if err != nil {
-			return
+			checkError(err)
 		}
 
 		_, err = b.Write(minifiedString)
 		if err != nil {
-			return
+			checkError(err)
 		}
 	}
 
 	if hash && filepath.Ext(outputFile) == ".js" {
 		m5 := md5.New()
-		m5.Write(b.Bytes())
+		_, err := m5.Write(b.Bytes())
+		if err != nil {
+			checkError(err)
+		}
 		m5res := hex.EncodeToString(m5.Sum(nil))
-		outputFile = strings.Replace(outputFile, ".js", "."+m5res[len(m5res)-10:]+".js", -1)
+		outputFile = strings.ReplaceAll(outputFile, ".js", "."+m5res[len(m5res)-10:]+".js")
 	}
 
 	err = writeOutputFile(b.String(), outputFile)
 	if err != nil {
 		checkError(err)
-		return
 	}
 }