Lianxun_Java.git

			@@ -22,7 +22,6 @@
			import com.java110.utils.util.Base64Convert;
			import com.java110.utils.util.StringUtil;
			import org.apache.commons.codec.digest.DigestUtils;
			import org.apache.logging.log4j.util.Base64Util;

			import javax.crypto.Cipher;
			import javax.crypto.SecretKeyFactory;
			@@ -32,15 +31,7 @@
			import java.io.ByteArrayInputStream;
			import java.io.ByteArrayOutputStream;
			import java.io.UnsupportedEncodingException;
			import java.net.URLEncoder;
			import java.security.InvalidParameterException;
			import java.security.Key;
			import java.security.KeyFactory;
			import java.security.KeyPair;
			import java.security.KeyPairGenerator;
			import java.security.MessageDigest;
			import java.security.PrivateKey;
			import java.security.PublicKey;
			import java.security.*;
			import java.security.spec.PKCS8EncodedKeySpec;
			import java.security.spec.X509EncodedKeySpec;
			import java.util.Base64;
			@@ -74,7 +65,8 @@


			// 加密
			public static String AesEncrypt(String sSrc, String sKey) throws Exception {
			public static String AesEncrypt(String sSrc, String sKey) {
			try {
			if (sKey == null) {
			System.out.print("Key为空null");
			return null;
			@@ -91,10 +83,14 @@
			byte[] encrypted = cipher.doFinal(sSrc.getBytes("utf-8"));

			return Base64Convert.byteToBase64(encrypted);//此处使用BASE64做转码功能，同时能起到2次加密的作用。
			} catch (Exception e) {
			e.printStackTrace();
			}
			return "";
			}

			// 解密
			public static String AesDecrypt(String sSrc, String sKey) throws Exception {
			public static String AesDecrypt(String sSrc, String sKey) {
			try {
			// 判断Key是否正确
			if (sKey == null) {
			@@ -463,6 +459,7 @@
			String newSign = md5(reportDataHeaderDto.getTranId() + reportDataHeaderDto.getReqTime() + reportDataDto.getReportDataBodyDto().toJSONString() + code).toLowerCase();
			reportDataHeaderDto.setSign(newSign);
			}

			/**
			* 加载公钥
			*