合并分支 'akun' 到 'master'

Akun



查看合并请求 !3084

@@ -205,4 +205,22 @@ class NoticeController extends BaseController
         MessagePush::addInquiryMessage(0, $project->id, $country, $name, $submit);
         MessagePush::addInquiryMessage(0, $project->id, $country, $name, $submit);
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * 获取6.0所有使用域名
+     * @return false|string
+     * @author Akun
+     * @date 2025/10/30 10:42
+     */
+    public function getAllDomain(){
+        $domainModel = new DomainInfo();
+        $lists = $domainModel->list(['status'=>DomainInfo::STATUS_ONE],'id',['domain','project_id'],'asc');
+
+        $project_model = new Project();
+        foreach ($lists as &$v){
+            $pro_info = $project_model->read(['id'=>$v['project_id']],['company']);
+            $v['company'] = $pro_info ? $pro_info['company'] : '';
+        }
+        return $this->success($lists);
+    }
 }
 }

@@ -74,6 +74,9 @@ Route::post('selfSiteSsl', [\App\Http\Controllers\Api\SelfSiteController::class,
 //创建301跳转任务
 //创建301跳转任务
 Route::any('/addRedirect',[\App\Http\Controllers\Api\NoticeController::class,'addRedirect']);
 Route::any('/addRedirect',[\App\Http\Controllers\Api\NoticeController::class,'addRedirect']);
 
 
+//获取所有有效域名
+Route::any('/getAllDomain',[\App\Http\Controllers\Api\NoticeController::class,'getAllDomain']);
+
 //关联域名
 //关联域名
 Route::post('/inquiry_relate_domain', [\App\Http\Controllers\Api\PrivateController::class, 'inquiry_relate_domain']);
 Route::post('/inquiry_relate_domain', [\App\Http\Controllers\Api\PrivateController::class, 'inquiry_relate_domain']);
 // 通过域名获取项目人员配置
 // 通过域名获取项目人员配置