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
b1250388
Commit
b1250388
authored
Jun 19, 2019
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加获取会员等级
parent
1d003293
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
4 deletions
+42
-4
UserFeign.java
...va/com/github/wxiaoqi/security/admin/feign/UserFeign.java
+24
-0
MemberLevelController.java
...ub/wxiaoqi/security/admin/rest/MemberLevelController.java
+18
-4
No files found.
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
View file @
b1250388
...
@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
...
@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import
com.github.wxiaoqi.security.admin.vo.AppUserVo
;
import
com.github.wxiaoqi.security.admin.vo.AppUserVo
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RequestParam
;
...
@@ -22,6 +23,12 @@ import java.util.List;
...
@@ -22,6 +23,12 @@ import java.util.List;
public
interface
UserFeign
{
public
interface
UserFeign
{
@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
);
/**
* token获取用户信息
* @param token
* @return
*/
@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
);
...
@@ -35,9 +42,26 @@ public interface UserFeign {
...
@@ -35,9 +42,26 @@ public interface UserFeign {
public
ObjectRestResponse
authentication
(
@RequestParam
(
value
=
"userId"
)
Integer
userId
,
public
ObjectRestResponse
authentication
(
@RequestParam
(
value
=
"userId"
)
Integer
userId
,
@RequestParam
(
value
=
"idNumber"
)
String
idNumber
,
@RequestParam
(
value
=
"idNumber"
)
String
idNumber
,
@RequestParam
(
value
=
"status"
)
Integer
status
);
@RequestParam
(
value
=
"status"
)
Integer
status
);
/**
* 获取会员等级列表
* @return
*/
@RequestMapping
(
value
=
"/member/app/unauth/levels"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/member/app/unauth/levels"
,
method
=
RequestMethod
.
GET
)
public
List
<
BaseUserMemberLevel
>
levels
();
public
List
<
BaseUserMemberLevel
>
levels
();
/**
* 获取单个会员等级
* @return
*/
@RequestMapping
(
value
=
"/member/app/unauth/level/{type}"
,
method
=
RequestMethod
.
GET
)
public
List
<
BaseUserMemberLevel
>
level
(
@PathVariable
Integer
type
);
/**
* 批量获取用户基本信息
* @param ids
* @return
*/
@RequestMapping
(
value
=
"/public/getByUserIds"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/public/getByUserIds"
,
method
=
RequestMethod
.
GET
)
public
ObjectRestResponse
<
List
<
AppUserVo
>>
getByUserIds
(
@RequestParam
(
"ids"
)
List
<
Integer
>
ids
);
public
ObjectRestResponse
<
List
<
AppUserVo
>>
getByUserIds
(
@RequestParam
(
"ids"
)
List
<
Integer
>
ids
);
}
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MemberLevelController.java
View file @
b1250388
...
@@ -2,11 +2,9 @@ package com.github.wxiaoqi.security.admin.rest;
...
@@ -2,11 +2,9 @@ package com.github.wxiaoqi.security.admin.rest;
import
com.github.wxiaoqi.security.admin.biz.UserMemberLevelBiz
;
import
com.github.wxiaoqi.security.admin.biz.UserMemberLevelBiz
;
import
com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel
;
import
com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel
;
import
io.swagger.models.auth.In
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
import
java.util.List
;
...
@@ -28,4 +26,20 @@ public class MemberLevelController {
...
@@ -28,4 +26,20 @@ public class MemberLevelController {
List
<
BaseUserMemberLevel
>
levels
()
throws
Exception
{
List
<
BaseUserMemberLevel
>
levels
()
throws
Exception
{
return
memberBiz
.
getLevesls
();
return
memberBiz
.
getLevesls
();
}
}
@RequestMapping
(
value
=
"/app/unauth/level/{type}"
,
method
=
RequestMethod
.
GET
)
public
@ResponseBody
BaseUserMemberLevel
level
(
@PathVariable
Integer
type
)
throws
Exception
{
List
<
BaseUserMemberLevel
>
list
=
memberBiz
.
getLevesls
();
if
(
type
!=
null
){
if
(
list
.
size
()>
0
){
for
(
BaseUserMemberLevel
userMemberLevel:
list
){
if
(
userMemberLevel
.
getLevel
()!=
null
&&
userMemberLevel
.
getLevel
()==
type
){
return
userMemberLevel
;
}
}
}
}
return
null
;
}
}
}
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