From 61c0c3ccae4c23a90c405d7ac1cb49f7d5ee0479 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 12 九月 2023 09:48:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java b/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java
index 67558fe..6a2b4db 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java
@@ -1,9 +1,6 @@
package com.ruoyi.utils.forest;
-import com.dtflys.forest.annotation.DataVariable;
-import com.dtflys.forest.annotation.Get;
-import com.dtflys.forest.annotation.JSONBody;
-import com.dtflys.forest.annotation.Post;
+import com.dtflys.forest.annotation.*;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
@@ -12,18 +9,17 @@
@Get("http://www.baidu.com")
String test();
- public static String IP = "http://112.98.126.2:6100/";
+ public static String IP = "http://112.98.126.2:7030/";
- @UavAuth(token = "${token}")
@Get(IP + "${url}")
- String GET(@DataVariable("url") String url, @DataVariable("token") String token, @JSONBody String body);
+ String GET(@Var("url") String url, @Header("x-auth-token") String token, @JSONBody String body);
- @UavAuth(token = "${token}")
@Post(IP + "${url}")
- String POST(@DataVariable("url") String url, @DataVariable("token") String token, @JSONBody String body);
- @UavAuth(token = "${token}")
- @Post(IP + "${url}")
- String DELETE(@DataVariable("url") String url, @DataVariable("token") String token, @JSONBody String body);
+ String POST(@Var("url") String url, @Header("x-auth-token") String token, @JSONBody String body);
+
+ @Delete(IP + "${url}")
+ String DELETE(@Var("url") String url, @Header("x-auth-token") String token, @JSONBody String body);
+
}
--
Gitblit v1.9.3