mirror of
https://gitee.com/dromara/RuoYi-Cloud-Plus.git
synced 2026-04-24 11:28:39 +08:00
Revert "[重大更新] 使用 spring feign 替代 HttpServiceClient (功能太新 支持不完全 使用成本太高)"
This reverts commit 485c2001
This commit is contained in:
@@ -1,20 +1,18 @@
|
||||
package org.dromara.system.api;
|
||||
|
||||
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.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.dromara.common.core.annotation.RemoteHttpService;
|
||||
import org.dromara.system.api.domain.vo.RemoteClientVo;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.service.annotation.GetExchange;
|
||||
import org.springframework.web.service.annotation.HttpExchange;
|
||||
|
||||
/**
|
||||
* 客户端服务
|
||||
*
|
||||
* @author Michelle.Chung
|
||||
*/
|
||||
@FeignClient(contextId = "remoteClientService", name = "ruoyi-system", path = "/remote/client", primary = false)
|
||||
@RemoteHttpService("ruoyi-system")
|
||||
@HttpExchange("/remote/client")
|
||||
public interface RemoteClientService {
|
||||
|
||||
/**
|
||||
@@ -23,8 +21,7 @@ public interface RemoteClientService {
|
||||
* @param clientId 客户端id
|
||||
* @return 客户端对象
|
||||
*/
|
||||
@GetMapping("/query-by-client-id")
|
||||
@GetExchange("/query-by-client-id")
|
||||
RemoteClientVo queryByClientId(@RequestParam String clientId);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,15 +1,12 @@
|
||||
package org.dromara.system.api;
|
||||
|
||||
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.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import cn.hutool.core.lang.Dict;
|
||||
import org.dromara.common.core.annotation.RemoteHttpService;
|
||||
import org.dromara.common.json.utils.JsonUtils;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.service.annotation.GetExchange;
|
||||
import org.springframework.web.service.annotation.HttpExchange;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
@@ -19,14 +16,15 @@ import java.util.List;
|
||||
*
|
||||
* @author Michelle.Chung
|
||||
*/
|
||||
@FeignClient(contextId = "remoteConfigService", name = "ruoyi-system", path = "/remote/config", primary = false)
|
||||
@RemoteHttpService("ruoyi-system")
|
||||
@HttpExchange("/remote/config")
|
||||
public interface RemoteConfigService {
|
||||
|
||||
/**
|
||||
* 获取注册开关
|
||||
* @return true开启,false关闭
|
||||
*/
|
||||
@GetMapping("/select-register-enabled")
|
||||
@GetExchange("/select-register-enabled")
|
||||
boolean selectRegisterEnabled();
|
||||
|
||||
/**
|
||||
@@ -35,7 +33,7 @@ public interface RemoteConfigService {
|
||||
* @param configKey 参数 key
|
||||
* @return 参数值
|
||||
*/
|
||||
@GetMapping("/get-config-value")
|
||||
@GetExchange("/get-config-value")
|
||||
String getConfigValue(@RequestParam String configKey);
|
||||
|
||||
/**
|
||||
@@ -123,4 +121,3 @@ public interface RemoteConfigService {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,19 +1,17 @@
|
||||
package org.dromara.system.api;
|
||||
|
||||
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.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.dromara.common.core.annotation.RemoteHttpService;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.service.annotation.GetExchange;
|
||||
import org.springframework.web.service.annotation.HttpExchange;
|
||||
|
||||
/**
|
||||
* 数据权限服务
|
||||
*
|
||||
* @author Lion Li
|
||||
*/
|
||||
@FeignClient(contextId = "remoteDataScopeService", name = "ruoyi-system", path = "/remote/data-scope", primary = false)
|
||||
@RemoteHttpService("ruoyi-system")
|
||||
@HttpExchange("/remote/data-scope")
|
||||
public interface RemoteDataScopeService {
|
||||
|
||||
/**
|
||||
@@ -22,7 +20,7 @@ public interface RemoteDataScopeService {
|
||||
* @param roleId 角色ID
|
||||
* @return 返回角色的自定义权限语句,如果没有找到则返回 null
|
||||
*/
|
||||
@GetMapping("/role-custom")
|
||||
@GetExchange("/role-custom")
|
||||
String getRoleCustom(@RequestParam Long roleId);
|
||||
|
||||
/**
|
||||
@@ -31,8 +29,7 @@ public interface RemoteDataScopeService {
|
||||
* @param deptId 部门ID
|
||||
* @return 返回部门及其下级的权限语句,如果没有找到则返回 null
|
||||
*/
|
||||
@GetMapping("/dept-and-child")
|
||||
@GetExchange("/dept-and-child")
|
||||
String getDeptAndChild(@RequestParam Long deptId);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
package org.dromara.system.api;
|
||||
|
||||
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.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.dromara.common.core.annotation.RemoteHttpService;
|
||||
import org.dromara.system.api.domain.vo.RemoteDeptVo;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.service.annotation.GetExchange;
|
||||
import org.springframework.web.service.annotation.HttpExchange;
|
||||
import org.springframework.web.service.annotation.PostExchange;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@@ -19,7 +17,8 @@ import java.util.Map;
|
||||
*
|
||||
* @author Lion Li
|
||||
*/
|
||||
@FeignClient(contextId = "remoteDeptService", name = "ruoyi-system", path = "/remote/dept", primary = false)
|
||||
@RemoteHttpService("ruoyi-system")
|
||||
@HttpExchange("/remote/dept")
|
||||
public interface RemoteDeptService {
|
||||
|
||||
/**
|
||||
@@ -28,7 +27,7 @@ public interface RemoteDeptService {
|
||||
* @param deptIds 部门ID串逗号分隔
|
||||
* @return 部门名称串逗号分隔
|
||||
*/
|
||||
@GetMapping("/select-dept-name-by-ids")
|
||||
@GetExchange("/select-dept-name-by-ids")
|
||||
String selectDeptNameByIds(@RequestParam String deptIds);
|
||||
|
||||
/**
|
||||
@@ -37,7 +36,7 @@ public interface RemoteDeptService {
|
||||
* @param deptId 部门ID,用于指定需要查询的部门
|
||||
* @return 返回该部门的负责人ID
|
||||
*/
|
||||
@GetMapping("/select-dept-leader-by-id")
|
||||
@GetExchange("/select-dept-leader-by-id")
|
||||
Long selectDeptLeaderById(@RequestParam Long deptId);
|
||||
|
||||
/**
|
||||
@@ -45,7 +44,7 @@ public interface RemoteDeptService {
|
||||
*
|
||||
* @return 部门列表
|
||||
*/
|
||||
@GetMapping("/select-depts-by-list")
|
||||
@GetExchange("/select-depts-by-list")
|
||||
List<RemoteDeptVo> selectDeptsByList();
|
||||
|
||||
/**
|
||||
@@ -54,8 +53,7 @@ public interface RemoteDeptService {
|
||||
* @param deptIds 部门 ID 列表
|
||||
* @return Map,其中 key 为部门 ID,value 为对应的部门名称
|
||||
*/
|
||||
@PostMapping("/select-dept-names-by-ids")
|
||||
@PostExchange("/select-dept-names-by-ids")
|
||||
Map<Long, String> selectDeptNamesByIds(@RequestBody Collection<Long> deptIds);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,14 +1,11 @@
|
||||
package org.dromara.system.api;
|
||||
|
||||
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.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.dromara.common.core.annotation.RemoteHttpService;
|
||||
import org.dromara.system.api.domain.vo.RemoteDictDataVo;
|
||||
import org.dromara.system.api.domain.vo.RemoteDictTypeVo;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.service.annotation.GetExchange;
|
||||
import org.springframework.web.service.annotation.HttpExchange;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -17,7 +14,8 @@ import java.util.List;
|
||||
*
|
||||
* @author Lion Li
|
||||
*/
|
||||
@FeignClient(contextId = "remoteDictService", name = "ruoyi-system", path = "/remote/dict", primary = false)
|
||||
@RemoteHttpService("ruoyi-system")
|
||||
@HttpExchange("/remote/dict")
|
||||
public interface RemoteDictService {
|
||||
|
||||
/**
|
||||
@@ -26,7 +24,7 @@ public interface RemoteDictService {
|
||||
* @param dictType 字典类型
|
||||
* @return 字典类型
|
||||
*/
|
||||
@GetMapping("/select-dict-type-by-type")
|
||||
@GetExchange("/select-dict-type-by-type")
|
||||
RemoteDictTypeVo selectDictTypeByType(@RequestParam String dictType);
|
||||
|
||||
/**
|
||||
@@ -35,8 +33,7 @@ public interface RemoteDictService {
|
||||
* @param dictType 字典类型
|
||||
* @return 字典数据集合信息
|
||||
*/
|
||||
@GetMapping("/select-dict-data-by-type")
|
||||
@GetExchange("/select-dict-data-by-type")
|
||||
List<RemoteDictDataVo> selectDictDataByType(@RequestParam String dictType);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,21 +1,19 @@
|
||||
package org.dromara.system.api;
|
||||
|
||||
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.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.dromara.common.core.annotation.RemoteHttpService;
|
||||
import org.dromara.system.api.domain.bo.RemoteLoginInfoBo;
|
||||
import org.dromara.system.api.domain.bo.RemoteOperLogBo;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.service.annotation.HttpExchange;
|
||||
import org.springframework.web.service.annotation.PostExchange;
|
||||
|
||||
/**
|
||||
* 日志服务
|
||||
*
|
||||
* @author Lion Li
|
||||
*/
|
||||
@FeignClient(contextId = "remoteLogService", name = "ruoyi-system", path = "/remote/log", primary = false)
|
||||
@RemoteHttpService("ruoyi-system")
|
||||
@HttpExchange("/remote/log")
|
||||
public interface RemoteLogService {
|
||||
|
||||
/**
|
||||
@@ -23,7 +21,7 @@ public interface RemoteLogService {
|
||||
*
|
||||
* @param sysOperLog 日志实体
|
||||
*/
|
||||
@PostMapping("/save-log")
|
||||
@PostExchange("/save-log")
|
||||
void saveLog(@RequestBody RemoteOperLogBo sysOperLog);
|
||||
|
||||
/**
|
||||
@@ -31,8 +29,7 @@ public interface RemoteLogService {
|
||||
*
|
||||
* @param sysLoginInfo 访问实体
|
||||
*/
|
||||
@PostMapping("/save-login-info")
|
||||
@PostExchange("/save-login-info")
|
||||
void saveLoginInfo(@RequestBody RemoteLoginInfoBo sysLoginInfo);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
package org.dromara.system.api;
|
||||
|
||||
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.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.dromara.common.core.annotation.RemoteHttpService;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.service.annotation.GetExchange;
|
||||
import org.springframework.web.service.annotation.HttpExchange;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
@@ -15,7 +12,8 @@ import java.util.Set;
|
||||
*
|
||||
* @author Lion Li
|
||||
*/
|
||||
@FeignClient(contextId = "remotePermissionService", name = "ruoyi-system", path = "/remote/permission", primary = false)
|
||||
@RemoteHttpService("ruoyi-system")
|
||||
@HttpExchange("/remote/permission")
|
||||
public interface RemotePermissionService {
|
||||
|
||||
/**
|
||||
@@ -24,7 +22,7 @@ public interface RemotePermissionService {
|
||||
* @param userId 用户id
|
||||
* @return 角色权限信息
|
||||
*/
|
||||
@GetMapping("/role-permission")
|
||||
@GetExchange("/role-permission")
|
||||
Set<String> getRolePermission(@RequestParam Long userId);
|
||||
|
||||
/**
|
||||
@@ -33,8 +31,7 @@ public interface RemotePermissionService {
|
||||
* @param userId 用户id
|
||||
* @return 菜单权限信息
|
||||
*/
|
||||
@GetMapping("/menu-permission")
|
||||
@GetExchange("/menu-permission")
|
||||
Set<String> getMenuPermission(@RequestParam Long userId);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
package org.dromara.system.api;
|
||||
|
||||
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.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.dromara.common.core.annotation.RemoteHttpService;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.service.annotation.HttpExchange;
|
||||
import org.springframework.web.service.annotation.PostExchange;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
@@ -16,7 +13,8 @@ import java.util.Map;
|
||||
*
|
||||
* @author Lion Li
|
||||
*/
|
||||
@FeignClient(contextId = "remotePostService", name = "ruoyi-system", path = "/remote/post", primary = false)
|
||||
@RemoteHttpService("ruoyi-system")
|
||||
@HttpExchange("/remote/post")
|
||||
public interface RemotePostService {
|
||||
|
||||
/**
|
||||
@@ -25,8 +23,7 @@ public interface RemotePostService {
|
||||
* @param postIds 岗位 ID 列表
|
||||
* @return Map,其中 key 为岗位 ID,value 为对应的岗位名称
|
||||
*/
|
||||
@PostMapping("/select-post-names-by-ids")
|
||||
@PostExchange("/select-post-names-by-ids")
|
||||
Map<Long, String> selectPostNamesByIds(@RequestBody Collection<Long> postIds);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
package org.dromara.system.api;
|
||||
|
||||
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.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.dromara.common.core.annotation.RemoteHttpService;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.service.annotation.HttpExchange;
|
||||
import org.springframework.web.service.annotation.PostExchange;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
@@ -16,7 +13,8 @@ import java.util.Map;
|
||||
*
|
||||
* @author Lion Li
|
||||
*/
|
||||
@FeignClient(contextId = "remoteRoleService", name = "ruoyi-system", path = "/remote/role", primary = false)
|
||||
@RemoteHttpService("ruoyi-system")
|
||||
@HttpExchange("/remote/role")
|
||||
public interface RemoteRoleService {
|
||||
|
||||
/**
|
||||
@@ -25,8 +23,7 @@ public interface RemoteRoleService {
|
||||
* @param roleIds 角色 ID 列表
|
||||
* @return Map,其中 key 为角色 ID,value 为对应的角色名称
|
||||
*/
|
||||
@PostMapping("/select-role-names-by-ids")
|
||||
@PostExchange("/select-role-names-by-ids")
|
||||
Map<Long, String> selectRoleNamesByIds(@RequestBody Collection<Long> roleIds);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,15 +1,13 @@
|
||||
package org.dromara.system.api;
|
||||
|
||||
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.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.dromara.common.core.annotation.RemoteHttpService;
|
||||
import org.dromara.system.api.domain.bo.RemoteSocialBo;
|
||||
import org.dromara.system.api.domain.vo.RemoteSocialVo;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.service.annotation.GetExchange;
|
||||
import org.springframework.web.service.annotation.HttpExchange;
|
||||
import org.springframework.web.service.annotation.PostExchange;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -18,7 +16,8 @@ import java.util.List;
|
||||
*
|
||||
* @author Michelle.Chung
|
||||
*/
|
||||
@FeignClient(contextId = "remoteSocialService", name = "ruoyi-system", path = "/remote/social", primary = false)
|
||||
@RemoteHttpService("ruoyi-system")
|
||||
@HttpExchange("/remote/social")
|
||||
public interface RemoteSocialService {
|
||||
|
||||
/**
|
||||
@@ -27,7 +26,7 @@ public interface RemoteSocialService {
|
||||
* @param authId 认证id
|
||||
* @return 授权信息
|
||||
*/
|
||||
@GetMapping("/select-by-auth-id")
|
||||
@GetExchange("/select-by-auth-id")
|
||||
List<RemoteSocialVo> selectByAuthId(@RequestParam String authId);
|
||||
|
||||
/**
|
||||
@@ -35,7 +34,7 @@ public interface RemoteSocialService {
|
||||
*
|
||||
* @param bo 社会化关系业务对象
|
||||
*/
|
||||
@PostMapping("/query-list")
|
||||
@PostExchange("/query-list")
|
||||
List<RemoteSocialVo> queryList(@RequestBody RemoteSocialBo bo);
|
||||
|
||||
/**
|
||||
@@ -43,7 +42,7 @@ public interface RemoteSocialService {
|
||||
*
|
||||
* @param bo 社会化关系业务对象
|
||||
*/
|
||||
@PostMapping("/insert-by-bo")
|
||||
@PostExchange("/insert-by-bo")
|
||||
void insertByBo(@RequestBody RemoteSocialBo bo);
|
||||
|
||||
/**
|
||||
@@ -51,7 +50,7 @@ public interface RemoteSocialService {
|
||||
*
|
||||
* @param bo 社会化关系业务对象
|
||||
*/
|
||||
@PostMapping("/update-by-bo")
|
||||
@PostExchange("/update-by-bo")
|
||||
void updateByBo(@RequestBody RemoteSocialBo bo);
|
||||
|
||||
/**
|
||||
@@ -60,8 +59,7 @@ public interface RemoteSocialService {
|
||||
* @param socialId 社会化关系ID
|
||||
* @return 结果
|
||||
*/
|
||||
@PostMapping("/delete-with-valid-by-id")
|
||||
@PostExchange("/delete-with-valid-by-id")
|
||||
Boolean deleteWithValidById(@RequestParam Long socialId);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,21 +1,19 @@
|
||||
package org.dromara.system.api;
|
||||
|
||||
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.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.dromara.common.core.annotation.RemoteHttpService;
|
||||
import org.dromara.system.api.domain.bo.RemoteTaskAssigneeBo;
|
||||
import org.dromara.system.api.domain.vo.RemoteTaskAssigneeVo;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.service.annotation.HttpExchange;
|
||||
import org.springframework.web.service.annotation.PostExchange;
|
||||
|
||||
/**
|
||||
* 工作流设计器获取任务执行人
|
||||
*
|
||||
* @author Lion Li
|
||||
*/
|
||||
@FeignClient(contextId = "remoteTaskAssigneeService", name = "ruoyi-system", path = "/remote/task-assignee", primary = false)
|
||||
@RemoteHttpService("ruoyi-system")
|
||||
@HttpExchange("/remote/task-assignee")
|
||||
public interface RemoteTaskAssigneeService {
|
||||
|
||||
/**
|
||||
@@ -24,7 +22,7 @@ public interface RemoteTaskAssigneeService {
|
||||
* @param taskQuery 查询条件
|
||||
* @return 办理人
|
||||
*/
|
||||
@PostMapping("/select-roles")
|
||||
@PostExchange("/select-roles")
|
||||
RemoteTaskAssigneeVo selectRolesByTaskAssigneeList(@RequestBody RemoteTaskAssigneeBo taskQuery);
|
||||
|
||||
/**
|
||||
@@ -33,7 +31,7 @@ public interface RemoteTaskAssigneeService {
|
||||
* @param taskQuery 查询条件
|
||||
* @return 办理人
|
||||
*/
|
||||
@PostMapping("/select-posts")
|
||||
@PostExchange("/select-posts")
|
||||
RemoteTaskAssigneeVo selectPostsByTaskAssigneeList(@RequestBody RemoteTaskAssigneeBo taskQuery);
|
||||
|
||||
/**
|
||||
@@ -42,7 +40,7 @@ public interface RemoteTaskAssigneeService {
|
||||
* @param taskQuery 查询条件
|
||||
* @return 办理人
|
||||
*/
|
||||
@PostMapping("/select-depts")
|
||||
@PostExchange("/select-depts")
|
||||
RemoteTaskAssigneeVo selectDeptsByTaskAssigneeList(@RequestBody RemoteTaskAssigneeBo taskQuery);
|
||||
|
||||
/**
|
||||
@@ -51,8 +49,7 @@ public interface RemoteTaskAssigneeService {
|
||||
* @param taskQuery 查询条件
|
||||
* @return 办理人
|
||||
*/
|
||||
@PostMapping("/select-users")
|
||||
@PostExchange("/select-users")
|
||||
RemoteTaskAssigneeVo selectUsersByTaskAssigneeList(@RequestBody RemoteTaskAssigneeBo taskQuery);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,19 +1,17 @@
|
||||
package org.dromara.system.api;
|
||||
|
||||
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.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.dromara.common.core.exception.ServiceException;
|
||||
import org.dromara.common.core.exception.user.UserException;
|
||||
import org.dromara.common.core.annotation.RemoteHttpService;
|
||||
import org.dromara.system.api.domain.bo.RemoteUserBo;
|
||||
import org.dromara.system.api.domain.vo.RemoteUserVo;
|
||||
import org.dromara.system.api.model.LoginUser;
|
||||
import org.dromara.system.api.model.XcxLoginUser;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.service.annotation.GetExchange;
|
||||
import org.springframework.web.service.annotation.HttpExchange;
|
||||
import org.springframework.web.service.annotation.PostExchange;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@@ -24,7 +22,8 @@ import java.util.Map;
|
||||
*
|
||||
* @author Lion Li
|
||||
*/
|
||||
@FeignClient(contextId = "remoteUserService", name = "ruoyi-system", path = "/remote/user", primary = false)
|
||||
@RemoteHttpService("ruoyi-system")
|
||||
@HttpExchange("/remote/user")
|
||||
public interface RemoteUserService {
|
||||
|
||||
/**
|
||||
@@ -33,7 +32,7 @@ public interface RemoteUserService {
|
||||
* @param username 用户名
|
||||
* @return 结果
|
||||
*/
|
||||
@GetMapping("/get-by-username")
|
||||
@GetExchange("/get-by-username")
|
||||
LoginUser getUserInfo(@RequestParam String username) throws UserException;
|
||||
|
||||
/**
|
||||
@@ -42,7 +41,7 @@ public interface RemoteUserService {
|
||||
* @param userId 用户id
|
||||
* @return 结果
|
||||
*/
|
||||
@GetMapping("/get-by-id")
|
||||
@GetExchange("/get-by-id")
|
||||
LoginUser getUserInfo(@RequestParam Long userId) throws UserException;
|
||||
|
||||
/**
|
||||
@@ -60,7 +59,7 @@ public interface RemoteUserService {
|
||||
* @param email 邮箱
|
||||
* @return 结果
|
||||
*/
|
||||
@GetMapping("/get-by-email")
|
||||
@GetExchange("/get-by-email")
|
||||
LoginUser getUserInfoByEmail(@RequestParam String email) throws UserException;
|
||||
|
||||
/**
|
||||
@@ -69,7 +68,7 @@ public interface RemoteUserService {
|
||||
* @param openid openid
|
||||
* @return 结果
|
||||
*/
|
||||
@GetMapping("/get-by-openid")
|
||||
@GetExchange("/get-by-openid")
|
||||
XcxLoginUser getUserInfoByOpenid(@RequestParam String openid) throws UserException;
|
||||
|
||||
/**
|
||||
@@ -78,7 +77,7 @@ public interface RemoteUserService {
|
||||
* @param remoteUserBo 用户信息
|
||||
* @return 结果
|
||||
*/
|
||||
@PostMapping("/register-user-info")
|
||||
@PostExchange("/register-user-info")
|
||||
Boolean registerUserInfo(@RequestBody RemoteUserBo remoteUserBo) throws UserException, ServiceException;
|
||||
|
||||
/**
|
||||
@@ -87,7 +86,7 @@ public interface RemoteUserService {
|
||||
* @param userId 用户id
|
||||
* @return 结果
|
||||
*/
|
||||
@GetMapping("/select-username-by-id")
|
||||
@GetExchange("/select-username-by-id")
|
||||
String selectUserNameById(@RequestParam Long userId);
|
||||
|
||||
/**
|
||||
@@ -96,7 +95,7 @@ public interface RemoteUserService {
|
||||
* @param userId 用户ID
|
||||
* @return 用户昵称
|
||||
*/
|
||||
@GetMapping("/select-nickname-by-id")
|
||||
@GetExchange("/select-nickname-by-id")
|
||||
String selectNicknameById(@RequestParam Long userId);
|
||||
|
||||
/**
|
||||
@@ -105,7 +104,7 @@ public interface RemoteUserService {
|
||||
* @param userIds 用户ID 多个用逗号隔开
|
||||
* @return 用户昵称
|
||||
*/
|
||||
@GetMapping("/select-nickname-by-ids")
|
||||
@GetExchange("/select-nickname-by-ids")
|
||||
String selectNicknameByIds(@RequestParam String userIds);
|
||||
|
||||
/**
|
||||
@@ -114,7 +113,7 @@ public interface RemoteUserService {
|
||||
* @param userId 用户id
|
||||
* @return 用户手机号
|
||||
*/
|
||||
@GetMapping("/select-phonenumber-by-id")
|
||||
@GetExchange("/select-phonenumber-by-id")
|
||||
String selectPhonenumberById(@RequestParam Long userId);
|
||||
|
||||
/**
|
||||
@@ -123,7 +122,7 @@ public interface RemoteUserService {
|
||||
* @param userId 用户id
|
||||
* @return 用户邮箱
|
||||
*/
|
||||
@GetMapping("/select-email-by-id")
|
||||
@GetExchange("/select-email-by-id")
|
||||
String selectEmailById(@RequestParam Long userId);
|
||||
|
||||
/**
|
||||
@@ -132,7 +131,7 @@ public interface RemoteUserService {
|
||||
* @param userId 用户ID
|
||||
* @param ip IP地址
|
||||
*/
|
||||
@PostMapping("/record-login-info")
|
||||
@PostExchange("/record-login-info")
|
||||
void recordLoginInfo(@RequestParam Long userId, @RequestParam String ip);
|
||||
|
||||
/**
|
||||
@@ -141,7 +140,7 @@ public interface RemoteUserService {
|
||||
* @param userIds 用户ids
|
||||
* @return 用户列表
|
||||
*/
|
||||
@PostMapping("/select-list-by-ids")
|
||||
@PostExchange("/select-list-by-ids")
|
||||
List<RemoteUserVo> selectListByIds(@RequestBody Collection<Long> userIds);
|
||||
|
||||
/**
|
||||
@@ -150,7 +149,7 @@ public interface RemoteUserService {
|
||||
* @param roleIds 角色ids
|
||||
* @return 用户ids
|
||||
*/
|
||||
@PostMapping("/select-user-ids-by-role-ids")
|
||||
@PostExchange("/select-user-ids-by-role-ids")
|
||||
List<Long> selectUserIdsByRoleIds(@RequestBody Collection<Long> roleIds);
|
||||
|
||||
/**
|
||||
@@ -159,7 +158,7 @@ public interface RemoteUserService {
|
||||
* @param roleIds 角色ids
|
||||
* @return 用户
|
||||
*/
|
||||
@PostMapping("/select-users-by-role-ids")
|
||||
@PostExchange("/select-users-by-role-ids")
|
||||
List<RemoteUserVo> selectUsersByRoleIds(@RequestBody Collection<Long> roleIds);
|
||||
|
||||
/**
|
||||
@@ -168,7 +167,7 @@ public interface RemoteUserService {
|
||||
* @param deptIds 部门ids
|
||||
* @return 用户
|
||||
*/
|
||||
@PostMapping("/select-users-by-dept-ids")
|
||||
@PostExchange("/select-users-by-dept-ids")
|
||||
List<RemoteUserVo> selectUsersByDeptIds(@RequestBody Collection<Long> deptIds);
|
||||
|
||||
/**
|
||||
@@ -177,7 +176,7 @@ public interface RemoteUserService {
|
||||
* @param postIds 岗位ids
|
||||
* @return 用户
|
||||
*/
|
||||
@PostMapping("/select-users-by-post-ids")
|
||||
@PostExchange("/select-users-by-post-ids")
|
||||
List<RemoteUserVo> selectUsersByPostIds(@RequestBody Collection<Long> postIds);
|
||||
|
||||
/**
|
||||
@@ -186,8 +185,7 @@ public interface RemoteUserService {
|
||||
* @param userIds 用户 ID 列表
|
||||
* @return Map,其中 key 为用户 ID,value 为对应的用户昵称
|
||||
*/
|
||||
@PostMapping("/select-user-nicks-by-ids")
|
||||
@PostExchange("/select-user-nicks-by-ids")
|
||||
Map<Long, String> selectUserNicksByIds(@RequestBody Collection<Long> userIds);
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user