diff --git a/lib/Conf/config.js b/lib/Conf/config.js index caf5e66b..b08eab44 100644 --- a/lib/Conf/config.js +++ b/lib/Conf/config.js @@ -40,10 +40,9 @@ module.exports = { cookie_domain: "", //cookie有效域名 cookie_path: "", //cookie路径 cookie_expires: 0, //cookie默认保持时间数,默认随浏览器关闭失效 - cookie_prefix: "", //cookie前缀,避免冲突 session_id: "thinkjs", //session id - session_type: "File", //session存储类型, 空为内存,还可以为File, Db + session_type: "File", //session存储类型, 空为内存,还可以为File session_options: {}, //session的一些选项 session_cookie_sign: "", //session对应的cookie使用签名,如果使用这里填密钥 diff --git a/lib/Lib/Core/Http.js b/lib/Lib/Core/Http.js index 5b11f42f..7cbee403 100644 --- a/lib/Lib/Core/Http.js +++ b/lib/Lib/Core/Http.js @@ -146,20 +146,9 @@ module.exports = Class(function(){ * @param {[type]} options [description] */ setCookie: function(name, value, options){ - //将cookie发送出去 - if (name === true) { - var cookies = Object.values(this._cookie); - if (cookies.length) { - this.setHeader("Set-Cookie", cookies); - this._cookie = {}; - }; - return true; - }; options = options || {}; if (typeof options == 'number') { - options = { - expires: options - } + options = {expires: options}; }; var expires = options.expires; if (expires === undefined) { @@ -181,6 +170,17 @@ module.exports = Class(function(){ value = cookie.serialize(name, value, options); this._cookie[name] = value; }, + /** + * 将队列中的cookie发送出去 + * @return {[type]} [description] + */ + sendCookie: function(){ + var cookies = Object.values(this._cookie); + if (cookies.length) { + this.setHeader("Set-Cookie", cookies); + this._cookie = {}; + }; + }, /** * url跳转 * @param {[type]} url [description] @@ -208,7 +208,7 @@ module.exports = Class(function(){ * @return {[type]} [description] */ echo: function(obj, encoding){ - this.setCookie(true); + this.sendCookie(); if (isArray(obj) || isObject(obj)) { obj = JSON.stringify(obj); }; @@ -222,7 +222,7 @@ module.exports = Class(function(){ * @return {[type]} [description] */ end: function(){ - this.setCookie(true); + this.sendCookie(); this.res.end(); } }