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

@@ -131,6 +131,7 @@ class ReplaceHtml extends Command
             $templateHtmlLogModel = new TemplateReplaceHtmlLog();
             $templateHtmlLogModel = new TemplateReplaceHtmlLog();
             $list = $templateHtmlLogModel->list(['replace_id'=>$info['rollback_id']]);
             $list = $templateHtmlLogModel->list(['replace_id'=>$info['rollback_id']]);
             foreach ($list as $value){
             foreach ($list as $value){
+                unset($value['id']);
                 $value['replace_id'] = $info['id'];
                 $value['replace_id'] = $info['id'];
                 $value['is_rollback'] = $info['is_rollback'];
                 $value['is_rollback'] = $info['is_rollback'];
                 $value['old_html'] = $info['old_html'];
                 $value['old_html'] = $info['old_html'];

@@ -13,6 +13,7 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Template\ReplaceHtmlLogic;
 use App\Http\Logic\Aside\Template\ReplaceHtmlLogic;
 use App\Models\Manage\Manage;
 use App\Models\Manage\Manage;
+use App\Models\Project\DeployBuild;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Template\TemplateReplaceHtml;
 use App\Models\Template\TemplateReplaceHtml;
 use App\Models\Template\TemplateReplaceHtmlLog;
 use App\Models\Template\TemplateReplaceHtmlLog;
@@ -71,7 +72,7 @@ class ReplaceHtmlController extends BaseController
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['project_name'] = (new Project())->getProjectName($v['project_id']);
                 $v['project_name'] = (new Project())->getProjectName($v['project_id']);
                 $v['operator_name'] = (new Manage())->getName($v['operator_id']);
                 $v['operator_name'] = (new Manage())->getName($v['operator_id']);
-                $v['source_name'] =  $logic->getSourceName($v['source'],$v['is_list'],$v['is_custom'],$v['project_id']);
+                $v['page_name'] =  $logic->getSourceName($v['source'],$v['is_list'],$v['is_custom'],$v['project_id']);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }
@@ -92,6 +93,19 @@ class ReplaceHtmlController extends BaseController
             'replace_id.required' => '主id不能为空',
             'replace_id.required' => '主id不能为空',
         ]);
         ]);
         $lists = $replaceHtmlLog->lists($this->map,$this->page,$this->row,$this->order);
         $lists = $replaceHtmlLog->lists($this->map,$this->page,$this->row,$this->order);
+        $projectModel = new DeployBuild();
+        $domain = '';
+        if(!empty($lists) && !empty($lists['list'])){
+            foreach ($lists['list'] as $k => $v){
+                if($k == 0){
+                    $projectInfo = $projectModel->read(['project_id'=>$v['project_id']]);
+                    $domain = $projectInfo['test_domain'];
+                }
+                $v['page_name'] =  $logic->getSourceName($v['source'],$v['is_list'],$v['is_custom'],$v['project_id']);
+                $v['route'] = $domain.$v['route'];
+                $lists['list'][$k] = $v;
+            }
+        }
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 

@@ -65,7 +65,12 @@ class FileManageController extends BaseController
      */
      */
     public function downLoad(){
     public function downLoad(){
         $username = basename($this->param['path']);
         $username = basename($this->param['path']);
-        $fileUrl = 'https://file.globalso.com'.$this->param['path'];
+        $parsed_url = parse_url($this->param['path']);
+        if(isset($parsed_url['scheme'])){
+            $fileUrl = $this->param['path'];
+        } else {
+            $fileUrl = 'https://file.globalso.com'.$this->param['path'];
+        }
         // 设置响应头
         // 设置响应头
         header('Content-Description: File Transfer');
         header('Content-Description: File Transfer');
         header('Content-Type: application/octet-stream');
         header('Content-Type: application/octet-stream');