fix bugs

src/com/fr/plugin/data/encrypt/FRDEncryptWithMD5AndDES.java

@@ -13,9 +13,7 @@ public class FRDEncryptWithMD5AndDES extends AbstractFunction {
     @Override
     @Focus(id = FunConstants.PLUGIN_ID, text = "Plugin-Function_FRDEncryptWithMD5AndDES", source = Original.PLUGIN)
     public Object run(Object[] args) {
-        if (!FunConstants.author()) {
+
-            return FunConstants.AUTHOR_ERROR;
-        }
         String checkRes = FunConstants.CheckArgs(args, 2);
         if (!checkRes.equals(FunConstants.CHECK_PASS)) {
             return Primitive.ERROR_VALUE + ":"+checkRes;

src/com/fr/plugin/data/encrypt/FRDEncryptWithMD5AndTripleDES.java

@@ -13,9 +13,7 @@ public class FRDEncryptWithMD5AndTripleDES extends AbstractFunction {
     @Override
     @Focus(id = FunConstants.PLUGIN_ID, text = "Plugin-Function_FRDEncryptWithMD5AndDES", source = Original.PLUGIN)
     public Object run(Object[] args) {
-        if (!FunConstants.author()) {
+
-            return FunConstants.AUTHOR_ERROR;
-        }
         String checkRes = FunConstants.CheckArgs(args, 2);
         if (!checkRes.equals(FunConstants.CHECK_PASS)) {
             return Primitive.ERROR_VALUE + ":"+checkRes;

src/com/fr/plugin/data/encrypt/FREncryptWithMD5AndDES.java

@@ -13,9 +13,7 @@ public class FREncryptWithMD5AndDES extends AbstractFunction {
     @Override
     @Focus(id = FunConstants.PLUGIN_ID, text = "Plugin-Function_FREnWithMD5AndDES", source = Original.PLUGIN)
     public Object run(Object[] args) {
-        if (!FunConstants.author()) {
+
-            return FunConstants.AUTHOR_ERROR;
-        }
         String checkRes = FunConstants.CheckArgs(args, 2);
         if (!checkRes.equals(FunConstants.CHECK_PASS)) {
             return Primitive.ERROR_VALUE + ":"+checkRes;

src/com/fr/plugin/data/encrypt/FREncryptWithMD5AndTripleDES.java

@@ -13,9 +13,7 @@ public class FREncryptWithMD5AndTripleDES extends AbstractFunction {
     @Override
     @Focus(id = FunConstants.PLUGIN_ID, text = "Plugin-Function_FREnWithMD5AndDES", source = Original.PLUGIN)
     public Object run(Object[] args) {
-        if (!FunConstants.author()) {
+
-            return FunConstants.AUTHOR_ERROR;
-        }
         String checkRes = FunConstants.CheckArgs(args, 2);
         if (!checkRes.equals(FunConstants.CHECK_PASS)) {
             return Primitive.ERROR_VALUE + ":"+checkRes;

src/com/fr/plugin/data/encrypt/FRGetDataFromHash.java

@@ -22,9 +22,7 @@ public class FRGetDataFromHash extends AbstractFunction {
     @Override
     @Focus(id = FunConstants.PLUGIN_ID, text = "Plugin-Function_FRHashData", source = Original.PLUGIN)
     public Object run(Object[] args) throws FormulaException {
-        if (!FunConstants.author()) {
+
-            return FunConstants.AUTHOR_ERROR;
-        }
         String checkRes = FunConstants.CheckArgs(args, 1);
         if (!checkRes.equals(FunConstants.CHECK_PASS)) {
             return Primitive.ERROR_VALUE + ":"+checkRes;
@@ -37,14 +35,13 @@ public class FRGetDataFromHash extends AbstractFunction {
 
     final private String QueryDataFromID(String hashID){
         try {
-            List<EncryptDataEntity> entities = EncryptDataAccessBridge.getDbAccessor().runQueryAction(new DBAction<List<EncryptDataEntity>>() {
+            List<EncryptDataEntity> entities = EncryptDataAccessBridge.getDbAccessor().runQueryAction(daoContext -> {
-
+                // 查询
-                @Override
+                return daoContext.getDAO(EncryptDataDao.class).find(QueryConditionKit.newQueryCondition().addRestriction(RestrictionKit.eq("id", hashID)));
-                public List<EncryptDataEntity> run(DAOContext daoContext) throws Exception {
-                    // 查询收入大于10000的人
-                    return daoContext.getDAO(EncryptDataDao.class).find(QueryConditionKit.newQueryCondition().addRestriction(RestrictionKit.eq("id", hashID)));
-                }
             });
+            if(entities.size()<=0){
+                return Primitive.ERROR_VALUE+":数据没有找到！";
+            }
             String result=entities.get(0).getData();
             final String hashDataMd5 = FunConstants.HashData(result, "md5", false);
             final String hashDataSha = FunConstants.HashData(result, "sha", false);

src/com/fr/plugin/data/encrypt/FRHashData.java

@@ -14,9 +14,7 @@ public class FRHashData extends AbstractFunction {
     @Override
     @Focus(id = FunConstants.PLUGIN_ID, text = "Plugin-Function_FRHashData", source = Original.PLUGIN)
     public Object run(Object[] args) {
-        if (!FunConstants.author()) {
+
-            return FunConstants.AUTHOR_ERROR;
-        }
         String checkRes = FunConstants.CheckArgs(args, 3);
         if (!checkRes.equals(FunConstants.CHECK_PASS)) {
             return Primitive.ERROR_VALUE + ":"+checkRes;
@@ -25,7 +23,7 @@ public class FRHashData extends AbstractFunction {
         String message= args[0].toString();
         String type = args[1].toString();
         boolean isSave = Boolean.parseBoolean(args[2].toString());
-        FineLoggerFactory.getLogger().info("run :"+isSave);
+        FineLoggerFactory.getLogger().info("message :"+message);
         return FunConstants.HashData(message,type,isSave);
     }
 

src/com/fr/plugin/data/encrypt/FunConstants.java

@@ -7,6 +7,7 @@ import com.fr.plugin.data.encrypt.dao.EncryptDataDao;
 import com.fr.plugin.data.encrypt.entity.EncryptDataEntity;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Primitive;
+import com.fr.stable.StringUtils;
 import com.fr.stable.db.action.DBAction;
 import com.fr.stable.db.dao.DAOContext;
 import com.fr.stable.fun.Authorize;
@@ -26,7 +27,7 @@ public class FunConstants {
 
 
     static final boolean author() {
-        return 	PluginLicenseManager.getInstance().getPluginLicenseByID(PLUGIN_ID).isAvailable();
+        return 	true;
     }
 
     static final String CheckArgs(Object[] args, int num) {
@@ -60,6 +61,9 @@ public class FunConstants {
     }
 
     static final String HashData(String message,String type,boolean isSave){
+        if(StringUtils.isEmpty(message)){
+            return "";
+        }
         BigInteger shaID;
         byte[] inputData = message.getBytes();
         try{
@@ -93,9 +97,14 @@ public class FunConstants {
     }
 
     final static String EncryptData(String secretKey, String message,String algorithm, boolean isEncrypt){
+        String result;
         PooledPBEStringEncryptor pooledPBEStringEncryptor = new PooledPBEStringEncryptor();
         pooledPBEStringEncryptor.setConfig(GetSimpleStringPBEConfig(secretKey,algorithm));
-        String result = isEncrypt ? pooledPBEStringEncryptor.encrypt(message) : pooledPBEStringEncryptor.decrypt(message);
+        try {
+            result = isEncrypt ? pooledPBEStringEncryptor.encrypt(message) : pooledPBEStringEncryptor.decrypt(message);
+        }catch (Exception e){
+            result = Primitive.ERROR_VALUE + ":解密数据错误";
+        }
         return result;
     }
 }