Merge branch 'bigdata' of gitlab.gongsibao.com:jiangyong/zhichan into bigdata

bigdata/app/base/api/api.base.js

@@ -56,7 +56,7 @@ class APIBase extends DocBase {
             var isPassResult = await this.checkAcck(gname, methodname, pobj, query, req);
             var isPassResult = await this.checkAcck(gname, methodname, pobj, query, req);
             if (!isPassResult.ispass) {
             if (!isPassResult.ispass) {
                 var tmpResult = system.getResultFail(system.tokenFail, "访问token失效，请重新获取");
                 var tmpResult = system.getResultFail(system.tokenFail, "访问token失效，请重新获取");
-                tmpResult.requestid = "";
+                tmpResult.requestId = "";
                 return tmpResult;
                 return tmpResult;
             }
             }
             // //检查appkey
             // //检查appkey
@@ -79,7 +79,7 @@ class APIBase extends DocBase {
                     });
                     });
                 }
                 }
             }
             }
-            rtn.requestid = requestid;
+            rtn.requestId = requestid;
             return rtn;
             return rtn;
         } catch (e) {
         } catch (e) {
             console.log(e.stack, "api调用异常--error...................");
             console.log(e.stack, "api调用异常--error...................");
@@ -90,7 +90,7 @@ class APIBase extends DocBase {
                 clientIp: req.clientIp
                 clientIp: req.clientIp
             });
             });
             var rtnerror = system.getResultFail(-200, "出现异常，请联系管理员");
             var rtnerror = system.getResultFail(-200, "出现异常，请联系管理员");
-            rtnerror.requestid = requestid;
+            rtnerror.requestId = requestid;
             return rtnerror;
             return rtnerror;
         }
         }
     }
     }

bigdata/app/config/localsettings.js

@@ -10,8 +10,8 @@ var settings = {
     user: "write",
     user: "write",
     password: "write",
     password: "write",
     config: {
     config: {
-      host: '43.247.184.35',
-      port: 8899,
+      host: '192.168.18.237',
+      port: 3306,
       dialect: 'mysql',
       dialect: 'mysql',
       operatorsAliases: false,
       operatorsAliases: false,
       pool: {
       pool: {
@@ -58,6 +58,6 @@ var settings = {
   reqEsDevUrl: "http://192.168.4.249:9200/",
   reqEsDevUrl: "http://192.168.4.249:9200/",
   reqHomePageDevUrl: "http://p.apps.com:4001/",
   reqHomePageDevUrl: "http://p.apps.com:4001/",
   reqAuthUrl: "http://p.apps.com:4001/auth",
   reqAuthUrl: "http://p.apps.com:4001/auth",
-  docUrl:"http://p.apps.com:4001/web/common/metaCtl/getApiDoc"
+  docUrl: "http://p.apps.com:4001/web/common/metaCtl/getApiDoc"
 };
 };
 module.exports = settings;
 module.exports = settings;