Merge pull request #525 from go-admin-team/dev

Dev

app/admin/models/sys_api.go

@@ -1,10 +1,14 @@
 package models
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
+	"regexp"
 	"strings"
 
+	"github.com/bitly/go-simplejson"
 	"github.com/go-admin-team/go-admin-core/sdk"
 	"github.com/go-admin-team/go-admin-core/sdk/runtime"
 	"github.com/go-admin-team/go-admin-core/storage"
@@ -58,8 +62,21 @@ func SaveSysApi(message storage.Messager) (err error) {
 				strings.Contains(v.RelativePath, "/static/") ||
 				strings.Contains(v.RelativePath, "/form-generator/") ||
 				strings.Contains(v.RelativePath, "/sys/tables") {
+
+				// 根据接口方法注释里的@Summary填充接口名称，适用于代码生成器
+				// 可在此处增加配置路径前缀的if判断，只对代码生成的自建应用进行定向的接口名称填充
+				jsonFile, _ := ioutil.ReadFile("docs/swagger.json")
+				jsonData, _ := simplejson.NewFromReader(bytes.NewReader(jsonFile))
+				urlPath := v.RelativePath
+				idPatten := "(.*)/:(\\w+)" // 正则替换，把:id换成{id}
+				reg, _ := regexp.Compile(idPatten)
+				if reg.MatchString(urlPath) {
+					urlPath = reg.ReplaceAllString(v.RelativePath, "${1}/{${2}}") // 把:id换成{id}
+				}
+				apiTitle, _ := jsonData.Get("paths").Get(urlPath).Get(strings.ToLower(v.HttpMethod)).Get("summary").String()
+
 				err := d.Debug().Where(SysApi{Path: v.RelativePath, Action: v.HttpMethod}).
-					Attrs(SysApi{Handle: v.Handler}).
+					Attrs(SysApi{Handle: v.Handler, Title: apiTitle}).
 					FirstOrCreate(&SysApi{}).
 					//Update("handle", v.Handler).
 					Error

common/global/adm.go

@@ -2,7 +2,7 @@ package global
 
 const (
 	// Version go-admin version info
-	Version = "2.0.2"
+	Version = "2.0.3"
 )
 
 var (

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/alibaba/sentinel-golang v0.6.1
 	github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5
+	github.com/bitly/go-simplejson v0.5.0
 	github.com/bytedance/go-tagexpr/v2 v2.7.12
 	github.com/casbin/casbin/v2 v2.25.1
 	github.com/gin-gonic/gin v1.7.2

template/v4/vue.go.template

@@ -27,9 +27,9 @@
                                                placeholder="{{$tableComment}}{{.ColumnComment}}" clearable size="small">
                                         <el-option
                                                 v-for="dict in {{.JsonField}}Options"
-                                                :key="dict.dictValue"
-                                                :label="dict.dictLabel"
-                                                :value="dict.dictValue"
+                                                :key="dict.value"
+                                                :label="dict.label"
+                                                :value="dict.value"
                                         />
                                     </el-select>
                                 {{- end}}
@@ -179,9 +179,9 @@
                                                        placeholder="请选择" {{if eq .IsEdit "false" -}} :disabled="isEdit" {{- end }}>
                                                 <el-option
                                                         v-for="dict in {{.JsonField}}Options"
-                                                        :key="dict.dictValue"
-                                                        :label="dict.dictLabel"
-                                                        :value="dict.dictValue"
+                                                        :key="dict.value"
+                                                        :label="dict.label"
+                                                        :value="dict.value"
                                                 />
                                             </el-select>
                                             {{- end -}}
@@ -189,9 +189,9 @@
                                             <el-radio-group v-model="form.{{.JsonField}}">
                                                 <el-radio
                                                         v-for="dict in {{.JsonField}}Options"
-                                                        :key="dict.dictValue"
-                                                        :label="dict.dictValue"
-                                                >{{"{{"}} dict.dictLabel {{"}}"}}</el-radio>
+                                                        :key="dict.value"
+                                                        :label="dict.value"
+                                                >{{"{{"}} dict.label {{"}}"}}</el-radio>
                                             </el-radio-group>
                                         {{- else if eq "file" .HtmlType -}}
                                             <el-input