convertUnderline方法修改以及系统默认地址切换至复原文创园

application/library/Our/ArrayConst.php

@@ -63,9 +63,9 @@ class ArrayConst
     //系统默认地址
     const defaultAddress = array(
         NameConst::cityCode => '0591',
-        NameConst::lat => '26.053183',
-        NameConst::lng => '119.24174',
-        NameConst::address => '横一号路特力林科技大厦',
+        NameConst::lat => '26.043194',
+        NameConst::lng => '119.331196',
+        NameConst::address => '福远文创园',
         'default'=>\Our\ApiConst::one
     );
 

application/library/Our/Common.php

@@ -347,13 +347,15 @@ class Common
      * @param array $data
      * @return array
      */
-    public static function convertHump(array $data){
+    public static function convertHump($data = array()){
         $result = [];
-        foreach ($data as $key => $item) {
-            if (is_array($item) || is_object($item)) {
-                $result[self::humpToLine($key)] = self::convertHump((array)$item);
-            } else {
-                $result[self::humpToLine($key)] = $item;
+        if($data){
+            foreach ($data as $key => $item) {
+                if (is_array($item) || is_object($item)) {
+                    $result[self::humpToLine($key)] = self::convertHump((array)$item);
+                } else {
+                    $result[self::humpToLine($key)] = $item;
+                }
             }
         }
         return $result;
@@ -365,13 +367,15 @@ class Common
      * @param array $data
      * @return array
      */
-    public static function convertUnderline(array $data){
+    public static function convertUnderline( $data=array()){
         $result = [];
-        foreach ($data as $key => $item) {
-            if (is_array($item) || is_object($item)) {
-                $result[self::underlineToHump($key)] = self::convertUnderline((array)$item);
-            } else {
-                $result[self::underlineToHump($key)] = $item;
+        if($data){
+            foreach ($data as $key => $item) {
+                if (is_array($item) || is_object($item)) {
+                    $result[self::underlineToHump($key)] = self::convertUnderline((array)$item);
+                } else {
+                    $result[self::underlineToHump($key)] = $item;
+                }
             }
         }
         return $result;