合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2035

@@ -54,7 +54,6 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
-        $this->_actionTemplateMain();
         return true;
         return true;
     }
     }
 
 

@@ -52,6 +52,9 @@ class CustomTemplateLogic extends BaseLogic
         $info['image'] = getImageUrl($info['image'],$this->user['storage_type'],$this->user['project_location']);
         $info['image'] = getImageUrl($info['image'],$this->user['storage_type'],$this->user['project_location']);
         if($info['is_visualization'] == 0 || $info['is_visualization'] == 1){
         if($info['is_visualization'] == 0 || $info['is_visualization'] == 1){
             $template_id = $this->getTemplateId();
             $template_id = $this->getTemplateId();
+            if(empty($info['html'])){
+                $info['html'] = $info['text'];
+            }
             $html = $this->getTemplateComHtml($info['html'],$info['html_style'],$template_id);
             $html = $this->getTemplateComHtml($info['html'],$info['html_style'],$template_id);
             $info['html'] = $this->getHeadFooter($html);
             $info['html'] = $this->getHeadFooter($html);
         }
         }
@@ -555,6 +558,7 @@ class CustomTemplateLogic extends BaseLogic
             'is_visualization' => $info['is_visualization'],
             'is_visualization' => $info['is_visualization'],
             'created_at' => date('Y-m-d H:i:s'),
             'created_at' => date('Y-m-d H:i:s'),
             'updated_at' => date('Y-m-d H:i:s'),
             'updated_at' => date('Y-m-d H:i:s'),
+            'text'=>$info['text'] ?? '',
         ];
         ];
     }
     }
 }
 }