Merge remote-tracking branch 'origin/master'

Administrator

2023-08-21 516e341ee555f64d081b85f20d102f4c47f061a5

Merge remote-tracking branch 'origin/master'

 ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java

@@ -37,8 +37,8 @@

    @GetMapping("/")
    @ApiOperation("无人机get接口")
    public Object get(@RequestParam String url, @RequestParam String data) {
        return this.uavService.doUavRequest(GET, url, data);
    public Object get(@RequestParam String url) {
        return this.uavService.doUavRequest(GET, url, "{}");

    }


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

@@ -76,6 +76,7 @@
        //验证token有效性
        try {
            String res = uavClient.GET("manage/api/v1/devices", token, "{}");
            System.out.println(res);
        } catch (ForestNetworkException fe) {
            if (fe.getStatusCode() == 401) {//token失效,重新登录
                this.login();