|
@@ -200,6 +200,9 @@ public class UserApiController extends AbstractApiController {
|
|
@GetMapping("/getUserInfo")
|
|
@GetMapping("/getUserInfo")
|
|
public Result<UserInfoBO> getUserInfo(HttpServletRequest request) {
|
|
public Result<UserInfoBO> getUserInfo(HttpServletRequest request) {
|
|
Long userId = authService.getTokenUserId(request);
|
|
Long userId = authService.getTokenUserId(request);
|
|
|
|
+ if (userId == null ){
|
|
|
|
+ ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
|
|
|
|
+ }
|
|
User user = userService.findById(userId);
|
|
User user = userService.findById(userId);
|
|
if (user == null){
|
|
if (user == null){
|
|
return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
|
|
return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
|
|
@@ -238,6 +241,9 @@ public class UserApiController extends AbstractApiController {
|
|
@PostMapping("/updateUser")
|
|
@PostMapping("/updateUser")
|
|
public Result<UserInfoBO> updateUser(@RequestBody UserInfoForm userForm,HttpServletRequest request) {
|
|
public Result<UserInfoBO> updateUser(@RequestBody UserInfoForm userForm,HttpServletRequest request) {
|
|
Long userId = authService.getTokenUserId(request);
|
|
Long userId = authService.getTokenUserId(request);
|
|
|
|
+ if (userId == null ){
|
|
|
|
+ ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
|
|
|
|
+ }
|
|
User user = userService.findById(userId);
|
|
User user = userService.findById(userId);
|
|
if (user == null){
|
|
if (user == null){
|
|
return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
|
|
return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
|
|
@@ -351,6 +357,9 @@ public class UserApiController extends AbstractApiController {
|
|
@ApiOperation(value = "获取我的邀请的用户",httpMethod = "POST")
|
|
@ApiOperation(value = "获取我的邀请的用户",httpMethod = "POST")
|
|
public Result<List<User>> myUsers(@RequestBody MyUserParam param, HttpServletRequest request) {
|
|
public Result<List<User>> myUsers(@RequestBody MyUserParam param, HttpServletRequest request) {
|
|
Long userId = authService.getTokenUserId(request);
|
|
Long userId = authService.getTokenUserId(request);
|
|
|
|
+ if (userId == null ){
|
|
|
|
+ ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
|
|
|
|
+ }
|
|
PageHelper.startPage(param.getPage(), param.getSize());
|
|
PageHelper.startPage(param.getPage(), param.getSize());
|
|
Condition condition = new Condition(User.class);
|
|
Condition condition = new Condition(User.class);
|
|
Example.Criteria criteria = condition.createCriteria();
|
|
Example.Criteria criteria = condition.createCriteria();
|