GC0202 / ThinkLibrary

src/service/Ip/OnlineService.php

Spacing +3 added lines, -3 removed lines

@@ -221,10 +221,10 @@ 
             throw new DtaException('请检查阿里-阿里云配置信息 appcode');
         }
         $headers = array();
-        array_push($headers, "Authorization:APPCODE " . $appcode);
+        array_push($headers, "Authorization:APPCODE ".$appcode);
         $querys = "ip={$this->ip}";
         $bodys = "";
-        $url = $host . $path . "?" . $querys;
+        $url = $host.$path."?".$querys;
 
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $method);
@@ -233,7 +233,7 @@ 
         curl_setopt($curl, CURLOPT_FAILONERROR, false);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($curl, CURLOPT_HEADER, false);
-        if (1 == strpos("$" . $host, "https://")) {
+        if (1 == strpos("$".$host, "https://")) {
             curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
             curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
         }

src/service/Ip/IpIpReader.php

Spacing +10 added lines, -10 removed lines

@@ -72,13 +72,13 @@ 
             throw new Exception('IP Database metadata error.');
         }
 
-        $fileSize = 4 + $metaLength + $this->meta['total_size'];
+        $fileSize = 4+$metaLength+$this->meta['total_size'];
         if ($fileSize != $this->fileSize) {
             throw  new Exception('IP Database size error.');
         }
 
         $this->nodeCount = $this->meta['node_count'];
-        $this->nodeOffset = 4 + $metaLength;
+        $this->nodeOffset = 4+$metaLength;
     }
 
     /**
@@ -144,7 +144,7 @@ 
     private function findNode($ip)
     {
         $binary = inet_pton($ip);
-        $bitCount = strlen($binary) * 8; // 32 | 128
+        $bitCount = strlen($binary)*8; // 32 | 128
         $key = substr($binary, 0, 2);
         $node = 0;
         $index = 0;
@@ -153,7 +153,7 @@ 
                 for ($i = 0; $i < 96 && $node < $this->nodeCount; $i++) {
                     if ($i >= 80) {
                         $idx = 1;
-                    } else {
+                    }else {
                         $idx = 0;
                     }
                     $node = $this->readNode($node, $idx);
@@ -162,10 +162,10 @@ 
                     }
                 }
                 $this->v4offset = $node;
-            } else {
+            }else {
                 $node = $this->v4offset;
             }
-        } else {
+        }else {
             if (isset($this->v6offsetCache[$key])) {
                 $index = 16;
                 $node = $this->v6offsetCache[$key];
@@ -177,7 +177,7 @@ 
                 break;
             }
 
-            $node = $this->readNode($node, 1 & ((0xFF & ord($binary[$i >> 3])) >> 7 - ($i % 8)));
+            $node = $this->readNode($node, 1 & ((0xFF & ord($binary[$i >> 3])) >> 7-($i%8)));
 
             if ($i == 15) {
                 $this->v6offsetCache[$key] = $node;
@@ -201,7 +201,7 @@ 
      */
     private function readNode($node, $index)
     {
-        return unpack('N', $this->read($this->file, $node * 8 + $index * 4, 4))[1];
+        return unpack('N', $this->read($this->file, $node*8+$index*4, 4))[1];
     }
 
     /**
@@ -211,7 +211,7 @@ 
      */
     private function resolve($node)
     {
-        $resolved = $node - $this->nodeCount + $this->nodeCount * 8;
+        $resolved = $node-$this->nodeCount+$this->nodeCount*8;
         if ($resolved >= $this->fileSize) {
             return NULL;
         }
@@ -241,7 +241,7 @@ 
     private function read($stream, $offset, $length)
     {
         if ($length > 0) {
-            if (fseek($stream, $offset + $this->nodeOffset) === 0) {
+            if (fseek($stream, $offset+$this->nodeOffset) === 0) {
                 $value = fread($stream, $length);
                 if (strlen($value) === $length) {
                     return $value;

src/service/wechat/MiniService.php

Spacing +8 added lines, -8 removed lines

@@ -423,26 +423,26 @@ 
                 $accessToken_res = HttpService::instance()
                     ->url("{$this->api_url}cgi-bin/token?grant_type={$this->grant_type}&appid={$this->app_id}&secret={$this->app_secret}")
                     ->toArray();
-                $accessToken_res['expires_time'] = time() + 6000;
+                $accessToken_res['expires_time'] = time()+6000;
                 file_put_contents($file, json_encode($accessToken_res, JSON_UNESCAPED_UNICODE));
                 $accessToken = $accessToken_res;
-            } else if (!isset($accessToken['access_token'])) {
+            }else if (!isset($accessToken['access_token'])) {
                 $accessToken_res = HttpService::instance()
                     ->url("{$this->api_url}cgi-bin/token?grant_type={$this->grant_type}&appid={$this->app_id}&secret={$this->app_secret}")
                     ->toArray();
-                $accessToken_res['expires_time'] = time() + 6000;
+                $accessToken_res['expires_time'] = time()+6000;
                 file_put_contents($file, json_encode($accessToken_res, JSON_UNESCAPED_UNICODE));
                 $accessToken = $accessToken_res;
-            } else if ($accessToken['expires_time'] <= time()) {
+            }else if ($accessToken['expires_time'] <= time()) {
                 $accessToken_res = HttpService::instance()
                     ->url("{$this->api_url}cgi-bin/token?grant_type={$this->grant_type}&appid={$this->app_id}&secret={$this->app_secret}")
                     ->toArray();
-                $accessToken_res['expires_time'] = time() + 6000;
+                $accessToken_res['expires_time'] = time()+6000;
                 file_put_contents($file, json_encode($accessToken_res, JSON_UNESCAPED_UNICODE));
                 $accessToken = $accessToken_res;
             }
             return $accessToken;
-        } else if ($this->cache == "mysql") {
+        }else if ($this->cache == "mysql") {
             $access_token = [];
             // 文件名
             $file = "{$this->app_id}_access_token";
@@ -450,7 +450,7 @@ 
             $cache_mysql_value = dtacache($file);
             if (!empty($cache_mysql_value)) {
                 $access_token['access_token'] = $cache_mysql_value;
-            } else {
+            }else {
                 $accessToken_res = HttpService::instance()
                     ->url("{$this->api_url}cgi-bin/token?grant_type={$this->grant_type}&appid={$this->app_id}&secret={$this->app_secret}")
                     ->toArray();
@@ -458,7 +458,7 @@ 
                 $access_token['access_token'] = $accessToken_res['access_token'];
             }
             return $access_token;
-        } else {
+        }else {
             throw new DtaException("驱动方式错误");
         }
     }

src/service/wechat/QyService.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
             $data['msgtype'] = $this->msgType;
         }
         $result = HttpService::instance()
-            ->url("{$this->url}cgi-bin/webhook/send?key=" . $this->key)
+            ->url("{$this->url}cgi-bin/webhook/send?key=".$this->key)
             ->data($data)
             ->toArray();
         if ($result['errcode'] == 0) {

src/service/douyin/WatermarkService.php

Spacing +102 added lines, -102 removed lines

@@ -56,7 +56,7 @@ 
                 throw new DtaException('配置网址内容不正确');
             }
             $this->url = $url;
-        } else {
+        }else {
             preg_match_all('#\bhttps?://[^,\s()<>]+(?:\([\w\d]+\)|([^,[:punct:]\s]|/))#', $str, $match);
             $url = $this->judgeUrl($match[0][0]);
             if (empty($url)) {
@@ -100,7 +100,7 @@ 
             $backtrack['short_id'] = $item_list['author']['short_id'];
             $backtrack['avatar'] = $this->cAuthorAvatar($item_list['author']);
             $this->backtrack = $backtrack;
-        } else {
+        }else {
             $this->backtrack = [];
         }
         return $this;
@@ -122,7 +122,7 @@ 
             $backtrack['title'] = $item_list['share_info']['share_title'];
             $backtrack['url'] = $item_list['share_url'];
             $this->backtrack = $backtrack;
-        } else {
+        }else {
             $this->backtrack = [];
         }
         return $this;
@@ -147,7 +147,7 @@ 
             $backtrack['play'] = $item_list['music']['play_url']['uri'];
             $backtrack['cover'] = $item_list['music']['cover_large']['url_list'][0];
             $this->backtrack = $backtrack;
-        } else {
+        }else {
             $this->backtrack = [];
         }
         return $this;
