Merge branch 'dev' into tap

Gameserver/App/configs/config_tap.php

@@ -42,7 +42,7 @@ class config_tap extends config {
         $this->nosql->host = "10.88.20.16";                                     # host/ip
         $this->nosql->port = 6379;                                              # 端口
         $this->nosql->pwd = 'wanggang1985';                                     # 密钥
-        $this->nosql->db = 10;                                                   # db索引
+        $this->nosql->db = 10;                                                  # db索引
     }
 
     /**