fix config file bug

seanchann · seanchann · commit 3d7cd293beca · 2017-03-29T11:10:51.000+08:00
diff --git a/README.md b/README.md
@@ -29,6 +29,7 @@ Configuration file is in json format like this:
 {
 	"clients": [
 		{
+			"name": "client1",
 			"host":"0.0.0.0",
 			"port":18387,
 			"encrypt":"aes-128-cfb",
@@ -37,6 +38,7 @@ Configuration file is in json format like this:
 			"timeout":60
 		},
 		{
+			"name": "client2",
 			"host":"0.0.0.0",
 			"port":18388,
 			"encrypt":"aes-128-cfb",
diff --git a/build/build-image/files/config.json b/build/build-image/files/config.json
@@ -1,6 +1,7 @@
 {
 	"clients": [
 		{
+			"name": "client1",
 			"host":"0.0.0.0",
 			"port":18387,
 			"encrypt":"aes-128-cfb",
@@ -9,6 +10,7 @@
 			"timeout":60
 		},
 		{
+			"name": "client2",
 			"host":"0.0.0.0",
 			"port":18388,
 			"encrypt":"aes-128-cfb",
diff --git a/pkg/config/interface.go b/pkg/config/interface.go
@@ -9,7 +9,7 @@ type ConnectionInfo struct {
 	Password      string `json:"password"`
 	EnableOTA     bool   `json:"enableOTA"`
 	Timeout       int    `json:"timeout"`
-	Name          string `json:"name,omitempty"`
+	Name          string `json:"name"`
 
 	//max connection for user
 	MaxConnection int

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ Configuration file is in json format like this:`
`29`	`29`	`{`
`30`	`30`	`"clients": [`
`31`	`31`	`{`
	`32`	`+ "name": "client1",`
`32`	`33`	`"host":"0.0.0.0",`
`33`	`34`	`"port":18387,`
`34`	`35`	`"encrypt":"aes-128-cfb",`
`@@ -37,6 +38,7 @@ Configuration file is in json format like this:`
`37`	`38`	`"timeout":60`
`38`	`39`	`},`
`39`	`40`	`{`
	`41`	`+ "name": "client2",`
`40`	`42`	`"host":"0.0.0.0",`
`41`	`43`	`"port":18388,`
`42`	`44`	`"encrypt":"aes-128-cfb",`