diff --git a/src/main/java/com/fanruan/api/cal/ParameterKit.java b/src/main/java/com/fanruan/api/cal/ParameterKit.java index a8db2f1..5750b54 100644 --- a/src/main/java/com/fanruan/api/cal/ParameterKit.java +++ b/src/main/java/com/fanruan/api/cal/ParameterKit.java @@ -98,6 +98,14 @@ public class ParameterKit { public static @NotNull ParameterMapNameSpace createParameterMapNameSpace(ParameterProvider[] ps) { return ParameterMapNameSpace.create(ps); } - - + /** + * 获得新的参数集合 + * + * @param paramTexts sql语句 + * @param ps 旧的参数集合 + * @return 新参数集合 + */ + public static ParameterProvider[] analyzeAndUnionSameParameters(String[] paramTexts, Parameter[] ps){ + return ParameterHelper.analyzeAndUnionSameParameters(paramTexts, ps); + } } diff --git a/src/main/java/com/fanruan/api/design/ui/toolbar/ToolBarDef.java b/src/main/java/com/fanruan/api/design/ui/toolbar/ToolBarDef.java index 8de1198..cfbf3c8 100644 --- a/src/main/java/com/fanruan/api/design/ui/toolbar/ToolBarDef.java +++ b/src/main/java/com/fanruan/api/design/ui/toolbar/ToolBarDef.java @@ -1,5 +1,6 @@ package com.fanruan.api.design.ui.toolbar; + import com.fanruan.api.design.ui.component.UIToolbar; import com.fr.design.gui.itoolbar.UIToolBarUI; @@ -32,5 +33,4 @@ public class ToolBarDef extends com.fr.design.menu.ToolBarDef { toolbar.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0)); return toolbar; } - } diff --git a/src/main/java/com/fanruan/api/err/JSONException.java b/src/main/java/com/fanruan/api/err/JSONException.java new file mode 100644 index 0000000..1abb13a --- /dev/null +++ b/src/main/java/com/fanruan/api/err/JSONException.java @@ -0,0 +1,14 @@ +package com.fanruan.api.err; + +/** + * 用来定义和JSON相关的异常 + * */ +public class JSONException extends com.fr.json.JSONException{ + public JSONException(String message) { + super(message); + } + + public JSONException(Throwable error) { + super(error); + } +} diff --git a/src/main/java/com/fanruan/api/json/JSONKit.java b/src/main/java/com/fanruan/api/json/JSONKit.java new file mode 100644 index 0000000..86bdedf --- /dev/null +++ b/src/main/java/com/fanruan/api/json/JSONKit.java @@ -0,0 +1,21 @@ +package com.fanruan.api.json; +import com.fr.json.JSONObject; + +public class JSONKit { + /** + * 创建一个JSONObject对象 + * + * @return 一个JSONObject对象 + */ + public static JSONObject create() { + return new JSONObject(); + } + /** + * 创建一个JSONObject对象 + * @param text 用来创建对象时的字符串 + * @return 一个JSONObject对象 + */ + public static JSONObject create(String text) { + return new JSONObject(text); + } +} diff --git a/src/main/java/com/fanruan/api/security/SecurityKit.java b/src/main/java/com/fanruan/api/security/SecurityKit.java index 5a72db1..e6e903c 100644 --- a/src/main/java/com/fanruan/api/security/SecurityKit.java +++ b/src/main/java/com/fanruan/api/security/SecurityKit.java @@ -1,6 +1,7 @@ package com.fanruan.api.security; import com.fr.security.SecurityToolbox; +import com.fr.stable.CodeUtils; /** * @author richie @@ -25,4 +26,13 @@ public class SecurityKit { public static String decrypt(String cipherText) { return SecurityToolbox.decrypt(cipherText); } + /** + * 给字符串解密 + * @param passwordText 待解密的字符串 + * @return 解密后的字符串 + */ + @Deprecated + public static String passwordDecode(String passwordText) { + return CodeUtils.passwordDecode(passwordText); + } } diff --git a/src/main/java/com/fanruan/api/util/CodeKit.java b/src/main/java/com/fanruan/api/util/CodeKit.java new file mode 100644 index 0000000..b819eb4 --- /dev/null +++ b/src/main/java/com/fanruan/api/util/CodeKit.java @@ -0,0 +1,15 @@ +package com.fanruan.api.util; + +import com.fr.stable.CodeUtils; +import com.fr.stable.CommonCodeUtils; + +public class CodeKit { + /** + * 给字符串解密 + * @param passwordText 待解密的字符串 + * @return 解密后的字符串 + */ + public static String passwordDecode(String passwordText) { + return CodeUtils.passwordDecode(passwordText); + } +} diff --git a/src/main/java/com/fanruan/api/util/DateKit.java b/src/main/java/com/fanruan/api/util/DateKit.java new file mode 100644 index 0000000..072e6e0 --- /dev/null +++ b/src/main/java/com/fanruan/api/util/DateKit.java @@ -0,0 +1,18 @@ +package com.fanruan.api.util; + +import com.fr.general.DateUtils; + +import java.util.Date; + +public class DateKit { + /** + * 将字符串转化为日期 + * + * @param str 字符串 + * @param returnNull 转化失败的时候是否返回null + * @return 将字符串转化为相应的日期值 + */ + public static Date string2Date(String str, boolean returnNull) { + return DateUtils.string2Date(str, returnNull); + } +} diff --git a/src/main/java/com/fanruan/api/util/GeneralKit.java b/src/main/java/com/fanruan/api/util/GeneralKit.java index 14b5fc7..9e13593 100644 --- a/src/main/java/com/fanruan/api/util/GeneralKit.java +++ b/src/main/java/com/fanruan/api/util/GeneralKit.java @@ -3,7 +3,9 @@ package com.fanruan.api.util; import com.fr.base.FRContext; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralUtils; +import com.fr.stable.CommonUtils; import com.fr.third.guava.base.Objects; +import com.fr.stable.StableUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -73,6 +75,15 @@ public class GeneralKit { } /** + * 将一个数组中的元素按照给定的连接符连接成一个字符串 + * @param array 数组 + * @param se 连接符 + * @return 连接后的字符串 + */ + public static String join(Object[] array, String se) { + return StableUtils.join(array, se); + } + /* * 返回国际化区属 * @return 国际化后区域属性 */ diff --git a/src/test/java/com/fanruan/api/json/JSONKitTest.java b/src/test/java/com/fanruan/api/json/JSONKitTest.java new file mode 100644 index 0000000..32c4261 --- /dev/null +++ b/src/test/java/com/fanruan/api/json/JSONKitTest.java @@ -0,0 +1,15 @@ +package com.fanruan.api.json; +import com.fanruan.api.util.ArrayKit; +import com.fr.json.JSONObject; + +import org.junit.Assert; +import org.junit.Test; + +public class JSONKitTest { + @Test + public void create() throws Exception{ + Assert.assertEquals(JSONKit.create(), new JSONObject()); + Assert.assertEquals(JSONKit.create("{test:123}"), new JSONObject("{test:123}")); + + } +} diff --git a/src/test/java/com/fanruan/api/util/CodeKitTest.java b/src/test/java/com/fanruan/api/util/CodeKitTest.java new file mode 100644 index 0000000..10853e6 --- /dev/null +++ b/src/test/java/com/fanruan/api/util/CodeKitTest.java @@ -0,0 +1,12 @@ +package com.fanruan.api.util; + +import com.fr.stable.CommonCodeUtils; +import org.junit.Assert; +import org.junit.Test; + +public class CodeKitTest { + @Test + public void passwordDecode(String passwordText) { + Assert.assertEquals(CodeKit.passwordDecode(passwordText), 123); + } +} diff --git a/src/test/java/com/fanruan/api/util/DateKitTest.java b/src/test/java/com/fanruan/api/util/DateKitTest.java new file mode 100644 index 0000000..31ae43c --- /dev/null +++ b/src/test/java/com/fanruan/api/util/DateKitTest.java @@ -0,0 +1,18 @@ +package com.fanruan.api.util; + +import java.util.Date; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import org.junit.Assert; +import org.junit.Test; + +public class DateKitTest { + @Test + public void string2Date() throws Exception{ + DateFormat dateFormat2 = new SimpleDateFormat("yyyy-MM-dd"); + Date myDate = dateFormat2.parse("2019-02-20"); + Assert.assertEquals(DateKit.string2Date("2019-02-20", false), myDate); + Assert.assertEquals(DateKit.string2Date("abcd", false), new Date()); + Assert.assertEquals(DateKit.string2Date("abcd", true), null); + } +} diff --git a/src/test/java/com/fanruan/api/util/GeneralKitTest.java b/src/test/java/com/fanruan/api/util/GeneralKitTest.java index 975ae8d..c8057ec 100644 --- a/src/test/java/com/fanruan/api/util/GeneralKitTest.java +++ b/src/test/java/com/fanruan/api/util/GeneralKitTest.java @@ -42,6 +42,12 @@ public class GeneralKitTest extends Prepare { Assert.assertEquals(GeneralKit.compare(s,s2),1); } + @Test + public void join() { + Object obj[] = {1, 2, 3, 4}; + String result = "1-2-3-4"; + Assert.assertEquals(GeneralKit.join(obj, "-"), result); + } @Test public void getLocale() { Assert.assertEquals(GeneralKit.getLocale(), Locale.CHINA);