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

@@ -29,8 +29,10 @@ class CustomTemplateController extends BaseController
     public function lists(CustomTemplateLogic $customTemplateLogic){
     public function lists(CustomTemplateLogic $customTemplateLogic){
         $lists = $customTemplateLogic->customTemplateLists($this->map,$this->page,$this->row,$this->order);
         $lists = $customTemplateLogic->customTemplateLists($this->map,$this->page,$this->row,$this->order);
         if (!empty($lists)){
         if (!empty($lists)){
+            $userModel = new User();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['url'] = $v['url'].'/';
                 $v['url'] = $v['url'].'/';
+                $v['operator_name'] =  $userModel->getName($v['operator_id']);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }

@@ -494,7 +494,7 @@ class BTemplateLogic extends BaseLogic
                 }
                 }
             }
             }
         }
         }
-        $data['main_html'] = characterTruncation($html,'/<main\b[^>]*>(.*?)<\/main>/s');
+        $data['main_html'] = characterTruncationStr($html,"<main","</main>");
         $data['main_css'] = characterTruncation($html,'/<style id="globalsojs-styles">(.*?)<\/style>/s');
         $data['main_css'] = characterTruncation($html,'/<style id="globalsojs-styles">(.*?)<\/style>/s');
         return $this->success($data);
         return $this->success($data);
     }
     }