二次测试存储型xss

license/src/main/java/iot/sixiang/license/util/CommonUtil.java

@@ -144,14 +144,22 @@ public class CommonUtil {
 
 	// 用于测试存储型xss
 	public static Object reverseData(Object obj, Class clazz) {
-		HashMap<String, Object> resMap = new HashMap<String, Object>();
+		HashMap<String, Object> resMap = new HashMap<>();
 		resMap.put("data", obj);
+		if (!PubUtils.isNull()) {
 			return  ResResult.success().goRecord(resMap);
+		} else {
+			return null;
+		}
+
 	}
 
 	public static <T> T dealWithAccessControl(Object obj, Class<T> clazz) {
 		ResResult actionResult = (ResResult) reverseData(obj, clazz);
-		HashMap<String, Object> resMap = (HashMap<String, Object>)actionResult.getRecord();
+		HashMap<String, Object> resMap = null;
+		if (!PubUtils.isNull(actionResult)) {
+			resMap = (HashMap<String, Object>)actionResult.getRecord();
+		}
 		return (T) resMap.get("data");
 	}
 

license/src/main/java/iot/sixiang/license/util/PubUtils.java

+package iot.sixiang.license.util;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import java.util.Collection;
+import java.util.UUID;
+
+/**
+ * Title: PubUtils
+ * Description: 公共实体类
+ *
+ * @author YFW
+ * @version V1.0
+ * @date 2020-07-28
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class PubUtils {
+	/**
+	 * The constant STRING_NULL.
+	 */
+	private final static String STRING_NULL = "-";
+	/**
+	 * 匹配手机号码, 支持+86和86开头
+	 */
+	private static final String REGX_MOBILENUM = "^((\\+86)|(86))?(13|15|17|18)\\d{9}$";
+	/**
+	 * 匹配手机号码, 支持+86和86开头
+	 */
+	private static final String REGX_MOBILENUM_NEW = "^((\\+86)|(86))?(1)\\d{10}$";
+	/**
+	 * 匹配邮箱帐号
+	 */
+	private static final String REGX_EMAIL = "\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*";
+
+	/**
+	 * 匹配设备标签,支持字母、数字、汉字和英文逗号，但不能以英文逗号结尾
+	 */
+	private static final String REGX_TAGS = "[a-zA-Z0-9,\\u4E00-\\u9FA5]*[^,]";
+
+	/**
+	 * 匹配手机号码（先支持13, 15, 17, 18开头的手机号码）.
+	 *
+	 * @param inputStr the input str
+	 *
+	 * @return the boolean
+	 */
+	public static Boolean isMobileNumber(String inputStr) {
+		return !PubUtils.isNull(inputStr) && inputStr.matches(REGX_MOBILENUM);
+	}
+
+	public static Boolean isMobileNumberNew(String inputStr) {
+		return !PubUtils.isNull(inputStr) && inputStr.matches(REGX_MOBILENUM_NEW);
+	}
+
+	/**
+	 * 判断一个或多个对象是否为空
+	 *
+	 * @param values 可变参数, 要判断的一个或多个对象
+	 *
+	 * @return 只有要判断的一个对象都为空则返回true, 否则返回false boolean
+	 */
+	public static boolean isNull(Object... values) {
+		if (!PubUtils.isNotNullAndNotEmpty(values)) {
+			return true;
+		}
+		for (Object value : values) {
+			boolean flag;
+			if (value instanceof Object[]) {
+				flag = !isNotNullAndNotEmpty((Object[]) value);
+			} else if (value instanceof Collection<?>) {
+				flag = !isNotNullAndNotEmpty((Collection<?>) value);
+			} else if (value instanceof String) {
+				flag = isOEmptyOrNull(value);
+			} else {
+				flag = (null == value);
+			}
+			if (flag) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Is o empty or null boolean.
+	 *
+	 * @param o the o
+	 *
+	 * @return boolean boolean
+	 */
+	private static boolean isOEmptyOrNull(Object o) {
+		return o == null || isSEmptyOrNull(o.toString());
+	}
+
+	/**
+	 * Is s empty or null boolean.
+	 *
+	 * @param s the s
+	 *
+	 * @return boolean boolean
+	 */
+	private static boolean isSEmptyOrNull(String s) {
+		return trimAndNullAsEmpty(s).length() <= 0;
+	}
+
+	/**
+	 * Trim and null as empty string.
+	 *
+	 * @param s the s
+	 *
+	 * @return java.lang.String string
+	 */
+	private static String trimAndNullAsEmpty(String s) {
+		if (s != null && !s.trim().equals(STRING_NULL)) {
+			return s.trim();
+		} else {
+			return "";
+		}
+		// return s == null ? "" : s.trim();
+	}
+
+	/**
+	 * 判断对象数组是否为空并且数量大于0
+	 *
+	 * @param value the value
+	 *
+	 * @return boolean
+	 */
+	private static Boolean isNotNullAndNotEmpty(Object[] value) {
+		boolean bl = false;
+		if (null != value && 0 < value.length) {
+			bl = true;
+		}
+		return bl;
+	}
+
+	/**
+	 * 判断对象集合（List,Set）是否为空并且数量大于0
+	 *
+	 * @param value the value
+	 *
+	 * @return boolean
+	 */
+	private static Boolean isNotNullAndNotEmpty(Collection<?> value) {
+		boolean bl = false;
+		if (null != value && !value.isEmpty()) {
+			bl = true;
+		}
+		return bl;
+	}
+
+	/**
+	 * Is email boolean.
+	 *
+	 * @param str the str
+	 *
+	 * @return the boolean
+	 */
+	public static boolean isEmail(String str) {
+		boolean bl = true;
+		if (isSEmptyOrNull(str) || !str.matches(REGX_EMAIL)) {
+			bl = false;
+		}
+		return bl;
+	}
+
+	/**
+	 * Is tags boolean.
+	 *
+	 * @param str the str
+	 *
+	 * @return the boolean
+	 */
+	public static boolean isTags(String str) {
+		boolean bl = true;
+		if (isSEmptyOrNull(str) || !str.matches(REGX_TAGS)) {
+			bl = false;
+		}
+		return bl;
+	}
+
+	/**
+	 * Uuid string.
+	 *
+	 * @return the string
+	 */
+	public synchronized static String uuid() {
+		return UUID.randomUUID().toString().replace("-", "");
+	}
+}