feat: mearge

pom.xml

@@ -90,6 +90,13 @@
             <version>${common-version}</version>
             <scope>compile</scope>
         </dependency>
+        <!-- 报表设计器包 -->
+        <dependency>
+            <groupId>com.fr.report</groupId>
+            <artifactId>fine-report-designer</artifactId>
+            <version>${common-version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

src/main/java/com/fanruan/api/cal/CalculatorKit.java

@@ -19,10 +19,9 @@ import com.fr.web.session.SessionIDInfo;
 import java.util.Map;
 
 /**
- * @ClassName CalculatorKit
+ * @author zack
- * @Author zack
+ * @date 2019/8/23
- * @Date 2019/8/23
+ * @version 10.0
- * @Version 10.0
  * 帆软算子工具类（主要用于公式计算）
  */
 public class CalculatorKit {

src/main/java/com/fanruan/api/design/util/GUICoreKit.java

@@ -0,0 +1,24 @@
+package com.fanruan.api.design.util;
+
+import com.fr.design.utils.gui.GUICoreUtils;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class GUICoreKit {
+
+    public static JPanel createFlowPane(Object... var0) {
+        return GUICoreUtils.createFlowPane(var0);
+    }
+
+    /**
+     * 弹出菜单，在坐标为x,y处弹出内容为component的菜单
+     * @param menu
+     * @param component
+     * @param x
+     * @param y
+     */
+    public static void showPopupMenu(JPopupMenu menu, Component component, int x, int y) {
+        GUICoreUtils.showPopupMenu(menu, component, x, y);
+    }
+}

src/main/java/com/fanruan/api/function/FunctionKit.java

@@ -10,10 +10,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @ClassName FunctionKit
+ * @author zack
- * @Author zack
+ * @date 2019/8/23
- * @Date 2019/8/23
+ * @version 10.0
- * @Version 10.0
  * 函数相关工具类
  */
 public class FunctionKit {

src/main/java/com/fanruan/api/report/TemplateKit.java

@@ -3,10 +3,9 @@ package com.fanruan.api.report;
 import com.fr.io.TemplateWorkBookIO;
 import com.fr.main.TemplateWorkBook;
 /**
- * @ClassName TemplateKit
+ * @author zack
- * @Author zack
+ * @date 2019/8/23
- * @Date 2019/8/23
+ * @version 10.0
- * @Version 10.0
  * 模板操作相关工具类
  */
 public class TemplateKit {

src/main/java/com/fanruan/api/report/analy/AnalyKit.java

@@ -21,10 +21,9 @@ import java.util.Iterator;
 import java.util.Map;
 
 /**
- * @ClassName AnalyKit
+ * @author zack
- * @Author zack
+ * @date 2019/8/23
- * @Date 2019/8/23
+ * @version 10.0
- * @Version 10.0
  * 数据分析相关工具类
  */
 public class AnalyKit {

src/main/java/com/fanruan/api/util/ArrayKit.java

@@ -82,4 +82,14 @@ public class ArrayKit {
      * @return 返回增加元素后的数组
      */
     public static <T> T[] addAll(T[] array, T... element){return ArrayUtils.addAll(array, element);};
+
+    /**
+     * 判断数组是否为不空
+     * @param array
+     * @param <T>
+     * @return 若数组array不空返回true，否则返回false
+     */
+    public static <T> boolean isNotEmpty(T[] array) {
+        return ArrayUtils.isNotEmpty(array);
+    }
 }

src/main/java/com/fanruan/api/util/AssistKit.java

@@ -0,0 +1,85 @@
+package com.fanruan.api.util;
+
+import com.fr.stable.AssistUtils;
+
+public class AssistKit {
+    /**
+     * 比较两个双精度浮点型数据是否相等
+     * @param parm1
+     * @param parm2
+     * @return 相等返回true 错误返回false
+     */
+    public static boolean equals(double parm1, double parm2) {
+        return AssistUtils.equals(parm1, parm2);
+    }
+
+    /**
+     * 比较两个单精度浮点型数据是否相等
+     * @param parm1
+     * @param parm2
+     * @return 相等返回true 错误返回false
+     */
+    public static boolean equals(float parm1, float parm2) {
+        return AssistUtils.equals(parm1, parm2);
+    }
+
+    /**
+     * 判断两个Object类型数据是否相等
+     * @param parm1
+     * @param parm2
+     * @return 相等返回true 错误返回false
+     */
+    public static boolean equals(Object parm1, Object parm2) {
+        return AssistUtils.equals(parm1, parm2);
+    }
+
+    /**
+     * 判断两个int类型数据是否相等
+     * @param parm1
+     * @param parm2
+     * @return 相等返回0，如果parm1大于parm2 返回1否则返回-1
+     */
+    public static int compare(int parm1, int parm2) {
+        return AssistUtils.compare(parm1, parm2);
+    }
+
+    /**
+     * 判断两个long类型数据是否相等
+     * @param parm1
+     * @param parm2
+     * @return 相等返回0，如果parm1大于parm2 返回1否则返回-1
+     */
+    public static int compare(long parm1, long parm2) {
+        return AssistUtils.compare(parm1, parm2);
+    }
+
+    /**
+     * 生成对象的哈希码值
+     * @param parm
+     * @return 返回对象的哈希码值
+     */
+    public static int hashCode(Object... parm) {
+        return AssistUtils.hashCode(parm);
+    }
+
+    /**
+     * 返回反映这个对象的字符串
+     * @param parm
+     * @return 返回反映这个对象的字符串
+     */
+    public static String toString(Object parm) {
+        return AssistUtils.toString(parm);
+    }
+
+    /**
+     *
+     * @param parm1
+     * @param parm2
+     * @return
+     */
+//    public static String toString(Object parm1, String... parm2) {
+//        return AssistUtils.toString(parm1, parm2);
+//    }
+
+
+}

src/main/java/com/fanruan/api/util/GeneralKit.java

@@ -1,5 +1,6 @@
 package com.fanruan.api.util;
 
+import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralUtils;
 import com.fr.stable.StableUtils;
 import com.fr.base.TemplateUtils;
@@ -94,4 +95,22 @@ public class GeneralKit {
     public static @Nullable Number objectToNumber(Object obj, boolean returnNull) {
         return GeneralUtils.objectToNumber(obj, returnNull);
     }
+
+    /**
+     * 读取jar的版本号
+     * @return 返回jar版本号
+     */
+    public static @Nullable String readBuildNO() {
+        return GeneralUtils.readBuildNO();
+    }
+
+    /**
+     * 返回两个对象比较的大小
+     * @param obj1
+     * @param obj2
+     * @return 若相等返回0，obj1小于obj2返回负数，否则返回正数
+     */
+    public static int compare(Object obj1, Object obj2) {
+        return ComparatorUtils.compare(obj1, obj2);
+    }
 }

src/main/java/com/fanruan/api/util/ReflectKit.java

@@ -0,0 +1,16 @@
+package com.fanruan.api.util;
+
+import com.fr.stable.StableUtils;
+
+public class ReflectKit {
+
+    /**
+     * 判断一个类是否是另一个类的子类
+     * @param current 当前类
+     * @param target 目标类
+     * @return 如果当前类是目标类的子类，则返回true，否则返回false
+     */
+    public static boolean classInstanceOf(Class current, Class target) {
+        return StableUtils.classInstanceOf(current, target);
+    }
+}

src/main/java/com/fanruan/api/util/RenderKit.java

@@ -0,0 +1,22 @@
+package com.fanruan.api.util;
+
+import com.fr.base.TemplateUtils;
+
+import java.util.Map;
+
+/**
+ * 文本动态渲染工具类
+ */
+public class RenderKit {
+
+    /**
+     * 根据参数, 来计算文档字符串
+     * @param text 待渲染的文本模板
+     * @param map 参数集合
+     * @return 返回渲染后的文本
+     * @throws Exception 渲染过程中出现错误则抛出此异常
+     */
+    public static String renderParameter4Tpl(String text, Map<String, Object> map) throws Exception {
+        return TemplateUtils.renderParameter4Tpl(text, map);
+    }
+}

src/main/java/com/fanruan/api/util/StringKit.java

@@ -1,6 +1,7 @@
 package com.fanruan.api.util;
 
 import com.fr.stable.StringUtils;
+import java.io.UnsupportedEncodingException;
 
 /**
  * @author richie
@@ -95,4 +96,169 @@ public class StringKit {
         return StringUtils.trim(string);
     }
 
+    /**
+     *如果String为空则返回空字符串，否则返回String本身的值，保证String不空。
+     * @param text
+     * @return
+     */
+    public static String alwaysNotNull(String text) {
+        return StringUtils.alwaysNotNull(text);
+    }
+    /**
+     * 获取text字符串中去除结尾suffix字符串的部分
+     * @param text
+     * @param suffix
+     * @return 若text字符串结尾是suffix，则返回去除suffix的部分，否则返回text
+     */
+    public static String cutStringEndWith(String text, String suffix) {
+        return StringUtils.cutStringEndWith(text, suffix);
+    }
+
+    /**获取text字符串去除开头startString部分
+     *
+     * @param text
+     * @param startString
+     * @return 若text字符串开头是suffix，则返回去除startString部分否则返回text
+     */
+    public static String cutStringStartWith(String text, String startString) {
+        return StringUtils.cutStringStartWith(text, startString);
+    }
+
+    /**
+     * 去掉text字符串两边的空格或ASCII码小于空格的字符
+     * @param text
+     * @return 若text只含空格字符，或ASCII码小于空格的字符，返回null，否则返回去除两边空字符后的text
+     */
+    public static String trimToNull(String text) {
+        return StringUtils.trimToNull(text);
+    }
+
+    /**
+     * 令text以startString开头
+     * @param text
+     * @param startString
+     * @return 若text不以startString开头，在text前添加startString。若text以startString开头返回text
+     */
+    public static String perfectStart(String text, String startString) {
+        return StringUtils.perfectStart(text, startString);
+    }
+
+    /**
+     * 令text以suffix结尾
+     * @param text
+     * @param suffix
+     * @return 若text不以suffix结尾，在text后添加suffix。若text以suffix结尾返回text
+     */
+    public static String perfectEnd(String text, String suffix) {
+        return StringUtils.perfectEnd(text, suffix);
+    }
+
+    /**
+     * 令text的开头结尾都是str
+     * @param text
+     * @param str
+     * @return 若text的开头或结尾不是str，在相应位置添加str，若开头结尾都是text，返回text
+     */
+    public static String perfectSurround(String text, String str) {
+        return StringUtils.perfectSurround(text, str);
+    }
+
+    /**
+     * 返回text长度
+     * @param text
+     * @return 若text为null返回0，否则返回text长度
+     */
+    public static int getLength(String text) {
+        return StringUtils.getLength(text);
+    }
+
+    /**
+     * 判断text1和text2在去掉开头或结尾的ignoreStr部分是否相等
+     * @param text1
+     * @param text2
+     * @param ignoreStr
+     * @return 如果text1和txet2去掉开头结尾的ignoreStr后相等返回true，不等返回false
+     */
+    public static boolean equalsIgnore(String text1, String text2, String ignoreStr) {
+        return StringUtils.equalsIgnore(text1, text2, ignoreStr);
+    }
+
+    /**
+     * 将str加入到strArr字符串数组的每个字符串后方（不包括最后一个字符串），同时将结果字符串数组连接起来，形成新的字符串
+     * @param str
+     * @param strArr
+     * @return 若strArr为空则返回null，若strArr长度为0返回""空字符串，否则返回连接后的字符串
+     */
+    public static String join(String str, String[] strArr) {
+        return StringUtils.join(str, strArr);
+    }
+
+    /**
+     * 将text字符串中的A-J转换成0-9,工具函数
+     * @param text
+     * @return 返回转换后的字符串
+     */
+    public static String parseVersion(String text) {
+        return StringUtils.parseVersion(text);
+    }
+
+    /**
+     * 判断text是否是json中数组的string形式
+     * @param text
+     * @return 若是数组的String形式返回true，否则返回flase
+     */
+    public static boolean isArrayType(String text) {
+        return StringUtils.isArrayType(text);
+    }
+
+    /**
+     *从原本json数组类型的String取出其中的每一个用逗号间隔元素，作为String二维数组返回值
+     * @param text
+     * @return 取出text中用逗号间隔的元素
+     */
+    public static String[][] stringToArray(String text) {
+        return StringUtils.stringToArray(text);
+    }
+
+    /**
+     *对text中每个字符，用charsetName为名的编码方式解码后，返回解码后字节长度从0到bytelength的部分，以String形式返回
+     * @param text
+     * @param charsetName
+     * @param byteLength
+     * @return 若text为空或byteLength小于等于0返回空字符串，否则以String形式返回解码后字节长度从0到bytelength的部分
+     */
+    public static String subStringByByteLength(String text, String charsetName, int byteLength) throws UnsupportedEncodingException {
+        return StringUtils.subStringByByteLength(text, charsetName, byteLength);
+    }
+
+    /**
+     * 比较text和compareStr两字符串值是否相等
+     * @param text
+     * @param compareStr
+     * @return 若text和compareStr两字符串的值相同返回true，否则返回false
+     */
+    public static boolean equals(String text, String compareStr) {
+        return StringUtils.equals(text, compareStr);
+    }
+
+    /**
+     * 比较text和compareStr两字符串忽略大小写的情况下值是否相等
+     * @param text
+     * @param compareStr
+     * @return 在忽略大小写的情况下，若text和compareStr两字符串的值相同返回true，否则返回false
+     */
+    public static boolean equalsIgnoreCase(String text, String compareStr) {
+        return StringUtils.equalsIgnoreCase(text, compareStr);
+    }
+
+    /**
+     * 扩展text的长度至stringLength，不足则以空格填充
+     * @param text
+     * @param stringLength
+     * @return 若text长度比stringLength，则将text扩充到stringLength长度，否则返回text
+     */
+    public static String rightPad(String text, int stringLength) {
+        return StringUtils.rightPad(text, stringLength);
+    }
+
 }

src/main/java/com/fanruan/api/util/TransmissionKit.java

@@ -6,11 +6,11 @@ import com.fr.base.EmailManager;
 import com.fr.base.sms.SMSManager;
 
 /**
- * @ClassName TransmissionKit
+ * @author zack
- * @Author zack
+ * @date 2019/8/23
- * @Date 2019/8/23
+ * @version 10.0
- * @Version 10.0
  * fine kit for data transmission.(eg. email or sms...)
+ * 数据发送工具类（比如：邮件发送，短信发送）
  */
 public class TransmissionKit {
     /**

src/test/java/com/fanruan/api/ModulePrepare.java

@@ -18,10 +18,9 @@ import org.junit.After;
 import org.junit.Before;
 
 /**
- * @ClassName ModulePrepare
+ * @author zack
- * @Author zack
+ * @date 2019/8/26
- * @Date 2019/8/26
+ * @version 10.0
- * @Version 10.0
  */
 public class ModulePrepare {
     Module module = null;

src/test/java/com/fanruan/api/cal/CalculatorKitEnvTest.java

@@ -19,10 +19,9 @@ import java.util.Map;
 /**
  * 需要启动模块的算子单元测试
  *
- * @ClassName CalculatorKitEnvTest
+ * @author zack
- * @Author zack
+ * @date 2019/8/23
- * @Date 2019/8/23
+ * @version 10.0
- * @Version 10.0
  */
 public class CalculatorKitEnvTest extends Prepare {
     @Test

src/test/java/com/fanruan/api/cal/CalculatorKitTest.java

@@ -9,10 +9,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @ClassName CalculatorKitTest
+ * @author zack
- * @Author zack
+ * @date 2019/8/23
- * @Date 2019/8/23
+ * @version 10.0
- * @Version 10.0
  */
 public class CalculatorKitTest {
     @Test

src/test/java/com/fanruan/api/function/FunctionKitTest.java

@@ -10,10 +10,9 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
 /**
- * @ClassName FunctionKitTest
+ * @author zack
- * @Author zack
+ * @date 2019/8/23
- * @Date 2019/8/23
+ * @version 10.0
- * @Version 10.0
  */
 public class FunctionKitTest extends Prepare {
 

src/test/java/com/fanruan/api/util/ArrayKitTest.java

@@ -1,6 +1,5 @@
 package com.fanruan.api.util;
-import com.fr.general.Inter;
+
-import com.fr.stable.ArrayUtils;
 import com.fanruan.api.Prepare;
 import org.junit.Assert;
 import org.junit.Test;
@@ -8,31 +7,31 @@ import org.junit.Test;
 public class ArrayKitTest extends Prepare {
     @Test
     public void isEmpty() throws Exception{
-        Object emptyArray []=new Object[0];
+        Object[] emptyArray = new Object[0];
-        Object notEmptyArray [] = new Object[1];
+        Object[] notEmptyArray = new Object[1];
-        Assert.assertEquals(ArrayKit.isEmpty(emptyArray), true);
+        Assert.assertTrue(ArrayKit.isEmpty(emptyArray));
-        Assert.assertEquals(ArrayKit.isEmpty(notEmptyArray), false);
+        Assert.assertFalse(ArrayKit.isEmpty(notEmptyArray));
 
     }
 
     @Test
     public void remove() throws Exception{
-        Integer intTestArray [] = {1,2,3,4};
+        Integer[] intTestArray = {1, 2, 3, 4};
-        Integer intTestResult [] = {1,2,3};
+        Integer[] intTestResult = {1, 2, 3};
-        Boolean booleanTestArray [] = {true, true, true, false};
+        Boolean[] booleanTestArray = {true, true, true, false};
-        Boolean booleanTestResult [] = {true, true, true};
+        Boolean[] booleanTestResult = {true, true, true};
-        Byte byteTestArray [] = {100,101,102,103};
+        Byte[] byteTestArray = {100, 101, 102, 103};
-        Byte byteTestResult [] = {100,101,102};
+        Byte[] byteTestResult = {100, 101, 102};
-        Character charTestArray [] = {'a','b','c','d'};
+        Character[] charTestArray = {'a', 'b', 'c', 'd'};
-        Character charTestResult [] = {'a','b','c'};
+        Character[] charTestResult = {'a', 'b', 'c'};
-        Double doubleTestArray [] = {1.1,2.2,3.3,4.4};
+        Double[] doubleTestArray = {1.1, 2.2, 3.3, 4.4};
-        Double doubleTestResult [] = {1.1,2.2,3.3};
+        Double[] doubleTestResult = {1.1, 2.2, 3.3};
-        Float floatTestArray [] = {1.1f,2.2f,3.3f,4.4f};
+        Float[] floatTestArray = {1.1f, 2.2f, 3.3f, 4.4f};
-        Float floatTestResult [] = {1.1f,2.2f,3.3f};
+        Float[] floatTestResult = {1.1f, 2.2f, 3.3f};
-        Long longTestArray [] = {1L,2L,3L,4L};
+        Long[] longTestArray = {1L, 2L, 3L, 4L};
-        Long longTestResult [] = {1L,2L,3L};
+        Long[] longTestResult = {1L, 2L, 3L};
-        Short shortTestArray [] = {1,2,3,4};
+        Short[] shortTestArray = {1, 2, 3, 4};
-        Short shortTestResult [] = {1,2,3};
+        Short[] shortTestResult = {1, 2, 3};
         Assert.assertEquals(ArrayKit.remove(intTestArray, 3), intTestResult);
         Assert.assertEquals(ArrayKit.remove(booleanTestArray, 3), booleanTestResult);
         Assert.assertEquals(ArrayKit.remove(byteTestArray, 3), byteTestResult);
@@ -45,22 +44,22 @@ public class ArrayKitTest extends Prepare {
 
     @Test
     public void add() throws Exception{
-        Integer intTestArray [] = {1,2,3,4};
+        Integer[] intTestArray = {1, 2, 3, 4};
-        Integer intTestResult [] = {1,2,3,4,5};
+        Integer[] intTestResult = {1, 2, 3, 4, 5};
-        Boolean booleanTestArray [] = {true, true, true, false};
+        Boolean[] booleanTestArray = {true, true, true, false};
-        Boolean booleanTestResult [] = {true, true, true, false, true};
+        Boolean[] booleanTestResult = {true, true, true, false, true};
-        Byte byteTestArray [] = {1};
+        Byte[] byteTestArray = {1};
-        Byte byteTestResult [] = {1,0};
+        Byte[] byteTestResult = {1, 0};
-        Character charTestArray [] = {'a','b','c','d'};
+        Character[] charTestArray = {'a', 'b', 'c', 'd'};
-        Character charTestResult [] = {'a','b','c','d','e'};
+        Character[] charTestResult = {'a', 'b', 'c', 'd', 'e'};
-        Double doubleTestArray [] = {1.1,2.2,3.3,4.4};
+        Double[] doubleTestArray = {1.1, 2.2, 3.3, 4.4};
-        Double doubleTestResult [] = {1.1,2.2,3.3,4.4,5.5};
+        Double[] doubleTestResult = {1.1, 2.2, 3.3, 4.4, 5.5};
-        Float floatTestArray [] = {1.1f,2.2f,3.3f,4.4f};
+        Float[] floatTestArray = {1.1f, 2.2f, 3.3f, 4.4f};
-        Float floatTestResult [] = {1.1f,2.2f,3.3f,4.4f,5.5f};
+        Float[] floatTestResult = {1.1f, 2.2f, 3.3f, 4.4f, 5.5f};
-        Long longTestArray [] = {1L,2L,3L,4L};
+        Long[] longTestArray = {1L, 2L, 3L, 4L};
-        Long longTestResult [] = {1L,2L,3L,4L,5L};
+        Long[] longTestResult = {1L, 2L, 3L, 4L, 5L};
-        Short shortTestArray [] = {1,2,3,4};
+        Short[] shortTestArray = {1, 2, 3, 4};
-        Short shortTestResult [] = {1,2,3,4,5};
+        Short[] shortTestResult = {1, 2, 3, 4, 5};
         Assert.assertEquals(ArrayKit.add(intTestArray, 5), intTestResult);
         Assert.assertEquals(ArrayKit.add(booleanTestArray, true), booleanTestResult);
         Assert.assertEquals(ArrayKit.add(byteTestArray, new Byte("0")), byteTestResult);
@@ -73,22 +72,22 @@ public class ArrayKitTest extends Prepare {
 
     @Test
     public void addAll() throws Exception{
-        Integer intTestArray [] = {1,2,3,4};
+        Integer[] intTestArray = {1, 2, 3, 4};
-        Integer intTestResult [] = {1,2,3,4,5,6};
+        Integer[] intTestResult = {1, 2, 3, 4, 5, 6};
-        Boolean booleanTestArray [] = {true, true, true, false};
+        Boolean[] booleanTestArray = {true, true, true, false};
-        Boolean booleanTestResult [] = {true, true, true, false, true,true};
+        Boolean[] booleanTestResult = {true, true, true, false, true, true};
-        Byte byteTestArray [] = {1};
+        Byte[] byteTestArray = {1};
-        Byte byteTestResult [] = {1,0,0};
+        Byte[] byteTestResult = {1, 0, 0};
-        Character charTestArray [] = {'a','b','c','d'};
+        Character[] charTestArray = {'a', 'b', 'c', 'd'};
-        Character charTestResult [] = {'a','b','c','d','e','f'};
+        Character[] charTestResult = {'a', 'b', 'c', 'd', 'e', 'f'};
-        Double doubleTestArray [] = {1.1,2.2,3.3,4.4};
+        Double[] doubleTestArray = {1.1, 2.2, 3.3, 4.4};
-        Double doubleTestResult [] = {1.1,2.2,3.3,4.4,5.5,6.6};
+        Double[] doubleTestResult = {1.1, 2.2, 3.3, 4.4, 5.5, 6.6};
-        Float floatTestArray [] = {1.1f,2.2f,3.3f,4.4f};
+        Float[] floatTestArray = {1.1f, 2.2f, 3.3f, 4.4f};
-        Float floatTestResult [] = {1.1f,2.2f,3.3f,4.4f,5.5f,6.6f};
+        Float[] floatTestResult = {1.1f, 2.2f, 3.3f, 4.4f, 5.5f, 6.6f};
-        Long longTestArray [] = {1L,2L,3L,4L};
+        Long[] longTestArray = {1L, 2L, 3L, 4L};
-        Long longTestResult [] = {1L,2L,3L,4L,5L,6L};
+        Long[] longTestResult = {1L, 2L, 3L, 4L, 5L, 6L};
-        Short shortTestArray [] = {1,2,3,4};
+        Short[] shortTestArray = {1, 2, 3, 4};
-        Short shortTestResult [] = {1,2,3,4,5,6};
+        Short[] shortTestResult = {1, 2, 3, 4, 5, 6};
         Assert.assertEquals(ArrayKit.addAll(intTestArray, 5,6), intTestResult);
         Assert.assertEquals(ArrayKit.addAll(booleanTestArray, true, true), booleanTestResult);
         Assert.assertEquals(ArrayKit.addAll(byteTestArray, new Byte("0"), new Byte("0")), byteTestResult);

src/test/java/com/fanruan/api/util/AssistKitTest.java

@@ -0,0 +1,68 @@
+package com.fanruan.api.util;
+
+import com.fr.event.Null;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.Objects;
+
+import static org.junit.Assert.*;
+
+public class AssistKitTest {
+
+    @Test
+    public void equals1() {
+        double a = 1.1;
+        double b = 1.1;
+        double c = 1.11;
+        Assert.assertTrue(AssistKit.equals(a, b));
+        Assert.assertFalse(AssistKit.equals(b, c));
+    }
+
+    @Test
+    public void equals2() {
+        float a = 1.1f;
+        float b = 1.1f;
+        float c = 1.111f;
+        Assert.assertTrue(AssistKit.equals(a, b));
+        Assert.assertFalse(AssistKit.equals(b, c));
+    }
+
+    @Test
+    public void equals3() {
+        Object a = 126;
+        Object b = 126;
+        Object c = new Integer(256);
+        Object d = new Integer(256);
+        Object e = 111.1f;
+        Assert.assertTrue(AssistKit.equals(a, b));
+        Assert.assertTrue(AssistKit.equals(null, null));
+        Assert.assertFalse(AssistKit.equals(null, a));
+        Assert.assertFalse(AssistKit.equals(a,e));
+
+    }
+
+    @Test
+    public void compare() {
+        Assert.assertEquals(0, AssistKit.compare(1, 1));
+        Assert.assertEquals(1, AssistKit.compare(2, 1));
+        Assert.assertEquals(-1, AssistKit.compare(1, 2));
+    }
+
+    @Test
+    public void compare1() {
+        Assert.assertEquals(0, AssistKit.compare(1l, 1l));
+        Assert.assertEquals(1, AssistKit.compare(2l, 1l));
+        Assert.assertEquals(-1, AssistKit.compare(1l, 2l));
+    }
+
+    @Test
+    public void hashCode1() {
+        String s = "hello";
+        Object[] a = new Object[]{s};
+        Assert.assertEquals(Arrays.hashCode(a), AssistKit.hashCode(s));
+        Assert.assertEquals(0, AssistKit.hashCode(null));
+    }
+}

src/test/java/com/fanruan/api/util/GeneralKitTest.java

@@ -2,6 +2,8 @@ package com.fanruan.api.util;
 
 import com.fanruan.api.Prepare;
 import com.fr.third.guava.base.Objects;
+import com.fr.general.GeneralUtils;
+import com.fr.third.javax.persistence.criteria.CriteriaBuilder;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -33,5 +35,25 @@ public class GeneralKitTest extends Prepare {
         class A{};
         Object a = new A();
         Assert.assertEquals(GeneralKit.hashCode(a), Objects.hashCode(a));
+    public void objectToString() {
+        Integer s = new Integer(1);
+        Assert.assertEquals(GeneralKit.objectToString(s),"1");
+    }
+
+    @Test
+    public void readBuildNO() {
+        Assert.assertEquals(GeneralKit.readBuildNO(), GeneralUtils.readBuildNO());
+    }
+
+
+    @Test
+    public void compare() {
+        Integer s = new Integer(1);
+        Integer s3 = new Integer(1);
+        Integer s1 = new Integer(2);
+        Integer s2 = new Integer(0);
+        Assert.assertEquals(GeneralKit.compare(s,s1),-1);
+        Assert.assertEquals(GeneralKit.compare(s,s3),0);
+        Assert.assertEquals(GeneralKit.compare(s,s2),1);
     }
 }

src/test/java/com/fanruan/api/util/ReflectKitTest.java

@@ -0,0 +1,14 @@
+package com.fanruan.api.util;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class ReflectKitTest {
+
+    @Test
+    public void classInstanceOf() {
+        assertEquals(ReflectKit.classInstanceOf(Integer.class,Object.class),true);
+        assertEquals(ReflectKit.classInstanceOf(Object.class,Integer.class),false);
+    }
+}

src/test/java/com/fanruan/api/util/RenderKitTest.java

@@ -0,0 +1,28 @@
+package com.fanruan.api.util;
+
+import com.fanruan.api.Prepare;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author richie
+ * @version 10.0
+ * Created by richie on 2019-08-27
+ */
+public class RenderKitTest extends Prepare {
+
+    @Test
+    public void renderParameter4Tpl() throws Exception {
+        Map<String, Object> map = new HashMap<>();
+        map.put("age", 20);
+        map.put("name", "Alex");
+        map.put("salary", 100);
+        String text = "${name} is ${age} years old, he earned ${salary} dollars per month.";
+        Assert.assertEquals("Alex is 20 years old, he earned 100 dollars per month.", RenderKit.renderParameter4Tpl(text, map));
+    }
+}

src/test/java/com/fanruan/api/util/StringKitTest.java

@@ -14,18 +14,32 @@ public class StringKitTest {
 
     @Test
     public void isEmpty() {
+        assertEquals(StringKit.isEmpty(""),true);
+        assertEquals(StringKit.isEmpty("asd"),false);
     }
 
     @Test
     public void isNotEmpty() {
+        assertEquals(StringKit.isNotEmpty("asd"),true);
+        assertEquals(StringKit.isNotEmpty(""),false);
     }
 
     @Test
     public void isBlank() {
+        assertEquals(StringKit.isNotBlank(null),false);
+        assertEquals(StringKit.isNotBlank(""),false);
+        assertEquals(StringKit.isNotBlank(" "),false);
+        assertEquals(StringKit.isNotBlank("bob"),true);
+        assertEquals(StringKit.isNotBlank("  bob  "),true);
     }
 
     @Test
     public void isNotBlank() {
+        assertEquals(StringKit.isBlank(null),true);
+        assertEquals(StringKit.isBlank(""),true);
+        assertEquals(StringKit.isBlank(" "),true);
+        assertEquals(StringKit.isBlank("bob"),false);
+        assertEquals(StringKit.isBlank("  bob  "),false);
     }
     @Test
     public void trim(){
@@ -36,4 +50,132 @@ public class StringKitTest {
         Assert.assertEquals(StringKit.trim(stringWithoutBlank), "abc");
         Assert.assertEquals(StringKit.trim(blankString), "");
     }
+
+    @Test
+    public void alwaysNotNull() {
+        assertEquals(StringKit.alwaysNotNull(null),"");
+        assertEquals(StringKit.alwaysNotNull(""),"");
+        assertEquals(StringKit.alwaysNotNull("asd"),"asd");
+    }
+
+    @Test
+    public void cutStringEndWith() {
+        assertEquals(StringKit.cutStringEndWith("bob is","is"), "bob ");
+        assertEquals(StringKit.cutStringEndWith("","is"), "");
+    }
+
+    @Test
+    public void cutStringStartWith() {
+        assertEquals(StringKit.cutStringStartWith("bob is","bob "), "is");
+        assertEquals(StringKit.cutStringStartWith("","is"), "");
+    }
+
+    @Test
+    public void trimToNull() {
+        assertEquals(StringKit.trimToNull("    "),null);
+        assertEquals(StringKit.trimToNull(" s  "),"s");
+    }
+
+    @Test
+    public void perfectStart() {
+        assertEquals(StringKit.perfectStart("bobob","bob"),"bobob");
+        assertEquals(StringKit.perfectStart("sbobob","bob"),"bobsbobob");
+    }
+
+    @Test
+    public void perfectEnd() {
+        assertEquals(StringKit.perfectEnd("bobob","bob"),"bobob");
+        assertEquals(StringKit.perfectEnd("bobobs","bob"),"bobobsbob");
+    }
+
+    @Test
+    public void perfectSurround() {
+        assertEquals(StringKit.perfectSurround("bobob","bob"),"bobob");
+        assertEquals(StringKit.perfectSurround("sbobobs","bob"),"bobsbobobsbob");
+    }
+
+    @Test
+    public void getLength() {
+        assertEquals(StringKit.getLength("asd"),3);
+        assertEquals(StringKit.getLength(""),0);
+        assertEquals(StringKit.getLength(null),0);
+    }
+
+    @Test
+    public void equalsIgnore() {
+        assertEquals(StringKit.equalsIgnore("asd","asd","qwewqe"),true);
+        assertEquals(StringKit.equalsIgnore("asd","as","d"),true);
+        assertEquals(StringKit.equalsIgnore("asd","asdd","d"),false);
+    }
+
+    @Test
+    public void join() {
+        String[] s = new String[3];
+        String[] s1 = new String[0];
+        s[0]= new String("qqq");
+        s[1]= new String("www");
+        s[2]= new String("eee");
+        assertEquals(StringKit.join("asd",s),"qqqasdwwwasdeee");
+        assertEquals(StringKit.join("",s),"qqqwwweee");
+        assertEquals(StringKit.join("asd",null),null);
+        assertEquals(StringKit.join("asd",s1),"");
+    }
+
+
+    @Test
+    public void parseVersion() {
+        assertEquals(StringKit.parseVersion("BCD123"),"123123");
+    }
+
+    @Test
+    public void isArrayType() {
+        assertEquals(StringKit.isArrayType("[[]]"),true);
+        assertEquals(StringKit.isArrayType("[["),false);
+    }
+
+    @Test
+    public void stringToArray() {
+        String[][] s = new String[1][3];
+        s[0][0] = new String("a");
+        s[0][1] = new String("b");
+        s[0][2] = new String("c");
+        assertEquals(StringKit.stringToArray("[[a,b,c]]"),s);
+    }
+
+    @Test
+    public void subStringByByteLength() {
+        try {
+            assertEquals(StringKit.subStringByByteLength("asd", "UTF-8", 1), "a");
+            assertEquals(StringKit.subStringByByteLength("  ", "UTF-8", 1), "");
+            assertEquals(StringKit.subStringByByteLength("asd", "UTF-8", 0), "");
+        }catch (Exception e){
+
+        }
+    }
+
+    @Test
+    public void equals() {
+        String s = new String("asd");
+        String s1 = new String("asd");
+        String s2 = new String("asds");
+        assertEquals(StringKit.equals(s, s1), true);
+        assertEquals(StringKit.equals(s, s2), false);
+        assertEquals(StringKit.equals(null, null), true);
+    }
+
+    @Test
+    public void equalsIgnoreCase() {
+        String s = new String("Asd");
+        String s1 = new String("asd");
+        String s2 = new String("asds");
+        assertEquals(StringKit.equalsIgnoreCase(s, s1), true);
+        assertEquals(StringKit.equalsIgnoreCase(s, s2), false);
+        assertEquals(StringKit.equalsIgnoreCase(null, null), true);
+    }
+
+    @Test
+    public void rightPad() {
+        assertEquals(StringKit.rightPad("asd",5), "asd  ");
+        assertEquals(StringKit.rightPad("asd",-1), "asd");
+    }
 }

src/test/java/com/fanruan/api/util/TransmissionKitTest.java

@@ -8,10 +8,9 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 /**
- * @ClassName TransmissionKitTest
+ * @author zack
- * @Author zack
+ * @date 2019/8/23
- * @Date 2019/8/23
+ * @version 10.0
- * @Version 10.0
  */
 public class TransmissionKitTest {
     @Test