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

@@ -331,6 +331,16 @@ class BlogLogic extends BaseLogic
                 $seo_description = substr(strip_tags($data[8]),0,200);
                 $seo_description = substr(strip_tags($data[8]),0,200);
             }
             }
 
 
+            $release_at = date('Y-m-d H:i:s');
+            if($data[9]??''){
+                $release_at = date('Y-m-d H:i:s',strtotime($data[9]));
+            }
+
+            $sort = 10;
+            if($data[10]??''){
+                $sort = $data[10];
+            }
+
             $id = $this->model->addReturnId(
             $id = $this->model->addReturnId(
                 [
                 [
                     'name' => $data[0],
                     'name' => $data[0],
@@ -345,7 +355,9 @@ class BlogLogic extends BaseLogic
                     'operator_id' => $user_id,
                     'operator_id' => $user_id,
                     'create_id' => $user_id,
                     'create_id' => $user_id,
                     'status' => Blog::STATUS_ONE,
                     'status' => Blog::STATUS_ONE,
-                    'url' => ''
+                    'url' => '',
+                    'release_at' => $release_at,
+                    'sort' => $sort
                 ]
                 ]
             );
             );
             //更新路由
             //更新路由
@@ -354,7 +366,7 @@ class BlogLogic extends BaseLogic
                 if (!$route_map) {
                 if (!$route_map) {
                     $route_map = new RouteMap();
                     $route_map = new RouteMap();
                     $route_map->project_id = $project_id;
                     $route_map->project_id = $project_id;
-                    $route_map->path = RouteMap::SOURCE_BLOG.'s';
+                    $route_map->path = RouteMap::SOURCE_BLOG;
                     $route_map->source = RouteMap::SOURCE_BLOG;
                     $route_map->source = RouteMap::SOURCE_BLOG;
                     $route_map->source_id = $id;
                     $route_map->source_id = $id;
                     $route_map->route = $route;
                     $route_map->route = $route;

@@ -372,6 +372,16 @@ class NewsLogic extends BaseLogic
                 $seo_description = substr(strip_tags($data[8]),0,200);
                 $seo_description = substr(strip_tags($data[8]),0,200);
             }
             }
 
 
+            $release_at = date('Y-m-d H:i:s');
+            if($data[9]??''){
+                $release_at = date('Y-m-d H:i:s',strtotime($data[9]));
+            }
+
+            $sort = 10;
+            if($data[10]??''){
+                $sort = $data[10];
+            }
+
             $id = $this->model->addReturnId(
             $id = $this->model->addReturnId(
                 [
                 [
                     'name' => $data[0],
                     'name' => $data[0],
@@ -386,7 +396,9 @@ class NewsLogic extends BaseLogic
                     'operator_id' => $user_id,
                     'operator_id' => $user_id,
                     'create_id' => $user_id,
                     'create_id' => $user_id,
                     'status' => News::STATUS_ONE,
                     'status' => News::STATUS_ONE,
-                    'url' => ''
+                    'url' => '',
+                    'release_at' => $release_at,
+                    'sort' => $sort
                 ]
                 ]
             );
             );
             //更新路由
             //更新路由