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

@@ -19,17 +19,6 @@ class WebSettingHtmlController extends BaseController
      * @time   :2023/4/28 14:45
      * @time   :2023/4/28 14:45
      */
      */
     public function save(WebSettingHtmlLogic $webSettingHtmlLogic){
     public function save(WebSettingHtmlLogic $webSettingHtmlLogic){
-        if(isset($this->param) && !empty($this->param)){
-            $this->request->validate([
-                'head_html'=>'required',
-                'body_html'=>'required',
-                'footer_html'=>'required'
-            ],[
-                'head_html.required' => 'head_html不能为空',
-                'body_html.required' => 'body_html不能为空',
-                'footer_html.required' => 'footer_html不能为空'
-            ]);
-        }
         $info = $webSettingHtmlLogic->setting_html_save();
         $info = $webSettingHtmlLogic->setting_html_save();
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
     }
     }

@@ -378,7 +378,8 @@ class BTemplateLogic extends BaseLogic
                 $route = 'all';
                 $route = 'all';
             }
             }
         }
         }
-        return $this->addUpdateNotify($type,$route);
+        $this->addUpdateNotify($type,$route);
+        return $this->curlDelRoute($route);
     }
     }
 
 
     /**
     /**

@@ -113,6 +113,7 @@ class CustomTemplateLogic extends BaseLogic
         }
         }
         //通知
         //通知
         $this->addUpdateNotify(RouteMap::SOURCE_PAGE,$info['url']);
         $this->addUpdateNotify(RouteMap::SOURCE_PAGE,$info['url']);
+        $this->curlDelRoute($info['url']);
         return $this->success();
         return $this->success();
     }
     }
 
 

@@ -20,7 +20,6 @@ class News extends Base
         if(!$value){
         if(!$value){
             return date('Y-m-d H:i:s', strtotime($this->getAttribute('created_at')));
             return date('Y-m-d H:i:s', strtotime($this->getAttribute('created_at')));
         }
         }
-
         return $value;
         return $value;
     }
     }
 }
 }

@@ -164,4 +164,10 @@ class Product extends Base
 //        return self::where('project_id', $project_id)->where('status', self::STATUS_ON)->count();
 //        return self::where('project_id', $project_id)->where('status', self::STATUS_ON)->count();
 //    }
 //    }
 
 
+    public function getSendTimeAttribute($value){
+        if(!$value){
+            return date('Y-m-d H:i:s', strtotime($this->getAttribute('created_at')));
+        }
+        return $value;
+    }
 }
 }