5.2.1

README.md

@@ -4,8 +4,8 @@
 </p>
 <h3 align="center" style="margin:30px 0 30px;font-weight:bold;font-size:30px;">快速开发平台 - Spring Boot</h3>
 <p align="center">
- <a href="https://jeesite.com/docs/upgrade/" target="__blank"><img alt="JeeSite-V5.1" src="https://img.shields.io/badge/JeeSite-V5.1-success.svg"></a>
- <a href="https://spring.io/projects/spring-boot#learn" target="__blank"><img alt="SpringBoot-2.5" src="https://img.shields.io/badge/SpringBoot-2.6-blue.svg"></a>
+ <a href="https://jeesite.com/docs/upgrade/" target="__blank"><img alt="JeeSite-V5.2" src="https://img.shields.io/badge/JeeSite-V5.2-success.svg"></a>
+ <a href="https://spring.io/projects/spring-boot#learn" target="__blank"><img alt="SpringBoot-2.7" src="https://img.shields.io/badge/SpringBoot-2.7-blue.svg"></a>
  <a href="https://gitee.com/thinkgem/jeesite4/stargazers" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite4/badge/star.svg?theme=dark"></a>
  <a href="https://gitee.com/thinkgem/jeesite4/members" target="__blank"><img alt="fork" src="https://gitee.com/thinkgem/jeesite4/badge/fork.svg?theme=dark"></a>
 </p>
@@ -41,7 +41,7 @@ JeeSite 功能全，知识点非常多，也非常少。因为她使用的都是
 
 JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，封装不是限制你去做一些事情，而是在便捷的同时，也具有较好的扩展性，在不具备一些功能的情况下，JeeSite 提供了扩展接口，提供了原生调用方法。
 
-大家都在用 Spring，也在学习 Spring 的优点，Spring 提供了较好的扩展性，可又有多少人去修改它的源代码呢，退一步说，大家去修改了 Spring 的源码，反而会对未来升级造成很大困扰，您说不是呢？这样的例子很多，所以不要纠结，我们非常注重这一点，JeeSite 也一样具备强大的扩展性。
+大家都在用 Spring，也在学习 Spring 的优点，Spring 提供了较好的扩展性，可又有多少人去修改它的源代码呢，退一步说，大家去修改了 Spring 的源码，反而会对未来升级造成很大困扰，您说不是呢？这样的例子很多，所以不要纠结，我们非常注重这一点，JeeSite 也一样具备强大的扩展性。
 
 * 至今 JeeSite 平台架构已经非常稳定。
 * JeeSite 精益求精，用心打磨每一个细节。
@@ -51,11 +51,11 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
 
 ## 技术选型
 
-* 主框架：Spring Boot 2.6、Spring Framework 5.3、Apache Shiro 1.9、J2Cache
+* 主框架：Spring Boot 2.7、Spring Framework 5.3、Apache Shiro 1.10、J2Cache
 * 持久层：Apache MyBatis 3.5、Hibernate Validator 6.2、Alibaba Druid 1.2
-* 视图层：Spring MVC 5.3、Beetl 3.3（替换JSP）、Bootstrap 3.3、AdminLTE 2.4
+* 视图层：Spring MVC 5.3、Beetl 3.10（替换JSP）、Bootstrap 3.3、AdminLTE 2.4
 * 前端组件：jQuery 3.5、jqGrid 4.7、layer 3.5、zTree 3.5、jQuery Validation
-* 分离前端版：Node.js、TypeScript、Vue3、Vite、Ant Design Vue、Vue Vben Admin
+* 分离前端版：Node.js、TypeScript、Vue3、Vite、Ant Design Vue3、Vue Vben Admin
 * 工作流引擎：Flowable 6.6、符合 BPMN 规范、在线流程设计器、中国式流程、退回、撤回、自由流
 * Bootstrap 版 支持 IE9 及以上版本及其他所有现代浏览器，如：谷歌、火狐、国产浏览器 等
 * Vue3 版 支持现代浏览器，如：谷歌 Chrome 86+、火狐、国产浏览器 等
