|
|
@@ -5,6 +5,7 @@ import com.xunmei.common.core.domain.R;
|
|
|
import com.xunmei.common.core.utils.StringUtils;
|
|
|
import com.xunmei.common.core.web.controller.BaseController;
|
|
|
import com.xunmei.common.security.annotation.InnerAuth;
|
|
|
+import com.xunmei.common.security.annotation.RequiresPermissions;
|
|
|
import com.xunmei.system.api.domain.User;
|
|
|
import com.xunmei.system.api.model.LoginUser;
|
|
|
import com.xunmei.system.dto.user.UserPageDto;
|
|
|
@@ -29,14 +30,15 @@ public class UserController extends BaseController {
|
|
|
|
|
|
/**
|
|
|
* 获取当前用户信息
|
|
|
+ *
|
|
|
* @param username 用户名
|
|
|
* @return
|
|
|
*/
|
|
|
@InnerAuth
|
|
|
@GetMapping("/info/{username}")
|
|
|
- public R<LoginUser> info(@PathVariable("username") String username){
|
|
|
+ public R<LoginUser> info(@PathVariable("username") String username) {
|
|
|
User user = userService.selectUserByUserName(username);
|
|
|
- if(StringUtils.isNull(user)){
|
|
|
+ if (StringUtils.isNull(user)) {
|
|
|
return R.fail("用户名或密码错误");
|
|
|
}
|
|
|
|
|
|
@@ -55,12 +57,10 @@ public class UserController extends BaseController {
|
|
|
return R.ok(loginUser);
|
|
|
}
|
|
|
|
|
|
- @InnerAuth
|
|
|
- @GetMapping("/page")
|
|
|
- public R<Page<UserPageVo>> page(@RequestBody UserPageDto request){
|
|
|
+ @RequiresPermissions("system:user:page")
|
|
|
+ @PostMapping("/page")
|
|
|
+ public R<Page<UserPageVo>> page(@RequestBody UserPageDto request) {
|
|
|
Page<UserPageVo> userPage = userService.selectPageData(request);
|
|
|
-
|
|
|
-
|
|
|
- return R.ok(userPage);
|
|
|
+ return R.ok(userPage, "查询成功");
|
|
|
}
|
|
|
}
|