Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Admin/Conf/config.php

@@ -19,6 +19,11 @@ return array(
 
     'GET_INFO_KEY' => 'wmkjtx_kj213',
 
+    'OA' => array(
+        'testUrl' => 'http://test.oa.76ba.com',
+        'formalUrl' => 'http://test.oa.76ba.com',
+    ),
+
     /* 文件上传相关配置 */
     'DOWNLOAD_UPLOAD' => array(
         'mimes'    => '', //允许上传的文件MiMe类型

Application/Admin/Controller/PromoteController.class.php

@@ -110,9 +110,9 @@ class PromoteController extends ThinkController
                 $arr['pageSize'] = 1000;
                 ksort($arr);
                 reset($arr);
-                $sign = md5(http_build_query($arr) . 'wmkjtx_kj213');
+                $sign = md5(http_build_query($arr) . C('GET_INFO_KEY'));
                 $arr['sign'] = $sign;
-                $re_data = curl_post('http://test.oa.76ba.com/api/wanmeng/platformAccount', $arr);
+                $re_data = curl_post(C('OA.formalUrl') . '/api/wanmeng/platformAccount', $arr);
                 $re_data = json_decode($re_data, true);
                 if ($re_data['code'] == 1) {
                     $oa = $re_data['data'];
@@ -151,7 +151,7 @@ class PromoteController extends ThinkController
                 reset($arr);
                 $sign = md5(http_build_query($arr) . 'wmkjtx_kj213');
                 $arr['sign'] = $sign;
-                $re_data = curl_post('http://test.oa.76ba.com/api/wanmeng/verifyBind', $arr);
+                $re_data = curl_post(C('OA.formalUrl') . '/api/wanmeng/verifyBind', $arr);
                 $re_data = json_decode($re_data, true)['data'];
                 foreach ($list_data as $k => $v) {
                     $oa_val = $re_data[trim($v['account'])];

Application/Mobile/Controller/SsgController.class.php

@@ -3,6 +3,7 @@ namespace Mobile\Controller;
 use Org\Ipa365SDK\Ipa365;
 use Org\WeixinSDK\Weixin;
 use User\Api\MemberApi;
+use Think\Log;
 
 class SsgController extends BaseController {
     const USER_NOT_ILLEGAL = -1;        //用户名不合法
@@ -591,7 +592,7 @@ class SsgController extends BaseController {
                 $param['callback'] = "https://".$_SERVER['HTTP_HOST']."/mobile.php/Ssg/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
                 //$param['notifyurl'] = "https://".$_SERVER['HTTP_HOST']."/callback.php/Notify/notify/apitype/alipay";
             }
-
+            Log::write(serialize($param), Log::DEBUG);
             $ali_pay = $this->alipay($param);
             redirect($ali_pay['url']);
         }else{

ThinkPHP/Library/Think/Pay.class.php

@@ -8,6 +8,7 @@
 namespace Think;
 
 use Org\UcenterSDK\Ucservice;
+use Think\Log;
 
 class Pay
 {
@@ -167,8 +168,10 @@ class Pay
                 break;
         }
         $notifyurl = $vo->getNotifyUrl();
-        if (!$notifyurl)
-        	$notifyurl = 'http://' . $_SERVER ['HTTP_HOST'] . '/callback.php/Notify2/notify/apitype/alipay/methodtype/notify';
+        if (!$notifyurl){
+            $notifyurl = 'http://' . $_SERVER ['HTTP_HOST'] . '/callback.php/Notify2/notify/apitype/alipay/methodtype/notify';
+        }
+        Log::write($notifyurl, Log::DEBUG);   
         $request->setNotifyUrl($notifyurl);
 
         switch ($type) {