lywsvip/pay-java-parent
1
0
Fork 0
mirror of https://gitee.com/egzosn/pay-java-parent.git synced 2026-05-12 16:37:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
egzosn
2018-03-28 17:02:39 +08:00
parent 9016fa5363 4b3070cfdc
commit 65f5f234df
15 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pay-java-common/src/main/java/com/egzosn/pay/common/bean/CurType.java
View File

@@ -3,8 +3,8 @@ package com.egzosn.pay.common.bean;
/**
* 货币类型
* @author Actinia
* @email hayesfu@qq.com
* <pre>
* email hayesfu@qq.com
* create 2017 2017/1/16
* </pre>
*/

4
pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpStringEntity.java
View File

@@ -133,7 +133,7 @@ public class HttpStringEntity extends StringEntity {
* @param request 请求体
* @param contentType 内容类型
*
* @throws UnsupportedEncodingException 不支持默认的HTTP字符集
* @throws UnsupportedCharsetException 不支持默认的HTTP字符集
*/
public HttpStringEntity(String request, ContentType contentType) throws UnsupportedCharsetException {
super(request, contentType);
@@ -146,7 +146,7 @@ public class HttpStringEntity extends StringEntity {
* @param request 请求体
* @param charset 字符类型
*
* @throws UnsupportedEncodingException 不支持默认的HTTP字符集
* @throws UnsupportedCharsetException 不支持默认的HTTP字符集
*/
public HttpStringEntity(String request, String charset) throws UnsupportedCharsetException {
super(request, charset);

5
pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/CertDescriptor.java
View File

@@ -74,10 +74,11 @@ public class CertDescriptor {
}
return encryptCertTemp;
}
/**
* 通过keyStore 获取私钥签名证书PrivateKey对象
*
*
* @param pwd 证书对应密码
* @return PrivateKey 私钥
*/
public PrivateKey getSignCertPrivateKey(String pwd) {