Merge branch 'master' of https://git.bjtdba.com/shop/php

app/controller/api/Auth.php

@@ -961,7 +961,7 @@ class Auth extends BaseController
     function curl_java_login($phone){
         $curl = curl_init();
         curl_setopt_array($curl, array(
-            CURLOPT_URL => 'http://testshop.hxxfb.com/gateway/userCenter_service/userLogOnService/userPhoneLogOn',
+            CURLOPT_URL => 'http://shop.hxxfb.com/gateway/userCenter_service/userLogOnService/userPhoneLogOn',
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_ENCODING => '',
             CURLOPT_MAXREDIRS => 10,