gx

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Aside\Optimize;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Optimize\OptimizeLogic;
+use App\Models\Domain\DomainInfo;
 use App\Models\Manage\Manage;
 use App\Models\Project\Project;
 use Illuminate\Support\Facades\DB;
@@ -32,11 +33,13 @@ class OptimizeController extends BaseController
         $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
         if(!empty($lists['list'])){
             $manager = new Manage();
+            $domainModel = new DomainInfo();
             foreach ($lists['list'] as $k => $v){
                 $v['plan'] = $project::planMap()[$v['plan']];
                 $v['optimist_mid_name'] = $manager->getName($v['optimist_mid']);
                 $v['tech_mid_name'] = $manager->getName($v['tech_mid']);
                 $v['autologin_code'] = getAutoLoginCode($v['id']);
+                $v['domain'] = $domainModel->getDomain($v['domain']);
                 $lists['list'][$k] = $v;
             }
         }

@@ -60,8 +60,10 @@ class ProjectController extends BaseController
             ->with('deploy_optimize')->with('online_check')->paginate($this->row, ['*'], 'page', $this->page);
         if(!empty($lists)){
             $lists = $lists->toArray();
+            $manageModel = new Manage();
+            $domainModel = new DomainInfo();
             foreach ($lists['list'] as $k=>$item){
-                $item = $this->handleParam($item);
+                $item = $this->handleParam($item,$manageModel,$domainModel);
                 $lists['list'][$k] = $item;
             }
         }
@@ -75,8 +77,7 @@ class ProjectController extends BaseController
      * @method :post
      * @time   :2023/8/30 11:07
      */
-    public function handleParam(&$item){
-        $manageModel = new Manage();
+    public function handleParam(&$item,&$manageModel,&$domainModel){
         if($item['mysql_id'] != 0 && $item['type'] != 0){
             $data = APublicModel::getNumByProjectId($item['id']);
         }
@@ -98,7 +99,7 @@ class ProjectController extends BaseController
             'type' => $item['type'],
             'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
             'plan' =>Project::planMap()[$item['deploy_build']['plan']],
-            'domain' => !empty($item['deploy_optimize']['domain']) ?  (new DomainInfo())->getDomain($item['deploy_optimize']['domain']) : '',
+            'domain' => !empty($item['deploy_optimize']['domain']) ?  $domainModel->getDomain($item['deploy_optimize']['domain']) : '',
             'created_at' => date('Y年m月d日', strtotime($item['created_at'])),
             'product_num' => $data['product'] ?? 0,
             'keyword_num' => $item['deploy_build']['keyword_num'] ?? 0,

@@ -16,6 +16,7 @@ use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Http\Logic\Aside\Project\RenewLogic;
 use App\Models\ASide\APublicModel;
 use App\Models\Channel\Channel;
+use App\Models\Domain\DomainInfo;
 use App\Models\HomeCount\Count;
 use App\Models\Manage\Manage;
 use App\Models\Project\DeployBuild;
@@ -44,8 +45,10 @@ class RenewProjectController extends BaseController
             ->with('deploy_optimize')->with('online_check')->paginate($this->row, ['*'], 'page', $this->page);
         if(!empty($lists)){
             $lists = $lists->toArray();
+            $manageModel = new Manage();
+            $domainModel = new DomainInfo();
             foreach ($lists['list'] as $k=>$item){
-                $item = $this->handleParam($item);
+                $item = $this->handleParam($item,$manageModel,$domainModel);
                 $lists['list'][$k] = $item;
             }
         }
@@ -138,8 +141,10 @@ class RenewProjectController extends BaseController
             ->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
         if(!empty($lists)){
             $lists = $lists->toArray();
+            $manageModel = new Manage();
+            $domainModel = new DomainInfo();
             foreach ($lists['list'] as $k=>$item){
-                $item = $this->handleParam($item);
+                $item = $this->handleParam($item,$manageModel,$domainModel);
                 $lists['list'][$k] = $item;
             }
         }
@@ -153,8 +158,7 @@ class RenewProjectController extends BaseController
      * @method :post
      * @time   :2023/8/18 14:44
      */
-    public function handleParam(&$item){
-        $manageModel = new Manage();
+    public function handleParam(&$item,&$manageModel,&$domainModel){
         if($item['type'] != Project::TYPE_ZERO){
             $data = APublicModel::getNumByProjectId($item['id']);
         }
@@ -176,7 +180,7 @@ class RenewProjectController extends BaseController
             'type' => $item['type'],
             'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
             'plan' =>Project::planMap()[$item['deploy_build']['plan']],
-            'domain' => $item['deploy_optimize']['domain'] ?? 0,
+            'domain' => !empty($item['deploy_optimize']['domain']) ?  $domainModel->getDomain($item['deploy_optimize']['domain']) : '',
             'created_at' => date('Y年m月d日', strtotime($item['created_at'])),
             'autologin_code' => getAutoLoginCode($item['id']),
             'product_num' => $data['product'] ?? 0,