Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
f4c1d050
Commit
f4c1d050
authored
Jul 20, 2019
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
9e0b831e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
UserFeign.java
...va/com/github/wxiaoqi/security/admin/feign/UserFeign.java
+6
-3
AppUserDetailMapper.xml
...e-admin/src/main/resources/mapper/AppUserDetailMapper.xml
+1
-1
No files found.
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
View file @
f4c1d050
...
@@ -27,9 +27,15 @@ public interface UserFeign {
...
@@ -27,9 +27,15 @@ public interface UserFeign {
public
static
final
int
MEMBER_DAYS_CONFIRM
=
2
;
public
static
final
int
MEMBER_DAYS_CONFIRM
=
2
;
public
static
final
int
MEMBER_DAYS_WITHDRAW
=
3
;
public
static
final
int
MEMBER_DAYS_WITHDRAW
=
3
;
//后台用户
@RequestMapping
(
value
=
"/public/userinfo-by-token"
)
@RequestMapping
(
value
=
"/public/userinfo-by-token"
)
public
ObjectRestResponse
<
UserDTO
>
userinfoByToken
(
@RequestParam
(
"token"
)
String
token
);
public
ObjectRestResponse
<
UserDTO
>
userinfoByToken
(
@RequestParam
(
"token"
)
String
token
);
@RequestMapping
(
value
=
"/public/userinfo-by-uid"
)
public
ObjectRestResponse
<
UserDTO
>
userinfoByUid
(
@RequestParam
(
"uid"
)
Integer
uid
);
/**
/**
* token获取用户信息
* token获取用户信息
* @param token
* @param token
...
@@ -37,9 +43,6 @@ public interface UserFeign {
...
@@ -37,9 +43,6 @@ public interface UserFeign {
*/
*/
@RequestMapping
(
value
=
"/public/app/userinfo-by-token"
)
@RequestMapping
(
value
=
"/public/app/userinfo-by-token"
)
public
ObjectRestResponse
<
AppUserDTO
>
userDetailByToken
(
@RequestParam
(
"token"
)
String
token
);
public
ObjectRestResponse
<
AppUserDTO
>
userDetailByToken
(
@RequestParam
(
"token"
)
String
token
);
@RequestMapping
(
value
=
"/public/userinfo-by-uid"
)
public
ObjectRestResponse
<
UserDTO
>
userinfoByUid
(
@RequestParam
(
"uid"
)
Integer
uid
);
/**
/**
* id获取用户信息
* id获取用户信息
* @param id
* @param id
...
...
ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
View file @
f4c1d050
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
<result
column=
"position_id"
property=
"positionId"
/>
<result
column=
"position_id"
property=
"positionId"
/>
<result
column=
"source"
property=
"source"
/>
<result
column=
"source"
property=
"source"
/>
<result
column=
"code"
property=
"code"
/>
<result
column=
"code"
property=
"code"
/>
<result
column=
"invitera_ccount"
property=
"inviterAccount"
/>
<result
column=
"invitera_
a
ccount"
property=
"inviterAccount"
/>
<result
column=
"state"
property=
"state"
/>
<result
column=
"state"
property=
"state"
/>
</resultMap>
</resultMap>
...
...
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