Merge branch 'master-20160711' into 'master'

更改缓存时间



See merge request !1

@@ -87,7 +87,7 @@ class Service_Auth extends Lib_Service
         $key = sprintf(self::$_key_auth . '%s_%s', $type, $auth_id);
         $key = sprintf(self::$_key_auth . '%s_%s', $type, $auth_id);
         $param = array('type' => $type, 'auth_id' => $auth_id);
         $param = array('type' => $type, 'auth_id' => $auth_id);
 
 
-        return self::service(self::ROUTER)->tag($tag)->key($key)->expire(self::EXPIRE)->fetchRow('getAuthByTypeAndAid', $param);
+        return self::service(self::ROUTER)->tag($tag)->key($key)->expire(300)->fetchRow('getAuthByTypeAndAid', $param);
     }
     }
 
 
     /**
     /**