From 752f9377ce15d50a2162ddd4e76b9bfad903ff26 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 七月 2017 21:01:06 +0800
Subject: [PATCH] 固话代码优化
---
ProxyConsole/config.json | 66 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/ProxyConsole/config.json b/ProxyConsole/config.json
index e47e1f8..6fabe8a 100644
--- a/ProxyConsole/config.json
+++ b/ProxyConsole/config.json
@@ -8,6 +8,7 @@
"equipments" : [
+
{
"id" : 1,
"type" : 4,
@@ -29,12 +30,41 @@
"channel" : 0,
"byWallNo" : 1,
"dwSubWinNo" : 1,
- "dwWinNo" : 1,
+ "dwWinNo" : [1,2],
"lAlarmOutPort" : 1
}
},
+
+
{
- "id" : 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",
@@ -53,36 +83,14 @@
"passwd" : "admin12345",
"channel" : 1,
"byWallNo" : 1,
- "dwSubWinNo" : 2,
- "dwWinNo" : 1,
- "lAlarmOutPort" : 1
- }
- },
- {
- "id" : 1,
- "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" : 2,
- "byWallNo" : 1,
- "dwSubWinNo" : 3,
- "dwWinNo" : 1,
+ "dwSubWinNo" : 1,
+ "dwWinNo" : [4,3],
"lAlarmOutPort" : 1
}
}
+
+
+
]
}
\ No newline at end of file
--
Gitblit v1.8.0