From d7c9138a31eb0cf5fa7be43ecff2a7de59983de7 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 11 Mar 2024 16:56:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jeesite/common/network/IpUtils.java | 2 +- .../com/jeesite/common/utils/IdcardUtils.java | 8 ++++---- .../jeesite/common/shiro/filter/FormFilter.java | 16 ++++++++-------- .../java/com/jeesite/modules/sys/entity/Log.java | 4 ++-- .../service/support/EmpUserServiceSupport.java | 12 ++++++++++-- .../service/support/EmployeeServiceSupport.java | 10 +++++++++- .../sys/service/support/PostServiceSupport.java | 8 ++++++++ 7 files changed, 42 insertions(+), 18 deletions(-) diff --git a/common/src/main/java/com/jeesite/common/network/IpUtils.java b/common/src/main/java/com/jeesite/common/network/IpUtils.java index 096386d5..9153ff5a 100644 --- a/common/src/main/java/com/jeesite/common/network/IpUtils.java +++ b/common/src/main/java/com/jeesite/common/network/IpUtils.java @@ -93,7 +93,7 @@ public class IpUtils { } public static byte[] textToNumericFormatV4(String paramString) { - if (paramString.length() == 0) { + if (paramString.isEmpty()) { return null; } byte[] arrayOfByte = new byte[4]; diff --git a/common/src/main/java/com/jeesite/common/utils/IdcardUtils.java b/common/src/main/java/com/jeesite/common/utils/IdcardUtils.java index b1c86297..a44b0ab1 100644 --- a/common/src/main/java/com/jeesite/common/utils/IdcardUtils.java +++ b/common/src/main/java/com/jeesite/common/utils/IdcardUtils.java @@ -1,5 +1,7 @@ package com.jeesite.common.utils; +import org.apache.commons.lang3.StringUtils; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -7,8 +9,6 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang3.StringUtils; - /** * 身份证工具类 * @@ -152,7 +152,7 @@ public class IdcardUtils extends StringUtils { int iSum17 = getPowerSum(iCard); // 获取校验位 String sVal = getCheckCode18(iSum17); - if (sVal.length() > 0) { + if (!sVal.isEmpty()) { idCard18 += sVal; } else { return null; @@ -205,7 +205,7 @@ public class IdcardUtils extends StringUtils { int iSum17 = getPowerSum(iCard); // 获取校验位 String val = getCheckCode18(iSum17); - if (val.length() > 0) { + if (!val.isEmpty()) { if (val.equalsIgnoreCase(code18)) { bTrue = true; } diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java index 3f80eb1e..9ecf8e97 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java @@ -263,21 +263,19 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica protected boolean executeLogin(ServletRequest request, ServletResponse response) throws Exception { // 是否在登录后生成新的Session（默认false） if (Global.getPropertyToBoolean("shiro.isGenerateNewSessionAfterLogin", "false")){ - String[] keys = new String[] {ValidCodeUtils.VALID_CODE}; - Map map = MapUtils.newHashMap(); + String[] keys = new String[] { ValidCodeUtils.VALID_CODE }; + Map attrMap = MapUtils.newHashMap(); final Session sessionOld = UserUtils.getSession(); for (String key : keys) { Object value = sessionOld.getAttribute(key); if (value != null) { - map.put(key, value); + attrMap.put(key, value); } } UserUtils.getSubject().logout(); // 恢复生成新的Session之前的Session数据 final Session sessionNew = UserUtils.getSession(); - map.forEach((key, value) -> { - sessionNew.setAttribute(key, value); - }); + attrMap.forEach(sessionNew::setAttribute); } return super.executeLogin(request, response); } @@ -362,8 +360,10 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica data.put("isValidCodeLogin", Global.getConfigToInteger("sys.login.failedNumAfterValidCode", "200") == 0); //获取当前会话对象 - Session session = UserUtils.getSession(); - data.put("sessionid", (String)session.getId()); + if (ServletUtils.isAjaxRequest(request)) { + Session session = UserUtils.getSession(); + data.put("sessionid", (String)session.getId()); + } // 如果登录设置了语言，则切换语言 if (paramMap.get("lang") != null){ diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java index 6361e5b3..8911a80a 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java @@ -240,7 +240,7 @@ public class Log extends DataEntity { /** * 设置请求参数 - * @param paramMap + * @param paramsMap */ @SuppressWarnings({ "unchecked", "rawtypes" }) public void setRequestParams(Map paramsMap){ @@ -252,7 +252,7 @@ public class Log extends DataEntity { } StringBuilder params = new StringBuilder(); for (Map.Entry param : ((Map)paramsMap).entrySet()){ - if (params.length() != 0) { + if (!params.isEmpty()) { params.append("&"); } params.append(param.getKey() + "="); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java index a4627551..9a9c77cd 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java @@ -23,13 +23,13 @@ import com.jeesite.modules.sys.service.EmployeeService; import com.jeesite.modules.sys.service.UserService; import com.jeesite.modules.sys.utils.EmpUtils; import com.jeesite.modules.sys.utils.UserUtils; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.PostConstruct; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.ConstraintViolationException; import java.util.List; /** @@ -80,6 +80,14 @@ public class EmpUserServiceSupport extends CrudService } } + /** + * 查询数据 + */ + @Override + public List findList(EmpUser entity) { + return super.findList(entity); + } + /** * 分页查询数据 */ diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmployeeServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmployeeServiceSupport.java index a53ed430..8cc3d120 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmployeeServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmployeeServiceSupport.java @@ -49,7 +49,15 @@ public class EmployeeServiceSupport extends CrudService where.setEmpNo(employee.getEmpNo()); return dao.getByEntity(where); } - + + /** + * 查询数据 + */ + @Override + public List findList(Employee entity) { + return super.findList(entity); + } + /** * 查询分页数据 */ diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/PostServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/PostServiceSupport.java index d6eb10d5..a9f19f77 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/PostServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/PostServiceSupport.java @@ -50,6 +50,14 @@ public class PostServiceSupport extends CrudService return dao.getByEntity(where); } + /** + * 查询数据 + */ + @Override + public List findList(Post entity) { + return super.findList(entity); + } + /** * 查询岗位 */