bug修复

src/main/java/cn/gtmap/bdcdj/core/encrypt/utils/GmSm4Util.java

@@ -2,7 +2,6 @@ package cn.gtmap.bdcdj.core.encrypt.utils;
 
 import cn.gtmap.bdcdj.core.encrypt.CryptProperties;
 import cn.gtmap.bdcdj.core.encrypt.enums.SaltsEnum;
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.pqc.math.linearalgebra.ByteUtils;
@@ -79,7 +78,7 @@ public class GmSm4Util {
             try {
                 byte[] srcData = paramStr.getBytes(encoding);
                 byte[] cipherArray = encrypt_Ecb_Padding(keyData, srcData);
-                return salt + Base64.encodeBase64String(cipherArray);
+                return salt + ByteUtils.toHexString(cipherArray);
             } catch (Exception var8) {
                 throw new RuntimeException(var8);
             }
@@ -161,16 +160,16 @@ public class GmSm4Util {
         if (StringUtils.startsWithIgnoreCase(cipherText, salt)) {
             if (StringUtils.endsWith(cipherText, "等")) {
                 String realCipherText = StringUtils.removeEnd(StringUtils.removeStartIgnoreCase(cipherText, salt), "等");
-                srcData = Base64.decodeBase64(realCipherText);
+                srcData = ByteUtils.fromHexString(realCipherText);
                 srcData = decrypt_Ecb_Padding(keyData, srcData);
                 return new String(srcData, encoding) + "等";
             } else {
-                cipherData = Base64.decodeBase64(StringUtils.removeStartIgnoreCase(cipherText, salt));
+                cipherData = ByteUtils.fromHexString(StringUtils.removeStartIgnoreCase(cipherText, salt));
                 srcData = decrypt_Ecb_Padding(keyData, cipherData);
                 return new String(srcData, encoding);
             }
         } else {
-            cipherData = Base64.decodeBase64(cipherText);
+            cipherData = ByteUtils.fromHexString(cipherText);
             srcData = decrypt_Ecb_Padding(keyData, cipherData);
             return new String(srcData, encoding);
         }