Merge branch 'master' of git-ssh.devops.yitong.com:yitong-public/nodejs-yitong-sdk

package.json

 {
   "name": "nodejs-yitong-sdk",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "",
   "main": "index.js",
   "scripts": {

yitong-sdk.js

@@ -28,8 +28,6 @@ class ApiError extends Error {
     }
 }
 
-
-
 /**
  * YiTong SDK HTTP
  */
@@ -43,19 +41,42 @@ const http = axios.create({
     httpAgent: new require('http').Agent({ keepAlive: true }),
     httpsAgent: new require('https').Agent({ keepAlive: true })
 });
-// koa opentracing
-// https://github.com/fapspirit/axios-opentracing
-http.interceptors.request.use(function (config) {
-    if(global.serviceMap) {
-        let paths = config.url.split("/")
-        if(paths.length >= 4){
-            let pathKey = paths[0] + "//" + paths[2] + "/" + paths[3] + "/"
-            if(global.serviceMap[pathKey]) {
-                config.url = config.url.replace(pathKey, global.serviceMap[pathKey])
+// URL转换 域名 转 k8s serviceName
+if (process.env.YT_SERVICE_RULES) {
+    const { serviceRuleMap } = require(process.env.YT_SERVICE_RULES);
+    if (_.size(serviceRuleMap) > 0) {
+        let rules = new Map();
+        for (const key of Object.keys(serviceRuleMap)) {
+            const value = serviceRuleMap[key];
+            rules.set(key, value);
+            if (key.startsWith("http://")) {
+                rules.set(`https://${key.substring(7)}`, value);
             }
         }
+        let rulesCache = new Map();
+        http.interceptors.request.use(function (config) {
+            let url = config.url;
+            if (url) {
+                let newUrl = rulesCache.get(config.url);
+                if (!newUrl) {
+                    for (const [key, value] of rules) {
+                        if (url.startsWith(key)) {
+                            newUrl = `${value}${url.substring(key.length)}`
+                            rulesCache.set(url, newUrl)
+                        }
+                    }
+                }
+                if (newUrl) {
+                    config.url = newUrl;
+                }
+            }
+            return config;
+        });
     }
-    
+}
+// koa opentracing
+// https://github.com/fapspirit/axios-opentracing
+http.interceptors.request.use(function (config) {
     if (config.context && config.context.span) {
         let tracer = opentracing.globalTracer();
         let span = tracer.startSpan(`${config.method}: ${config.url}`, {
@@ -188,7 +209,16 @@ function errorHandler() {
         } catch (e) {
             ctx.status = 200;
             ctx.body = transformError(e);
-            log.error(e);
+            log.error({
+                url: ctx.request.url,
+                body: ctx.request.body,
+                headers: {
+                    "user-agent": ctx.headers["user-agent"],
+                    "x-real-ip": ctx.headers["x-real-ip"],
+                    "x-forwarded-for": ctx.headers["x-forwarded-for"]
+                },
+                error: e
+            });
         }
     };
 }