From eb2ac2a40f92359739701c6f060607a474010de0 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 09 十二月 2024 18:11:23 +0800
Subject: [PATCH] 单位管理
---
medicalWaste-framework/src/main/java/com/sinata/framework/web/service/SysLoginService.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/medicalWaste-framework/src/main/java/com/sinata/framework/web/service/SysLoginService.java b/medicalWaste-framework/src/main/java/com/sinata/framework/web/service/SysLoginService.java
index 4178333..66c0060 100644
--- a/medicalWaste-framework/src/main/java/com/sinata/framework/web/service/SysLoginService.java
+++ b/medicalWaste-framework/src/main/java/com/sinata/framework/web/service/SysLoginService.java
@@ -1,12 +1,5 @@
package com.sinata.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.sinata.common.constant.CacheConstants;
import com.sinata.common.constant.Constants;
import com.sinata.common.constant.UserConstants;
@@ -28,6 +21,14 @@
import com.sinata.framework.security.context.AuthenticationContextHolder;
import com.sinata.system.service.ISysConfigService;
import com.sinata.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;
/**
* 登录校验方法
@@ -37,8 +38,6 @@
@Component
public class SysLoginService
{
- @Autowired
- private TokenService tokenService;
@Resource
private AuthenticationManager authenticationManager;
@@ -61,7 +60,7 @@
* @param uuid 唯一标识
* @return 结果
*/
- public String login(String username, String password, String code, String uuid)
+ public LoginUser login(String username, String password, String code, String uuid)
{
// 验证码校验
validateCaptcha(username, code, uuid);
@@ -97,7 +96,7 @@
LoginUser loginUser = (LoginUser) authentication.getPrincipal();
recordLoginInfo(loginUser.getUserId());
// 生成token
- return tokenService.createToken(loginUser);
+ return loginUser;
}
/**
--
Gitblit v1.7.1