From 44e2cc3deb22aa0b832a2bf4f738cd98d4e9255a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 13 Oct 2025 15:06:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java b/ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java
index c5cf605..6a97548 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java
@@ -34,9 +34,9 @@
@ApiOperation("获取六合token信息")
@ApiOperationSupport(order = 1)
- @GetMapping("/getToken")
- public AjaxResult getToken() {
- return AjaxResult.success(tyService.getAccessToken());
+ @GetMapping("/getToken/{serverId}")
+ public AjaxResult getToken(@PathVariable("serverId") String serverId) {
+ return AjaxResult.success(tyService.getAccessToken(serverId));
}
@ApiOperation("获取六合盒子列表")
--
Gitblit v1.9.3