From 9e1ead35932dfdf99e783c83d3faf61676f02ebc Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Sat, 18 Jan 2020 17:09:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9jar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simulator/demo-protocol-1.0.jar | Bin 9950 -> 9911 bytes simulator/scripts/demo-device.js | 5 +++-- simulator/start.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/simulator/demo-protocol-1.0.jar b/simulator/demo-protocol-1.0.jar index 4e8569dd7bd06bb94ae9ecbaeec603c78ffc05c8..badb06d81d308d56007fde141a83ead9853e8e1b 100644 GIT binary patch delta 2907 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 delta 2981 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 diff --git a/simulator/scripts/demo-device.js b/simulator/scripts/demo-device.js index 650d2d31..55d27666 100644 --- a/simulator/scripts/demo-device.js +++ b/simulator/scripts/demo-device.js @@ -37,13 +37,14 @@ var events = { //事件上报 simulator.onEvent(function (index, session) { //上报属性 - events.reportProperty(index, session); + events.reportProperty(index, session); //上报火警 - // events.fireAlarm(index,session); + events.fireAlarm(index,session); }); simulator.bindHandler("/read-property", function (message, session) { + _logger.info("读取属性:[{}]", message); session.sendMessage("/read-property-reply", JSON.stringify({ messageId: message.messageId, deviceId: message.deviceId, diff --git a/simulator/start.sh b/simulator/start.sh index abbc3b7e..f0117a49 100755 --- a/simulator/start.sh +++ b/simulator/start.sh @@ -8,4 +8,4 @@ java -jar device-simulator.jar \ mqtt.eventRate=1000 \ mqtt.scriptFile=./scripts/demo-device.js \ mqtt.address=127.0.0.1 \ - mqtt.port=1889 \ No newline at end of file + mqtt.port=1883 \ No newline at end of file