Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/java/com/iamberry/rst/utils/ValidateUtil.java

@@ -10,9 +10,6 @@ public class ValidateUtil {
 
     /**
      * 6～16位字符，至少包含数字、大写字母、小写字母、符号中的两种
-     * http://www.docin.com/p-835484940.html
-     * @param value
-     * @return
      */
     public static boolean checkPwd(String value) {
         return value.matches("(?!^[0-9]+$)(?!^[A-Z]+$)(?!^[a-z]+$)(?!^[^A-z0-9]+$)^.{6,16}");

watero-rst-web/src/main/java/com/iamberry/rst/utils/test.java

@@ -1,30 +0,0 @@
-package com.iamberry.rst.utils;
-
-import com.alibaba.fastjson.JSON;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by Administrator on 2017/6/20.
- */
-public class test {
-    public static void main(String[] args){
-        String data = "{\"dataId\":\"0005520031E364758439780F4F85E8FF\",\"devId\":\"002001015ccf7f944f3f\",\"dpa\":[{\"milk_box_state\":true,\"t\":1497535674017}],\"productKey\":\"4Ic6GgKI0vUG65Jd\"}";
-        JSONObject jasonObject = JSONObject.fromObject(data);
-        System.out.println(jasonObject.has("dps"));
-        if(jasonObject.has("dps")){
-            JSONArray dps = jasonObject.getJSONArray("dps");
-            Map maps = (Map) JSON.parse(dps.getJSONObject(0).toString());
-            Map mapTypes = JSON.parseObject(dps.getJSONObject(0).toString());
-            System.out.println(mapTypes);
-            for (Object obj : maps.keySet()){
-                System.out.println("key为："+obj+"值为："+maps.get(obj));
-            }
-            System.out.println(dps.getJSONObject(0));
-        }
-
-    }
-}