@@ -88,7 +88,7 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
 ### 本地运行
 
 1. 环境准备：`JDK 1.8 or 11、17`、`Maven 3.6+`、使用 `MySQL 5.7 or 8.0` 数据库、[其它数据库](https://jeesite.com/docs/technology/#_8、已支持数据库)
-2. 下载源码：<https://gitee.com/thinkgem/jeesite4/repository/archive/v5.1.zip> 并解压
+2. 下载源码：<https://gitee.com/thinkgem/jeesite4/repository/archive/v5.2.zip> 并解压
 3. 打开文件：`/web/src/main/resources/config/application.yml` 配置JDBC连接
 4. 执行脚本：`/web/bin/init-data.bat` 初始化数据库
 5. 执行脚本：`/web/bin/run-tomcat.bat` 启动服务即可

common/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.2.1-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	

common/src/main/java/com/jeesite/common/ueditor/define/State.java

@@ -6,12 +6,12 @@ package com.jeesite.common.ueditor.define;
  */
 public interface State {
 	
-	public boolean isSuccess ();
+	boolean isSuccess();
 	
-	public void putInfo( String name, String val );
+	void putInfo(String name, String val);
 	
-	public void putInfo ( String name, long val );
+	void putInfo(String name, long val);
 	
-	public String toJSONString ();
+	String toJSONString();
 
 }

common/src/main/java/com/jeesite/common/utils/excel/fieldtype/FieldType.java

@@ -14,21 +14,21 @@ public interface FieldType {
 	/**
 	 * 获取对象值（导入）
 	 */
-	default public Object getValue(String val) {
+	default Object getValue(String val) {
 		return null;
 	}
 
 	/**
 	 * 获取对象值（导出）
 	 */
-	default public String setValue(Object val) {
+	default String setValue(Object val) {
 		return null;
 	}
 	
 	/**
 	 * 获取对象值格式（导出）
 	 */
-	default public String getDataFormat() {
+	default String getDataFormat() {
 		return null;
 	}
 	

common/src/main/java/com/jeesite/common/web/http/ServletUtils.java

@@ -4,23 +4,6 @@
  */
 package com.jeesite.common.web.http;
 
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.Validate;
-import org.springframework.http.MediaType;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
 import com.fasterxml.jackson.databind.util.JSONPObject;
 import com.jeesite.common.codec.EncodeUtils;
 import com.jeesite.common.collect.MapUtils;
@@ -29,6 +12,17 @@ import com.jeesite.common.lang.ExceptionUtils;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.mapper.JsonMapper;
 import com.jeesite.common.mapper.XmlMapper;
+import org.apache.commons.lang3.Validate;
+import org.springframework.http.MediaType;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.*;
+import java.util.Map.Entry;
 
 /**
  * Http与Servlet工具类.
@@ -387,6 +381,18 @@ public class ServletUtils {
 		return null;
 	}
 
+	/**
+	 * 获取请求的域名（含端口）
+	 */
+	public static String getRequestDomain(String url) {
+		String scheme = StringUtils.substringBefore(url, "://");
+		String domain = StringUtils.substringAfter(url, "://");
+		if (StringUtils.contains(domain, "/")) {
+			domain = StringUtils.substringBefore(domain, "/");
+		}
+		return scheme + "://" + domain;
+	}
+
 	/**
 	 * 获得请求参数值
 	 */

modules/cms/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.2.1-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 

modules/cms/src/main/java/com/jeesite/modules/cms/dao/ArticleDao.java

@@ -16,8 +16,8 @@ import com.jeesite.modules.cms.entity.Article;
 @MyBatisDao
 public interface ArticleDao extends CrudDao<Article> {
 
-	public long updateExpiredWeight(Article article);
+	long updateExpiredWeight(Article article);
 
-	public long updateHitsAddOne(String id);
+	long updateHitsAddOne(String id);
 
 }

modules/cms/src/main/resources/db/upgrade/cms/versions

@@ -11,4 +11,6 @@
 5.0.0
 5.0.1
 5.0.2
-5.1.0
+5.1.0
+5.2.0
+5.2.1

modules/core/db/db2/core.sql

@@ -348,7 +348,14 @@ CREATE TABLE js_sys_job
 	job_group varchar(64) NOT NULL,
 	description vargraphic(100) NOT NULL,
 	invoke_target vargraphic(1000) NOT NULL,
+	job_type vargraphic(10) DEFAULT 'cron' NOT NULL,
+	job_priority decimal(10),
+	start_time timestamp,
+	start_delay decimal(19),
+	repeat_interval decimal(19),
+	repeat_count decimal(10),
 	cron_expression varchar(255) NOT NULL,
+	rule_expression varchar(255),
 	misfire_instruction decimal(1) NOT NULL,
 	concurrent char(1) NOT NULL,
 	instance_name varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL,

modules/core/db/h2/core.sql

@@ -348,7 +348,14 @@ CREATE TABLE js_sys_job
 	job_group varchar(64) NOT NULL,
 	description varchar(100) NOT NULL,
 	invoke_target varchar(1000) NOT NULL,
+	job_type varchar(10) DEFAULT 'cron' NOT NULL,
+	job_priority decimal(10),
+	start_time datetime,
+	start_delay decimal(19),
+	repeat_interval decimal(19),
+	repeat_count decimal(10),
 	cron_expression varchar(255) NOT NULL,
+	rule_expression varchar(255),
 	misfire_instruction decimal(1) NOT NULL,
 	concurrent char(1) NOT NULL,
 	instance_name varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL,

modules/core/db/mssql/core.sql

@@ -348,7 +348,14 @@ CREATE TABLE [js_sys_job]
 	[job_group] varchar(64) NOT NULL,
 	[description] nvarchar(100) NOT NULL,
 	[invoke_target] nvarchar(1000) NOT NULL,
+	[job_type] nvarchar(10) DEFAULT 'cron' NOT NULL,
+	[job_priority] decimal(10),
+	[start_time] datetime,
+	[start_delay] decimal(19),
+	[repeat_interval] decimal(19),
+	[repeat_count] decimal(10),
 	[cron_expression] varchar(255) NOT NULL,
+	[rule_expression] varchar(255),
 	[misfire_instruction] decimal(1) NOT NULL,
 	[concurrent] char(1) NOT NULL,
 	[instance_name] varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL,

modules/core/db/mysql/core.sql

@@ -349,7 +349,14 @@ CREATE TABLE js_sys_job
 	job_group varchar(64) NOT NULL COMMENT '任务组名',
 	description varchar(100) NOT NULL COMMENT '任务描述',
 	invoke_target varchar(1000) NOT NULL COMMENT '调用目标字符串',
+	job_type varchar(10) DEFAULT 'cron' NOT NULL COMMENT '任务触发类型',
+	job_priority decimal(10) COMMENT '触发器优先级',
+	start_time datetime COMMENT '触发器启动时间',
+	start_delay decimal(19) COMMENT '触发器延迟启动时间',
+	repeat_interval decimal(19) COMMENT '循环间隔时间（毫秒）',
+	repeat_count decimal(10) COMMENT '循环次数（ -1 无期限）',
 	cron_expression varchar(255) NOT NULL COMMENT 'Cron执行表达式',
+	rule_expression varchar(255) COMMENT '自定义规则表达式',
 	misfire_instruction decimal(1) NOT NULL COMMENT '计划执行错误策略',
 	concurrent char(1) NOT NULL COMMENT '是否并发执行',
 	instance_name varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL COMMENT '集群的实例名字',

modules/core/db/oracle/core.sql

@@ -348,7 +348,14 @@ CREATE TABLE js_sys_job
 	job_group varchar2(64) NOT NULL,
 	description nvarchar2(100) NOT NULL,
 	invoke_target nvarchar2(1000) NOT NULL,
+	job_type nvarchar2(10) DEFAULT 'cron' NOT NULL,
+	job_priority number(10),
+	start_time timestamp,
+	start_delay number(19),
+	repeat_interval number(19),
+	repeat_count number(10),
 	cron_expression varchar2(255) NOT NULL,
+	rule_expression varchar2(255),
 	misfire_instruction number(1) NOT NULL,
 	concurrent char(1) NOT NULL,
 	instance_name varchar2(64) DEFAULT 'JeeSiteScheduler' NOT NULL,
@@ -1233,7 +1240,14 @@ COMMENT ON COLUMN js_sys_job.job_name IS '任务名称';
 COMMENT ON COLUMN js_sys_job.job_group IS '任务组名';
 COMMENT ON COLUMN js_sys_job.description IS '任务描述';
 COMMENT ON COLUMN js_sys_job.invoke_target IS '调用目标字符串';
+COMMENT ON COLUMN js_sys_job.job_type IS '任务触发类型';
+COMMENT ON COLUMN js_sys_job.job_priority IS '触发器优先级';
+COMMENT ON COLUMN js_sys_job.start_time IS '触发器启动时间';
+COMMENT ON COLUMN js_sys_job.start_delay IS '触发器延迟启动时间';
+COMMENT ON COLUMN js_sys_job.repeat_interval IS '循环间隔时间（毫秒）';
+COMMENT ON COLUMN js_sys_job.repeat_count IS '循环次数（ -1 无期限）';
 COMMENT ON COLUMN js_sys_job.cron_expression IS 'Cron执行表达式';
+COMMENT ON COLUMN js_sys_job.rule_expression IS '自定义规则表达式';
 COMMENT ON COLUMN js_sys_job.misfire_instruction IS '计划执行错误策略';
 COMMENT ON COLUMN js_sys_job.concurrent IS '是否并发执行';
 COMMENT ON COLUMN js_sys_job.instance_name IS '集群的实例名字';

modules/core/db/postgresql/core.sql

@@ -348,7 +348,14 @@ CREATE TABLE js_sys_job
 	job_group varchar(64) NOT NULL,
 	description varchar(100) NOT NULL,
 	invoke_target varchar(1000) NOT NULL,
+	job_type varchar(10) DEFAULT 'cron' NOT NULL,
+	job_priority decimal(10),
+	start_time timestamp,
+	start_delay decimal(19),
+	repeat_interval decimal(19),
+	repeat_count decimal(10),
 	cron_expression varchar(255) NOT NULL,
+	rule_expression varchar(255),
 	misfire_instruction decimal(1) NOT NULL,
 	concurrent char(1) NOT NULL,
 	instance_name varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL,
@@ -1233,7 +1240,14 @@ COMMENT ON COLUMN js_sys_job.job_name IS '任务名称';
 COMMENT ON COLUMN js_sys_job.job_group IS '任务组名';
 COMMENT ON COLUMN js_sys_job.description IS '任务描述';
 COMMENT ON COLUMN js_sys_job.invoke_target IS '调用目标字符串';
+COMMENT ON COLUMN js_sys_job.job_type IS '任务触发类型';
+COMMENT ON COLUMN js_sys_job.job_priority IS '触发器优先级';
+COMMENT ON COLUMN js_sys_job.start_time IS '触发器启动时间';
+COMMENT ON COLUMN js_sys_job.start_delay IS '触发器延迟启动时间';
+COMMENT ON COLUMN js_sys_job.repeat_interval IS '循环间隔时间（毫秒）';
+COMMENT ON COLUMN js_sys_job.repeat_count IS '循环次数（ -1 无期限）';
 COMMENT ON COLUMN js_sys_job.cron_expression IS 'Cron执行表达式';
+COMMENT ON COLUMN js_sys_job.rule_expression IS '自定义规则表达式';
 COMMENT ON COLUMN js_sys_job.misfire_instruction IS '计划执行错误策略';
 COMMENT ON COLUMN js_sys_job.concurrent IS '是否并发执行';
 COMMENT ON COLUMN js_sys_job.instance_name IS '集群的实例名字';

modules/core/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.2.1-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
@@ -25,8 +25,8 @@
 		
 		<!-- MySQL -->
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
+			<groupId>com.mysql</groupId>
+			<artifactId>mysql-connector-j</artifactId>
 			<scope>runtime</scope>
 		</dependency>
 		<!-- Oracle 11g -->

modules/core/src/main/java/com/jeesite/autoconfigure/sys/SysAutoConfiguration.java

@@ -4,35 +4,22 @@
  */
 package com.jeesite.autoconfigure.sys;
 
+import com.jeesite.common.mybatis.MyBatisFactoryBean;
+import com.jeesite.modules.msg.service.MsgInnerService;
+import com.jeesite.modules.sys.service.*;
+import com.jeesite.modules.sys.service.support.*;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.jeesite.common.mybatis.MyBatisFactoryBean;
-import com.jeesite.modules.msg.service.MsgInnerService;
-import com.jeesite.modules.sys.service.AreaService;
-import com.jeesite.modules.sys.service.CompanyService;
-import com.jeesite.modules.sys.service.EmpUserService;
-import com.jeesite.modules.sys.service.EmployeeService;
-import com.jeesite.modules.sys.service.LogService;
-import com.jeesite.modules.sys.service.OfficeService;
-import com.jeesite.modules.sys.service.PostService;
-import com.jeesite.modules.sys.service.support.AreaServiceSupport;
-import com.jeesite.modules.sys.service.support.CompanyServiceSupport;
-import com.jeesite.modules.sys.service.support.EmpUserServiceSupport;
-import com.jeesite.modules.sys.service.support.EmployeeServiceSupport;
-import com.jeesite.modules.sys.service.support.LogServiceSupport;
-import com.jeesite.modules.sys.service.support.OfficeServiceSupport;
-import com.jeesite.modules.sys.service.support.PostServiceSupport;
 
 /**
  * 系统核心实现类
  * @author ThinkGem
  * @version 2018-10-13
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @ConditionalOnBean(MyBatisFactoryBean.class)
 @ConditionalOnProperty(name="user.enabled", havingValue="true", matchIfMissing=true)
 public class SysAutoConfiguration {

modules/core/src/main/java/com/jeesite/modules/msg/dao/MsgInnerRecordDao.java

@@ -21,6 +21,6 @@ public interface MsgInnerRecordDao extends CrudDao<MsgInnerRecord> {
 	/**
 	 * 根据消息编号和接受者用户名更新读取状态
 	 */
-	public long updateReadStatus(MsgInnerRecord msgInnerRecord);
+	long updateReadStatus(MsgInnerRecord msgInnerRecord);
 	
 }

modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java

@@ -92,7 +92,8 @@ public class MsgInnerService extends CrudService<MsgInnerDao, MsgInner> {
 			}
 		}
 		msgInner.setSendDate(new Date());
-		msgInner.setIsAttac(StringUtils.isNotBlank(ServletUtils.getParameter("msgInner_file"))?Global.YES:Global.NO);
+		msgInner.setIsAttac(msgInner.getDataMap() != null && StringUtils.isNotBlank((String)msgInner.getDataMap().get("msgInner_file"))
+				|| StringUtils.isNotBlank(ServletUtils.getParameter("msgInner_file")) ? Global.YES : Global.NO);
 		super.save(msgInner);
 		// 保存上传附件
 		FileUploadUtils.saveFileUpload(msgInner, msgInner.getId(), "msgInner_file");

modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java

@@ -23,21 +23,21 @@ public interface EmpUserDao extends CrudDao<EmpUser> {
 	/**
 	 * 查询全部用户，仅返回基本信息
 	 */
-	public List<EmpUser> findUserList(EmpUser empUser);
+	List<EmpUser> findUserList(EmpUser empUser);
 	
 	/**
 	 * 根据部门编码查询用户，仅返回基本信息
 	 */
-	public List<EmpUser> findUserListByOfficeCodes(EmpUser empUser);
+	List<EmpUser> findUserListByOfficeCodes(EmpUser empUser);
 	
 	/**
 	 * 根据角色编码查询用户，仅返回基本信息
 	 */
-	public List<EmpUser> findUserListByRoleCodes(EmpUser empUser);
+	List<EmpUser> findUserListByRoleCodes(EmpUser empUser);
 	
 	/**
 	 * 根据岗位编码查询用户，仅返回基本信息
 	 */
-	public List<EmpUser> findUserListByPostCodes(EmpUser empUser);
+	List<EmpUser> findUserListByPostCodes(EmpUser empUser);
 	
 }

modules/core/src/main/java/com/jeesite/modules/sys/service/AreaService.java

@@ -4,11 +4,11 @@
  */
 package com.jeesite.modules.sys.service;
 
-import java.util.List;
-
 import com.jeesite.common.service.api.TreeServiceApi;
 import com.jeesite.modules.sys.entity.Area;
 
+import java.util.List;
+
 /**
  * 行政区划Service
  * @author ThinkGem
@@ -20,24 +20,24 @@ public interface AreaService extends TreeServiceApi<Area> {
 	 * 获取区划
 	 */
 	@Override
-	public Area get(Area area);
+	Area get(Area area);
 
 	/**
 	 * 查询区划
 	 */
 	@Override
-	public List<Area> findList(Area area);
+	List<Area> findList(Area area);
 
 	/**
 	 * 保存区划
 	 */
 	@Override
-	public void save(Area area);
+	void save(Area area);
 
 	/**
 	 * 删除区划
 	 */
 	@Override
-	public void delete(Area area);
+	void delete(Area area);
 
 }

modules/core/src/main/java/com/jeesite/modules/sys/service/CompanyService.java

@@ -4,11 +4,11 @@
  */
 package com.jeesite.modules.sys.service;
 
-import java.util.List;
-
 import com.jeesite.common.service.api.TreeServiceApi;
 import com.jeesite.modules.sys.entity.Company;
 
+import java.util.List;
+
 /**
  * 公司管理Service
  * @author ThinkGem
@@ -20,36 +20,36 @@ public interface CompanyService extends TreeServiceApi<Company> {
 	 * 获取单条数据
 	 */
 	@Override
-	public Company get(Company company);
+	Company get(Company company);
 	
 	/**
 	 * 添加数据权限过滤条件
 	 */
 	@Override
-	public void addDataScopeFilter(Company company, String ctrlPermi);
+	void addDataScopeFilter(Company company, String ctrlPermi);
 
 	/**
 	 * 查询公司列表
 	 */
 	@Override
-	public List<Company> findList(Company company);
+	List<Company> findList(Company company);
 
 	/**
 	 * 保存公司
 	 */
 	@Override
-	public void save(Company company);
+	void save(Company company);
 	
 	/**
 	 * 删除公司
 	 */
 	@Override
-	public void delete(Company company);
+	void delete(Company company);
 
 	/**
 	 * 停用当前节点
 	 */
 	@Override
-	public void updateStatus(Company company);
+	void updateStatus(Company company);
 
 }

modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java

@@ -4,13 +4,12 @@
  */
 package com.jeesite.modules.sys.service;
 
-import java.util.List;
-
-import org.springframework.web.multipart.MultipartFile;
-
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.service.api.CrudServiceApi;
 import com.jeesite.modules.sys.entity.EmpUser;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 /**
  * 员工管理Service
@@ -23,7 +22,7 @@ public interface EmpUserService extends CrudServiceApi<EmpUser> {
 	 * 获取单条数据
 	 */
 	@Override
-	public EmpUser get(EmpUser empUser);
+	EmpUser get(EmpUser empUser);
 	
 	/**
 	 * 添加数据权限过滤条件
@@ -31,57 +30,57 @@ public interface EmpUserService extends CrudServiceApi<EmpUser> {
 	 * @param ctrlPermi 控制权限类型（拥有的数据权限：DataScope.CTRL_PERMI_HAVE、可管理的数据权限：DataScope.CTRL_PERMI_HAVE）
 	 */
 	@Override
-	public void addDataScopeFilter(EmpUser empUser, String ctrlPermi);
+	void addDataScopeFilter(EmpUser empUser, String ctrlPermi);
 
 	/**
 	 * 分页查询数据
 	 */
 	@Override
-	public Page<EmpUser> findPage(EmpUser empUser);
+	Page<EmpUser> findPage(EmpUser empUser);
 	
 	/**
 	 * 查询全部用户，仅返回基本信息
 	 */
-	public List<EmpUser> findUserList(EmpUser empUser);
+	List<EmpUser> findUserList(EmpUser empUser);
 	
 	/**
 	 * 根据部门编码查询用户，仅返回基本信息
 	 */
-	public List<EmpUser> findUserListByOfficeCodes(EmpUser empUser);
+	List<EmpUser> findUserListByOfficeCodes(EmpUser empUser);
 	
 	/**
 	 * 根据角色编码查询用户，仅返回基本信息
 	 */
-	public List<EmpUser> findUserListByRoleCodes(EmpUser empUser);
+	List<EmpUser> findUserListByRoleCodes(EmpUser empUser);
 	
 	/**
 	 * 根据岗位编码查询用户，仅返回基本信息
 	 */
-	public List<EmpUser> findUserListByPostCodes(EmpUser empUser);
+	List<EmpUser> findUserListByPostCodes(EmpUser empUser);
 
 	/**
 	 * 保存用户员工
 	 */
 	@Override
-	public void save(EmpUser user);
+	void save(EmpUser user);
 
 	/**
 	 * 导入用户数据
 	 * @param file 导入的用户数据文件
 	 * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
 	 */
-	public String importData(MultipartFile file, Boolean isUpdateSupport);
+	String importData(MultipartFile file, Boolean isUpdateSupport);
 
 	/**
 	 * 更新状态
 	 */
 	@Override
-	public void updateStatus(EmpUser empUser);
+	void updateStatus(EmpUser empUser);
 	
 	/**
 	 * 删除用户
 	 */
 	@Override
-	public void delete(EmpUser empUser);
+	void delete(EmpUser empUser);
 	
 }

