优化灰度路由,透传req参数

@@ -6,7 +6,6 @@ var request = require('request');
 
 var config = require('../config/gray');
 var _ = require('lodash');
-var queryString = require('query-string');
 
 /**
  * 灰度界面配置
@@ -14,25 +13,16 @@ var queryString = require('query-string');
  * @return {Function}  返中间件
  */
 module.exports = function(proxyRoute) {
-  /**
-   *  灰度界面中间件
-   * @param  {Object} req  请求对象
-   * @param  {Object} res  响应对象
-   * @param  {Function} next 执行下个中间件
-   * @return {void}       无返回
-   */
+
    return function(req, ress, next) {
     //日志记录器
     var logger = req.app.logger;
     //方法名称
     var method = req.method;
-
     //访问路由路径
     var path = req.route?req.route.path:'';
-
     //路由的hash key
     var key = proxyRoute.genKey(method,path);
-    
     //登出，清掉cookie
     if(path === '/logout') {
        req.session.gray = null;
@@ -45,71 +35,40 @@ module.exports = function(proxyRoute) {
       
       //老系统调用地址
       var callUrl = config.url + req.originalUrl;
-      //gray 透传cookie
       var options = {
         method:method,
         url:callUrl,
         timeout:config.timeout,
-        headers: {
-          'Cookie':req.session.gray
-        }
+        headers: req.headers,
+        useQuerystring:true,
+        form:req.body
       }
-
+      //删除提交内容长度，代理会改变长度
+      delete options.headers['content-length'];
+      //设置代理host
+      options.headers['host'] = config.url.replace('http://','');
       if(!req.session.gray) {
         logger.log('warn','grayroute: cookie missed',req.session.user);
-      }
-
-      //如果是Ajax请求加上 Ajax头
-      if(req.headers['x-requested-with']) {
-        options.headers['X-Requested-With'] = 'XMLHttpRequest';
-      }
-
-      if(req.headers['referer']) {
-        options.headers['Referer'] = req.headers['referer'];
-      }
-      
-      if(isFromArray(req.body)) { //如果是数组的form表单，使用querystring序列化
-        options.useQuerystring = true;
-      }
-
-      //如果是POST，设置form表单的传参
-      if(method === "POST") {
-        options.form = req.body;
+      } else {
+        options.headers['cookie'] = req.session.gray;
       }
 
       logger.log('info','grayroute: request options: %j',options,{});
 
       //发起代理请求
       if(req.is('html')) { 
-        request(options,callback);
+        request(options,function(err,res,body) {
+          if(err) {
+            logger.log('error','grayroute: request error:',err);
+            ress.status(500).send('');
+          } else {
+            setGrayCookie(req,res);
+            ress.status(res.statusCode).send(body);
+          }
+        });
       } else {
         request(options).pipe(ress);//如果是静态资源，直接管道传递结果
       }
-      
-      //代理回调
-      function callback(err,res,body) {
-        if(err) {
-          logger.log('error','grayroute: request error:',err);
-          ress.status(500).send('');
-        } else if(res&&res.statusCode === 200) {
-          setGrayCookie(req,res);
-          var ContentType = res.caseless.get('Content-Type');
-          ress.append('Content-Type',ContentType);
-          ress.send(body);
-        
-        } else if(res&&res.statusCode === 302) {
-          var curCookie = setGrayCookie(req,res);
-          if(!curCookie||curCookie.length<1) {
-            res.session.user = null;
-          }
-          //跳转
-          ress.redirect(res.caseless.get('location'));
-        } else if(res){
-          ress.status(res.statusCode).send(body);
-        } else {
-          ress.status(500).send('500 ERROR!');
-        }
-      }
     } else {
 
       //当不是老系统的URL，需要访问老系统保持session
@@ -123,13 +82,11 @@ module.exports = function(proxyRoute) {
         var code = res?res.statusCode:'no response';
         logger.log('info','grayroute: session keep status:'+code);
       });
-
       next();
     }
   }
  }
 
-
   /**
    * 灰度cookie设置
    * @param {Object} req express request
@@ -143,20 +100,4 @@ module.exports = function(proxyRoute) {
       req.session.gray = cookie[0];
     } 
     return cookie;
- }
-
- /**
-  * 判断是否是数组的form表单
-  * @param  {[type]}  form [description]
-  * @return {Boolean}      [description]
-  */
- function isFromArray(form) {
-  form = form||{};
-  var ret = false;
-  _.forEach(form,function(v,k){
-    if(k.indexOf('[]')>-1){
-      ret = true;
-    }
-  });
-  return ret;
-}
\ No newline at end of file
+ }
\ No newline at end of file