Bläddra i källkod

refactor(AllinpaySDK): 调整参数顺序并更新测试配置

更新了AllinpaySDK中参数的顺序,将必填参数集中放置。同时更新了SybConstants中的生产环境配置,移除了测试环境的注释,并将SM2密钥改为从环境变量获取。
skyfffire 1 vecka sedan
förälder
incheckning
37c71fd1d2

+ 8 - 8
src/main/java/common/utils/tl/AllinpaySDK.java

@@ -44,16 +44,16 @@ public class AllinpaySDK {
             params.put("appid", SybConstants.SYB_APPID);
             params.put("version", SybConstants.VERSION);
             params.put("trxamt", String.valueOf(trxamt));
-            params.put("reqsn", reqsn);
+            params.put("charset", charset);
+            params.put("returl", returl);
+            params.put("notify_url", notify_url);
             params.put("body", body);
             params.put("remark", remark);
-            params.put("notify_url", notify_url);
             params.put("randomstr", SybUtil.getValidatecode(8));
             params.put("signtype", SybConstants.SIGN_TYPE);
+            params.put("reqsn", reqsn);
 
             // 添加可选参数
-            if (!SybUtil.isEmpty(returl)) params.put("returl", returl);
-            if (!SybUtil.isEmpty(charset)) params.put("charset", charset);
             if (validtime != null) params.put("validtime", String.valueOf(validtime));
             if (!SybUtil.isEmpty(limit_pay)) params.put("limit_pay", limit_pay);
             if (!SybUtil.isEmpty(truename)) params.put("truename", truename);
@@ -321,12 +321,12 @@ public class AllinpaySDK {
         System.out.println("=== 通联支付H5收银台测试 ===");
         
         // 测试参数
-        String reqsn = "H5TEST" + System.currentTimeMillis(); // 商户订单号
+        String reqsn = "H5" + System.currentTimeMillis(); // 商户订单号
         Long trxamt = 100L; // 1元(分为单位)
-        String body = "测试商品";
-        String remark = "H5收银台测试订单";
+        String body = "鲁迅的茶";
+        String remark = "鲁迅的书";
         String notify_url = "https://dlsh-nft.com.cn/api/notify/allinpay";
-        String returl = "https://dlsh-nft.com.cn/success.html";
+        String returl = "https://dlsh-nft.com.cn";
         String charset = "UTF-8";
         Integer validtime = 30; // 30分钟有效期
         

+ 10 - 32
src/main/java/common/utils/tl/SybConstants.java

@@ -1,41 +1,19 @@
 package common.utils.tl;
 
 public class SybConstants {
-//	测试环境测试参数
-//	public static final String SYB_ORGID = "";//集团/机构模式下该参数不为空,且appid与key是与次参数对应
-//	public static final String SYB_CUSID = "990581007426001";
-//	public static final String SYB_APPID = "00000051";
-//	public static final String SYB_MD5_APPKEY = "allinpay888";
-//	public static final String SYB_APIURL = "http://172.16.1.10/apiweb";
-    /**
-     * 商户RSA私钥,用于向通联发起请求前进行签名
-     **/
-//	public static final String SYB_RSACUSPRIKEY = "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAK5aIo+E1eyWwEIgMB8ZEZRAaWjSAglmfKVhzy8N1eLjAlqPjJgOCqXGEYt/r61AyIjCCJiYVDTHzcqstmbBU7HKpYjTsquCLjRWcL/fhMwMGBSg2bP5mqw5locSOz1gtRujmd3kZo9OIJuWtfG2+wgPPdKUdGZS+5K8WtWCF4z1AgMBAAECgYAPvvqvkPzb9tpqrmsCJ/qvM6kBazP9Ytjfe8ehFYQLT1qrUJsPMXdzNMHpYhD82eSyeymZFGrIcIIMq4/2lD+pYOMQTMGGjoVb2wnQhZFqPdgjXgOQ90E43X69jD3p5F8CuKVNa13I4l3iyfzlVIL780JPdJdug7yKEFdSeOQZUQJBAONlFpIqz87pbnwzfgO5kRTbbI7DcyObb8OEeCK3VlGB3r9P4NoMEDaXm+HnIdv53gnFq+xgbREWUt2nFq9dSUUCQQDESOIdSvIBc3KQTYR+cnlQTH0SOvm0Tlx4KekBCLxTFAFyBqnOBLdVyQb6Z1wxGz855AjnNbHy1rFhUYQ6hPfxAkAIRZUcnBITJMqwGe9rk0SDzbeVOebmVLEsG5WDLcgmDuNbcjxrsiSk178D6LSCnARHtrkaUCenh3hcN8fLeUlBAkABNP2G9pYEYkRbFM7yxBtw3feK7Cfq7uxspL1VD0uxKxdTLy1OIgNKmMDdO1N6zdMWtQtE+LSObLmMgqbQgU7RAkBFX5kl4+B3k+/aCYB/ndqd1nQIr4SNAtLFJDtlW2xah9W2lQL/7KQDT4o4dUMY51m7Bu61SAmKtralv7Hf25yf";
-//	/**通联平台RSA公钥,用于请求返回或者通联通知的验签**/
-//	public static final String SYB_RSATLPUBKEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYXfu4b7xgDSmEGQpQ8Sn3RzFgl5CE4gL4TbYrND4FtCYOrvbgLijkdFgIrVVWi2hUW4K0PwBsmlYhXcbR+JSmqv9zviVXZiym0lK3glJGVCN86r9EPvNTusZZPm40TOEKMVENSYaUjCxZ7JzeZDfQ4WCeQQr2xirqn6LdJjpZ5wIDAQAB";
-//
-//	/**商户sm2私钥,用于向通联发起请求前进行签名**/
-//	public static final String SYB_SM2PPRIVATEKEY = "MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgjj4Rk+b0YjwO+UwXofnHf4bK+kaaY5Btkd8nMP2VimmgCgYIKoEcz1UBgi2hRANCAAQqlALW4qGC3bP1x3wo5QsKxaCMEZJ2ODTTwOQ+d8UGU7GoK/y/WMBQWf5upMnFU06p5FxGooXYYoBtldgm03hq";
-//	/**通联平台sm2公钥,用于请求返回或者通联通知的验签**/
-//	public static final String SYB_SM2TLPUBKEY = "MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE/BnA8BawehBtH0ksPyayo4pmzL/u1FQ2sZcqwOp6bjVqQX4tjo930QAvHZPJ2eez8sCz/RYghcqv4LvMq+kloQ==";
-
-//	正式环境测试参数
-    public static final String SYB_ORGID = "";//集团/机构模式下该参数不为空,且appid与key是与次参数对应
-    public static final String SYB_CUSID = "990440148166000";
-    public static final String SYB_APPID = "00000003";
-    public static final String SYB_MD5_APPKEY = "a0ea3fa20dbd7bb4d5abf1d59d63bae8";
+    //	正式环境测试参数
+    public static final String SYB_ORGID = "";
+    public static final String SYB_CUSID = "660222053994DLK";
+    public static final String SYB_APPID = "00375513";
+    public static final String SYB_MD5_APPKEY = "";
     public static final String SYB_APIURL = "https://vsp.allinpay.com/apiweb";//生产环境
-    public static final String SYB_RSACUSPRIKEY = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAO0HpPUP+eHk//Ba6ZOePvoZVDpOCRtt943oeVfCTllye43bqja1jVIaebX0MgX+yPYnWIQIOJ9ubSH0R4iyY9y1/HR00qkUpfW3/0usBPt9qn7r0xtFHerhVCd4dT2rKb2Oc5IhKOg05cw/BmMFohMkFsqt0jlrUXI8zJOlLIcxAgMBAAECgYA9lt/pAYa3iK5sQOMyhUrt54j4QXCiXPeXOxHUmNuM6G9sU+itoI0hCVoYymP5JNQJCf45CH3WB3Z5/SRdQ6Uoo1cjao6cCohPLxMSfJglsZCHckPH53o25RKEza4njIgKC+yN7HAhanKymhw/yYQ6i0aXq38zFIk8djMtE7R6xQJBAP6jvNy7UhPKO5rxGFKR+MvvbO3qnYH6x0jZCGY3FlxuGfbavueOiFtMeK67FuDv683dcUKi+M48yR4kH5CfIusCQQDuS9KF6mlm3kHAiZWgVhE8VVNYGpRLCRDgAKm4InGmvk5mUv+O1yAtAFVAEHWIgD4awC7Eqf1YFrSF/It9HV9TAkEAsXiU7JJxhfFw0XAvL30lFZ1tIfReinSp6A+7VuIV552k4vNaEjC4wEjv43fpXiRZCEXJ5lOHbNXYpfUvOrBuuQJAOpow8rf8Jc0g1G3Be0XPRUwii/c1YuKe4Meo9VybIIuKkkV1Dba/9fEwBepGTURkgYWjur+nSyOCT7UUxLcVewJAPLig8dVfKpsiNwYuveEYMcFaO5xoRuiB7v+CMmvxpuuK+rrFS+d7RdmwDbnBiDV4JkTgFObUiGvB7MtS+LGfhw==";
-    public static final String SYB_RSATLPUBKEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCm9OV6zH5DYH/ZnAVYHscEELdCNfNTHGuBv1nYYEY9FrOzE0/4kLl9f7Y9dkWHlc2ocDwbrFSm0Vqz0q2rJPxXUYBCQl5yW3jzuKSXif7q1yOwkFVtJXvuhf5WRy+1X5FOFoMvS7538No0RpnLzmNi3ktmiqmhpcY/1pmt20FHQQIDAQAB";
+    public static final String SYB_RSACUSPRIKEY = "";
+    public static final String SYB_RSATLPUBKEY = "";
 
     public static final String VERSION = "12";
-    public static final String RET_URL = "https://test.allinpaygd.com/JWeb/reccomparams.jsp";
-    public static final String NOTFIY_URL = "https://test.allinpaygd.com/JWeb/NotifyServlet";
-    public static final String VALID_TIME = "5";
-    public static final String SIGN_TYPE = "SM2";//
+    public static final String SIGN_TYPE = "SM2";
     //	/**商户sm2私钥,用于向通联发起请求前进行签名**/
-    public static final String SYB_SM2PPRIVATEKEY = "MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgjj4Rk+b0YjwO+UwXofnHf4bK+kaaY5Btkd8nMP2VimmgCgYIKoEcz1UBgi2hRANCAAQqlALW4qGC3bP1x3wo5QsKxaCMEZJ2ODTTwOQ+d8UGU7GoK/y/WMBQWf5upMnFU06p5FxGooXYYoBtldgm03hq";
+    public static final String SYB_SM2PPRIVATEKEY = System.getenv("TL_SM2_PRIVATE_KEY");
     //	/**通联平台sm2公钥,用于请求返回或者通联通知的验签**/
-    public static final String SYB_SM2TLPUBKEY = "MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAEBQicgWm0KAMqhO3bdqMUEDrKQvYg8cCXHhdGwq7CGE6oJDzJ1P/94HpuVdBf1KidmPxr7HOH+0DAnpeCcx9TcQ==";
-
+    public static final String SYB_SM2TLPUBKEY = System.getenv("TL_SM2_PUBLIC_KEY");
 }