|
|
@@ -1,10 +1,10 @@
|
|
|
package com.ctsi.Auth.web;
|
|
|
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
|
-import com.ctsi.Auth.entity.CaptchaPO;
|
|
|
-import com.ctsi.Auth.entity.TokenInfoPO;
|
|
|
-import com.ctsi.Auth.entity.UserForm;
|
|
|
-import com.ctsi.Auth.entity.UserInfoPO;
|
|
|
+import com.ctsi.Auth.entity.PO.CaptchaPO;
|
|
|
+import com.ctsi.Auth.entity.PO.TokenInfoPO;
|
|
|
+import com.ctsi.Auth.entity.VO.UserForm;
|
|
|
+import com.ctsi.Auth.entity.PO.UserInfoPO;
|
|
|
import com.ctsi.Enum.ErrorCodeEnum;
|
|
|
import com.ctsi.System.SysMenu.entity.PO.SysMenuSearchPO;
|
|
|
import com.ctsi.System.SysMenu.service.SysMenuService;
|
|
|
@@ -79,7 +79,7 @@ public class login {
|
|
|
|
|
|
@ApiOperation("登出")
|
|
|
@GetMapping(value = "/logout",name = "登出")
|
|
|
- public ApiResult logout(){
|
|
|
+ public ApiResult<String> logout(){
|
|
|
StpUtil.logout();
|
|
|
return ApiResult.success("退出成功");
|
|
|
}
|
|
|
@@ -110,7 +110,7 @@ public class login {
|
|
|
String captcha = CaptchaUtil.generateRandomString();
|
|
|
byte[] captchaImage = CaptchaUtil.generateCaptcha(captcha);
|
|
|
Base64.Encoder encoder = Base64.getEncoder();
|
|
|
- String png_base64 = encoder.encodeToString(captchaImage);;//转换成base64串
|
|
|
+ String png_base64 = encoder.encodeToString(captchaImage);//转换成base64串
|
|
|
png_base64 = png_base64.replaceAll("\n", "").replaceAll("\r", "");
|
|
|
String uuid = UUID.randomUUID().toString();
|
|
|
redisUtil.set(uuid, captcha, 360L);
|
|
|
@@ -119,7 +119,7 @@ public class login {
|
|
|
captchaPO.setCaptcha("data:image/jpg;base64," + png_base64);
|
|
|
return ApiResult.success(captchaPO);
|
|
|
} catch (IOException e) {
|
|
|
- e.printStackTrace();
|
|
|
+ log.error(e.getMessage());
|
|
|
return ApiResult.failure("获取验证码失败",null);
|
|
|
}
|
|
|
}
|