From 67d965cb476bde49109a3773532c33dd9de60518 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 09 八月 2023 13:30:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java b/ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java
index 07d1185..a8f40e1 100644
--- a/ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java
@@ -1,30 +1,16 @@
package com.ruoyi.device.uav.controller;
-import com.dtflys.forest.exceptions.ForestNetworkException;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.pagehelper.util.StringUtil;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.device.uav.service.UavService;
-import com.ruoyi.utils.forest.UavClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.binary.StringUtils;
-import org.jetbrains.annotations.Nullable;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
import org.springframework.web.bind.annotation.*;
import javax.annotation.PostConstruct;
-import javax.crypto.Cipher;
-import javax.crypto.spec.SecretKeySpec;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.util.*;
-import org.apache.commons.codec.binary.Base64;
import static org.springframework.http.HttpMethod.*;
@@ -58,7 +44,9 @@
@PostMapping("/")
@ApiOperation("鏃犱汉鏈簆ost鎺ュ彛")
- public Object post(@RequestParam String url, @RequestParam String data) {
+ public Object post(@RequestBody Map<String,String> param) {
+ String url = param.get("url");
+ String data = param.get("data");
return this.uavService.doUavRequest(POST, url, data);
}
--
Gitblit v1.9.3