正在显示
3 个修改的文件
包含
9 行增加
和
14 行删除
| @@ -27,14 +27,16 @@ if (!function_exists('generateRoute')) { | @@ -27,14 +27,16 @@ if (!function_exists('generateRoute')) { | ||
| 27 | if(is_array($string)){ | 27 | if(is_array($string)){ |
| 28 | $string = $string[0]; | 28 | $string = $string[0]; |
| 29 | } | 29 | } |
| 30 | - $length = strlen($string); | ||
| 31 | - if($length >= 5){ | ||
| 32 | - $last5Chars = substr($string, -5); | ||
| 33 | - if($last5Chars == '.html'){ | ||
| 34 | - return strtolower($string); | ||
| 35 | - } | 30 | + $last5Chars = substr($string, -5); |
| 31 | + if($last5Chars == '.html'){ | ||
| 32 | + return strtolower($string); | ||
| 33 | + } | ||
| 34 | + $sign = str_replace(".", "", trim(strtolower(preg_replace('/[^\w.]+/', '-', trim($string))), '-')); | ||
| 35 | + $length = strlen($sign); | ||
| 36 | + if($length > 180){ | ||
| 37 | + $sign = trim(mb_substr($sign, 0, 180, 'UTF-8'),'-'); | ||
| 36 | } | 38 | } |
| 37 | - return str_replace(".", "", trim(strtolower(preg_replace('/[^\w.]+/', '-', trim($string))), '-')); | 39 | + return $sign; |
| 38 | } | 40 | } |
| 39 | } | 41 | } |
| 40 | 42 |
| @@ -160,8 +160,6 @@ class RankDataController extends BaseController | @@ -160,8 +160,6 @@ class RankDataController extends BaseController | ||
| 160 | 'reach' => '是否达标', | 160 | 'reach' => '是否达标', |
| 161 | ]; | 161 | ]; |
| 162 | } | 162 | } |
| 163 | - | ||
| 164 | - | ||
| 165 | //生成文件,发送到客户端 | 163 | //生成文件,发送到客户端 |
| 166 | $table = new BatchExportService($lang . "关键词历史数据导出"); | 164 | $table = new BatchExportService($lang . "关键词历史数据导出"); |
| 167 | $file = $table->head($map)->data($data['data'])->save(); | 165 | $file = $table->head($map)->data($data['data'])->save(); |
| @@ -170,7 +168,6 @@ class RankDataController extends BaseController | @@ -170,7 +168,6 @@ class RankDataController extends BaseController | ||
| 170 | } | 168 | } |
| 171 | $fileurl = Storage::disk('runtime')->url($file); | 169 | $fileurl = Storage::disk('runtime')->url($file); |
| 172 | // return Storage::disk('runtime')->download($file); //直接下载 | 170 | // return Storage::disk('runtime')->download($file); //直接下载 |
| 173 | - | ||
| 174 | $this->response('success',Code::SUCCESS,['url' => $fileurl]); | 171 | $this->response('success',Code::SUCCESS,['url' => $fileurl]); |
| 175 | } | 172 | } |
| 176 | 173 |
| @@ -61,10 +61,6 @@ class RouteMap extends Base | @@ -61,10 +61,6 @@ class RouteMap extends Base | ||
| 61 | } | 61 | } |
| 62 | $i=1; | 62 | $i=1; |
| 63 | $sign = generateRoute($title); | 63 | $sign = generateRoute($title); |
| 64 | - $length = strlen($sign); | ||
| 65 | - if($length > 180){ | ||
| 66 | - $sign = trim(mb_substr($sign, 0, 180, 'UTF-8'),'-'); | ||
| 67 | - } | ||
| 68 | $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first(); | 64 | $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first(); |
| 69 | $suffix = ''; | 65 | $suffix = ''; |
| 70 | if(empty($info)){ | 66 | if(empty($info)){ |
-
请 注册 或 登录 后发表评论