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

 <?php
 
-namespace App\Http\Controllers\Aside\Inquiry;
+namespace App\Http\Controllers\Aside\Optimize;
 
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
-use App\Http\Logic\Aside\Projects\InquiryInfoLogic;
+use App\Http\Logic\Aside\Optimize\InquiryInfoLogic;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 
 /**

 <?php
 
-namespace App\Http\Controllers\Aside\Project;
+namespace App\Http\Controllers\Aside\Optimize;
 
 use App\Http\Controllers\Aside\BaseController;
-use App\Http\Logic\Aside\Project\OptimizeLogic;
+use App\Http\Logic\Aside\Optimize\OptimizeLogic;
 
 /**
  * @remark :优化方案设置

+<?php
+
+namespace App\Http\Controllers\Aside\Optimize;
+
+use App\Http\Controllers\Aside\BaseController;
+
+/**
+ * @remark :上线审核
+ * @class  :ProcessController.php
+ * @author :lyh
+ * @time   :2023/7/20 11:05
+ */
+class ProcessController extends BaseController
+{
+    /**
+     * @remark :上线审核列表
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/20 11:05
+     */
+    public function lists(){
+
+    }
+}

 <?php
 
-namespace App\Http\Controllers\Aside\Project;
+namespace App\Http\Controllers\Aside\Optimize;
 
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
-use App\Http\Logic\Aside\Project\GscLogic;
+use App\Http\Logic\Aside\Optimize\GscLogic;
 use App\Http\Requests\Aside\User\GscRequest;
 
 /**

 <?php
 
-namespace App\Http\Controllers\Aside\GoogleSeoIps;
+namespace App\Http\Controllers\Aside\Optimize;
 
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
-use App\Http\Logic\Aside\Projects\ProjectsLogic;
-use App\Models\GoogleSeoIps\Country;
+use App\Http\Logic\Aside\Optimize\ProjectsLogic;
 
 /**
  * @remark :谷歌流量系统

 <?php
 
-namespace App\Http\Controllers\Aside\GoogleSeoIps;
+namespace App\Http\Controllers\Aside\Optimize;
 
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
-use App\Http\Logic\Aside\Projects\ProjectsLogLogic;
+use App\Http\Logic\Aside\Optimize\ProjectsLogLogic;
 
 /**
  * @remark :谷歌流量系统日记

@@ -329,7 +329,7 @@ class FileController
         if (!is_file($path)) {
             $this->response('指定文件已被系统删除!', Code::USER_ERROR);
         }
-        $fileUrl = url('upload/files/'.basename($path));  // 文件的 URL
+        $fileUrl = url('upload'.$path);  // 文件的 URL
         $fileName = 'downloaded_file'.'.'.$info['type'];  // 要保存的文件名
         // 设置响应头
         header('Content-Type: application/octet-stream');

 <?php
 
-namespace App\Http\Logic\Aside\Project;
+namespace App\Http\Logic\Aside\Optimize;
 
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\Project\DomainInfo;

 <?php
 
-namespace App\Http\Logic\Aside\Projects;
+namespace App\Http\Logic\Aside\Optimize;
 
 use App\Http\Logic\Aside\BaseLogic;
+use App\Models\GoogleSeoIps\InquiryUser;
 use App\Models\Inquiry\InquiryCount;
 use App\Models\Inquiry\InquiryInfo;
 use App\Models\Inquiry\InquiryIP;
-use App\Models\Project\DeployBuild;
 use App\Models\Project\Keywords;
-use App\Models\GoogleSeoIps\InquiryUser;
 use Illuminate\Support\Facades\DB;
 
 /**

 <?php
 
-namespace App\Http\Logic\Aside\Project;
+namespace App\Http\Logic\Aside\Optimize;
 
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\Project\DeployOptimize;

+<?php
+
+namespace App\Http\Logic\Aside\Optimize;
+
+use App\Http\Logic\Aside\BaseLogic;
+
+/**
+ * @remark :
+ * @class  :ProcessLogic.php
+ * @author :lyh
+ * @time   :2023/7/20 11:07
+ */
+class ProcessLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->param = $this->requestAll;
+        $this->model = new Projects();
+    }
+}

 <?php
 
-namespace App\Http\Logic\Aside\Projects;
+namespace App\Http\Logic\Aside\Optimize;
 
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\GoogleSeoIps\ProjectsSeoTask;

 <?php
 
-namespace App\Http\Logic\Aside\Projects;
+namespace App\Http\Logic\Aside\Optimize;
 
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\GoogleSeoIps\Country as CountryModel;

+<?php
+
+namespace App\Models\Optimize;
+
+use App\Models\Base;
+
+/**
+ * @remark :上线审核
+ * @class  :Process.php
+ * @author :lyh
+ * @time   :2023/7/20 11:12
+ */
+class Process extends Base
+{
+
+}

