From a6a9814c069ed108212fe4899d773926b67732ef Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 九月 2021 17:58:36 +0800
Subject: [PATCH] update 更新 service 注解

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java |   82 ++++++++++++++++++-----------------------
 1 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
index 45bbf0a..0d2218e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
@@ -18,74 +18,65 @@
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 /**
  * 鐧诲綍鏍￠獙鏂规硶
- * 
+ *
  * @author ruoyi
  */
-@Component
-public class SysLoginService
-{
+@Service
+public class SysLoginService {
     @Autowired
     private TokenService tokenService;
 
     @Resource
     private AuthenticationManager authenticationManager;
 
-	@Autowired
+    @Autowired
     private ISysUserService userService;
 
-	@Autowired
-	private ISysConfigService configService;
+    @Autowired
+    private ISysConfigService configService;
 
-	@Autowired
-	private LogininforService asyncService;
+    @Autowired
+    private LogininforService asyncService;
 
     /**
      * 鐧诲綍楠岃瘉
-     * 
+     *
      * @param username 鐢ㄦ埛鍚�
      * @param password 瀵嗙爜
-     * @param code 楠岃瘉鐮�
-     * @param uuid 鍞竴鏍囪瘑
+     * @param code     楠岃瘉鐮�
+     * @param uuid     鍞竴鏍囪瘑
      * @return 缁撴灉
      */
-    public String login(String username, String password, String code, String uuid)
-    {
-		HttpServletRequest request = ServletUtils.getRequest();
-		boolean captchaOnOff = configService.selectCaptchaOnOff();
+    public String login(String username, String password, String code, String uuid) {
+        HttpServletRequest request = ServletUtils.getRequest();
+        boolean captchaOnOff = configService.selectCaptchaOnOff();
         // 楠岃瘉鐮佸紑鍏�
-        if (captchaOnOff)
-        {
+        if (captchaOnOff) {
             validateCaptcha(username, code, uuid, request);
         }
         // 鐢ㄦ埛楠岃瘉
         Authentication authentication = null;
-        try
-        {
+        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);
+        } catch (Exception e) {
+            if (e instanceof BadCredentialsException) {
+                asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"), request);
                 throw new UserPasswordNotMatchException();
-            }
-            else
-            {
+            } else {
                 asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage(), request);
                 throw new ServiceException(e.getMessage());
             }
         }
-		asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
+        asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         recordLoginInfo(loginUser.getUserId());
         // 鐢熸垚token
@@ -94,24 +85,24 @@
 
     /**
      * 鏍￠獙楠岃瘉鐮�
-     * 
+     *
      * @param username 鐢ㄦ埛鍚�
-     * @param code 楠岃瘉鐮�
-     * @param uuid 鍞竴鏍囪瘑
+     * @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 = RedisUtils.getCacheObject(verifyKey);
+        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+        String captcha = RedisUtils.getCacheObject(verifyKey);
         RedisUtils.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();
-		}
+        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();
+        }
     }
 
     /**
@@ -119,8 +110,7 @@
      *
      * @param userId 鐢ㄦ埛ID
      */
-    public void recordLoginInfo(Long userId)
-    {
+    public void recordLoginInfo(Long userId) {
         SysUser sysUser = new SysUser();
         sysUser.setUserId(userId);
         sysUser.setLoginIp(ServletUtils.getClientIP());

--
Gitblit v1.9.3