修改了登录的代码

feige

2024-08-30 8b19a417e339441cec66e18a2a5d68337184dada

修改了登录的代码

 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<>();

 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))
        {

 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()));

 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;

    /**
     * 用户密码

 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);

 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")));

 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;