From 5a5b01fa9824a42e3eb033088a20e24c32b30dda Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 17 八月 2024 16:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/RoleSiteClient.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/RoleSiteClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/RoleSiteClient.java
index 7dd2db2..c230ce7 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/RoleSiteClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/RoleSiteClient.java
@@ -6,10 +6,7 @@
import com.ruoyi.other.api.factory.RoleSiteFallbackFactory;
import com.ruoyi.other.api.factory.UserSiteFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -26,8 +23,8 @@
* @param roleId
* @return
*/
- @PostMapping("/t-role-site/getSiteIds")
- R<List<Integer>> getSiteIds(Long roleId);
+ @PostMapping("/t-role-site/getSiteIds/{roleId}")
+ R<List<Integer>> getSiteIds(@PathVariable("roleId") Long roleId);
/**
@@ -36,13 +33,13 @@
* @return
*/
@PostMapping("/t-role-site/addRoleSite")
- R addRoleSite(List<TRoleSite> roleSites);
+ R addRoleSite(@RequestBody List<TRoleSite> roleSites);
/**
* 删除角色站点数据
* @param roleId
* @return
*/
- @DeleteMapping("/t-role-site/delRoleSite")
- R delRoleSite(Long roleId);
+ @DeleteMapping("/t-role-site/delRoleSite/{roleId}")
+ R delRoleSite(@PathVariable("roleId") Long roleId);
}
--
Gitblit v1.7.1