modules/core/src/main/java/com/jeesite/modules/sys/service/EmployeeService.java

@@ -4,14 +4,14 @@
  */
 package com.jeesite.modules.sys.service;
 
-import java.util.List;
-
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.service.api.CrudServiceApi;
 import com.jeesite.modules.sys.entity.Employee;
 import com.jeesite.modules.sys.entity.EmployeeOffice;
 import com.jeesite.modules.sys.entity.EmployeePost;
 
+import java.util.List;
+
 /**
  * 员工管理Service
  * @author ThinkGem
@@ -23,39 +23,39 @@ public interface EmployeeService extends CrudServiceApi<Employee> {
 	 * 获取单条数据
 	 */
 	@Override
-	public Employee get(Employee employee);
+	Employee get(Employee employee);
 	
 	/**
 	 * 根据工号获取数据
 	 */
-	public Employee getByEmpNo(Employee employee);
+	Employee getByEmpNo(Employee employee);
 	
 	/**
 	 * 查询分页数据
 	 */
 	@Override
-	public Page<Employee> findPage(Employee employee);
+	Page<Employee> findPage(Employee employee);
 	
 	/**
 	 * 保存数据（插入或更新）
 	 */
 	@Override
-	public void save(Employee employee);
+	void save(Employee employee);
 	
 	/**
 	 * 删除数据
 	 */
 	@Override
