|
|
@ -31,9 +31,9 @@ public class AccountController { |
|
|
|
@GetMapping("/list") |
|
|
|
public ResponseData getAccountList() { |
|
|
|
log.info("-----------------查询账户列表开始-----------------"); |
|
|
|
List<Account> accounts = accountService.list(); |
|
|
|
// 筛除password |
|
|
|
// TODO |
|
|
|
List<Account> accounts = accountService.list(); |
|
|
|
log.info("-----------------查询账户列表结束-----------------"); |
|
|
|
return ResponseData.success(accounts); |
|
|
|
} |
|
|
@ -44,15 +44,15 @@ public class AccountController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@PostMapping("/register") |
|
|
|
// @PreAuthorize("hasRole('ADMIN')") |
|
|
|
@PreAuthorize("hasRole('ADMIN')") |
|
|
|
public ResponseData registerAccount(@RequestBody Map<String,String> registerUser) { |
|
|
|
log.info("-----------------注册账户开始-----------------"); |
|
|
|
boolean register = accountService.register(registerUser.get("username"), registerUser.get("password")); |
|
|
|
boolean register = accountService.register(registerUser.get("username"), registerUser.get("password"), registerUser.get("role")); |
|
|
|
if (register) { |
|
|
|
log.info("-----------------注册账户成功-----------------"); |
|
|
|
return ResponseData.success(); |
|
|
|
} |
|
|
|
return ResponseData.fail("注册失败"); |
|
|
|
return ResponseData.fail("注册失败,用户名重复!"); |
|
|
|
} |
|
|
|
|
|
|
|
} |