Fix issues: #725, #740 (#813)

* Fix issues: #725, #740

* Update filed sort

Co-authored-by: anqiansong <anqiansong@xiaoheiban.cn>

tools/goctl/model/sql/gen/keys_test.go

@@ -11,32 +11,28 @@ import (
 
 func TestGenCacheKeys(t *testing.T) {
 	primaryField := &parser.Field{
-		Name:         stringx.From("id"),
-		DataBaseType: "bigint",
-		DataType:     "int64",
-		Comment:      "自增id",
-		SeqInIndex:   1,
+		Name:       stringx.From("id"),
+		DataType:   "int64",
+		Comment:    "自增id",
+		SeqInIndex: 1,
 	}
 	mobileField := &parser.Field{
-		Name:         stringx.From("mobile"),
-		DataBaseType: "varchar",
-		DataType:     "string",
-		Comment:      "手机号",
-		SeqInIndex:   1,
+		Name:       stringx.From("mobile"),
+		DataType:   "string",
+		Comment:    "手机号",
+		SeqInIndex: 1,
 	}
 	classField := &parser.Field{
-		Name:         stringx.From("class"),
-		DataBaseType: "varchar",
-		DataType:     "string",
-		Comment:      "班级",
-		SeqInIndex:   1,
+		Name:       stringx.From("class"),
+		DataType:   "string",
+		Comment:    "班级",
+		SeqInIndex: 1,
 	}
 	nameField := &parser.Field{
-		Name:         stringx.From("name"),
-		DataBaseType: "varchar",
-		DataType:     "string",
-		Comment:      "姓名",
-		SeqInIndex:   2,
+		Name:       stringx.From("name"),
+		DataType:   "string",
+		Comment:    "姓名",
+		SeqInIndex: 2,
 	}
 	primariCacheKey, uniqueCacheKey := genCacheKeys(parser.Table{
 		Name: stringx.From("user"),
@@ -53,23 +49,20 @@ func TestGenCacheKeys(t *testing.T) {
 				nameField,
 			},
 		},
-		NormalIndex: nil,
 		Fields: []*parser.Field{
 			primaryField,
 			mobileField,
 			classField,
 			nameField,
 			{
-				Name:         stringx.From("createTime"),
-				DataBaseType: "timestamp",
-				DataType:     "time.Time",
-				Comment:      "创建时间",
+				Name:     stringx.From("createTime"),
+				DataType: "time.Time",
+				Comment:  "创建时间",
 			},
 			{
-				Name:         stringx.From("updateTime"),
-				DataBaseType: "timestamp",
-				DataType:     "time.Time",
-				Comment:      "更新时间",
+				Name:     stringx.From("updateTime"),
+				DataType: "time.Time",
+				Comment:  "更新时间",
 			},
 		},
 	})