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

lyh
app/Console/Commands/Inquiry/RelayInquiry.php
app/Console/Commands/Inquiry/postInquiry.php
app/Http/Controllers/Api/PrivateController.php
routes/api.php
--- a/app/Console/Commands/Inquiry/RelayInquiry.php
查看文件 @81d1a08
+++ b/app/Console/Commands/Inquiry/RelayInquiry.php
查看文件 @81d1a08
@@ -593,7 +593,7 @@ class RelayInquiry extends Command
         }
         $translateSl = Translate::translateSl($incontent);
         $lang = $translateSl['texts']['sl'] ?? 'en';
-        if ($lang == 'en' || Str::contains($lang, 'zh')) {
+        if ($lang == 'en' || $lang == 'ja' || $lang == 'ko' || Str::contains($lang, 'zh')) {
             $language = '英文';
             $lang = 'en';
         }else{
--- a/app/Console/Commands/Inquiry/postInquiry.php
查看文件 @81d1a08
+++ b/app/Console/Commands/Inquiry/postInquiry.php
查看文件 @81d1a08
@@ -6,6 +6,7 @@ use App\Models\Inquiry\ReInquiryDetail;
 use App\Models\Inquiry\ReInquiryDetailLog;
 use App\Models\Inquiry\ReInquiryForm;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Redis;
@@ -115,11 +116,16 @@ class postInquiry extends Command
             }
         }else{
             //v4 v5分离项目 往测试链接推
-            $client = new \GuzzleHttp\Client();
-            $site_array = $client->request('GET', "https://www.quanqiusou.cn/extend_api/saas/split.php", [
-                'proxy' => env('CURL_PROXY'), // 代理服务器地址和端口号
-            ])->getBody()->getContents();
-            $site_array = json_decode($site_array, true);
+            $split_api_cache_key = 'quanqiusou_split_site_array';
+            $site_array = Cache::get($split_api_cache_key);
+            if(!$site_array){
+                $client = new \GuzzleHttp\Client();
+                $site_array = $client->request('GET', "https://www.quanqiusou.cn/extend_api/saas/split.php", [
+                    'proxy' => env('CURL_PROXY'), // 代理服务器地址和端口号
+                ])->getBody()->getContents();
+                $site_array = json_decode($site_array, true);
+                Cache::put($split_api_cache_key, $site_array, 7200);
+            }
             $mail_urls = array_column($site_array, 'main_url');
             $key = array_search($website, $mail_urls);
             if ($key !== false) {
@@ -195,6 +201,7 @@ class postInquiry extends Command
             //兼容接口返回格式
             if(!empty($res['data'][0]['status'])){
                 $res['data'][0]['code'] = $res['data'][0]['status'] == 'success' ? 200 : 400;
+                !empty($res['data'][0]['msg']) && $res['message'] = $res['data'][0]['msg'];
             }
             if(empty($res['data'][0]['code']) || !in_array($res['data'][0]['code'], [200,300])){
                 $log->status = ReInquiryDetailLog::STATUS_FAIL;
--- a/app/Http/Controllers/Api/PrivateController.php
查看文件 @81d1a08
+++ b/app/Http/Controllers/Api/PrivateController.php
查看文件 @81d1a08
@@ -9,7 +9,9 @@ namespace App\Http\Controllers\Api;
 use App\Enums\Common\Code;
 use App\Http\Logic\Bside\User\UserLoginLogic;
+use App\Models\Blog\Blog;
 use App\Models\Domain\DomainInfo;
+use App\Models\News\News;
 use App\Models\Product\Category;
 use App\Models\Product\CategoryRelated;
 use App\Models\Product\Keyword;
@@ -283,4 +285,54 @@ class PrivateController extends BaseController
         }
         return $this->success($projects);
     }
+
+    /**
+     * 获取有效时间内 新增有效URL
+     * 用于自动提交Google收录
+     * @param Request $request
+     * @return false|string
+     */
+    public function projectNewUrl(Request $request)
+    {
+        $domain = trim($request->input('domain'));
+        $domain_parse = parse_url($domain);
+        $domain = $domain_parse['host'] ?? $domain;
+        $date = trim($request->input('date'));
+
+        if (empty($domain) || empty($date)) {
+            return $this->error('非法参数！');
+        }
+
+        $project = Project::getProjectByDomain($domain);
+        if (empty($project)) {
+            return $this->error('未找到当前域名对应的项目！');
+        }
+
+        ProjectServer::useProject($project->id);
+        $result = [];
+        // 查询有效时间后 有效的产品、新闻、博客、聚合页 链接
+        $product = Product::where(['status' => Product::STATUS_ON])->where('created_at', '>=', $date)->pluck('route');
+        $news = News::where(['status' => News::STATUS_ONE])->where('release_at', '>', $date)->pluck('url');
+        $blog = Blog::where(['status' => Blog::STATUS_ONE])->where('release_at', '>', $date)->pluck('url');
+        $keyword = Keyword::where('created_at', '>', $date)->pluck('route');
+
+        // 组装链接
+        foreach ($product as $item) {
+            $url = 'https://' . $domain . '/' . $item;
+            array_push($result, $url);
+        }
+        foreach ($keyword as $item) {
+            $url = 'https://' . $domain . '/' . $item;
+            array_push($result, $url);
+        }
+        foreach ($news as $item) {
+            $url = 'https://' . $domain . '/news/' . $item;
+            array_push($result, $url);
+        }
+        foreach ($blog as $item) {
+            $url = 'https://' . $domain . '/blogs/' . $item;
+            array_push($result, $url);
+        }
+        return $this->success($result);
+    }
 }
--- a/routes/api.php
查看文件 @81d1a08
+++ b/routes/api.php
查看文件 @81d1a08
@@ -39,6 +39,9 @@ Route::any('valid_user', [\App\Http\Controllers\Api\PrivateController::class, 'v
 Route::any('getAutoToken', [\App\Http\Controllers\Api\PrivateController::class, 'getAutoToken'])->name('api.getAutoToken');
 // 特殊项目 有效产品路由
 Route::any('valid_product_route', [\App\Http\Controllers\Api\PrivateController::class, 'getProductRoute'])->name('api.valid_product_route');
+// 6.0项目新增有效链接 - 提交Google
+Route::any('project_new_url', [\App\Http\Controllers\Api\PrivateController::class, 'projectNewUrl'])->name('api.project_new_url');
+
 // --------------------- 站群服务 ------------------------------------------
 // 获取项目信息