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

Master server



查看合并请求 !1061

@@ -39,9 +39,11 @@ class RemainDay extends Command
         354,
         354,
         378,
         378,
         649,
         649,
+        1226,
         1283,
         1283,
+        1703,
         1893,
         1893,
-        2066
+        2066,
     ];//需要单独处理的项目
     ];//需要单独处理的项目
     /**
     /**
      * The console command description.
      * The console command description.

@@ -27,14 +27,16 @@ if (!function_exists('generateRoute')) {
         if(is_array($string)){
         if(is_array($string)){
             $string = $string[0];
             $string = $string[0];
         }
         }
-        $length = strlen($string);
-        if($length >= 5){
-            $last5Chars = substr($string, -5);
-            if($last5Chars == '.html'){
-                return strtolower($string);
-            }
+        $last5Chars = substr($string, -5);
+        if($last5Chars == '.html'){
+            return strtolower($string);
+        }
+        $sign = str_replace(".", "", trim(strtolower(preg_replace('/[^\w.]+/', '-', trim($string))), '-'));
+        $length = strlen($sign);
+        if($length > 180){
+            $sign = trim(mb_substr($sign, 0, 180, 'UTF-8'),'-');
         }
         }
-        return str_replace(".", "", trim(strtolower(preg_replace('/[^\w.]+/', '-', trim($string))), '-'));
+        return $sign;
     }
     }
 }
 }
 
 

@@ -38,12 +38,10 @@ class NoticeController extends BaseController
     {
     {
         LogUtils::info('notice rank_data', $this->param);
         LogUtils::info('notice rank_data', $this->param);
         NoticeLog::createLog(NoticeLog::TYPE_RANK_DATA, $this->param);
         NoticeLog::createLog(NoticeLog::TYPE_RANK_DATA, $this->param);
-
         //特殊项目 一个项目多个apino
         //特殊项目 一个项目多个apino
         if($this->param['api_no'] == 10690){
         if($this->param['api_no'] == 10690){
             NoticeLog::createLog(NoticeLog::TYPE_RANK_DATA, ['api_no' => 11201]);
             NoticeLog::createLog(NoticeLog::TYPE_RANK_DATA, ['api_no' => 11201]);
         }
         }
-
         $this->response('success');
         $this->response('success');
     }
     }
 
 

@@ -160,8 +160,6 @@ class RankDataController extends BaseController
                 'reach' => '是否达标',
                 'reach' => '是否达标',
             ];
             ];
         }
         }
-
-
         //生成文件，发送到客户端
         //生成文件，发送到客户端
         $table = new BatchExportService($lang . "关键词历史数据导出");
         $table = new BatchExportService($lang . "关键词历史数据导出");
         $file = $table->head($map)->data($data['data'])->save();
         $file = $table->head($map)->data($data['data'])->save();
@@ -170,7 +168,6 @@ class RankDataController extends BaseController
         }
         }
         $fileurl = Storage::disk('runtime')->url($file);
         $fileurl = Storage::disk('runtime')->url($file);
 //        return Storage::disk('runtime')->download($file); //直接下载
 //        return Storage::disk('runtime')->download($file); //直接下载
-
         $this->response('success',Code::SUCCESS,['url' => $fileurl]);
         $this->response('success',Code::SUCCESS,['url' => $fileurl]);
     }
     }
 
 

@@ -493,9 +493,11 @@ class RankDataLogic extends BaseLogic
             354,
             354,
             378,
             378,
             649,
             649,
+            1226,
             1283,
             1283,
+            1703,
             1893,
             1893,
-            2066
+            2066,
         ];//暂停项目id
         ];//暂停项目id
 
 
         //一个项目多个api_no
         //一个项目多个api_no

@@ -61,10 +61,6 @@ class RouteMap extends Base
         }
         }
         $i=1;
         $i=1;
         $sign = generateRoute($title);
         $sign = generateRoute($title);
-        $length = strlen($sign);
-        if($length > 180){
-            $sign = trim(mb_substr($sign, 0, 180, 'UTF-8'),'-');
-        }
         $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();
         $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();
         $suffix = '';
         $suffix = '';
         if(empty($info)){
         if(empty($info)){