修改冲突

app/Helper/helper.php

@@ -46,20 +46,3 @@ function verifySign($sign, $params, $secret_key)
 
 }
 
-function http($url, $param, $method = 'post')
-{
-    try {
-        $client = new \GuzzleHttp\Client();
-        $response = $client->request($method, $url, $param);
-        $result = json_decode($response->getBody()->getContents(), true);
-        if ($result['code'] == 0) {
-            return $result['data'];
-        } else {
-            return [];
-        }
-    } catch (\Exception $exception) {
-        return [];
-    }
-
-}
-