Merge remote-tracking branch 'origin/develop' into develop

diboot-core/src/main/java/com/diboot/core/util/V.java

@@ -157,8 +157,9 @@ public class V {
      * @param str 
      * @return true Or false 
      */  
-    public static boolean isNumeric(String str){
+    public static boolean isNumber(String str){
-          return S.isNumeric(str);
+		String regex = "^(-?[1-9]\\d*\\.?\\d*)|(-?0\\.\\d*[1-9])|(-?[0])|(-?[0]\\.\\d*)$";
+		return str.matches(regex);
     }
 
     /** 
@@ -189,22 +190,6 @@ public class V {
         return valid;
     }
 
-    /** 
-     * 判断是否为整型数字
-     * @param str 
-     * @return 
-     */  
-    public static boolean isNumber(String str) {
-        try{
-        	S.isNumeric(str);
-            Integer.parseInt(str);
-            return true;
-        }
-        catch(Exception ex){  
-            return false;  
-        }
-    }
-
 	/**
 	 * 是否boolean值范围
 	 */