)so3.get("data"));
+ Assert.assertEquals(so4.getString("tokenName"), "satoken");
+ Assert.assertEquals(so4.getString("tokenValue"), token);
+
+ // 注销
+ request("/acc/logout?satoken=" + token);
+
+ // 是否登录
+ SoMap so5 = request("/acc/isLogin?satoken=" + token);
+ Assert.assertFalse(so5.getBoolean("data"));
+ }
+
+ // 封装请求
+ private SoMap request(String path) throws Exception {
+ MvcResult mvcResult = mvc.perform(
+ MockMvcRequestBuilders.post(path)
+ .contentType(MediaType.APPLICATION_JSON_UTF8)
+ .accept(MediaType.APPLICATION_JSON_UTF8)
+ )
+ .andExpect(MockMvcResultMatchers.status().isOk())
+ .andReturn();
+
+ SoMap so = SoMap.getSoMap().setJsonString(
+ mvcResult.getResponse().getContentAsString()
+ );
+
+ return so;
+ }
+
+}
diff --git a/sa-token-test/sa-token-springboot-integrate-test/src/test/java/com/pj/test/StartUpApplication.java b/sa-token-test/sa-token-springboot-integrate-test/src/test/java/com/pj/test/StartUpApplication.java
new file mode 100644
index 00000000..2a174efd
--- /dev/null
+++ b/sa-token-test/sa-token-springboot-integrate-test/src/test/java/com/pj/test/StartUpApplication.java
@@ -0,0 +1,16 @@
+package com.pj.test;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * 启动类
+ * @author Auster
+ *
+ */
+@SpringBootApplication
+public class StartUpApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(StartUpApplication.class, args);
+ }
+}
diff --git a/sa-token-test/sa-token-springboot-integrate-test/src/test/java/com/pj/test/util/SoMap.java b/sa-token-test/sa-token-springboot-integrate-test/src/test/java/com/pj/test/util/SoMap.java
new file mode 100644
index 00000000..2ff88103
--- /dev/null
+++ b/sa-token-test/sa-token-springboot-integrate-test/src/test/java/com/pj/test/util/SoMap.java
@@ -0,0 +1,747 @@
+package com.pj.test.util;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Map< String, Object> 是最常用的一种Map类型，但是它写着麻烦
+ * 所以特封装此类，继承Map，进行一些扩展，可以让Map更灵活使用
+ *
最新：2020-12-10 新增部分构造方法
+ * @author kong
+ */
+public class SoMap extends LinkedHashMap {
+
+ private static final long serialVersionUID = 1L;
+
+ public SoMap() {
+ }
+
+
+ /** 以下元素会在isNull函数中被判定为Null， */
+ public static final Object[] NULL_ELEMENT_ARRAY = {null, ""};
+ public static final List NULL_ELEMENT_LIST;
+
+
+ static {
+ NULL_ELEMENT_LIST = Arrays.asList(NULL_ELEMENT_ARRAY);
+ }
+
+ // ============================= 读值 =============================
+
+ /** 获取一个值 */
+ @Override
+ public Object get(Object key) {
+ if("this".equals(key)) {
+ return this;
+ }
+ return super.get(key);
+ }
+
+ /** 如果为空，则返回默认值 */
+ public Object get(Object key, Object defaultValue) {
+ Object value = get(key);
+ if(valueIsNull(value)) {
+ return defaultValue;
+ }
+ return value;
+ }
+
+ /** 转为String并返回 */
+ public String getString(String key) {
+ Object value = get(key);
+ if(value == null) {
+ return null;
+ }
+ return String.valueOf(value);
+ }
+
+ /** 如果为空，则返回默认值 */
+ public String getString(String key, String defaultValue) {
+ Object value = get(key);
+ if(valueIsNull(value)) {
+ return defaultValue;
+ }
+ return String.valueOf(value);
+ }
+
+ /** 转为int并返回 */
+ public int getInt(String key) {
+ Object value = get(key);
+ if(valueIsNull(value)) {
+ return 0;
+ }
+ return Integer.valueOf(String.valueOf(value));
+ }
+ /** 转为int并返回，同时指定默认值 */
+ public int getInt(String key, int defaultValue) {
+ Object value = get(key);
+ if(valueIsNull(value)) {
+ return defaultValue;
+ }
+ return Integer.valueOf(String.valueOf(value));
+ }
+
+ /** 转为long并返回 */
+ public long getLong(String key) {
+ Object value = get(key);
+ if(valueIsNull(value)) {
+ return 0;
+ }
+ return Long.valueOf(String.valueOf(value));
+ }
+
+ /** 转为double并返回 */
+ public double getDouble(String key) {
+ Object value = get(key);
+ if(valueIsNull(value)) {
+ return 0.0;
+ }
+ return Double.valueOf(String.valueOf(value));
+ }
+
+ /** 转为boolean并返回 */
+ public boolean getBoolean(String key) {
+ Object value = get(key);
+ if(valueIsNull(value)) {
+ return false;
+ }
+ return Boolean.valueOf(String.valueOf(value));
+ }
+
+ /** 转为Date并返回，根据自定义格式 */
+ public Date getDateByFormat(String key, String format) {
+ try {
+ return new SimpleDateFormat(format).parse(getString(key));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /** 转为Date并返回，根据格式： yyyy-MM-dd */
+ public Date getDate(String key) {
+ return getDateByFormat(key, "yyyy-MM-dd");
+ }
+
+ /** 转为Date并返回，根据格式： yyyy-MM-dd HH:mm:ss */
+ public Date getDateTime(String key) {
+ return getDateByFormat(key, "yyyy-MM-dd HH:mm:ss");
+ }
+
+ /** 获取集合(必须原先就是个集合，否则会创建个新集合并返回) */
+ @SuppressWarnings("unchecked")
+ public List getList(String key) {
+ Object value = get(key);
+ List list = null;
+ if(value == null || value.equals("")) {
+ list = new ArrayList();
+ }
+ else if(value instanceof List) {
+ list = (List)value;
+ } else {
+ list = new ArrayList();
+ list.add(value);
+ }
+ return list;
+ }
+
+ /** 获取集合 (指定泛型类型) */
+ public List getList(String key, Class cs) {
+ List list = getList(key);
+ List list2 = new ArrayList();
+ for (Object obj : list) {
+ T objC = getValueByClass(obj, cs);
+ list2.add(objC);
+ }
+ return list2;
+ }
+
+ /** 获取集合(逗号分隔式)，(指定类型) */
+ public List getListByComma(String key, Class cs) {
+ String listStr = getString(key);
+ if(listStr == null || listStr.equals("")) {
+ return new ArrayList<>();
+ }
+ // 开始转化
+ String [] arr = listStr.split(",");
+ List list = new ArrayList();
+ for (String str : arr) {
+ if(cs == int.class || cs == Integer.class || cs == long.class || cs == Long.class) {
+ str = str.trim();
+ }
+ T objC = getValueByClass(str, cs);
+ list.add(objC);
+ }
+ return list;
+ }
+
+
+ /** 根据指定类型从map中取值，返回实体对象 */
+ public T getModel(Class cs) {
+ try {
+ return getModelByObject(cs.newInstance());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /** 从map中取值，塞到一个对象中 */
+ public T getModelByObject(T obj) {
+ // 获取类型
+ Class cs = obj.getClass();
+ // 循环复制
+ for (Field field : cs.getDeclaredFields()) {
+ try {
+ // 获取对象
+ Object value = this.get(field.getName());
+ if(value == null) {
+ continue;
+ }
+ field.setAccessible(true);
+ Object valueConvert = getValueByClass(value, field.getType());
+ field.set(obj, valueConvert);
+ } catch (IllegalArgumentException | IllegalAccessException e) {
+ throw new RuntimeException("属性取值出错：" + field.getName(), e);
+ }
+ }
+ return obj;
+ }
+
+
+
+ /**
+ * 将指定值转化为指定类型并返回
+ * @param obj
+ * @param cs
+ * @param
+ * @return
+ */
+ @SuppressWarnings("unchecked")
+ public static T getValueByClass(Object obj, Class cs) {
+ String obj2 = String.valueOf(obj);
+ Object obj3 = null;
+ if (cs.equals(String.class)) {
+ obj3 = obj2;
+ } else if (cs.equals(int.class) || cs.equals(Integer.class)) {
+ obj3 = Integer.valueOf(obj2);
+ } else if (cs.equals(long.class) || cs.equals(Long.class)) {
+ obj3 = Long.valueOf(obj2);
+ } else if (cs.equals(short.class) || cs.equals(Short.class)) {
+ obj3 = Short.valueOf(obj2);
+ } else if (cs.equals(byte.class) || cs.equals(Byte.class)) {
+ obj3 = Byte.valueOf(obj2);
+ } else if (cs.equals(float.class) || cs.equals(Float.class)) {
+ obj3 = Float.valueOf(obj2);
+ } else if (cs.equals(double.class) || cs.equals(Double.class)) {
+ obj3 = Double.valueOf(obj2);
+ } else if (cs.equals(boolean.class) || cs.equals(Boolean.class)) {
+ obj3 = Boolean.valueOf(obj2);
+ } else {
+ obj3 = (T)obj;
+ }
+ return (T)obj3;
+ }
+
+
+ // ============================= 写值 =============================
+
+ /**
+ * 给指定key添加一个默认值（只有在这个key原来无值的情况先才会set进去）
+ */
+ public void setDefaultValue(String key, Object defaultValue) {
+ if(isNull(key)) {
+ set(key, defaultValue);
+ }
+ }
+
+ /** set一个值，连缀风格 */
+ public SoMap set(String key, Object value) {
+ // 防止敏感key
+ if(key.toLowerCase().equals("this")) {
+ return this;
+ }
+ put(key, value);
+ return this;
+ }
+
+ /** 将一个Map塞进SoMap */
+ public SoMap setMap(Map map) {
+ if(map != null) {
+ for (String key : map.keySet()) {
+ this.set(key, map.get(key));
+ }
+ }
+ return this;
+ }
+
+ /** 将一个对象解析塞进SoMap */
+ public SoMap setModel(Object model) {
+ if(model == null) {
+ return this;
+ }
+ Field[] fields = model.getClass().getDeclaredFields();
+ for (Field field : fields) {
+ try{
+ field.setAccessible(true);
+ boolean isStatic = Modifier.isStatic(field.getModifiers());
+ if(!isStatic) {
+ this.set(field.getName(), field.get(model));
+ }
+ }catch (Exception e){
+ throw new RuntimeException(e);
+ }
+ }
+ return this;
+ }
+
+ /** 将json字符串解析后塞进SoMap */
+ public SoMap setJsonString(String jsonString) {
+ try {
+ @SuppressWarnings("unchecked")
+ Map map = new ObjectMapper().readValue(jsonString, Map.class);
+ return this.setMap(map);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+ // ============================= 删值 =============================
+
+ /** delete一个值，连缀风格 */
+ public SoMap delete(String key) {
+ remove(key);
+ return this;
+ }
+
+ /** 清理所有value为null的字段 */
+ public SoMap clearNull() {
+ Iterator iterator = this.keySet().iterator();
+ while(iterator.hasNext()) {
+ String key = iterator.next();
+ if(this.isNull(key)) {
+ iterator.remove();
+ this.remove(key);
+ }
+
+ }
+ return this;
+ }
+ /** 清理指定key */
+ public SoMap clearIn(String ...keys) {
+ List keys2 = Arrays.asList(keys);
+ Iterator iterator = this.keySet().iterator();
+ while(iterator.hasNext()) {
+ String key = iterator.next();
+ if(keys2.contains(key) == true) {
+ iterator.remove();
+ this.remove(key);
+ }
+ }
+ return this;
+ }
+ /** 清理掉不在列表中的key */
+ public SoMap clearNotIn(String ...keys) {
+ List keys2 = Arrays.asList(keys);
+ Iterator iterator = this.keySet().iterator();
+ while(iterator.hasNext()) {
+ String key = iterator.next();
+ if(keys2.contains(key) == false) {
+ iterator.remove();
+ this.remove(key);
+ }
+
+ }
+ return this;
+ }
+ /** 清理掉所有key */
+ public SoMap clearAll() {
+ clear();
+ return this;
+ }
+
+
+ // ============================= 快速构建 =============================
+
+ /** 构建一个SoMap并返回 */
+ public static SoMap getSoMap() {
+ return new SoMap();
+ }
+ /** 构建一个SoMap并返回 */
+ public static SoMap getSoMap(String key, Object value) {
+ return new SoMap().set(key, value);
+ }
+ /** 构建一个SoMap并返回 */
+ public static SoMap getSoMap(Map map) {
+ return new SoMap().setMap(map);
+ }
+
+ /** 将一个对象集合解析成为SoMap */
+ public static SoMap getSoMapByModel(Object model) {
+ return SoMap.getSoMap().setModel(model);
+ }
+
+ /** 将一个对象集合解析成为SoMap集合 */
+ public static List getSoMapByList(List list) {
+ List listMap = new ArrayList();
+ for (Object model : list) {
+ listMap.add(getSoMapByModel(model));
+ }
+ return listMap;
+ }
+
+ /** 克隆指定key，返回一个新的SoMap */
+ public SoMap cloneKeys(String... keys) {
+ SoMap so = new SoMap();
+ for (String key : keys) {
+ so.set(key, this.get(key));
+ }
+ return so;
+ }
+ /** 克隆所有key，返回一个新的SoMap */
+ public SoMap cloneSoMap() {
+ SoMap so = new SoMap();
+ for (String key : this.keySet()) {
+ so.set(key, this.get(key));
+ }
+ return so;
+ }
+
+ /** 将所有key转为大写 */
+ public SoMap toUpperCase() {
+ SoMap so = new SoMap();
+ for (String key : this.keySet()) {
+ so.set(key.toUpperCase(), this.get(key));
+ }
+ this.clearAll().setMap(so);
+ return this;
+ }
+ /** 将所有key转为小写 */
+ public SoMap toLowerCase() {
+ SoMap so = new SoMap();
+ for (String key : this.keySet()) {
+ so.set(key.toLowerCase(), this.get(key));
+ }
+ this.clearAll().setMap(so);
+ return this;
+ }
+ /** 将所有key中下划线转为中划线模式 (kebab-case风格) */
+ public SoMap toKebabCase() {
+ SoMap so = new SoMap();
+ for (String key : this.keySet()) {
+ so.set(wordEachKebabCase(key), this.get(key));
+ }
+ this.clearAll().setMap(so);
+ return this;
+ }
+ /** 将所有key中下划线转为小驼峰模式 */
+ public SoMap toHumpCase() {
+ SoMap so = new SoMap();
+ for (String key : this.keySet()) {
+ so.set(wordEachBigFs(key), this.get(key));
+ }
+ this.clearAll().setMap(so);
+ return this;
+ }
+ /** 将所有key中小驼峰转为下划线模式 */
+ public SoMap humpToLineCase() {
+ SoMap so = new SoMap();
+ for (String key : this.keySet()) {
+ so.set(wordHumpToLine(key), this.get(key));
+ }
+ this.clearAll().setMap(so);
+ return this;
+ }
+
+
+
+
+ // ============================= 辅助方法 =============================
+
+
+ /** 指定key是否为null，判定标准为 NULL_ELEMENT_ARRAY 中的元素 */
+ public boolean isNull(String key) {
+ return valueIsNull(get(key));
+ }
+
+ /** 指定key列表中是否包含value为null的元素，只要有一个为null，就会返回true */
+ public boolean isContainNull(String ...keys) {
+ for (String key : keys) {
+ if(this.isNull(key)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /** 与isNull()相反 */
+ public boolean isNotNull(String key) {
+ return !isNull(key);
+ }
+ /** 指定key的value是否为null，作用同isNotNull() */
+ public boolean has(String key) {
+ return !isNull(key);
+ }
+
+ /** 指定value在此SoMap的判断标准中是否为null */
+ public boolean valueIsNull(Object value) {
+ return NULL_ELEMENT_LIST.contains(value);
+ }
+
+ /** 验证指定key不为空，为空则抛出异常 */
+ public SoMap checkNull(String ...keys) {
+ for (String key : keys) {
+ if(this.isNull(key)) {
+ throw new RuntimeException("参数" + key + "不能为空");
+ }
+ }
+ return this;
+ }
+
+ static Pattern patternNumber = Pattern.compile("[0-9]*");
+ /** 指定key是否为数字 */
+ public boolean isNumber(String key) {
+ String value = getString(key);
+ if(value == null) {
+ return false;
+ }
+ return patternNumber.matcher(value).matches();
+ }
+
+
+
+
+ /**
+ * 转为JSON字符串
+ */
+ public String toJsonString() {
+ try {
+// SoMap so = SoMap.getSoMap(this);
+ return new ObjectMapper().writeValueAsString(this);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+//
+// /**
+// * 转为JSON字符串, 带格式的
+// */
+// public String toJsonFormatString() {
+// try {
+// return JSON.toJSONString(this, true);
+// } catch (Exception e) {
+// throw new RuntimeException(e);
+// }
+// }
+
+ // ============================= web辅助 =============================
+
+
+ /**
+ * 返回当前request请求的的所有参数
+ * @return
+ */
+ public static SoMap getRequestSoMap() {
+ // 大善人SpringMVC提供的封装
+ ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+ if(servletRequestAttributes == null) {
+ throw new RuntimeException("当前线程非JavaWeb环境");
+ }
+ // 当前request
+ HttpServletRequest request = servletRequestAttributes.getRequest();
+ if (request.getAttribute("currentSoMap") == null || request.getAttribute("currentSoMap") instanceof SoMap == false ) {
+ initRequestSoMap(request);
+ }
+ return (SoMap)request.getAttribute("currentSoMap");
+ }
+
+ /** 初始化当前request的 SoMap */
+ private static void initRequestSoMap(HttpServletRequest request) {
+ SoMap soMap = new SoMap();
+ Map parameterMap = request.getParameterMap(); // 获取所有参数
+ for (String key : parameterMap.keySet()) {
+ try {
+ String[] values = parameterMap.get(key); // 获得values
+ if(values.length == 1) {
+ soMap.set(key, values[0]);
+ } else {
+ List list = new ArrayList();
+ for (String v : values) {
+ list.add(v);
+ }
+ soMap.set(key, list);
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ request.setAttribute("currentSoMap", soMap);
+ }
+
+ /**
+ * 验证返回当前线程是否为JavaWeb环境
+ * @return
+ */
+ public static boolean isJavaWeb() {
+ ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();// 大善人SpringMVC提供的封装
+ if(servletRequestAttributes == null) {
+ return false;
+ }
+ return true;
+ }
+
+
+
+ // ============================= 常见key （以下key经常用，所以封装以下，方便写代码） =============================
+
+ /** get 当前页 */
+ public int getKeyPageNo() {
+ int pageNo = getInt("pageNo", 1);
+ if(pageNo <= 0) {
+ pageNo = 1;
+ }
+ return pageNo;
+ }
+ /** get 页大小 */
+ public int getKeyPageSize() {
+ int pageSize = getInt("pageSize", 10);
+ if(pageSize <= 0 || pageSize > 1000) {
+ pageSize = 10;
+ }
+ return pageSize;
+ }
+
+ /** get 排序方式 */
+ public int getKeySortType() {
+ return getInt("sortType");
+ }
+
+
+
+
+
+ // ============================= 分页相关(封装mybatis的page-help插件 ) =============================
+
+// /** 分页插件 */
+// private com.github.pagehelper.Page pagePlug;
+// /** 分页插件 - 开始分页 */
+// public SoMap startPage() {
+// this.pagePlug= com.github.pagehelper.PageHelper.startPage(getKeyPageNo(), getKeyPageSize());
+// return this;
+// }
+// /** 获取上次分页的记录总数 */
+// public long getDataCount() {
+// if(pagePlug == null) {
+// return -1;
+// }
+// return pagePlug.getTotal();
+// }
+// /** 分页插件 - 结束分页, 返回总条数 （该方法已过时，请调用更加符合语义化的getDataCount() ） */
+// @Deprecated
+// public long endPage() {
+// return getDataCount();
+// }
+
+
+
+
+
+ // ============================= 工具方法 =============================
+
+
+ /**
+ * 将一个一维集合转换为树形集合
+ * @param list 集合
+ * @param idKey id标识key
+ * @param parentIdKey 父id标识key
+ * @param childListKey 子节点标识key
+ * @return 转换后的tree集合
+ */
+ public static List listToTree(List list, String idKey, String parentIdKey, String childListKey) {
+ // 声明新的集合，存储tree形数据
+ List newTreeList = new ArrayList();
+ // 声明hash-Map，方便查找数据
+ SoMap hash = new SoMap();
+ // 将数组转为Object的形式，key为数组中的id
+ for (int i = 0; i < list.size(); i++) {
+ SoMap json = (SoMap) list.get(i);
+ hash.put(json.getString(idKey), json);
+ }
+ // 遍历结果集
+ for (int j = 0; j < list.size(); j++) {
+ // 单条记录
+ SoMap aVal = (SoMap) list.get(j);
+ // 在hash中取出key为单条记录中pid的值
+ SoMap hashVp = (SoMap) hash.get(aVal.get(parentIdKey, "").toString());
+ // 如果记录的pid存在，则说明它有父节点，将她添加到孩子节点的集合中
+ if (hashVp != null) {
+ // 检查是否有child属性，有则添加，没有则新建
+ if (hashVp.get(childListKey) != null) {
+ @SuppressWarnings("unchecked")
+ List ch = (List) hashVp.get(childListKey);
+ ch.add(aVal);
+ hashVp.put(childListKey, ch);
+ } else {
+ List ch = new ArrayList();
+ ch.add(aVal);
+ hashVp.put(childListKey, ch);
+ }
+ } else {
+ newTreeList.add(aVal);
+ }
+ }
+ return newTreeList;
+ }
+
+
+
+ /** 指定字符串的字符串下划线转大写模式 */
+ private static String wordEachBig(String str){
+ String newStr = "";
+ for (String s : str.split("_")) {
+ newStr += wordFirstBig(s);
+ }
+ return newStr;
+ }
+ /** 返回下划线转小驼峰形式 */
+ private static String wordEachBigFs(String str){
+ return wordFirstSmall(wordEachBig(str));
+ }
+
+ /** 将指定单词首字母大写 */
+ private static String wordFirstBig(String str) {
+ return str.substring(0, 1).toUpperCase() + str.substring(1, str.length());
+ }
+
+ /** 将指定单词首字母小写 */
+ private static String wordFirstSmall(String str) {
+ return str.substring(0, 1).toLowerCase() + str.substring(1, str.length());
+ }
+
+ /** 下划线转中划线 */
+ private static String wordEachKebabCase(String str) {
+ return str.replaceAll("_", "-");
+ }
+
+ /** 驼峰转下划线 */
+ private static String wordHumpToLine(String str) {
+ return str.replaceAll("[A-Z]", "_$0").toLowerCase();
+ }
+
+
+}
diff --git a/sa-token-test/sa-token-springboot-test/pom.xml b/sa-token-test/sa-token-springboot-test/pom.xml
index 08bed033..efbdecea 100644
--- a/sa-token-test/sa-token-springboot-test/pom.xml
+++ b/sa-token-test/sa-token-springboot-test/pom.xml
@@ -23,6 +23,4 @@