Merge branch 'master' of http://git.ahamu.cn:9202/CHENSEN/csapi

# Conflicts:
#	.idea/php.xml

.idea/php.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpIncludePathManager">
+    <include_path>
+      <path value="$PROJECT_DIR$/vendor/topthink/think-installer" />
+      <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/vendor/psr/http-message" />
+      <path value="$PROJECT_DIR$/vendor/psr/http-client" />
+      <path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
+      <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
+      <path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
+      <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-image" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-captcha" />
+      <path value="$PROJECT_DIR$/vendor/symfony/dom-crawler" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
+      <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-worker" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-mongo" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-angular" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-helper" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-sae" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-migration" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-queue" />
+      <path value="$PROJECT_DIR$/vendor/workerman/workerman" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit-mock-objects" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-token-stream" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
+      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <path value="$PROJECT_DIR$/vendor/phpspec/prophecy" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
+      <path value="$PROJECT_DIR$/vendor/topthink/think-testing" />
+    </include_path>
+  </component>
+  <component name="PhpProjectSharedConfiguration" php_language_level="5.4.0" />
+</project>

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); //商品描述
         //自定义订单号，此处仅作举例
@@ -186,7 +189,7 @@ class Xcx extends BaseAuth
         if ($errCode == 0) {
             $data =  json_decode($data,true);
             HelperService::returnJson([
-                'data'=>  array_merge($openInfo,['appId'=>$appId]),'msg'=>'success','code'=>200
+                'data'=>  array_merge($data,['appId'=>$appId]),'msg'=>'success','code'=>200
             ]);
         }
 

public/COMPANY_LIST/MSJ/auth.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+
+    'Xcx_pay_appId'=>'wxac26792ea601584c',
+    'Xcx_mchId'=>'no',
+    'Xcx_pay_key'=>'NLyogkbd80HkD32rCtT02Cvl1Rt8sWPo',
+    'Xcx_secret'=>'643c0acd48ea8957d08bc0edde36b797',
+    'email_auth'=>1,
+    
+    'signKey'=>'533E269CD14DBF46257C09612CE51EC8',
+];

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',
 ];