majiameng / tools

src/async/AsyncHook.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace tinymeng\tools\async;
 
-class AsyncHook{
+class AsyncHook {
 
     /**
      * @var array
@@ -20,7 +20,7 @@ 
      */
     public static function hook(callable $callback, $params) {
         self::$hook_list[] = array('callback' => $callback, 'params' => $params);
-        if(self::$hooked === false) {
+        if (self::$hooked === false) {
             self::$hooked = true;
             //注册一个callback当前在脚本执行完后执行
             register_shutdown_function(array(__CLASS__, '__run'));
@@ -33,10 +33,10 @@ 
      */
     private static function __run() {
         fastcgi_finish_request();
-        if(empty(self::$hook_list)) {
+        if (empty(self::$hook_list)) {
             return;
         }
-        foreach(self::$hook_list as $hook) {
+        foreach (self::$hook_list as $hook) {
             $callback = $hook['callback'];
             $params = $hook['params'];
             call_user_func_array($callback, $params);

src/core/Singleton.php

Spacing +4 added lines, -4 removed lines

@@ -13,11 +13,11 @@ 
      */
     private static $instance = null;
 
-    public function __construct($config=[]){
+    public function __construct($config = []) {
         $this->config = $config;
     }
 
-    private function __clone(){}
+    private function __clone() {}
 
     public function __sleep(): array
     {
@@ -25,7 +25,7 @@ 
         return [];
     }
 
-    protected static function init($gateway, $config=[])
+    protected static function init($gateway, $config = [])
     {
         if (!self::$instance instanceof static) {
             self::$instance = new static($config);
@@ -41,7 +41,7 @@ 
      *@author: JiaMeng <666@majiameng.com>
      * Updater:
      */
-    public static function __callStatic($gateway, array $config=[])
+    public static function __callStatic($gateway, array $config = [])
     {
         return self::init($gateway, ...$config);
     }

src/exception/TException.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         $this->setHeaders($headers);
 
         /** message */
-        if(empty($message)) $message = StatusCode::$status_code[$statusCode] ?? StatusCode::$status_code[StatusCode::COMMON_UNKNOWN];
+        if (empty($message)) $message = StatusCode::$status_code[$statusCode] ?? StatusCode::$status_code[StatusCode::COMMON_UNKNOWN];
         parent::__construct('ERROR tinymeng tools: '.$message, $code, $previous);
     }
 

src/HttpRequest.php

Spacing +25 added lines, -25 removed lines

@@ -37,19 +37,19 @@ 
      * @return bool|string
      * @throws \Exception
      */
-    static public function httpPost(string $url, array $param = array(), array $httpHeaders = array(), string $proxy='', int $http_code = 200)
+    static public function httpPost(string $url, array $param = array(), array $httpHeaders = array(), string $proxy = '', int $http_code = 200)
     {
         /** 参数检测,object或者array进行http_build_query */
-        if(!empty($param) && is_array($param)){
+        if (!empty($param) && is_array($param)) {
             $flag = false;
-            foreach ($param as $value){
+            foreach ($param as $value) {
                 //判断参数是否是一个对象 或者 是一个数组
-                if(is_array($value) || (is_string($value) && is_object($value))){
+                if (is_array($value) || (is_string($value) && is_object($value))) {
                     $flag = true;
                     break;
                 }
             }
-            if($flag){
+            if ($flag) {
                 $param = http_build_query($param);
             }
         }
@@ -66,7 +66,7 @@ 
         curl_setopt($curl, CURLOPT_POSTFIELDS, $param);
 
         /** 设置请求headers */
-        if(empty($httpHeaders)) $httpHeaders = self::$httpHeaders;
+        if (empty($httpHeaders)) $httpHeaders = self::$httpHeaders;
         curl_setopt($curl, CURLOPT_HTTPHEADER, $httpHeaders);
 
         /** gzip压缩 */
@@ -80,11 +80,11 @@ 
         }
 
         /** http代理 */
-        if(!empty($proxy)){
-            $proxy = explode(':',$proxy);
+        if (!empty($proxy)) {
+            $proxy = explode(':', $proxy);
             curl_setopt($curl, CURLOPT_PROXYAUTH, CURLAUTH_BASIC); //代理认证模式
             curl_setopt($curl, CURLOPT_PROXY, "$proxy[0]"); //代理服务器地址
-            curl_setopt($curl, CURLOPT_PROXYPORT,$proxy[1]); //代理服务器端口
+            curl_setopt($curl, CURLOPT_PROXYPORT, $proxy[1]); //代理服务器端口
         }
 
         /** 请求 */
@@ -94,20 +94,20 @@ 
         /** 关闭请求资源 */
         curl_close($curl);
 
-        if($http_code !== 0){
+        if ($http_code !== 0) {
             /** 验证网络请求状态 */
             if (intval($info["http_code"]) === 0) {
                 throw new TException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
-                    '[httpPost]: POST request was aborted ! Request url :' . $url . ' , post request data : ' . var_export($param,true)
+                    '[httpPost]: POST request was aborted ! Request url :'.$url.' , post request data : '.var_export($param, true)
                 );
-            }elseif(intval($info["http_code"]) != $http_code){
+            }elseif (intval($info["http_code"]) != $http_code) {
                 throw new TException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
-                    '[httpPost]: POST request was aborted ! Request url :' . $url . ' , post request data : ' . var_export($param,true).' ,return code : '.$info["http_code"] .' ,return content : '.$content
+                    '[httpPost]: POST request was aborted ! Request url :'.$url.' , post request data : '.var_export($param, true).' ,return code : '.$info["http_code"].' ,return content : '.$content
                 );
             } else {
                 return $content;
             }
-        }else{
+        } else {
             return $content;
         }
     }
@@ -124,13 +124,13 @@ 
      * @return bool|string
      * @throws \Exception
      */
-    static public function httpGet(string $url, array $param = array(), array $httpHeaders = array(), string $proxy= '', int $http_code = 200)
+    static public function httpGet(string $url, array $param = array(), array $httpHeaders = array(), string $proxy = '', int $http_code = 200)
     {
         $curl = curl_init();
 
         /** 设置请求参数 */
         if (!empty($param)) {
-            $url = $url . '?' . http_build_query($param);
+            $url = $url.'?'.http_build_query($param);
         }
 
         /** 设置请求链接 */
@@ -146,15 +146,15 @@ 
         }
 
         /** http代理 */
-        if(!empty($proxy)){
-            $proxy = explode(':',$proxy);
+        if (!empty($proxy)) {
+            $proxy = explode(':', $proxy);
             curl_setopt($curl, CURLOPT_PROXYAUTH, CURLAUTH_BASIC); //代理认证模式
             curl_setopt($curl, CURLOPT_PROXY, "$proxy[0]"); //代理服务器地址
-            curl_setopt($curl, CURLOPT_PROXYPORT,$proxy[1]); //代理服务器端口
+            curl_setopt($curl, CURLOPT_PROXYPORT, $proxy[1]); //代理服务器端口
         }
 
         /** 设置请求headers */
-        if(empty($httpHeaders)) $httpHeaders = self::$httpHeaders;
+        if (empty($httpHeaders)) $httpHeaders = self::$httpHeaders;
         curl_setopt($curl, CURLOPT_HTTPHEADER, $httpHeaders);
 
         /** gzip压缩 */
@@ -168,19 +168,19 @@ 
         curl_close($curl);
 
         /** 验证网络请求状态 */
-        if($http_code !== 0){
+        if ($http_code !== 0) {
             if (intval($info["http_code"]) === 0) {
                 throw new TException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
-                    '[httpGet]: GET request was aborted ! Request url :' . $url
+                    '[httpGet]: GET request was aborted ! Request url :'.$url
                 );
-            }elseif(intval($info["http_code"]) != $http_code){
+            }elseif (intval($info["http_code"]) != $http_code) {
                 throw new TException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
-                    '[httpGet]: GET request was aborted ! Request url :' . $url .' ,return code : '.$info["http_code"] .' ,return content : '.$content
+                    '[httpGet]: GET request was aborted ! Request url :'.$url.' ,return code : '.$info["http_code"].' ,return content : '.$content
                 );
             } else {
                 return $content;
             }
-        }else{
+        } else {
             return $content;
         }
     }

src/StringTool.php

Spacing +63 added lines, -63 removed lines

@@ -80,22 +80,22 @@ 
         $str = '';
         switch ($type) {
             case 0:
-                $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' . $addChars;
+                $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.$addChars;
                 break;
             case 1:
                 $chars = str_repeat('0123456789', 3);
                 break;
             case 2:
-                $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' . $addChars;
+                $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.$addChars;
                 break;
             case 3:
-                $chars = 'abcdefghijklmnopqrstuvwxyz' . $addChars;
+                $chars = 'abcdefghijklmnopqrstuvwxyz'.$addChars;
                 break;
             case 4:
-                $chars = "们以我到他会作时要动国产的一是工就年阶义发成部民可出能方进在了不和有大这主中人上为来分生对于学下级地个用同行面说种过命度革而多子后自社加小机也经力线本电高量长党得实家定深法表着水理化争现所二起政三好十战无农使性前等反体合斗路图把结第里正新开论之物从当两些还天资事队批点育重其思与间内去因件日利相由压员气业代全组数果期导平各基或月毛然如应形想制心样干都向变关问比展那它最及外没看治提五解系林者米群头意只明四道马认次文通但条较克又公孔领军流入接席位情运器并飞原油放立题质指建区验活众很教决特此常石强极土少已根共直团统式转别造切九你取西持总料连任志观调七么山程百报更见必真保热委手改管处己将修支识病象几先老光专什六型具示复安带每东增则完风回南广劳轮科北打积车计给节做务被整联步类集号列温装即毫知轴研单色坚据速防史拉世设达尔场织历花受求传口断况采精金界品判参层止边清至万确究书" . $addChars;
+                $chars = "们以我到他会作时要动国产的一是工就年阶义发成部民可出能方进在了不和有大这主中人上为来分生对于学下级地个用同行面说种过命度革而多子后自社加小机也经力线本电高量长党得实家定深法表着水理化争现所二起政三好十战无农使性前等反体合斗路图把结第里正新开论之物从当两些还天资事队批点育重其思与间内去因件日利相由压员气业代全组数果期导平各基或月毛然如应形想制心样干都向变关问比展那它最及外没看治提五解系林者米群头意只明四道马认次文通但条较克又公孔领军流入接席位情运器并飞原油放立题质指建区验活众很教决特此常石强极土少已根共直团统式转别造切九你取西持总料连任志观调七么山程百报更见必真保热委手改管处己将修支识病象几先老光专什六型具示复安带每东增则完风回南广劳轮科北打积车计给节做务被整联步类集号列温装即毫知轴研单色坚据速防史拉世设达尔场织历花受求传口断况采精金界品判参层止边清至万确究书".$addChars;
                 break;
             default:
-                $chars = 'ABCDEFGHIJKMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz23456789' . $addChars;
+                $chars = 'ABCDEFGHIJKMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz23456789'.$addChars;
                 break;
         }
         if ($length > 10) {
@@ -176,7 +176,7 @@ 
         if (!ctype_lower($value)) {
             $value = preg_replace('/\s+/u', '', ucwords($value));
 
-            $value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1' . $delimiter, $value));
+            $value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1'.$delimiter, $value));
         }
 
         return static::$snakeCache[$key][$delimiter] = $value;
@@ -259,16 +259,16 @@ 
     static public function createChannelId($namespace = ''):string {
         static $guid = '';
         $uid = uniqid("", true);
-        $data = $namespace. md5(time() . mt_rand(1,1000000)).uniqid();
-        $hash = strtoupper(hash('ripemd128', $uid . $guid . md5($data)));
-        $guid = substr($hash, 0, 8) .
-            '-' .
-            substr($hash, 8, 4) .
-            '-' .
-            substr($hash, 12, 4) .
-            '-' .
-            substr($hash, 16, 4) .
-            '-' .
+        $data = $namespace.md5(time().mt_rand(1, 1000000)).uniqid();
+        $hash = strtoupper(hash('ripemd128', $uid.$guid.md5($data)));
+        $guid = substr($hash, 0, 8).
+            '-'.
+            substr($hash, 8, 4).
+            '-'.
+            substr($hash, 12, 4).
+            '-'.
+            substr($hash, 16, 4).
+            '-'.
             substr($hash, 20, 12);
         return $guid;
     }
@@ -281,7 +281,7 @@ 
      * @return string
      */
     static public function md5Bit16($str):string {
-        return strtoupper(substr(md5($str),8,16));
+        return strtoupper(substr(md5($str), 8, 16));
     }
 
     /**
@@ -291,15 +291,15 @@ 
      * @return int
      */
     static public function millisecond($time = null) :int{
-        if(empty($time)){
+        if (empty($time)) {
             list($msec, $sec) = explode(' ', microtime());
-            $millisecond = (int)sprintf('%.0f', (floatval($msec) + floatval($sec)) * 1000);
-        }elseif(is_numeric($time) && strlen((string)$time)==10){
-            $millisecond = (string)$time."000";
-        }else{
+            $millisecond = (int) sprintf('%.0f', (floatval($msec) + floatval($sec)) * 1000);
+        }elseif (is_numeric($time) && strlen((string) $time) == 10) {
+            $millisecond = (string) $time."000";
+        } else {
             $millisecond = strtotime($time)."000";
         }
-        return (int)$millisecond;
+        return (int) $millisecond;
     }
 
     /**
@@ -308,7 +308,7 @@ 
      * @param string $string
      * @return bool
      */
-    public static function isContainChinese($string=''):bool {
+    public static function isContainChinese($string = ''):bool {
         $result = preg_match('/[\x{4e00}-\x{9fa5}]/u', $string);
         return $result == 0 ? false : true;
     }
@@ -319,7 +319,7 @@ 
      * @param string $string
      * @return bool
      */
-    public static function isAllChinese($string=''):bool {
+    public static function isAllChinese($string = ''):bool {
         $result = preg_match('/^[\x{4e00}-\x{9fa5}]+$/u', $string);
         return $result == 0 ? false : true;
     }
@@ -331,7 +331,7 @@ 
      * @param string $string
      * @return bool
      */
-    public static function isMobile($string=''):bool {
+    public static function isMobile($string = ''):bool {
         if (!preg_match("/(^1[3|4|5|7|8][0-9]{9}$)/", $string)) {
             return false;
         }
@@ -346,9 +346,9 @@ 
      * @param int $double   小数点保留位数 默认3位
      * @return string
      */
-    public static function sctonum($num, $double = 3){
-        if(false !== stripos($num, "e")){
-            $a = explode("e",strtolower($num));
+    public static function sctonum($num, $double = 3) {
+        if (false !== stripos($num, "e")) {
+            $a = explode("e", strtolower($num));
             return bcmul($a[0], bcpow(10, $a[1], $double), $double);
         }
         return $num;
@@ -362,7 +362,7 @@ 
      * @param string $to
      * @return array|false|string|string[]|null
      */
-    public static function autoCharset($string, $from='gbk', $to='utf-8') {
+    public static function autoCharset($string, $from = 'gbk', $to = 'utf-8') {
         $from = strtoupper($from) == 'UTF8' ? 'utf-8' : $from;
         $to = strtoupper($to) == 'UTF8' ? 'utf-8' : $to;
         if (strtoupper($from) === strtoupper($to) || empty($string) || (is_scalar($string) && !is_string($string))) {
@@ -398,7 +398,7 @@ 
      * @param $html
      * @return string
      */
-    public static function filterATag($html=''):string {
+    public static function filterATag($html = ''):string {
         return preg_replace("#<a[^>]*>(.*?)</a>#is", "$1", $html);
     }
 
@@ -409,7 +409,7 @@ 
      * @param $html
      * @return string
      */
-    public static function deleteATag($html=''):string {
+    public static function deleteATag($html = ''):string {
         return preg_replace("#<a[^>]*>(.*?)</a>#is", "", $html);
     }
 
@@ -421,36 +421,36 @@ 
      * @param bool $is_timestamp   是否是时间戳
      * @return string
      */
-    public static function getTime($date,$is_timestamp=false):string {
-        if($is_timestamp === true){
+    public static function getTime($date, $is_timestamp = false):string {
+        if ($is_timestamp === true) {
             $time = $date;
-        }else{
-            $time = strtotime($date);//时间转换为时间戳
+        } else {
+            $time = strtotime($date); //时间转换为时间戳
         }
 
-        if($time >= time()){
+        if ($time >= time()) {
             return '刚刚';
         }
         $seconds = time() - $time;
-        if($seconds <= 60){
+        if ($seconds <= 60) {
             return '刚刚';
         }
         $minutes = intval($seconds / 60);
-        if($minutes <= 60){
+        if ($minutes <= 60) {
             return $minutes.'分钟前';
         }
         $hours = intval($minutes / 60);
-        if($hours <= 24){
+        if ($hours <= 24) {
             return $hours.'小时前';
         }
         $days = intval($hours / 24);
-        if($days <= 3){
+        if ($days <= 3) {
             return $days.'天前';
         }
-        if($days <= 365){
-            return date('m-d',/** @scrutinizer ignore-type */ $time);
+        if ($days <= 365) {
+            return date('m-d', /** @scrutinizer ignore-type */ $time);
         }
-        return date('Y-m-d',$time);
+        return date('Y-m-d', $time);
     }
 
     /**
@@ -464,11 +464,11 @@ 
         $compress = '';
         foreach ($chunks as $c) {
             if (strtolower(substr($c, 0, 19)) == '<!--<nocompress>-->') {
-                $c        = substr($c, 19, strlen($c) - 19 - 20);
+                $c = substr($c, 19, strlen($c) - 19 - 20);
                 $compress .= $c;
                 continue;
             } elseif (strtolower(substr($c, 0, 12)) == '<nocompress>') {
-                $c        = substr($c, 12, strlen($c) - 12 - 13);
+                $c = substr($c, 12, strlen($c) - 12 - 13);
                 $compress .= $c;
                 continue;
             } elseif (strtolower(substr($c, 0, 4)) == '<pre' || strtolower(substr($c, 0, 9)) == '<textarea') {
@@ -516,14 +516,14 @@ 
      * @return mixed
      */
     static public function htmlReplaceXcx(string $content):string {
-        $content = str_replace("\r\n","",$content);//出除回车和换行符
-        $content = preg_replace("/style=\".*?\"/si",'',$content);//style样式
-        $content = preg_replace(["/<strong.*?>/si", "/<\/strong>/si"],['<text class="wx-strong">','</text>'],$content);//strong
-        $content = preg_replace(["/<p.*?>/si", "/<\/p>/si"],['<view class="wx-p">','</view>'],$content);//p
-        $content = preg_replace(["/<a.*?>/si", "/<\/a>/si"],['<text class="wx-a">','</text>'],$content);//a
-        $content = preg_replace(["/<span.*?>/si", "/<\/span>/si"],['<text class="wx-span">','</text>'],$content);//span
-        $content = preg_replace(["/<h[1-6].*?>/si", "/<\/h[1-6]>/si"],['<view class="wx-h">','</view>'],$content);//h
-        $content = preg_replace("/<img.*?/si",'<image class="wx-img"',$content);//img
+        $content = str_replace("\r\n", "", $content); //出除回车和换行符
+        $content = preg_replace("/style=\".*?\"/si", '', $content); //style样式
+        $content = preg_replace(["/<strong.*?>/si", "/<\/strong>/si"], ['<text class="wx-strong">', '</text>'], $content); //strong
+        $content = preg_replace(["/<p.*?>/si", "/<\/p>/si"], ['<view class="wx-p">', '</view>'], $content); //p
+        $content = preg_replace(["/<a.*?>/si", "/<\/a>/si"], ['<text class="wx-a">', '</text>'], $content); //a
+        $content = preg_replace(["/<span.*?>/si", "/<\/span>/si"], ['<text class="wx-span">', '</text>'], $content); //span
+        $content = preg_replace(["/<h[1-6].*?>/si", "/<\/h[1-6]>/si"], ['<view class="wx-h">', '</view>'], $content); //h
+        $content = preg_replace("/<img.*?/si", '<image class="wx-img"', $content); //img
         return $content;
     }
 
@@ -535,8 +535,8 @@ 
      * @return string
      */
     static public function pReplaceSpan(string $content):string {
-        $content = str_replace(["\r","\n","\t"],'',$content);
-        $content = preg_replace(["/<p/si", "/<\/p>/si"],['<span','</span><br>'],$content);//p
+        $content = str_replace(["\r", "\n", "\t"], '', $content);
+        $content = preg_replace(["/<p/si", "/<\/p>/si"], ['<span', '</span><br>'], $content); //p
         return $content;
     }
 
@@ -547,10 +547,10 @@ 
      * @param  string $keyword
      * @return string
      */
-    static public function filterPunctuation($keyword){
-        $keyword = str_replace(["\r\n", "\r", "\n"," ","　"], "", trim($keyword));//删除空格
-        $keyword = preg_replace('# #','',$keyword);
-        $keyword = preg_replace("/[ '.,:;*?~`!@#$%^&+=)(<>{}]|\]|\[|\/|\\\|\"|\|/",'',$keyword);
+    static public function filterPunctuation($keyword) {
+        $keyword = str_replace(["\r\n", "\r", "\n", " ", "　"], "", trim($keyword)); //删除空格
+        $keyword = preg_replace('# #', '', $keyword);
+        $keyword = preg_replace("/[ '.,:;*?~`!@#$%^&+=)(<>{}]|\]|\[|\/|\\\|\"|\|/", '', $keyword);
         return $keyword;
     }
 
@@ -562,9 +562,9 @@ 
      * @param string $allowable_tags
      * @return string
      */
-    static public function stripTags($content,$allowable_tags = '<font>'){
-        $content = strip_tags($content,$allowable_tags);//替换标签
-        $content = str_replace(["\r\n", "\r", "\n","　"], "", trim($content));//删除空格
+    static public function stripTags($content, $allowable_tags = '<font>') {
+        $content = strip_tags($content, $allowable_tags); //替换标签
+        $content = str_replace(["\r\n", "\r", "\n", "　"], "", trim($content)); //删除空格
         return $content;
     }
 

src/ArrayTool.php

Spacing +23 added lines, -23 removed lines

@@ -8,7 +8,7 @@ 
  * Description: Tool.php.
  */
 
-class ArrayTool{
+class ArrayTool {
 
     /**
      * @param $arr
@@ -16,20 +16,20 @@ 
      * @param $type
      * @return array
      */
-    static public function arraySort($arr,$keys,$type='asc'){
+    static public function arraySort($arr, $keys, $type = 'asc') {
         $keysValue = $newArray = array();
-        foreach ($arr as $k=>$v){
-            if(isset($v[$keys])){
+        foreach ($arr as $k=>$v) {
+            if (isset($v[$keys])) {
                 $keysValue[$k] = $v[$keys];
             }
         }
-        if($type == 'asc'){
+        if ($type == 'asc') {
             asort($keysValue);
-        }else{
+        } else {
             arsort($keysValue);
         }
         reset($keysValue);
-        foreach ($keysValue as $k=>$v){
+        foreach ($keysValue as $k=>$v) {
             $newArray[$k] = $arr[$k];
         }
         return array_values($newArray);
@@ -46,14 +46,14 @@ 
      * @param string $childrenName child
      * @return array
      */
-    public static function getTreeStructureRecursion(array $list,string $filed='id',string $parentFiled='pid',int $parentId=0,string $childrenName = 'child')
+    public static function getTreeStructureRecursion(array $list, string $filed = 'id', string $parentFiled = 'pid', int $parentId = 0, string $childrenName = 'child')
     {
         $result = array();
-        if(!empty($list)){
-            foreach($list as $val){
-                if($val[$parentFiled] == $parentId){
-                    $val[$childrenName] = self::getTreeStructureRecursion($list,$filed,$parentFiled,$val[$filed]);
-                    if(empty($val[$childrenName])){
+        if (!empty($list)) {
+            foreach ($list as $val) {
+                if ($val[$parentFiled] == $parentId) {
+                    $val[$childrenName] = self::getTreeStructureRecursion($list, $filed, $parentFiled, $val[$filed]);
+                    if (empty($val[$childrenName])) {
                         unset($val[$childrenName]);
                     }
                     $result[] = $val;
@@ -73,7 +73,7 @@ 
      * @param string $childrenName child
      * @return array
      */
-    public static function getTreeStructure(array $list,string $filed = 'id', string $parentFiled = 'pid', string $childrenName = 'child')
+    public static function getTreeStructure(array $list, string $filed = 'id', string $parentFiled = 'pid', string $childrenName = 'child')
     {
         $result = array();
         foreach ($list as $value) {
@@ -97,12 +97,12 @@ 
      * @param $obj
      * @return array
      */
-    public static function objectToArray($obj){
-        if(!is_object($obj) && !is_array($obj)) {
+    public static function objectToArray($obj) {
+        if (!is_object($obj) && !is_array($obj)) {
             return $obj;
         }
         $arr = array();
-        foreach($obj as $k => $v){
+        foreach ($obj as $k => $v) {
             $arr[$k] = self::objectToArray($v);
         }
         return $arr;
@@ -114,12 +114,12 @@ 
      * @Author: TinyMeng <666@majiameng.com>
      * @param $data
      */
-    public static function nullArrayToObject(&$data){
-        foreach ($data as $key=>&$val){
-            if(is_array($val)){
-                if(empty($val)){
-                    settype($val,'object');
-                }else{
+    public static function nullArrayToObject(&$data) {
+        foreach ($data as $key=>&$val) {
+            if (is_array($val)) {
+                if (empty($val)) {
+                    settype($val, 'object');
+                } else {
                     self::nullArrayToObject($val);
                 }
             }