diff --git a/src/main/java/org/starrier/common/annotation/threadsafe/ThreadSafeClass.java b/src/main/java/org/starrier/common/annotation/threadsafe/ThreadSafeClass.java
index 07e9d70..9bf0698 100644
--- a/src/main/java/org/starrier/common/annotation/threadsafe/ThreadSafeClass.java
+++ b/src/main/java/org/starrier/common/annotation/threadsafe/ThreadSafeClass.java
@@ -1,16 +1,10 @@
 package org.starrier.common.annotation.threadsafe;
 
-import net.jcip.annotations.ThreadSafe;
-
-<<<<<<< HEAD
-import java.lang.annotation.*;
-=======
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
->>>>>>> master
 
 /**
  * @author Starrier
@@ -21,7 +15,6 @@
         ElementType.ANNOTATION_TYPE,
         ElementType.CONSTRUCTOR,
 })
-@ThreadSafe
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ThreadSafeClass {
diff --git a/src/main/java/org/starrier/common/annotation/threadsafe/ThreadSafeVariable.java b/src/main/java/org/starrier/common/annotation/threadsafe/ThreadSafeVariable.java
index 8df5166..34ba499 100644
--- a/src/main/java/org/starrier/common/annotation/threadsafe/ThreadSafeVariable.java
+++ b/src/main/java/org/starrier/common/annotation/threadsafe/ThreadSafeVariable.java
@@ -1,16 +1,11 @@
 package org.starrier.common.annotation.threadsafe;
 
-import net.jcip.annotations.ThreadSafe;
 
-<<<<<<< HEAD
-import java.lang.annotation.*;
-=======
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
->>>>>>> master
 
 /**
  * @author Starrier
@@ -21,7 +16,6 @@
         ElementType.ANNOTATION_TYPE,
         ElementType.CONSTRUCTOR,
         ElementType.PARAMETER})
-@ThreadSafe
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ThreadSafeVariable {
diff --git a/src/main/java/org/starrier/common/utils/StringNumberUtils.java b/src/main/java/org/starrier/common/utils/StringNumberUtils.java
new file mode 100644
index 0000000..7873dd5
--- /dev/null
+++ b/src/main/java/org/starrier/common/utils/StringNumberUtils.java
@@ -0,0 +1,37 @@
+package org.starrier.common.utils;
+
+import java.util.regex.Pattern;
+
+public class StringNumberUtils {
+
+    // 判断字符串是否是浮点数
+    public static boolean isFloat(String target) {
+
+        if (target == null || target.length() == 0) {
+            return false;
+        }
+
+        Pattern pattern = Pattern.compile("^[-\\+]?([1-9]\\d*.\\d*|0\\.\\d*[1-9]\\d*)");
+        return pattern.matcher(target).matches();
+    }
+
+    /**
+     * 判断字符串是否是 Integer 整数
+     *
+     * @param target 目标字符串
+     * @return 是否是 Integer 整数
+     */
+    public static boolean isInteger(String target) {
+        if (target == null || target.length() == 0) {
+            return false;
+        }
+        Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+        return pattern.matcher(target).matches();
+    }
+
+
+    public static void main(String[] args) {
+        boolean integer = isInteger("100.0");
+        System.out.println(integer);
+    }
+}
diff --git a/src/main/java/org/starrier/common/utils/datatime/DateUtils.java b/src/main/java/org/starrier/common/utils/datatime/DateUtils.java
index 29734d2..bc7ae0f 100644
--- a/src/main/java/org/starrier/common/utils/datatime/DateUtils.java
+++ b/src/main/java/org/starrier/common/utils/datatime/DateUtils.java
@@ -15,8 +15,8 @@ public class DateUtils {
      *
      * @param date specific date
      *             <blockquote><pre>
-     *                                     getLastHourTime(new Date(),0);
-     *                                       </pre></blockquote>
+     *                                                                                     getLastHourTime(new Date(),0);
+     *                                                                                       </pre></blockquote>
      * @return datetime String
      * <blockquote>
      * 2020-02-25 14:00:00
@@ -35,8 +35,8 @@ public static String getLastHourTime(Date date, int n) {
     /**
      * 获取当前时间的整点小时时间
      *
-     * @param date
-     * @return
+     * @param date 日期时间
+     * @return 时间字符串
      */
     public static String getCurrHourTime(Date date) {
         Calendar ca = Calendar.getInstance();
@@ -69,19 +69,20 @@ public static Date getSpecificDate(Integer specificBeforeDate) {
 
     /**
      * Date String format convert to another String format
-     * @param original
-     * @param originalFormat
-     * @param targetFormate
-     * @return
-     * @throws ParseException
+     *
+     * @param original       原始格式的 时间字符串
+     * @param originalFormat 原始时间格式
+     * @param targetFormat   目标时间格式
+     * @return 返回格式化后的瞬间格式
+     * @throws ParseException 解析过程中可能出现的异常信息
      */
-    public static String stringDateConvert(String original,String originalFormat,String targetFormate)
-         throws ParseException {
-            SimpleDateFormat formatter = new SimpleDateFormat(originalFormat);
-            formatter.setLenient(false);
-            Date newDate= formatter.parse(original);
-            formatter = new SimpleDateFormat(targetFormate);
-            return formatter.format(newDate);
+    public static String stringDateConvert(String original, String originalFormat, String targetFormat)
+            throws ParseException {
+        SimpleDateFormat formatter = new SimpleDateFormat(originalFormat);
+        formatter.setLenient(false);
+        Date newDate = formatter.parse(original);
+        formatter = new SimpleDateFormat(targetFormat);
+        return formatter.format(newDate);
     }