update EncryptDencrypt by tylerchen

tylerchen · Nov 20, 2017 · 9e5341f · 9e5341f
1 parent 4ffa42f
commit 9e5341f
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/builds/org/iff/tc-util-project/1.0.19/tc-util-project-1.0.19-sources.jar b/builds/org/iff/tc-util-project/1.0.19/tc-util-project-1.0.19-sources.jar
diff --git a/builds/org/iff/tc-util-project/1.0.19/tc-util-project-1.0.19.jar b/builds/org/iff/tc-util-project/1.0.19/tc-util-project-1.0.19.jar
diff --git a/builds/org/iff/tc-util-project/maven-metadata-local.xml b/builds/org/iff/tc-util-project/maven-metadata-local.xml
@@ -24,6 +24,6 @@
       <version>1.0.18</version>
       <version>1.0.19</version>
     </versions>
-    <lastUpdated>20171109161024</lastUpdated>
+    <lastUpdated>20171120084252</lastUpdated>
   </versioning>
 </metadata>
diff --git a/src/main/java/org/iff/infra/util/spring/bean/EncryptDencrypt.java b/src/main/java/org/iff/infra/util/spring/bean/EncryptDencrypt.java
@@ -13,6 +13,13 @@
  */
 public interface EncryptDencrypt {
 
+	public static final String METHOD_MD5 = "MD5";
+	public static final String METHOD_MD5_2 = "MD5-2";
+	public static final String METHOD_MD5_FIRST = "MD5-first";
+	public static final String METHOD_MD5_SECOND = "MD5-second";
+	public static final String METHOD_MD5_BOTH = "MD5-both";
+	public static final String METHOD_RSA = "RSA";
+
 	String encrypt(String method, String salt, String value);
 
 	String dencrypt(String method, String salt, String value);

diff --git a/src/main/java/org/iff/infra/util/spring/bean/EncryptDencryptImpl.java b/src/main/java/org/iff/infra/util/spring/bean/EncryptDencryptImpl.java
@@ -23,14 +23,20 @@ public String encrypt(String method, String saltOrKey, String value) {
 		if (StringUtils.isEmpty(value)) {
 			return value;
 		}
-		if ("MD5".equalsIgnoreCase(method)) {
+		if (EncryptDencrypt.METHOD_MD5.equalsIgnoreCase(method)) {
 			return MD5Helper.string2MD5(value);
-		} else if ("MD5-2".equalsIgnoreCase(method)) {
+		} else if (EncryptDencrypt.METHOD_MD5_2.equalsIgnoreCase(method)) {
 			if (StringUtils.isNotEmpty(saltOrKey)) {
 				return MD5Helper.string2MD5(saltOrKey + "-" + MD5Helper.string2MD5(value));
 			}
 			return MD5Helper.string2MD5(MD5Helper.string2MD5(value));
-		} else if ("RSA".equalsIgnoreCase(method)) {
+		} else if (EncryptDencrypt.METHOD_MD5_FIRST.equalsIgnoreCase(method)) {
+			return MD5Helper.firstSalt(value);
+		} else if (EncryptDencrypt.METHOD_MD5_SECOND.equalsIgnoreCase(method)) {
+			return MD5Helper.secondSalt(value);
+		} else if (EncryptDencrypt.METHOD_MD5_BOTH.equalsIgnoreCase(method)) {
+			return MD5Helper.firstSalt(MD5Helper.secondSalt(value));
+		} else if (EncryptDencrypt.METHOD_RSA.equalsIgnoreCase(method)) {
 			if (StringUtils.isNotEmpty(saltOrKey)) {
 				return RSAHelper.encrypt(value, RSAHelper.getPublicKeyFromBase64(saltOrKey));
 			} else {
@@ -45,11 +51,17 @@ public String dencrypt(String method, String saltOrKey, String value) {
 		if (StringUtils.isEmpty(value)) {
 			return value;
 		}
-		if ("MD5".equalsIgnoreCase(method)) {
+		if (EncryptDencrypt.METHOD_MD5.equalsIgnoreCase(method)) {
 			Assert.error(FCS.get("Encrypt method {0} is not supported for dencrypt!", method));
-		} else if ("MD5-2".equalsIgnoreCase(method)) {
+		} else if (EncryptDencrypt.METHOD_MD5_2.equalsIgnoreCase(method)) {
 			Assert.error(FCS.get("Encrypt method {0} is not supported for dencrypt!", method));
-		} else if ("RSA".equalsIgnoreCase(method)) {
+		} else if (EncryptDencrypt.METHOD_MD5_FIRST.equalsIgnoreCase(method)) {
+			Assert.error(FCS.get("Encrypt method {0} is not supported for dencrypt!", method));
+		} else if (EncryptDencrypt.METHOD_MD5_SECOND.equalsIgnoreCase(method)) {
+			Assert.error(FCS.get("Encrypt method {0} is not supported for dencrypt!", method));
+		} else if (EncryptDencrypt.METHOD_MD5_BOTH.equalsIgnoreCase(method)) {
+			Assert.error(FCS.get("Encrypt method {0} is not supported for dencrypt!", method));
+		} else if (EncryptDencrypt.METHOD_RSA.equalsIgnoreCase(method)) {
 			if (StringUtils.isNotEmpty(saltOrKey)) {
 				return RSAHelper.decrypt(value, RSAHelper.getPrivateKeyFromBase64(saltOrKey));
 			} else {