优化签名

pay-java-union/src/main/java/com/egzosn/pay/union/SDK/CertUtil.java

@@ -18,7 +18,6 @@ package com.egzosn.pay.union.SDK;
 import com.egzosn.pay.common.util.str.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
 import java.io.*;
 import java.math.BigInteger;

pay-java-union/src/main/java/com/egzosn/pay/union/SDK/SDKConfig.java

@@ -216,7 +216,7 @@ public class SDKConfig {
 	}
 
 	/**
-	 * 根据传入的 {@link #load(java.util.Properties)}对象设置配置参数
+	 * 根据传入的 {@link #loadProperties(java.util.Properties)}对象设置配置参数
 	 * 
 	 * @param pro
 	 */
@@ -400,7 +400,7 @@ public class SDKConfig {
 				return SDKConstants.SIGNMETHOD_RSA;
 			case "SHA256":
 				return SDKConstants.SIGNMETHOD_SHA256;
-			case "SM3":
+			case "sm3":
 				return SDKConstants.SIGNMETHOD_SM3;
 			default:
 				return SDKConstants.SIGNMETHOD_RSA;

pay-java-union/src/main/java/com/egzosn/pay/union/SDK/SDKUtils.java

@@ -94,8 +94,8 @@ public class SDKUtils {
                     // 验证签名需要用银联发给商户的公钥证书.
                     boolean result = SecureUtil.validateSignBySoft256(x509Cert
                             .getPublicKey(), Base64.decode(stringSign
-                            ), SHA256.sha256X16(
-                            stringData, encoding));
+                            ), SHA256.sign(
+                            stringData, "", encoding).getBytes());
                     log.info("验证签名" + (result? "成功":"失败"));
                     return result;
                 } catch (UnsupportedEncodingException e) {

pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayConfigStorage.java

@@ -20,21 +20,9 @@ public class UnionPayConfigStorage extends BasePayConfigStorage {
      * 商户收款账号
      */
     public volatile String seller;
-    //公钥
-    private volatile String aliPublicKey;
 
 
 
-    public String getAliPublicKey () {
-        return aliPublicKey;
-    }
-
-    public void setAliPublicKey (String aliPublicKey) {
-        setKeyPublic(aliPublicKey);
-        this.aliPublicKey = aliPublicKey;
-    }
-
-
     @Override
     public String getAppid () {
         return null;