diff --git a/planner/configexport/configexport_test.go b/planner/configexport/configexport_test.go index b8a379d..7556d96 100644 --- a/planner/configexport/configexport_test.go +++ b/planner/configexport/configexport_test.go @@ -3,7 +3,7 @@ package configexport import "testing" func TestNew(t *testing.T) { - c := New(`D:\sources\minotaur\planner\configexport\template.xlsx`) + c := New(`./template.xlsx`) c.ExportGo("server", "./example") c.ExportClient("client", "./example") diff --git a/planner/configexport/example/client.EasyConfig.json b/planner/configexport/example/client.EasyConfig.json index 67c853c..410ffc1 100644 --- a/planner/configexport/example/client.EasyConfig.json +++ b/planner/configexport/example/client.EasyConfig.json @@ -7,8 +7,8 @@ }, "Other": { "0": { - "id": 1, - "name": "张飞" + "name": "张飞", + "id": 1 }, "1": { "id": 2, diff --git a/planner/configexport/example/client.IndexConfig.json b/planner/configexport/example/client.IndexConfig.json index dcf5131..89c64d8 100644 --- a/planner/configexport/example/client.IndexConfig.json +++ b/planner/configexport/example/client.IndexConfig.json @@ -8,13 +8,13 @@ "1": "12" }, "Other": { - "0": { - "name": "张飞", - "id": 1 - }, "1": { "id": 2, "name": "刘备" + }, + "0": { + "id": 1, + "name": "张飞" } } } @@ -33,8 +33,8 @@ "name": "张飞" }, "1": { - "name": "刘备", - "id": 2 + "id": 2, + "name": "刘备" } } }, @@ -46,13 +46,13 @@ "1": "12" }, "Other": { - "1": { - "id": 2, - "name": "刘备" - }, "0": { "id": 1, "name": "张飞" + }, + "1": { + "name": "刘备", + "id": 2 } } } diff --git a/planner/configexport/example/server.EasyConfig.json b/planner/configexport/example/server.EasyConfig.json index 85f2a5d..7a84e12 100644 --- a/planner/configexport/example/server.EasyConfig.json +++ b/planner/configexport/example/server.EasyConfig.json @@ -2,15 +2,15 @@ "Id": 1, "Count": "a", "Info": { + "id": 1, "name": "小明", "info": { + "lv": 1, "exp": { "mux": 10, "count": 100 - }, - "lv": 1 - }, - "id": 1 + } + } }, "Other": { "0": { diff --git a/planner/configexport/example/server.IndexConfig.json b/planner/configexport/example/server.IndexConfig.json index fe128bc..f6597b1 100644 --- a/planner/configexport/example/server.IndexConfig.json +++ b/planner/configexport/example/server.IndexConfig.json @@ -1,37 +1,36 @@ { "1": { "b": { + "Id": 1, + "Count": "b", + "Info": { + "name": "小明", + "info": { + "lv": 1, + "exp": { + "mux": 10, + "count": 100 + } + }, + "id": 1 + }, "Other": { "0": { - "id": 1, - "name": "张飞" + "name": "张飞", + "id": 1 }, "1": { "id": 2, "name": "刘备" } - }, - "Id": 1, - "Count": "b", - "Info": { - "id": 1, - "name": "小明", - "info": { - "lv": 1, - "exp": { - "mux": 10, - "count": 100 - } - } } } }, "2": { - "d": { + "c": { "Id": 2, - "Count": "d", + "Count": "c", "Info": { - "id": 1, "name": "小明", "info": { "lv": 1, @@ -39,7 +38,8 @@ "mux": 10, "count": 100 } - } + }, + "id": 1 }, "Other": { "0": { @@ -52,19 +52,19 @@ } } }, - "c": { + "d": { "Id": 2, - "Count": "c", + "Count": "d", "Info": { - "id": 1, - "name": "小明", "info": { - "lv": 1, "exp": { "mux": 10, "count": 100 - } - } + }, + "lv": 1 + }, + "id": 1, + "name": "小明" }, "Other": { "0": {