1. 转录安装单处理

application/libraries/Source/SourceGalanz.php

@@ -141,6 +141,7 @@ class SourceGalanz extends Source
     public function CreateWorkOrder($id, $data)
     {
         $result = $this->HandelCallOrder($id, $data, 'CreateWorkOrder');
+        $this->HandelOrderError($result);
 
         //获取订单id
         preg_match('/new_srv_workorderEP.aspx\?id=([^\']+)\'/', $result, $arr);
@@ -164,6 +165,7 @@ class SourceGalanz extends Source
     public function CreateUserProfileOrder($id, $data)
     {
         $result = $this->HandelCallOrder($id, $data, 'CreateUserprofile');
+        $this->HandelOrderError($result);
 
         //获取订单id
         preg_match('/new_srv_userprofileEP.aspx\?id=([^\']+)\'/', $result, $arr);
@@ -1303,7 +1305,7 @@ class SourceGalanz extends Source
                 break;
 
             case 'CreateUserprofile':
-                $post['__EVENTTARGET'] = 'ctl00%24ContentHeader%24btnCreateUserprofile';
+                $post['__EVENTTARGET'] = 'ctl00$ContentHeader$btnCreateUserprofile';
                 break;
 
             case 'Accept':
@@ -2514,12 +2516,16 @@ class SourceGalanz extends Source
     private function HandelOrderError($html)
     {
         preg_match('/<scriptt[^>]*>alert\("([^"]+)"\);?<\/scriptt>/', $html, $arr);
+
         $error = isset($arr[1]) ? $arr[1] : '';
 
-        $error_needle = ['已保存', '成功'];
-        foreach ($error_needle as $key => $value) {
-            if (stripos($error, $value) !== false) {
-                return_msg(false, $error);
+        if ($error) {
+            $error_needle = ['已保存', '成功'];
+
+            foreach ($error_needle as $key => $value) {
+                if (stripos($error, $value) === false) {
+                    return_msg(false, $error);
+                }
             }
         }
     }

application/libraries/source/source.php

@@ -16,7 +16,7 @@ class Source
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $url);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($curl, CURLOPT_TIMEOUT, 30);
+        curl_setopt($curl, CURLOPT_TIMEOUT, 15);
         curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
         curl_setopt($curl, CURLOPT_COOKIEJAR, self::$cookieFilePath); //获取COOKIE并存储
         $contents = curl_exec($curl);
@@ -29,7 +29,7 @@ class Source
     {
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $url);
-        curl_setopt($curl, CURLOPT_TIMEOUT, 30);
+        curl_setopt($curl, CURLOPT_TIMEOUT, 15);
         curl_setopt($curl, CURLOPT_HEADER, 0);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($curl, CURLOPT_COOKIEFILE, self::$cookieFilePath);
@@ -45,12 +45,13 @@ class Source
         curl_setopt($curl, CURLOPT_URL, $url);
         curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($curl, CURLOPT_TIMEOUT, 30);
+        curl_setopt($curl, CURLOPT_TIMEOUT, 20);
         curl_setopt($curl, CURLOPT_COOKIEFILE, self::$cookieFilePath);
         curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($post));
         $result = curl_exec($curl);
         $code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
         curl_close($curl);
+        $this->ReturnError($result, $url);
 
         return ['code' => $code, 'data' => $result];
     }
@@ -61,11 +62,19 @@ class Source
         curl_setopt($curl, CURLOPT_URL, $url);
         curl_setopt($curl, CURLOPT_HEADER, 0);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($curl, CURLOPT_TIMEOUT, 30);
+        curl_setopt($curl, CURLOPT_TIMEOUT, 15);
         curl_setopt($curl, CURLOPT_COOKIEFILE, self::$cookieFilePath); //读取cookie
         $rs = curl_exec($curl); //执行cURL抓取页面内容
         curl_close($curl);
+        $this->ReturnError($rs, $url);
 
         return $rs;
     }
+
+    protected function ReturnError($html, $url)
+    {
+        if (!$html) {
+            return_msg(false, '地址请求失败', $url);
+        }
+    }
 }
\ No newline at end of file