From 06a6dc6aba7a5ebb55ef50473b7fa165594eb004 Mon Sep 17 00:00:00 2001
From: 沈斌 <23420800@qq.com>
Date: Tue, 31 Jan 2017 15:45:28 +0800
Subject: [PATCH] 修复json config中notice问题
---
server.js | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/server.js b/server.js
index 487c0d1..511a5ad 100644
--- a/server.js
+++ b/server.js
@@ -10,16 +10,19 @@
var queue = require('./queue');
var map = {
- "5a0000010001": 32,
- "5a0000010002": 102,
- "5a0000010003": 162,
- "5a0000010004": 32,
- "5a0000010006": 122,
- "5a0000010007": 32,
- "5a000001000c": 20
+ "5a0000010001": 32, //���������������
+ "5a0000010002": 102, //���������������WIFI������
+ "5a0000010003": 162, //���������������������
+ "5a0000010004": 32, //������������
+ "5a0000010006": 122, //������������
+ "5a0000010007": 32, //������������������������������������������
+ "5a000001000c": 20 //������������
};
+global.configs = {};
+
function handleData(db, socket, value) {
+
//1.���������������
if(value.startsWith('5a0000010001')) {
var output = [ 0x6A, 0x00, 0x00, 0x01, 0x00, 0x01, 0xA1, 0x1A, 0xC7, 0x6B ];
@@ -38,7 +41,6 @@
if(value.startsWith('5a0000010003')) {
var output = [ 0x6A, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6B ];
method.insertData(db, value, function(data, rank) {
- method.insertDocument2(db, value, rank, function(data) {});
var fields = method.padLeft(rank.toString(16), 8).match(/.{2}/g);
output[6] = method.toDec(fields[0]);
output[7] = method.toDec(fields[1]);
@@ -118,6 +120,12 @@
}
console.log('Connecting to Mongo DB at ' + config.URL);
+ //���������������������������������
+ method.initConfigs(db);
+
+ //���������������������������������������
+ queue.listenToMQ("ex_data_config");
+
net.createServer().on('connection', function(socket){
console.log('CONNECTED: ' + socket.remoteAddress +':'+ socket.remotePort);
@@ -132,8 +140,6 @@
console.log("Error - invalid data - less than 12 character long");
return;
}
-
- //console.log(moment().format('YYYY-MM-DD HH:mm:ss') + " => " + value);
doWork(db, socket, value);
});
@@ -154,11 +160,7 @@
socket.on('close', function(data) {
console.log('Closed socket: ' + socket.remoteAddress +' '+ socket.remotePort);
});
-
- socket.on('close', function(data) {
- console.log('Closed socket: ' + socket.remoteAddress + ' ' + socket.remotePort);
- });
}).listen(config.PORT, config.HOST);
console.log('TCP Server listening on ' + config.HOST + ':' + config.PORT);
-});
+});
\ No newline at end of file
--
Gitblit v1.8.0