Merge remote-tracking branch 'origin/master'

Administrator

2023-08-09 67d965cb476bde49109a3773532c33dd9de60518

 ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java

@@ -1,6 +1,7 @@
package com.ruoyi.device.uav.service;

import com.dtflys.forest.exceptions.ForestNetworkException;
import com.dtflys.forest.exceptions.ForestRuntimeException;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -89,8 +90,8 @@
            if (this.uavUser != null) {
                this.token = (String) this.uavUser.get("access_token");
            }
        } catch (ForestNetworkException e) {
            e.printStackTrace();
        } catch (ForestRuntimeException e) {
            log.error("无人机连接超时" + e.getMessage());
        } catch (JsonMappingException e) {
            e.printStackTrace();
        } catch (JsonProcessingException e) {