From 52bd84663ef5bff417588dccd324937d506b9d95 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 四月 2017 18:38:13 +0800
Subject: [PATCH] optimize

---
 ProxyConsole/config.json |   71 ++++++++++++++++++++++++++++++++++-
 1 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/ProxyConsole/config.json b/ProxyConsole/config.json
index 55c97e9..6fabe8a 100644
--- a/ProxyConsole/config.json
+++ b/ProxyConsole/config.json
@@ -1,10 +1,18 @@
 {
+	"hcsdk" : {
+		"serverIP" : "192.168.1.101",
+		"serverport" : 8000,
+		"username" : "admin",
+		"passwd" : "a1234567"
+	},
+
 	"equipments" : [
+	
 	
 		{
 			"id" : 1,
 			"type" : 4,
-			"type_str" : "ET_HCNET_DECODER_ALARMOUT",
+			"type_str" : "ET_HCNET_DECODER_LOGO",
 			"ip" : "192.168.1.5",
 			"port" : "80",
 			"user" : "supervisor",
@@ -15,17 +23,74 @@
 			"reboot" : 0,
 			
 			"user_config" : {
-				"ip" : "192.168.1.63",
+				"ip" : "192.168.1.64",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 0,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : [1,2],
+				"lAlarmOutPort" : 1
+			}
+		},
+		
+	
+		{
+			"id" : 5,
+			"type" : 4,
+			"type_str" : "ET_HCNET_DECODER_LOGO",
+			"ip" : "192.168.1.6",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "192.168.1.101",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "192.168.1.66",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 0,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 5,
+				"lAlarmOutPort" : 1
+			}
+		},
+
+		
+		{
+			"id" : 3,
+			"type" : 4,
+			"type_str" : "ET_HCNET_DECODER_LOGO",
+			"ip" : "192.168.1.5",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "192.168.1.101",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "192.168.1.66",
 				"port" : 8000,
 				"username" : "admin",
 				"passwd" : "admin12345",
 				"channel" : 1,
 				"byWallNo" : 1,
 				"dwSubWinNo" : 1,
-				"dwWinNo" : 0,
+				"dwWinNo" : [4,3],
 				"lAlarmOutPort" : 1
 			}
 		}
+		
+		
+
 	
 	]
 }
\ No newline at end of file

--
Gitblit v1.8.0