fix the urlencode bug.

llaiajiale · Nov 14, 2019 · 8c521c3 · 8c521c3
1 parent ee19d01
commit 8c521c3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
   "description": "Informix DB driver for Laravel 5",
   "keywords": ["informix", "laravel", "laravel 5", "ifx" ],
   "license": "MIT",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "authors": [
     {
       "name": "llaiayumi",

diff --git a/src/Poyii/Informix/IfxJsonConnection.php b/src/Poyii/Informix/IfxJsonConnection.php
@@ -222,7 +222,9 @@ public function select($query, $bindings = [], $useReadPdo = true)
             Log::debug("the sql is ${sql}");
         }
 
-        $response = $client->get($uri, [ "query"=> [ "action" => "queryList", "source" => $source,
+        $response = $client->get($uri, [
+            "header" =>[ "Content-Type"=> "application/json; charset=utf-8",],
+            "query"=> [ "action" => "queryList", "source" => $source,
             "_token"=>$token, "sql"=> $sql,
         ] ]);
 
@@ -236,15 +238,7 @@ public function select($query, $bindings = [], $useReadPdo = true)
         if($json){
             $results = json_decode($json);
             if(is_array($results)){
-                foreach ($results as &$result){
-                    foreach ($result as $key =>&$value){
-                        if($value){
-                            if(is_string($value) && substr($value, 0, 1) == '%'){
-                                $value = urldecode($value);
-                            }
-                        }
-                    }
-                }
+                $results = $this->parseResult($results);
             }
             return $results;
         }
@@ -253,18 +247,16 @@ public function select($query, $bindings = [], $useReadPdo = true)
     }
 
     protected function parseResult($results){
-        if(!$results) return;
+        if(!$results) return $results;
         foreach ($results as &$result){
-            foreach ($result as $key =>&$value){
-                if(!$value) continue;
-                if(is_array($value)){
-                    $value = $this->parseResult($value);
-                } else if(is_object($value)){
-                    $value = $this->parseResult($value);
-                } else if(is_string($value)){
-                    if(substr($value, 0, 1) == '%'){
-                        $value = urldecode($value);
-                    }
+            if(!$result) continue;
+            if(is_array($result)){
+                $result = $this->parseResult($result);
+            } else if(is_object($result)){
+                $result = $this->parseResult($result);
+            } else if(is_string($result)){
+                if(substr($result, 0, 1) == '%'){
+                    $result = rawurldecode($result);
                 }
             }
         }