优化getConfig方法

5ini99 · Oct 9, 2016 · 2d25a57 · 2d25a57
1 parent 9b39ed0
commit 2d25a57
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -4,6 +4,7 @@
     "homepage": "https://github.com/5ini99/think-addons",
     "license": "Apache-2.0",
     "minimum-stability": "stable",
+    "version": "1.0.2",
     "authors": [
         {
             "name": "xiaobo.sun",

diff --git a/src/Addons.php b/src/Addons.php
@@ -86,25 +86,21 @@ final public function getConfig($name = '')
         }
         $map['name'] = $name;
         $map['status'] = 1;
-        $config = Db::name('Addons')->where($map)->value('config');
-        if ($config) {
-            $config = json_decode($config, true);
-        } else {
-            if (is_file($this->config_file)) {
-                $temp_arr = include $this->config_file;
-                foreach ($temp_arr as $key => $value) {
-                    if ($value['type'] == 'group') {
-                        foreach ($value['options'] as $gkey => $gvalue) {
-                            foreach ($gvalue['options'] as $ikey => $ivalue) {
-                                $config[$ikey] = $ivalue['value'];
-                            }
+        $config = [];
+        if (is_file($this->config_file)) {
+            $temp_arr = include $this->config_file;
+            foreach ($temp_arr as $key => $value) {
+                if ($value['type'] == 'group') {
+                    foreach ($value['options'] as $gkey => $gvalue) {
+                        foreach ($gvalue['options'] as $ikey => $ivalue) {
+                            $config[$ikey] = $ivalue['value'];
                         }
-                    } else {
-                        $config[$key] = $temp_arr[$key]['value'];
                     }
+                } else {
+                    $config[$key] = $temp_arr[$key]['value'];
                 }
-                unset($temp_arr);
             }
+            unset($temp_arr);
         }
         $_config[$name] = $config;