diff --git a/simulator/demo-protocol-1.0.jar b/simulator/demo-protocol-1.0.jar index 4e8569dd..badb06d8 100644 Binary files a/simulator/demo-protocol-1.0.jar and b/simulator/demo-protocol-1.0.jar differ 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