Merge branch 'master' into dev_20111115

# Conflicts:
#	liquidnet-bus-config/liquidnet-config/application-dev.yml
#	liquidnet-bus-config/liquidnet-config/application-test.yml

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -13,7 +13,7 @@ liquidnet:
     refresh-ttl: 525600
     blacklist_grace_period: 5
   mysql:
-    urlHostAndPort: 39.106.122.201:3308
+    urlHostAndPort: 39.107.71.112:3308
     username: testmall
     password: zhengzai!mYT
   rabbitmq:
@@ -34,35 +34,35 @@ liquidnet:
     kylin:
       dbs: 0,16
       database: 15
-      host: 39.106.122.201
+      host: 39.107.71.112
       port: 6379
       password: 3Xa%8p
     dragon:
       dbs: 0,16
       database: 15
-      host: 39.106.122.201
+      host: 39.107.71.112
       port: 6379
       password: 3Xa%8p
     sweet:
       dbs: 0,16
       database: 15
-      host: 39.106.122.201
+      host: 39.107.71.112
       port: 6379
       password: 3Xa%8p
     adam:
       dbs: 0,16
       database: 15
-      host: 39.106.122.201
+      host: 39.107.71.112
       port: 6379
       password: 3Xa%8p
     candy:
       dbs: 0,16
       database: 15
-      host: 39.106.122.201
+      host: 39.107.71.112
       port: 6379
       password: 3Xa%8p
   mongodb:
-    host: 39.106.122.201:27017
+    host: 39.107.71.112:27017
     port: 27017
     user: admin
     pwd: S&y$6d*JwJ
@@ -99,7 +99,7 @@ liquidnet:
     executor-main:
       xxl:
         admin:
-          addresses: 172.17.205.50:8090
+          addresses: 172.17.192.42:8090
   client:
     admin:
       phpPayUrl: http://devdragon.zhengzai.tv

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -13,7 +13,7 @@ liquidnet:
     refresh-ttl: 525600
     blacklist_grace_period: 5
   mysql:
-    urlHostAndPort: 172.17.205.50:3308
+    urlHostAndPort: 39.107.71.112:3308
     username: root
     password: Zhengzai@rd2U#
   rabbitmq:
@@ -62,7 +62,7 @@ liquidnet:
       port: 6380
       password: Zhengzai@2021
   mongodb:
-    host: 172.17.205.50:27017
+    host: 39.107.71.112:27017
     port: 27017
     user: admin
     pwd: S&y$6d*JwJ