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

@@ -219,7 +219,7 @@ class DomainInfoLogic extends BaseLogic
         $unique_extend = [];
         $unique_extend = [];
         if(isset($this->param['extend_config']) && $this->param['extend_config']){
         if(isset($this->param['extend_config']) && $this->param['extend_config']){
             foreach ($this->param['extend_config'] as $k=>$v){
             foreach ($this->param['extend_config'] as $k=>$v){
-                if(!in_array($v['origin'],$unique_extend)){
+                if($v['origin'] && (!in_array($v['origin'],$unique_extend))){
                     $unique_extend[] = $v['origin'];
                     $unique_extend[] = $v['origin'];
                     $extend_config[] = $v;
                     $extend_config[] = $v;
                 }
                 }
@@ -230,7 +230,7 @@ class DomainInfoLogic extends BaseLogic
         $amp_unique_extend = [];
         $amp_unique_extend = [];
         if(isset($this->param['amp_extend_config']) && $this->param['amp_extend_config']){
         if(isset($this->param['amp_extend_config']) && $this->param['amp_extend_config']){
             foreach ($this->param['amp_extend_config'] as $ka=>$va){
             foreach ($this->param['amp_extend_config'] as $ka=>$va){
-                if(!in_array($va['origin'],$amp_unique_extend)){
+                if($va['origin'] && (!in_array($va['origin'],$amp_unique_extend))){
                     $amp_unique_extend[] = $va['origin'];
                     $amp_unique_extend[] = $va['origin'];
                     $amp_extend_config[] = $va;
                     $amp_extend_config[] = $va;
                 }
                 }

@@ -294,6 +294,10 @@ class UserLoginLogic
         }
         }
         $info['is_amp'] = $is_amp;
         $info['is_amp'] = $is_amp;
         $info['is_three_code'] = $project['is_three_code'] ?? 0;
         $info['is_three_code'] = $project['is_three_code'] ?? 0;
+        //产品，新闻，博客导入模板
+        $info['import_products_url'] = 'https://ecdn6.globalso.com/upload/p/1/file/2024-12/products.csv';
+        $info['import_news_url'] = 'https://ecdn6.globalso.com/upload/p/1/file/2024-12/news.csv';
+        $info['import_blogs_url'] = 'https://ecdn6.globalso.com/upload/p/1/file/2024-12/blogs.csv';
         return $info;
         return $info;
     }
     }