-	public void delete(Employee employee);
+	void delete(Employee employee);
 	
 	/**
 	 * 查询当前员工关联的岗位信息
 	 */
-	public List<EmployeePost> findEmployeePostList(Employee employee);
+	List<EmployeePost> findEmployeePostList(Employee employee);
 	
 	/**
 	 * 查询当前员工关联的附属机构信息
 	 */
-	public List<EmployeeOffice> findEmployeeOfficeList(Employee employee);
+	List<EmployeeOffice> findEmployeeOfficeList(Employee employee);
 
 }

modules/core/src/main/java/com/jeesite/modules/sys/service/LogService.java

@@ -19,11 +19,11 @@ public interface LogService extends CrudServiceApi<Log> {
 	 * 查询日志记录
 	 */
 	@Override
-	public Page<Log> findPage(Log log);
+	Page<Log> findPage(Log log);
 	
 	/**
 	 * 不使用数据库事务，执行插入日志
 	 */
-	public void insertLog(Log entity);
+	void insertLog(Log entity);
 	
 }

modules/core/src/main/java/com/jeesite/modules/sys/service/OfficeService.java

@@ -22,43 +22,43 @@ public interface OfficeService extends TreeServiceApi<Office> {
 	 * 获取单条数据
 	 */
 	@Override
-	public Office get(Office office);
+	Office get(Office office);
 	
 	/**
 	 * 添加数据权限过滤条件
 	 */
 	@Override
-	public void addDataScopeFilter(Office office, String ctrlPermi);
+	void addDataScopeFilter(Office office, String ctrlPermi);
 
 	/**
 	 * 查询组织机构列表
 	 */
 	@Override
-	public List<Office> findList(Office office);
+	List<Office> findList(Office office);
 
 	/**
 	 * 保存数据（插入或更新）
 	 */
 	@Override
-	public void save(Office office);
+	void save(Office office);
 
 	/**
 	 * 导入机构数据
 	 * @param file 导入的用户数据文件
 	 * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
 	 */
-	public String importData(MultipartFile file, Boolean isUpdateSupport);
+	String importData(MultipartFile file, Boolean isUpdateSupport);
 
 	/**
 	 * 更新部门状态
 	 */
 	@Override
-	public void updateStatus(Office office);
+	void updateStatus(Office office);
 
 	/**
 	 * 删除数据
 	 */
 	@Override
-	public void delete(Office office);
+	void delete(Office office);
 
 }

modules/core/src/main/java/com/jeesite/modules/sys/service/PostService.java

