From c8a13925ed3e2f27845abc5fb7b17ef01d2c33ea Mon Sep 17 00:00:00 2001
From: cherrylzhao <zhaojunv3@126.com>
Date: Thu, 22 Nov 2018 18:43:33 +0800
Subject: [PATCH] #1238 Revert config file.

---
 .../main/resources/conf/config-sharding.yaml  | 94 +++++++++----------
 .../src/main/resources/conf/server.yaml       | 30 +++---
 2 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/sharding-proxy/src/main/resources/conf/config-sharding.yaml b/sharding-proxy/src/main/resources/conf/config-sharding.yaml
index 987decf682ebdf..e2daaed0fdf699 100644
--- a/sharding-proxy/src/main/resources/conf/config-sharding.yaml
+++ b/sharding-proxy/src/main/resources/conf/config-sharding.yaml
@@ -8,50 +8,50 @@
 # 
 ######################################################################################################
 
-schemaName: sharding_db
-
-dataSources:
-  ds_0:
-    url: jdbc:mysql://127.0.0.1:3306/demo_ds_0?serverTimezone=UTC&useSSL=false
-    username: root
-    password:
-    autoCommit: true
-    connectionTimeout: 30000
-    idleTimeout: 60000
-    maxLifetime: 1800000
-    maximumPoolSize: 50
-  ds_1:
-    url: jdbc:mysql://127.0.0.1:3306/demo_ds_1?serverTimezone=UTC&useSSL=false
-    username: root
-    password:
-    autoCommit: true
-    connectionTimeout: 30000
-    idleTimeout: 60000
-    maxLifetime: 1800000
-    maximumPoolSize: 50
-
-shardingRule:
-  tables:
-    t_order:
-      actualDataNodes: ds_${0..1}.t_order_${0..1}
-      tableStrategy:
-        inline:
-          shardingColumn: order_id
-          algorithmExpression: t_order_${order_id % 2}
-      keyGeneratorColumnName: order_id
-    t_order_item:
-      actualDataNodes: ds_${0..1}.t_order_item_${0..1}
-      tableStrategy:
-        inline:
-          shardingColumn: order_id
-          algorithmExpression: t_order_item_${order_id % 2}
-      keyGeneratorColumnName: order_item_id
-  bindingTables:
-    - t_order,t_order_item
-  defaultDatabaseStrategy:
-    inline:
-      shardingColumn: user_id
-      algorithmExpression: ds_${user_id % 2}
-  defaultTableStrategy:
-    none:
-  defaultKeyGeneratorClassName: io.shardingsphere.core.keygen.DefaultKeyGenerator
+#schemaName: sharding_db
+#
+#dataSources:
+#  ds_0:
+#    url: jdbc:mysql://127.0.0.1:3306/demo_ds_0?serverTimezone=UTC&useSSL=false
+#    username: root
+#    password:
+#    autoCommit: true
+#    connectionTimeout: 30000
+#    idleTimeout: 60000
+#    maxLifetime: 1800000
+#    maximumPoolSize: 50
+#  ds_1:
+#    url: jdbc:mysql://127.0.0.1:3306/demo_ds_1?serverTimezone=UTC&useSSL=false
+#    username: root
+#    password:
+#    autoCommit: true
+#    connectionTimeout: 30000
+#    idleTimeout: 60000
+#    maxLifetime: 1800000
+#    maximumPoolSize: 50
+#
+#shardingRule:
+#  tables:
+#    t_order:
+#      actualDataNodes: ds_${0..1}.t_order_${0..1}
+#      tableStrategy:
+#        inline:
+#          shardingColumn: order_id
+#          algorithmExpression: t_order_${order_id % 2}
+#      keyGeneratorColumnName: order_id
+#    t_order_item:
+#      actualDataNodes: ds_${0..1}.t_order_item_${0..1}
+#      tableStrategy:
+#        inline:
+#          shardingColumn: order_id
+#          algorithmExpression: t_order_item_${order_id % 2}
+#      keyGeneratorColumnName: order_item_id
+#  bindingTables:
+#    - t_order,t_order_item
+#  defaultDatabaseStrategy:
+#    inline:
+#      shardingColumn: user_id
+#      algorithmExpression: ds_${user_id % 2}
+#  defaultTableStrategy:
+#    none:
+#  defaultKeyGeneratorClassName: io.shardingsphere.core.keygen.DefaultKeyGenerator
diff --git a/sharding-proxy/src/main/resources/conf/server.yaml b/sharding-proxy/src/main/resources/conf/server.yaml
index d5405020b7e9b1..c19de987e55bba 100644
--- a/sharding-proxy/src/main/resources/conf/server.yaml
+++ b/sharding-proxy/src/main/resources/conf/server.yaml
@@ -11,21 +11,21 @@
 #    serverLists: localhost:2181
 #    namespace: orchestration
 #
-authentication:
-  username: root
-  password: root
-
-props:
-  max.connections.size.per.query: 8
-  acceptor.size: 16  # The default value is available processors count * 2.
-  executor.size: 16  # Infinite by default.
-    # LOCAL: Proxy will run with LOCAL transaction.
-    # XA: Proxy will run with XA transaction.
-    # BASE: Proxy will run with B.A.S.E transaction.
-  proxy.transaction.type: LOCAL
-  proxy.opentracing.enabled: false
-  sql.show: false
-
+#authentication:
+#  username: root
+#  password: root
+#
+#props:
+#  max.connections.size.per.query: 1
+#  acceptor.size: 16  # The default value is available processors count * 2.
+#  executor.size: 16  # Infinite by default.
+#    # LOCAL: Proxy will run with LOCAL transaction.
+#    # XA: Proxy will run with XA transaction.
+#    # BASE: Proxy will run with B.A.S.E transaction.
+#  proxy.transaction.type: LOCAL
+#  proxy.opentracing.enabled: false
+#  sql.show: false
+#
 #configMap:
 #  sharding-key1: sharding-value1
 #  sharding-key2: sharding-value2