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

Application/Sdk/Controller/WapPayController.class.php

@@ -624,18 +624,18 @@ class WapPayController extends BaseController{
                       $json_data['paytype'] ="wx"; 
                 }else{
                     if(!empty($request['scheme'])) {
-                        $redirect_url = (is_ssl()?'https://':'http://'). $_SERVER ['HTTP_HOST'] . "/sdk.php/Spend/pay_success2/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id'];
+                        $redirect_url = 'https://api.wmtxkj.com' . "/sdk.php/Spend/pay_success2/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id'];
                     } else {
-                        $redirect_url = (is_ssl()?'https://':'http://'). $_SERVER ['HTTP_HOST'] . "/sdk.php/Spend/pay_success/orderno/".$request['pay_order_number'];
+                        $redirect_url = 'https://api.wmtxkj.com' . "/sdk.php/Spend/pay_success/orderno/".$request['pay_order_number'];
                     }
                      $json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.urlencode( $redirect_url );
                       $json_data['paytype'] ="wx"; 
                 } 
             }else{ 
                 $json_data['status'] = 500; 
-                $json_data['url']    = "http://" . $_SERVER['HTTP_HOST']; 
+                $json_data['url']    = "https://" . 'api.wmtxkj.com'; 
             } 
-                $json_data['cal_url']    = $_SERVER ['HTTP_HOST'];
+                $json_data['cal_url']    = 'https://api.wmtxkj.com';
                 echo base64_encode(json_encode($json_data));exit;
                 // $this->redirect('WapPay/weixin_pay_view',['user_id'=>$request['user_id'],'game_id'=>$request['game_id']]);
         } else if(get_wx_pay_type() == 1){  // 威富通