wechat/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-11-08 08:47:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

批量格式化代码

Browse Source
This commit is contained in:
Binary Wang
2017-05-11 17:07:08 +08:00
parent 5f887739a3
commit 8982cf8471
223 changed files with 2425 additions and 2793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/WxPayOrderNotifyResponse.java
View File

@ -4,7 +4,6 @@ import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import com.thoughtworks.xstream.annotations.XStreamOmitField;
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
import me.chanjar.weixin.common.util.xml.XStreamInitializer;

37
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java
View File

@ -28,22 +28,6 @@ import java.math.BigDecimal;
* @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
*/
public abstract class WxPayBaseRequest {
/**
* 检查请求参数内容，包括必填参数以及特殊约束
*/
protected void checkFields() throws WxErrorException {
//check required fields
BeanUtils.checkRequiredFields(this);
//check other parameters
this.checkConstraints();
}
/**
* 检查约束情况
*/
protected abstract void checkConstraints();
/**
* <pre>
* 公众账号ID
@ -68,7 +52,6 @@ public abstract class WxPayBaseRequest {
*/
@XStreamAlias("mch_id")
protected String mchId;
/**
* <pre>
* 服务商模式下的子商户公众账号ID
@ -81,7 +64,6 @@ public abstract class WxPayBaseRequest {
*/
@XStreamAlias("sub_appid")
protected String subAppId;
/**
* <pre>
* 服务商模式下的子商户号
@ -128,6 +110,22 @@ public abstract class WxPayBaseRequest {
return new BigDecimal(yuan).setScale(2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).intValue();
}
/**
* 检查请求参数内容，包括必填参数以及特殊约束
*/
protected void checkFields() throws WxErrorException {
//check required fields
BeanUtils.checkRequiredFields(this);
//check other parameters
this.checkConstraints();
}
/**
* 检查约束情况
*/
protected abstract void checkConstraints();
public String getAppid() {
return this.appid;
}
@ -209,6 +207,7 @@ public abstract class WxPayBaseRequest {
* 2、补充系统参数，如果未传入则从配置里读取
* 3、生成签名，并设置进去
* </pre>
*
* @param config 支付配置对象，用于读取相应系统配置信息
*/
public void checkAndSign(WxPayConfig config) throws WxErrorException {
@ -227,7 +226,7 @@ public abstract class WxPayBaseRequest {
}
if (StringUtils.isBlank(getSubMchId())) {
this. setSubMchId(config.getSubMchId());
this.setSubMchId(config.getSubMchId());
}
if (StringUtils.isBlank(getNonceStr())) {

27
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java
View File

@ -28,16 +28,6 @@ import java.util.Arrays;
public class WxPayRefundRequest extends WxPayBaseRequest {
private static final String[] REFUND_ACCOUNT = new String[]{"REFUND_SOURCE_RECHARGE_FUNDS",
"REFUND_SOURCE_UNSETTLED_FUNDS"};
@Override
public void checkAndSign(WxPayConfig config) throws WxErrorException {
if (StringUtils.isBlank(this.getOpUserId())) {
this.setOpUserId(config.getMchId());
}
super.checkAndSign(config);
}
/**
* <pre>
* 设备号
@ -50,7 +40,6 @@ public class WxPayRefundRequest extends WxPayBaseRequest {
*/
@XStreamAlias("device_info")
private String deviceInfo;
/**
* <pre>
* 微信订单号
@ -63,7 +52,6 @@ public class WxPayRefundRequest extends WxPayBaseRequest {
*/
@XStreamAlias("transaction_id")
private String transactionId;
/**
* <pre>
* 商户订单号
@ -76,7 +64,6 @@ public class WxPayRefundRequest extends WxPayBaseRequest {
*/
@XStreamAlias("out_trade_no")
private String outTradeNo;
/**
* <pre>
* 商户退款单号
@ -90,7 +77,6 @@ public class WxPayRefundRequest extends WxPayBaseRequest {
@Required
@XStreamAlias("out_refund_no")
private String outRefundNo;
/**
* <pre>
* 订单金额
@ -104,7 +90,6 @@ public class WxPayRefundRequest extends WxPayBaseRequest {
@Required
@XStreamAlias("total_fee")
private Integer totalFee;
/**
* <pre>
* 退款金额
@ -118,7 +103,6 @@ public class WxPayRefundRequest extends WxPayBaseRequest {
@Required
@XStreamAlias("refund_fee")
private Integer refundFee;
/**
* <pre>
* 货币种类
@ -131,7 +115,6 @@ public class WxPayRefundRequest extends WxPayBaseRequest {
*/
@XStreamAlias("refund_fee_type")
private String refundFeeType;
/**
* <pre>
* 操作员
@ -145,7 +128,6 @@ public class WxPayRefundRequest extends WxPayBaseRequest {
//@Required
@XStreamAlias("op_user_id")
private String opUserId;
/**
* <pre>
* 退款资金来源
@ -186,6 +168,15 @@ public class WxPayRefundRequest extends WxPayBaseRequest {
return new Builder();
}
@Override
public void checkAndSign(WxPayConfig config) throws WxErrorException {
if (StringUtils.isBlank(this.getOpUserId())) {
this.setOpUserId(config.getMchId());
}
super.checkAndSign(config);
}
public String getDeviceInfo() {
return this.deviceInfo;
}

14
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayShorturlRequest.java
View File

@ -24,6 +24,13 @@ public class WxPayShorturlRequest extends WxPayBaseRequest {
@XStreamAlias("long_url")
private String longUrl;
public WxPayShorturlRequest() {
}
public WxPayShorturlRequest(String longUrl) {
this.longUrl = longUrl;
}
public String getLongUrl() {
return this.longUrl;
}
@ -32,13 +39,6 @@ public class WxPayShorturlRequest extends WxPayBaseRequest {
this.longUrl = longUrl;
}
public WxPayShorturlRequest() {
}
public WxPayShorturlRequest(String longUrl) {
this.longUrl = longUrl;
}
@Override
protected void checkConstraints() {
//do nothing

48
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxScanPayNotifyResult.java
View File

@ -1,24 +1,24 @@
package com.github.binarywang.wxpay.bean.result;
import java.io.Serializable;
import com.thoughtworks.xstream.annotations.XStreamAlias;
public class WxScanPayNotifyResult extends WxPayBaseResult implements Serializable{
private static final long serialVersionUID = 3381324564266118986L;
/**
* 预支付ID
*/
@XStreamAlias("prepay_id")
private String prepayId;
public String getPrepayId() {
return prepayId;
}
public void setPrepayId(String prepayId) {
this.prepayId = prepayId;
}
}
package com.github.binarywang.wxpay.bean.result;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import java.io.Serializable;
public class WxScanPayNotifyResult extends WxPayBaseResult implements Serializable {
private static final long serialVersionUID = 3381324564266118986L;
/**
* 预支付ID
*/
@XStreamAlias("prepay_id")
private String prepayId;
public String getPrepayId() {
return prepayId;
}
public void setPrepayId(String prepayId) {
this.prepayId = prepayId;
}
}

77
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
View File

@ -24,48 +24,17 @@ public class WxPayConfig {
private String keyPath;
private boolean useSandboxEnv = false;
public void setNotifyUrl(String notifyUrl) {
this.notifyUrl = notifyUrl;
}
public void setTradeType(String tradeType) {
this.tradeType = tradeType;
}
/**
* 设置证书
* @param keyPath apiclient_cert.p12的文件的绝对路径
*/
public void setKeyPath(String keyPath) {
this.keyPath = keyPath;
}
public String getKeyPath() {
return keyPath;
}
public void setAppId(String appId) {
this.appId = appId;
}
public void setSubAppId(String subAppId) {
this.subAppId = subAppId;
}
public void setMchId(String mchId) {
this.mchId = mchId;
}
public void setMchKey(String mchKey) {
this.mchKey = mchKey;
}
public void setSubMchId(String subMchId) {
this.subMchId = subMchId;
}
public void setSslContext(SSLContext sslContext) {
this.sslContext = sslContext;
/**
* 设置证书
*
* @param keyPath apiclient_cert.p12的文件的绝对路径
*/
public void setKeyPath(String keyPath) {
this.keyPath = keyPath;
}
/**
@ -75,6 +44,10 @@ public class WxPayConfig {
return this.mchId;
}
public void setMchId(String mchId) {
this.mchId = mchId;
}
/**
* 商户密钥
*/
@ -82,6 +55,10 @@ public class WxPayConfig {
return this.mchKey;
}
public void setMchKey(String mchKey) {
this.mchKey = mchKey;
}
/**
* 公众号appid
*/
@ -89,6 +66,10 @@ public class WxPayConfig {
return this.appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
/**
* 服务商模式下的子商户公众账号ID
*/
@ -96,6 +77,10 @@ public class WxPayConfig {
return this.subAppId;
}
public void setSubAppId(String subAppId) {
this.subAppId = subAppId;
}
/**
* 服务商模式下的子商户号
*/
@ -103,6 +88,10 @@ public class WxPayConfig {
return this.subMchId;
}
public void setSubMchId(String subMchId) {
this.subMchId = subMchId;
}
/**
* 微信支付异步回掉地址，通知url必须为直接可访问的url，不能携带参数。
*/
@ -110,6 +99,10 @@ public class WxPayConfig {
return this.notifyUrl;
}
public void setNotifyUrl(String notifyUrl) {
this.notifyUrl = notifyUrl;
}
/**
* 交易类型
* <pre>
@ -122,10 +115,18 @@ public class WxPayConfig {
return this.tradeType;
}
public void setTradeType(String tradeType) {
this.tradeType = tradeType;
}
public SSLContext getSslContext() {
return this.sslContext;
}
public void setSslContext(SSLContext sslContext) {
this.sslContext = sslContext;
}
/**
* 微信支付是否使用仿真测试环境
* 默认不使用

8
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
View File

@ -288,6 +288,7 @@ public interface WxPayService {
* 接口地址：https://api.mch.weixin.qq.com/tools/shorturl
* 是否需要证书：否
* </pre>
*
* @param request 请求对象
*/
String shorturl(WxPayShorturlRequest request) throws WxErrorException;
@ -296,8 +297,9 @@ public interface WxPayService {
* <pre>
* 转换短链接
* </pre>
* @see WxPayService#shorturl(WxPayShorturlRequest)
*
* @param longUrl 需要被压缩的网址
* @see WxPayService#shorturl(WxPayShorturlRequest)
*/
String shorturl(String longUrl) throws WxErrorException;
@ -310,6 +312,7 @@ public interface WxPayService {
* 接口链接:
* https://api.mch.weixin.qq.com/tools/authcodetoopenid
* </pre>
*
* @param request 请求对象
* @return openid
*/
@ -319,9 +322,10 @@ public interface WxPayService {
* <pre>
* 授权码查询OPENID接口
* </pre>
* @see WxPayService#authcode2Openid(WxPayAuthcode2OpenidRequest)
*
* @param authCode 授权码
* @return openid
* @see WxPayService#authcode2Openid(WxPayAuthcode2OpenidRequest)
*/
String authcode2Openid(String authCode) throws WxErrorException;
}

2
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
View File

@ -17,11 +17,11 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.net.ssl.SSLContext;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.Map;
import javax.net.ssl.SSLContext;
/**
* Created by Binary Wang on 2016/7/28.

6
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/util/SignUtils.java
View File

@ -36,7 +36,7 @@ public class SignUtils {
* @return 签名字符串
*/
public static String createSign(Map<String, String> params, String signKey) {
// if (this.getConfig().useSandboxForWxPay()) {
// if (this.getConfig().useSandbox()) {
// //使用仿真测试环境
// //TODO 目前测试发现，以下两行代码都会出问题，所以暂不建议使用仿真测试环境
// signKey = "ABCDEFGHIJKLMNOPQRSTUVWXYZ123456";
@ -49,11 +49,11 @@ public class SignUtils {
for (String key : sortedMap.keySet()) {
String value = params.get(key);
if (StringUtils.isNotEmpty(value) && !"sign".equals(key) && !"key".equals(key)) {
toSign.append(key + "=" + value + "&");
toSign.append(key).append("=").append(value).append("&");
}
}
toSign.append("key=" + signKey);
toSign.append("key=").append(signKey);
return DigestUtils.md5Hex(toSign.toString()).toUpperCase();
}