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

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
 
 
 use App\Exceptions\InquiryFilterException;
 use App\Exceptions\InquiryFilterException;
 use App\Models\Mail\Mail;
 use App\Models\Mail\Mail;
+use App\Models\Project\DeployBuild;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\User\User;
 use App\Models\User\User;
 use App\Models\Visit\SyncSubmitTask;
 use App\Models\Visit\SyncSubmitTask;
@@ -124,4 +125,36 @@ class SelfSiteController extends BaseController
 
 
         return $this->success([]);
         return $this->success([]);
     }
     }
+
+    /**
+     * 自建站上传验证文件接口
+     * @param Request $request
+     * @return false|string
+     * @author Akun
+     * @date 2024/05/28 11:47
+     */
+    public function selfSiteVerify(Request $request)
+    {
+        $token = $request->header('token');//token
+        $pid = $request->header('pid');//项目id
+        $file_name = $request->input('file_name');//验证文件名称
+        $type = $request->input('type');//验证文件类型，1主站，2小语种站
+
+        if (empty($token) || empty($pid)) {
+            return $this->error('token无效', 401);
+        }
+
+        //判断token是否有效
+        $project_model = new Project();
+        $project_info = $project_model->read(['id' => $pid, 'site_token' => $token]);
+        if (!$project_info) {
+            return $this->error('token无效', 401);
+        }
+
+        $model = new DeployBuild();
+        $data = $type == 1 ? ['main_verify_file' => $file_name] : ['amp_verify_file' => $file_name];
+        $model->edit($data, ['project_id' => $pid]);
+
+        return $this->success([]);
+    }
 }
 }

@@ -264,8 +264,6 @@ class ProjectLogic extends BaseLogic
     protected function saveProjectDeployBuild($deploy_build){
     protected function saveProjectDeployBuild($deploy_build){
         $deployBuildModel = new DeployBuild();
         $deployBuildModel = new DeployBuild();
         $deploy_build['configuration'] = Arr::a2s(!empty($deploy_build['configuration']) ? $deploy_build['configuration'] : []);
         $deploy_build['configuration'] = Arr::a2s(!empty($deploy_build['configuration']) ? $deploy_build['configuration'] : []);
-        $deploy_build['main_verify_file'] = $deploy_build['main_verify_file'] ?? '';
-        $deploy_build['amp_verify_file'] = $deploy_build['amp_verify_file'] ?? '';
         $deployBuildModel->edit($deploy_build,['id'=>$deploy_build['id']]);
         $deployBuildModel->edit($deploy_build,['id'=>$deploy_build['id']]);
         return $this->success();
         return $this->success();
     }
     }

@@ -38,5 +38,6 @@ Route::any('getAutoToken', [\App\Http\Controllers\Api\PrivateController::class,
 //自建站接口转接
 //自建站接口转接
 Route::post('selfSiteApi', [\App\Http\Controllers\Api\SelfSiteController::class, 'selfSiteApi']);
 Route::post('selfSiteApi', [\App\Http\Controllers\Api\SelfSiteController::class, 'selfSiteApi']);
 Route::post('selfSiteNotify', [\App\Http\Controllers\Api\SelfSiteController::class, 'selfSiteNotify']);
 Route::post('selfSiteNotify', [\App\Http\Controllers\Api\SelfSiteController::class, 'selfSiteNotify']);
+Route::post('selfSiteVerify', [\App\Http\Controllers\Api\SelfSiteController::class, 'selfSiteVerify']);