gx数据

@@ -85,7 +85,7 @@ class TemplateLog extends Command
      * @time   :2024/11/13 16:19
      * @time   :2024/11/13 16:19
      */
      */
     public function deleteUserLog(){
     public function deleteUserLog(){
-        $date = date('Y-m-d H:i:s', strtotime('-60 days'));
+        $date = date('Y-m-d H:i:s', strtotime('-90 days'));
         $userLogModel = new UserLog();
         $userLogModel = new UserLog();
         return $userLogModel->del(['created_at'=>['<=',$date]]);
         return $userLogModel->del(['created_at'=>['<=',$date]]);
     }
     }

@@ -208,6 +208,7 @@ class CNoticeController extends BaseController
      * 更新通知C端
      * 更新通知C端
      * @param Request $request
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      * @return \Illuminate\Http\JsonResponse
+     * @param : type : 1->主站更新 4->聚合页更新
      */
      */
     public function sendNotify(Request $request)
     public function sendNotify(Request $request)
     {
     {
@@ -217,6 +218,13 @@ class CNoticeController extends BaseController
         $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));
+        if($type == 4){//代表聚合页更新
+            $keywordModel = new Keyword();
+            $keywordInfo = $keywordModel->whereNull('seo_title')->orWhereNull('seo_keywords')->orWhereNull('seo_description')->first();
+            if(!empty($keywordInfo)){
+                $this->fail('TDK不全，禁止提交。');
+            }
+        }
         //获取项目所在服务器
         //获取项目所在服务器
         $project_model = new Project();
         $project_model = new Project();
         $project_info = $project_model->read(['id'=>$project_id],['serve_id','is_upgrade', 'main_lang_id']);
         $project_info = $project_model->read(['id'=>$project_id],['serve_id','is_upgrade', 'main_lang_id']);
@@ -239,7 +247,6 @@ class CNoticeController extends BaseController
                 $this->fail('当前升级项目还有页面正在采集，请采集完成之后再更新静态页面');
                 $this->fail('当前升级项目还有页面正在采集，请采集完成之后再更新静态页面');
             }
             }
         }
         }
-
         if($servers_id == ServerConfig::SELF_SITE_ID){
         if($servers_id == ServerConfig::SELF_SITE_ID){
             //自建站服务器：如果项目已经上线，不请求C端接口，数据直接入库
             //自建站服务器：如果项目已经上线，不请求C端接口，数据直接入库
             $domain_model = new DomainInfo();
             $domain_model = new DomainInfo();

@@ -159,8 +159,11 @@ class FileController
         $nameArr = explode('.',$name);
         $nameArr = explode('.',$name);
         $suffix = array_pop($nameArr) ?? 'jpg';
         $suffix = array_pop($nameArr) ?? 'jpg';
         $nameStr = implode('-', $nameArr);
         $nameStr = implode('-', $nameArr);
-        $enName = generateRoute(Translate::tran($nameStr, 'en'));
-        if(substr($enName, 0, 1) === '-'){
+        //为空时，重试三次
+        $enName = retry(3, function () use ($nameStr) {
+            return generateRoute(Translate::tran($nameStr, 'en'));
+        }, 100); // 100 毫秒后重试
+        if(empty($enName)){
             $enName = md5(uniqid().$project_id.rand(1,1000));
             $enName = md5(uniqid().$project_id.rand(1,1000));
         }
         }
         $fileName = $enName;
         $fileName = $enName;