@@ -175,7 +175,7 @@ 
             $backtrack['play'] = $this->cVideoPlayUrl($item_list['video']['play_addr']['url_list'][0], 'play');
             $backtrack['playwm'] = $this->cVideoPlayUrl($item_list['video']['play_addr']['url_list'][0], 'playwm');
             $this->backtrack = $backtrack;
-        } else {
+        }else {
             $this->backtrack = [];
         }
         return $this;
@@ -235,322 +235,322 @@ 
             $backtrack['video_info']['cover'] = $cVideoAvatar['cover'];
             $backtrack['video_info']['play'] = $this->cVideoPlayUrl($item_list['video']['play_addr']['url_list'][0], 'play');
             $backtrack['video_info']['playwm'] = $this->cVideoPlayUrl($item_list['video']['play_addr']['url_list'][0], 'playwm');
-            $this->storagePath = $this->storagePath . $backtrack['author_info']['uid'] . "/";
+            $this->storagePath = $this->storagePath.$backtrack['author_info']['uid']."/";
             if (!empty($this->storage)) {
                 // 保存文件
                 // 作者头像
                 $author_info_avatar = StorageService::instance()
                     ->path($this->storagePath)
                     ->remotely($backtrack['author_info']['avatar'])
-                    ->save($backtrack['author_info']['uid'] . ".jpeg");
+                    ->save($backtrack['author_info']['uid'].".jpeg");
                 // 音频头像
                 $music_info_avatar = StorageService::instance()
                     ->path($this->storagePath)
                     ->remotely($backtrack['music_info']['avatar'])
-                    ->save($backtrack['music_info']['mid'] . ".jpeg");
+                    ->save($backtrack['music_info']['mid'].".jpeg");
                 // 音频文件
                 if (!empty($backtrack['music_info']['play'])) {
                     $music_info_play = StorageService::instance()
                         ->path($this->storagePath)
                         ->remotely($backtrack['music_info']['play'])
-                        ->save($backtrack['music_info']['mid'] . ".mp3");
-                } else {
+                        ->save($backtrack['music_info']['mid'].".mp3");
+                }else {
                     $music_info_play = ['size' => '0kb'];
                 }
                 // 音频封面
                 $music_info_cover = StorageService::instance()
                     ->path($this->storagePath)
                     ->remotely($backtrack['music_info']['cover'])
-                    ->save($backtrack['music_info']['mid'] . "_cover" . ".jpeg");
+                    ->save($backtrack['music_info']['mid']."_cover".".jpeg");
                 // 视频封面
                 $video_info_dynamic = StorageService::instance()
                     ->path($this->storagePath)
                     ->remotely($backtrack['video_info']['dynamic'])
-                    ->save($backtrack['video_info']['vid'] . "_dynamic" . ".jpeg");
+                    ->save($backtrack['video_info']['vid']."_dynamic".".jpeg");
                 // 视频封面
                 $video_info_origin_cover = StorageService::instance()
                     ->path($this->storagePath)
                     ->remotely($backtrack['video_info']['origin_cover'])
-                    ->save($backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg");
+                    ->save($backtrack['video_info']['vid']."_origin_cover".".jpeg");
                 // 视频封面
                 $video_info_cover = StorageService::instance()
                     ->path($this->storagePath)
                     ->remotely($backtrack['video_info']['cover'])
-                    ->save($backtrack['video_info']['vid'] . "_cover" . ".jpeg");
+                    ->save($backtrack['video_info']['vid']."_cover".".jpeg");
                 // 视频文件
                 $video_info_play = StorageService::instance()
                     ->path($this->storagePath)
                     ->remotely($backtrack['video_info']['play'])
-                    ->save($backtrack['video_info']['vid'] . "_play" . ".mp4");
+                    ->save($backtrack['video_info']['vid']."_play".".mp4");
                 // 视频文件
                 $video_info_playwm = StorageService::instance()
                     ->path($this->storagePath)
                     ->remotely($backtrack['video_info']['playwm'])
-                    ->save($backtrack['video_info']['vid'] . "_playwm" . ".mp4");
+                    ->save($backtrack['video_info']['vid']."_playwm".".mp4");
                 $system_path = StorageService::instance()
                     ->path($this->storagePath)
                     ->getPath();
-                $yun_path = "douyin/" . $backtrack['author_info']['uid'] . '/';
+                $yun_path = "douyin/".$backtrack['author_info']['uid'].'/';
                 // 上传到云存储
                 $backtrack['yun']['platform'] = $this->storage;
                 switch ($this->storage) {
                     case "aliyun":
                         // 作者头像
                         $backtrack['yun']['author_info']['avatar'] = OssService::instance()
-                            ->upload($yun_path . $backtrack['author_info']['uid'] . ".jpeg", $system_path . $backtrack['author_info']['uid'] . ".jpeg");
+                            ->upload($yun_path.$backtrack['author_info']['uid'].".jpeg", $system_path.$backtrack['author_info']['uid'].".jpeg");
                         // 音频头像
                         $backtrack['yun']['music_info']['avatar'] = OssService::instance()
-                            ->upload($yun_path . $backtrack['music_info']['mid'] . ".jpeg", $system_path . $backtrack['music_info']['mid'] . ".jpeg");
+                            ->upload($yun_path.$backtrack['music_info']['mid'].".jpeg", $system_path.$backtrack['music_info']['mid'].".jpeg");
                         // 音频文件
                         if (!empty($backtrack['music_info']['play'])) {
                             $backtrack['yun']['music_info']['play'] = OssService::instance()
-                                ->upload($yun_path . $backtrack['music_info']['mid'] . ".mp3", $system_path . $backtrack['music_info']['mid'] . ".mp3");
-                        } else {
+                                ->upload($yun_path.$backtrack['music_info']['mid'].".mp3", $system_path.$backtrack['music_info']['mid'].".mp3");
+                        }else {
                             $backtrack['yun']['music_info']['play'] = '';
                         }
                         // 音频封面
                         $backtrack['yun']['music_info']['cover'] = OssService::instance()
-                            ->upload($yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg", $system_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['music_info']['mid']."_cover".".jpeg", $system_path.$backtrack['music_info']['mid']."_cover".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['dynamic'] = OssService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg", $system_path.$backtrack['video_info']['vid']."_dynamic".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['origin_cover'] = OssService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['cover'] = OssService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_cover".".jpeg");
                         // 视频文件
                         $backtrack['yun']['video_info']['play'] = OssService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_play" . ".mp4");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_play".".mp4", $system_path.$backtrack['video_info']['vid']."_play".".mp4");
                         // 视频文件
                         $backtrack['yun']['video_info']['playwm'] = OssService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_playwm".".mp4", $system_path.$backtrack['video_info']['vid']."_playwm".".mp4");
                         break;
                     case "tencentcloud":
                         // 作者头像
                         $backtrack['yun']['author_info']['avatar'] = CosService::instance()
-                            ->upload($yun_path . $backtrack['author_info']['uid'] . ".jpeg", $system_path . $backtrack['author_info']['uid'] . ".jpeg");
+                            ->upload($yun_path.$backtrack['author_info']['uid'].".jpeg", $system_path.$backtrack['author_info']['uid'].".jpeg");
                         // 音频头像
                         $backtrack['yun']['music_info']['avatar'] = CosService::instance()
-                            ->upload($yun_path . $backtrack['music_info']['mid'] . ".jpeg", $system_path . $backtrack['music_info']['mid'] . ".jpeg");
+                            ->upload($yun_path.$backtrack['music_info']['mid'].".jpeg", $system_path.$backtrack['music_info']['mid'].".jpeg");
                         // 音频文件
                         if (!empty($backtrack['music_info']['play'])) {
                             $backtrack['yun']['music_info']['play'] = CosService::instance()
-                                ->upload($yun_path . $backtrack['music_info']['mid'] . ".mp3", $system_path . $backtrack['music_info']['mid'] . ".mp3");
-                        } else {
+                                ->upload($yun_path.$backtrack['music_info']['mid'].".mp3", $system_path.$backtrack['music_info']['mid'].".mp3");
+                        }else {
                             $backtrack['yun']['music_info']['play'] = '';
                         }
                         // 音频封面
                         $backtrack['yun']['music_info']['cover'] = CosService::instance()
-                            ->upload($yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg", $system_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['music_info']['mid']."_cover".".jpeg", $system_path.$backtrack['music_info']['mid']."_cover".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['dynamic'] = CosService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg", $system_path.$backtrack['video_info']['vid']."_dynamic".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['origin_cover'] = CosService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['cover'] = CosService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_cover".".jpeg");
                         // 视频文件
                         $backtrack['yun']['video_info']['play'] = CosService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_play" . ".mp4");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_play".".mp4", $system_path.$backtrack['video_info']['vid']."_play".".mp4");
                         // 视频文件
                         $backtrack['yun']['video_info']['playwm'] = CosService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_playwm".".mp4", $system_path.$backtrack['video_info']['vid']."_playwm".".mp4");
                         break;
                     case "huaweicloud":
                         // 作者头像
                         $backtrack['yun']['author_info']['avatar'] = ObsService::instance()
-                            ->upload($yun_path . $backtrack['author_info']['uid'] . ".jpeg", $system_path . $backtrack['author_info']['uid'] . ".jpeg");
+                            ->upload($yun_path.$backtrack['author_info']['uid'].".jpeg", $system_path.$backtrack['author_info']['uid'].".jpeg");
                         // 音频头像
                         $backtrack['yun']['music_info']['avatar'] = ObsService::instance()
-                            ->upload($yun_path . $backtrack['music_info']['mid'] . ".jpeg", $system_path . $backtrack['music_info']['mid'] . ".jpeg");
+                            ->upload($yun_path.$backtrack['music_info']['mid'].".jpeg", $system_path.$backtrack['music_info']['mid'].".jpeg");
                         // 音频文件
                         if (!empty($backtrack['music_info']['play'])) {
                             $backtrack['yun']['music_info']['play'] = ObsService::instance()
-                                ->upload($yun_path . $backtrack['music_info']['mid'] . ".mp3", $system_path . $backtrack['music_info']['mid'] . ".mp3");
-                        } else {
+                                ->upload($yun_path.$backtrack['music_info']['mid'].".mp3", $system_path.$backtrack['music_info']['mid'].".mp3");
+                        }else {
                             $backtrack['yun']['music_info']['play'] = '';
                         }
                         // 音频封面
                         $backtrack['yun']['music_info']['cover'] = ObsService::instance()
-                            ->upload($yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg", $system_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['music_info']['mid']."_cover".".jpeg", $system_path.$backtrack['music_info']['mid']."_cover".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['dynamic'] = ObsService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg", $system_path.$backtrack['video_info']['vid']."_dynamic".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['origin_cover'] = ObsService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['cover'] = ObsService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_cover".".jpeg");
                         // 视频文件
                         $backtrack['yun']['video_info']['play'] = ObsService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_play" . ".mp4");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_play".".mp4", $system_path.$backtrack['video_info']['vid']."_play".".mp4");
                         // 视频文件
                         $backtrack['yun']['video_info']['playwm'] = ObsService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_playwm".".mp4", $system_path.$backtrack['video_info']['vid']."_playwm".".mp4");
                         break;
                     case "baiducloud":
                         // 作者头像
                         $backtrack['yun']['author_info']['avatar'] = BosService::instance()
-                            ->upload($yun_path . $backtrack['author_info']['uid'] . ".jpeg", $system_path . $backtrack['author_info']['uid'] . ".jpeg");
+                            ->upload($yun_path.$backtrack['author_info']['uid'].".jpeg", $system_path.$backtrack['author_info']['uid'].".jpeg");
                         // 音频头像
                         $backtrack['yun']['music_info']['avatar'] = BosService::instance()
-                            ->upload($yun_path . $backtrack['music_info']['mid'] . ".jpeg", $system_path . $backtrack['music_info']['mid'] . ".jpeg");
+                            ->upload($yun_path.$backtrack['music_info']['mid'].".jpeg", $system_path.$backtrack['music_info']['mid'].".jpeg");
                         // 音频文件
                         if (!empty($backtrack['music_info']['play'])) {
                             $backtrack['yun']['music_info']['play'] = BosService::instance()
-                                ->upload($yun_path . $backtrack['music_info']['mid'] . ".mp3", $system_path . $backtrack['music_info']['mid'] . ".mp3");
-                        } else {
+                                ->upload($yun_path.$backtrack['music_info']['mid'].".mp3", $system_path.$backtrack['music_info']['mid'].".mp3");
+                        }else {
                             $backtrack['yun']['music_info']['play'] = '';
                         }
                         // 音频封面
                         $backtrack['yun']['music_info']['cover'] = BosService::instance()
-                            ->upload($yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg", $system_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['music_info']['mid']."_cover".".jpeg", $system_path.$backtrack['music_info']['mid']."_cover".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['dynamic'] = BosService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg", $system_path.$backtrack['video_info']['vid']."_dynamic".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['origin_cover'] = BosService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['cover'] = BosService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_cover".".jpeg");
                         // 视频文件
                         $backtrack['yun']['video_info']['play'] = BosService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_play" . ".mp4");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_play".".mp4", $system_path.$backtrack['video_info']['vid']."_play".".mp4");
                         // 视频文件
                         $backtrack['yun']['video_info']['playwm'] = BosService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_playwm".".mp4", $system_path.$backtrack['video_info']['vid']."_playwm".".mp4");
                         break;
                     case "qiniu":
                         // 作者头像
                         $backtrack['yun']['author_info']['avatar'] = KodoService::instance()
-                            ->upload($yun_path . $backtrack['author_info']['uid'] . ".jpeg", $system_path . $backtrack['author_info']['uid'] . ".jpeg");
+                            ->upload($yun_path.$backtrack['author_info']['uid'].".jpeg", $system_path.$backtrack['author_info']['uid'].".jpeg");
                         // 音频头像
                         $backtrack['yun']['music_info']['avatar'] = KodoService::instance()
-                            ->upload($yun_path . $backtrack['music_info']['mid'] . ".jpeg", $system_path . $backtrack['music_info']['mid'] . ".jpeg");
+                            ->upload($yun_path.$backtrack['music_info']['mid'].".jpeg", $system_path.$backtrack['music_info']['mid'].".jpeg");
                         // 音频文件
                         if (!empty($backtrack['music_info']['play'])) {
                             $backtrack['yun']['music_info']['play'] = KodoService::instance()
-                                ->upload($yun_path . $backtrack['music_info']['mid'] . ".mp3", $system_path . $backtrack['music_info']['mid'] . ".mp3");
-                        } else {
+                                ->upload($yun_path.$backtrack['music_info']['mid'].".mp3", $system_path.$backtrack['music_info']['mid'].".mp3");
+                        }else {
                             $backtrack['yun']['music_info']['play'] = '';
                         }
                         // 音频封面
                         $backtrack['yun']['music_info']['cover'] = KodoService::instance()
-                            ->upload($yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg", $system_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['music_info']['mid']."_cover".".jpeg", $system_path.$backtrack['music_info']['mid']."_cover".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['dynamic'] = KodoService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg", $system_path.$backtrack['video_info']['vid']."_dynamic".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['origin_cover'] = KodoService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['cover'] = KodoService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_cover".".jpeg");
                         // 视频文件
                         $backtrack['yun']['video_info']['play'] = KodoService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_play" . ".mp4");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_play".".mp4", $system_path.$backtrack['video_info']['vid']."_play".".mp4");
                         // 视频文件
                         $backtrack['yun']['video_info']['playwm'] = KodoService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_playwm".".mp4", $system_path.$backtrack['video_info']['vid']."_playwm".".mp4");
                         break;
                     case "upyun":
                         // 作者头像
                         $backtrack['yun']['author_info']['avatar'] = UssService::instance()
-                            ->upload($yun_path . $backtrack['author_info']['uid'] . ".jpeg", $system_path . $backtrack['author_info']['uid'] . ".jpeg");
+                            ->upload($yun_path.$backtrack['author_info']['uid'].".jpeg", $system_path.$backtrack['author_info']['uid'].".jpeg");
                         // 音频头像
                         $backtrack['yun']['music_info']['avatar'] = UssService::instance()
-                            ->upload($yun_path . $backtrack['music_info']['mid'] . ".jpeg", $system_path . $backtrack['music_info']['mid'] . ".jpeg");
+                            ->upload($yun_path.$backtrack['music_info']['mid'].".jpeg", $system_path.$backtrack['music_info']['mid'].".jpeg");
                         // 音频文件
                         if (!empty($backtrack['music_info']['play'])) {
                             $backtrack['yun']['music_info']['play'] = UssService::instance()
-                                ->upload($yun_path . $backtrack['music_info']['mid'] . ".mp3", $system_path . $backtrack['music_info']['mid'] . ".mp3");
-                        } else {
+                                ->upload($yun_path.$backtrack['music_info']['mid'].".mp3", $system_path.$backtrack['music_info']['mid'].".mp3");
+                        }else {
                             $backtrack['yun']['music_info']['play'] = '';
                         }
                         // 音频封面
                         $backtrack['yun']['music_info']['cover'] = UssService::instance()
-                            ->upload($yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg", $system_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['music_info']['mid']."_cover".".jpeg", $system_path.$backtrack['music_info']['mid']."_cover".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['dynamic'] = UssService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg", $system_path.$backtrack['video_info']['vid']."_dynamic".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['origin_cover'] = UssService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['cover'] = UssService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_cover".".jpeg");
                         // 视频文件
                         $backtrack['yun']['video_info']['play'] = UssService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_play" . ".mp4");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_play".".mp4", $system_path.$backtrack['video_info']['vid']."_play".".mp4");
                         // 视频文件
                         $backtrack['yun']['video_info']['playwm'] = UssService::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_playwm".".mp4", $system_path.$backtrack['video_info']['vid']."_playwm".".mp4");
                         break;
                     case "ksyun":
                         // 作者头像
                         $backtrack['yun']['author_info']['avatar'] = Ks3Service::instance()
-                            ->upload($yun_path . $backtrack['author_info']['uid'] . ".jpeg", $system_path . $backtrack['author_info']['uid'] . ".jpeg");
+                            ->upload($yun_path.$backtrack['author_info']['uid'].".jpeg", $system_path.$backtrack['author_info']['uid'].".jpeg");
                         // 音频头像
                         $backtrack['yun']['music_info']['avatar'] = Ks3Service::instance()
-                            ->upload($yun_path . $backtrack['music_info']['mid'] . ".jpeg", $system_path . $backtrack['music_info']['mid'] . ".jpeg");
+                            ->upload($yun_path.$backtrack['music_info']['mid'].".jpeg", $system_path.$backtrack['music_info']['mid'].".jpeg");
                         // 音频文件
                         if (!empty($backtrack['music_info']['play'])) {
                             $backtrack['yun']['music_info']['play'] = Ks3Service::instance()
-                                ->upload($yun_path . $backtrack['music_info']['mid'] . ".mp3", $system_path . $backtrack['music_info']['mid'] . ".mp3");
-                        } else {
+                                ->upload($yun_path.$backtrack['music_info']['mid'].".mp3", $system_path.$backtrack['music_info']['mid'].".mp3");
+                        }else {
                             $backtrack['yun']['music_info']['play'] = '';
                         }
                         // 音频封面
                         $backtrack['yun']['music_info']['cover'] = Ks3Service::instance()
-                            ->upload($yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg", $system_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['music_info']['mid']."_cover".".jpeg", $system_path.$backtrack['music_info']['mid']."_cover".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['dynamic'] = Ks3Service::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg", $system_path.$backtrack['video_info']['vid']."_dynamic".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['origin_cover'] = Ks3Service::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg");
                         // 视频封面
                         $backtrack['yun']['video_info']['cover'] = Ks3Service::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg", $system_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_cover".".jpeg", $system_path.$backtrack['video_info']['vid']."_cover".".jpeg");
                         // 视频文件
                         $backtrack['yun']['video_info']['play'] = Ks3Service::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_play" . ".mp4");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_play".".mp4", $system_path.$backtrack['video_info']['vid']."_play".".mp4");
                         // 视频文件
                         $backtrack['yun']['video_info']['playwm'] = Ks3Service::instance()
-                            ->upload($yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4", $system_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4");
+                            ->upload($yun_path.$backtrack['video_info']['vid']."_playwm".".mp4", $system_path.$backtrack['video_info']['vid']."_playwm".".mp4");
                         break;
                     case "storage":
                         $domain_name = config('dtapp.storage.domain_name');
-                        $new_yun_path = config("dtapp.storage.domain_list.{$domain_name}") . "upload/watermark/{$yun_path}";
+                        $new_yun_path = config("dtapp.storage.domain_list.{$domain_name}")."upload/watermark/{$yun_path}";
                         // 本地存储
                         // 作者头像
-                        $backtrack['yun']['author_info']['avatar'] = "{$new_yun_path}" . $backtrack['author_info']['uid'] . ".jpeg";
+                        $backtrack['yun']['author_info']['avatar'] = "{$new_yun_path}".$backtrack['author_info']['uid'].".jpeg";
                         // 音频头像
-                        $backtrack['yun']['music_info']['avatar'] = $new_yun_path . $backtrack['music_info']['mid'] . ".jpeg";
+                        $backtrack['yun']['music_info']['avatar'] = $new_yun_path.$backtrack['music_info']['mid'].".jpeg";
                         // 音频文件
                         if (!empty($backtrack['music_info']['play'])) {
-                            $backtrack['yun']['music_info']['play'] = $new_yun_path . $backtrack['music_info']['mid'] . ".mp3";
-                        } else {
+                            $backtrack['yun']['music_info']['play'] = $new_yun_path.$backtrack['music_info']['mid'].".mp3";
+                        }else {
                             $backtrack['yun']['music_info']['play'] = $new_yun_path;
                         }
                         // 音频封面
-                        $backtrack['yun']['music_info']['cover'] = $new_yun_path . $backtrack['music_info']['mid'] . "_cover" . ".jpeg";
+                        $backtrack['yun']['music_info']['cover'] = $new_yun_path.$backtrack['music_info']['mid']."_cover".".jpeg";
                         // 视频封面
-                        $backtrack['yun']['video_info']['dynamic'] = $new_yun_path . $backtrack['video_info']['vid'] . "_dynamic" . ".jpeg";
+                        $backtrack['yun']['video_info']['dynamic'] = $new_yun_path.$backtrack['video_info']['vid']."_dynamic".".jpeg";
                         // 视频封面
-                        $backtrack['yun']['video_info']['origin_cover'] = $new_yun_path . $backtrack['video_info']['vid'] . "_origin_cover" . ".jpeg";
+                        $backtrack['yun']['video_info']['origin_cover'] = $new_yun_path.$backtrack['video_info']['vid']."_origin_cover".".jpeg";
                         // 视频封面
-                        $backtrack['yun']['video_info']['cover'] = $new_yun_path . $backtrack['video_info']['vid'] . "_cover" . ".jpeg";
+                        $backtrack['yun']['video_info']['cover'] = $new_yun_path.$backtrack['video_info']['vid']."_cover".".jpeg";
                         // 视频文件
-                        $backtrack['yun']['video_info']['play'] = $new_yun_path . $backtrack['video_info']['vid'] . "_play" . ".mp4";
+                        $backtrack['yun']['video_info']['play'] = $new_yun_path.$backtrack['video_info']['vid']."_play".".mp4";
                         // 视频文件
-                        $backtrack['yun']['video_info']['playwm'] = $new_yun_path . $backtrack['video_info']['vid'] . "_playwm" . ".mp4";
+                        $backtrack['yun']['video_info']['playwm'] = $new_yun_path.$backtrack['video_info']['vid']."_playwm".".mp4";
                         break;
                     default:
                         break;
@@ -576,7 +576,7 @@ 
                 $backtrack['size']['video_info']['playwm'] = $video_info_playwm['size'];
             }
             $this->backtrack = $backtrack;
-        } else {
+        }else {
             $this->backtrack = [];
         }
         return $this;
