From 845d08585f9affc1b42457a4cc7d513e41fee805 Mon Sep 17 00:00:00 2001
From: cuiyaming <947426925@qq.com>
Date: Wed, 3 Mar 2021 15:24:13 +0800
Subject: [PATCH] add json tag lower camel case

---
 data/config/MyIni.go          | 5 +++++
 data/view/model/model.go      | 4 ++--
 data/view/model/model_test.go | 5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/data/config/MyIni.go b/data/config/MyIni.go
index 7690b0d..12855af 100644
--- a/data/config/MyIni.go
+++ b/data/config/MyIni.go
@@ -96,6 +96,11 @@ func GetIsWEBTag() bool {
 	return _map.IsWEBTag
 }
 
+// SetIsWEBTag json tag.json标记
+func SetIsWEBTag(b bool) {
+	_map.IsWEBTag = b
+}
+
 // GetIsWebTagPkHidden web tag是否隐藏主键
 func GetIsWebTagPkHidden() bool {
 	return _map.IsWebTagPkHidden
diff --git a/data/view/model/model.go b/data/view/model/model.go
index 3e1f187..194169b 100644
--- a/data/view/model/model.go
+++ b/data/view/model/model.go
@@ -131,7 +131,7 @@ func (m *_Model) genTableElement(cols []ColumnsInfo) (el []genstruct.GenElement)
 				if isPK && config.GetIsWebTagPkHidden() {
 					tmp.AddTag(_tagJSON, "-")
 				} else {
-					tmp.AddTag(_tagJSON, mybigcamel.UnMarshal(v.Name))
+					tmp.AddTag(_tagJSON, mybigcamel.UnSmallMarshal(mybigcamel.Marshal(v.Name)))
 				}
 			}
 
@@ -174,7 +174,7 @@ func (m *_Model) genForeignKey(col ColumnsInfo) (fklist []genstruct.GenElement)
 
 			// json tag
 			if config.GetIsWEBTag() {
-				tmp.AddTag(_tagJSON, mybigcamel.UnMarshal(v.TableName)+"_list")
+				tmp.AddTag(_tagJSON, mybigcamel.UnSmallMarshal(mybigcamel.Marshal(v.TableName))+"List")
 			}
 
 			fklist = append(fklist, tmp)
diff --git a/data/view/model/model_test.go b/data/view/model/model_test.go
index 8e92422..91891ab 100644
--- a/data/view/model/model_test.go
+++ b/data/view/model/model_test.go
@@ -3,9 +3,8 @@ package model
 import (
 	"encoding/json"
 	"fmt"
-	"testing"
-
 	"github.com/xxjwxc/gormt/data/config"
+	"testing"
 )
 
 func TestTypeName(t *testing.T) {
@@ -19,6 +18,8 @@ func TestTools(t *testing.T) {
 	// out, _ := json.Marshal(pkg)
 	// tools.WriteFile("test.txt", []string{string(out)}, true)
 
+	config.SetIsWEBTag(true)
+	config.SetIsOutFunc(false)
 	list, _ := Generate(pkg)
 	fmt.Println(list)