KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix

Browse Source
This commit is contained in:
zhoulingpo
2023-07-31 15:54:47 +08:00
parent a782cc6c0f f19ca10d0d
commit 856072675f
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java
+6 -7
View File
@@ -1,21 +1,20 @@
package com.jero.modules.system.controller; package com.jero.modules.system.controller;
import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Results; import com.jero.common.api.vo.Results;
import com.jero.common.util.PasswordUtil; import com.jero.common.util.PasswordUtil;
import org.apache.commons.lang.StringUtils;
import com.jero.common.util.SqlInjectionUtil; import com.jero.common.util.SqlInjectionUtil;
import com.jero.modules.system.mapper.SysDictMapper; import com.jero.modules.system.mapper.SysDictMapper;
import com.jero.modules.system.model.DuplicateCheckVo; import com.jero.modules.system.model.DuplicateCheckVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api; import javax.servlet.http.HttpServletRequest;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
/** /**
* @Title: DuplicateCheckAction * @Title: DuplicateCheckAction
@@ -48,7 +47,7 @@ public class DuplicateCheckController {
//SQL注入校验（只限制非法串改数据库） //SQL注入校验（只限制非法串改数据库）
final String[] sqlInjCheck = {duplicateCheckVo.getTableName(),duplicateCheckVo.getFieldName()}; final String[] sqlInjCheck = {duplicateCheckVo.getTableName(),duplicateCheckVo.getFieldName()};
SqlInjectionUtil.filterContent(sqlInjCheck); SqlInjectionUtil.filterContent(sqlInjCheck);
if ("phone".equals(duplicateCheckVo.getFieldName())) { if ("phone".equals(duplicateCheckVo.getFieldName()) || "email".equals(duplicateCheckVo.getFieldName())) {
if (StringUtils.isNotBlank(duplicateCheckVo.getFieldVal())) { if (StringUtils.isNotBlank(duplicateCheckVo.getFieldVal())) {
duplicateCheckVo.setFieldVal(PasswordUtil.encrypt(duplicateCheckVo.getFieldVal())); duplicateCheckVo.setFieldVal(PasswordUtil.encrypt(duplicateCheckVo.getFieldVal()));
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java
+6 -2
View File
@@ -146,7 +146,9 @@ public class LoginServiceImpl implements ILoginService {
//update-begin--Author:wangshuai Date:20200714 for：登录日志没有记录人员 //update-begin--Author:wangshuai Date:20200714 for：登录日志没有记录人员
LoginUser loginUser = new LoginUser(); LoginUser loginUser = new LoginUser();
BeanUtils.copyProperties(sysUser, loginUser); BeanUtils.copyProperties(sysUser, loginUser);
baseCommonService.addLog(USER_NAME + username + ",登录成功！", CommonConstant.LOG_TYPE_1, null,loginUser); baseCommonService.addLog(USER_NAME + sysUser.getRealname() + "（"+username+"）,登录成功！",
CommonConstant.LOG_TYPE_1, null,
loginUser);
//update-end--Author:wangshuai Date:20200714 for：登录日志没有记录人员 //update-end--Author:wangshuai Date:20200714 for：登录日志没有记录人员
return result; return result;
@@ -191,7 +193,9 @@ public class LoginServiceImpl implements ILoginService {
LoginUser sysUser = sysBaseAPI.getUserByName(username); LoginUser sysUser = sysBaseAPI.getUserByName(username);
if(sysUser!=null) { if(sysUser!=null) {
//update-begin--Author:wangshuai Date:20200714 for：登出日志没有记录人员 //update-begin--Author:wangshuai Date:20200714 for：登出日志没有记录人员
baseCommonService.addLog(USER_NAME+sysUser.getRealname()+",退出成功！", CommonConstant.LOG_TYPE_1, null,sysUser); baseCommonService.addLog(USER_NAME+sysUser.getRealname()+"（"+sysUser.getUsername()+"）,退出成功！",
CommonConstant.LOG_TYPE_1, null,
sysUser);
//update-end--Author:wangshuai Date:20200714 for：登出日志没有记录人员 //update-end--Author:wangshuai Date:20200714 for：登出日志没有记录人员
log.info(" 用户名: "+sysUser.getRealname()+",退出成功！ "); log.info(" 用户名: "+sysUser.getRealname()+",退出成功！ ");
//清空用户登录Token缓存 //清空用户登录Token缓存