@@ -602,9 +602,9 @@ 
     {
         if (strpos($url, 'douyin.com') !== false) {
             return $url;
-        } else if (strpos($url, 'iesdouyin.com') !== false) {
+        }else if (strpos($url, 'iesdouyin.com') !== false) {
             return $url;
-        } else {
+        }else {
             return '';
         }
     }
@@ -762,7 +762,7 @@ 
     {
         if ($type == 'play') {
             $headers = get_headers(str_replace("/playwm/", "/play/", $url), TRUE);
-        } else {
+        }else {
             $headers = get_headers($url, TRUE);
         }
         //输出跳转到的网址

src/service/taobao/TbkService.php

Spacing +9 added lines, -9 removed lines

@@ -563,9 +563,9 @@ 
                 $this->output = json_encode($this->output, JSON_UNESCAPED_UNICODE);
             }
             return json_decode($this->output, true);
-        } else {
+        }else {
             // 正常
-            $response = substr(Strings::replace('.', '_', $this->method), 7) . "_response";
+            $response = substr(Strings::replace('.', '_', $this->method), 7)."_response";
             if (is_array($this->output)) {
                 if (isset($this->output["$response"])) {
                     return $this->output["$response"];
@@ -578,7 +578,7 @@ 
             $this->output = json_decode($this->output, true);
             if (isset($this->output["$response"])) {
                 return $this->output["$response"];
-            } else {
+            }else {
                 return $this->output;
             }
         }
@@ -610,12 +610,12 @@ 
         $sign = $this->createSign();
         //组织参数
         $strParam = $this->createStrParam();
-        $strParam .= 'sign=' . $sign;
+        $strParam .= 'sign='.$sign;
         //访问服务
         if (empty($this->sandbox)) {
-            $url = 'http://gw.api.taobao.com/router/rest?' . $strParam;
-        } else {
-            $url = 'http://gw.api.tbsandbox.com/router/rest?' . $strParam;
+            $url = 'http://gw.api.taobao.com/router/rest?'.$strParam;
+        }else {
+            $url = 'http://gw.api.tbsandbox.com/router/rest?'.$strParam;
         }
         $result = file_get_contents($url);
         $result = json_decode($result, true);
@@ -639,7 +639,7 @@ 
         ksort($this->param);
         foreach ($this->param as $key => $val) {
             if ($key != '' && $val != '') {
-                $sign .= $key . $val;
+                $sign .= $key.$val;
             }
         }
         $sign .= $this->app_secret;
@@ -656,7 +656,7 @@ 
         $strParam = '';
         foreach ($this->param as $key => $val) {
             if ($key != '' && $val != '') {
-                $strParam .= $key . '=' . urlencode($val) . '&';
+                $strParam .= $key.'='.urlencode($val).'&';
             }
         }
         return $strParam;

src/service/SystemService.php

Spacing +13 added lines, -13 removed lines

@@ -52,15 +52,15 @@ 
         if (empty($suffix) && !empty($fillSuffix)) {
             if (empty($url_common_param)) {
                 $location = $this->app->route->buildUrl($url, $vars)->suffix($suffix)->domain($domain)->build();
-            } else {
+            }else {
                 $location = $this->app->route->buildUrl($url, [])->suffix($suffix)->domain($domain)->build();
             }
             if (empty($vars)) {
-                $location = substr($location . "{$pathinfo_depr}" . $this->arr_to_str($vars, $pathinfo_depr), 0, -1) . ".{$url_html_suffix}";
-            } else {
-                $location = $location . "{$pathinfo_depr}" . $this->arr_to_str($vars, $pathinfo_depr) . ".{$url_html_suffix}";
+                $location = substr($location."{$pathinfo_depr}".$this->arr_to_str($vars, $pathinfo_depr), 0, -1).".{$url_html_suffix}";
+            }else {
+                $location = $location."{$pathinfo_depr}".$this->arr_to_str($vars, $pathinfo_depr).".{$url_html_suffix}";
             }
-        } else {
+        }else {
             $location = $this->app->route->buildUrl($url, $vars)->suffix($suffix)->domain($domain)->build();
         }
         return $location;
@@ -76,7 +76,7 @@ 
     {
         $t = '';
         foreach ($arr as $k => $v) {
-            $t .= $k . $glue . $v . $glue;
+            $t .= $k.$glue.$v.$glue;
         }
         $t = substr($t, 0, -1); // 利用字符串截取函数消除最后一个
         return $t;
@@ -112,8 +112,8 @@ 
         }
         $tem = array();
         foreach ($this->result as $val) {
-            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)) {
-                $this->macAddr = $tem[0];//多个网卡时，会返回第一个网卡的mac地址，一般够用。
+            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)) {
+                $this->macAddr = $tem[0]; //多个网卡时，会返回第一个网卡的mac地址，一般够用。
                 break;
                 //$this->macAddrs[] = $temp_array[0];//返回所有的mac地址
             }