@@ -196,26 +196,26 @@ Route::middleware(['aloginauth'])->group(function () {
     });
     //谷歌流量系统
     Route::prefix('projects')->group(function () {
-        Route::post('/', [Aside\GoogleSeoIps\ProjectsController::class, 'lists'])->name('projects_lists');
-        Route::post('/save', [Aside\GoogleSeoIps\ProjectsController::class, 'save'])->name('projects_save');
-        Route::post('/getCountry', [Aside\GoogleSeoIps\ProjectsController::class, 'getCountry'])->name('projects_getCountry');
-        Route::post('/del', [Aside\GoogleSeoIps\ProjectsController::class, 'del'])->name('projects_del');
+        Route::post('/', [Aside\Optimize\ProjectsController::class, 'lists'])->name('projects_lists');
+        Route::post('/save', [Aside\Optimize\ProjectsController::class, 'save'])->name('projects_save');
+        Route::post('/getCountry', [Aside\Optimize\ProjectsController::class, 'getCountry'])->name('projects_getCountry');
+        Route::post('/del', [Aside\Optimize\ProjectsController::class, 'del'])->name('projects_del');
         //谷歌流量系统日志
         Route::prefix('log')->group(function () {
-            Route::post('/', [Aside\GoogleSeoIps\ProjectsLogController::class, 'lists'])->name('projectsLog_lists');
+            Route::post('/', [Aside\Optimize\ProjectsLogController::class, 'lists'])->name('projectsLog_lists');
         });
         //优化gsc账号记录表
         Route::prefix('gsc')->group(function () {
-            Route::any('/', [Aside\Project\ProjectGscController::class, 'lists'])->name('admin.lists');
-            Route::any('/domainLists', [Aside\Project\ProjectGscController::class, 'domainLists'])->name('admin.domainLists');
-            Route::any('/read', [Aside\Project\ProjectGscController::class, 'read'])->name('admin.read');
-            Route::any('/save', [Aside\Project\ProjectGscController::class, 'save'])->name('admin.save');
-            Route::any('/del', [Aside\Project\ProjectGscController::class, 'del'])->name('admin.del');
+            Route::any('/', [Aside\Optimize\ProjectGscController::class, 'lists'])->name('admin.lists');
+            Route::any('/domainLists', [Aside\Optimize\ProjectGscController::class, 'domainLists'])->name('admin.domainLists');
+            Route::any('/read', [Aside\Optimize\ProjectGscController::class, 'read'])->name('admin.read');
+            Route::any('/save', [Aside\Optimize\ProjectGscController::class, 'save'])->name('admin.save');
+            Route::any('/del', [Aside\Optimize\ProjectGscController::class, 'del'])->name('admin.del');
         });
 
         //gsc账号审核
         Route::prefix('optimize')->group(function () {
-            Route::any('/empowerDomain', [Aside\Project\OptimizeController::class, 'empowerDomain'])->name('admin.empowerDomain');
+            Route::any('/empowerDomain', [Aside\Optimize\OptimizeController::class, 'empowerDomain'])->name('admin.empowerDomain');
         });
     });
 
@@ -271,15 +271,15 @@ Route::group([], function () {
     });
 
     Route::prefix('inquiry')->group(function () {
-        Route::any('/', [Aside\Inquiry\InquiryInfoController::class, 'lists'])->name('admin.inquiry_lists');
-        Route::any('/save', [Aside\Inquiry\InquiryInfoController::class, 'save'])->name('admin.inquiry_save');
-        Route::any('/status', [Aside\Inquiry\InquiryInfoController::class, 'status'])->name('admin.inquiry_status');
-        Route::any('/getCount', [Aside\Inquiry\InquiryInfoController::class, 'getCount'])->name('admin.inquiry_getCount');
-        Route::any('/forwardInquiry', [Aside\Inquiry\InquiryInfoController::class, 'forwardInquiry'])->name('admin.inquiry_forwardInquiry');
-        Route::any('/info', [Aside\Inquiry\InquiryInfoController::class, 'info'])->name('admin.inquiry_info');
-        Route::any('/importInquirySave', [Aside\Inquiry\InquiryInfoController::class, 'importInquirySave'])->name('admin.inquiry_importInquirySave');
-        Route::any('/getSearchIpInfo', [Aside\Inquiry\InquiryInfoController::class, 'getSearchIpInfo'])->name('admin.inquiry_getSearchIpInfo');
-        Route::any('/getKeywordUrl', [Aside\Inquiry\InquiryInfoController::class, 'getKeywordUrl'])->name('admin.inquiry_getKeywordUrl');
+        Route::any('/', [Aside\Optimize\InquiryInfoController::class, 'lists'])->name('admin.inquiry_lists');
+        Route::any('/save', [Aside\Optimize\InquiryInfoController::class, 'save'])->name('admin.inquiry_save');
+        Route::any('/status', [Aside\Optimize\InquiryInfoController::class, 'status'])->name('admin.inquiry_status');
+        Route::any('/getCount', [Aside\Optimize\InquiryInfoController::class, 'getCount'])->name('admin.inquiry_getCount');
+        Route::any('/forwardInquiry', [Aside\Optimize\InquiryInfoController::class, 'forwardInquiry'])->name('admin.inquiry_forwardInquiry');
+        Route::any('/info', [Aside\Optimize\InquiryInfoController::class, 'info'])->name('admin.inquiry_info');
+        Route::any('/importInquirySave', [Aside\Optimize\InquiryInfoController::class, 'importInquirySave'])->name('admin.inquiry_importInquirySave');
+        Route::any('/getSearchIpInfo', [Aside\Optimize\InquiryInfoController::class, 'getSearchIpInfo'])->name('admin.inquiry_getSearchIpInfo');
+        Route::any('/getKeywordUrl', [Aside\Optimize\InquiryInfoController::class, 'getKeywordUrl'])->name('admin.inquiry_getKeywordUrl');
     });
 });