From 713a6addbde41a644e301372e91b43ac27311acc Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 12 Dec 2016 16:55:09 +0800
Subject: [PATCH] 删除环境数云端冗余代码
---
server.js | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/server.js b/server.js
index 1a5d74d..f1ccf9f 100644
--- a/server.js
+++ b/server.js
@@ -7,6 +7,7 @@
var mongoClient = require('mongodb').MongoClient;
var config = require('./config');
var method = require('./method');
+var queue = require('./queue');
var map = {
"5a0000010001": 32,
@@ -18,7 +19,7 @@
"5a000001000c": 20
};
-function handleData(value) {
+function handleData(db, socket, value) {
//1.���������������
if(value.startsWith('5a0000010001')) {
var output = [ 0x6A, 0x00, 0x00, 0x01, 0x00, 0x01, 0xA1, 0x1A, 0xC7, 0x6B ];
@@ -95,20 +96,26 @@
}
}
-function doWork(data) {
+function doWork(db, socket, data) {
if(data == "") return;
var length = map[data.slice(0, 12)];
if(length > 0) {
var value = data.slice(0, length);
console.log(moment().format('YYYY-MM-DD HH:mm:ss') + " => " + value);
- handleData(value);
- doWork(data.slice(length));
+ queue.publishMessage(value);
+
+ handleData(db, socket, value);
+
+ doWork(db, socket, data.slice(length));
}
}
mongoClient.connect(config.URL, function(err, db) {
- if (err) return;
+ if (err) {
+ console.log(err.message);
+ return;
+ }
console.log('Connecting to Mongo DB at ' + config.URL);
net.createServer().on('connection', function(socket){
@@ -128,11 +135,11 @@
//console.log(moment().format('YYYY-MM-DD HH:mm:ss') + " => " + value);
- doWork(value);
+ doWork(db, socket, value);
});
socket.on('end', function(){
- console.log(count)
+
});
socket.on('error', function(error) {
@@ -146,10 +153,6 @@
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);
--
Gitblit v1.8.0