diff --git a/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/AreaType.java b/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/AreaType.java index 6df2ff65..5d621d3d 100644 --- a/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/AreaType.java +++ b/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/AreaType.java @@ -4,12 +4,12 @@ */ package com.jeesite.common.utils.excel.fieldtype; -import java.util.List; - import com.jeesite.common.lang.StringUtils; import com.jeesite.modules.sys.entity.Area; import com.jeesite.modules.sys.utils.AreaUtils; +import java.util.List; + /** * 字段类型转换 * @author ThinkGem @@ -18,7 +18,7 @@ import com.jeesite.modules.sys.utils.AreaUtils; */ public class AreaType implements FieldType { - private List list; + private final List list; public AreaType() { list = AreaUtils.getAreaAllList(); diff --git a/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/CompanyType.java b/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/CompanyType.java index 6c211203..6c0cab83 100644 --- a/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/CompanyType.java +++ b/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/CompanyType.java @@ -4,12 +4,12 @@ */ package com.jeesite.common.utils.excel.fieldtype; -import java.util.List; - import com.jeesite.common.lang.StringUtils; import com.jeesite.modules.sys.entity.Company; import com.jeesite.modules.sys.utils.EmpUtils; +import java.util.List; + /** * 字段类型转换 * @author ThinkGem @@ -18,7 +18,7 @@ import com.jeesite.modules.sys.utils.EmpUtils; */ public class CompanyType implements FieldType { - private List list; + private final List list; public CompanyType() { list = EmpUtils.getCompanyAllList(); diff --git a/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/OfficeType.java b/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/OfficeType.java index d48d96b9..25d423e6 100644 --- a/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/OfficeType.java +++ b/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/OfficeType.java @@ -18,7 +18,7 @@ import com.jeesite.modules.sys.utils.EmpUtils; */ public class OfficeType implements FieldType { - private List list; + private final List list; public OfficeType() { list = EmpUtils.getOfficeAllList(); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/utils/AreaUtils.java b/modules/core/src/main/java/com/jeesite/modules/sys/utils/AreaUtils.java index b911cebb..6e3ff6db 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/utils/AreaUtils.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/utils/AreaUtils.java @@ -24,7 +24,7 @@ public class AreaUtils { * 静态内部类,延迟加载,懒汉式,线程安全的单例模式 */ private static final class Static { - private static AreaService areaService = SpringUtils.getBean(AreaService.class); + private static final AreaService areaService = SpringUtils.getBean(AreaService.class); } /** diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java b/modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java index f604f75f..3b6d64fd 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java @@ -32,9 +32,9 @@ public class EmpUtils { * 静态内部类,延迟加载,懒汉式,线程安全的单例模式 */ private static final class Static { - private static OfficeService officeService = SpringUtils.getBean(OfficeService.class); - private static CompanyService companyService = SpringUtils.getBean(CompanyService.class); - private static EmployeeService employeeService = SpringUtils.getBean(EmployeeService.class); + private static final OfficeService officeService = SpringUtils.getBean(OfficeService.class); + private static final CompanyService companyService = SpringUtils.getBean(CompanyService.class); + private static final EmployeeService employeeService = SpringUtils.getBean(EmployeeService.class); } /** diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java b/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java index 7d537771..f7b7da5c 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java @@ -45,7 +45,7 @@ import java.util.concurrent.TimeUnit; */ public class LogUtils { - private static ExecutorService logThreadPool = new ThreadPoolExecutor(5, 20, + private static final ExecutorService logThreadPool = new ThreadPoolExecutor(5, 20, 60L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new DefaultThreadFactory("log-save")); @@ -53,12 +53,12 @@ public class LogUtils { * 静态内部类,延迟加载,懒汉式,线程安全的单例模式 */ private static final class Static { - private static LogService logService = SpringUtils.getBean(LogService.class); - private static MenuService menuService = SpringUtils.getBean(MenuService.class); + private static final LogService logService = SpringUtils.getBean(LogService.class); + private static final MenuService menuService = SpringUtils.getBean(MenuService.class); } // 参数名获取工具(尝试获取标注为@ModelAttribute注解的方法,第一个参数名一般为主键名) - private static ParameterNameDiscoverer pnd = new DefaultParameterNameDiscoverer(); + private static final ParameterNameDiscoverer pnd = new DefaultParameterNameDiscoverer(); /** * 保存日志