Merge branch 'master' of git.quantgroup.cn:QA/config_repository

nodejs/op-api.js

+// 和环境有关的配置
+module.exports = {
+  // controller中请求各类数据前缀和域名的键值对
+  api: {
+    merchantBackend_api: 'http://merchantapi.xyqb.com',
+    redpacket_api: 'http://redpacket.xyqb.com',
+    app_api: 'https://sappbackend.xyqb.com',
+    btCapital_api: 'http://fundmanage.xyqb.com',
+    boHai_api: 'http://fundmanage.xyqb.com',
+    btDirect_api: 'http://internal.btzt.xyqb.com',
+    sms_api: 'http://backend.xyqb.com',
+    userCenter_api: 'https://passportapi.xyqb.com',
+    zbj_api: 'http://taurus.quantgroup.cn/',
+    gdxd_api: 'http://192.168.4.161:7005'
+  },
+
+  // 站点相关的配置
+  site: {
+    env: 'development',
+    port: 80
+  },
+
+  userCenter: 'http://op.xyqb.com',
+
+  // mongo配置
+  mongo: {
+    options: {
+     options: {
+      auto_reconnect: true,
+      poolSize: 3,
+      socketOptions: {
+        keepAlive: 300000,
+        connectTimeoutMS: 30000
+      }
+    }, 
+    },
+    api: {
+      'implied': 'mongodb://192.168.4.50:27017/op',
+      'xyqb': 'mongodb://192.168.4.50:27017/h5_xyqb',
+      'loan': 'mongodb://192.168.4.50:27017/loan',
+      'ka_factory': 'mongodb://192.168.4.50:27017/ka_factory'
+    }  
+  },
+  
+  // redis配置
+  redis: {
+    api: 'redis://192.168.4.50:6379/1'
+  },
+
+  // 七牛配置
+  qiniu: {
+    domain: 'http://op-api.xyqb.com',
+    ACCESS_KEY: 'QyjX3i2tEMvrv50j6M_wpb9YoFJbxSm3jEkOj9lY',
+    SECRET_KEY: 'uoMTzRLoElTAKXVzelGgTvI652zJ8bCz_qqTtoGl',
+    BUCKET: 'app-sync',
+  },
+
+  upload: {
+    path: '/vpants/quant_group/op-api-data'
+  },
+
+  log4js: {
+    "appenders": [
+      {
+        "type": "dateFile",
+        "filename": "/home/quant_group/logs/op-api.log",
+        "pattern": "-yyyy-MM-dd",
+        "layout": { type: 'basic' }
+      },
+      {
+        "type": "logLevelFilter",
+        "level": "ERROR",
+        "appender": {
+          "type": "dateFile",
+          "filename": "/home/quant_group/logs/op-api-errors.log",
+          "pattern": "-yyyy-MM-dd"
+        }
+      }
+    ]
+  },
+  upload: {
+    path:  '/home/quant_group/op-api/upload'
+  }
+}
\ No newline at end of file

nodejs/xyqb-h5-backend.js

+module.exports = {
+  api: {
+    passport_api: 'http://xyqb-user',
+    xjd_api: 'http://xyqb',
+    redpacket_api: 'http://redpacket',
+    score_api: 'http://score',
+    auth_api: 'https://han-gu-guan',
+    flow_api: 'http://traffic-webapp',
+    mall_api: 'http://xyqb-mall',
+    bt_api: 'http://baitiao'
+  },
+
+  site: {
+    env: 'development',
+    port: 80
+  },
+
+  mongo: {
+    options: {
+    },
+    api: 'mongodb://192.168.4.50:27017/h5_xyqb'
+  },
+
+  redis: {
+    api: 'redis://redis:6379/1'
+  },
+
+  rabbitmq: {
+    mall_api: 'amqp://qa:qatest@rabbitmq:5672/mall'
+  },
+
+  qiniu: {
+    domain: 'https://mapi.xyqb.com',
+    ACCESS_KEY: 'QyjX3i2tEMvrv50j6M_wpb9YoFJbxSm3jEkOj9lY',
+    SECRET_KEY: 'uoMTzRLoElTAKXVzelGgTvI652zJ8bCz_qqTtoGl',
+    BUCKET: 'app-sync',
+  },
+
+  log4js: {
+    appenders: [
+      {
+        type: "console"
+      },
+      {
+        type: "dateFile",
+        filename: "/home/quant_group/logs/xyqb-h5-backend.log",
+        pattern: "-yyyy-MM-dd"
+      },
+      {
+        type: "logLevelFilter",
+        level: "ERROR",
+        appender: {
+          type: "dateFile",
+          filename: "/home/quant_group/logs/xyqb-h5-backend-errors.log",
+          pattern: "-yyyy-MM-dd"
+        }
+      },
+      {
+        type: 'dateFile', 
+        filename: '/home/quant_group/logs/xyqb-h5-backend-proxy.log',
+        pattern: '.yyyy-MM-dd',
+        category: 'proxy',
+        layout: {
+          type: 'pattern',
+          pattern: "%m"
+        }
+      }
+    ]
+  }
+};

ui/bt-ui.js

@@ -14,7 +14,6 @@ module.exports = {
   mallUrl: mallUrl,
   newMallUrl: newMallUrl,
   mallApi: xyqbH5Backend + '/bt/mall',
-  socketApi: socketApi,
   baitiaoBankCardToken: 'BAITIAO_RETURN_DEV_ZQ',
   baitiaoRepayToken: 'BAITIAO_REPAY_RETURN_LOCAL',
   xyqbUrl: xyqbUrl