Merge branch 'master' of iqiyoo:zhuishuyun_wap

app/Http/Controllers/Wap/Pay/MonthOrderController.php

@@ -63,7 +63,7 @@ class MonthOrderController extends Controller
         Log::info(compact('app_id','app_secret','plan_id','user_id','ip','sign'));
         //$url = 'http://pap.manyuedu.org/h5.php?'.http_build_query(compact('app_id','app_secret','plan_id','user_id','ip','sign'));
         $url = 'http://pap.manyuedu.org/?'.http_build_query(compact('app_id','app_secret','plan_id','user_id','ip','sign'));
-        //return $url;
+        return $url;
         return $client->get($url)->getBody()->getContents();
     }
 
@@ -72,7 +72,7 @@ class MonthOrderController extends Controller
         Log::info($request->all());
         Log::info($request->getMethod());
         Log::info('signCallBack-------------------end-----------------------signCallBack');
-
+        return response('success');
     }
 
     public function orderCallBack(Request $request){
@@ -81,6 +81,7 @@ class MonthOrderController extends Controller
         Log::info($request->all());
         Log::info($request->getMethod());
         Log::info('orderCallBack--------------------endend----------------------orderCallBack');
+        return response('success');
     }
 
     public function monthSignCallBack(Request $request){