bug和企业微信同步

jiangqs

2023-07-18 79f8fc87c9c9e4866a477dfe4485eedda5976209

 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -12,6 +12,7 @@
import com.ruoyi.common.core.utils.ip.IpUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
@@ -137,12 +138,12 @@
            if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
            {
                recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除",Constants.FROM_MINI_APP);
                throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
                throw new ServiceException("对不起，您的账号： 已被删除");
            }
            if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
            {
                recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员",Constants.FROM_MINI_APP);
                throw new ServiceException("对不起，您的账号：" + username + " 已停用");
                throw new ServiceException("对不起，您的账号： 已停用");
            }
            recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_MINI_APP);
        }
@@ -176,12 +177,12 @@
            if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
            {
                recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除",Constants.FROM_MINI_APP);
                throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
                throw new ServiceException("对不起，您的账号： 已被删除");
            }
            if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
            {
                recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员",Constants.FROM_MINI_APP);
                throw new ServiceException("对不起，您的账号：" + username + " 已停用");
                throw new ServiceException("对不起，您的账号： 已停用");
            }
            recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_MINI_APP);
        }
@@ -195,6 +196,9 @@
    {
        // 查询用户信息
        R<QwH5LoginVo> userResult = remoteShopService.qwH5Login(qwUserDetail);
        if(userResult==null){
            throw new ServiceException(AppErrorConstant.USER_NO_SHOP);
        }
        if (R.FAIL == userResult.getCode())
        {
            throw new ServiceException(userResult.getMsg());
@@ -239,7 +243,10 @@
    public QwH5LoginVo qwH5StaffLogin(QwUserDetailDto qwUserDetail)
    {
        // 查询用户信息
        R<QwH5LoginVo> userResult = remoteShopService.qwH5Login(qwUserDetail);
        R<QwH5LoginVo> userResult = remoteUserService.qwH5StaffLogin(qwUserDetail);
        if(userResult==null){
            throw new ServiceException(AppErrorConstant.USER_NO_SHOP);
        }
        if (R.FAIL == userResult.getCode())
        {
            throw new ServiceException(userResult.getMsg());