|
|
@@ -67,7 +67,6 @@ public class LoginController {
|
|
|
|
|
|
@PostMapping("/login")
|
|
|
@ApiOperation(value = "登录", notes = "传入账号:account,密码:password")
|
|
|
- @SaCheckPermission("login:login")
|
|
|
@XjrLog(value = "账号密码登录成功", saveRequestData = false)
|
|
|
public R login(@RequestBody @Valid LoginDto dto) throws Exception {
|
|
|
return R.ok(loginService.login(dto));
|
|
|
@@ -75,7 +74,6 @@ public class LoginController {
|
|
|
|
|
|
@PostMapping("/findUserByCode")
|
|
|
@ApiOperation(value = "根据code找user", notes = "code")
|
|
|
- @SaCheckPermission("login:finduserbycode")
|
|
|
@XjrLog(value = "根据code找user")
|
|
|
public R findUserByCode(@RequestBody @Valid LoginByCodeDto dto) throws Exception {
|
|
|
return R.ok(loginService.findUserByCode(dto));
|
|
|
@@ -83,7 +81,6 @@ public class LoginController {
|
|
|
|
|
|
@PostMapping("/loginByCode")
|
|
|
@ApiOperation(value = "登录", notes = "code")
|
|
|
- @SaCheckPermission("login:loginbycode")
|
|
|
@XjrLog(value = "Code登录成功")
|
|
|
public R loginByCode(@RequestBody @Valid LoginByCodeDto dto) throws Exception {
|
|
|
return R.ok(loginService.loginByCode(dto));
|
|
|
@@ -91,7 +88,6 @@ public class LoginController {
|
|
|
|
|
|
@GetMapping(value = "/loginQRCode")
|
|
|
@ApiOperation(value = "登录-二维码")
|
|
|
- @SaCheckPermission("login:loginqrcode")
|
|
|
@XjrLog(value = "登录-二维码")
|
|
|
public RT<LoginQRCodeVo> qrcode() {
|
|
|
long loginCode = IdUtil.getSnowflakeNextId();
|
|
|
@@ -119,7 +115,6 @@ public class LoginController {
|
|
|
|
|
|
@PostMapping("/QR-code-login")
|
|
|
@ApiOperation(value = "二维码登录", notes = "code")
|
|
|
- @SaCheckPermission("login:qrcodelogin")
|
|
|
@XjrLog(value = "二维码登录")
|
|
|
public RT<String> loginQRCode(@RequestBody LoginQRCodeDto dto) throws Exception {
|
|
|
// Long timestamp = redisUtil.get(dto.getLoginCode() + "time", Long.class);
|
|
|
@@ -137,7 +132,6 @@ public class LoginController {
|
|
|
|
|
|
@PostMapping("/check-QR-code-login")
|
|
|
@ApiOperation(value = "验证是否登录成功", notes = "验证是否登录成功")
|
|
|
- @SaCheckPermission("login:checkqrcodelogin")
|
|
|
@XjrLog(value = "验证是否登录成功")
|
|
|
public RT<LoginCheckQRCodeVo> checkLoginQRCode(@RequestBody @Valid QRLoginDto dto) {
|
|
|
Long timestamp = redisUtil.get(dto.getLoginCode() + "time", Long.class);
|
|
|
@@ -160,7 +154,6 @@ public class LoginController {
|
|
|
|
|
|
@PostMapping("/bindOpenid")
|
|
|
@ApiOperation(value = "登录", notes = "登录")
|
|
|
- @SaCheckPermission("login:bindopenid")
|
|
|
@XjrLog(value = "code换Openid并绑定")
|
|
|
public R bindOpenid(@RequestBody @Valid LoginByCodeDto dto) throws Exception {
|
|
|
return R.ok(loginService.bindOpenid(dto));
|
|
|
@@ -168,14 +161,12 @@ public class LoginController {
|
|
|
|
|
|
@GetMapping("/imgcaptcha")
|
|
|
@ApiOperation(value = "图形验证码", notes = "图形验证码")
|
|
|
- @SaCheckPermission("login:imgcaptcha")
|
|
|
public R imgCaptcha() {
|
|
|
return R.ok(loginService.imgCaptcha());
|
|
|
}
|
|
|
|
|
|
@PostMapping("/create-token")
|
|
|
@ApiOperation(value = "创建token", notes = "传入账号:account,密码:password")
|
|
|
- @SaCheckPermission("login:createtoken")
|
|
|
@XjrLog(value = "账号密码登录成功")
|
|
|
public R createToken(@RequestBody @Valid CreateTokenDto dto) {
|
|
|
return R.ok(loginService.createToken(dto));
|
|
|
@@ -188,7 +179,6 @@ public class LoginController {
|
|
|
@PostMapping("/captcha")
|
|
|
@XjrLog(value = "发送验证码")
|
|
|
@ApiOperation(value = "发送验证码", notes = "传入账号:mobile")
|
|
|
- @SaCheckPermission("login:captcha")
|
|
|
public R captcha(@RequestBody @Valid CaptchaDto captchaDto) {
|
|
|
|
|
|
String active = SpringUtil.getActiveProfile();
|
|
|
@@ -217,7 +207,6 @@ public class LoginController {
|
|
|
* 验证码登录
|
|
|
*/
|
|
|
@PostMapping("/loginCaptcha")
|
|
|
- @SaCheckPermission("login:logincaptcha")
|
|
|
@XjrLog(value = "验证码登录")
|
|
|
public R loginByCaptcha(@RequestBody LoginCaptchaDto loginCaptchaDto) throws Exception {
|
|
|
// 验证验证码
|
|
|
@@ -232,7 +221,6 @@ public class LoginController {
|
|
|
* 退出
|
|
|
*/
|
|
|
@PostMapping("/logout")
|
|
|
- @SaCheckPermission("login:logout")
|
|
|
@XjrLog(value = "退出")
|
|
|
public R logout() {
|
|
|
StpUtil.logout();
|
|
|
@@ -241,7 +229,6 @@ public class LoginController {
|
|
|
|
|
|
@PostMapping("/token")
|
|
|
@ApiOperation(value = "根据keycloak-token 登录", notes = "传入keycloak-token")
|
|
|
- @SaCheckPermission("login:token")
|
|
|
@XjrLog(value = "keycloak-token登录成功")
|
|
|
public R loginByToken(@RequestBody KeyCloakLoginInfoDto dto) {
|
|
|
|
|
|
@@ -282,7 +269,6 @@ public class LoginController {
|
|
|
|
|
|
@PostMapping("/qrcode-login")
|
|
|
@ApiOperation(value = "oauth 扫码登录", notes = "oauth 扫码登录")
|
|
|
- @SaCheckPermission("login:qrcodelogin")
|
|
|
@XjrLog(value = "oauth 扫码登录")
|
|
|
public R createAuthorizeUrl(@Valid @RequestBody CreateAuthorizeUrlDto dto) {
|
|
|
|
|
|
@@ -293,7 +279,6 @@ public class LoginController {
|
|
|
|
|
|
@GetMapping("/imgcaptcha-answer")
|
|
|
@ApiOperation(value = "图形验证码", notes = "图形验证码")
|
|
|
- @SaCheckPermission("login:imgcaptchaanswer")
|
|
|
@XjrLog(value = "图形验证码", saveResponseData = true)
|
|
|
public R imgcaptchaAnswer(String key) {
|
|
|
String active = SpringUtil.getActiveProfile();
|