From 7abcdab53153b503de23c83b49d1667475f102b4 Mon Sep 17 00:00:00 2001 From: egan Date: Sun, 21 Jan 2018 13:34:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pay-java-ali/README.md | 2 +- pay-java-ali/pom.xml | 2 +- pay-java-common/pom.xml | 2 +- .../pay/common/http/HttpStringEntity.java | 6 +- .../egzosn/pay/common/http/UriVariables.java | 1 - .../java/com/egzosn/pay/common/util/Util.java | 40 +++---- .../pay/common/util/sign/CertDescriptor.java | 113 +++--------------- .../pay/common/util/sign/encrypt/SHA1.java | 7 +- .../pay/common/util/sign/encrypt/SHA256.java | 6 +- .../pay/common/util/sign/encrypt/sm3/SM3.java | 11 +- .../util/sign/encrypt/sm3/SM3Digest.java | 28 +++-- pay-java-demo/pom.xml | 2 +- pay-java-fuiou/pom.xml | 2 +- .../pay/fuiou/api/FuiouPayConfigStorage.java | 2 +- .../egzosn/pay/fuiou/api/FuiouPayService.java | 2 +- .../egzosn/pay/fuiou/bean/FuiouCurType.java | 2 +- .../pay/fuiou/bean/FuiouTransactionType.java | 2 +- pay-java-union/pom.xml | 2 +- .../pay/union/api/UnionPayConfigStorage.java | 5 +- .../egzosn/pay/union/api/UnionPayService.java | 23 ++-- .../egzosn/pay/union/bean/SDKConstants.java | 6 +- .../pay/union/bean/UnionTransactionType.java | 2 +- pay-java-union/src/test/java/PayTest.java | 1 + pay-java-wx-youdian/pom.xml | 2 +- pay-java-wx/pom.xml | 2 +- pom.xml | 8 +- 26 files changed, 106 insertions(+), 175 deletions(-) diff --git a/pay-java-ali/README.md b/pay-java-ali/README.md index 80d677df..84ce9754 100644 --- a/pay-java-ali/README.md +++ b/pay-java-ali/README.md @@ -150,7 +150,7 @@ ```java - Map result = service..query("支付宝单号", "我方系统单号"); + Map result = service.query("支付宝单号", "我方系统单号"); ``` diff --git a/pay-java-ali/pom.xml b/pay-java-ali/pom.xml index 33c79ecc..97f86f5b 100644 --- a/pay-java-ali/pom.xml +++ b/pay-java-ali/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.6-SNAPSHOT + 2.0.6 4.0.0 pay-java-ali diff --git a/pay-java-common/pom.xml b/pay-java-common/pom.xml index f4b80828..30aeb653 100644 --- a/pay-java-common/pom.xml +++ b/pay-java-common/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.6-SNAPSHOT + 2.0.6 4.0.0 jar diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpStringEntity.java b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpStringEntity.java index 56fed0e5..bd6ee400 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpStringEntity.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpStringEntity.java @@ -14,8 +14,10 @@ * 请求实体 * * @author egan - * @email egzosn@gmail.com - * @date 2017/12/20 + * 
+ * email egzosn@gmail.com
+ * date 2017/12/20
+ *
*/ public class HttpStringEntity extends StringEntity { diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/http/UriVariables.java b/pay-java-common/src/main/java/com/egzosn/pay/common/http/UriVariables.java index 7c81ea94..d34a41cd 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/http/UriVariables.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/http/UriVariables.java @@ -127,7 +127,6 @@ public static String getMapToParameters(Map pe){ * * @param str 需要解析的字符串 * @return 解析的结果map - * @throws UnsupportedEncodingException */ public static JSONObject getParametersToMap (String str) { diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/Util.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/Util.java index a033597e..88d0d2ec 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/util/Util.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/Util.java @@ -2,8 +2,7 @@ import java.math.BigInteger; -public class Util -{ +public class Util{ /** * 整形转换成网络传输的字节流（字节数组）型数据 * @@ -61,8 +60,8 @@ public static byte[] longToBytes(long num) /** * 大数字转换字节流（字节数组）型数据 * - * @param n - * @return + * @param n 大整形 + * @return 字节数组 */ public static byte[] byteConvert32Bytes(BigInteger n) { @@ -96,8 +95,8 @@ else if(n.toByteArray().length == 32) /** * 换字节流（字节数组）型数据转大数字 * - * @param b - * @return + * @param b 字节数组 + * @return 大整形 */ public static BigInteger byteConvertInteger(byte[] b) { @@ -114,8 +113,8 @@ public static BigInteger byteConvertInteger(byte[] b) /** * 根据字节数组获得值(十六进制数字) * - * @param bytes - * @return + * @param bytes 字节数组 + * @return 16进制字符串 */ public static String getHexString(byte[] bytes) { @@ -125,9 +124,9 @@ public static String getHexString(byte[] bytes) /** * 根据字节数组获得值(十六进制数字) * - * @param bytes - * @param upperCase - * @return + * @param bytes 字节数组 + * @param upperCase 是否大写 + * @return 转换后的字符串 */ public static String getHexString(byte[] bytes, boolean upperCase) { @@ -142,7 +141,7 @@ public static String getHexString(byte[] bytes, boolean upperCase) /** * 打印十六进制字符串 * - * @param bytes + * @param bytes 字节数组 */ public static void printHexString(byte[] bytes) { @@ -187,8 +186,7 @@ public static byte[] hexStringToBytes(String hexString) /** * Convert char to byte * - * @param c - * char + * @param c char * @return byte */ public static byte charToByte(char c) @@ -327,8 +325,7 @@ protected static int toDigit(char ch, int index) { /** * 数字字符串转ASCII码字符串 * - * @param String - * 字符串 + * @param content 字符串 * @return ASCII字符串 */ public static String StringToAsciiString(String content) { @@ -389,8 +386,7 @@ public static int hexStringToAlgorism(String hex) { /** * 十六转二进制 * - * @param hex - * 十六进制字符串 + * @param hex 十六进制字符串 * @return 二进制字符串 */ public static String hexStringToBinary(String hex) { @@ -456,8 +452,7 @@ public static String hexStringToBinary(String hex) { /** * ASCII码字符串转数字字符串 * - * @param String - * ASCII字符串 + * @param content ASCII字符串 * @return 字符串 */ public static String AsciiStringToString(String content) { @@ -532,8 +527,7 @@ public static int binaryToAlgorism(String binary) { /** * 十进制转换为十六进制字符串 * - * @param algorism - * int 十进制的数字 + * @param algorism 十进制的数字 * @return String 对应的十六进制字符串 */ public static String algorismToHEXString(int algorism) { @@ -609,7 +603,7 @@ public static int parseToInt(String s, int defaultInt) { /** * 十六进制串转化为byte数组 - * + *@param hex 16进制的字符 * @return the array of byte */ public static byte[] hexToByte(String hex) diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/CertDescriptor.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/CertDescriptor.java index 0b640ead..89dc2a2f 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/CertDescriptor.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/CertDescriptor.java @@ -27,9 +27,8 @@ /** - * @ClassName: CertDescriptor - * @Description: acpsdk证书工具类，主要用于对证书的加载和使用 - * @date 2016-7-22 下午2:46:20 + * acpsdk证书工具类，主要用于对证书的加载和使用 + * date 2016-7-22 下午2:46:20 * 声明：以下代码只是为了方便接入方测试而提供的样例代码，商户可以根据自己需要，按照技术文档编写。该代码仅供参考，不提供编码，性能，规范性等方面的保障 */ public class CertDescriptor { @@ -46,8 +45,8 @@ public class CertDescriptor { /** * 通过证书路径初始化为公钥证书 - * @param path - * @return + * @param path 证书地址 + * @return X509 证书 */ private static X509Certificate initCert(String path) { X509Certificate encryptCertTemp = null; @@ -79,7 +78,7 @@ private static X509Certificate initCert(String path) { /** * 通过keyStore 获取私钥签名证书PrivateKey对象 * - * @return + * @return PrivateKey 私钥 */ public PrivateKey getSignCertPrivateKey(String pwd) { try { @@ -133,12 +132,9 @@ public String getSignCertId() { /** * 将签名私钥证书文件读取为证书存储对象 * - * @param signCertPath - * 证书文件名 - * @param signCertPwd - * 证书密码 - * @param signCertType - * 证书类型 + * @param signCertPath 证书文件名 + * @param signCertPwd 证书密码 + * @param signCertType 证书类型 */ public void initPrivateSignCert(String signCertPath, String signCertPwd, String signCertType) { @@ -158,12 +154,9 @@ public void initPrivateSignCert(String signCertPath, String signCertPwd, String /** * 将签名私钥证书文件读取为证书存储对象 * - * @param pfxkeyfile - * 证书文件名 - * @param keypwd - * 证书密码 - * @param type - * 证书类型 + * @param pfxkeyfile 证书文件名 + * @param keypwd 证书密码 + * @param type 证书类型 * @return 证书对象 * @throws IOException */ @@ -208,49 +201,12 @@ private String getCertIdIdByStore(KeyStore keyStore) { return null; } } - - /** - * 使用模和指数生成RSA公钥 注意：此代码用了默认补位方式，为RSA/None/PKCS1Padding，不同JDK默认的补位方式可能不同 - * - * @param modulus - * 模 - * @param exponent - * 指数 - * @return - */ - private PublicKey getPublicKey(String modulus, String exponent) { - try { - BigInteger b1 = new BigInteger(modulus); - BigInteger b2 = new BigInteger(exponent); - KeyFactory keyFactory = KeyFactory.getInstance("RSA", "BC"); - RSAPublicKeySpec keySpec = new RSAPublicKeySpec(b1, b2); - return keyFactory.generatePublic(keySpec); - } catch (Exception e) { - log.error("构造RSA公钥失败：" + e); - return null; - } - } - - /** - * 将字符串转换为X509Certificate对象. - * - * @param x509CertString - * @return - */ - public X509Certificate genCertificateByStr(String x509CertString) { - X509Certificate x509Cert = null; - try { - CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC"); - InputStream tIn = new ByteArrayInputStream(x509CertString.getBytes("ISO-8859-1")); - x509Cert = (X509Certificate) cf.generateCertificate(tIn); - } catch (Exception e) { - log.error("gen certificate error", e); - } - return x509Cert; - } + + /** - * 加载中级证书 + * 加载中级证书 + * @param certPath 证书地址 */ public void initPublicCert(String certPath) { if (!StringUtils.isEmpty(certPath)) { @@ -260,8 +216,10 @@ public void initPublicCert(String certPath) { log.info("PublicKeyCert is empty"); } } + /** * 加载根证书 + * @param certPath 证书地址 */ public void initRootCert(String certPath) { if (!StringUtils.isEmpty(certPath)) { @@ -274,7 +232,7 @@ public void initRootCert(String certPath) { /** * 获取公钥/中级证书 - * @return + * @return X509Certificate */ public X509Certificate getPublicCert() { return publicKeyCert; @@ -282,49 +240,16 @@ public X509Certificate getPublicCert() { /** * 获取中级证书 - * @return + * @return X509Certificate */ public X509Certificate getRootCert() { return rootKeyCert; } - /** - * 获取证书的CN - * @param aCert - * @return - */ - private String getIdentitiesFromCertficate(X509Certificate aCert) { - String tDN = aCert.getSubjectDN().toString(); - String tPart = ""; - if ((tDN != null)) { - String tSplitStr[] = tDN.substring(tDN.indexOf("CN=")).split("@"); - if (tSplitStr != null && tSplitStr.length > 2 - && tSplitStr[2] != null) - tPart = tSplitStr[2]; - } - return tPart; - } - - /** - * 证书文件过滤器 - * - */ - static class CerFilter implements FilenameFilter { - public boolean isCer(String name) { - if (name.toLowerCase().endsWith(".cer")) { - return true; - } else { - return false; - } - } - public boolean accept(File dir, String name) { - return isCer(name); - } - } } diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/SHA1.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/SHA1.java index 83167c5e..36a99cba 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/SHA1.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/SHA1.java @@ -7,8 +7,11 @@ /** * SHA1签名工具 * @author Actinia - * @email hayesfu@qq.com - * @create 2017 2017/11/27 0027 + * 
+ * email hayesfu@qq.com
+ *
+ * create 2017 2017/11/27 0027
+ *
*/ public class SHA1 { diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/SHA256.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/SHA256.java index b7ed21b1..663c0c79 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/SHA256.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/SHA256.java @@ -9,8 +9,10 @@ /** * @author Actinia - * @email hayesfu@qq.com - * @create 2017 2017/11/27 0027 + * 
+ * email hayesfu@qq.com
+ * create 2017 2017/11/27 0027
+ *
*/ public class SHA256 { diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/sm3/SM3.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/sm3/SM3.java index 1656c322..934a7bb1 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/sm3/SM3.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/sm3/SM3.java @@ -219,10 +219,9 @@ private static int P1(int X) /** * 对最后一个分组字节数据padding * - * @param in - * @param bLen - * 分组个数 - * @return + * @param in 输入字节 + * @param bLen 分组个数 + * @return 分组好的字节 */ public static byte[] padding(byte[] in, int bLen) { @@ -249,8 +248,8 @@ public static byte[] padding(byte[] in, int bLen) /** * 字节数组逆序 * - * @param in - * @return + * @param in 输入字节 + * @return 排序好的字节 */ private static byte[] back(byte[] in) { diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/sm3/SM3Digest.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/sm3/SM3Digest.java index 1d132455..cf62b248 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/sm3/SM3Digest.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/sm3/SM3Digest.java @@ -1,7 +1,6 @@ package com.egzosn.pay.common.util.sign.encrypt.sm3; -public class SM3Digest -{ +public class SM3Digest { /** SM3值的长度 */ private static final int BYTE_LENGTH = 32; @@ -25,8 +24,8 @@ public class SM3Digest public SM3Digest() { } - public SM3Digest(SM3Digest t) - { + + public SM3Digest(SM3Digest t){ System.arraycopy(t.xBuf, 0, this.xBuf, 0, t.xBuf.length); this.xBufOff = t.xBufOff; System.arraycopy(t.V, 0, this.V, 0, t.V.length); @@ -37,7 +36,7 @@ public SM3Digest(SM3Digest t) * * @param out 保存SM3结构的缓冲区 * @param outOff 缓冲区偏移量 - * @return + * @return 字节长度 */ public int doFinal(byte[] out, int outOff) { @@ -46,6 +45,9 @@ public int doFinal(byte[] out, int outOff) return BYTE_LENGTH; } + /** + * 重置 + */ public void reset() { xBufOff = 0; @@ -56,12 +58,9 @@ public void reset() /** * 明文输入 * - * @param in - * 明文输入缓冲区 - * @param inOff - * 缓冲区偏移量 - * @param len - * 明文长度 + * @param in 明文输入缓冲区 + * @param inOff 缓冲区偏移量 + * @param len 明文长度 */ public void update(byte[] in, int inOff, int len) { @@ -87,6 +86,9 @@ public void update(byte[] in, int inOff, int len) xBufOff += inputLen; } + /** + * 更新 + */ private void doUpdate() { byte[] B = new byte[BLOCK_LENGTH]; @@ -98,6 +100,10 @@ private void doUpdate() xBufOff = 0; } + /** + * 转16进制 + * @param B 字节数组 + */ private void doHash(byte[] B) { byte[] tmp = SM3.CF(V, B); diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml index 8baa10ee..94b84fdd 100644 --- a/pay-java-demo/pom.xml +++ b/pay-java-demo/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.6-SNAPSHOT + 2.0.6 4.0.0 war diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml index 28456408..7d0448b8 100644 --- a/pay-java-fuiou/pom.xml +++ b/pay-java-fuiou/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.6-SNAPSHOT + 2.0.6 4.0.0 pay-java-fuiou diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java index 9b350ed3..480ee7d1 100644 --- a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java +++ b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java @@ -3,8 +3,8 @@ /** * @author Actinia - * @email hayesfu@qq.com * 
+ * email hayesfu@qq.com
  * create 2017 2017/1/16 0016
  *
*/ diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java index 77776b9f..5819b6c9 100644 --- a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java +++ b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java @@ -21,8 +21,8 @@ /** * @author Actinia - * @email hayesfu@qq.com * 
+ *email hayesfu@qq.com
  * create 2017 2017/1/16 0016
  *
*/ diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouCurType.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouCurType.java index 264c1ed8..3691e466 100644 --- a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouCurType.java +++ b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouCurType.java @@ -5,8 +5,8 @@ /** * 货币类型 * @author Actinia - * @email hayesfu@qq.com * 
+ * email hayesfu@qq.com
  * create 2017 2017/1/16 0016
  *
*/ diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouTransactionType.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouTransactionType.java index 9280ecfa..4d47e8de 100644 --- a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouTransactionType.java +++ b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouTransactionType.java @@ -5,8 +5,8 @@ /** * 支付类型 * @author Actinia - * @email hayesfu@qq.com * 
+ *  email hayesfu@qq.com
  * create 2017 2017/1/16 0016
  *
*/ diff --git a/pay-java-union/pom.xml b/pay-java-union/pom.xml index b4a2ec58..b17afb9d 100644 --- a/pay-java-union/pom.xml +++ b/pay-java-union/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.6-SNAPSHOT + 2.0.6 4.0.0 diff --git a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayConfigStorage.java b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayConfigStorage.java index 6117c8db..4235a26b 100644 --- a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayConfigStorage.java +++ b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayConfigStorage.java @@ -5,9 +5,10 @@ /** * @author Actinia - * @email hayesfu@qq.com + * * 
-    create 2017 2017/11/4 0004
+ * email hayesfu@qq.com
+ *   create 2017 2017/11/4 0004
  *
*/ public class UnionPayConfigStorage extends BasePayConfigStorage { diff --git a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java index ec36d925..b2b9831f 100644 --- a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java +++ b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java @@ -30,8 +30,10 @@ /** * @author Actinia - * @email hayesfu@qq.com - * @create 2017 2017/11/5 + * 
+ * email hayesfu@qq.com
+ * create 2017 2017/11/5
+ *
*/ public class UnionPayService extends BasePayService { private static final Log log = LogFactory.getLog(UnionPayService.class); @@ -53,15 +55,12 @@ public class UnionPayService extends BasePayService { private static final String FILE_TRANS_URL= "https://filedownload.%s/"; private static final String APP_TRANS_URL= "https://gateway.%s/gateway/api/appTransReq.do"; private static final String CARD_TRANS_URL= "https://gateway.%s/gateway/api/cardTransReq.do"; + + /** - * 以下缴费产品使用，其余产品用不到 + * 构造函数 + * @param payConfigStorage 支付配置 */ -// private static final String JF_FRONT_TRANS_URL= "https://gateway.%s/jiaofei/api/frontTransReq.do"; -// private static final String JF_BACK_TRANS_URL= "https://gateway.%s/jiaofei/api/backTransReq.do"; -// private static final String JF_SINGLE_QUERY_URL= "https://gateway.%s/jiaofei/api/queryTrans.do"; -// private static final String JF_APP_TRANS_URL= "https://gateway.%s/jiaofei/api/appTransReq.do"; -// private static final String JF_CARD_TRANS_URL= "https://gateway.%s/jiaofei/api/cardTransReq.do"; - public UnionPayService (PayConfigStorage payConfigStorage) { super(payConfigStorage); } @@ -348,8 +347,8 @@ public Map microPay (PayOrder order) { /** * 将字符串转换为X509Certificate对象. * - * @param x509CertString - * @return + * @param x509CertString 证书串 + * @return X509Certificate */ public static X509Certificate genCertificateByStr(String x509CertString) { X509Certificate x509Cert = null; @@ -391,7 +390,7 @@ public PayOutMessage successPayOutMessage (PayMessage payMessage) { /** * 获取输出消息，用户返回给支付端, 针对于web端 * - * @param ` 发起支付的订单信息 + * @param orderInfo 发起支付的订单信息 * @param method 请求方式 "post" "get", * * @return 获取输出消息，用户返回给支付端, 针对于web端 diff --git a/pay-java-union/src/main/java/com/egzosn/pay/union/bean/SDKConstants.java b/pay-java-union/src/main/java/com/egzosn/pay/union/bean/SDKConstants.java index 4a066100..536e2948 100644 --- a/pay-java-union/src/main/java/com/egzosn/pay/union/bean/SDKConstants.java +++ b/pay-java-union/src/main/java/com/egzosn/pay/union/bean/SDKConstants.java @@ -16,9 +16,9 @@ /** * - * @ClassName SDKConstants - * @Description acpsdk常量类 - * @date 2016-7-22 下午4:05:54 + * acpsdk常量类 + * + * date 2016-7-22 下午4:05:54 * */ public class SDKConstants { diff --git a/pay-java-union/src/main/java/com/egzosn/pay/union/bean/UnionTransactionType.java b/pay-java-union/src/main/java/com/egzosn/pay/union/bean/UnionTransactionType.java index 2520ba67..fcc30fdf 100644 --- a/pay-java-union/src/main/java/com/egzosn/pay/union/bean/UnionTransactionType.java +++ b/pay-java-union/src/main/java/com/egzosn/pay/union/bean/UnionTransactionType.java @@ -7,8 +7,8 @@ /** * @author Actinia - * @email hayesfu@qq.com * 
+ *   email hayesfu@qq.com
     create 2017 2017/11/4 0004
  *
*/ diff --git a/pay-java-union/src/test/java/PayTest.java b/pay-java-union/src/test/java/PayTest.java index 5ae125ea..731d621b 100644 --- a/pay-java-union/src/test/java/PayTest.java +++ b/pay-java-union/src/test/java/PayTest.java @@ -1,5 +1,6 @@ import com.egzosn.pay.common.bean.MethodType; import com.egzosn.pay.common.bean.PayOrder; +import com.egzosn.pay.common.bean.RefundOrder; import com.egzosn.pay.union.api.UnionPayConfigStorage; import com.egzosn.pay.union.api.UnionPayService; import com.egzosn.pay.union.bean.UnionTransactionType; diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml index ca009ac8..e6c1ceab 100644 --- a/pay-java-wx-youdian/pom.xml +++ b/pay-java-wx-youdian/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.6-SNAPSHOT + 2.0.6 4.0.0 pay-java-wx-youdian diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml index a23a015d..381e7dd6 100644 --- a/pay-java-wx/pom.xml +++ b/pay-java-wx/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.6-SNAPSHOT + 2.0.6 4.0.0 pay-java-wx diff --git a/pom.xml b/pom.xml index c689c09c..a1a01726 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.egzosn pay-java-parent pom - 2.0.6-SNAPSHOT + 2.0.6 Pay Java - Parent Pay Java Parent @@ -43,8 +43,8 @@ pay-java-wx pay-java-wx-youdian pay-java-fuiou - pay-java-demo pay-java-union + pay-java-demo @@ -125,7 +125,7 @@ utf-8 - + \ No newline at end of file