Merge remote-tracking branch 'origin/zhiquanquan' into zhiquanquan

zhiquanquan/app/config/settings.js

@@ -4,7 +4,7 @@ var ENVINPUT = {
   DB_PORT: process.env.DB_PORT,
   DB_PORT: process.env.DB_PORT,
   DB_USER: process.env.DB_USER,
   DB_USER: process.env.DB_USER,
   DB_PWD: process.env.DB_PWD,
   DB_PWD: process.env.DB_PWD,
-  DB_NAME: process.env.ZHIQUANQUAN_DB_NAME,
+  DB_NAME: process.env.ZQQ_DB_NAME,
   REDIS_HOST: process.env.REDIS_HOST,
   REDIS_HOST: process.env.REDIS_HOST,
   REDIS_PORT: process.env.REDIS_PORT,
   REDIS_PORT: process.env.REDIS_PORT,
   REDIS_PWD: process.env.REDIS_PWD,
   REDIS_PWD: process.env.REDIS_PWD,
@@ -34,13 +34,6 @@ var settings = {
   browsingRecordsLogUrl: function () {
   browsingRecordsLogUrl: function () {
     return "http://43.247.184.94:7200/marketplat_browsingrecords_log/_doc?pretty";
     return "http://43.247.184.94:7200/marketplat_browsingrecords_log/_doc?pretty";
   },
   },
-  templateLinkUrl: function () {
-    if (this.env == "dev") {
-      return "http://192.168.200.208:8081/tfhref";
-    } else {
-      return "https://marketflow.gongsibao.com/tfhref";
-    }
-  },
   requrl: function () {
   requrl: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
       return "http://192.168.18.101:4018";
       return "http://192.168.18.101:4018";
@@ -48,40 +41,40 @@ var settings = {
       return "http://sytxpublic-msgq-service";
       return "http://sytxpublic-msgq-service";
     }
     }
   },
   },
-  paasUrl:function(){
-      if(this.env=="dev"){
-          return "http://59.110.125.77:4001/";
-      }else {
-          return "https://open.gongsibao.com/";
-      }
+  paasUrl: function () {
+    if (this.env == "dev") {
+      return "http://59.110.125.77:4001/";
+    } else {
+      return "https://open.gongsibao.com/";
+    }
   },
   },
   channelApiUrl: function () {
   channelApiUrl: function () {
-      if (this.env == "dev") {
-          return "http://alitm.qifu-dev.gongsibao.com";
-      } else {
-          return "http://zc-channel-service";
-      }
+    if (this.env == "dev") {
+      return "http://alitm.qifu-dev.gongsibao.com";
+    } else {
+      return "http://zc-channel-service";
+    }
   },
   },
-  uploadfileossurl:function () {
-      if (this.env == "dev") {
-          return "http://192.168.49.170:8080";
-      } else {
-          return "http://localhost:8080";
-      }
+  uploadfileossurl: function () {
+    if (this.env == "dev") {
+      return "http://192.168.49.170:8080";
+    } else {
+      return "http://localhost:8080";
+    }
   },
   },
-  tmtransactionurl:function () {
-      if (this.env == "dev") {
-          return "http://gsbweb.qifu-dev.gongsibao.com";
-      } else {
-          return "http://gsbweb.qifu-dev.gongsibao.com";
-      }
+  tmtransactionurl: function () {
+    if (this.env == "dev") {
+      return "http://gsbweb.qifu-dev.gongsibao.com";
+    } else {
+      return "http://gsbweb.qifu-dev.gongsibao.com";
+    }
   },
   },
-  serviceurl:function () {
-      if (this.env == "dev") {
-          return "http://192.168.200.181:3003";
-      } else {
-          return "http://gsbweb.qifu-dev.gongsibao.com";
-      }
+  serviceurl: function () {
+    if (this.env == "dev") {
+      return "http://192.168.200.181:3003";
+    } else {
+      return "http://gsbweb.qifu-dev.gongsibao.com";
+    }
   },
   },
   pmappid: 1,
   pmappid: 1,
   pmcompanyid: 1,
   pmcompanyid: 1,