@@ -19,35 +19,35 @@ public interface PostService extends CrudServiceApi<Post> {
 	 * 查询岗位
 	 */
 	@Override
-	public Post get(Post post);
+	Post get(Post post);
 	
 	/**
 	 * 根据名称查询岗位
 	 */
-	public Post getByPostName(Post post);
+	Post getByPostName(Post post);
 
 	/**
 	 * 查询岗位
 	 */
 	@Override
-	public Page<Post> findPage(Post post);
+	Page<Post> findPage(Post post);
 
 	/**
 	 * 保存岗位
 	 */
 	@Override
-	public void save(Post post);
+	void save(Post post);
 
 	/**
 	 * 更新岗位状态
 	 */
 	@Override
-	public void updateStatus(Post post);
+	void updateStatus(Post post);
 
 	/**
 	 * 删除岗位
 	 */
 	@Override
-	public void delete(Post post);
+	void delete(Post post);
 
 }

modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java

@@ -4,22 +4,18 @@
  */
 package com.jeesite.modules.sys.utils;
 
-import java.util.List;
-import java.util.Set;
-
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.collect.SetUtils;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.utils.SpringUtils;
-import com.jeesite.modules.sys.entity.Company;
-import com.jeesite.modules.sys.entity.Employee;
-import com.jeesite.modules.sys.entity.EmployeeOffice;
-import com.jeesite.modules.sys.entity.Office;
-import com.jeesite.modules.sys.entity.User;
+import com.jeesite.modules.sys.entity.*;
 import com.jeesite.modules.sys.service.CompanyService;
 import com.jeesite.modules.sys.service.EmployeeService;
 import com.jeesite.modules.sys.service.OfficeService;
 
+import java.util.List;
+import java.util.Set;
+
 /**
  * 员工部门工具类
  * @author ThinkGem
@@ -55,7 +51,11 @@ public class EmpUtils {
 	 */
 	public static Employee get(User user){
 		if (user != null && User.USER_TYPE_EMPLOYEE.equals(user.getUserType())){
-			return user.getRefObj();
+			Employee employee = user.getRefObj();
+			if (employee == null) {
+				employee = Static.employeeService.get(user.getRefCode());
+			}
+			return employee;
 		}
 		return null;
 	}

modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java

@@ -4,23 +4,6 @@
  */
 package com.jeesite.modules.sys.utils;
 
-import java.lang.reflect.Method;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.ibatis.mapping.SqlCommandType;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.core.DefaultParameterNameDiscoverer;
-import org.springframework.core.ParameterNameDiscoverer;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.method.HandlerMethod;
-
 import com.jeesite.common.codec.EncodeUtils;
 import com.jeesite.common.config.Global;
 import com.jeesite.common.entity.BaseEntity;
@@ -37,9 +20,23 @@ import com.jeesite.modules.sys.entity.Log;
 import com.jeesite.modules.sys.entity.User;
 import com.jeesite.modules.sys.service.LogService;
 import com.jeesite.modules.sys.service.MenuService;
-
 import eu.bitwalker.useragentutils.UserAgent;
 import io.netty.util.concurrent.DefaultThreadFactory;
