ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit 9f8b90328c08dff9ad22d9aa29ec03ee5534f2fb 2 parents 18b3c295 2861d7e1

Merge branch 'dev-pay' into test6.9.13

Inline Side-by-side
Showing 3 changed files with 4 additions and 141 deletions
@@ -8,44 +8,11 @@ import java.util.Map; @@ -8,44 +8,11 @@ import java.util.Map;
8 8
9 public class AlipayConfig { 9 public class AlipayConfig {
10 10
11 - // 合作身份者ID，以2088开头由16位纯数字组成的字符串  
12 - public static final String partner = "2088701661478015";  
13 -  
14 - // 收款支付宝账号，以2088开头由16位纯数字组成的字符串，一般情况下收款账号就是签约账号  
15 - public static final String seller_id = partner;  
16 -  
17 - public static final String appid = "2013080700000742";  
18 -  
19 - // 商户的私钥  
20 - public static final String private_key_md5 = "kcxawi9bb07mzh0aq2wcirsf9znusobw"; // MD5  
21 -  
22 - public static final String private_key = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOfywqINCNC+IFvg" +  
23 - "zqq3aEYxmh89WamWL59FukMKoKYMDR1NWMgFLNX2ld6aRWWdlJCBUsTzH/8uabEj" +  
24 - "fBOM5BK+N08GfkpCYRmzww2y1H8RZ4P3wtKu95UYdaq3Ir5ucfgKxGy/1ay2qQFZ" +  
25 - "PAkvPtTw+qdkVOgPakvqCWgcFL8LAgMBAAECgYAYeTnmJV/vvo/lgePsiWucNHGh" +  
26 - "qDSEu08NDCtqFX375zufAuFCQaGIdfs8QKTf4u+hC7QzCcAvibMnOKpH2c7apAEc" +  
27 - "RUfTUUcY/UB/yIkvzjkvkMKZSXI6y3lyFn8mNEwQei9u4OdSg1IBVuWqZoyqilCm" +  
28 - "ARMzXyoeAOY55MelSQJBAPP+sEbPadMENkzzkiiHCHuo3Y0OEF5Zv2h3LJmtRx/6" +  
29 - "B60mrfaUSSbU/iNq0uzQSoDQlY2DxXb21l1LYZzgdn8CQQDzXFXNj/qkXIuTLjfK" +  
30 - "YxIhwiNKYXXKeG9C6+MlviY2zVrKruuuHJMcJ8238hzRcPsX+TCwFd3VhHuL61jB" +  
31 - "2+l1AkBhUNTH+VQQ6N4rhP5nkawNfkWXS+O1bgBMzzOHu7fhhhznr8S002H1zf/q" +  
32 - "6mFkOJNum0L65XKtxzeqkDVHl7NLAkEAg/jKvxMZRRC60DH8J1DagFwbbzay/f2Z" +  
33 - "uJzbLZiUeJucZNW/EUiFrnsXYG13m0y9nh6QfK0fA684oIQcOeTcEQJBAIxCxNUP" +  
34 - "jXsvqTV2ypek3ktvutFwSFuvo0zD2sn2HNlMSfh3K6RZV2Q0Q4W7bLELKEEkxmJX" +  
35 - "IMLSK3hQB7jYD0Q=";  
36 -  
37 -  
38 -  
39 - // 支付宝的公钥，无需修改该值  
40 - public static final String ali_public_key = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRAFljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQEB/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5KsiNG9zpgmLCUYuLkxpLQIDAQAB";  
41 -  
42 // 字符编码格式 目前支持 gbk 或 utf-8 11 // 字符编码格式 目前支持 gbk 或 utf-8
43 public static final String input_charset = "utf-8"; 12 public static final String input_charset = "utf-8";
44 13
45 // 签名方式 不需修改 14 // 签名方式 不需修改
46 - public static final String sign_type = "RSA"; // "MD5";  
47 - public static final String sign_type_wap = "MD5";  
48 - 15 + public static final String sign_type = "RSA";
49 /** 16 /**
50 * 支付宝ATN验证地址 17 * 支付宝ATN验证地址
51 */ 18 */
@@ -62,99 +29,11 @@ public class AlipayConfig { @@ -62,99 +29,11 @@ public class AlipayConfig {
62 29
63 public static final String OPENAPI_BIZ_SUCCESS = "10000"; 30 public static final String OPENAPI_BIZ_SUCCESS = "10000";
64 31
65 - public static final String OPENAPI_BIZ_PAYFAILED = "40004"; //支付失败  
66 -  
67 - public static final String OPENAPI_BIZ_WAITPAY = "10003"; //等待用户付款  
68 -  
69 - public static final String OPENAPI_BIZ_UNKNOWN = "20000"; //未知异常  
70 -  
71 - /********************/ //BLK  
72 - public static final String BLK_PARTNER = "2088421464239504";  
73 -  
74 - public static final String BLK_APPID = "2016072701672910";  
75 -  
76 - public static final String BLK_KEY_MD5 = "e3i54meghrac3qhryzhw1h5yzeijik7e";  
77 -  
78 - public static final String BLK_MCH_RSA_PRIVATE = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAL2c4G8GjAobjUgk" +  
79 - "aUJ5E9jQVdpYK/XDLLPzTP+b1xwb7yBiYKKPtq992bMeILwe5dzXrJZXlk+p4WPW" +  
80 - "9ktVihxc8RBnyLqxmmuUVjjkxZFLXVLOo1b3/C6JhUeQY8WUpmoGtJqFROqg7Fqf" +  
81 - "vtT12bjYZyN+PNTH8wSowCOGdATvAgMBAAECgYB/T2y1vxyZ0MP8s03lbuwvgDqU" +  
82 - "vuzNN321WV/So+07l1noUYV2wK21iPd5t3ndNZW6wSjFTQvEc1i9M2DtVgLDPpeg" +  
83 - "J3dW5gbA4cp2rvMbkatz4JM//Fe9T+IZPnvIghvJHnpZU356Z/aQJn/U7kmcXV0k" +  
84 - "MSHG4P951u1epNY/gQJBAN62uLkiUDfI2ZIoGI6W+xnUKTWsHMz0DaNvEQFbCXps" +  
85 - "WLEnjtBuFNTDUWZ/+zk5iQbyRpvIv+oVPgTrb4kDla8CQQDZ86zjk9B4nE2hAPLN" +  
86 - "49M8KLBU2bFgezlIhvGP7g3xHdycpD4Mcc3Xjrl0ojFJuKiOCXyO1CsBMJlPrmO/" +  
87 - "+ZTBAkEAjTuieQThif68uorix8nHAuIgIAE9YluCKppMVme84v3CYNWNI3ArlaEn" +  
88 - "BbEzR17NHrKVREVSLse5xLToziKP0QJAOZLE+NjzGOkxGHbHrNuh0SJucfuPf40N" +  
89 - "dLsw1HRt+mOJA1ffjCoD1g09sDGoE3FUFTEsVg51zbqoxQOsFeo4AQJBANISoSPG" +  
90 - "KoY1kO4JHcwUVzNCRdCHeFO21CRnndjw2yw333mpdzLZxLLAD8wT099zOzKDzG/2" +  
91 - "b/80piQRjbIoxUo=";  
92 -  
93 - public static final String BLK_ALI_RSA_PUBLIC = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRAFljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQEB/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5KsiNG9zpgmLCUYuLkxpLQIDAQAB";  
94 -  
95 /********************/ //OUYIN 32 /********************/ //OUYIN
96 - public static final String OUYIN_EMAIL = "ouyin@yoho.cn";  
97 - public static final String OUYIN_USER_NAME = "欧印南京贸易有限公司";  
98 public static final String OUYIN_PARTNER = "2088421850636193"; 33 public static final String OUYIN_PARTNER = "2088421850636193";
99 -  
100 public static final String OUYIN_APPID = "2016091401906455"; 34 public static final String OUYIN_APPID = "2016091401906455";
101 -  
102 - public static final String OUYIN_KEY_MD5 = "nozhau70yynk2dtmdz97maw13qo0h6rz";  
103 -  
104 - public static final String OUYIN_MCH_RSA_PRIVATE = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKqYgXtur32Spmu9" +  
105 - "AJZK0g6ghSQbJIbCcriePO60KlsB4xNstAwwgQ0Q619aV/gm5u+ejwc+05rko1LV" +  
106 - "I+8XAT7fk+f2MdvqZFeWWD8ESK+ZB/9yLwQW7kaiDRXtCSzkGUGp/MRJS4jgpbd6" +  
107 - "RlXTAhnNy7f6tCxzeJYEOBgHa2kVAgMBAAECgYEAjRXDQAmyKO/3onKU4bbPMjme" +  
108 - "4tVvx+NYbUawrdlijhFpcs8buFkE4YF0p09YIWpK4zEGqL9U0Wz1hbOwHDOyWqtl" +  
109 - "eaAkQd8Nq2VsGO2lkq2Nc9tnWXwdm5EJj9NxgCevdRlodYq47WXafSr6j00HD0pi" +  
110 - "b6EP2TCh62e9QRGfSqECQQDUrfCfnCqEz2EnlD338Ixe4b/d1iNBAE/yzl1zqsSg" +  
111 - "EaAtZjq9CniIYhUuiKvUcBleoA8aMFc5p0xMimSvDxpXAkEAzVghtSKgCZNALSJA" +  
112 - "B3obDPTuVejbh3156/FeXmIhkATs50T2W0DC0E+PYIZCT8e2hJ/0lWYfXBMhPaob" +  
113 - "ab2McwJAYkLG5IdbYacKpSWph88cm43DfrO78AE77tuHc7RXSfk6vx73TnXzAFgI" +  
114 - "n0pH0UvFfOGIeLoS4rE34DkkkXjx2wJAWuIc2RygFFzV1KQKDsUeX9ev/Nn4/7ir" +  
115 - "U6Aakk+AZ0umxp0hJDY/gw8TeDcz9jeAMqbRC6aNTqUw2ygExgIcvQJAbUCgtAfB" +  
116 - "6ZG7dCe1+qAG1S/tVd24ZwKqPP0KVRa8Do4qFbIQjv5Cou4DOf35ifLfGzRUWF4D" +  
117 - "juPP619T5yGTHA==";  
118 -  
119 -  
120 - public static final String CROSS_BORDER_RSA_PRIVATE = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALmkG51+GXXK5eDM\n" +  
121 - "V42xi/MRXt/LCKkv+1Xzoo2gno+gE91DScdMz1odmXiNW5RMJ+AvaFTOJ3fIHk3w\n" +  
122 - "75Ebje7w0UZQ8/JPYManMKV1TdDisp8hzPDK0/kBTGQQQvlgpMLp1aFbfp1TqRID\n" +  
123 - "v40cZMcA4imUiOeD22VlBW9j35WhAgMBAAECgYBxgAGWUBO27h+QSr85FZVwPm2Y\n" +  
124 - "PGWGM5ziVzxKhSqMu52JiWthW/fmq/Q6PYsBZ3J14eZS+1wsIwFMPAPs30DuDFTX\n" +  
125 - "6wMNpl44K4MVUgpT6CcEv2DAhZ+5NgjiKztbiAcZxqakt/VawSx5Li6E0AtqOOTH\n" +  
126 - "G/7GIiOJo3T4tJSEcQJBAN5So7tl1m0fULSVHwiRfSJpa6QT4bjReD8X9Rzj9YeK\n" +  
127 - "07Q+ufmkkRJVFBHJEVHmC5cZwf3zrb1Gu04bkHscTC0CQQDVwwCAzCktNKW7ig8G\n" +  
128 - "1w8ZNU52fMRHT7vnJtR4huI+9pD3k0qtB8gyR9TcHu6mAZH90mWg1OJ4ipwNjmLL\n" +  
129 - "HDPFAkEAyEonG9L5RMHrkWSu2qdH1tKmmOEYf8qmzCCnQGnWb1AQvdes8EzkLWHc\n" +  
130 - "fNFp+yCG3I/mBwWbRmQMpqeKmH672QJBAKJfq+QqMSULltDsQBncBrYJTf6nK5lX\n" +  
131 - "sc4WKtMa8oUNWnUVR2ZEQQgglEpYnMMw8iqyRUx0KUuTTpLlk5nhZFkCQGuZtT34\n" +  
132 - "CrknMjYrpibDYPaT8NljffTrnJspAeste6CDLHyH0mgVDzADyXrzuoWNF4UMqWE8\n" +  
133 - "toAXZXd//cA4ZOw=";  
134 -  
135 - public static final String CROSS_BORDER_RSA_PUBLIC = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRA\n" +  
136 - "FljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQE\n" +  
137 - "B/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5Ksi\n" +  
138 - "NG9zpgmLCUYuLkxpLQIDAQAB";  
139 -  
140 - public static final String OUYIN_ALI_MAPI_RSA_PUBLIC = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRAFljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQEB/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5KsiNG9zpgmLCUYuLkxpLQIDAQAB";  
141 -  
142 -  
143 - public static final String OUYIN_ALI_RSA_PUBLIC = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDI6d306Q8fIfCOaTXyiUeJHkrIvYISRcc73s3vF1ZT7XN8RNPwJxo8pWaJMmvyTn9N4HQ632qJBVHf8sxHi/fEsraprwCtzvzQETrNRwVxLO5jVmRGi60j8Ue1efIlzPXV9je9mkjzOmdssymZkh2QhUrCmZYI/FCEa3/cNMW0QIDAQAB";  
144 -  
145 - /*******************/ //OUYIN01 欧印南京贸易有限公司第一分公司  
146 - public static final String OUYIN01_PARTNER = "2088821975536417";  
147 -  
148 - public static final String OUYIN01_APPID = "2017121800943287";  
149 -  
150 - public static final String OUYIN01_KEY_MD5 = ""; //无  
151 -  
152 - 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=";  
153 -  
154 - public static final String OUYIN01_ALI_RSA_PUBLIC = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDI6d306Q8fIfCOaTXyiUeJHkrIvYISRcc73s3vF1ZT7XN8RNPwJxo8pWaJMmvyTn9N4HQ632qJBVHf8sxHi/fEsraprwCtzvzQETrNRwVxLO5jVmRGi60j8Ue1efIlzPXV9je9mkjzOmdssymZkh2QhUrCmZYI/FCEa3/cNMW0QIDAQAB";  
155 -  
156 -  
157 - private static final Map<String, List<Integer>> MCH_PAYTYPE_MAP = new HashMap<>(); 35 + public static final String OUYIN_EMAIL = "ouyin@yoho.cn";
  36 + public static final String OUYIN_USER_NAME = "欧印南京贸易有限公司";
158 37
159 38
160 } 39 }
@@ -76,10 +76,6 @@ public abstract class AbstractAlipayService extends AbstractPayService { @@ -76,10 +76,6 @@ public abstract class AbstractAlipayService extends AbstractPayService {
76 return ""; 76 return "";
77 } 77 }
78 78
79 - protected String getRsaAliMApipubKey() {  
80 - return "";  
81 - }  
82 -  
83 @Autowired 79 @Autowired
84 private AlipaySignatureHelperFactory factory; 80 private AlipaySignatureHelperFactory factory;
85 81
@@ -799,10 +795,7 @@ public abstract class AbstractAlipayService extends AbstractPayService { @@ -799,10 +795,7 @@ public abstract class AbstractAlipayService extends AbstractPayService {
799 795
800 public boolean notifyVerifyMApi(Map<String, String> params) { 796 public boolean notifyVerifyMApi(Map<String, String> params) {
801 String preSignStr = getSignString(params); 797 String preSignStr = getSignString(params);
802 -  
803 - logger.info("method notifyVerifyMApi in preSignStr is {}, sign is {}, RsaAlipubKey is {}", preSignStr, params.get("sign"), getRsaAliMApipubKey());  
804 -  
805 - return RSAUtils.verify(preSignStr, params.get("sign"), getRsaAliMApipubKey(), AlipayConfig.input_charset); 798 + return helper().verifyWithRsa(preSignStr,AlipayConfig.input_charset,params.get("sign"));
806 } 799 }
807 800
808 /** 801 /**
@@ -1010,11 +1003,6 @@ public abstract class AbstractAlipayService extends AbstractPayService { @@ -1010,11 +1003,6 @@ public abstract class AbstractAlipayService extends AbstractPayService {
1010 if(StringUtils.isEmpty(notifyId)) 1003 if(StringUtils.isEmpty(notifyId))
1011 return false; 1004 return false;
1012 1005
1013 - // TODO 验证开关是否打开  
1014 -// if(orderDegradeProperties.enableAlipayCheckAtn()) {  
1015 -// return true;  
1016 -// }  
1017 -  
1018 String result = obtainAtn(outTradeNo, notifyId); 1006 String result = obtainAtn(outTradeNo, notifyId);
1019 1007
1020 //除非支付系统明确返回false，其余情况全部放通 1008 //除非支付系统明确返回false，其余情况全部放通
@@ -27,8 +27,4 @@ public class AlipayOuyinService extends AbstractAlipayService { @@ -27,8 +27,4 @@ public class AlipayOuyinService extends AbstractAlipayService {
27 return AlipayConfig.OUYIN_EMAIL; 27 return AlipayConfig.OUYIN_EMAIL;
28 } 28 }
29 29
30 - protected String getRsaAliMApipubKey() {  
31 - return AlipayConfig.OUYIN_ALI_MAPI_RSA_PUBLIC;  
32 - }  
33 -  
34 } 30 }