✨ (CamelConverter): 蛇形命名和驼峰互相转换，拆分功能

Joycezhangw · Dec 26, 2023 · 483512e · 483512e
1 parent 35763d8
commit 483512e
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 58 deletions.
diff --git a/src/Helpers/CamelHelper.php b/src/Helpers/CamelHelper.php
@@ -0,0 +1,75 @@
+<?php
+// +----------------------------------------------------------------------
+// | 通用类包
+// +----------------------------------------------------------------------
+// | Copyright (c) 2020 http://www.hmall.com.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: joyecZhang <[email protected]>
+// +----------------------------------------------------------------------
+
+declare (strict_types=1);
+
+namespace JoyceZ\LaravelLib\Helpers;
+
+
+use Illuminate\Support\Str;
+
+class CamelHelper
+{
+    /**
+     * 循环迭代将数组键驼峰转下划线
+     * @param $arr
+     * @return array
+     */
+    public static function recursiveConvertParameterNameCase($arr)
+    {
+        if (!is_array($arr)) {
+            return $arr;
+        }
+        $params = [];
+        foreach ($arr as $key => $value) {
+            if (!is_int($key)) {
+                if (is_array($value)) {
+                    $params[Str::snake($key)] = self::recursiveConvertParameterNameCase($value);
+                } else {
+                    $params[Str::snake($key)] = $value;
+                }
+            } elseif (is_array($value)) {
+                $params[$key] = self::recursiveConvertParameterNameCase($value);
+            } else {
+                $params[Str::snake($key)] = $value;
+            }
+        }
+        return $params;
+    }
+
+    /**
+     * 循环迭代将数组键转换位驼峰
+     * @param $arr
+     * @return array
+     */
+    public static function recursiveConvertNameCaseToCamel($arr)
+    {
+        if (!is_array($arr)) {
+            return $arr;
+        }
+        $outArray = [];
+        foreach ($arr as $key => $value) {
+            if (!is_int($key)) {
+                if (is_array($value)) {
+                    $outArray[Str::camel($key)] = self::recursiveConvertNameCaseToCamel($value);
+                } else {
+                    $outArray[Str::camel($key)] = $value;
+                }
+            } elseif (is_array($value)) {
+                $outArray[$key] = self::recursiveConvertNameCaseToCamel($value);
+            } else {
+                $outArray[Str::camel($key)] = $value;
+            }
+        }
+        return $outArray;
+    }
+
+}
diff --git a/src/Middleware/ApiCaseConverter.php b/src/Middleware/ApiCaseConverter.php
@@ -4,7 +4,7 @@
 
 use Closure;
 use Illuminate\Http\Request;
-use Illuminate\Support\Str;
+use JoyceZ\LaravelLib\Helpers\CamelHelper;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -49,35 +49,9 @@ private function convertRequestNameCase($request)
     private function convertParameterNameCase($parameterBag)
     {
         $parameters = $parameterBag->all();
-        $parameterBag->replace($this->recursiveConvertParameterNameCase($parameters));
+        $parameterBag->replace(CamelHelper::recursiveConvertParameterNameCase($parameters));
     }
 
-    /**
-     * 循环迭代将数组键驼峰转下划线
-     * @param $arr
-     * @return array
-     */
-    private function recursiveConvertParameterNameCase($arr)
-    {
-        if (!is_array($arr)) {
-            return $arr;
-        }
-        $params = [];
-        foreach ($arr as $key => $value) {
-            if (!is_int($key)) {
-                if (is_array($value)) {
-                    $params[Str::snake($key)] = $this->recursiveConvertParameterNameCase($value);
-                } else {
-                    $params[Str::snake($key)] = $value;
-                }
-            } elseif (is_array($value)) {
-                $params[$key] = $this->recursiveConvertParameterNameCase($value);
-            } else {
-                $params[Str::snake($key)] = $value;
-            }
-        }
-        return $params;
-    }
 
     /**
      * 响应数据下划线转驼峰
@@ -88,35 +62,8 @@ private function convertResponseNameCase($response)
         $content = $response->getContent();
         $json = json_decode($content, true);
         if (is_array($json)) {
-            $json = $this->recursiveConvertNameCaseToCamel($json);
+            $json =CamelHelper::recursiveConvertNameCaseToCamel($json);
             $response->setContent(json_encode($json));
         }
     }
-
-    /**
-     * 循环迭代将数组键转换位驼峰
-     * @param $arr
-     * @return array
-     */
-    private function recursiveConvertNameCaseToCamel($arr)
-    {
-        if (!is_array($arr)) {
-            return $arr;
-        }
-        $outArray = [];
-        foreach ($arr as $key => $value) {
-            if (!is_int($key)) {
-                if (is_array($value)) {
-                    $outArray[Str::camel($key)] = $this->recursiveConvertNameCaseToCamel($value);
-                } else {
-                    $outArray[Str::camel($key)] = $value;
-                }
-            } elseif (is_array($value)) {
-                $outArray[$key] = $this->recursiveConvertNameCaseToCamel($value);
-            } else {
-                $outArray[Str::camel($key)] = $value;
-            }
-        }
-        return $outArray;
-    }
-}
+}
diff --git a/src/config.php b/src/config.php
@@ -2,7 +2,7 @@
 
 return [
     'passport' => [
-        'check_captcha_cache_key' => 'captcha_uniqid',
+        'check_captcha_cache_key' => 'captchaUniqId',
         'password_salt' => env('LANDAO_PASSPORT_PASSWORD_SALT', env('APP_KEY'))
     ],
     'security' => [