From 8b19a417e339441cec66e18a2a5d68337184dada Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 30 八月 2024 09:51:20 +0800
Subject: [PATCH] 修改了登录的代码
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 4 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java | 12 ++++++------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 3 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 4 ++--
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java | 11 ++++++-----
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java | 14 +++++++++++++-
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java | 3 ++-
7 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 737fb4c..89856db 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -48,7 +48,8 @@
public AjaxResult login(@RequestBody LoginBody loginBody)
{
// 鐢熸垚浠ょ墝
- String token = loginService.login(loginBody.getNickName(), loginBody.getPassword(), loginBody.getCode(),
+ System.out.println(loginBody);
+ String token = loginService.login(loginBody.getNickname(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
HashMap<String, String> tokenMap = new HashMap<>();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 46d357b..a63d213 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -380,9 +380,9 @@
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
- if (!userService.checkUserNameUnique(user))
+ if (!userService.checkNickNameUnique(user))
{
- return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ return error("淇敼鐢ㄦ埛'" + user.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
index ea3ed43..244de4e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
@@ -187,8 +187,8 @@
us.setPassword("123456");
us.setUserName(ancestorHelper.getName());
us.setClanId(ancestorHelper.getClanId());
- if (!userService.checkUserNameUnique(us)) {
- return error("鏂板绁栧厛'" + us.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ if (!userService.checkNickNameUnique(us)) {
+ return error("鏂板绁栧厛'" + us.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
us.setPassword(SecurityUtils.encryptPassword(us.getPassword()));
@@ -201,8 +201,8 @@
usa.setPassword("123456");
usa.setClanId(ancestorHelper.getClanId());
usa.setUserName(ancestorHelper.getFname());
- if (!userService.checkUserNameUnique(usa)) {
- return error("鏂板绁栧厛1'" + usa.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ if (!userService.checkNickNameUnique(usa)) {
+ return error("鏂板绁栧厛1'" + usa.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
us.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
@@ -293,8 +293,8 @@
us.setClanId(ancestorHelper.getClanId());
System.out.println(ancestorHelper.getClanId());
System.out.println("0000_______+++++++++++++999999999999");
- if (!userService.checkUserNameUnique(us)) {
- return error("鏂板绁栧厛绠＄悊鍛�'" + us.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ if (!userService.checkNickNameUnique(us)) {
+ return error("鏂板绁栧厛绠＄悊鍛�'" + us.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
us.setPassword(SecurityUtils.encryptPassword(us.getPassword()));
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
index 82d6107..3e9b8f4 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
@@ -7,12 +7,13 @@
*/
public class LoginBody
{
- public String getNickName() {
- return nickName;
+
+ public String getNickname() {
+ return nickname;
}
- public void setNickName(String nickName) {
- this.nickName = nickName;
+ public void setNickname(String nickname) {
+ this.nickname = nickname;
}
/**
@@ -21,7 +22,7 @@
private String username;
- private String nickName;
+ private String nickname;
/**
* 鐢ㄦ埛瀵嗙爜
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
index 267e305..36512cc 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
@@ -59,7 +59,8 @@
String browser = userAgent.getBrowser().getName();
// 灏佽瀵硅薄
SysLogininfor logininfor = new SysLogininfor();
- logininfor.setUserName(username);
+ // logininfor.setUserName(username);
+ logininfor.setNickName(username);
logininfor.setIpaddr(ip);
logininfor.setLoginLocation(address);
logininfor.setBrowser(browser);
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 0534071..58be3dd 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
@@ -3,6 +3,7 @@
import javax.annotation.Resource;
import com.ruoyi.domain.SysUserRole1;
+import com.ruoyi.framework.web.domain.server.Sys;
import com.ruoyi.service.ZfRegisterService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
@@ -212,6 +213,9 @@
public void loginPreCheck(String username, String password)
{
// 鐢ㄦ埛鍚嶆垨瀵嗙爜涓虹┖ 閿欒
+ System.out.println(username);
+ System.out.println("099999999999999999999999999999999999");
+ System.out.println(password);
if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password))
{
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null")));
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
index 7fdea30..1c8f7bd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
@@ -20,8 +20,12 @@
private Long infoId;
/** 鐢ㄦ埛璐﹀彿 */
- @Excel(name = "鐢ㄦ埛璐﹀彿")
+ @Excel(name = "鐢ㄦ埛濮撳悕")
private String userName;
+
+
+ @Excel(name = "鐢ㄦ埛璐﹀彿")
+ private String nickName;
/** 鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触 */
@Excel(name = "鐧诲綍鐘舵��", readConverterExp = "0=鎴愬姛,1=澶辫触")
@@ -87,6 +91,14 @@
return ipaddr;
}
+ public String getNickName() {
+ return nickName;
+ }
+
+ public void setNickName(String nickName) {
+ this.nickName = nickName;
+ }
+
public void setIpaddr(String ipaddr)
{
this.ipaddr = ipaddr;
--
Gitblit v1.9.1