From 3a3aa4aeb78a17c19fa767f844ff1536516e7a32 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 09 九月 2025 15:16:51 +0800
Subject: [PATCH] 上传修改
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 12 ++----------
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 18 ++++++++++++------
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 3 +++
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 373dfe2..90fc6e0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -151,6 +151,9 @@
@ApiModelProperty(value = "继承账号")
@TableField("parentAccount")
private String parentAccount;
+ @ApiModelProperty(value = "分配")
+ @TableField("allocateIp")
+ private String allocateIp;
public Integer getRoleType() {
return roleType;
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 f703c22..f4b8a03 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
@@ -1,21 +1,14 @@
package com.ruoyi.framework.web.service;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.entity.TTenantResp;
import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.domain.model.LoginUserApplet;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.UserStatus;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.exception.user.BlackListException;
-import com.ruoyi.common.exception.user.CaptchaException;
-import com.ruoyi.common.exception.user.CaptchaExpireException;
-import com.ruoyi.common.exception.user.UserNotExistsException;
-import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
+import com.ruoyi.common.exception.user.*;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -26,7 +19,6 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
@@ -74,7 +66,7 @@
public LoginUser login(String username, String password, String code, String uuid)
{
// 验证码校验
- validateCaptcha(username, code, uuid);
+// validateCaptcha(username, code, uuid);
// 登录前置校验
loginPreCheck(username, password);
// 用户验证
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 4dfb977..f003daf 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -27,6 +27,7 @@
<result property="districtId" column="districtId" />
<result property="roleType" column="role_type" />
<result property="signPicture" column="sign_picture" />
+ <result property="allocateIp" column="allocateIp" />
<association property="dept" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@@ -52,7 +53,7 @@
<sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password,u.sign_picture AS signPicture,
- u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.role_type,
+ u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.role_type,u.allocateIp,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u
@@ -136,7 +137,7 @@
u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack,
u.districtId AS districtId,u.sign_picture AS signPicture,
- u.role_type AS roleType,
+ u.role_type AS roleType,u.allocateIp AS allocateIp,
ur.role_id AS roleId,sr.role_name AS roleName,u.deptName as deptName
from sys_user u
left join sys_user_role ur on u.user_id = ur.user_id
@@ -227,10 +228,12 @@
select * from sys_user
</select>
<select id="pageList" resultType="com.ruoyi.system.vo.SysUserVO">
- select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,u.disable_remark AS disableRemark,
- u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,u.operating_time AS operatingTime,u.operating_person AS operatingPerson,
- u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId,u.role_type AS roleType,
- r.role_id AS roleId, r.role_name AS roleName, r.role_key AS roleKey, r.role_sort AS roleSort, r.data_scope AS dataScope, r.status as role_status,u.deptName as deptName
+ select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email,
+ u.avatar AS avatar,u.disable_remark AS disableRemark,u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status,
+ u.del_flag AS delFlag, u.login_ip AS loginIp,u.operating_time AS operatingTime,u.operating_person AS operatingPerson,
+ u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack,
+ u.districtId AS districtId,u.role_type AS roleType,u.allocateIp AS allocateIp,r.role_id AS roleId, r.role_name AS roleName,
+ r.role_key AS roleKey, r.role_sort AS roleSort, r.data_scope AS dataScope, r.status as role_status,u.deptName as deptName
from sys_user u
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
@@ -319,6 +322,7 @@
<if test="ifBlack != null">ifBlack,</if>
<if test="districtId != null">districtId,</if>
<if test="roleType != null">role_type,</if>
+ <if test="allocateIp != null">allocateIp,</if>
<if test="userIdentification != null and userIdentification != ''">userIdentification,</if>
create_time
)values(
@@ -338,6 +342,7 @@
<if test="ifBlack != null">#{ifBlack},</if>
<if test="districtId != null">#{districtId},</if>
<if test="roleType != null">#{roleType},</if>
+ <if test="allocateIp != null">#{allocateIp},</if>
<if test="userIdentification != null and userIdentification != ''">#{userIdentification},</if>
sysdate()
)
@@ -366,6 +371,7 @@
<if test="operatingTime != null">operating_time = #{operatingTime},</if>
<if test="operatingPerson != null">operating_person = #{operatingPerson},</if>
<if test="roleType != null">role_type = #{roleType},</if>
+ <if test="allocateIp != null">allocateIp = #{allocateIp},</if>
update_time = sysdate()
</set>
where user_id = #{userId}
--
Gitblit v1.7.1