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

@@ -608,6 +608,8 @@ class PrivateController extends BaseController
     public function getExternalLink(Request $request)
     public function getExternalLink(Request $request)
     {
     {
         $max_id = DB::table('gl_project_external_link_make')->where(['status' => 0])->max('id');
         $max_id = DB::table('gl_project_external_link_make')->where(['status' => 0])->max('id');
+        if (empty($max_id))
+            return $this->success();
         $links = DB::table('gl_project_external_link_make')->where(['status' => 0])->where('id', '<=', $max_id)->pluck('external_link')->toArray();
         $links = DB::table('gl_project_external_link_make')->where(['status' => 0])->where('id', '<=', $max_id)->pluck('external_link')->toArray();
         DB::table('gl_project_external_link_make')->where(['status' => 0])->where('id', '<=', $max_id)->update(['status' => 1, 'updated_at' => date('Y-m-d H:i;s')]);
         DB::table('gl_project_external_link_make')->where(['status' => 0])->where('id', '<=', $max_id)->update(['status' => 1, 'updated_at' => date('Y-m-d H:i;s')]);
         return $this->success($links);
         return $this->success($links);

@@ -16,6 +16,7 @@ use App\Models\Ai\AiBlogAuthor;
 use App\Models\Channel\Channel;
 use App\Models\Channel\Channel;
 use App\Models\Channel\User;
 use App\Models\Channel\User;
 use App\Models\Channel\Zone;
 use App\Models\Channel\Zone;
+use App\Models\Com\CollectLog;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\UpdateLog;
 use App\Models\Com\UpdateLog;
 use App\Models\Devops\Servers;
 use App\Models\Devops\Servers;
@@ -116,6 +117,8 @@ class ProjectLogic extends BaseLogic
         $info['minor_languages'] = $this->getProjectMinorLanguages($id);
         $info['minor_languages'] = $this->getProjectMinorLanguages($id);
         //升级项目采集完成时间
         //升级项目采集完成时间
         $info['collect_time'] = $info['is_upgrade'] ? UpdateLog::getProjectUpdate($id) : '';
         $info['collect_time'] = $info['is_upgrade'] ? UpdateLog::getProjectUpdate($id) : '';
+        //升级项目采集的测试站域名
+        $info['collect_test_domain'] = $info['is_upgrade'] ? CollectLog::getCollectTestDomain($id) : '';
         //获取项目所属行业
         //获取项目所属行业
         $info['deploy_optimize']['industry'] = ProjectIndustryRelated::where('project_id', $id)->pluck('industry_id')->toArray();
         $info['deploy_optimize']['industry'] = ProjectIndustryRelated::where('project_id', $id)->pluck('industry_id')->toArray();
 
 

@@ -7,4 +7,16 @@ use App\Models\Base;
 class CollectLog extends Base
 class CollectLog extends Base
 {
 {
     protected $table = 'gl_collect_log';
     protected $table = 'gl_collect_log';
+
+    /**
+     * 获取最近一次填写的采集域名
+     * @param $project_id
+     * @return string
+     * @author Akun
+     * @date 2025/09/19 14:31
+     */
+    public static function getCollectTestDomain($project_id)
+    {
+        return self::where('project_id', $project_id)->orderBy('id', 'desc')->value('test_domain') ?? '';
+    }
 }
 }