Authored by 周少峰

Merge branch 'feature/students' into release/4.9.1.0

@@ -383,7 +383,6 @@ class WebAction extends Controller_Abstract @@ -383,7 +383,6 @@ class WebAction extends Controller_Abstract
383 $userInfo = LoginData::profile($uid); 383 $userInfo = LoginData::profile($uid);
384 if (isset($userInfo['data']) && $userInfo['data']) { 384 if (isset($userInfo['data']) && $userInfo['data']) {
385 $token = Helpers::makeToken($uid); 385 $token = Helpers::makeToken($uid);
386 - $userInfo['data']['uid'] = Encryption::encrypt($userInfo['data']['uid']);  
387 $uidCookie = $userInfo['data']['profile_name'] . '::' . $userInfo['data']['uid'] . '::' . $userInfo['data']['vip_info']['title'] . '::' . $token; 386 $uidCookie = $userInfo['data']['profile_name'] . '::' . $userInfo['data']['uid'] . '::' . $userInfo['data']['vip_info']['title'] . '::' . $token;
388 $this->setCookie('_UID',$uidCookie,time() + 86400 * 360); 387 $this->setCookie('_UID',$uidCookie,time() + 86400 * 360);
389 UdpLog::info('syncUserCookie :',$uidCookie); 388 UdpLog::info('syncUserCookie :',$uidCookie);
@@ -413,7 +412,6 @@ class WebAction extends Controller_Abstract @@ -413,7 +412,6 @@ class WebAction extends Controller_Abstract
413 // 兼容老的 412 // 兼容老的
414 if (!empty($cookie)) { 413 if (!empty($cookie)) {
415 $cookieList = explode('::', $cookie); 414 $cookieList = explode('::', $cookie);
416 - $cookieList[1] = Encryption::decrypt($cookieList[1]);  
417 if (isset($cookieList[1]) && $cookieList[1]) { 415 if (isset($cookieList[1]) && $cookieList[1]) {
418 if ($useSession) { 416 if ($useSession) {
419 $token = $this->getSession('_TOKEN'); 417 $token = $this->getSession('_TOKEN');