From bfc4eee4dad838e96059c9e0c2f5e01722ab7284 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 04 十一月 2024 16:58:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
index ad41b7f..64de41c 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -7,10 +7,7 @@
import com.ruoyi.system.api.factory.SysUserFallbackFactory;
import com.ruoyi.system.api.model.*;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
import javax.management.relation.Role;
import java.util.List;
@@ -22,7 +19,7 @@
R<List<CompanyUserListVo>> getSysUserFromCompanyId(@RequestBody CompanySysUserReq companySysUserReq);
@PostMapping("/user/getSysUser")
- R<SysUser> getSysUser(Long userId);
+ R<SysUser> getSysUser(@RequestParam("userId")Long userId);
@PostMapping("/user/updateSysUser")
R<Boolean> updateSysUser(@RequestBody SysUser sysUser);
@@ -51,7 +48,7 @@
* @param userId
* @return
*/
- @GetMapping("/user/queryRoleByUserId/{userId}")
+ @PostMapping("/user/queryRoleByUserId/{userId}")
R<SysRole> queryRoleByUserId(@PathVariable("userId") Long userId);
@@ -60,7 +57,7 @@
* @param roleId
* @return
*/
- @GetMapping("/user/queryRoleByRoleId/{roleId}")
+ @PostMapping("/user/queryRoleByRoleId/{roleId}")
R<SysRole> queryRoleByRoleId(@PathVariable("roleId") Long roleId);
/**
@@ -86,15 +83,6 @@
*/
@PostMapping("/user/queryUserByPhone")
R<SysUser> queryUserByPhone(@RequestBody String phone);
-
-
- /**
- * 根据账号获取用户数据
- * @param account
- * @return
- */
- @PostMapping("/user/queryUserByAccount")
- R<SysUser> queryUserByAccount(@RequestBody String account);
/**
* 通过账号查询用户
@@ -109,7 +97,7 @@
* @param user
*/
@PostMapping("/user/addSysUser")
- R addSysUser(SysUser user);
+ R<Long> addSysUser(@RequestBody SysUser user);
/**
@@ -118,5 +106,5 @@
* @return
*/
@PostMapping("/user/resetPassword")
- R resetPassword(SysUser user);
+ R resetPassword(@RequestBody SysUser user);
}
--
Gitblit v1.7.1