Merge remote-tracking branch 'origin/master' into akun

@@ -31,6 +31,7 @@ use App\Models\Project\MinorLanguages;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Purchaser\PurchaserInfo;
 use App\Models\Purchaser\PurchaserInfo;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
+use App\Models\Template\BCustomTemplate;
 use App\Models\Template\BTemplateCom;
 use App\Models\Template\BTemplateCom;
 use App\Services\AmazonS3Service;
 use App\Services\AmazonS3Service;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
@@ -57,72 +58,66 @@ class Demo extends Command
      */
      */
     protected $description = 'demo';
     protected $description = 'demo';
 
 
+    public static $main404Html = '<main>
+        <section data-section="section" data-screen="screen-large" class="section-404-wrap-block section-block-error404"
+            id="sectionIdyxqu938">
+            <div class="layout" data-unable="demo01-error404">
+                <img src="https://ecdn6.globalso.com/upload/m/image_other/2023-10/6528a87e594db30162.png" />
+            </div>
+            <p style="text-align: center">SORRY. THE PAGE HAS EITHER MOVED OR CANNOT BE FOUND.</p>
+            <style>
+                .section-block-error404 .layout {
+                    height: 700px;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                }
+                .section-block-error404 img {
+                    width: 400px;
+                }
+                @media only screen and (max-width:500) {
+                    .section-block-error404 img {
+                        max-width: 100%;
+                    }
+                }
+            </style>
+            <script>
+            </script>
+        </section>
+    </main>';
     public function handle(){
     public function handle(){
-        $optimizeModel = new DeployOptimize();
-        $list = $optimizeModel->list();
-        foreach ($list as $k => $v){
-            if(!empty($v['g_top_plan'])){
-                $v['g_top_plan']['is_compliance'] = 0;
-                $optimizeModel->edit(['g_top_plan'=>json_encode($v['g_top_plan'])],['id'=>$v['id']]);
-                echo date('Y-m-d H:i:s') . '重制g_top-project_id:'.$v['project_id'] . PHP_EOL;
+        $projectModel = new Project();
+        $list = $projectModel->list(['is_upgrade'=>1]);
+        $data = [];
+        foreach ($list as $v){
+            echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
+            ProjectServer::useProject($v['id']);
+            $this->init404Page($v['id']);
+            DB::disconnect('custom_mysql');
+        }
+        echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
+    }
+    public static function init404Page($project_id){
+        $time = date('Y-m-d H:i:s');
+        $info = DB::connection('custom_mysql')->table('gl_web_custom_template')->where('url',BCustomTemplate::NOT_FOUND_PAGE_URL)->first();
+        if(empty($info)) {
+            $data = [
+                'project_id' => $project_id,
+                'name' => BCustomTemplate::NOT_FOUND_PAGE_URL,
+                'status' => 1,
+                'url' => BCustomTemplate::NOT_FOUND_PAGE_URL,
+                'html' => self::$main404Html,
+                'html_style' => '<style id="globalsojs-styles"></style>',
+                'title' => '404-Page not found',
+                'description' => 'Sorry. The page has either moved or cannot be found.',
+                'created_at' => $time, 'updated_at' => $time];
+            $id = DB::connection('custom_mysql')->table('gl_web_custom_template')->insertGetId($data);
+            //路由
+            $info = DB::connection('custom_mysql')->table('gl_route_map')->first();
+            if(empty($info)) {
+                $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);
             }
             }
         }
         }
-        return true;
     }
     }
-
-//    public function handle(){
-//        $projectModel = new Project();
-//        $list = $projectModel->list(['id'=>503]);
-//        foreach ($list as $v){
-//            echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
-//            ProjectServer::useProject($v['id']);
-//            $newsModel = new News();
-//            $blogList = $newsModel->list(['status'=>1],'id',['*'],'asc');
-//            foreach ($blogList as $blogV){
-//                $customContentModel = new CustomModuleContent();
-//                $id = $customContentModel->addReturnId([
-//                    'name'=>$blogV['name'],
-//                    'status'=>0,
-//                    'sort'=>$blogV['sort'],
-//                    'remark'=>$blogV['remark'],
-//                    'route'=>$blogV['url'],
-//                    'image'=>$blogV['image'],
-//                    'seo_title'=>$blogV['seo_title'],
-//                    'seo_keywords'=>$blogV['seo_keywords'],
-//                    'seo_description'=>$blogV['seo_description'],
-//                    'project_id'=>$blogV['project_id'],
-//                    'created_at'=>$blogV['created_at'],
-//                    'updated_at'=>$blogV['updated_at'],
-//                    'module_id'=>10,
-//                    'video'=>null,
-//                    'release_at'=>$blogV['release_at'],
-//                    'operator_id'=>$blogV['operator_id']
-//                ]);
-//                RouteMap::setRoute($blogV['url'],RouteMap::SOURCE_MODULE,$id,503);
-//            }
-//            DB::disconnect('custom_mysql');
-//        }
-//    }
-//    public function handle(){
-//        ProjectServer::useProject(503);
-//        $newsCate = new NewsCategory();
-//        $newsList = $newsCate->list();
-//        foreach ($newsList as $v){
-//            $data = [
-//                'name'=>$v['name'],
-//                'status'=>0,
-//                'sort'=>$v['sort'],
-//                'pid'=>$v['pid'],
-//                'route'=>$v['alias'],
-//                'project_id'=>503,
-//                'operator_id'=>$v['operator_id'],
-//                'create_id'=>1101,
-//                'module_id'=>10,
-//            ];
-//            $moduleCateModel = new CustomModuleCategory();
-//            $id = $moduleCateModel->addReturnId($data);
-//            RouteMap::setRoute($v['alias'],RouteMap::SOURCE_MODULE_CATE,$id,503);
-//        }
-//        DB::disconnect('custom_mysql');
-//    }
 }
 }

@@ -12,6 +12,7 @@ namespace App\Http\Controllers\Bside\Setting;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Models\WebSetting\LanguageTxt;
 use App\Models\WebSetting\LanguageTxt;
+use App\Models\WebSetting\WebLanguage;
 
 
 class LanguageTxtController extends BaseController
 class LanguageTxtController extends BaseController
 {
 {
@@ -46,7 +47,8 @@ class LanguageTxtController extends BaseController
             if(isset($v['id']) && !empty($v['id'])){
             if(isset($v['id']) && !empty($v['id'])){
                 $languageTxtModel->edit(['en_name'=>$v['en_name']],['id'=>$v['id']]);
                 $languageTxtModel->edit(['en_name'=>$v['en_name']],['id'=>$v['id']]);
             }else{
             }else{
-                $languageTxtModel->addReturnId(['name'=>$v['name'], 'en_name'=>$v['en_name']]);
+                //获取当前语种id
+                $languageTxtModel->addReturnId(['name'=>$v['name'], 'en_name'=>$v['en_name'],'language_id'=>$v['language_id']]);
             }
             }
         }
         }
         $this->response('success');
         $this->response('success');