Merge remote-tracking branch 'origin/master' into beta

+[memcached]
+master.hosts=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111
+slave.hosts=10.170.182.9:12112,10.172.169.31:12112,10.173.8.214:12112
+session.hosts=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111
+
+[redis]
+servers.hosts=127.0.0.1:6379
\ No newline at end of file

+[memcached]
+master.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
+slave.hosts=192.168.166.16:12112,192.168.166.17:12112,192.168.166.18:12112
+session.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
+
+[redis]
+servers.hosts=127.0.0.1:6379
\ No newline at end of file

@@ -466,7 +466,7 @@ class HomeController extends AbstractAction
         $serviceUrl = 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=';
         if ($uid) {
             $time = time() . '000';
-            $info = 'userId=' . $uid . '&name=' . $this->_uname . '&memo=&hashCode=' . md5(rawurlencode($uid . $this->_uname . $time . '1231')) . '&timestamp=' . $time;
+            $info = 'userId=' . $uid . '&name=' . $this->_uname . '&memo=&hashCode=' . md5( strtoupper( rawurlencode($uid . $this->_uname . $time . '1231') ) ) . '&timestamp=' . $time;
             $serviceUrl .= rawurlencode($info);
         }
             

+[memcached]
+master.hosts=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111
+slave.hosts=10.170.182.9:12112,10.172.169.31:12112,10.173.8.214:12112
+session.hosts=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111
+
+[redis]
+servers.hosts=127.0.0.1:6379
\ No newline at end of file

+[memcached]
+master.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
+slave.hosts=192.168.166.16:12112,192.168.166.17:12112,192.168.166.18:12112
+session.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
+
+[redis]
+servers.hosts=127.0.0.1:6379
\ No newline at end of file