Commit a9c71cd7 by chenweisong

更新

parent 6aea560a
...@@ -19,14 +19,14 @@ public class UserController { ...@@ -19,14 +19,14 @@ public class UserController {
@Autowired @Autowired
private FeignAuthService feignAuthService; private FeignAuthService feignAuthService;
@ApiOperation(value = "获取组织树") @ApiOperation(value = "获取组织树", hidden = true)
@GetMapping(value = "/orgs") @GetMapping(value = "/orgs")
public ApiResponse getOrgs() { public ApiResponse getOrgs() {
return ApiResponse.ok(feignAuthService.getOrgs()); return ApiResponse.ok(feignAuthService.getOrgs());
} }
@ApiOperation(value = "根据组织id获取用户") @ApiOperation(value = "根据组织id获取用户", hidden = true)
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "orgId", value = "机构id", paramType = "query", required = true, dataType = "long") @ApiImplicitParam(name = "orgId", value = "机构id", paramType = "query", required = true, dataType = "long")
}) })
...@@ -36,7 +36,7 @@ public class UserController { ...@@ -36,7 +36,7 @@ public class UserController {
return ApiResponse.ok(users); return ApiResponse.ok(users);
} }
@ApiOperation(value = "根据组织id获取用户组") @ApiOperation(value = "根据组织id获取用户组", hidden = true)
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "orgId", value = "机构id", paramType = "query", required = true, dataType = "long") @ApiImplicitParam(name = "orgId", value = "机构id", paramType = "query", required = true, dataType = "long")
}) })
...@@ -46,7 +46,7 @@ public class UserController { ...@@ -46,7 +46,7 @@ public class UserController {
return ApiResponse.ok(userGroups); return ApiResponse.ok(userGroups);
} }
@ApiOperation(value = "根据用户组id获取用户") @ApiOperation(value = "根据用户组id获取用户", hidden = true)
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "userGroupId", value = "用户组id", paramType = "query", required = true, dataType = "long") @ApiImplicitParam(name = "userGroupId", value = "用户组id", paramType = "query", required = true, dataType = "long")
}) })
......
...@@ -9,8 +9,8 @@ eureka: ...@@ -9,8 +9,8 @@ eureka:
enabled: true enabled: true
instance: instance:
prefer-ip-address: false prefer-ip-address: false
hostname: 192.168.0.48 # hostname: 192.168.0.48
hostname: 192.168.0.68
hystrix: hystrix:
command: command:
default: default:
...@@ -53,8 +53,8 @@ app: ...@@ -53,8 +53,8 @@ app:
active-process: MoreSubProcessStandard.bpmn active-process: MoreSubProcessStandard.bpmn
swagger2: swagger2:
host: 192.168.0.240:8762/api/datacollector # host: 192.168.0.240:8762/api/datacollector
host: localhost:8110
security: security:
authUser: root authUser: root
authPwd: pwd authPwd: pwd
......
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