Browse Source

feat: 当登录ip值为空或*时,允许任意ip进行登录

feature/agg
yinhuaiwei 1 week ago
parent
commit
cbb216aa38
3 changed files with 3 additions and 7 deletions
  1. +1
    -3
      inspect-admin/src/main/java/com/inspect/admin/service/SysLoginService.java
  2. +1
    -4
      inspect-management/src/main/java/com/inspect/system/controller/SysUserController.java
  3. +1
    -0
      inspect-management/src/main/resources/mapper/system/SysUserMapper.xml

+ 1
- 3
inspect-admin/src/main/java/com/inspect/admin/service/SysLoginService.java View File

@ -126,9 +126,7 @@ public class SysLoginService {
String username = userInfo.getUsername();
if(!roles.contains("admin")) {
String aollowIp = userInfo.getSysUser().getAollowIp();
if(StringUtils.isBlank(aollowIp)) {
throw new ServiceException("用户未绑定登录ip,不允许登录");
} else if (StringUtils.equals("*",aollowIp)) {
if (StringUtils.isBlank(aollowIp) || StringUtils.equals("*", aollowIp)) {
logger.info("允许用户任意ip登录");
} else if(!StringUtils.equals(requestIp, aollowIp)) {
try {


+ 1
- 4
inspect-management/src/main/java/com/inspect/system/controller/SysUserController.java View File

@ -160,10 +160,7 @@ public class SysUserController extends BaseController {
)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysUser user) {
String allowIp = user.getAollowIp();
if (StringUtils.isBlank(allowIp)) {
return AjaxResult.error("请填写允许登录的ip");
} else if ("1".equals(this.userService.checkUserNameUnique(user.getUserName()))) {
if ("1".equals(this.userService.checkUserNameUnique(user.getUserName()))) {
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,登录账号已存在");
} else if (StringUtils.isNotEmpty(user.getPhonenumber()) && "1".equals(this.userService.checkPhoneUnique(user))) {
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,手机号码已存在");


+ 1
- 0
inspect-management/src/main/resources/mapper/system/SysUserMapper.xml View File

@ -232,6 +232,7 @@
<if test="loginDate != null">login_date = #{loginDate},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="aollowIp != null">aollow_ip = #{aollowIp},</if>
update_time = sysdate()
</set>
where user_id = #{userId}


Loading…
Cancel
Save