Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
datacollector
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenweisong
datacollector
Commits
a9c71cd7
Commit
a9c71cd7
authored
Apr 01, 2020
by
chenweisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新
parent
6aea560a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
UserController.java
...in/java/com/keymobile/rest/controller/UserController.java
+4
-4
application-test.yml
src/main/resources/application-test.yml
+4
-4
No files found.
src/main/java/com/keymobile/rest/controller/UserController.java
View file @
a9c71cd7
...
@@ -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"
)
})
})
...
...
src/main/resources/application-test.yml
View file @
a9c71cd7
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment