Merge branch 'develop'

src/document/cn/apis.js

@@ -441,6 +441,7 @@
  * @apiParam (PathVariable) {String} refund_id 必填，商户退款单号
  * @apiUse Sign
  * @apiParam (JSON) {int} fee 必填，退款金额，单位是货币最小单位，单个订单退款单金额总和不能超过用户支付金额
+ * @apiParam (JSON) {String} device_id 可选，设备ID
  *
  * @apiSuccess {String} return_code 执行结果
  * @apiSuccess {String} result_code

src/document/en/apis.js

@@ -344,7 +344,7 @@
  * @apiSuccess {String} pay_time Time when order is paid(yyyy-MM-dd HH:mm:ss, UTC+10)
  * @apiSuccess {String} create_time Time when order is created(according to the latest order)(yyyy-MM-dd HH:mm:ss, UTC+10)
  * @apiSuccess {String} currency Currency. Default value is AUD.
- * @apiSuccess {String} channel	 Currency. Channel. Alipay,Wechat,Bestpay.
+ * @apiSuccess {String} channel     Currency. Channel. Alipay,Wechat,Bestpay.
  *
  * @apiUse GlobalError
  * @apiError (ERROR_CODE) ORDER_MISMATCH Order ID does not belongs to current partner.
@@ -447,7 +447,7 @@
  * @apiParam (PathVariable) {String} refund_id Required, Partner refund order id
  * @apiUse Sign
  * @apiParam (JSON) {int} fee Required, Refund amount. Use base unit of the currency. Total amount of all refund orders must be less than actual paid amount.
- *
+ * @apiParam (JSON) {String} device_id is Optional, ID of the device which sends the request
  * @apiSuccess {String} return_code Execution result
  * @apiSuccess {String} result_code
  * <ul>
@@ -812,7 +812,6 @@
  */
 
 
-
 /**
  * @api {PUT} /api/v1.0/alipay/partners/{partner_code}/orders/{order_id} Create Alipay Online Order
  * @apiName AlipayOnline
@@ -897,7 +896,6 @@
  */
 
 
-
 /**
  * @api {PUT} /api/v1.0/hf_gateway/partners/{partner_code}/orders/{orderId} Create HF Web Order
  * @apiName hfapi
@@ -1029,6 +1027,7 @@
  * @apiError (ERROR_CODE) ORDER_MISMATCH Order is not belong to this partner
  *
  */
+
 /**
  * @api {PUT} /api/v1.0/customs/partners/{partner_code}/redeclare/report/{client_report_id} Redeclare
  * @apiName redeclare_report

src/test/java/au/com/royalpay/payment/manage/valid/JPinYinTest.java

@@ -68,9 +68,7 @@ public class JPinYinTest {
 
     @Test
     public void testhash(){
-        String hash = DigestUtils.sha256Hex("customer&xxnpdBRwd4sIaCCI&1575949279241&/api/sso/manager_sign_in").toLowerCase();
-        String hash2 = DigestUtils.sha256Hex("customer&xxnpdBRwd4sIaCCI&1575950092568&/api/sso/manager_sign_in&119.28.3.196").toLowerCase();
+        String hash = DigestUtils.sha256Hex("TST8&1581903765147&123&nL4FCaj8ojI3IqKUcMELPkRAamKG86oy").toLowerCase();
         System.err.println(hash);
-        System.err.println(hash2);
     }
 }