@@ -141,13 +141,13 @@ 
         @exec("ipconfig /all", $this->result);
         if ($this->result) {
             return $this->result;
-        } else {
-            $ipconfig = $_SERVER["WINDIR"] . "\system32\ipconfig.exe";
+        }else {
+            $ipconfig = $_SERVER["WINDIR"]."\system32\ipconfig.exe";
             if (is_file($ipconfig)) {
-                @exec($ipconfig . " /all", $this->result);
+                @exec($ipconfig." /all", $this->result);
                 return $this->result;
-            } else {
-                @exec($_SERVER["WINDIR"] . "\system\ipconfig.exe /all", $this->result);
+            }else {
+                @exec($_SERVER["WINDIR"]."\system\ipconfig.exe /all", $this->result);
                 return $this->result;
             }
         }

src/service/aliyun/OssService.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
         try {
             $ossClient = new OssClient($this->accessKeyId, $this->accessKeySecret, $this->endpoint);
             $ossClient->uploadFile($this->bucket, $object, $filePath);
-            return config('dtapp.aliyun.oss.url', '') . $object;
+            return config('dtapp.aliyun.oss.url', '').$object;
         } catch (OssException $e) {
             return $e->getMessage();
         }

src/service/ksyun/bin/exceptions/Exceptions.php

