Merge remote-tracking branch 'origin/develop' into akun

@@ -62,7 +62,7 @@ class BTemplateLogic extends BaseLogic
         }
         }
         $TemplateInfo = [];
         $TemplateInfo = [];
         $key = 'template_'.$this->user['project_id'].'_'.$this->param['source'].'_'.$this->param['source_id'];
         $key = 'template_'.$this->user['project_id'].'_'.$this->param['source'].'_'.$this->param['source_id'];
-        if(!empty(Cache::add($key))){
+        if(!empty(Cache::get($key))){
             $this->fail('当前页面正在装修中');
             $this->fail('当前页面正在装修中');
         }
         }
         if($this->param['source'] == $this->model::SOURCE_HOME){//首页
         if($this->param['source'] == $this->model::SOURCE_HOME){//首页

@@ -145,7 +145,7 @@ class RankDataLogic extends BaseLogic
         $project_id = $this->user['project_id'];
         $project_id = $this->user['project_id'];
         $project = (new ProjectLogic())->getProjectInfo($project_id);
         $project = (new ProjectLogic())->getProjectInfo($project_id);
         $api_no = $project['deploy_optimize']['api_no'] ?? '';
         $api_no = $project['deploy_optimize']['api_no'] ?? '';
-        $domain = $this->user['domain'];
+        $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
         $domain_arr = parse_url($domain);
         $domain_arr = parse_url($domain);
         $domain = $domain_arr['host'] ?? $domain_arr['path'];
         $domain = $domain_arr['host'] ?? $domain_arr['path'];
         //复制站点域名
         //复制站点域名