合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !1663

@@ -99,7 +99,7 @@ class RemainDay extends Command
                 $seo_remain_day = 0;
                 $seo_remain_day = 0;
                 $extend_type = Project::TYPE_FIVE;
                 $extend_type = Project::TYPE_FIVE;
             }
             }
-            $this->project->edit(['seo_service_duration'=>$seo_remain_day,'extend_type'=>$extend_type],['id'=>$item['id']]);
+//            $this->project->edit(['seo_service_duration'=>$seo_remain_day,'extend_type'=>$extend_type],['id'=>$item['id']]);
         }
         }
         return $projectArr;
         return $projectArr;
     }
     }
@@ -155,7 +155,7 @@ class RemainDay extends Command
                 $remain_day = 0;
                 $remain_day = 0;
                 $extend_type = Project::TYPE_FIVE;
                 $extend_type = Project::TYPE_FIVE;
             }
             }
-            $this->project->edit(['remain_day'=>$remain_day,'extend_type'=>$extend_type],['id'=>$item['id']]);
+//            $this->project->edit(['remain_day'=>$remain_day,'extend_type'=>$extend_type],['id'=>$item['id']]);
             echo 'end->项目id:' . $item['id'] . '执行时间：'. date('Y-m-d H:i:s') . PHP_EOL;
             echo 'end->项目id:' . $item['id'] . '执行时间：'. date('Y-m-d H:i:s') . PHP_EOL;
             return true;
             return true;
         }
         }

@@ -215,6 +215,9 @@ class CNoticeController extends BaseController
         $project_id = $this->user['project_id'];
         $project_id = $this->user['project_id'];
         $type = intval($request->input('type', 1));
         $type = intval($request->input('type', 1));
         $route = intval($request->input('page', 1));
         $route = intval($request->input('page', 1));
+        if(in_array($route,[4,6])){
+            $this->fail('聚合页翻译请联系管理员');
+        }
         $url = $request->input('url', []);
         $url = $request->input('url', []);
         $language = $request->input('language', []);
         $language = $request->input('language', []);
         $is_sitemap = intval($request->input('is_sitemap', 0));
         $is_sitemap = intval($request->input('is_sitemap', 0));