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

application/expand/controller/Xcx.php

@@ -27,7 +27,7 @@ class Xcx extends BaseAuth
         parent::__construct();
         
         if($this->_inWhiteList == true){
-            return true;
+            return ;
         }
 
         $this->_Account = $this->getKey($this->_apiCode);
@@ -80,6 +80,9 @@ class Xcx extends BaseAuth
         if(!empty($params['tip'])){
             $body = $params['tip'];
         }
+        if(empty($body)){
+            $body = $this->_apiCode;
+        }
         $unifiedOrder->setParameter("body",$body."[". substr($params['order_no'],-8)."]"); //商品描述
         $unifiedOrder->setParameter("attach",$body); //商品描述
         //自定义订单号，此处仅作举例

public/COMPANY_LIST/SRDS/auth.php

@@ -3,10 +3,16 @@
 return [
 
     'Xcx_pay_appId'=>'wx6943561b4c99e044',
-    'Xcx_mchId'=>'no',
-    'Xcx_pay_key'=>'NLyogkbd80HkD32rCtT02Cvl1Rt8sWPo',
+    'Xcx_mchId'=>'1603056544',
+    'Xcx_pay_key'=>'739iV4PL6iLjYxG7bqrQ1Skfl2Ik7Ct1',
     'Xcx_secret'=>'a1b268bf5137ddaf26035d836a4063fe',
     'email_auth'=>1,
+
+    'Xcx_pay_notify_url'=>[
+        'http://yuyue-api.izaotu.com/api/order/notify'
+    ],
+
+    'tip'=>'High-end-customization',
     
     'signKey'=>'533E269CD14DBF46257C09612CE51EC9',
 ];