Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -390,33 +390,66 @@ class HtmlCollect extends Command
                         $js_html = curl_c(getImageUrl($new_source), false);
                         preg_match_all("/[large|thumb]+URL:['\"]+(\s*[^>]+?)['\"]+,/i", $js_html, $result_js_source);
                         $js_source = $result_js_source[1] ?? [];
-                        foreach ($js_source as $vjs) {
-                            $vjs_result = $this->url_check($vjs, $project_id, $domain, $web_url_domain, $home_url);
-                            if (!$vjs_result) {
-                                continue;
-                            }
+                        if($js_source){
+                            foreach ($js_source as $vjs) {
+                                $vjs_result = $this->url_check($vjs, $project_id, $domain, $web_url_domain, $home_url);
+                                if (!$vjs_result) {
+                                    continue;
+                                }
 
-                            if ($vjs_result['download']) {
-                                $new_vjs = CosService::uploadRemote($project_id, 'source', $vjs_result['url_complete']);
-                                if ($new_vjs) {
-                                    CollectSource::insert([
-                                        'project_id' => $project_id,
-                                        'origin' => $vjs_result['url'],
-                                        'target' => $new_vjs,
-                                        'created_at' => date('Y-m-d H:i:s'),
-                                        'updated_at' => date('Y-m-d H:i:s'),
-                                    ]);
-                                    $js_html = str_replace($vjs, getImageUrl($new_vjs), $js_html);
+                                if ($vjs_result['download']) {
+                                    $new_vjs = CosService::uploadRemote($project_id, 'source', $vjs_result['url_complete']);
+                                    if ($new_vjs) {
+                                        CollectSource::insert([
+                                            'project_id' => $project_id,
+                                            'origin' => $vjs_result['url'],
+                                            'target' => $new_vjs,
+                                            'created_at' => date('Y-m-d H:i:s'),
+                                            'updated_at' => date('Y-m-d H:i:s'),
+                                        ]);
+                                        $js_html = str_replace($vjs, getImageUrl($new_vjs), $js_html);
+                                    }
+                                } else {
+                                    $js_html = str_replace($vjs, getImageUrl($vjs_result['url_complete']), $js_html);
                                 }
-                            } else {
-                                $js_html = str_replace($vjs, getImageUrl($vjs_result['url_complete']), $js_html);
                             }
+
+                            CosService::uploadRemote($project_id, 'source', $new_source, $new_source, $js_html);
+                        }
+                    }
+                }
+            } elseif(substr($vs['url_complete'], -2, 2) == 'js') {
+
+                $js_html = curl_c(getImageUrl($vs['url_complete']), false);
+                preg_match_all("/[large|thumb]+URL:['\"]+(\s*[^>]+?)['\"]+,/i", $js_html, $result_js_source);
+                $js_source = $result_js_source[1] ?? [];
+                if($js_source){
+                    foreach ($js_source as $vjs) {
+                        $vjs_result = $this->url_check($vjs, $project_id, $domain, $web_url_domain, $home_url);
+                        if (!$vjs_result) {
+                            continue;
                         }
 
-                        CosService::uploadRemote($project_id, 'source', $new_source, $new_source, $js_html);
+                        if ($vjs_result['download']) {
+                            $new_vjs = CosService::uploadRemote($project_id, 'source', $vjs_result['url_complete']);
+                            if ($new_vjs) {
+                                CollectSource::insert([
+                                    'project_id' => $project_id,
+                                    'origin' => $vjs_result['url'],
+                                    'target' => $new_vjs,
+                                    'created_at' => date('Y-m-d H:i:s'),
+                                    'updated_at' => date('Y-m-d H:i:s'),
+                                ]);
+                                $js_html = str_replace($vjs, getImageUrl($new_vjs), $js_html);
+                            }
+                        } else {
+                            $js_html = str_replace($vjs, getImageUrl($vjs_result['url_complete']), $js_html);
+                        }
                     }
+
+                    CosService::uploadRemote($project_id, 'source', $vs['url_complete'], $vs['url_complete'], $js_html);
                 }
-            } else {
+            }else{
                 $html = str_replace($vs['url'], getImageUrl($vs['url_complete']), $html);
             }
         }

@@ -544,17 +544,17 @@ class ProjectController extends BaseController
             $this->map['entry_position'] = ['in',$this->map['entry_position']];
         }
         $lists = $hrManagerModel->list($this->map,'id',['id','manage_id','name','entry_position','is_leader']);
-        
+
         //zgj 售后技术排序调整 start
-        if(isset($this->map['entry_position'][1]) && in_array(45,$this->map['entry_position'][1])){
-            $ar_sort = ['王娇'=>1,'银蝶'=>2,'胡哲'=>3,'郭婷婷'=>4,'徐庆'=>5,'邓锦康'=>6,'兰波'=>7];
-            foreach ($lists as $k=>$v){
-                $lists[$k]['sort'] = 0;
-                if(in_array($v['name'],array_keys($ar_sort))){
-                    $lists[$k]['sort'] = $ar_sort[$v['name']];
-                }
+        $ar_sort = ['王娇'=>1,'银蝶'=>2,'胡哲'=>3,'郭婷婷'=>4,'徐庆'=>5,'邓锦康'=>6,'兰波'=>7];
+        foreach ($lists as $k=>$v){
+            $lists[$k]['sort'] = 0;
+            if(in_array($v['name'],array_keys($ar_sort))){
+                $lists[$k]['sort'] = $ar_sort[$v['name']];
             }
-            $sort_arr = array_column($lists, 'sort');
+        }
+        $sort_arr = array_column($lists, 'sort');
+        if($sort_arr){
             array_multisort($sort_arr,SORT_DESC,$lists);
         }
         //售后技术排序调整 end