wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by 梁志锋
Commit 3e3d25e003f58a2dacd6cbb5dd5efcb7cc77e2e4 2 parents 75177909 2f39e85f

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

Inline Side-by-side
Showing 5 changed files with 29 additions and 1 deletions
  1 +[memcached]
  2 +master.hosts=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111
  3 +slave.hosts=10.170.182.9:12112,10.172.169.31:12112,10.173.8.214:12112
  4 +session.hosts=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111
  5 +
  6 +[redis]
  7 +servers.hosts=127.0.0.1:6379
  1 +[memcached]
  2 +master.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
  3 +slave.hosts=192.168.166.16:12112,192.168.166.17:12112,192.168.166.18:12112
  4 +session.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
  5 +
  6 +[redis]
  7 +servers.hosts=127.0.0.1:6379
@@ -466,7 +466,7 @@ class HomeController extends AbstractAction @@ -466,7 +466,7 @@ class HomeController extends AbstractAction
466 $serviceUrl = 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info='; 466 $serviceUrl = 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=';
467 if ($uid) { 467 if ($uid) {
468 $time = time() . '000'; 468 $time = time() . '000';
469 - $info = 'userId=' . $uid . '&name=' . $this->_uname . '&memo=&hashCode=' . md5(rawurlencode($uid . $this->_uname . $time . '1231')) . '&timestamp=' . $time; 469 + $info = 'userId=' . $uid . '&name=' . $this->_uname . '&memo=&hashCode=' . md5( strtoupper( rawurlencode($uid . $this->_uname . $time . '1231') ) ) . '&timestamp=' . $time;
470 $serviceUrl .= rawurlencode($info); 470 $serviceUrl .= rawurlencode($info);
471 } 471 }
472 472
  1 +[memcached]
  2 +master.hosts=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111
  3 +slave.hosts=10.170.182.9:12112,10.172.169.31:12112,10.173.8.214:12112
  4 +session.hosts=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111
  5 +
  6 +[redis]
  7 +servers.hosts=127.0.0.1:6379
  1 +[memcached]
  2 +master.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
  3 +slave.hosts=192.168.166.16:12112,192.168.166.17:12112,192.168.166.18:12112
  4 +session.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
  5 +
  6 +[redis]
  7 +servers.hosts=127.0.0.1:6379