@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | // | Packagist 地址 :https://packagist.org/packages/liguangchun/think-library |
18 | 18 | // +---------------------------------------------------------------------- |
19 | 19 | |
20 | -declare (strict_types=1); |
|
20 | +declare(strict_types=1); |
|
21 | 21 | |
22 | 22 | namespace DtApp\ThinkLibrary\helper; |
23 | 23 | |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | */ |
38 | 38 | public function extractBefore(string $str, int $start_num, int $end_num): string |
39 | 39 | { |
40 | - if (strlen($str) < $start_num + $end_num) { |
|
40 | + if (strlen($str) < $start_num+$end_num) { |
|
41 | 41 | return $str; |
42 | 42 | } |
43 | 43 | return substr($str, $start_num, $end_num); |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | // | Packagist 地址 :https://packagist.org/packages/liguangchun/think-library |
18 | 18 | // +---------------------------------------------------------------------- |
19 | 19 | |
20 | -declare (strict_types=1); |
|
20 | +declare(strict_types=1); |
|
21 | 21 | |
22 | 22 | namespace DtApp\ThinkLibrary\helper; |
23 | 23 | |
@@ -60,14 +60,14 @@ discard block |
||
60 | 60 | if (!isset($array) || empty($array)) { |
61 | 61 | return $arrRet; |
62 | 62 | } |
63 | - $iCount = count($array) / $num; |
|
63 | + $iCount = count($array)/$num; |
|
64 | 64 | if (!is_int($iCount)) { |
65 | 65 | $iCount = ceil($iCount); |
66 | - } else { |
|
66 | + }else { |
|
67 | 67 | ++$iCount; |
68 | 68 | } |
69 | 69 | for ($i = 0; $i < $iCount; ++$i) { |
70 | - $arrInfos = array_slice($array, $i * $num, $num); |
|
70 | + $arrInfos = array_slice($array, $i*$num, $num); |
|
71 | 71 | if (empty($arrInfos)) { |
72 | 72 | continue; |
73 | 73 | } |
@@ -109,11 +109,11 @@ discard block |
||
109 | 109 | foreach ($arrays as $array) { |
110 | 110 | if (is_array($array)) { |
111 | 111 | $key_arrays[] = $array[$sort_key]; |
112 | - } else { |
|
112 | + }else { |
|
113 | 113 | return []; |
114 | 114 | } |
115 | 115 | } |
116 | - } else { |
|
116 | + }else { |
|
117 | 117 | return []; |
118 | 118 | } |
119 | 119 | array_multisort($key_arrays, $sort_order, $sort_type, $arrays); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | foreach ($arr as $key => $value) { |
134 | 134 | if (is_array($value)) { |
135 | 135 | $arr[$key] = $this->TrimArray($value); |
136 | - } else { |
|
136 | + }else { |
|
137 | 137 | $arr[$key] = $this->trimAll($value); |
138 | 138 | } |
139 | 139 | } |
@@ -17,7 +17,7 @@ |
||
17 | 17 | // | Packagist 地址 :https://packagist.org/packages/liguangchun/think-library |
18 | 18 | // +---------------------------------------------------------------------- |
19 | 19 | |
20 | -declare (strict_types=1); |
|
20 | +declare(strict_types=1); |
|
21 | 21 | |
22 | 22 | namespace DtApp\ThinkLibrary\helper; |
23 | 23 |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | throw new DtaException('配置网址内容不正确'); |
60 | 60 | } |
61 | 61 | $this->url = $url; |
62 | - } else { |
|
62 | + }else { |
|
63 | 63 | preg_match_all('#\bhttps?://[^,\s()<>]+(?:\([\w\d]+\)|([^,[:punct:]\s]|/))#', $str, $match); |
64 | 64 | $url = $this->judgeUrl($match[0][0]); |
65 | 65 | if (empty($url)) { |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | $backtrack['short_id'] = $item_list['author']['short_id']; |
104 | 104 | $backtrack['avatar'] = $this->cAuthorAvatar($item_list['author']); |
105 | 105 | $this->backtrack = $backtrack; |
106 | - } else { |
|
106 | + }else { |
|
107 | 107 | $this->backtrack = []; |
108 | 108 | } |
109 | 109 | return $this; |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $backtrack['title'] = $item_list['share_info']['share_title']; |
126 | 126 | $backtrack['url'] = $item_list['share_url']; |
127 | 127 | $this->backtrack = $backtrack; |
128 | - } else { |
|
128 | + }else { |
|
129 | 129 | $this->backtrack = []; |
130 | 130 | } |
131 | 131 | return $this; |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | $backtrack['play'] = $item_list['music']['play_url']['uri']; |
151 | 151 | $backtrack['cover'] = $item_list['music']['cover_large']['url_list'][0]; |
152 | 152 | $this->backtrack = $backtrack; |
153 | - } else { |
|
153 | + }else { |
|
154 | 154 | $this->backtrack = []; |
155 | 155 | } |
156 | 156 | return $this; |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | $backtrack['play'] = $this->cVideoPlayUrl($item_list['video']['play_addr']['url_list'][0], 'play'); |
179 | 179 | $backtrack['playwm'] = $this->cVideoPlayUrl($item_list['video']['play_addr']['url_list'][0], 'playwm'); |
180 | 180 | $this->backtrack = $backtrack; |
181 | - } else { |
|
181 | + }else { |
|
182 | 182 | $this->backtrack = []; |
183 | 183 | } |
184 | 184 | return $this; |
@@ -238,322 +238,322 @@ discard block |
||
238 | 238 | $backtrack['video_info']['cover'] = $cVideoAvatar['cover']; |
239 | 239 | $backtrack['video_info']['play'] = $this->cVideoPlayUrl($item_list['video']['play_addr']['url_list'][0], 'play'); |
240 | 240 | $backtrack['video_info']['playwm'] = $this->cVideoPlayUrl($item_list['video']['play_addr']['url_list'][0], 'playwm'); |
241 | - $this->storagePath .= $backtrack['author_info']['uid'] . "/"; |
|
241 | + $this->storagePath .= $backtrack['author_info']['uid']."/"; |
|
242 | 242 | if (!empty($this->storage)) { |
243 | 243 | // 保存文件 |
244 | 244 | // 作者头像 |
245 | 245 | $author_info_avatar = StorageService::instance() |
246 | 246 | ->path($this->storagePath) |
247 | 247 | ->remotely($backtrack['author_info']['avatar']) |
248 | - ->save($backtrack['author_info']['uid'] . ".jpeg"); |
|
248 | + ->save($backtrack['author_info']['uid'].".jpeg"); |
|
249 | 249 | // 音频头像 |
250 | 250 | $music_info_avatar = StorageService::instance() |
251 | 251 | ->path($this->storagePath) |
252 | 252 | ->remotely($backtrack['music_info']['avatar']) |
253 | - ->save($backtrack['music_info']['mid'] . ".jpeg"); |
|
253 | + ->save($backtrack['music_info']['mid'].".jpeg"); |
|
254 | 254 | // 音频文件 |
255 | 255 | if (!empty($backtrack['music_info']['play'])) { |
256 | 256 | $music_info_play = StorageService::instance() |
257 | 257 | ->path($this->storagePath) |
258 | 258 | ->remotely($backtrack['music_info']['play']) |
259 | - ->save($backtrack['music_info']['mid'] . ".mp3"); |
|
260 | - } else { |
|
259 | + ->save($backtrack['music_info']['mid'].".mp3"); |
|
260 | + }else { |
|
261 | 261 | $music_info_play = ['size' => '0kb']; |
262 | 262 | } |
263 | 263 | // 音频封面 |
264 | 264 | $music_info_cover = StorageService::instance() |
265 | 265 | ->path($this->storagePath) |
266 | 266 | ->remotely($backtrack['music_info']['cover']) |
267 | - ->save($backtrack['music_info']['mid'] . "_cover" . ".jpeg"); |
|
267 | + ->save($backtrack['music_info']['mid']."_cover".".jpeg"); |
|
268 | 268 | // 视频封面 |
269 | 269 | $video_info_dynamic = StorageService::instance() |
270 | 270 | ->path($this->storagePath) |
271 | 271 | ->remotely($backtrack['video_info']['dynamic']) |
272 | - ->save($backtrack['video_info']['vid'] . "_dynamic" . ".jpeg"); |
|
272 | + ->save($backtrack['video_info']['vid']."_dynamic".".jpeg"); |
|
273 | 273 | // 视频封面 |
274 | 274 | $video_info_origin_cover = StorageService::instance() |
275 | 275 | ->path($this->storagePath) |
276 | 276 | ->remotely($backtrack['video_info']['origin_cover']) |
277 | - ->save($backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg"); |
|
277 | + ->save($backtrack['video_info']['vid']."_origin_cover".".jpeg"); |
|
278 | 278 | // 视频封面 |
279 | 279 | $video_info_cover = StorageService::instance() |
280 | 280 | ->path($this->storagePath) |
281 | 281 | ->remotely($backtrack['video_info']['cover']) |
282 | - ->save($backtrack['video_info']['vid'] . "_cover" . ".jpeg"); |
|
282 | + ->save($backtrack['video_info']['vid']."_cover".".jpeg"); |
|
283 | 283 | // 视频文件 |
284 | 284 | $video_info_play = StorageService::instance() |
285 | 285 | ->path($this->storagePath) |
286 | 286 | ->remotely($backtrack['video_info']['play']) |
287 | - ->save($backtrack['video_info']['vid'] . "_play" . ".mp4"); |
|
287 | + ->save($backtrack['video_info']['vid']."_play".".mp4"); |
|
288 | 288 | // 视频文件 |
289 | 289 | $video_info_playwm = StorageService::instance() |
290 | 290 | ->path($this->storagePath) |
291 | 291 | ->remotely($backtrack['video_info']['playwm']) |
292 | - ->save($backtrack['video_info']['vid'] . "_playwm" . ".mp4"); |
|
292 | + ->save($backtrack['video_info']['vid']."_playwm".".mp4"); |
|
293 | 293 | $system_path = StorageService::instance() |
294 | 294 | ->path($this->storagePath) |
295 | 295 | ->getPath(); |
296 | - $yun_path = "douyin/" . $backtrack['author_info']['uid'] . '/'; |
|
296 | + $yun_path = "douyin/".$backtrack['author_info']['uid'].'/'; |
|
297 | 297 | // 上传到云存储 |
298 | 298 | $backtrack['yun']['platform'] = $this->storage; |
299 | 299 | switch ($this->storage) { |
300 | 300 | case "aliyun": |
301 | 301 | // 作者头像 |
302 | 302 | $backtrack['yun']['author_info']['avatar'] = OssService::instance() |
303 | - ->upload($yun_path . $backtrack['author_info']['uid'] . ".jpeg", $system_path . $backtrack['author_info']['uid'] . ".jpeg"); |
|
303 | + ->upload($yun_path.$backtrack['author_info']['uid'].".jpeg", $system_path.$backtrack['author_info']['uid'].".jpeg"); |
|
304 | 304 | // 音频头像 |
305 | 305 | $backtrack['yun']['music_info']['avatar'] = OssService::instance() |
306 | - ->upload($yun_path . $backtrack['music_info']['mid'] . ".jpeg", $system_path . $backtrack['music_info']['mid'] . ".jpeg"); |
|
306 | + ->upload($yun_path.$backtrack['music_info']['mid'].".jpeg", $system_path.$backtrack['music_info']['mid'].".jpeg"); |
|
307 | 307 | // 音频文件 |
308 | 308 | if (!empty($backtrack['music_info']['play'])) { |
309 | 309 | $backtrack['yun']['music_info']['play'] = OssService::instance() |
310 | - ->upload($yun_path . $backtrack['music_info']['mid'] . ".mp3", $system_path . $backtrack['music_info']['mid'] . ".mp3"); |
|
311 | - } else { |
|
310 | + ->upload($yun_path.$backtrack['music_info']['mid'].".mp3", $system_path.$backtrack['music_info']['mid'].".mp3"); |
|
311 | + }else { |
|
312 | 312 | $backtrack['yun']['music_info']['play'] = ''; |
313 | 313 | } |
314 | 314 | // 音频封面 |
315 | 315 | $backtrack['yun']['music_info']['cover'] = OssService::instance() |
316 | - ->upload($yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg", $system_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg"); |
|
316 | + ->upload($yun_path.$backtrack['music_info']['mid']."_cover".".jpeg", $system_path.$backtrack['music_info']['mid']."_cover".".jpeg"); |
|
317 | 317 | // 视频封面 |
318 | 318 | $backtrack['yun']['video_info']['dynamic'] = OssService::instance() |
319 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg"); |
|
319 | + ->upload($yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg", $system_path.$backtrack['video_info']['vid']."_dynamic".".jpeg"); |
|
320 | 320 | // 视频封面 |
321 | 321 | $backtrack['yun']['video_info']['origin_cover'] = OssService::instance() |
322 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg"); |
|
322 | + ->upload($yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg"); |
|
323 | 323 | // 视频封面 |
324 | 324 | $backtrack['yun']['video_info']['cover'] = OssService::instance() |
325 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg"); |
|
325 | + ->upload($yun_path.$backtrack['video_info']['vid']."_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_cover".".jpeg"); |
|
326 | 326 | // 视频文件 |
327 | 327 | $backtrack['yun']['video_info']['play'] = OssService::instance() |
328 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_play" . ".mp4"); |
|
328 | + ->upload($yun_path.$backtrack['video_info']['vid']."_play".".mp4", $system_path.$backtrack['video_info']['vid']."_play".".mp4"); |
|
329 | 329 | // 视频文件 |
330 | 330 | $backtrack['yun']['video_info']['playwm'] = OssService::instance() |
331 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4"); |
|
331 | + ->upload($yun_path.$backtrack['video_info']['vid']."_playwm".".mp4", $system_path.$backtrack['video_info']['vid']."_playwm".".mp4"); |
|
332 | 332 | break; |
333 | 333 | case "tencentcloud": |
334 | 334 | // 作者头像 |
335 | 335 | $backtrack['yun']['author_info']['avatar'] = CosService::instance() |
336 | - ->upload($yun_path . $backtrack['author_info']['uid'] . ".jpeg", $system_path . $backtrack['author_info']['uid'] . ".jpeg"); |
|
336 | + ->upload($yun_path.$backtrack['author_info']['uid'].".jpeg", $system_path.$backtrack['author_info']['uid'].".jpeg"); |
|
337 | 337 | // 音频头像 |
338 | 338 | $backtrack['yun']['music_info']['avatar'] = CosService::instance() |
339 | - ->upload($yun_path . $backtrack['music_info']['mid'] . ".jpeg", $system_path . $backtrack['music_info']['mid'] . ".jpeg"); |
|
339 | + ->upload($yun_path.$backtrack['music_info']['mid'].".jpeg", $system_path.$backtrack['music_info']['mid'].".jpeg"); |
|
340 | 340 | // 音频文件 |
341 | 341 | if (!empty($backtrack['music_info']['play'])) { |
342 | 342 | $backtrack['yun']['music_info']['play'] = CosService::instance() |
343 | - ->upload($yun_path . $backtrack['music_info']['mid'] . ".mp3", $system_path . $backtrack['music_info']['mid'] . ".mp3"); |
|
344 | - } else { |
|
343 | + ->upload($yun_path.$backtrack['music_info']['mid'].".mp3", $system_path.$backtrack['music_info']['mid'].".mp3"); |
|
344 | + }else { |
|
345 | 345 | $backtrack['yun']['music_info']['play'] = ''; |
346 | 346 | } |
347 | 347 | // 音频封面 |
348 | 348 | $backtrack['yun']['music_info']['cover'] = CosService::instance() |
349 | - ->upload($yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg", $system_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg"); |
|
349 | + ->upload($yun_path.$backtrack['music_info']['mid']."_cover".".jpeg", $system_path.$backtrack['music_info']['mid']."_cover".".jpeg"); |
|
350 | 350 | // 视频封面 |
351 | 351 | $backtrack['yun']['video_info']['dynamic'] = CosService::instance() |
352 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg"); |
|
352 | + ->upload($yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg", $system_path.$backtrack['video_info']['vid']."_dynamic".".jpeg"); |
|
353 | 353 | // 视频封面 |
354 | 354 | $backtrack['yun']['video_info']['origin_cover'] = CosService::instance() |
355 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg"); |
|
355 | + ->upload($yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg"); |
|
356 | 356 | // 视频封面 |
357 | 357 | $backtrack['yun']['video_info']['cover'] = CosService::instance() |
358 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg"); |
|
358 | + ->upload($yun_path.$backtrack['video_info']['vid']."_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_cover".".jpeg"); |
|
359 | 359 | // 视频文件 |
360 | 360 | $backtrack['yun']['video_info']['play'] = CosService::instance() |
361 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_play" . ".mp4"); |
|
361 | + ->upload($yun_path.$backtrack['video_info']['vid']."_play".".mp4", $system_path.$backtrack['video_info']['vid']."_play".".mp4"); |
|
362 | 362 | // 视频文件 |
363 | 363 | $backtrack['yun']['video_info']['playwm'] = CosService::instance() |
364 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4"); |
|
364 | + ->upload($yun_path.$backtrack['video_info']['vid']."_playwm".".mp4", $system_path.$backtrack['video_info']['vid']."_playwm".".mp4"); |
|
365 | 365 | break; |
366 | 366 | case "huaweicloud": |
367 | 367 | // 作者头像 |
368 | 368 | $backtrack['yun']['author_info']['avatar'] = ObsService::instance() |
369 | - ->upload($yun_path . $backtrack['author_info']['uid'] . ".jpeg", $system_path . $backtrack['author_info']['uid'] . ".jpeg"); |
|
369 | + ->upload($yun_path.$backtrack['author_info']['uid'].".jpeg", $system_path.$backtrack['author_info']['uid'].".jpeg"); |
|
370 | 370 | // 音频头像 |
371 | 371 | $backtrack['yun']['music_info']['avatar'] = ObsService::instance() |
372 | - ->upload($yun_path . $backtrack['music_info']['mid'] . ".jpeg", $system_path . $backtrack['music_info']['mid'] . ".jpeg"); |
|
372 | + ->upload($yun_path.$backtrack['music_info']['mid'].".jpeg", $system_path.$backtrack['music_info']['mid'].".jpeg"); |
|
373 | 373 | // 音频文件 |
374 | 374 | if (!empty($backtrack['music_info']['play'])) { |
375 | 375 | $backtrack['yun']['music_info']['play'] = ObsService::instance() |
376 | - ->upload($yun_path . $backtrack['music_info']['mid'] . ".mp3", $system_path . $backtrack['music_info']['mid'] . ".mp3"); |
|
377 | - } else { |
|
376 | + ->upload($yun_path.$backtrack['music_info']['mid'].".mp3", $system_path.$backtrack['music_info']['mid'].".mp3"); |
|
377 | + }else { |
|
378 | 378 | $backtrack['yun']['music_info']['play'] = ''; |
379 | 379 | } |
380 | 380 | // 音频封面 |
381 | 381 | $backtrack['yun']['music_info']['cover'] = ObsService::instance() |
382 | - ->upload($yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg", $system_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg"); |
|
382 | + ->upload($yun_path.$backtrack['music_info']['mid']."_cover".".jpeg", $system_path.$backtrack['music_info']['mid']."_cover".".jpeg"); |
|
383 | 383 | // 视频封面 |
384 | 384 | $backtrack['yun']['video_info']['dynamic'] = ObsService::instance() |
385 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg"); |
|
385 | + ->upload($yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg", $system_path.$backtrack['video_info']['vid']."_dynamic".".jpeg"); |
|
386 | 386 | // 视频封面 |
387 | 387 | $backtrack['yun']['video_info']['origin_cover'] = ObsService::instance() |
388 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg"); |
|
388 | + ->upload($yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg"); |
|
389 | 389 | // 视频封面 |
390 | 390 | $backtrack['yun']['video_info']['cover'] = ObsService::instance() |
391 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg"); |
|
391 | + ->upload($yun_path.$backtrack['video_info']['vid']."_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_cover".".jpeg"); |
|
392 | 392 | // 视频文件 |
393 | 393 | $backtrack['yun']['video_info']['play'] = ObsService::instance() |
394 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_play" . ".mp4"); |
|
394 | + ->upload($yun_path.$backtrack['video_info']['vid']."_play".".mp4", $system_path.$backtrack['video_info']['vid']."_play".".mp4"); |
|
395 | 395 | // 视频文件 |
396 | 396 | $backtrack['yun']['video_info']['playwm'] = ObsService::instance() |
397 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4"); |
|
397 | + ->upload($yun_path.$backtrack['video_info']['vid']."_playwm".".mp4", $system_path.$backtrack['video_info']['vid']."_playwm".".mp4"); |
|
398 | 398 | break; |
399 | 399 | case "baiducloud": |
400 | 400 | // 作者头像 |
401 | 401 | $backtrack['yun']['author_info']['avatar'] = BosService::instance() |
402 | - ->upload($yun_path . $backtrack['author_info']['uid'] . ".jpeg", $system_path . $backtrack['author_info']['uid'] . ".jpeg"); |
|
402 | + ->upload($yun_path.$backtrack['author_info']['uid'].".jpeg", $system_path.$backtrack['author_info']['uid'].".jpeg"); |
|
403 | 403 | // 音频头像 |
404 | 404 | $backtrack['yun']['music_info']['avatar'] = BosService::instance() |
405 | - ->upload($yun_path . $backtrack['music_info']['mid'] . ".jpeg", $system_path . $backtrack['music_info']['mid'] . ".jpeg"); |
|
405 | + ->upload($yun_path.$backtrack['music_info']['mid'].".jpeg", $system_path.$backtrack['music_info']['mid'].".jpeg"); |
|
406 | 406 | // 音频文件 |
407 | 407 | if (!empty($backtrack['music_info']['play'])) { |
408 | 408 | $backtrack['yun']['music_info']['play'] = BosService::instance() |
409 | - ->upload($yun_path . $backtrack['music_info']['mid'] . ".mp3", $system_path . $backtrack['music_info']['mid'] . ".mp3"); |
|
410 | - } else { |
|
409 | + ->upload($yun_path.$backtrack['music_info']['mid'].".mp3", $system_path.$backtrack['music_info']['mid'].".mp3"); |
|
410 | + }else { |
|
411 | 411 | $backtrack['yun']['music_info']['play'] = ''; |
412 | 412 | } |
413 | 413 | // 音频封面 |
414 | 414 | $backtrack['yun']['music_info']['cover'] = BosService::instance() |
415 | - ->upload($yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg", $system_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg"); |
|
415 | + ->upload($yun_path.$backtrack['music_info']['mid']."_cover".".jpeg", $system_path.$backtrack['music_info']['mid']."_cover".".jpeg"); |
|
416 | 416 | // 视频封面 |
417 | 417 | $backtrack['yun']['video_info']['dynamic'] = BosService::instance() |
418 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg"); |
|
418 | + ->upload($yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg", $system_path.$backtrack['video_info']['vid']."_dynamic".".jpeg"); |
|
419 | 419 | // 视频封面 |
420 | 420 | $backtrack['yun']['video_info']['origin_cover'] = BosService::instance() |
421 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg"); |
|
421 | + ->upload($yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg"); |
|
422 | 422 | // 视频封面 |
423 | 423 | $backtrack['yun']['video_info']['cover'] = BosService::instance() |
424 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg"); |
|
424 | + ->upload($yun_path.$backtrack['video_info']['vid']."_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_cover".".jpeg"); |
|
425 | 425 | // 视频文件 |
426 | 426 | $backtrack['yun']['video_info']['play'] = BosService::instance() |
427 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_play" . ".mp4"); |
|
427 | + ->upload($yun_path.$backtrack['video_info']['vid']."_play".".mp4", $system_path.$backtrack['video_info']['vid']."_play".".mp4"); |
|
428 | 428 | // 视频文件 |
429 | 429 | $backtrack['yun']['video_info']['playwm'] = BosService::instance() |
430 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4"); |
|
430 | + ->upload($yun_path.$backtrack['video_info']['vid']."_playwm".".mp4", $system_path.$backtrack['video_info']['vid']."_playwm".".mp4"); |
|
431 | 431 | break; |
432 | 432 | case "qiniu": |
433 | 433 | // 作者头像 |
434 | 434 | $backtrack['yun']['author_info']['avatar'] = KodoService::instance() |
435 | - ->upload($yun_path . $backtrack['author_info']['uid'] . ".jpeg", $system_path . $backtrack['author_info']['uid'] . ".jpeg"); |
|
435 | + ->upload($yun_path.$backtrack['author_info']['uid'].".jpeg", $system_path.$backtrack['author_info']['uid'].".jpeg"); |
|
436 | 436 | // 音频头像 |
437 | 437 | $backtrack['yun']['music_info']['avatar'] = KodoService::instance() |
438 | - ->upload($yun_path . $backtrack['music_info']['mid'] . ".jpeg", $system_path . $backtrack['music_info']['mid'] . ".jpeg"); |
|
438 | + ->upload($yun_path.$backtrack['music_info']['mid'].".jpeg", $system_path.$backtrack['music_info']['mid'].".jpeg"); |
|
439 | 439 | // 音频文件 |
440 | 440 | if (!empty($backtrack['music_info']['play'])) { |
441 | 441 | $backtrack['yun']['music_info']['play'] = KodoService::instance() |
442 | - ->upload($yun_path . $backtrack['music_info']['mid'] . ".mp3", $system_path . $backtrack['music_info']['mid'] . ".mp3"); |
|
443 | - } else { |
|
442 | + ->upload($yun_path.$backtrack['music_info']['mid'].".mp3", $system_path.$backtrack['music_info']['mid'].".mp3"); |
|
443 | + }else { |
|
444 | 444 | $backtrack['yun']['music_info']['play'] = ''; |
445 | 445 | } |
446 | 446 | // 音频封面 |
447 | 447 | $backtrack['yun']['music_info']['cover'] = KodoService::instance() |
448 | - ->upload($yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg", $system_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg"); |
|
448 | + ->upload($yun_path.$backtrack['music_info']['mid']."_cover".".jpeg", $system_path.$backtrack['music_info']['mid']."_cover".".jpeg"); |
|
449 | 449 | // 视频封面 |
450 | 450 | $backtrack['yun']['video_info']['dynamic'] = KodoService::instance() |
451 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg"); |
|
451 | + ->upload($yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg", $system_path.$backtrack['video_info']['vid']."_dynamic".".jpeg"); |
|
452 | 452 | // 视频封面 |
453 | 453 | $backtrack['yun']['video_info']['origin_cover'] = KodoService::instance() |
454 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg"); |
|
454 | + ->upload($yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg"); |
|
455 | 455 | // 视频封面 |
456 | 456 | $backtrack['yun']['video_info']['cover'] = KodoService::instance() |
457 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg"); |
|
457 | + ->upload($yun_path.$backtrack['video_info']['vid']."_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_cover".".jpeg"); |
|
458 | 458 | // 视频文件 |
459 | 459 | $backtrack['yun']['video_info']['play'] = KodoService::instance() |
460 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_play" . ".mp4"); |
|
460 | + ->upload($yun_path.$backtrack['video_info']['vid']."_play".".mp4", $system_path.$backtrack['video_info']['vid']."_play".".mp4"); |
|
461 | 461 | // 视频文件 |
462 | 462 | $backtrack['yun']['video_info']['playwm'] = KodoService::instance() |
463 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4"); |
|
463 | + ->upload($yun_path.$backtrack['video_info']['vid']."_playwm".".mp4", $system_path.$backtrack['video_info']['vid']."_playwm".".mp4"); |
|
464 | 464 | break; |
465 | 465 | case "upyun": |
466 | 466 | // 作者头像 |
467 | 467 | $backtrack['yun']['author_info']['avatar'] = UssService::instance() |
468 | - ->upload($yun_path . $backtrack['author_info']['uid'] . ".jpeg", $system_path . $backtrack['author_info']['uid'] . ".jpeg"); |
|
468 | + ->upload($yun_path.$backtrack['author_info']['uid'].".jpeg", $system_path.$backtrack['author_info']['uid'].".jpeg"); |
|
469 | 469 | // 音频头像 |
470 | 470 | $backtrack['yun']['music_info']['avatar'] = UssService::instance() |
471 | - ->upload($yun_path . $backtrack['music_info']['mid'] . ".jpeg", $system_path . $backtrack['music_info']['mid'] . ".jpeg"); |
|
471 | + ->upload($yun_path.$backtrack['music_info']['mid'].".jpeg", $system_path.$backtrack['music_info']['mid'].".jpeg"); |
|
472 | 472 | // 音频文件 |
473 | 473 | if (!empty($backtrack['music_info']['play'])) { |
474 | 474 | $backtrack['yun']['music_info']['play'] = UssService::instance() |
475 | - ->upload($yun_path . $backtrack['music_info']['mid'] . ".mp3", $system_path . $backtrack['music_info']['mid'] . ".mp3"); |
|
476 | - } else { |
|
475 | + ->upload($yun_path.$backtrack['music_info']['mid'].".mp3", $system_path.$backtrack['music_info']['mid'].".mp3"); |
|
476 | + }else { |
|
477 | 477 | $backtrack['yun']['music_info']['play'] = ''; |
478 | 478 | } |
479 | 479 | // 音频封面 |
480 | 480 | $backtrack['yun']['music_info']['cover'] = UssService::instance() |
481 | - ->upload($yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg", $system_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg"); |
|
481 | + ->upload($yun_path.$backtrack['music_info']['mid']."_cover".".jpeg", $system_path.$backtrack['music_info']['mid']."_cover".".jpeg"); |
|
482 | 482 | // 视频封面 |
483 | 483 | $backtrack['yun']['video_info']['dynamic'] = UssService::instance() |
484 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg"); |
|
484 | + ->upload($yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg", $system_path.$backtrack['video_info']['vid']."_dynamic".".jpeg"); |
|
485 | 485 | // 视频封面 |
486 | 486 | $backtrack['yun']['video_info']['origin_cover'] = UssService::instance() |
487 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg"); |
|
487 | + ->upload($yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg"); |
|
488 | 488 | // 视频封面 |
489 | 489 | $backtrack['yun']['video_info']['cover'] = UssService::instance() |
490 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg"); |
|
490 | + ->upload($yun_path.$backtrack['video_info']['vid']."_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_cover".".jpeg"); |
|
491 | 491 | // 视频文件 |
492 | 492 | $backtrack['yun']['video_info']['play'] = UssService::instance() |
493 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_play" . ".mp4"); |
|
493 | + ->upload($yun_path.$backtrack['video_info']['vid']."_play".".mp4", $system_path.$backtrack['video_info']['vid']."_play".".mp4"); |
|
494 | 494 | // 视频文件 |
495 | 495 | $backtrack['yun']['video_info']['playwm'] = UssService::instance() |
496 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4"); |
|
496 | + ->upload($yun_path.$backtrack['video_info']['vid']."_playwm".".mp4", $system_path.$backtrack['video_info']['vid']."_playwm".".mp4"); |
|
497 | 497 | break; |
498 | 498 | case "ksyun": |
499 | 499 | // 作者头像 |
500 | 500 | $backtrack['yun']['author_info']['avatar'] = Ks3Service::instance() |
501 | - ->upload($yun_path . $backtrack['author_info']['uid'] . ".jpeg", $system_path . $backtrack['author_info']['uid'] . ".jpeg"); |
|
501 | + ->upload($yun_path.$backtrack['author_info']['uid'].".jpeg", $system_path.$backtrack['author_info']['uid'].".jpeg"); |
|
502 | 502 | // 音频头像 |
503 | 503 | $backtrack['yun']['music_info']['avatar'] = Ks3Service::instance() |
504 | - ->upload($yun_path . $backtrack['music_info']['mid'] . ".jpeg", $system_path . $backtrack['music_info']['mid'] . ".jpeg"); |
|
504 | + ->upload($yun_path.$backtrack['music_info']['mid'].".jpeg", $system_path.$backtrack['music_info']['mid'].".jpeg"); |
|
505 | 505 | // 音频文件 |
506 | 506 | if (!empty($backtrack['music_info']['play'])) { |
507 | 507 | $backtrack['yun']['music_info']['play'] = Ks3Service::instance() |
508 | - ->upload($yun_path . $backtrack['music_info']['mid'] . ".mp3", $system_path . $backtrack['music_info']['mid'] . ".mp3"); |
|
509 | - } else { |
|
508 | + ->upload($yun_path.$backtrack['music_info']['mid'].".mp3", $system_path.$backtrack['music_info']['mid'].".mp3"); |
|
509 | + }else { |
|
510 | 510 | $backtrack['yun']['music_info']['play'] = ''; |
511 | 511 | } |
512 | 512 | // 音频封面 |
513 | 513 | $backtrack['yun']['music_info']['cover'] = Ks3Service::instance() |
514 | - ->upload($yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg", $system_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg"); |
|
514 | + ->upload($yun_path.$backtrack['music_info']['mid']."_cover".".jpeg", $system_path.$backtrack['music_info']['mid']."_cover".".jpeg"); |
|
515 | 515 | // 视频封面 |
516 | 516 | $backtrack['yun']['video_info']['dynamic'] = Ks3Service::instance() |
517 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg"); |
|
517 | + ->upload($yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg", $system_path.$backtrack['video_info']['vid']."_dynamic".".jpeg"); |
|
518 | 518 | // 视频封面 |
519 | 519 | $backtrack['yun']['video_info']['origin_cover'] = Ks3Service::instance() |
520 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg"); |
|
520 | + ->upload($yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg"); |
|
521 | 521 | // 视频封面 |
522 | 522 | $backtrack['yun']['video_info']['cover'] = Ks3Service::instance() |
523 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg"); |
|
523 | + ->upload($yun_path.$backtrack['video_info']['vid']."_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_cover".".jpeg"); |
|
524 | 524 | // 视频文件 |
525 | 525 | $backtrack['yun']['video_info']['play'] = Ks3Service::instance() |
526 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_play" . ".mp4"); |
|
526 | + ->upload($yun_path.$backtrack['video_info']['vid']."_play".".mp4", $system_path.$backtrack['video_info']['vid']."_play".".mp4"); |
|
527 | 527 | // 视频文件 |
528 | 528 | $backtrack['yun']['video_info']['playwm'] = Ks3Service::instance() |
529 | - ->upload($yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4"); |
|
529 | + ->upload($yun_path.$backtrack['video_info']['vid']."_playwm".".mp4", $system_path.$backtrack['video_info']['vid']."_playwm".".mp4"); |
|
530 | 530 | break; |
531 | 531 | case "storage": |
532 | 532 | $domain_name = config('dtapp.storage.domain_name'); |
533 | - $new_yun_path = config("dtapp.storage.domain_list.{$domain_name}") . "upload/watermark/{$yun_path}"; |
|
533 | + $new_yun_path = config("dtapp.storage.domain_list.{$domain_name}")."upload/watermark/{$yun_path}"; |
|
534 | 534 | // 本地存储 |
535 | 535 | // 作者头像 |
536 | - $backtrack['yun']['author_info']['avatar'] = ($new_yun_path) . $backtrack['author_info']['uid'] . ".jpeg"; |
|
536 | + $backtrack['yun']['author_info']['avatar'] = ($new_yun_path).$backtrack['author_info']['uid'].".jpeg"; |
|
537 | 537 | // 音频头像 |
538 | - $backtrack['yun']['music_info']['avatar'] = $new_yun_path . $backtrack['music_info']['mid'] . ".jpeg"; |
|
538 | + $backtrack['yun']['music_info']['avatar'] = $new_yun_path.$backtrack['music_info']['mid'].".jpeg"; |
|
539 | 539 | // 音频文件 |
540 | 540 | if (!empty($backtrack['music_info']['play'])) { |
541 | - $backtrack['yun']['music_info']['play'] = $new_yun_path . $backtrack['music_info']['mid'] . ".mp3"; |
|
542 | - } else { |
|
541 | + $backtrack['yun']['music_info']['play'] = $new_yun_path.$backtrack['music_info']['mid'].".mp3"; |
|
542 | + }else { |
|
543 | 543 | $backtrack['yun']['music_info']['play'] = $new_yun_path; |
544 | 544 | } |
545 | 545 | // 音频封面 |
546 | - $backtrack['yun']['music_info']['cover'] = $new_yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg"; |
|
546 | + $backtrack['yun']['music_info']['cover'] = $new_yun_path.$backtrack['music_info']['mid']."_cover".".jpeg"; |
|
547 | 547 | // 视频封面 |
548 | - $backtrack['yun']['video_info']['dynamic'] = $new_yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg"; |
|
548 | + $backtrack['yun']['video_info']['dynamic'] = $new_yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg"; |
|
549 | 549 | // 视频封面 |
550 | - $backtrack['yun']['video_info']['origin_cover'] = $new_yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg"; |
|
550 | + $backtrack['yun']['video_info']['origin_cover'] = $new_yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg"; |
|
551 | 551 | // 视频封面 |
552 | - $backtrack['yun']['video_info']['cover'] = $new_yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg"; |
|
552 | + $backtrack['yun']['video_info']['cover'] = $new_yun_path.$backtrack['video_info']['vid']."_cover".".jpeg"; |
|
553 | 553 | // 视频文件 |
554 | - $backtrack['yun']['video_info']['play'] = $new_yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4"; |
|
554 | + $backtrack['yun']['video_info']['play'] = $new_yun_path.$backtrack['video_info']['vid']."_play".".mp4"; |
|
555 | 555 | // 视频文件 |
556 | - $backtrack['yun']['video_info']['playwm'] = $new_yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4"; |
|
556 | + $backtrack['yun']['video_info']['playwm'] = $new_yun_path.$backtrack['video_info']['vid']."_playwm".".mp4"; |
|
557 | 557 | break; |
558 | 558 | default: |
559 | 559 | break; |
@@ -579,7 +579,7 @@ discard block |
||
579 | 579 | $backtrack['size']['video_info']['playwm'] = $video_info_playwm['size']; |
580 | 580 | } |
581 | 581 | $this->backtrack = $backtrack; |
582 | - } else { |
|
582 | + }else { |
|
583 | 583 | $this->backtrack = []; |
584 | 584 | } |
585 | 585 | return $this; |
@@ -745,7 +745,7 @@ discard block |
||
745 | 745 | { |
746 | 746 | if ($type === 'play') { |
747 | 747 | $headers = get_headers(str_replace("/playwm/", "/play/", $url), TRUE); |
748 | - } else { |
|
748 | + }else { |
|
749 | 749 | $headers = get_headers($url, TRUE); |
750 | 750 | } |
751 | 751 | //输出跳转到的网址 |
@@ -220,10 +220,10 @@ discard block |
||
220 | 220 | throw new DtaException('请检查阿里-阿里云配置信息 appcode'); |
221 | 221 | } |
222 | 222 | $headers = array(); |
223 | - $headers[] = "Authorization:APPCODE " . $appcode; |
|
223 | + $headers[] = "Authorization:APPCODE ".$appcode; |
|
224 | 224 | $querys = "ip={$this->ip}"; |
225 | 225 | $bodys = ""; |
226 | - $url = $host . $path . "?" . $querys; |
|
226 | + $url = $host.$path."?".$querys; |
|
227 | 227 | |
228 | 228 | $curl = curl_init(); |
229 | 229 | curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $method); |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | curl_setopt($curl, CURLOPT_FAILONERROR, false); |
233 | 233 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
234 | 234 | curl_setopt($curl, CURLOPT_HEADER, false); |
235 | - if (1 == strpos("$" . $host, "https://")) { |
|
235 | + if (1 == strpos("$".$host, "https://")) { |
|
236 | 236 | curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); |
237 | 237 | curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); |
238 | 238 | } |
@@ -24,7 +24,7 @@ |
||
24 | 24 | /** |
25 | 25 | * @var |
26 | 26 | */ |
27 | - public $country_name , $region_name, $city_name , $district_name , $china_admin_code, $covering_radius,$longitude , $latitude = ''; |
|
27 | + public $country_name, $region_name, $city_name, $district_name, $china_admin_code, $covering_radius, $longitude, $latitude = ''; |
|
28 | 28 | |
29 | 29 | /** |
30 | 30 | * IpIpDistrictInfo constructor. |
@@ -75,13 +75,13 @@ discard block |
||
75 | 75 | throw new Exception('IP Database metadata error.'); |
76 | 76 | } |
77 | 77 | |
78 | - $fileSize = 4 + $metaLength + $this->meta['total_size']; |
|
78 | + $fileSize = 4+$metaLength+$this->meta['total_size']; |
|
79 | 79 | if ($fileSize !== $this->fileSize) { |
80 | 80 | throw new Exception('IP Database size error.'); |
81 | 81 | } |
82 | 82 | |
83 | 83 | $this->nodeCount = $this->meta['node_count']; |
84 | - $this->nodeOffset = 4 + $metaLength; |
|
84 | + $this->nodeOffset = 4+$metaLength; |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | /** |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | private function findNode($ip): int |
162 | 162 | { |
163 | 163 | $binary = inet_pton($ip); |
164 | - $bitCount = strlen($binary) * 8; // 32 | 128 |
|
164 | + $bitCount = strlen($binary)*8; // 32 | 128 |
|
165 | 165 | $key = substr($binary, 0, 2); |
166 | 166 | $node = 0; |
167 | 167 | $index = 0; |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | for ($i = 0; $i < 96 && $node < $this->nodeCount; $i++) { |
171 | 171 | if ($i >= 80) { |
172 | 172 | $idx = 1; |
173 | - } else { |
|
173 | + }else { |
|
174 | 174 | $idx = 0; |
175 | 175 | } |
176 | 176 | $node = $this->readNode($node, $idx); |
@@ -179,10 +179,10 @@ discard block |
||
179 | 179 | } |
180 | 180 | } |
181 | 181 | $this->v4offset = $node; |
182 | - } else { |
|
182 | + }else { |
|
183 | 183 | $node = $this->v4offset; |
184 | 184 | } |
185 | - } else { |
|
185 | + }else { |
|
186 | 186 | if (isset($this->v6offsetCache[$key])) { |
187 | 187 | $index = 16; |
188 | 188 | $node = $this->v6offsetCache[$key]; |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | break; |
195 | 195 | } |
196 | 196 | |
197 | - $node = $this->readNode($node, 1 & ((0xFF & ord($binary[$i >> 3])) >> 7 - ($i % 8))); |
|
197 | + $node = $this->readNode($node, 1 & ((0xFF & ord($binary[$i >> 3])) >> 7-($i%8))); |
|
198 | 198 | |
199 | 199 | if ($i == 15) { |
200 | 200 | $this->v6offsetCache[$key] = $node; |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | */ |
221 | 221 | private function readNode($node, $index) |
222 | 222 | { |
223 | - return unpack('N', $this->read($this->file, $node * 8 + $index * 4, 4))[1]; |
|
223 | + return unpack('N', $this->read($this->file, $node*8+$index*4, 4))[1]; |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | /** |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | */ |
231 | 231 | private function resolve($node) |
232 | 232 | { |
233 | - $resolved = $node - $this->nodeCount + $this->nodeCount * 8; |
|
233 | + $resolved = $node-$this->nodeCount+$this->nodeCount*8; |
|
234 | 234 | if ($resolved >= $this->fileSize) { |
235 | 235 | return NULL; |
236 | 236 | } |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | private function read($stream, $offset, $length) |
264 | 264 | { |
265 | 265 | if ($length > 0) { |
266 | - if (fseek($stream, $offset + $this->nodeOffset) === 0) { |
|
266 | + if (fseek($stream, $offset+$this->nodeOffset) === 0) { |
|
267 | 267 | $value = fread($stream, $length); |
268 | 268 | if (strlen($value) === $length) { |
269 | 269 | return $value; |
@@ -135,14 +135,14 @@ |
||
135 | 135 | if (empty($this->path)) { |
136 | 136 | $this->getConfig(); |
137 | 137 | } |
138 | - $bytes = filesize($this->path . $name); |
|
138 | + $bytes = filesize($this->path.$name); |
|
139 | 139 | if ($bytes >= 1073741824) { |
140 | - $bytes = round($bytes / 1073741824 * 100) / 100 . 'GB'; |
|
140 | + $bytes = round($bytes/1073741824*100)/100.'GB'; |
|
141 | 141 | } elseif ($bytes >= 1048576) { |
142 | - $bytes = round($bytes / 1048576 * 100) / 100 . 'MB'; |
|
142 | + $bytes = round($bytes/1048576*100)/100.'MB'; |
|
143 | 143 | } elseif ($bytes >= 1024) { |
144 | - $bytes = round($bytes / 1024 * 100) / 100 . 'KB'; |
|
145 | - } else { |
|
144 | + $bytes = round($bytes/1024*100)/100.'KB'; |
|
145 | + }else { |
|
146 | 146 | $bytes .= 'Bytes'; |
147 | 147 | } |
148 | 148 | return $bytes; |
@@ -52,15 +52,15 @@ discard block |
||
52 | 52 | if (empty($suffix) && !empty($fillSuffix)) { |
53 | 53 | if (empty($url_common_param)) { |
54 | 54 | $location = $this->app->route->buildUrl($url, $vars)->suffix($suffix)->domain($domain)->build(); |
55 | - } else { |
|
55 | + }else { |
|
56 | 56 | $location = $this->app->route->buildUrl($url, [])->suffix($suffix)->domain($domain)->build(); |
57 | 57 | } |
58 | 58 | if (empty($vars)) { |
59 | - $location = substr($location . ($pathinfo_depr) . $this->arr_to_str($vars, $pathinfo_depr), 0, -1) . ".{$url_html_suffix}"; |
|
60 | - } else { |
|
61 | - $location .= ($pathinfo_depr) . $this->arr_to_str($vars, $pathinfo_depr) . ".{$url_html_suffix}"; |
|
59 | + $location = substr($location.($pathinfo_depr).$this->arr_to_str($vars, $pathinfo_depr), 0, -1).".{$url_html_suffix}"; |
|
60 | + }else { |
|
61 | + $location .= ($pathinfo_depr).$this->arr_to_str($vars, $pathinfo_depr).".{$url_html_suffix}"; |
|
62 | 62 | } |
63 | - } else { |
|
63 | + }else { |
|
64 | 64 | $location = $this->app->route->buildUrl($url, $vars)->suffix($suffix)->domain($domain)->build(); |
65 | 65 | } |
66 | 66 | return $location; |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | { |
77 | 77 | $t = ''; |
78 | 78 | foreach ($arr as $k => $v) { |
79 | - $t .= $k . $glue . $v . $glue; |
|
79 | + $t .= $k.$glue.$v.$glue; |
|
80 | 80 | } |
81 | 81 | $t = substr($t, 0, -1); // 利用字符串截取函数消除最后一个 |
82 | 82 | return $t; |
@@ -113,8 +113,8 @@ discard block |
||
113 | 113 | } |
114 | 114 | $tem = array(); |
115 | 115 | foreach ($this->result as $val) { |
116 | - if (preg_match("/[0-9a-f][0-9a-f][:-]" . "[0-9a-f][0-9a-f][:-]" . "[0-9a-f][0-9a-f][:-]" . "[0-9a-f][0-9a-f][:-]" . "[0-9a-f][0-9a-f][:-]" . "[0-9a-f][0-9a-f]/i", $val, $tem)) { |
|
117 | - $this->macAddr = $tem[0];//多个网卡时,会返回第一个网卡的mac地址,一般够用。 |
|
116 | + if (preg_match("/[0-9a-f][0-9a-f][:-]"."[0-9a-f][0-9a-f][:-]"."[0-9a-f][0-9a-f][:-]"."[0-9a-f][0-9a-f][:-]"."[0-9a-f][0-9a-f][:-]"."[0-9a-f][0-9a-f]/i", $val, $tem)) { |
|
117 | + $this->macAddr = $tem[0]; //多个网卡时,会返回第一个网卡的mac地址,一般够用。 |
|
118 | 118 | break; |
119 | 119 | //$this->macAddrs[] = $temp_array[0];//返回所有的mac地址 |
120 | 120 | } |
@@ -144,13 +144,13 @@ discard block |
||
144 | 144 | return $this->result; |
145 | 145 | } |
146 | 146 | |
147 | - $ipconfig = $_SERVER["WINDIR"] . "\system32\ipconfig.exe"; |
|
147 | + $ipconfig = $_SERVER["WINDIR"]."\system32\ipconfig.exe"; |
|
148 | 148 | if (is_file($ipconfig)) { |
149 | - @exec($ipconfig . " /all", $this->result); |
|
149 | + @exec($ipconfig." /all", $this->result); |
|
150 | 150 | return $this->result; |
151 | 151 | } |
152 | 152 | |
153 | - @exec($_SERVER["WINDIR"] . "\system\ipconfig.exe /all", $this->result); |
|
153 | + @exec($_SERVER["WINDIR"]."\system\ipconfig.exe /all", $this->result); |
|
154 | 154 | return $this->result; |
155 | 155 | } |
156 | 156 |