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

lyh
app/Console/Commands/Update/HtmlCollect.php
app/Console/Commands/Update/HtmlLanguageCollect.php
app/Console/Commands/Update/ProjectUpdate.php
app/Helper/helper.php
app/Http/Logic/Bside/Inquiry/InquiryLogic.php
--- a/app/Console/Commands/Update/HtmlCollect.php
查看文件 @9c021d1
+++ b/app/Console/Commands/Update/HtmlCollect.php
查看文件 @9c021d1
@@ -9,7 +9,6 @@ use App\Models\RouteMap\RouteMap;
 use App\Services\CosService;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Redis;
@@ -77,8 +76,8 @@ class HtmlCollect extends Command
             $collect_info->status = CollectTask::STATUS_ING;
             $collect_info->save();
-            //获取站点正式和测试域名
-            $old_info = $this->getOldDomain($project_id, $collect_info->domain);
+            //获取站点原始域名信息
+            $old_info = getOldDomain($project_id, $collect_info->domain);
             //采集html页面，下载资源到本地并替换
             try {
@@ -183,42 +182,6 @@ class HtmlCollect extends Command
         return $task_id;
     }
-    //获取站点老域名
-    protected function getOldDomain($project_id, $domain)
-    {
-        $key = 'project_collect_domain_' . $project_id;
-
-        $data = Cache::get($key);
-
-        if (!$data) {
-            $web_url_domain = $domain;
-            $home_url = $domain;
-
-            $url_web_config = 'https://' . $domain . '/wp-content/cache/user_config.text';
-            $data_config = curl_c($url_web_config);
-            if ($data_config) {
-                $web_url_arr = parse_url($data_config['web_url_domain'] ?? '');
-                if (isset($web_url_arr['host'])) {
-                    $web_url_domain = $web_url_arr['host'];
-                }
-
-                $home_url_arr = parse_url($data_config['home_url'] ?? '');
-                if (isset($home_url_arr['host'])) {
-                    $home_url = $home_url_arr['host'];
-                }
-            }
-
-            $data = [
-                'web_url_domain' => $web_url_domain,
-                'home_url' => $home_url,
-            ];
-
-            Cache::add($key, $data, 3600);//缓存1小时
-        }
-
-        return $data;
-    }
-
     //正则匹配html资源
     protected function html_preg($html, $project_id, $domain, $web_url_domain, $home_url)
     {
--- a/app/Console/Commands/Update/HtmlLanguageCollect.php
查看文件 @9c021d1
+++ b/app/Console/Commands/Update/HtmlLanguageCollect.php
查看文件 @9c021d1
@@ -9,7 +9,6 @@ use App\Models\RouteMap\RouteMap;
 use App\Services\CosService;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Redis;
@@ -78,7 +77,7 @@ class HtmlLanguageCollect extends Command
             $collect_info->save();
             //获取站点正式和测试域名
-            $old_info = $this->getOldDomain($project_id, $collect_info->domain);
+            $old_info = getOldDomain($project_id, $collect_info->domain);
             //采集html页面，下载资源到本地并替换
             try {
@@ -183,42 +182,6 @@ class HtmlLanguageCollect extends Command
         return $task_id;
     }
-    //获取站点老域名
-    protected function getOldDomain($project_id, $domain)
-    {
-        $key = 'project_collect_lan_domain_' . $project_id;
-
-        $data = Cache::get($key);
-
-        if (!$data) {
-            $web_url_domain = $domain;
-            $home_url = $domain;
-
-            $url_web_config = 'https://' . $domain . '/wp-content/cache/user_config.text';
-            $data_config = curl_c($url_web_config);
-            if ($data_config) {
-                $web_url_arr = parse_url($data_config['web_url_domain'] ?? '');
-                if (isset($web_url_arr['host'])) {
-                    $web_url_domain = $web_url_arr['host'];
-                }
-
-                $home_url_arr = parse_url($data_config['home_url'] ?? '');
-                if (isset($home_url_arr['host'])) {
-                    $home_url = $home_url_arr['host'];
-                }
-            }
-
-            $data = [
-                'web_url_domain' => $web_url_domain,
-                'home_url' => $home_url,
-            ];
-
-            Cache::add($key, $data, 3600);//缓存1小时
-        }
-
-        return $data;
-    }
-
     //正则匹配html资源
     protected function html_preg($html, $project_id, $domain, $web_url_domain, $home_url)
     {
--- a/app/Console/Commands/Update/ProjectUpdate.php
查看文件 @9c021d1
+++ b/app/Console/Commands/Update/ProjectUpdate.php
查看文件 @9c021d1
@@ -73,6 +73,7 @@ class ProjectUpdate extends Command
         $api_type = $task->api_type;
         $api_url_arr = explode('?', $task->api_url);
         $api_url = $api_url_arr[0];
+        $domain_arr = parse_url($api_url);
         $page_size = 20;
@@ -81,26 +82,12 @@ class ProjectUpdate extends Command
         $task->status = UpdateLog::STATUS_ING;//同步中
         $task->save();
-        $domain_arr = parse_url($api_url);
-        //获取网站配置
-        $link_type = 0;
-        $web_url_domain = $domain_arr['host'];
-        $home_url = $domain_arr['host'];
-        $url_web_config = 'https://' . $domain_arr['host'] . '/wp-content/cache/user_config.text';
-        $data_config = curl_c($url_web_config);
-        if ($data_config) {
-            $link_type = $data_config['link_type'] ?? 0;
-
-            $web_url_arr = parse_url($data_config['web_url_domain'] ?? '');
-            if (isset($web_url_arr['host'])) {
-                $web_url_domain = $web_url_arr['host'];
-            }
+        //获取站点原始域名信息
+        $old_info = getOldDomain($project_id, $domain_arr['host']);
+        $link_type = $old_info['link_type'];
+        $web_url_domain = $old_info['web_url_domain'];
+        $home_url = $old_info['home_url'];
-            $home_url_arr = parse_url($data_config['home_url'] ?? '');
-            if (isset($home_url_arr['host'])) {
-                $home_url = $home_url_arr['host'];
-            }
-        }
         //获取所有语种
         $language_list = [];
         $url_language = 'https://' . $domain_arr['host'] . '/wp-content/plugins/proofreading/json/user_language.json';
@@ -108,6 +95,7 @@ class ProjectUpdate extends Command
         if ($data_language) {
             $language_list = array_column($data_language, 'short');
         }
+
         //获取所有页面
         $page_list = [];
         $url_page = 'https://' . $domain_arr['host'] . '/wp-content/cache/pages_list.json';
@@ -480,16 +468,19 @@ class ProjectUpdate extends Command
     //获取地址路由
     protected function get_url_route($url)
     {
-        $arr = parse_url(urldecode($url));
+        if (strpos($url, '%ec') !== false) {
+            $url = str_replace('%ec', 'v6SpecialStr', $url);
+            $url = urldecode($url);
+            $url = str_replace('v6SpecialStr', '%ec', $url);
+        } else {
+            $url = urldecode($url);
+        }
+        $arr = parse_url($url);
         if (empty($arr['path'])) {
             return '';
         }
         $path = $arr['path'];
-        if (strpos($path, '.') !== false) {
-            $path = substr($path, 0, strpos($path, '.'));
-        }
-
         $path_arr = explode('/', $path);
         return end($path_arr) ? end($path_arr) : $path_arr[count($path_arr) - 2];
@@ -623,8 +614,11 @@ class ProjectUpdate extends Command
         $url_complete = ($scheme ?: 'https') . '://' . ($host ?: $domain) . $path;
-        if ((empty($host) || $host == $web_url_domain || $host == $home_url) && $path) {
-
+        if (
+            (empty($scheme) || $scheme == 'https' || $scheme == 'http')
+            && (empty($host) || (strpos($web_url_domain, $host) !== false) || (strpos($home_url, $host) !== false))
+            && $path
+        ) {
             $source = CollectSource::where('project_id', $project_id)->where('origin', $url)->first();
             if (!$source) {
                 $new_url = CosService::uploadRemote($project_id, 'image_product', $url_complete);
--- a/app/Helper/helper.php
查看文件 @9c021d1
+++ b/app/Helper/helper.php
查看文件 @9c021d1
@@ -9,6 +9,7 @@ use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Carbon;
 use App\Models\File\File;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Redis;
 define('HTTP_OPENAI_URL', 'http://openai.waimaoq.com/');
@@ -654,6 +655,7 @@ function redis_add($key,$val,$ttl=3600){
  * 判断远程地址是否需要下载
  * @param $url
  * @author Akun
+ * @return  bool
  * @date 2023/12/08 14:17
  */
 function check_remote_url_down($url){
@@ -689,3 +691,50 @@ function check_remote_url_down($url){
     return true;
 }
+
+/**
+ * 获取升级项目原始域名
+ * @param $project_id
+ * @param $domain
+ * @return array
+ * @author Akun
+ * @date 2023/12/12 10:52
+ */
+function getOldDomain($project_id, $domain)
+{
+    $key = 'project_collect_domain_' . $project_id;
+
+    $data = Cache::get($key);
+
+    if (!$data) {
+        $link_type = 0;
+        $web_url_domain = $domain;
+        $home_url = $domain;
+
+        $url_web_config = 'https://' . $domain . '/wp-content/cache/user_config.text';
+        $data_config = curl_c($url_web_config);
+        if ($data_config) {
+            $link_type = $data_config['link_type'] ?? 0;
+
+            $web_url_arr = parse_url($data_config['web_url_domain'] ?? '');
+            if (isset($web_url_arr['host'])) {
+                $web_url_domain = $web_url_arr['host'];
+            }
+
+            $home_url_arr = parse_url($data_config['home_url'] ?? '');
+            if (isset($home_url_arr['host'])) {
+                $home_url = $home_url_arr['host'];
+            }
+        }
+
+        $data = [
+            'link_type' => $link_type,
+            'web_url_domain' => $web_url_domain,
+            'home_url' => $home_url,
+        ];
+
+        Cache::add($key, $data, 3600);//缓存1小时
+    }
+
+    return $data;
+}
--- a/app/Http/Logic/Bside/Inquiry/InquiryLogic.php
查看文件 @9c021d1
+++ b/app/Http/Logic/Bside/Inquiry/InquiryLogic.php
查看文件 @9c021d1
@@ -95,6 +95,11 @@ class InquiryLogic extends BaseLogic
             ->select($fields)->orderBy('id', 'desc')->paginate($page_size, ['*'], 'page', $page);
         $data = $lists->toArray();
         foreach ($data['list'] as &$v){
+            foreach ($v['data'] as &$field){
+                if(is_array($field) && !empty($field['path'])){
+                    $field['path'] = getImageUrl($field['path']);
+                }
+            }
             $v = array_merge($v, $v['data']);
         }
         return $this->success($data);