统一参数为uri；write逻辑移到v2版本中

README.md

@@ -48,7 +48,7 @@ module.exports = router
 pipe
 
 option: 对象格式，和request包参数一直
-    如果是字符串类型，默认会转为{url: 'some string'}
+    如果是字符串类型，默认会转为{uri: 'some string'}
 
 extra: 对象格式，现有两个属性
     rawRes: 是否返回接受到的res,默认false
@@ -63,7 +63,7 @@ extra: 对象格式，现有两个属性
 
 if (ctx.method === 'POST') {
     let option = {
-      url: config.api.mall_api + ctx.url.replace('/mall/other', ''),
+      uri: config.api.mall_api + ctx.url.replace('/mall/other', ''),
       headers: {
         'x-auth-token': ctx.headers['x-auth-token']
       }

index.js

 'use strict'
 const request = require('request')
 const debug = require('debug')('request-proxy')
-const qs = require('querystring')
 
 const Agent = require('agentkeepalive');
 const HttpsAgent = require('agentkeepalive').HttpsAgent;
@@ -49,11 +48,6 @@ module.exports = function (options) {
     timeout: options.timeout
   }
 
-  const isProduction = process.env.NODE_ENV === 'production'
-  const rewriteUrl = function (source, to) {
-    return source.replace(/\/\/([^\/]+)\//, `//${to}/`).replace(/_ip_=[\w\.:%]+&?/, '')
-  }
-
   const httpAgent = new Agent(options.agent);
   const httpsAgent = new HttpsAgent();
 
@@ -73,19 +67,11 @@ module.exports = function (options) {
       option = Object.assign({}, curlDefault, option)
       extra = Object.assign({}, extraDefault, extra)
 
-      if (!isProduction && ctx.request.query['_ip_']) {
-        if (option.url) {
-          option.url = rewriteUrl(option.url, ctx.request.query['_ip_'])
-        } else {
-          option.uri = rewriteUrl(option.uri, ctx.request.query['_ip_'])
-        }
-      }
-
       debug(option)
 
-      if (!option.agent && !/^https/.test(option.url)) {
+      if (!option.agent && !/^https/.test(option.uri)) {
         option.agent = httpAgent
-      } else if (!option.agent && /^https/.test(option.url)) {
+      } else if (!option.agent && /^https/.test(option.uri)) {
         option.agent = httpsAgent
       }
 
@@ -114,29 +100,21 @@ module.exports = function (options) {
       }
       option = Object.assign({}, pipeDefault, option)
 
-      if (!isProduction && ctx.request.query['_ip_']) {
-        if (option.url) {
-          option.url = rewriteUrl(option.url, ctx.request.query['_ip_'])
-        } else {
-          option.uri = rewriteUrl(option.uri, ctx.request.query['_ip_'])
-        }
-      }
-
       if (!option.method) {
         option.method = ctx.method
       }
 
       debug(option)
 
-      if (!option.agent && !/^https/.test(option.url)) {
+      if (!option.agent && !/^https/.test(option.uri)) {
         option.agent = httpAgent
-      } else if (!option.agent && /^https/.test(option.url)) {
+      } else if (!option.agent && /^https/.test(option.uri)) {
         option.agent = httpsAgent
       }
       return new Promise(function (resolve, reject) {
         let r = ctx.req.pipe(request(option, function (err, response) {
           if (option.time && options.logger) {
-            options.logger.info(option.url || option.uri, JSON.stringify(response && response.timings || ''))
+            options.logger.info(option.uri, JSON.stringify(response && response.timings || ''))
           }
         }))
         r.on('error', function (err) {

package.json

 {
   "name": "request-proxy",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "",
   "main": "index.js",
   "scripts": {