Commit ac8804e0 by chenweisong

更新

parent b81c8b6a
...@@ -21,7 +21,7 @@ public class UserController { ...@@ -21,7 +21,7 @@ public class UserController {
private FeignAuthService feignAuthService; private FeignAuthService feignAuthService;
@ApiOperation(value = "获取组织树") @ApiOperation(value = "获取组织树")
@PostMapping(value = "/orgs") @GetMapping(value = "/orgs")
public ApiResponse getOrgs() { public ApiResponse getOrgs() {
return ApiResponse.ok(feignAuthService.getOrgs()); return ApiResponse.ok(feignAuthService.getOrgs());
} }
...@@ -31,7 +31,7 @@ public class UserController { ...@@ -31,7 +31,7 @@ public class UserController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "orgId", value = "机构id", paramType = "query", required = true, dataType = "long") @ApiImplicitParam(name = "orgId", value = "机构id", paramType = "query", required = true, dataType = "long")
}) })
@PostMapping(value = "/org/users") @GetMapping(value = "/org/users")
public ApiResponse getOrgUsers(long orgId) { public ApiResponse getOrgUsers(long orgId) {
List<Map> users = feignAuthService.getUsersByOrgId(orgId); List<Map> users = feignAuthService.getUsersByOrgId(orgId);
return ApiResponse.ok(users); return ApiResponse.ok(users);
...@@ -41,7 +41,7 @@ public class UserController { ...@@ -41,7 +41,7 @@ public class UserController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "orgId", value = "机构id", paramType = "query", required = true, dataType = "long") @ApiImplicitParam(name = "orgId", value = "机构id", paramType = "query", required = true, dataType = "long")
}) })
@PostMapping(value = "/groups") @GetMapping(value = "/groups")
public ApiResponse getUserGroups(long orgId) { public ApiResponse getUserGroups(long orgId) {
List<Map> userGroups = feignAuthService.getUserGroups(0, orgId); List<Map> userGroups = feignAuthService.getUserGroups(0, orgId);
return ApiResponse.ok(userGroups); return ApiResponse.ok(userGroups);
...@@ -51,14 +51,14 @@ public class UserController { ...@@ -51,14 +51,14 @@ public class UserController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "userGroupId", value = "用户组id", paramType = "query", required = true, dataType = "long") @ApiImplicitParam(name = "userGroupId", value = "用户组id", paramType = "query", required = true, dataType = "long")
}) })
@PostMapping(value = "/group/users") @GetMapping(value = "/group/users")
public ApiResponse getGroupUsers(long userGroupId) { public ApiResponse getGroupUsers(long userGroupId) {
List<Map> users = feignAuthService.getGroupUsers(0, userGroupId); List<Map> users = feignAuthService.getGroupUsers(0, userGroupId);
return ApiResponse.ok(users); return ApiResponse.ok(users);
} }
@ApiOperation(value = "获取补录范围用户树") @ApiOperation(value = "获取补录范围用户树")
@PostMapping(value = "/users") @GetMapping(value = "/users")
public ApiResponse getUsers() { public ApiResponse getUsers() {
Map tree = (Map) feignAuthService.getOrgs(); Map tree = (Map) feignAuthService.getOrgs();
List<Map> subNodes = (List<Map>) tree.get("subNodes"); List<Map> subNodes = (List<Map>) tree.get("subNodes");
......
...@@ -12,12 +12,12 @@ eureka: ...@@ -12,12 +12,12 @@ eureka:
hostname: 192.168.0.48 hostname: 192.168.0.48
hystrix: hystrix:
command: command:
   default: default:
    execution: execution:
     isolation: isolation:
      thread: thread:
       timeoutInMilliseconds: 60000 timeoutInMilliseconds: 60000
spring: spring:
application: application:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment