Merge branch 'dev' into test

share-system/src/main/java/share/system/service/impl/MqttxServiceImpl.java

@@ -557,7 +557,7 @@ public class MqttxServiceImpl implements MqttxService {
                 Map<String, Device> map = deviceList.stream()
                         .collect(Collectors.toMap(Device::getDevId, Function.identity()));
                 // 设备操作日志（最近3分钟内的最新操作日志）
-                Date startDate = DateUtil.offsetMinute(DateUtil.date(), -3);
+                Date startDate = DateUtil.offsetMinute(DateUtil.date(), -5);
                 List<DeviceLog> deviceLogList = deviceLogMapper.selectListByMaxId(devIds, startDate);
                 // 将List转换为Map
                 Map<String, DeviceLog> deviceLogMap = deviceLogList.stream()

share-system/src/main/java/share/system/service/impl/WechatNewServiceImpl.java

@@ -511,7 +511,8 @@ public class WechatNewServiceImpl implements WechatNewService {
                 if (data2.containsKey("errcode") && !data2.getString("errcode").equals("0")) {
                     if (data2.containsKey("errmsg")) {
                         wxExceptionDispose(data2, "微信小程序发送订阅消息重试异常");
-                        throw new BaseException("微信接口调用失败：" + data2.getString("errcode") + data2.getString("errmsg"));
+                        logger.error("微信小程序发送订阅消息重试异常：" + data2.getString("errcode") + data2.getString("errmsg"));
+//                        throw new BaseException("微信接口调用失败：" + data2.getString("errcode") + data2.getString("errmsg"));
                     }
                 } else {
                     return Boolean.TRUE;
@@ -519,7 +520,8 @@ public class WechatNewServiceImpl implements WechatNewService {
             }
             if (data.containsKey("errmsg")) {
                 wxExceptionDispose(data, "微信小程序发送订阅消息异常");
-                throw new BaseException("微信接口调用失败：" + data.getString("errcode") + data.getString("errmsg"));
+                logger.error("微信小程序发送订阅消息异常：" + data.getString("errcode") + data.getString("errmsg"));
+//                throw new BaseException("微信接口调用失败：" + data.getString("errcode") + data.getString("errmsg"));
             }
         }
         return Boolean.TRUE;