GC0202 / ThinkLibrary

src/facade/Xmls.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-declare (strict_types=1);
+declare(strict_types=1);
 
 namespace DtApp\ThinkLibrary\facade;
 

src/session/Mysql.php

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
     public function read(string $sessionId): string
     {
         return (string)Db::table($this->table_name)
-            ->where('session_id', $this->config['session_prefix'] . $sessionId)
+            ->where('session_id', $this->config['session_prefix'].$sessionId)
             ->whereTime('session_expire', '>=', time())
             ->order('session_expire desc')
             ->value('session_data', '');
@@ -72,7 +72,7 @@ 
     public function delete(string $sessionId): bool
     {
         $result = Db::table($this->table_name)
-            ->where('session_id', $this->config['session_prefix'] . $sessionId)
+            ->where('session_id', $this->config['session_prefix'].$sessionId)
             ->delete();
         return $result ? true : false;
     }
@@ -89,20 +89,20 @@ 
     public function write(string $sessionId, string $data): bool
     {
         $get = Db::table($this->table_name)
-            ->where('session_id', $this->config['session_prefix'] . $sessionId)
+            ->where('session_id', $this->config['session_prefix'].$sessionId)
             ->whereTime('session_expire', '>=', time())
             ->field('id')
             ->find();
         if (empty($get)) {
             $params = [
-                'session_id' => $this->config['session_prefix'] . $sessionId,
+                'session_id' => $this->config['session_prefix'].$sessionId,
                 'session_expire' => Times::dateRear("Y-m-d H:i:s", $this->config['session_expire']),
                 'session_data' => $data
             ];
             $result = Db::table($this->table_name)
                 ->insert($params);
             return $result ? true : false;
-        } else {
+        }else {
             $params = [
                 'session_expire' => Times::dateRear("Y-m-d H:i:s", $this->config['session_expire']),
                 'session_data' => $data

src/ApiController.php

Spacing +4 added lines, -4 removed lines

@@ -186,7 +186,7 @@ 
         }
         if (isset($this->aes_decrypt_data[$name])) {
             return $this->aes_decrypt_data[$name];
-        } else {
+        }else {
             return $default;
         }
     }
@@ -218,7 +218,7 @@ 
         $rear = strtotime('+2minute');
         if ($timestamp <= $rear && $timestamp >= $before) {
             $this->aes_decrypt_data = $data;
-        } else {
+        }else {
             $this->error('已超时，请重新尝试！');
         }
     }
@@ -240,7 +240,7 @@ 
         if (!empty(is_array($data))) {
             $data = json_encode($data);
         }
-        return urlencode(base64_encode(openssl_encrypt($data, 'AES-128-CBC', $this->aes_md5, 1, $this->aes_md5_iv . $timestamp)));
+        return urlencode(base64_encode(openssl_encrypt($data, 'AES-128-CBC', $this->aes_md5, 1, $this->aes_md5_iv.$timestamp)));
     }
 
     /**
@@ -257,6 +257,6 @@ 
         if (empty($this->aes_md5_iv)) {
             $this->setAesMd5Iv();
         }
-        return openssl_decrypt(base64_decode(urldecode($data)), "AES-128-CBC", $this->aes_md5, true, $this->aes_md5_iv . $timestamp);
+        return openssl_decrypt(base64_decode(urldecode($data)), "AES-128-CBC", $this->aes_md5, true, $this->aes_md5_iv.$timestamp);
     }
 }

src/exception/ThinkException.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
                         'domain' => request()->domain(),
                         'url' => request()->url(),
                         'node' => config('dtapp.exception.wechat.node', ''),
-                        'info' => "ServerIp：" . $ip . "；CdnIp：" . $_SERVER['REMOTE_ADDR'] . "；ClientIp：" . get_ip(),
+                        'info' => "ServerIp：".$ip."；CdnIp：".$_SERVER['REMOTE_ADDR']."；ClientIp：".get_ip(),
                         'ip' => $ipinfo['location_all'],
                         'error' => base64_encode($msg)
                     ])

src/common.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
         if (empty($ip)) {
             if (!isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
                 $ip = $_SERVER['REMOTE_ADDR'];
-            } else {
+            }else {
                 //为了兼容百度的CDN，所以转成数组
                 $arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
                 $ip = $arr[0];
@@ -61,7 +61,7 @@ 
             //为了兼容百度的CDN，所以转成数组
             $arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
             return $arr[0];
-        } else {
+        }else {
             return $_SERVER['REMOTE_ADDR'];
         }
     }
@@ -99,13 +99,13 @@ 
         if (empty($value)) {
             return $myc->name($name)
                 ->get();
-        } else {
+        }else {
             if (empty($myc->name($name)
                 ->get())) {
                 $myc->name($name)
                     ->expire($expire)
                     ->set($value);
-            } else {
+            }else {
                 $myc->name($name)
                     ->expire($expire)
                     ->update($value);

src/service/Ip/IpIpService.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         if (empty($this->ipPath)) {
             throw new DtaException('请检查配置文件是否配置了IP数据库文件存放位置');
         }
-        $this->reader = new IpIpReader($this->ipPath . 'ipipfree.ipdb');
+        $this->reader = new IpIpReader($this->ipPath.'ipipfree.ipdb');
         parent::__construct($app);
     }
 

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/WebAppService.php

Spacing +19 added lines, -19 removed lines

@@ -165,7 +165,7 @@ 
             $this->scope = $scope;
         } elseif ($scope === "snsapi_userinfo") {
             $this->scope = $scope;
-        } else {
+        }else {
             throw new DtaException("请检查scope参数");
         }
         return $this;
@@ -313,7 +313,7 @@ 
         // 获取数据
         $accessToken = $this->getAccessToken();
         if (!isset($accessToken['access_token'])) {
-            throw  new DtaException("获取access_token错误，" . $accessToken['errmsg']);
+            throw  new DtaException("获取access_token错误，".$accessToken['errmsg']);
         }
         $res = HttpService::instance()
             ->url("{$this->api_url}cgi-bin/ticket/getticket?access_token={$accessToken['access_token']}&type=jsapi")
@@ -322,7 +322,7 @@ 
             // 获取数据
             $accessToken = $this->getAccessToken();
             if (!isset($accessToken['access_token'])) {
-                throw  new DtaException("获取access_token错误，" . $accessToken['errmsg']);
+                throw  new DtaException("获取access_token错误，".$accessToken['errmsg']);
             }
             $res = HttpService::instance()
                 ->url("{$this->api_url}cgi-bin/ticket/getticket?access_token={$accessToken['access_token']}&type=jsapi")
@@ -355,7 +355,7 @@ 
         $chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
         $str = "";
         for ($i = 0; $i < $length; $i++) {
-            $str .= substr($chars, mt_rand(0, strlen($chars) - 1), 1);
+            $str .= substr($chars, mt_rand(0, strlen($chars)-1), 1);
         }
         return $str;
     }
@@ -627,22 +627,22 @@ 
                 $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;
             }
@@ -653,12 +653,12 @@ 
                 $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";
@@ -666,7 +666,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();
@@ -684,7 +684,7 @@ 
                 $access_token['access_token'] = $accessToken_res['access_token'];
             }
             return $access_token;
-        } else {
+        }else {
             throw new DtaException("驱动方式错误");
         }
     }
@@ -735,11 +735,11 @@ 
         // 转成字符串
         $stringA = Urls::toParams($array);
         // 在字符串接商户支付秘钥
-        $stringSignTemp = "{$stringA}&key=" . $this->mch_key;
+        $stringSignTemp = "{$stringA}&key=".$this->mch_key;
         //步骤四：MD5或HMAC-SHA256C加密
         if ($hmacsha256) {
             $str = hash_hmac("sha256", $stringSignTemp, $this->mch_key);
-        } else {
+        }else {
             $str = md5($stringSignTemp);
         }
         //符转大写
@@ -759,8 +759,8 @@ 
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
 
         //试试手气新增，增加之后 curl 不报 60# 错误，可以请求到微信的响应
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);  //不验证 SSL 证书
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);//不验证 SSL 证书域名
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); //不验证 SSL 证书
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); //不验证 SSL 证书域名
         //post提交方式
         curl_setopt($ch, CURLOPT_POST, TRUE);
         curl_setopt($ch, CURLOPT_POSTFIELDS, $xml);
@@ -770,10 +770,10 @@ 
         if ($data) {
             curl_close($ch);
             return $data;
-        } else {
+        }else {
             $error = curl_errno($ch);
             curl_close($ch);
-            return "curl error, error code " . $error;
+            return "curl error, error code ".$error;
             //throw new WxPayException("curl出错，错误码:$error");
         }
     }