Merge branch 'master' of http://git.qiniu1314.com/Kirin/shenying

app/Request.php

@@ -138,7 +138,6 @@ class Request extends \think\Request
      */
     public function getFromType()
     {
-        @file_put_contents('from_type.txt', $this->header('Form-type', ''), FILE_APPEND);
         return $this->header('Form-type', '');
     }
 

app/services/pay/PayServices.php

@@ -121,6 +121,7 @@ class PayServices
                     } else {
                         //微信支付，从APP端请求过来
                         if (request()->isApp()) {
+                            @file_put_contents('from_type.txt', 'sdadas', FILE_APPEND);
                             return Payment::appPay($openid, $orderId, $price, $successAction, $body);
                         } else {
                             //开启了v3支付