Indentation +27 added lines, -27 removed lines

@@ -3,32 +3,32 @@
 	
 }
 class Ks3ServiceException extends Ks3ClientException{
-	private $requestId;
-	private $errorCode;
-	private $errorMessage;
-	private $resource;
-	private $statusCode;
-	public function __set($property_name, $value){
-		$this->$property_name=$value;
-	}
-	public function __get($property_name){
-		if(isset($this->$property_name))
-		{
-			return($this->$property_name);
-		}else
-		{
-			return(NULL);
-		}
-	}
-	public function __toString()
-  	{
-      		$message = get_class($this) . ': '
-      			."(errorCode:".$this->errorCode.";"
-      			."errorMessage:".$this->errorMessage.";"
-      			."resource:".$this->resource.";"
-      			."requestId:".$this->requestId.";"
-      			."statusCode:".$this->statusCode.")";
-		return $message;
-      	}
+    private $requestId;
+    private $errorCode;
+    private $errorMessage;
+    private $resource;
+    private $statusCode;
+    public function __set($property_name, $value){
+        $this->$property_name=$value;
+    }
+    public function __get($property_name){
+        if(isset($this->$property_name))
+        {
+            return($this->$property_name);
+        }else
+        {
+            return(NULL);
+        }
+    }
+    public function __toString()
+        {
+                $message = get_class($this) . ': '
+                    ."(errorCode:".$this->errorCode.";"
+                    ."errorMessage:".$this->errorMessage.";"
+                    ."resource:".$this->resource.";"
+                    ."requestId:".$this->requestId.";"
+                    ."statusCode:".$this->statusCode.")";
+        return $message;
+            }
 }
 ?>
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -1,18 +1,18 @@ 
 <?php
-class Ks3ClientException extends RuntimeException{
+class Ks3ClientException extends RuntimeException {
 	
 }
-class Ks3ServiceException extends Ks3ClientException{
+class Ks3ServiceException extends Ks3ClientException {
 	private $requestId;
 	private $errorCode;
 	private $errorMessage;
 	private $resource;
 	private $statusCode;
-	public function __set($property_name, $value){
-		$this->$property_name=$value;
+	public function __set($property_name, $value) {
+		$this->$property_name = $value;
 	}
-	public function __get($property_name){
-		if(isset($this->$property_name))
+	public function __get($property_name) {
+		if (isset($this->$property_name))
 		{
 			return($this->$property_name);
 		}else
@@ -22,7 +22,7 @@ 
 	}
 	public function __toString()
   	{
-      		$message = get_class($this) . ': '
+      		$message = get_class($this).': '
       			."(errorCode:".$this->errorCode.";"
       			."errorMessage:".$this->errorMessage.";"
       			."resource:".$this->resource.";"

Braces +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 		if(isset($this->$property_name))
 		{
 			return($this->$property_name);
-		}else
+		} else
 		{
 			return(NULL);
 		}