表结构修改

yzg-util-base/src/main/java/com/yanzuoguang/util/helper/RsaHelper.java

@@ -373,12 +373,7 @@ public final class RsaHelper {
      */
     public static String decodeRsaValueInfo(String rsaJsonPwd, PublicKey publicKey, long timeout) {
         String rsaJson = decryptionByPublicKey(rsaJsonPwd, publicKey);
-        RsaValueInfo rsaValueInfo = JsonHelper.deserialize(rsaJson, RsaValueInfo.class);
-        long splitTime = rsaValueInfo.getT() - System.currentTimeMillis() / 1000;
-        if (splitTime > timeout) {
-            throw new RuntimeCodeException("056", "解密超时");
-        }
-        return rsaValueInfo.getV();
+        return checkTimeout(timeout, rsaJson);
     }
 
     /**
@@ -391,9 +386,13 @@ public final class RsaHelper {
      */
     public static String decodeRsaValueInfo(String rsaJsonPwd, PrivateKey privateKey, long timeout) {
         String rsaJson = decryptionByPrivateKey(rsaJsonPwd, privateKey);
+        return checkTimeout(timeout, rsaJson);
+    }
+
+    private static String checkTimeout(long timeout, String rsaJson) {
         RsaValueInfo rsaValueInfo = JsonHelper.deserialize(rsaJson, RsaValueInfo.class);
-        long splitTime = rsaValueInfo.getT() - System.currentTimeMillis() / 1000;
-        if (splitTime > timeout) {
+        long splitTime = System.currentTimeMillis() / 1000 - rsaValueInfo.getT();
+        if (splitTime > timeout && timeout > 0) {
             throw new RuntimeCodeException("056", "解密超时");
         }
         return rsaValueInfo.getV();

yzg-util-base/src/test/java/helper/TestRsa.java

 package helper;
 
 import com.yanzuoguang.util.helper.RsaHelper;
+import com.yanzuoguang.util.thread.ThreadHelper;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -42,10 +43,20 @@ public class TestRsa {
         Assert.assertEquals(from, result);
 
         String rsaTemp = RsaHelper.encodeRsaValueInfo(from, rsaInfo.getPublicKeyFrom());
-        String rsaResult = RsaHelper.decodeRsaValueInfo(rsaTemp, rsaInfo.getPrivateKeyFrom(), 10 * 1000);
+        String rsaResult = RsaHelper.decodeRsaValueInfo(rsaTemp, rsaInfo.getPrivateKeyFrom(), 0);
         System.out.println("Json时间公钥加密后字段:" + rsaTemp);
         System.out.println("Json时间私钥解密后字段:" + rsaResult);
         Assert.assertEquals(from, rsaResult);
+
+        ThreadHelper.sleep(2000);
+        boolean isOk = false;
+        try {
+            String rsaResult1 = RsaHelper.decodeRsaValueInfo(rsaTemp, rsaInfo.getPrivateKeyFrom(), 1);
+            isOk = true;
+        } catch (Exception ex) {
+            System.err.println(ex.getMessage());
+        }
+        Assert.assertFalse(isOk);
     }
 
 
@@ -64,9 +75,19 @@ public class TestRsa {
         Assert.assertEquals(from, result);
 
         String rsaTemp = RsaHelper.encodeRsaValueInfo(from, rsaInfo.getPrivateKeyFrom());
-        String rsaResult = RsaHelper.decodeRsaValueInfo(rsaTemp, rsaInfo.getPublicKeyFrom(), 10 * 1000);
+        String rsaResult = RsaHelper.decodeRsaValueInfo(rsaTemp, rsaInfo.getPublicKeyFrom(), 0);
         System.out.println("Json时间公钥加密后字段:" + rsaTemp);
         System.out.println("Json时间私钥解密后字段:" + rsaResult);
         Assert.assertEquals(from, rsaResult);
+
+        ThreadHelper.sleep(2000);
+        boolean isOk = false;
+        try {
+            RsaHelper.decodeRsaValueInfo(rsaTemp, rsaInfo.getPublicKeyFrom(), 1);
+            isOk = true;
+        } catch (Exception ex) {
+            System.err.println(ex.getMessage());
+        }
+        Assert.assertFalse(isOk);
     }
 }