+import org.apache.ibatis.mapping.SqlCommandType;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.core.DefaultParameterNameDiscoverer;
+import org.springframework.core.ParameterNameDiscoverer;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.method.HandlerMethod;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 日志工具类
@@ -167,7 +164,7 @@ public class LogUtils {
 							};
 							// 如果是BaseEntity的子类，则获取主键名
 							if (superClass != null){
-								Table t = type.getAnnotation(Table.class);
+								Table t = MapperHelper.getTableCache(type);
 								for (Column c : t.columns()){
 									if (c.isPK()){
 										try {
@@ -217,8 +214,8 @@ public class LogUtils {
 			if (StringUtils.isBlank(log.getLogTitle())){
 				log.setLogTitle("未知操作");
 			}
-			// 如果有异常，设置异常信息（将异常对象转换为字符串）
-			log.setIsException(throwable != null ? Global.YES : Global.NO);
+			// 如果有异常，并且不是登录登出的日志，则设置异常信息（将异常对象转换为字符串）
+			log.setIsException(throwable != null && !Log.TYPE_LOGIN_LOGOUT.equals(log.getLogType()) ? Global.YES : Global.NO);
 			String message = ExceptionUtils.getExceptionMessage(throwable);
 			if (message != null) {
 				log.setExceptionInfo(message);

modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java

@@ -217,6 +217,13 @@ public class LoginController extends BaseController{
 		if (StringUtils.isBlank(successUrl)){
 			successUrl = (String)request.getAttribute("__url");
 		}
+		if (StringUtils.contains(successUrl, "://")){
+			String domain = ServletUtils.getRequestDomain(successUrl);
+			successUrl = StringUtils.substring(successUrl, domain.length());
+			if (StringUtils.startsWith(successUrl, request.getContextPath())) {
+				successUrl = StringUtils.substringAfter(successUrl, request.getContextPath());
+			}
+		}
 		if (StringUtils.isBlank(successUrl)){
 			successUrl = Global.getProperty("shiro.successUrl");
 		}
@@ -380,6 +387,9 @@ public class LoginController extends BaseController{
 	public String switchSkin(@PathVariable String skinName, HttpServletRequest request, HttpServletResponse response) {
 		if (StringUtils.isNotBlank(skinName) && !"select".equals(skinName)){
 			CookieUtils.setCookie(response, "skinName", skinName);
+			if (ServletUtils.isAjaxRequest(request)) {
+				return renderResult(response, Global.TRUE, text("主题切换成功"));
+			}
 			return REDIRECT + adminPath + "/index";
 		}
 		return "modules/sys/switchSkin";

modules/core/src/main/java/com/jeesite/modules/sys/web/SsoController.java

@@ -38,9 +38,10 @@ public class SsoController extends BaseController{
 
 //	public static void main(String[] args) {
 //		String username = "system";
-// 		String secretKey = Global.getConfig("shiro.sso.secretKey");
+// 		String secretKey = "test"; // Global.getConfig("shiro.sso.secretKey");
 // 		String token = Md5Utils.md5(secretKey + username + DateUtils.getDate("yyyyMMdd"));
-//		System.out.println("http://127.0.0.1:3100/js/sso/" + username + "/" + token + "?url=../sys/office/index");
+//		System.out.println("http://192.168.56.1:8980/js/sso/" + username + "/" + token + "?url=/a/sys/office/index&relogin=true");
+//		System.out.println("http://192.168.56.1:3100/js/sso/" + username + "/" + token + "?url=../sys/office/index&relogin=true");
 //	}
 
 	/**

modules/core/src/main/resources/META-INF/spring.factories

@@ -1,3 +0,0 @@
-# Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.jeesite.autoconfigure.sys.SysAutoConfiguration

modules/core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+com.jeesite.autoconfigure.sys.SysAutoConfiguration

modules/core/src/main/resources/config/jeesite-core.yml

@@ -399,6 +399,9 @@ shiro:
   
   # 允许的网站来源地址，不设置为全部地址（避免一些跨站点请求伪造 CSRF、防盗链）
   #allowReferers: http://127.0.0.1,http://localhost
+
+  # 允许重定向的地址，不设置为全部允许，设置this只允许本项目内部跳转，多个用逗号隔开，例如：this,http://*.jeesite.com
+  #allowRedirects: ~
   
   # 是否在登录后生成新的Session（默认false）
   isGenerateNewSessionAfterLogin: false
@@ -604,6 +607,9 @@ web:
         
   # 静态文件后缀，过滤静态文件，以提高访问性能。
   staticFile: .css,.js,.map,.png,.jpg,.gif,.jpeg,.bmp,.ico,.swf,.psd,.htc,.crx,.xpi,.exe,.ipa,.apk,.otf,.eot,.svg,.ttf,.woff,.woff2
+
+  # 静态资源缓存周期 Cache-Control，单位秒，1年
+  staticCachePeriod: 31536000
   
   # 静态文件后缀，排除的url路径，指定哪些uri路径不进行静态文件过滤。
   staticFileExcludeUri: /druid/

modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml

@@ -552,8 +552,8 @@ for (c in table.columnList){
 <% } %>
 
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    resetFields();
     setDrawerProps({ loading: true });
+    await resetFields();
     const res = await ${className}Form(data);
     record.value = (res.${className} || {}) as ${ClassName};
     record.value.__t = new Date().getTime();

modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml

@@ -253,7 +253,7 @@ if(table.isTreeEntity){
       dataIndex: '${c.attrName}',
       width: 230,
       align: 'left',
-      slots: { customRender: 'firstColumn' },
+      slot: 'firstColumn',
     },
     <%
       firstColumn = false;
@@ -298,7 +298,7 @@ for(c in table.columnList){
       dictType: '${c.optionMap['dictType']}',
     <% } %>
     <% if(firstColumn){ %>
-      slots: { customRender: 'firstColumn' },
+      slot: 'firstColumn',
     <% } %>
     },
 <%

modules/core/src/main/resources/templates/modules/gen/crud_cloud/api.xml

@@ -10,7 +10,7 @@ package ${packageName}.${moduleName}.api${isNotEmpty(subModuleName)?'.'+subModul
 
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import com.jeesite.common.service.rest.CrudServiceRest;
+import com.jeesite.common.service.rest.${table.isTreeEntity?'Tree':'Crud'}ServiceRest;
 import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
 
 /**

modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml

@@ -70,7 +70,7 @@ spring:
         server-addr: 127.0.0.1:8848
         file-extension: yml
         group: jeesite-cloud-50
-        ext-config:
+        extension-configs:
           - data-id: application.yml
             group: jeesite-cloud-50
 

modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java

@@ -4,15 +4,6 @@
  */
 package com.jeesite.test;
 
-import java.util.Date;
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.entity.DataScope;
 import com.jeesite.common.entity.Page;
@@ -20,18 +11,16 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 import com.jeesite.common.tests.BaseSpringContextTests;
 import com.jeesite.modules.file.dao.FileUploadDao;
 import com.jeesite.modules.file.entity.FileUpload;
-import com.jeesite.modules.sys.dao.AreaDao;
-import com.jeesite.modules.sys.dao.CompanyDao;
-import com.jeesite.modules.sys.dao.ConfigDao;
-import com.jeesite.modules.sys.dao.DictDataDao;
-import com.jeesite.modules.sys.dao.EmpUserDao;
-import com.jeesite.modules.sys.dao.UserDao;
-import com.jeesite.modules.sys.entity.Area;
-import com.jeesite.modules.sys.entity.Company;
-import com.jeesite.modules.sys.entity.Config;
-import com.jeesite.modules.sys.entity.DictData;
-import com.jeesite.modules.sys.entity.EmpUser;
-import com.jeesite.modules.sys.entity.User;
+import com.jeesite.modules.sys.dao.*;
+import com.jeesite.modules.sys.entity.*;
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * Mapper测试
@@ -164,7 +153,8 @@ public class DaoMapperTest extends BaseSpringContextTests {
 			throw new Exception(e);
 		}
 	}
-	
+
+	@Test
 	public static void main(String[] args) {
 		String a = null, b = null;
 		System.out.println("============ 基本测试 ============");
@@ -172,25 +162,25 @@ public class DaoMapperTest extends BaseSpringContextTests {
 				.getWhere().and("name", QueryType.EQ, "abc").toSql();
 		b = "a.`id` = #{sqlMap.where#id#EQ1} AND a.name = #{sqlMap.where.name#EQ1.val}";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
-		
+
 		a = new Config("1").getSqlMap().getWhere()
 				.and("name", QueryType.IN, new String[]{"1", "2", "3"}).toSql();
 		b = "a.`id` = #{sqlMap.where#id#EQ1} AND a.name IN ( #{sqlMap.where.name#IN1.val[0]},"
 				+ " #{sqlMap.where.name#IN1.val[1]}, #{sqlMap.where.name#IN1.val[2]} )";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
-		
+
 		a = new Config("1").getSqlMap().getWhere()
 				.or("name", QueryType.IN, new String[]{"1", "2", "3"}).toSql();
 		b = "a.`id` = #{sqlMap.where#id#EQ1} OR a.name IN ( #{sqlMap.where.name#IN1.val[0]},"
 				+ " #{sqlMap.where.name#IN1.val[1]}, #{sqlMap.where.name#IN1.val[2]} )";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
-		
+
 		System.out.println("============ 重复赋值测试 ============");
 		a = new Config("1").getSqlMap().getWhere()
 				.and("name", QueryType.LIKE, "abc").and("name", QueryType.LIKE, "def").toSql();
 		b = "a.`id` = #{sqlMap.where#id#EQ1} AND a.name LIKE #{sqlMap.where.name#LIKE1.val}";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
-		
+
 		System.out.println("============ IN、NOT IN 测试 ============");
 		a = new Config("1").getSqlMap().getWhere()
 				.and("name", QueryType.IN, new String[]{"abc","def"})
@@ -198,13 +188,13 @@ public class DaoMapperTest extends BaseSpringContextTests {
 		b = "a.`id` = #{sqlMap.where#id#EQ1} AND a.name IN ( #{sqlMap.where.name#IN1.val[0]}, #{sqlMap.where.name#IN1.val[1]} )"
 				+ " AND a.name2 NOT IN ( #{sqlMap.where.name2#NOT_IN1.val[0]}, #{sqlMap.where.name2#NOT_IN1.val[1]} )";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
-		
+
 		a = new Config("1").getSqlMap().getWhere()
 				.and("name", QueryType.IN, null).and("name2", QueryType.IN, new String[]{})
 				.and("name3", QueryType.NOT_IN, ListUtils.newArrayList()).toSql();
 		b = "a.`id` = #{sqlMap.where#id#EQ1}";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
-		
+
 		System.out.println("============ 带括号测试 ============");
 		a = new Config("1").getSqlMap().getWhere()
 				.andBracket("name", QueryType.EQ, "abc", 1).or("name", QueryType.EQ, "def", 2)
@@ -212,7 +202,7 @@ public class DaoMapperTest extends BaseSpringContextTests {
 		b = "a.`id` = #{sqlMap.where#id#EQ1} AND ( a.name = #{sqlMap.where.name#EQ1.val}"
 				+ " OR a.name = #{sqlMap.where.name#EQ2.val} OR a.name = #{sqlMap.where.name#EQ3.val} )";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
-		
+
 		a = new Config().getSqlMap().getWhere()
 				.andBracket("name", QueryType.EQ, "val1", 1).and("name", QueryType.NE, "val2", 11).endBracket(1)
 				.orBracket("name", QueryType.NE, "val3", 2).and("name", QueryType.NE, "val4", 22).endBracket(2)
@@ -222,41 +212,41 @@ public class DaoMapperTest extends BaseSpringContextTests {
 				+ " OR ( a.name != #{sqlMap.where.name#NE2.val} AND a.name != #{sqlMap.where.name#NE22.val} )"
 				+ " OR ( a.name != #{sqlMap.where.name#NE3.val} AND a.name = #{sqlMap.where.name#EQ33.val} )";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
-		
+
 		System.out.println("============ 带括号部分空值测试 ============");
 		a = new Config("1").getSqlMap().getWhere()
 				.andBracket("name", QueryType.EQ, "", 1).or("name", QueryType.EQ, "def", 2)
 					.or("name", QueryType.EQ, "", 3).endBracket().toSql();
 		b = "a.`id` = #{sqlMap.where#id#EQ1} AND ( a.name = #{sqlMap.where.name#EQ2.val} )";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
-		
+
 		a = new Config("1").getSqlMap().getWhere()
 				.andBracket("name", QueryType.EQ, "abc", 1).or("name", QueryType.EQ, "def", 2)
 				.or("name", QueryType.EQ, "", 3).endBracket().toSql();
 		b = "a.`id` = #{sqlMap.where#id#EQ1} AND ( a.name = #{sqlMap.where.name#EQ1.val}"
 				+ " OR a.name = #{sqlMap.where.name#EQ2.val} )";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
-		
+
 		a = new Config("1").getSqlMap().getWhere()
 				.andBracket("name", QueryType.EQ, "", 1).or("name", QueryType.EQ, "def", 2)
 				.or("name", QueryType.EQ, "ghi", 3).endBracket().toSql();
 		b = "a.`id` = #{sqlMap.where#id#EQ1} AND ( a.name = #{sqlMap.where.name#EQ2.val}"
 				+ " OR a.name = #{sqlMap.where.name#EQ3.val} )";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
-		
+
 		System.out.println("============ 带括号全部空值测试 ============");
 		a = new Config("1").getSqlMap().getWhere()
 				.andBracket("name", QueryType.EQ, "", 1).or("name", QueryType.EQ, "", 2)
 				.or("name", QueryType.EQ, "", 3).endBracket().toSql();
 		b = "a.`id` = #{sqlMap.where#id#EQ1} ";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
-		
+
 		a = new Config().getSqlMap().getWhere()
 				.andBracket("name", QueryType.EQ, "", 1).or("name", QueryType.EQ, "", 2)
 				.or("name", QueryType.EQ, "", 3).endBracket().toSql();
 		b = "";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
-		
+
 		System.out.println("============ 实体嵌套测试 ============");
 		Company company = new Company("1");
 		company.setCreateDate_gte(new Date());
@@ -280,7 +270,7 @@ public class DaoMapperTest extends BaseSpringContextTests {
 		a = new FileUpload().getSqlMap().getWhere().and("u.`user_name`", QueryType.EQ, "user1").toSql();
 		b = "a.`status` != #{STATUS_DELETE} AND u.`user_name` = #{sqlMap.where.u#_user_name_#EQ1.val}";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
-		
+
 		System.out.println("============ 联合查询，返回到当前实体测试 ============");
 		FileUpload fileUpload = new FileUpload();
 		fileUpload.getSqlMap().getWhere().and("create_by", QueryType.IN, new String[]{"user1","user2"});
@@ -288,7 +278,7 @@ public class DaoMapperTest extends BaseSpringContextTests {
 		b = "a.`status` != #{STATUS_DELETE} AND a.create_by IN ( #{sqlMap.where.create_by#IN1.val[0]},"
 				+ " #{sqlMap.where.create_by#IN1.val[1]} )";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
-		
+
 		System.out.println("============ 联合查询，属性为this时也可作为查询条件 ============");
 		FileUpload fileUpload2 = new FileUpload();
 		fileUpload2.setCreateByName("ThinkGem/JeeSite");
@@ -297,6 +287,27 @@ public class DaoMapperTest extends BaseSpringContextTests {
 		b = "a.`status` != #{STATUS_DELETE} AND a.create_by IN ( #{sqlMap.where.create_by#IN1.val[0]},"
 				+ " #{sqlMap.where.create_by#IN1.val[1]} ) AND u.`user_name` LIKE #{sqlMap.where#user_name#LIKE1}";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
+
+		System.out.println("============ 条件嵌套查询，可替代 andBracket、orBracket、endBracket v5.2.1+ ============");
+		a = new Config("1").getSqlMap().getWhere()
+				.and("name", QueryType.EQ, "abc", 1)
+				.and((w) -> w
+						.or("name", QueryType.EQ, "def", 2)
+						.or("name", QueryType.EQ, "ghi", 3))
+				.and((w) -> w
+						.or((w2) -> w2
+								.and("name", QueryType.EQ, "def", 4)
+								.and("name", QueryType.EQ, "", 5)
+								.and("name", QueryType.EQ_FORCE, "", 6))
+						.or((w2) -> w2
+								.and("name", QueryType.EQ, "def", 7)
+								.and("name", QueryType.EQ, "ghi", 8)))
+				.toSql();
+		b = "a.`id` = #{sqlMap.where#id#EQ1} AND a.name = #{sqlMap.where.name#EQ1.val}" +
+				" AND (a.name = #{sqlMap.where.n#[0].name#EQ2.val} OR a.name = #{sqlMap.where.n#[0].name#EQ3.val})" +
+				" AND ((a.name = #{sqlMap.where.n#[1].n#[0].name#EQ4.val} AND a.name = #{sqlMap.where.n#[1].n#[0].name#EQ_FORCE6.val})" +
+				" OR (a.name = #{sqlMap.where.n#[1].n#[1].name#EQ7.val} AND a.name = #{sqlMap.where.n#[1].n#[1].name#EQ8.val}))";
+		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b);
 		
 		System.exit(0);
 	}

modules/core/src/test/resources/application.yml

@@ -4,8 +4,8 @@ productName: JeeSite Demo
 companyName: ThinkGem
 
 # 产品版本、版权年份
-productVersion: V5.1
-copyrightYear: 2022
+productVersion: V5.2
+copyrightYear: 2023
 
 # 数据库连接
 jdbc: 
@@ -13,7 +13,7 @@ jdbc:
   # Mysql 数据库配置
   type: mysql
   driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+  url: jdbc:mysql://127.0.0.1:3306/jeesite_v5?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
   username: root
   password: 123456
   testSql: SELECT 1

parent/pom.xml

@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.11</version>
+		<version>2.7.8</version>
 		<relativePath />
 	</parent>
 
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite-parent</artifactId>
-	<version>5.1.0-SNAPSHOT</version>
+	<version>5.2.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>JeeSite Parent</name>
@@ -23,15 +23,15 @@
 
 		<!-- common version setting -->
 		<commons-io.version>2.11.0</commons-io.version>
-		<commons-text.version>1.9</commons-text.version>
+		<commons-text.version>1.10.0</commons-text.version>
 		<commons-beanutils.version>1.9.4</commons-beanutils.version>
 		<commons-email.version>1.5</commons-email.version>
 		<fst.version>2.57</fst.version>
 		<fastjson.version>1.2.83_noneautotype</fastjson.version>
-		<!-- <jackson.version>2.12.6</jackson.version> -->
-		<!-- <activation.version>1.1.1</activation.version> -->
+		<!--<jackson.version>2.12.6</jackson.version>-->
+		<!--<activation.version>1.1.1</activation.version>-->
 		<UserAgentUtils.version>1.21</UserAgentUtils.version>
-		<!-- <metadata-extractor.version>2.11.0</metadata-extractor.version> -->
+		<!--<metadata-extractor.version>2.11.0</metadata-extractor.version>-->
 		<thumbnailator.version>0.4.17</thumbnailator.version>
 		<twelvemonkeys.version>3.8.2</twelvemonkeys.version>
 		<blade-patchca.version>1.1.2</blade-patchca.version>
@@ -42,22 +42,18 @@
 		<groovy.version>3.0.10</groovy.version>
 
 		<!-- framework version setting -->
-		<mybatis.version>3.5.10</mybatis.version>
+		<mybatis.version>3.5.11</mybatis.version>
 		<mybatis-spring.version>2.0.7</mybatis-spring.version>
 		<jsqlparser.version>4.5</jsqlparser.version>
-		<druid.version>1.2.11</druid.version>
-		<shiro.version>1.9.1</shiro.version>
+		<druid.version>1.2.15</druid.version>
+		<shiro.version>1.11.0</shiro.version>
 		<j2cache.version>2.8.0-release</j2cache.version>
 		<swagger.version>1.6.6</swagger.version>
 		<log4j2.version>2.18.0</log4j2.version>
 
-		<!-- jdbc setting -->
-		<!-- <mysql.version>5.1.49</mysql.version> -->
-		<mysql.version>8.0.29</mysql.version>
-
 		<!-- environment setting -->
 		<java.version>1.8</java.version>
-		<!-- <tomcat.version>9.0.58</tomcat.version> -->
+		<!--<tomcat.version>9.0.58</tomcat.version>-->
 		<maven.test.skip>true</maven.test.skip>
 		<resource.delimiter>@</resource.delimiter>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -189,6 +185,13 @@
 					</configuration>
 				</plugin>
 
+				<!-- exec插件 -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>exec-maven-plugin</artifactId>
+					<version>3.1.0</version>
+				</plugin>
+
 				<!-- springboot插件 -->
 				<plugin>
 					<groupId>org.springframework.boot</groupId>

pom.xml

@@ -5,7 +5,7 @@
 	
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite</artifactId>
-	<version>5.1.0-SNAPSHOT</version>
+	<version>5.2.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite</name>

root/pom.xml

@@ -5,7 +5,7 @@
 	
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite-root</artifactId>
-	<version>5.1.0-SNAPSHOT</version>
+	<version>5.2.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite Root</name>

web-api/db/mysql/create_user.sql

@@ -6,7 +6,7 @@ set global read_only=0;
 
 create user 'jeesite'@'%' identified by 'jeesite';
 
-create database jeesite DEFAULT CHARSET 'utf8' COLLATE 'utf8_general_ci'; 
+create database jeesite DEFAULT CHARSET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci';
 
 grant all privileges on jeesite.* to 'jeesite'@'%' identified by 'jeesite';
 

web-api/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.2.1-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	

web-api/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java

@@ -4,13 +4,13 @@
  */
 package com.jeesite.modules.test.dao;
 
-import java.util.List;
-import java.util.Map;
-
 import com.jeesite.common.dao.CrudDao;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.test.entity.TestData;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 测试数据DAO接口
  * @author ThinkGem
@@ -22,6 +22,6 @@ public interface TestDataDao extends CrudDao<TestData> {
 	/**
 	 * 演示Map参数和返回值，支持分页
 	 */
-	public List<Map<String, Object>> findListForMap(Map<String, Object> params);
+	List<Map<String, Object>> findListForMap(Map<String, Object> params);
 	
 }

web-api/src/main/resources/config/application.yml

@@ -8,8 +8,8 @@ productName: JeeSite Demo
 companyName: ThinkGem
 
 # 产品版本、版权年份
-productVersion: V5.1
-copyrightYear: 2022
+productVersion: V5.2
+copyrightYear: 2023
 
 # 是否演示模式
 demoMode: false
@@ -27,7 +27,7 @@ server:
   servlet:
     context-path: /js
     register-default-servlet: false
-    encoding.enabled: true
+#    encoding.enabled: true
   tomcat:
     uri-encoding: UTF-8
     # 表单请求数据的最大大小
@@ -590,6 +590,9 @@ shiro:
 #  # 允许的网站来源地址，不设置为全部地址（避免一些跨站点请求伪造 CSRF、防盗链）
 #  allowReferers: http://127.0.0.1,http://localhost
 #
+#  # 允许重定向的地址，不设置为全部允许，设置this只允许本项目内部跳转，多个用逗号隔开，例如：this,http://*.jeesite.com
+#  allowRedirects: ~
+#
 #  # 是否在登录后生成新的Session（默认false）
 #  isGenerateNewSessionAfterLogin: false
 #

web-fast/db/mysql/create_user.sql

@@ -6,7 +6,7 @@ set global read_only=0;
 
 create user 'jeesite'@'%' identified by 'jeesite';
 
-create database jeesite DEFAULT CHARSET 'utf8' COLLATE 'utf8_general_ci'; 
+create database jeesite DEFAULT CHARSET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci';
 
 grant all privileges on jeesite.* to 'jeesite'@'%' identified by 'jeesite';
 

web-fast/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.2.1-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	

web-fast/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java

@@ -4,13 +4,13 @@
  */
 package com.jeesite.modules.test.dao;
 
-import java.util.List;
-import java.util.Map;
-
 import com.jeesite.common.dao.CrudDao;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.test.entity.TestData;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 测试数据DAO接口
  * @author ThinkGem
@@ -22,6 +22,6 @@ public interface TestDataDao extends CrudDao<TestData> {
 	/**
 	 * 演示Map参数和返回值，支持分页
 	 */
-	public List<Map<String, Object>> findListForMap(Map<String, Object> params);
+	List<Map<String, Object>> findListForMap(Map<String, Object> params);
 	
 }

web-fast/src/main/resources/config/application.yml

@@ -8,8 +8,8 @@ productName: JeeSite Demo
 companyName: ThinkGem
 
 # 产品版本、版权年份
-productVersion: V5.1
-copyrightYear: 2022
+productVersion: V5.2
+copyrightYear: 2023
 
 # 是否演示模式
 demoMode: false

web/db/mysql/create_user.sql

@@ -6,7 +6,7 @@ set global read_only=0;
 
 create user 'jeesite'@'%' identified by 'jeesite';
 
-create database jeesite DEFAULT CHARSET 'utf8' COLLATE 'utf8_general_ci'; 
+create database jeesite DEFAULT CHARSET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci';
 
 grant all privileges on jeesite.* to 'jeesite'@'%' identified by 'jeesite';
 

web/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.2.1-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	

web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java

@@ -22,6 +22,6 @@ public interface TestDataDao extends CrudDao<TestData> {
 	/**
 	 * 演示Map参数和返回值，支持分页
 	 */
-	public List<Map<String, Object>> findListForMap(Map<String, Object> params);
+	List<Map<String, Object>> findListForMap(Map<String, Object> params);
 	
 }

web/src/main/resources/config/application.yml

@@ -8,8 +8,8 @@ productName: JeeSite Demo
 companyName: ThinkGem
 
 # 产品版本、版权年份
-productVersion: V5.1
-copyrightYear: 2022
+productVersion: V5.2
+copyrightYear: 2023
 
 # 是否演示模式
 demoMode: false
@@ -27,7 +27,7 @@ server:
   servlet:
     context-path: /js
     register-default-servlet: false
-    encoding.enabled: true
+#    encoding.enabled: true
   tomcat:
     uri-encoding: UTF-8
     # 表单请求数据的最大大小
@@ -590,6 +590,9 @@ shiro:
 #  # 允许的网站来源地址，不设置为全部地址（避免一些跨站点请求伪造 CSRF、防盗链）
 #  allowReferers: http://127.0.0.1,http://localhost
 #
+#  # 允许重定向的地址，不设置为全部允许，设置this只允许本项目内部跳转，多个用逗号隔开，例如：this,http://*.jeesite.com
+#  allowRedirects: ~
+#
 #  # 是否在登录后生成新的Session（默认false）
 #  isGenerateNewSessionAfterLogin: false
 #