From d8bf7dc3fdc5f2d767323d52c1d9d8e1f53fa6d3 Mon Sep 17 00:00:00 2001 From: cobb Date: Fri, 29 Jul 2022 17:24:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0form=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=EF=BC=9B=E6=9B=B4=E5=83=8Frestful=20api=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/HelloWorld.vue | 50 ++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue index 74a89ba..cacd07f 100644 --- a/src/components/HelloWorld.vue +++ b/src/components/HelloWorld.vue @@ -129,7 +129,7 @@ export default { components: { vueJsonEditor }, data() { return { - isUnderScoreCase: true, // 默认是下划线命名法 + isUnderScoreCase: false, // 默认是非下划线 schemaKey: "19878878", renderKey: 1, activeName: "", @@ -234,10 +234,10 @@ export default { const Output = ` { ${lowTableName} := admin.Group("${lowTableName}") - ${lowTableName}.POST("list", a.${tableName}.List${tableName}) + ${lowTableName}.GET("list", a.${tableName}.List${tableName}) ${lowTableName}.POST("create", a.${tableName}.Create${tableName}) - ${lowTableName}.POST("detail", a.${tableName}.Get${tableName}One) - ${lowTableName}.POST("del", a.${tableName}.Delete${tableName}) + ${lowTableName}.GET("detail", a.${tableName}.Get${tableName}One) + ${lowTableName}.DELETE("del", a.${tableName}.Delete${tableName}) } `; return Output; @@ -332,7 +332,7 @@ export default { func (l *${tableName}Api) Get${tableName}One(c *gin.Context) { req := &schema.IDResult{} - if err := ginplus.ParseJSON(c, req); err != nil { + if err := ginplus.ParseQuery(c, req); err != nil { ginplus.ResError(c, err) return } @@ -346,7 +346,7 @@ export default { func (l *${tableName}Api) List${tableName}(c *gin.Context) { req := &model.${tableName}ReqParams{} - if err := ginplus.ParseJSON(c, req); err != nil { + if err := ginplus.ParseQuery(c, req); err != nil { ginplus.ResError(c, err) return } @@ -367,7 +367,7 @@ export default { func (l *${tableName}Api) Delete${tableName}(c *gin.Context) { var req schema.IDResult - if err := ginplus.ParseJSON(c, &req); err != nil { + if err := ginplus.ParseQuery(c, &req); err != nil { ginplus.ResError(c, err) return } @@ -605,11 +605,12 @@ export default { func (p *${tableName}ReqParams) GetExport() bool { return p.Export } type ${tableName}ReqParams struct { - Query *${tableName}Params \`json:"query,omitempty"\` - Export bool \`json:"export,omitempty"\` - Fields []string \`json:"fields,omitempty"\` - PageNum int \`json:"page_num,omitempty"\` - PageSize int \`json:"page_size,omitempty"\` + Query *${tableName}Params \`json:"query,omitempty" form:"inner_query"\` + Export bool \`json:"export,omitempty" form:"export"\` + ForQuery string \`json:"export,omitempty" form:"query"\` + Fields []string \`json:"fields,omitempty" form:"fields"\` + PageNum int \`json:"pageNum,omitempty" form:"pageNum"\` + PageSize int \`json:"pageSize,omitempty" form:"pageSize"\` } type ${tableName}Params struct {\n`; var center = ``; @@ -634,6 +635,7 @@ export default { Object.keys(properties).forEach(function (key) { const o = properties[key]; const skey = toCamelCase(key); + const caseKey = lowerCase(toCamelCase(key)); const tableKey = `${tableName}` + toCamelCase(key); const type = typeMap(o.type); // 当枚举类型的时候做处理 @@ -668,7 +670,11 @@ export default { } if (key.indexOf("_time") > -1) { - center += `${skey}Interval []interface{} \`json:"${key}|interval,omitempty"\`\n`; + if (this.isUnderScoreCase) { + center += `${skey}Interval []interface{} \`json:"${key}|interval,omitempty" form:"${key}|interval"\`\n`; + } else { + center += `${skey}Interval []interface{} \`json:"${caseKey}|interval,omitempty" form:"${caseKey}|interval"\`\n`; + } filtercenter += ` if len(para.Query.${skey}Interval) > 0 { opt.${skey}Interval(para.Query.${skey}Interval) @@ -693,7 +699,11 @@ export default { // id过滤掉，不能生成，List里面可以查询ID会有风险 if (key.indexOf("_id") > -1) { - center += `${skey}In []${type} \`json:"${key}|in,omitempty"\`\n`; + if (this.isUnderScoreCase) { + center += `${skey}In []${type} \`json:"${key}|in,omitempty" form:"${key}|in"\`\n`; + } else { + center += `${skey}In []${type} \`json:"${caseKey}|in,omitempty" form:"${caseKey}|in"\`\n`; + } filtercenter += ` if len(para.Query.${skey}In) > 0 { opt.${skey}In(para.Query.${skey}In...) @@ -709,7 +719,11 @@ export default { } if (requires.indexOf(key) > -1) { - center += `${skey} ${type} \`json:"${key},omitempty"\`\n`; + if (this.isUnderScoreCase) { + center += `${skey} ${type} \`json:"${key},omitempty" form:"${key}"\`\n`; + } else { + center += `${skey} ${type} \`json:"${caseKey},omitempty" form:"${caseKey}"\`\n`; + } if (type == "string") { filtercenter += ` if para.Query.${skey} != "" { @@ -732,7 +746,11 @@ export default { \n `; if (type == "string") { - center += `${skey}Like ${type} \`json:"${key}|like,omitempty"\`\n`; + if (this.isUnderScoreCase) { + center += `${skey}Like ${type} \`json:"${key}|like,omitempty" form:"${key}|like"\`\n`; + } else { + center += `${skey}Like ${type} \`json:"${caseKey}|like,omitempty" form:"${caseKey}|like"\`\n`; + } filtercenter += ` if para.Query.${skey}Like != "" { opt.${skey}Like(para.Query.${skey}Like)