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

lua-ui/nginx/di-ting-ui.vh.conf

@@ -3,7 +3,7 @@ server {
 		server_name _;
 
     location / {
-        root /home/quant_group/SYSTEM_NAME/dist/public;
+        root /home/quant_group/di-ting-ui/dist/public;
         try_files $uri $uri/ /index.html;
     }
 }
\ No newline at end of file

nodejs/xyqb-h5-backend.js

+
+const path = require('path')
+const logDir = path.resolve(process.cwd(), './logs')
+
 module.exports = {
+  port:80,
   api: {
+
     passport_api: 'http://xyqb-user',
     xjd_api: 'http://xyqb',
     redpacket_api: 'http://redpacket',
@@ -7,64 +13,45 @@ module.exports = {
     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'
+    bt_api: 'http://baitiao',
+    appbackend_api: 'http://app-backend',
+    pay_api: 'http://gu-bei'
   },
 
   redis: {
     api: 'redis://redis:6379/1'
   },
 
-  rabbitmq: {
-    mall_api: 'amqp://qa:qatest@rabbitmq:5672/mall'
+  log4js: {
+    appenders: {
+      out: { type: 'stdout' },
+      app: { type: 'dateFile', filename: logDir + '/xyqb-h5-backend.log', daysToKeep: 3, compress: true },
+      error: { type: 'dateFile', filename: logDir + '/xyqb-h5-backend.error.log', daysToKeep: 3, compress: true },
+      just_errors: { type: 'logLevelFilter', appender: 'error', level: 'error' }
+    },
+    categories: {
+      default: { appenders: ['out', 'app', 'just_errors'], level: 'info' }
+    }
   },
 
   qiniu: {
     domain: 'https://mapi.xyqb.com',
-    ACCESS_KEY: 'QyjX3i2tEMvrv50j6M_wpb9YoFJbxSm3jEkOj9lY',
-    SECRET_KEY: 'uoMTzRLoElTAKXVzelGgTvI652zJ8bCz_qqTtoGl',
+    ACCESS_KEY: 'e2S74rOnpqNz1rkZRdgY45c8L988PoARRQ60_6-t',
+    SECRET_KEY: 'YYtAEZ2bPDiyNLt2qLKGpaEp0-Thq8tGLrqlBgxY',
     BUCKET: 'app-sync',
   },
 
-  log4js: {
-    appenders: [
-      {
-        type: "console"
-      },
-      {
-        type: "dateFile",
-        filename: "/home/quant_group/logs/xyqb-h5-backend.log",
-        pattern: "-yyyy-MM-dd"
+  mongo: {
+    api: 'mongodb://192.168.4.50:27017/h5_xyqb'
   },
-      {
-        type: "logLevelFilter",
-        level: "ERROR",
-        appender: {
-          type: "dateFile",
-          filename: "/home/quant_group/logs/xyqb-h5-backend-errors.log",
-          pattern: "-yyyy-MM-dd"
-        }
+
+  ocr: {
+    auth_api: 'http://139.198.2.95:38099/auth-center/api/ocr/h5/auth_url.json',
+    query_api: 'http://139.198.2.95:38099/auth-center/h5/api/ocr/auth.json',
+    key: 'wd8bRaLf1nbiMDvPpM1fP9sA2mVSmmpy'
   },
-      {
-        type: 'dateFile', 
-        filename: '/home/quant_group/logs/xyqb-h5-backend-proxy.log',
-        pattern: '.yyyy-MM-dd',
-        category: 'proxy',
-        layout: {
-          type: 'pattern',
-          pattern: "%m"
-        }
-      }
-    ]
+
+  rabbitmq: {
+    mall_api: 'amqp://qa:qatest@rabbitmq:5672/mall'
   }
-};
+}