From a3f1a00078fa731b11826c2c54c005c31085bc4e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 26 七月 2021 13:15:37 +0800
Subject: [PATCH] udpate 更新 OSS模块 适配新规范
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 259 ++++++++++++++++++++++++++-------------------------
1 files changed, 130 insertions(+), 129 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index d605303..3aa6d18 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -1,129 +1,130 @@
-package com.ruoyi.framework.web.service;
-
-import javax.annotation.Resource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.exception.CustomException;
-import com.ruoyi.common.exception.user.CaptchaException;
-import com.ruoyi.common.exception.user.CaptchaExpireException;
-import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.MessageUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.ip.IpUtils;
-import com.ruoyi.framework.manager.AsyncManager;
-import com.ruoyi.framework.manager.factory.AsyncFactory;
-import com.ruoyi.system.service.ISysConfigService;
-import com.ruoyi.system.service.ISysUserService;
-
-/**
- * 鐧诲綍鏍￠獙鏂规硶
- *
- * @author ruoyi
- */
-@Component
-public class SysLoginService
-{
- @Autowired
- private TokenService tokenService;
-
- @Resource
- private AuthenticationManager authenticationManager;
-
- @Autowired
- private RedisCache redisCache;
-
- @Autowired
- private ISysUserService userService;
-
- @Autowired
- private ISysConfigService configService;
-
- /**
- * 鐧诲綍楠岃瘉
- *
- * @param username 鐢ㄦ埛鍚�
- * @param password 瀵嗙爜
- * @param code 楠岃瘉鐮�
- * @param uuid 鍞竴鏍囪瘑
- * @return 缁撴灉
- */
- public String login(String username, String password, String code, String uuid)
- {
- boolean captchaOnOff = configService.selectCaptchaOnOff();
- // 楠岃瘉鐮佸紑鍏�
- if (captchaOnOff)
- {
- validateCapcha(username, code, uuid);
- }
- // 鐢ㄦ埛楠岃瘉
- Authentication authentication = null;
- try
- {
- // 璇ユ柟娉曚細鍘昏皟鐢║serDetailsServiceImpl.loadUserByUsername
- authentication = authenticationManager
- .authenticate(new UsernamePasswordAuthenticationToken(username, password));
- }
- catch (Exception e)
- {
- if (e instanceof BadCredentialsException)
- {
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
- throw new UserPasswordNotMatchException();
- }
- else
- {
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
- throw new CustomException(e.getMessage());
- }
- }
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
- LoginUser loginUser = (LoginUser) authentication.getPrincipal();
- recordLoginInfo(loginUser.getUser());
- // 鐢熸垚token
- return tokenService.createToken(loginUser);
- }
-
- /**
- * 鏍￠獙楠岃瘉鐮�
- *
- * @param username 鐢ㄦ埛鍚�
- * @param code 楠岃瘉鐮�
- * @param uuid 鍞竴鏍囪瘑
- * @return 缁撴灉
- */
- public void validateCapcha(String username, String code, String uuid)
- {
- String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
- String captcha = redisCache.getCacheObject(verifyKey);
- redisCache.deleteObject(verifyKey);
- if (captcha == null)
- {
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));
- throw new CaptchaExpireException();
- }
- if (!code.equalsIgnoreCase(captcha))
- {
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
- throw new CaptchaException();
- }
- }
-
- /**
- * 璁板綍鐧诲綍淇℃伅
- */
- public void recordLoginInfo(SysUser user)
- {
- user.setLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
- user.setLoginDate(DateUtils.getNowDate());
- userService.updateUserProfile(user);
- }
-}
+package com.ruoyi.framework.web.service;
+
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.exception.user.CaptchaException;
+import com.ruoyi.common.exception.user.CaptchaExpireException;
+import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 鐧诲綍鏍￠獙鏂规硶
+ *
+ * @author ruoyi
+ */
+@Component
+public class SysLoginService
+{
+ @Autowired
+ private TokenService tokenService;
+
+ @Resource
+ private AuthenticationManager authenticationManager;
+
+ @Autowired
+ private RedisCache redisCache;
+
+ @Autowired
+ private ISysUserService userService;
+
+ @Autowired
+ private ISysConfigService configService;
+
+ @Autowired
+ private AsyncService asyncService;
+
+ /**
+ * 鐧诲綍楠岃瘉
+ *
+ * @param username 鐢ㄦ埛鍚�
+ * @param password 瀵嗙爜
+ * @param code 楠岃瘉鐮�
+ * @param uuid 鍞竴鏍囪瘑
+ * @return 缁撴灉
+ */
+ public String login(String username, String password, String code, String uuid)
+ {
+ HttpServletRequest request = ServletUtils.getRequest();
+ boolean captchaOnOff = configService.selectCaptchaOnOff();
+ // 楠岃瘉鐮佸紑鍏�
+ if (captchaOnOff)
+ {
+ validateCaptcha(username, code, uuid, request);
+ }
+ // 鐢ㄦ埛楠岃瘉
+ Authentication authentication = null;
+ try
+ {
+ // 璇ユ柟娉曚細鍘昏皟鐢║serDetailsServiceImpl.loadUserByUsername
+ authentication = authenticationManager
+ .authenticate(new UsernamePasswordAuthenticationToken(username, password));
+ }
+ catch (Exception e)
+ {
+ if (e instanceof BadCredentialsException)
+ {
+ asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"), request);
+ throw new UserPasswordNotMatchException();
+ }
+ else
+ {
+ asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage(), request);
+ throw new CustomException(e.getMessage());
+ }
+ }
+ asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
+ LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+ recordLoginInfo(loginUser.getUser());
+ // 鐢熸垚token
+ return tokenService.createToken(loginUser);
+ }
+
+ /**
+ * 鏍￠獙楠岃瘉鐮�
+ *
+ * @param username 鐢ㄦ埛鍚�
+ * @param code 楠岃瘉鐮�
+ * @param uuid 鍞竴鏍囪瘑
+ * @return 缁撴灉
+ */
+ public void validateCaptcha(String username, String code, String uuid, HttpServletRequest request) {
+ String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+ String captcha = redisCache.getCacheObject(verifyKey);
+ redisCache.deleteObject(verifyKey);
+ if (captcha == null) {
+ asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"), request);
+ throw new CaptchaExpireException();
+ }
+ if (!code.equalsIgnoreCase(captcha)) {
+ asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"), request);
+ throw new CaptchaException();
+ }
+ }
+
+ /**
+ * 璁板綍鐧诲綍淇℃伅
+ */
+ public void recordLoginInfo(SysUser user)
+ {
+ user.setLoginIp(ServletUtils.getClientIP());
+ user.setLoginDate(DateUtils.getNowDate());
+ user.setUpdateBy(user.getUserName());
+ userService.updateUserProfile(user);
+ }
+}
--
Gitblit v1.9.3