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

@@ -102,12 +102,11 @@ class ProjectServer
      * @time   :2023/9/19 14:45
      * @time   :2023/9/19 14:45
      */
      */
     public static function saveInitParam($project_id){
     public static function saveInitParam($project_id){
-        $created_at = date('Y-m-d H:i:s');
-        self::initGroup($project_id,$created_at);
+//        self::initGroup($project_id);
         //初始化单页
         //初始化单页
-        self::init404Page($project_id,$created_at);
+//        self::init404Page($project_id);
         //初始化模块数据
         //初始化模块数据
-        self::initModule($project_id);
+//        self::initModule($project_id);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         return true;
         return true;
     }
     }
@@ -140,16 +139,17 @@ class ProjectServer
      * @method :post
      * @method :post
      * @time   :2023/12/29 9:30
      * @time   :2023/12/29 9:30
      */
      */
-    public static function initGroup($project_id,$created_at){
+    public static function initGroup($project_id){
+        $time = date('Y-m-d H:i:s');
         $info = DB::connection('custom_mysql')->table('gl_web_nav')->first();
         $info = DB::connection('custom_mysql')->table('gl_web_nav')->first();
         if(empty($info)) {
         if(empty($info)) {
             $data = [
             $data = [
-                ['project_id' => $project_id, 'name' => 'Home', 'url' => 'Home', 'location' => 'header', 'group_id' => 1, 'created_at' => $created_at, 'updated_at' => $created_at],
-                ['project_id' => $project_id, 'name' => 'Products', 'url' => 'Products', 'location' => 'header', 'group_id' => 1, 'created_at' => $created_at, 'updated_at' => $created_at],
-                ['project_id' => $project_id, 'name' => 'News', 'url' => 'News', 'location' => 'header', 'group_id' => 1, 'created_at' => $created_at, 'updated_at' => $created_at],
-                ['project_id' => $project_id, 'name' => 'ABOUT US', 'url' => 'about-us', 'location' => 'footer', 'group_id' => 2, 'created_at' => $created_at, 'updated_at' => $created_at],
-                ['project_id' => $project_id, 'name' => 'Contact Us', 'url' => 'contact-us', 'location' => 'footer', 'group_id' => 2, 'created_at' => $created_at, 'updated_at' => $created_at],
-                ['project_id' => $project_id, 'name' => 'FAQ', 'url' => 'faq', 'location' => 'footer', 'group_id' => 2, 'created_at' => $created_at, 'updated_at' => $created_at],
+                ['project_id' => $project_id, 'name' => 'Home', 'url' => 'Home', 'location' => 'header', 'group_id' => 1, 'created_at' => $time, 'updated_at' => $time],
+                ['project_id' => $project_id, 'name' => 'Products', 'url' => 'Products', 'location' => 'header', 'group_id' => 1, 'created_at' => $time, 'updated_at' => $time],
+                ['project_id' => $project_id, 'name' => 'News', 'url' => 'News', 'location' => 'header', 'group_id' => 1, 'created_at' => $time, 'updated_at' => $time],
+                ['project_id' => $project_id, 'name' => 'ABOUT US', 'url' => 'about-us', 'location' => 'footer', 'group_id' => 2, 'created_at' => $time, 'updated_at' => $time],
+                ['project_id' => $project_id, 'name' => 'Contact Us', 'url' => 'contact-us', 'location' => 'footer', 'group_id' => 2, 'created_at' => $time, 'updated_at' => $time],
+                ['project_id' => $project_id, 'name' => 'FAQ', 'url' => 'faq', 'location' => 'footer', 'group_id' => 2, 'created_at' => $time, 'updated_at' => $time],
             ];
             ];
             DB::connection('custom_mysql')->table('gl_web_nav')->insert($data);
             DB::connection('custom_mysql')->table('gl_web_nav')->insert($data);
         }
         }
@@ -157,8 +157,8 @@ class ProjectServer
         $info = DB::connection('custom_mysql')->table('gl_web_nav_group')->first();
         $info = DB::connection('custom_mysql')->table('gl_web_nav_group')->first();
         if(empty($info)) {
         if(empty($info)) {
             $data = [
             $data = [
-                ['id' => 1, 'project_id' => $project_id, 'name' => '全局顶部菜单', 'created_at' => $created_at, 'updated_at' => $created_at],
-                ['id' => 2, 'project_id' => $project_id, 'name' => '底部菜单', 'created_at' => $created_at, 'updated_at' => $created_at],
+                ['id' => 1, 'project_id' => $project_id, 'name' => '全局顶部菜单', 'created_at' => $time, 'updated_at' => $time],
+                ['id' => 2, 'project_id' => $project_id, 'name' => '底部菜单', 'created_at' => $time, 'updated_at' => $time],
             ];
             ];
             DB::connection('custom_mysql')->table('gl_web_nav_group')->insert($data);
             DB::connection('custom_mysql')->table('gl_web_nav_group')->insert($data);
         }
         }
@@ -172,7 +172,8 @@ class ProjectServer
      * @method :post
      * @method :post
      * @time   :2023/12/29 9:32
      * @time   :2023/12/29 9:32
      */
      */
-    public function init404Page($project_id,$created_at){
+    public function init404Page($project_id){
+        $time = date('Y-m-d H:i:s');
         $info = DB::connection('custom_mysql')->table('gl_web_custom_template')->first();
         $info = DB::connection('custom_mysql')->table('gl_web_custom_template')->first();
         if(empty($info)) {
         if(empty($info)) {
             $main_404_html = '<main>
             $main_404_html = '<main>
@@ -211,12 +212,12 @@ class ProjectServer
                 'html_style' => '<style id="globalsojs-styles"></style>',
                 'html_style' => '<style id="globalsojs-styles"></style>',
                 'title' => '404-Page not found',
                 'title' => '404-Page not found',
                 'description' => 'Sorry. The page has either moved or cannot be found.',
                 'description' => 'Sorry. The page has either moved or cannot be found.',
-                'created_at' => $created_at, 'updated_at' => $created_at];
+                'created_at' => $time, 'updated_at' => $time];
             $id = DB::connection('custom_mysql')->table('gl_web_custom_template')->insertGetId($data);
             $id = DB::connection('custom_mysql')->table('gl_web_custom_template')->insertGetId($data);
             //路由
             //路由
             $info = DB::connection('custom_mysql')->table('gl_route_map')->first();
             $info = DB::connection('custom_mysql')->table('gl_route_map')->first();
             if(empty($info)) {
             if(empty($info)) {
-                $data = ['project_id' => $project_id, 'source' => RouteMap::SOURCE_PAGE, 'source_id' => $id, 'route' => BCustomTemplate::NOT_FOUND_PAGE_URL, 'created_at' => $created_at, 'updated_at' => $created_at];
+                $data = ['project_id' => $project_id, 'source' => RouteMap::SOURCE_PAGE, 'source_id' => $id, 'route' => BCustomTemplate::NOT_FOUND_PAGE_URL, 'created_at' => $time, 'updated_at' => $time];
                 DB::connection('custom_mysql')->table('gl_route_map')->insert($data);
                 DB::connection('custom_mysql')->table('gl_route_map')->insert($data);
             }
             }
         }
         }