Merge remote-tracking branch 'origin/master'

baoshiwei

2025-04-19 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76

 zhitan-framework/src/main/java/com/zhitan/framework/web/service/SysLoginService.java

@@ -1,5 +1,7 @@
package com.zhitan.framework.web.service;

import cn.hutool.core.collection.CollUtil;
import com.zhitan.common.config.keycloak.AuthKeycloakRequest;
import com.zhitan.common.constant.CacheConstants;
import com.zhitan.common.constant.Constants;
import com.zhitan.common.constant.UserConstants;
@@ -10,14 +12,23 @@
import com.zhitan.common.exception.user.*;
import com.zhitan.common.utils.DateUtils;
import com.zhitan.common.utils.MessageUtils;
import com.zhitan.common.utils.SocialUtils;
import com.zhitan.common.utils.StringUtils;
import com.zhitan.common.utils.ip.IpUtils;
import com.zhitan.framework.manager.AsyncManager;
import com.zhitan.framework.manager.factory.AsyncFactory;
import com.zhitan.framework.security.context.AuthenticationContextHolder;
import com.zhitan.framework.security.single.SingleAuthenticationToken;
import com.zhitan.system.domain.SysSocial;
import com.zhitan.system.domain.bo.SysSocialBo;
import com.zhitan.system.domain.vo.SysSocialVo;
import com.zhitan.system.service.ISysConfigService;
import com.zhitan.system.service.ISysSocialService;
import com.zhitan.system.service.ISysUserService;
import me.zhyd.oauth.model.AuthCallback;
import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthToken;
import me.zhyd.oauth.model.AuthUser;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -25,6 +36,7 @@
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.List;

/**
 * 登录校验方法
@@ -49,6 +61,9 @@
    @Resource
    private ISysConfigService configService;

    @Resource
    private ISysSocialService sysSocialService;

    /**
     * 登录验证
     *
@@ -61,7 +76,7 @@
    public String login(String username, String password, String code, String uuid)
    {
        // 验证码校验
        validateCaptcha(username, code, uuid);
//        validateCaptcha(username, code, uuid);
        // 登录前置校验
        loginPreCheck(username, password);
        // 用户验证
@@ -97,6 +112,68 @@
        return tokenService.createToken(loginUser);
    }





    public String loginByCode(String code,String state)
    {
        AuthKeycloakRequest authRequest = SocialUtils.getAuthKeyloakRequest();
       // AuthToken accessToken = authRequest.getAccessToken(passwordLoginBody);
        AuthCallback callback = new AuthCallback();
        callback.setCode(code);
        callback.setState(state);
        AuthResponse<AuthUser> res = authRequest.login(callback);
        AuthUser authUserData = res.getData();
        // 新增KEYCLOAK用户自动创建逻辑
        String authId = authUserData.getSource() + authUserData.getUuid();
        List<SysSocial> list = sysSocialService.selectByAuthId(authId);
        if (CollUtil.isEmpty(list)) {
            // 自动创建新用户
            SysUser newUser = new SysUser();
            newUser.setUserName(authUserData.getUsername());
            newUser.setEmail(authUserData.getEmail());
            newUser.setNickName(authUserData.getNickname());
            newUser.setPassword("Initial123@"); // 初始密码需符合安全策略
            newUser.setStatus("0");

            userService.insertUser(newUser); // 假设存在插入方法

            // 创建社交绑定记录
            SysSocialBo newSocial = new SysSocialBo();
            newSocial.setUserId(newUser.getUserId());
            newSocial.setUserName(newUser.getUserName());
            newSocial.setAuthId(authId);
            newSocial.setSource(authUserData.getSource());
            newSocial.setOpenId(authUserData.getUuid());
            newSocial.setAccessToken(authUserData.getToken().getAccessToken());
            newSocial.setRefreshToken(authUserData.getToken().getRefreshToken());
            newSocial.setIdToken(authUserData.getToken().getIdToken());
            sysSocialService.insertByBo(newSocial); // 需确保服务有新增方法

            // 重新查询确保数据可用
            list = sysSocialService.selectByAuthId(authId);
        } else {
            // 更新社交绑定记录
            SysSocialBo socialBo = new SysSocialBo();
            socialBo.setId(list.get(0).getId());
            socialBo.setAccessToken(authUserData.getToken().getAccessToken());
            socialBo.setRefreshToken(authUserData.getToken().getRefreshToken());
            socialBo.setIdToken(authUserData.getToken().getIdToken());
            sysSocialService.updateByBo(socialBo);

        }
        list = sysSocialService.selectByAuthId(authUserData.getSource() + authUserData.getUuid());
        if (CollUtil.isEmpty(list)) {
            throw new ServiceException("你还没有绑定第三方账号，绑定后才可以登录！");
        }
        LoginUser loginUser = new LoginUser();
        loginUser.setUser(userService.selectUserById(list.get(0).getUserId()));
        loginUser.setUserId(list.get(0).getUserId());
        // 生成token
        return tokenService.createToken(loginUser);
    }

    /**
     * 校验验证码
     *