From 70ff9c1ef093a806a4450dda178ec01c78ca27bd Mon Sep 17 00:00:00 2001
From: John <john@johng.cn>
Date: Fri, 19 Jan 2018 17:48:40 +0800
Subject: [PATCH] =?UTF-8?q?gcfg=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 geg/frame/config.xml | 29 +++++++++++++++++++++++++-
 geg/frame/config.yml | 49 ++++++++++++++++++--------------------------
 2 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/geg/frame/config.xml b/geg/frame/config.xml
index 42c1bdf97..f0dfbf90f 100644
--- a/geg/frame/config.xml
+++ b/geg/frame/config.xml
@@ -1 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+    <viewpath>/home/www/templates/</viewpath>
+    <database>
+        <default>
+            <host>127.0.0.1</host>
+            <port>3306</port>
+            <user>root</user>
+            <pass>123456</pass>
+            <name>test</name>
+            <role>master</role>
+            <type>mysql</type>
+            <charset>utf8</charset>
+            <priority>1</priority>
+        </default>
+        <default>
+            <host>127.0.0.1</host>
+            <port>3306</port>
+            <user>root</user>
+            <pass>123456</pass>
+            <name>test</name>
+            <role>master</role>
+            <type>mysql</type>
+            <charset>utf8</charset>
+            <priority>1</priority>
+        </default>
+    </database>
+</config>
\ No newline at end of file
diff --git a/geg/frame/config.yml b/geg/frame/config.yml
index 433dcf4a9..c19de3fc7 100644
--- a/geg/frame/config.yml
+++ b/geg/frame/config.yml
@@ -1,29 +1,20 @@
-{
-    "viewpath"   : "/home/www/templates/",
-    "database"   : {
-        "default" : [
-            {
-                "host"     : "127.0.0.1",
-                "port"     : "3306",
-                "user"     : "root",
-                "pass"     : "123456",
-                "name"     : "test",
-                "type"     : "mysql",
-                "role"     : "master",
-                "charset"  : "utf8",
-                "priority" : "1"
-            },
-            {
-                "host"     : "127.0.0.1",
-                "port"     : "3306",
-                "user"     : "root",
-                "pass"     : "123456",
-                "name"     : "test",
-                "type"     : "mysql",
-                "role"     : "master",
-                "charset"  : "utf8",
-                "priority" : "1"
-            }
-        ]
-    }
-}
\ No newline at end of file
+viewpath: /home/www/templates/
+database:
+  default:
+  - host: 127.0.0.1
+    port: 3306
+    user: root
+    pass: 123456
+    name: test
+    type: mysql
+    role: master
+    priority: 1
+  - host: 127.0.0.1
+    port: 3306
+    user: root
+    pass: 123456
+    name: test
+    type: mysql
+    role: master
+    priority: 1
+