规范notifyUrl字段属性写法

binarywang · binarywang · commit 1a4ca8c0bdbd · 2018-01-19T17:12:17.000+08:00
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java
@@ -8,7 +8,7 @@
 public class FileUtils {
 
   /**
-   * 创建临时文件
+   * 创建临时文件.
    *
    * @param inputStream 输入文件流
    * @param name        文件名
@@ -24,7 +24,7 @@ public static File createTmpFile(InputStream inputStream, String name, String ex
   }
 
   /**
-   * 创建临时文件
+   * 创建临时文件.
    *
    * @param inputStream 输入文件流
    * @param name        文件名
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java
@@ -56,11 +56,14 @@ public File execute(String uri, String queryParam) throws WxErrorException, IOEx
       return null;
     }
 
-    File file = File.createTempFile(FilenameUtils.getBaseName(fileName), FilenameUtils.getExtension(fileName),
-      super.tmpDirFile);
+    File file = File.createTempFile(
+      FilenameUtils.getBaseName(fileName), "." + FilenameUtils.getExtension(fileName), super.tmpDirFile
+    );
+
     try (BufferedSink sink = Okio.buffer(Okio.sink(file))) {
       sink.writeAll(response.body().source());
     }
+
     file.deleteOnExit();
     return file;
   }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
@@ -214,7 +214,7 @@ public class WxPayUnifiedOrderRequest extends BaseWxPayRequest {
    */
   @Required
   @XStreamAlias("notify_url")
-  private String notifyURL;
+  private String notifyUrl;
 
   /**
    * <pre>
@@ -319,9 +319,11 @@ public class WxPayUnifiedOrderRequest extends BaseWxPayRequest {
 
   /**
    * 如果配置中已经设置，可以不设置值.
+   *
+   * @param notifyUrl 支付回调通知地址
    */
-  public void setNotifyURL(String notifyURL) {
-    this.notifyURL = notifyURL;
+  public void setNotifyUrl(String notifyUrl) {
+    this.notifyUrl = notifyUrl;
   }
 
   /**
@@ -342,8 +344,8 @@ protected void checkConstraints() throws WxPayException {
 
   @Override
   public void checkAndSign(WxPayConfig config) throws WxPayException {
-    if (StringUtils.isBlank(this.getNotifyURL())) {
-      this.setNotifyURL(config.getNotifyUrl());
+    if (StringUtils.isBlank(this.getNotifyUrl())) {
+      this.setNotifyUrl(config.getNotifyUrl());
     }
 
     if (StringUtils.isBlank(this.getTradeType())) {
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
@@ -8,7 +8,6 @@
 import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult;
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
-import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.github.binarywang.wxpay.constant.WxPayConstants.BillType;
 import com.github.binarywang.wxpay.constant.WxPayConstants.SignType;
 import com.github.binarywang.wxpay.constant.WxPayConstants.TradeType;
@@ -26,7 +25,7 @@
 import java.util.Calendar;
 import java.util.Date;
 
-import static com.github.binarywang.wxpay.constant.WxPayConstants.*;
+import static com.github.binarywang.wxpay.constant.WxPayConstants.TarType;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.*;
 
@@ -53,7 +52,7 @@ public void testUnifiedOrder() throws WxPayException {
       .body("我去")
       .totalFee(1)
       .spbillCreateIp("11.1.11.1")
-      .notifyURL("111111")
+      .notifyUrl("111111")
       .tradeType(TradeType.JSAPI)
       .openid(((XmlWxPayConfig) this.payService.getConfig()).getOpenid())
       .outTradeNo("1111112")
@@ -76,7 +75,7 @@ public void testCreateOrder_jsapi() throws Exception {
         .body("我去")
         .totalFee(1)
         .spbillCreateIp("11.1.11.1")
-        .notifyURL("111111")
+        .notifyUrl("111111")
         .tradeType(TradeType.JSAPI)
         .openid(((XmlWxPayConfig) this.payService.getConfig()).getOpenid())
         .outTradeNo("1111112")
@@ -92,7 +91,7 @@ public void testCreateOrder_app() throws Exception {
         .body("我去")
         .totalFee(1)
         .spbillCreateIp("11.1.11.1")
-        .notifyURL("111111")
+        .notifyUrl("111111")
         .tradeType(TradeType.APP)
         .outTradeNo("1111112")
         .build());
@@ -108,7 +107,7 @@ public void testCreateOrder_native() throws Exception {
         .totalFee(1)
         .productId("aaa")
         .spbillCreateIp("11.1.11.1")
-        .notifyURL("111111")
+        .notifyUrl("111111")
         .tradeType(TradeType.NATIVE)
         .outTradeNo("111111290")
         .build());

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`public class FileUtils {`
`9`	`9`
`10`	`10`	`/**`
`11`		`- * 创建临时文件`
	`11`	`+ * 创建临时文件.`
`12`	`12`	`*`
`13`	`13`	`* @param inputStream 输入文件流`
`14`	`14`	`* @param name 文件名`
`@@ -24,7 +24,7 @@ public static File createTmpFile(InputStream inputStream, String name, String ex`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`/**`
`27`		`- * 创建临时文件`
	`27`	`+ * 创建临时文件.`
`28`	`28`	`*`
`29`	`29`	`* @param inputStream 输入文件流`
`30`	`30`	`* @param name 文件名`
Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,14 @@ public File execute(String uri, String queryParam) throws WxErrorException, IOEx`
`56`	`56`	`return null;`
`57`	`57`	`}`
`58`	`58`
`59`		`- File file = File.createTempFile(FilenameUtils.getBaseName(fileName), FilenameUtils.getExtension(fileName),`
`60`		`- super.tmpDirFile);`
	`59`	`+ File file = File.createTempFile(`
	`60`	`+ FilenameUtils.getBaseName(fileName), "." + FilenameUtils.getExtension(fileName), super.tmpDirFile`
	`61`	`+ );`
	`62`	`+`
`61`	`63`	`try (BufferedSink sink = Okio.buffer(Okio.sink(file))) {`
`62`	`64`	`sink.writeAll(response.body().source());`
`63`	`65`	`}`
	`66`	`+`
`64`	`67`	`file.deleteOnExit();`
`65`	`68`	`return file;`
`66`	`69`	`}`