Merge branch 'dev-pay' into test6.9.13

@@ -8,44 +8,11 @@ import java.util.Map;
 
 public class AlipayConfig {
 
-    // 合作身份者ID，以2088开头由16位纯数字组成的字符串
-    public static final String partner = "2088701661478015";
-
-    // 收款支付宝账号，以2088开头由16位纯数字组成的字符串，一般情况下收款账号就是签约账号
-    public static final String seller_id = partner;
-    
-    public static final String appid = "2013080700000742";
-    
-    // 商户的私钥
-    public static final String private_key_md5 = "kcxawi9bb07mzh0aq2wcirsf9znusobw";  // MD5
-
-    public static final String private_key = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOfywqINCNC+IFvg" +
-            "zqq3aEYxmh89WamWL59FukMKoKYMDR1NWMgFLNX2ld6aRWWdlJCBUsTzH/8uabEj" +
-            "fBOM5BK+N08GfkpCYRmzww2y1H8RZ4P3wtKu95UYdaq3Ir5ucfgKxGy/1ay2qQFZ" +
-            "PAkvPtTw+qdkVOgPakvqCWgcFL8LAgMBAAECgYAYeTnmJV/vvo/lgePsiWucNHGh" +
-            "qDSEu08NDCtqFX375zufAuFCQaGIdfs8QKTf4u+hC7QzCcAvibMnOKpH2c7apAEc" +
-            "RUfTUUcY/UB/yIkvzjkvkMKZSXI6y3lyFn8mNEwQei9u4OdSg1IBVuWqZoyqilCm" +
-            "ARMzXyoeAOY55MelSQJBAPP+sEbPadMENkzzkiiHCHuo3Y0OEF5Zv2h3LJmtRx/6" +
-            "B60mrfaUSSbU/iNq0uzQSoDQlY2DxXb21l1LYZzgdn8CQQDzXFXNj/qkXIuTLjfK" +
-            "YxIhwiNKYXXKeG9C6+MlviY2zVrKruuuHJMcJ8238hzRcPsX+TCwFd3VhHuL61jB" +
-            "2+l1AkBhUNTH+VQQ6N4rhP5nkawNfkWXS+O1bgBMzzOHu7fhhhznr8S002H1zf/q" +
-            "6mFkOJNum0L65XKtxzeqkDVHl7NLAkEAg/jKvxMZRRC60DH8J1DagFwbbzay/f2Z" +
-            "uJzbLZiUeJucZNW/EUiFrnsXYG13m0y9nh6QfK0fA684oIQcOeTcEQJBAIxCxNUP" +
-            "jXsvqTV2ypek3ktvutFwSFuvo0zD2sn2HNlMSfh3K6RZV2Q0Q4W7bLELKEEkxmJX" +
-            "IMLSK3hQB7jYD0Q=";
-
-
-
-    // 支付宝的公钥，无需修改该值
-    public static final String ali_public_key  = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRAFljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQEB/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5KsiNG9zpgmLCUYuLkxpLQIDAQAB";
-
     // 字符编码格式 目前支持 gbk 或 utf-8
     public static final String input_charset = "utf-8";
 
     // 签名方式 不需修改
-    public static final String sign_type = "RSA"; // "MD5";
-    public static final String sign_type_wap = "MD5";
-    
+    public static final String sign_type = "RSA";
     /**
      * 支付宝ATN验证地址
      */
@@ -62,99 +29,11 @@ public class AlipayConfig {
 
     public static final String OPENAPI_BIZ_SUCCESS = "10000";
 
-    public static final String OPENAPI_BIZ_PAYFAILED = "40004";  //支付失败
-    
-    public static final String OPENAPI_BIZ_WAITPAY = "10003";	//等待用户付款
-    
-    public static final String OPENAPI_BIZ_UNKNOWN = "20000";	//未知异常
-    
-    /********************/  //BLK
-    public static final String BLK_PARTNER = "2088421464239504";
-    
-    public static final String BLK_APPID = "2016072701672910";
-    
-    public static final String BLK_KEY_MD5 = "e3i54meghrac3qhryzhw1h5yzeijik7e";
-
-    public static final String BLK_MCH_RSA_PRIVATE = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAL2c4G8GjAobjUgk" +
-    		"aUJ5E9jQVdpYK/XDLLPzTP+b1xwb7yBiYKKPtq992bMeILwe5dzXrJZXlk+p4WPW" +
-    		"9ktVihxc8RBnyLqxmmuUVjjkxZFLXVLOo1b3/C6JhUeQY8WUpmoGtJqFROqg7Fqf" +
-    		"vtT12bjYZyN+PNTH8wSowCOGdATvAgMBAAECgYB/T2y1vxyZ0MP8s03lbuwvgDqU" +
-    		"vuzNN321WV/So+07l1noUYV2wK21iPd5t3ndNZW6wSjFTQvEc1i9M2DtVgLDPpeg" +
-    		"J3dW5gbA4cp2rvMbkatz4JM//Fe9T+IZPnvIghvJHnpZU356Z/aQJn/U7kmcXV0k" +
-    		"MSHG4P951u1epNY/gQJBAN62uLkiUDfI2ZIoGI6W+xnUKTWsHMz0DaNvEQFbCXps" +
-    		"WLEnjtBuFNTDUWZ/+zk5iQbyRpvIv+oVPgTrb4kDla8CQQDZ86zjk9B4nE2hAPLN" +
-    		"49M8KLBU2bFgezlIhvGP7g3xHdycpD4Mcc3Xjrl0ojFJuKiOCXyO1CsBMJlPrmO/" +
-    		"+ZTBAkEAjTuieQThif68uorix8nHAuIgIAE9YluCKppMVme84v3CYNWNI3ArlaEn" +
-    		"BbEzR17NHrKVREVSLse5xLToziKP0QJAOZLE+NjzGOkxGHbHrNuh0SJucfuPf40N" +
-    		"dLsw1HRt+mOJA1ffjCoD1g09sDGoE3FUFTEsVg51zbqoxQOsFeo4AQJBANISoSPG" +
-    		"KoY1kO4JHcwUVzNCRdCHeFO21CRnndjw2yw333mpdzLZxLLAD8wT099zOzKDzG/2" +
-    		"b/80piQRjbIoxUo=";
-
-    public static final String BLK_ALI_RSA_PUBLIC = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRAFljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQEB/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5KsiNG9zpgmLCUYuLkxpLQIDAQAB";
-    
     /********************/  //OUYIN
-    public static final String OUYIN_EMAIL = "ouyin@yoho.cn";
-    public static final String OUYIN_USER_NAME = "欧印南京贸易有限公司";
     public static final String OUYIN_PARTNER = "2088421850636193";
-    
     public static final String OUYIN_APPID = "2016091401906455";
-    
-    public static final String OUYIN_KEY_MD5 = "nozhau70yynk2dtmdz97maw13qo0h6rz";
-    
-    public static final String OUYIN_MCH_RSA_PRIVATE = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKqYgXtur32Spmu9" + 
-    		"AJZK0g6ghSQbJIbCcriePO60KlsB4xNstAwwgQ0Q619aV/gm5u+ejwc+05rko1LV" +
-    		"I+8XAT7fk+f2MdvqZFeWWD8ESK+ZB/9yLwQW7kaiDRXtCSzkGUGp/MRJS4jgpbd6" +
-    		"RlXTAhnNy7f6tCxzeJYEOBgHa2kVAgMBAAECgYEAjRXDQAmyKO/3onKU4bbPMjme" +
-    		"4tVvx+NYbUawrdlijhFpcs8buFkE4YF0p09YIWpK4zEGqL9U0Wz1hbOwHDOyWqtl" +
-    		"eaAkQd8Nq2VsGO2lkq2Nc9tnWXwdm5EJj9NxgCevdRlodYq47WXafSr6j00HD0pi" +
-    		"b6EP2TCh62e9QRGfSqECQQDUrfCfnCqEz2EnlD338Ixe4b/d1iNBAE/yzl1zqsSg" +
-    		"EaAtZjq9CniIYhUuiKvUcBleoA8aMFc5p0xMimSvDxpXAkEAzVghtSKgCZNALSJA" +
-    		"B3obDPTuVejbh3156/FeXmIhkATs50T2W0DC0E+PYIZCT8e2hJ/0lWYfXBMhPaob" +
-    		"ab2McwJAYkLG5IdbYacKpSWph88cm43DfrO78AE77tuHc7RXSfk6vx73TnXzAFgI" +
-    		"n0pH0UvFfOGIeLoS4rE34DkkkXjx2wJAWuIc2RygFFzV1KQKDsUeX9ev/Nn4/7ir" +
-    		"U6Aakk+AZ0umxp0hJDY/gw8TeDcz9jeAMqbRC6aNTqUw2ygExgIcvQJAbUCgtAfB" +
-    		"6ZG7dCe1+qAG1S/tVd24ZwKqPP0KVRa8Do4qFbIQjv5Cou4DOf35ifLfGzRUWF4D" +
-    		"juPP619T5yGTHA==";
-
-
-    public static final String CROSS_BORDER_RSA_PRIVATE = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALmkG51+GXXK5eDM\n" +
-            "V42xi/MRXt/LCKkv+1Xzoo2gno+gE91DScdMz1odmXiNW5RMJ+AvaFTOJ3fIHk3w\n" +
-            "75Ebje7w0UZQ8/JPYManMKV1TdDisp8hzPDK0/kBTGQQQvlgpMLp1aFbfp1TqRID\n" +
-            "v40cZMcA4imUiOeD22VlBW9j35WhAgMBAAECgYBxgAGWUBO27h+QSr85FZVwPm2Y\n" +
-            "PGWGM5ziVzxKhSqMu52JiWthW/fmq/Q6PYsBZ3J14eZS+1wsIwFMPAPs30DuDFTX\n" +
-            "6wMNpl44K4MVUgpT6CcEv2DAhZ+5NgjiKztbiAcZxqakt/VawSx5Li6E0AtqOOTH\n" +
-            "G/7GIiOJo3T4tJSEcQJBAN5So7tl1m0fULSVHwiRfSJpa6QT4bjReD8X9Rzj9YeK\n" +
-            "07Q+ufmkkRJVFBHJEVHmC5cZwf3zrb1Gu04bkHscTC0CQQDVwwCAzCktNKW7ig8G\n" +
-            "1w8ZNU52fMRHT7vnJtR4huI+9pD3k0qtB8gyR9TcHu6mAZH90mWg1OJ4ipwNjmLL\n" +
-            "HDPFAkEAyEonG9L5RMHrkWSu2qdH1tKmmOEYf8qmzCCnQGnWb1AQvdes8EzkLWHc\n" +
-            "fNFp+yCG3I/mBwWbRmQMpqeKmH672QJBAKJfq+QqMSULltDsQBncBrYJTf6nK5lX\n" +
-            "sc4WKtMa8oUNWnUVR2ZEQQgglEpYnMMw8iqyRUx0KUuTTpLlk5nhZFkCQGuZtT34\n" +
-            "CrknMjYrpibDYPaT8NljffTrnJspAeste6CDLHyH0mgVDzADyXrzuoWNF4UMqWE8\n" +
-            "toAXZXd//cA4ZOw=";
-
-    public static final String CROSS_BORDER_RSA_PUBLIC = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRA\n" +
-            "FljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQE\n" +
-            "B/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5Ksi\n" +
-            "NG9zpgmLCUYuLkxpLQIDAQAB";
-
-    public static final String OUYIN_ALI_MAPI_RSA_PUBLIC = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRAFljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQEB/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5KsiNG9zpgmLCUYuLkxpLQIDAQAB";
-
-    
-    public static final String OUYIN_ALI_RSA_PUBLIC = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDI6d306Q8fIfCOaTXyiUeJHkrIvYISRcc73s3vF1ZT7XN8RNPwJxo8pWaJMmvyTn9N4HQ632qJBVHf8sxHi/fEsraprwCtzvzQETrNRwVxLO5jVmRGi60j8Ue1efIlzPXV9je9mkjzOmdssymZkh2QhUrCmZYI/FCEa3/cNMW0QIDAQAB";
-    
-    /*******************/  //OUYIN01 欧印南京贸易有限公司第一分公司
-    public static final String OUYIN01_PARTNER = "2088821975536417";
-    
-    public static final String OUYIN01_APPID = "2017121800943287";
-    
-    public static final String OUYIN01_KEY_MD5 = "";	//无
-    
-    public static final String OUYIN01_MCH_RSA_PRIVATE = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMGnTJUrR+/dBsnUSpehi+uFAmXHScTHOY0K3CjkpWDUbR1esjF6DMgBvN/KSQ7ait0/DrJDLMF+QWt8A9tneCq0GoRezQNdZe8YhYtKI03U14dI3u2oVx+8wF6K/To9m28DT4eHMrlshBFq6RoGSs4e710VVdh3T9TTe7QZRCWjAgMBAAECgYB2YxGVa/U5dVUOFANZ+X+xhwn1MMUvUGAlkosPUOCtdpASUW78glHIAA/4fBD3zLDyGvegESMOU2IpFJLDEdlKqJ9+wv/6SrJMZMUzpLy29r9BfCO8NBJfHMi6aBEUZCyfU8VbSjEgQIIvKzaiV8Qpw4EJ1TyOXqdJd+vJEtEdeQJBAPPCgvU03REuxEO/8vXwAJXWQpvmmJ5M/UAvjqlbeqfem7M+WYNfHAlMo9/NQm/pIEK1QskXw2I5O1EQNccnqjcCQQDLYK4e43s3wjEoCz7f6dk+/aMx2n8y+wdKl+9r/U8EdPBlUiyusfHv85DbNDB9cI0AJpFIlCpxB9oEh7Db2Dn1AkEA1I3JWf41wrTwCU/IkXItYHrL7FvguzDRKHYPxVfylY0EYgE9VtPJg8Zjo1S92Q4ExoZ+bRGemvji42XqLvZEcwJBALibKXIgSthyDOysSIY3XlsvH9NA4fUEp7mt8EW1yOPiwdM2pBhurY2BKRvQY7N5VoOsfnPDCkNPPTafdIoZ24ECQDsmvO5EjQanxG+M+3Wzfo2psCXQsgwN0Et9ra4BX3UdoNt8hh2Y6FbKqt/QxuEKqfLrGQ3qp7wuUun/M8LWeSc=";
-    
-    public static final String OUYIN01_ALI_RSA_PUBLIC = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDI6d306Q8fIfCOaTXyiUeJHkrIvYISRcc73s3vF1ZT7XN8RNPwJxo8pWaJMmvyTn9N4HQ632qJBVHf8sxHi/fEsraprwCtzvzQETrNRwVxLO5jVmRGi60j8Ue1efIlzPXV9je9mkjzOmdssymZkh2QhUrCmZYI/FCEa3/cNMW0QIDAQAB";
-    
-    
-    private static final Map<String, List<Integer>> MCH_PAYTYPE_MAP = new HashMap<>();
+    public static final String OUYIN_EMAIL = "ouyin@yoho.cn";
+    public static final String OUYIN_USER_NAME = "欧印南京贸易有限公司";
 
 
 }

@@ -76,10 +76,6 @@ public abstract class AbstractAlipayService extends AbstractPayService {
 		return "";
 	}
 
-	protected String getRsaAliMApipubKey() {
-		return "";
-	}
-
 	@Autowired
 	private AlipaySignatureHelperFactory factory;
 
@@ -799,10 +795,7 @@ public abstract class AbstractAlipayService extends AbstractPayService {
 
 	public boolean notifyVerifyMApi(Map<String, String> params) {
 		String preSignStr = getSignString(params);
-
-		logger.info("method notifyVerifyMApi in preSignStr is {}, sign is {}, RsaAlipubKey is {}", preSignStr, params.get("sign"), getRsaAliMApipubKey());
-
-		return RSAUtils.verify(preSignStr, params.get("sign"), getRsaAliMApipubKey(), AlipayConfig.input_charset);
+		return helper().verifyWithRsa(preSignStr,AlipayConfig.input_charset,params.get("sign"));
 	}
 
 	/**
@@ -1010,11 +1003,6 @@ public abstract class AbstractAlipayService extends AbstractPayService {
 		if(StringUtils.isEmpty(notifyId))
 			return false;
 
-		// TODO 验证开关是否打开
-//		if(orderDegradeProperties.enableAlipayCheckAtn()) {
-//			return true;
-//		}
-
 		String result = obtainAtn(outTradeNo, notifyId);
 
 		//除非支付系统明确返回false，其余情况全部放通

@@ -27,8 +27,4 @@ public class AlipayOuyinService extends AbstractAlipayService {
 		return AlipayConfig.OUYIN_EMAIL;
 	}
 
-	protected String getRsaAliMApipubKey() {
-		return AlipayConfig.OUYIN_ALI_MAPI_RSA_PUBLIC;
-	}
-
 }