diff --git a/fr-plugin-DataEncryptor-1.0/fr-plugin-DataEncryptor-1.0.jar b/fr-plugin-DataEncryptor-1.0/fr-plugin-DataEncryptor-1.0.jar index ea32e04..a1993d0 100644 Binary files a/fr-plugin-DataEncryptor-1.0/fr-plugin-DataEncryptor-1.0.jar and b/fr-plugin-DataEncryptor-1.0/fr-plugin-DataEncryptor-1.0.jar differ diff --git a/fr-plugin-DataEncryptor-1.0/plugin.xml b/fr-plugin-DataEncryptor-1.0/plugin.xml index 0cd3750..1b7edd4 100644 --- a/fr-plugin-DataEncryptor-1.0/plugin.xml +++ b/fr-plugin-DataEncryptor-1.0/plugin.xml @@ -11,9 +11,9 @@ [2021-3-6]初始化插件。
]]> - - - + + + - + \ No newline at end of file diff --git a/install/fr-plugin-DataEncryptor-1.0.zip b/install/fr-plugin-DataEncryptor-1.0.zip index 572b41b..39f89ce 100644 Binary files a/install/fr-plugin-DataEncryptor-1.0.zip and b/install/fr-plugin-DataEncryptor-1.0.zip differ diff --git a/plugin.xml b/plugin.xml index 0cd3750..1b7edd4 100644 --- a/plugin.xml +++ b/plugin.xml @@ -11,9 +11,9 @@ [2021-3-6]初始化插件。
]]> - - - + + + - + \ No newline at end of file diff --git a/src/com/fr/plugin/baidu/encrypt/EncryptDataAccessBridge.java b/src/com/fr/plugin/data/encrypt/EncryptDataAccessBridge.java similarity index 88% rename from src/com/fr/plugin/baidu/encrypt/EncryptDataAccessBridge.java rename to src/com/fr/plugin/data/encrypt/EncryptDataAccessBridge.java index 743fcbe..8b72857 100644 --- a/src/com/fr/plugin/baidu/encrypt/EncryptDataAccessBridge.java +++ b/src/com/fr/plugin/data/encrypt/EncryptDataAccessBridge.java @@ -1,10 +1,10 @@ -package com.fr.plugin.baidu.encrypt; +package com.fr.plugin.data.encrypt; import com.fr.db.fun.impl.AbstractDBAccessProvider; import com.fr.intelli.record.Focus; import com.fr.intelli.record.Original; -import com.fr.plugin.baidu.encrypt.dao.EncryptDataDao; -import com.fr.plugin.baidu.encrypt.entity.EncryptDataEntity; +import com.fr.plugin.data.encrypt.dao.EncryptDataDao; +import com.fr.plugin.data.encrypt.entity.EncryptDataEntity; import com.fr.record.analyzer.EnableMetrics; import com.fr.stable.db.accessor.DBAccessor; import com.fr.stable.db.dao.BaseDAO; diff --git a/src/com/fr/plugin/baidu/encrypt/FRDEncryptWithMD5AndDES.java b/src/com/fr/plugin/data/encrypt/FRDEncryptWithMD5AndDES.java similarity index 96% rename from src/com/fr/plugin/baidu/encrypt/FRDEncryptWithMD5AndDES.java rename to src/com/fr/plugin/data/encrypt/FRDEncryptWithMD5AndDES.java index 7b223f8..4ca8695 100644 --- a/src/com/fr/plugin/baidu/encrypt/FRDEncryptWithMD5AndDES.java +++ b/src/com/fr/plugin/data/encrypt/FRDEncryptWithMD5AndDES.java @@ -1,4 +1,4 @@ -package com.fr.plugin.baidu.encrypt; +package com.fr.plugin.data.encrypt; import com.fr.intelli.record.Focus; import com.fr.intelli.record.Original; diff --git a/src/com/fr/plugin/baidu/encrypt/FRDEncryptWithMD5AndTripleDES.java b/src/com/fr/plugin/data/encrypt/FRDEncryptWithMD5AndTripleDES.java similarity index 96% rename from src/com/fr/plugin/baidu/encrypt/FRDEncryptWithMD5AndTripleDES.java rename to src/com/fr/plugin/data/encrypt/FRDEncryptWithMD5AndTripleDES.java index 0baa3aa..afa194a 100644 --- a/src/com/fr/plugin/baidu/encrypt/FRDEncryptWithMD5AndTripleDES.java +++ b/src/com/fr/plugin/data/encrypt/FRDEncryptWithMD5AndTripleDES.java @@ -1,4 +1,4 @@ -package com.fr.plugin.baidu.encrypt; +package com.fr.plugin.data.encrypt; import com.fr.intelli.record.Focus; import com.fr.intelli.record.Original; diff --git a/src/com/fr/plugin/baidu/encrypt/FREncryptWithMD5AndDES.java b/src/com/fr/plugin/data/encrypt/FREncryptWithMD5AndDES.java similarity index 96% rename from src/com/fr/plugin/baidu/encrypt/FREncryptWithMD5AndDES.java rename to src/com/fr/plugin/data/encrypt/FREncryptWithMD5AndDES.java index a0c131f..b387b81 100644 --- a/src/com/fr/plugin/baidu/encrypt/FREncryptWithMD5AndDES.java +++ b/src/com/fr/plugin/data/encrypt/FREncryptWithMD5AndDES.java @@ -1,4 +1,4 @@ -package com.fr.plugin.baidu.encrypt; +package com.fr.plugin.data.encrypt; import com.fr.intelli.record.Focus; import com.fr.intelli.record.Original; diff --git a/src/com/fr/plugin/baidu/encrypt/FREncryptWithMD5AndTripleDES.java b/src/com/fr/plugin/data/encrypt/FREncryptWithMD5AndTripleDES.java similarity index 96% rename from src/com/fr/plugin/baidu/encrypt/FREncryptWithMD5AndTripleDES.java rename to src/com/fr/plugin/data/encrypt/FREncryptWithMD5AndTripleDES.java index 5a54841..8d98f7c 100644 --- a/src/com/fr/plugin/baidu/encrypt/FREncryptWithMD5AndTripleDES.java +++ b/src/com/fr/plugin/data/encrypt/FREncryptWithMD5AndTripleDES.java @@ -1,4 +1,4 @@ -package com.fr.plugin.baidu.encrypt; +package com.fr.plugin.data.encrypt; import com.fr.intelli.record.Focus; import com.fr.intelli.record.Original; diff --git a/src/com/fr/plugin/baidu/encrypt/FREncryptorFunction.java b/src/com/fr/plugin/data/encrypt/FREncryptorFunction.java similarity index 76% rename from src/com/fr/plugin/baidu/encrypt/FREncryptorFunction.java rename to src/com/fr/plugin/data/encrypt/FREncryptorFunction.java index dc1b820..4b84149 100644 --- a/src/com/fr/plugin/baidu/encrypt/FREncryptorFunction.java +++ b/src/com/fr/plugin/data/encrypt/FREncryptorFunction.java @@ -1,4 +1,4 @@ -package com.fr.plugin.baidu.encrypt; +package com.fr.plugin.data.encrypt; import com.fr.stable.fun.impl.AbstractFunctionDefContainer; import com.fr.stable.script.FunctionDef; @@ -7,7 +7,7 @@ public class FREncryptorFunction extends AbstractFunctionDefContainer { @Override public FunctionDef[] getFunctionDefs() { return new FunctionDef[]{ - new FunctionDef("FRHashData", "FRHashData(varchar1,varchar2,logical3)：生成数据散列码。\n参数说明：\nvarchar1：源数据文本或单元格，如“中国”，A1。\nvarchar2：散列类型，md5或sha。\nlogical3：是否存储数据，true或false，如果存储数据，可以用FRGetDataFromHash函数通过散列值获取数据。\n示例：FRHashData(\"asddfds\",\"SHA\",true)", FRHashData.class.getName()), + new FunctionDef("FRHashData", "FRHashData(varchar1,varchar2,logical3)：生成数据散列码，存存储妻finedb数据库中的FINE_PLUGIN_ENCRYPT_DATA表中以便FRGetDataFromHash函数引用。\n参数说明：\nvarchar1：源数据文本或单元格，如“中国”，A1。\nvarchar2：散列类型，md5或sha。\nlogical3：是否存储数据，true或false，如果存储数据，可以用FRGetDataFromHash函数通过散列值获取数据。\n示例：FRHashData(\"asddfds\",\"SHA\",true)。结果为返回\"asddfds\"用sha加密后的hash值，并储存到finedb数据库中的FINE_PLUGIN_ENCRYPT_DATA表中。", FRHashData.class.getName()), new FunctionDef("FRGetDataFromHash", "FRGetDataFromHash(varchar1)：数据散列码获得数据，如果数据被非法篡改，则返回错误信息。\n参数说明：\nvarchar1：数据散列码文本。\n示例：FRGetDataFromHash(\"dhstkd7v4q7s7qnes5rar4mjp\")", FRGetDataFromHash.class.getName()), new FunctionDef("FREncryptWithMD5AndDES", "FREncryptWithMD5AndDES(varchar1,varchar2)：用MD5AndDES算法加密数据。\n参数说明：\nvarchar1：加密密钥。\nvarchar2：加密数据。\n示例：FREncryptWithMD5AndDES(\"abc\",b1)", FREncryptWithMD5AndDES.class.getName()), new FunctionDef("FREncryptWithMD5AndTripleDES", "FREncryptWithMD5AndTripleDES(varchar1,varchar2)：用MD5AndTripleDES算法加密数据。\n参数说明：\nvarchar1：加密密钥。\nvarchar2：加密数据。\n示例：FREncryptWithMD5AndTripleDES(\"abc\",b1)", FREncryptWithMD5AndTripleDES.class.getName()), diff --git a/src/com/fr/plugin/baidu/encrypt/FRGetDataFromHash.java b/src/com/fr/plugin/data/encrypt/FRGetDataFromHash.java similarity index 93% rename from src/com/fr/plugin/baidu/encrypt/FRGetDataFromHash.java rename to src/com/fr/plugin/data/encrypt/FRGetDataFromHash.java index a7adc39..a3de8d1 100644 --- a/src/com/fr/plugin/baidu/encrypt/FRGetDataFromHash.java +++ b/src/com/fr/plugin/data/encrypt/FRGetDataFromHash.java @@ -1,11 +1,11 @@ -package com.fr.plugin.baidu.encrypt; +package com.fr.plugin.data.encrypt; import com.fanruan.api.query.QueryConditionKit; import com.fanruan.api.query.RestrictionKit; import com.fr.intelli.record.Focus; import com.fr.intelli.record.Original; -import com.fr.plugin.baidu.encrypt.dao.EncryptDataDao; -import com.fr.plugin.baidu.encrypt.entity.EncryptDataEntity; +import com.fr.plugin.data.encrypt.dao.EncryptDataDao; +import com.fr.plugin.data.encrypt.entity.EncryptDataEntity; import com.fr.record.analyzer.EnableMetrics; import com.fr.script.AbstractFunction; import com.fr.stable.Primitive; diff --git a/src/com/fr/plugin/baidu/encrypt/FRHashData.java b/src/com/fr/plugin/data/encrypt/FRHashData.java similarity index 96% rename from src/com/fr/plugin/baidu/encrypt/FRHashData.java rename to src/com/fr/plugin/data/encrypt/FRHashData.java index 277cd49..cef0e87 100644 --- a/src/com/fr/plugin/baidu/encrypt/FRHashData.java +++ b/src/com/fr/plugin/data/encrypt/FRHashData.java @@ -1,4 +1,4 @@ -package com.fr.plugin.baidu.encrypt; +package com.fr.plugin.data.encrypt; import com.fr.intelli.record.Focus; import com.fr.intelli.record.Original; diff --git a/src/com/fr/plugin/baidu/encrypt/FunConstants.java b/src/com/fr/plugin/data/encrypt/FunConstants.java similarity index 96% rename from src/com/fr/plugin/baidu/encrypt/FunConstants.java rename to src/com/fr/plugin/data/encrypt/FunConstants.java index e2671d1..119ad8d 100644 --- a/src/com/fr/plugin/baidu/encrypt/FunConstants.java +++ b/src/com/fr/plugin/data/encrypt/FunConstants.java @@ -1,10 +1,10 @@ -package com.fr.plugin.baidu.encrypt; +package com.fr.plugin.data.encrypt; import com.fr.locale.InterProviderFactory; import com.fr.log.FineLoggerFactory; import com.fr.plugin.PluginLicenseManager; -import com.fr.plugin.baidu.encrypt.dao.EncryptDataDao; -import com.fr.plugin.baidu.encrypt.entity.EncryptDataEntity; +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.db.action.DBAction; diff --git a/src/com/fr/plugin/baidu/encrypt/FunLocaleFinder.java b/src/com/fr/plugin/data/encrypt/FunLocaleFinder.java similarity index 93% rename from src/com/fr/plugin/baidu/encrypt/FunLocaleFinder.java rename to src/com/fr/plugin/data/encrypt/FunLocaleFinder.java index 7dd7922..6ec2a07 100644 --- a/src/com/fr/plugin/baidu/encrypt/FunLocaleFinder.java +++ b/src/com/fr/plugin/data/encrypt/FunLocaleFinder.java @@ -1,4 +1,4 @@ -package com.fr.plugin.baidu.encrypt; +package com.fr.plugin.data.encrypt; import com.fr.intelli.record.Focus; import com.fr.intelli.record.Original; diff --git a/src/com/fr/plugin/baidu/encrypt/TestFun.java b/src/com/fr/plugin/data/encrypt/TestFun.java similarity index 71% rename from src/com/fr/plugin/baidu/encrypt/TestFun.java rename to src/com/fr/plugin/data/encrypt/TestFun.java index eb4d794..8435647 100644 --- a/src/com/fr/plugin/baidu/encrypt/TestFun.java +++ b/src/com/fr/plugin/data/encrypt/TestFun.java @@ -1,4 +1,4 @@ -package com.fr.plugin.baidu.encrypt; +package com.fr.plugin.data.encrypt; public class TestFun { public static void main(String args[]) throws Exception { diff --git a/src/com/fr/plugin/baidu/encrypt/dao/EncryptDataDao.java b/src/com/fr/plugin/data/encrypt/dao/EncryptDataDao.java similarity index 77% rename from src/com/fr/plugin/baidu/encrypt/dao/EncryptDataDao.java rename to src/com/fr/plugin/data/encrypt/dao/EncryptDataDao.java index 09f3b5c..4b9c5b6 100644 --- a/src/com/fr/plugin/baidu/encrypt/dao/EncryptDataDao.java +++ b/src/com/fr/plugin/data/encrypt/dao/EncryptDataDao.java @@ -1,6 +1,6 @@ -package com.fr.plugin.baidu.encrypt.dao; +package com.fr.plugin.data.encrypt.dao; -import com.fr.plugin.baidu.encrypt.entity.EncryptDataEntity; +import com.fr.plugin.data.encrypt.entity.EncryptDataEntity; import com.fr.stable.db.dao.BaseDAO; import com.fr.stable.db.session.DAOSession; diff --git a/src/com/fr/plugin/baidu/encrypt/entity/EncryptDataEntity.java b/src/com/fr/plugin/data/encrypt/entity/EncryptDataEntity.java similarity index 90% rename from src/com/fr/plugin/baidu/encrypt/entity/EncryptDataEntity.java rename to src/com/fr/plugin/data/encrypt/entity/EncryptDataEntity.java index 2e5bbe9..b6ad11f 100644 --- a/src/com/fr/plugin/baidu/encrypt/entity/EncryptDataEntity.java +++ b/src/com/fr/plugin/data/encrypt/entity/EncryptDataEntity.java @@ -1,6 +1,6 @@ -package com.fr.plugin.baidu.encrypt.entity; +package com.fr.plugin.data.encrypt.entity; -import com.fr.plugin.baidu.encrypt.FunConstants; +import com.fr.plugin.data.encrypt.FunConstants; import com.fr.stable.AssistUtils; import com.fr.stable.db.entity.BaseEntity; import com.fr.third.javax.persistence.Column; diff --git a/src/com/fr/plugin/baidu/encrypt/local/dataEncrypt.properties b/src/com/fr/plugin/data/encrypt/local/dataEncrypt.properties similarity index 100% rename from src/com/fr/plugin/baidu/encrypt/local/dataEncrypt.properties rename to src/com/fr/plugin/data/encrypt/local/dataEncrypt.properties diff --git a/src/com/fr/plugin/baidu/encrypt/local/dataEncrypt_zh_CN.properties b/src/com/fr/plugin/data/encrypt/local/dataEncrypt_zh_CN.properties similarity index 100% rename from src/com/fr/plugin/baidu/encrypt/local/dataEncrypt_zh_CN.properties rename to src/com/fr/plugin/data/encrypt/local/dataEncrypt_zh_CN.properties diff --git a/src/com/fr/plugin/baidu/encrypt/resources/menuIcon.png b/src/com/fr/plugin/data/encrypt/resources/menuIcon.png similarity index 100% rename from src/com/fr/plugin/baidu/encrypt/resources/menuIcon.png rename to src/com/fr/plugin/data/encrypt/resources/menuIcon.png