Merge remote-tracking branch 'origin/master'

src/main/java/com/fanruan/api/design/ui/component/table/action/UITableEditAction.java

@@ -5,8 +5,8 @@ import java.awt.event.ActionEvent;
 public class UITableEditAction  extends com.fr.design.gui.itableeditorpane.UITableEditAction {
 
     @Override
-    public void checkEnabled() {
-    }
+    public void checkEnabled(){};
+
     @Override
     public void actionPerformed(ActionEvent e) {
 

src/main/java/com/fanruan/api/design/ui/component/table/model/UITableModelAdapter.java

@@ -20,6 +20,7 @@ public abstract class UITableModelAdapter<T> extends com.fr.design.gui.itableedi
         super(strings);
     }
 
+    @Override
     public abstract UITableEditAction[] createAction();
 
 

src/main/java/com/fanruan/api/security/SecurityKit.java

@@ -35,4 +35,13 @@ public class SecurityKit {
     public static String passwordDecode(String passwordText) {
         return CodeUtils.passwordDecode(passwordText);
     }
+
+    /**
+     * 给字符串加密
+     * @param passwordText 待加密的字符串
+     * @return 解加密的字符串
+     */
+    public static String passwordEncode(String passwordText) {
+        return CodeUtils.passwordEncode(passwordText);
+    }
 }

src/test/java/com/fanruan/api/security/SecurityKitTest.java

@@ -0,0 +1,18 @@
+package com.fanruan.api.security;
+
+import java.util.*;
+
+import com.fr.stable.CommonCodeUtils;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class SecurityKitTest {
+    @Test
+    public void passwordDecode(){
+        Assert.assertEquals(SecurityKit.passwordDecode("1234"), CommonCodeUtils.passwordDecode("1234"));
+    }
+    @Test
+    public void passwordEncode(){
+        Assert.assertEquals(SecurityKit.passwordEncode("1234"), CommonCodeUtils.passwordEncode("1234"));
+    }
+}