新增读写分离配置(不依赖shardingsphere)、高性能、支持复杂SQL、两种读库负载均衡算法、并支持附加数据源读写分离、支持读写分离数据源事务；新增MyBatisDao与数据源映射配置，可不用修改代码，通过映射即可指定对应数据源；ThreadLocal优化；新增RoleListType；

modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/RoleListType.java

@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ */
+package com.jeesite.common.utils.excel.fieldtype;
+
+import java.util.List;
+
+import com.jeesite.common.collect.ListUtils;
+import com.jeesite.common.lang.StringUtils;
+import com.jeesite.common.utils.SpringUtils;
+import com.jeesite.modules.sys.entity.Role;
+import com.jeesite.modules.sys.service.RoleService;
+
+/**
+ * 字段类型转换
+ * @author ThinkGem
+ * @version 2018-08-11
+ * @example fieldType = RoleListType.class
+ */
+public class RoleListType implements FieldType {
+
+	private List<Role> roleList;
+	
+	public RoleListType() {
+		RoleService roleService = SpringUtils.getBean(RoleService.class);
+		roleList = roleService.findList(new Role());
+	}
+	
+	/**
+	 * 获取对象值（导入）
+	 */
+	public Object getValue(String val) {
+		for (String s : StringUtils.split(val, ",")) {
+			for (Role e : roleList) {
+				if (StringUtils.trimToEmpty(s).equals(e.getRoleName())) {
+					roleList.add(e);
+				}
+			}
+		}
+		return roleList.size() > 0 ? roleList : null;
+	}
+
+	/**
+	 * 设置对象值（导出）
+	 */
+	public String setValue(Object val) {
+		if (val != null) {
+			@SuppressWarnings("unchecked")
+			List<Role> roleList = (List<Role>) val;
+			return ListUtils.extractToString(roleList, "roleName", ", ");
+		}
+		return "";
+	}
+	
+}

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

@@ -142,10 +142,10 @@ user:
   # {"用户类型":{"beanName":"Service或Dao的Bean名称","loginView":"登录页面视图","indexView":"主框架页面视图，支持 redirect: 前缀"}}
   userTypeMap: >
     {
-      "employee":{"beanName":"employeeService","loginView":"","indexView":"modules/sys/sysIndex"},
-      "member":{"beanName":"memberService","loginView":"","indexView":"modules/sys/sysIndexMember"},
-      "btype":{"beanName":"btypeInfoService","loginView":"","indexView":"modules/sys/sysIndexBtype"},
-      "expert":{"beanName":"expertService","loginView":"","indexView":"modules/sys/sysIndexExpert"}
+      employee: {beanName: "employeeService", loginView: "", indexView: "modules/sys/sysIndex"},
+      member: {beanName: "memberService", loginView: "", indexView: "modules/sys/sysIndexMember"},
+      btype: {beanName: "btypeInfoService", loginView: "", indexView: "modules/sys/sysIndexBtype"},
+      expert: {beanName: "expertService", loginView: "", indexView: "modules/sys/sysIndexExpert"}
     }
 
   # 数据权限设置参数，可新增自定义数据权限，moduleCode: 针对模块, ctrlPermi: 权限类型（0全部  1拥有权限  2管理权限）