Merge branch 'master' into test

device-api-service/src/main/java/com/xy/service/factory/device/impl/alipay/AliPayOpenDeviceFatoryImpl.java

@@ -121,7 +121,7 @@ public class AliPayOpenDeviceFatoryImpl implements DeviceFactory, SpiDeviceServi
             //重启设备
             if (templet.getStr("cmdType").equals("task")) {
                 JSONObject data = templet.getJSONObject("data");
-                if (data.getStr("type").equals("app") && data.getStr("task").equals("restart")) {
+                if (data.getStr("type").equals("system") && data.getStr("task").equals("reboot")) {
                     alipayDeviceService.deviceReboot(commandMqtt.getDeviceId().toString());
                 }
             }