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

@@ -92,6 +92,7 @@ class ReplaceHtml extends Command
                 'is_custom'=>$info['is_custom'],
                 'is_custom'=>$info['is_custom'],
                 'is_list'=>$info['is_list'],
                 'is_list'=>$info['is_list'],
                 'is_rollback'=>$info['rollback'],
                 'is_rollback'=>$info['rollback'],
+                'template_id'=>$info['template_id'],
                 'created_at'=>date('Y-m-d H:i:s'),
                 'created_at'=>date('Y-m-d H:i:s'),
                 'updated_at'=>date('Y-m-d H:i:s')
                 'updated_at'=>date('Y-m-d H:i:s')
             ];
             ];

@@ -50,7 +50,7 @@ class UpdateProductCategory extends Command
     public function handle(){
     public function handle(){
         //获取所有项目
         //获取所有项目
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[302]]],'id',['id']);
+        $list = $projectModel->list(['id'=>['in',[621]]],'id',['id']);
         echo date('Y-m-d H:i:s') . ' start: ' . json_encode($list) . PHP_EOL;
         echo date('Y-m-d H:i:s') . ' start: ' . json_encode($list) . PHP_EOL;
         try {
         try {
             foreach ($list as $v) {
             foreach ($list as $v) {

@@ -382,6 +382,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/replaceTemplateLog', [Aside\Template\ReplaceHtmlController::class, 'replaceTemplateLog'])->name('admin.replace_replaceTemplateLog');
         Route::any('/replaceTemplateLog', [Aside\Template\ReplaceHtmlController::class, 'replaceTemplateLog'])->name('admin.replace_replaceTemplateLog');
         Route::any('/replaceTemplateSonLog', [Aside\Template\ReplaceHtmlController::class, 'replaceTemplateSonLog'])->name('admin.replace_replaceTemplateSonLog');
         Route::any('/replaceTemplateSonLog', [Aside\Template\ReplaceHtmlController::class, 'replaceTemplateSonLog'])->name('admin.replace_replaceTemplateSonLog');
         Route::any('/reductionHtml', [Aside\Template\ReplaceHtmlController::class, 'reductionHtml'])->name('admin.replace_reductionHtml');
         Route::any('/reductionHtml', [Aside\Template\ReplaceHtmlController::class, 'reductionHtml'])->name('admin.replace_reductionHtml');
+        Route::any('/rollbackIdHtml', [Aside\Template\ReplaceHtmlController::class, 'rollbackIdHtml'])->name('admin.replace_rollbackIdHtml');
         Route::any('/pageType', [Aside\Template\ReplaceHtmlController::class, 'pageType'])->name('admin.replace_pageType');
         Route::any('/pageType', [Aside\Template\ReplaceHtmlController::class, 'pageType'])->name('admin.replace_pageType');
     });
     });