gx

@@ -7,6 +7,7 @@ use App\Helper\Common;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\Controller;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Http\Requests\Scene;
 use App\Http\Requests\Scene;
+use App\Models\Domain\DomainInfo;
 use App\Models\File\File;
 use App\Models\File\File;
 use App\Models\File\Image;
 use App\Models\File\Image;
 use App\Models\User\User as UserModel;
 use App\Models\User\User as UserModel;

@@ -6,6 +6,7 @@ use App\Enums\Common\Code;
 use App\Exceptions\AsideGlobalException;
 use App\Exceptions\AsideGlobalException;
 use App\Exceptions\BsideGlobalException;
 use App\Exceptions\BsideGlobalException;
 use App\Helper\Common;
 use App\Helper\Common;
+use App\Models\Domain\DomainInfo;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Sms\SmsLog;
 use App\Models\Sms\SmsLog;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
@@ -163,7 +164,7 @@ class UserLoginLogic
         $info['hagro'] = $project['hagro'] ?? '';
         $info['hagro'] = $project['hagro'] ?? '';
         $info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
         $info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
         $info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
         $info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
-            $project['deploy_optimize']['domain'] : ($project['deploy_build']['test_domain'] ?? ''));
+            ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
         //保存项目缓存
         //保存项目缓存
         Cache::put('user-'.$info['project_id'],$project,$minutes = null);
         Cache::put('user-'.$info['project_id'],$project,$minutes = null);
         return $this->success($info);
         return $this->success($info);
@@ -187,13 +188,14 @@ class UserLoginLogic
         $info['hagro'] = $project['hagro'] ?? '';
         $info['hagro'] = $project['hagro'] ?? '';
         $info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
         $info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
         $info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
         $info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
-            $project['deploy_optimize']['domain'] : ($project['deploy_build']['test_domain'] ?? ''));
+            ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
         //保存项目缓存
         //保存项目缓存
         Cache::put('user-'.$info['project_id'],$project,$minutes = null);
         Cache::put('user-'.$info['project_id'],$project,$minutes = null);
         return $this->success($info);
         return $this->success($info);
     }
     }
 
 
 
 
+
     /**
     /**
      * @remark :获取项目数据详情
      * @remark :获取项目数据详情
      * @name   :getProjectInfo
      * @name   :getProjectInfo

@@ -51,7 +51,20 @@ class DomainInfo extends Base
     }
     }
 
 
 
 
-
+    /**
+     * @remark :获取域名信息
+     * @name   :getDomain
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/4 17:05
+     */
+    public function getDomain($domain){
+        $info = $this->read(['id'=>$domain]);
+        if($info === false){
+            return '';
+        }
+        return $info['domain'];
+    }
 
 
 
 
 }
 }