Merge branch 'gray' into 'master'

Gray



See merge request !92

+############################################################
+# Dockerfile to build hystrix + turbin Installed Containers
+# Based on centos 6.7
+# How to build new image: docker build -t  yoho-hystrix-qcloud .
+# the hystrix alert need to post events to influxdb.yohoops.org.
+# nginx version: 1.12.0
+############################################################
+
+#base image ： ccr.ccs.tencentyun.com/yoho-base/nodejs:8.9.1
+FROM ccr.ccs.tencentyun.com/yoho-base/nodejs:8.9.1
+
+MAINTAINER  feng.chen  <feng.chen@yoho.cn>
+
+ENV NODE_ENV=production \
+	NODE_HOME=/home
+
+COPY yoho-shop-manage.tar.gz /home
+
+RUN cd /home && \
+	mkdir -p /home/yoho-shop-manage && \
+	mkdir -p /Data/log/yoho-shop-manage && \
+	tar -xzf yoho-shop-manage.tar.gz -C /home/yoho-shop-manage && \
+	rm -rf yoho-shop-manage.tar.gz
+
+WORKDIR /home/yoho-shop-manage
+
+#expose port
+EXPOSE 6007
+
+CMD ["node","/home/yoho-shop-manage/server/app.js"]

+#!/bin/bash
+wordir=$2
+cd $wordir
+rm -rf yoho-shop-manage.tar.gz
+yarn
+if [[ $1 == "TEST1" ]] || [[ $1 == "TEST2" ]] || [[ $1 == "TEST3" ]]
+then
+yarn build
+fi
+tar -czf yoho-shop-manage.tar.gz *

@@ -56,6 +56,10 @@ app.use(multipartMiddleware);
 const middleware = require('./middleware');
 const middleware = require('./middleware');
 const controllers = require('./controllers');
 const controllers = require('./controllers');
 
 
+app.use('/crm/common/ok.jsp', (req, res) => {
+    res.status(204).end();
+});
+
 try {
 try {
     app.use(middleware.main);
     app.use(middleware.main);
 
 

@@ -146,7 +146,7 @@ if (global.env.Test) {
 if (global.env.Production) {
 if (global.env.Production) {
     domains.erp = 'http://gateway.erp.yohoops.org';
     domains.erp = 'http://gateway.erp.yohoops.org';
     domains.platform = 'http://api.platform.yohoops.org/platform';
     domains.platform = 'http://api.platform.yohoops.org/platform';
-    domains.shop = 'http://127.0.0.1:30016';
+    domains.shop = 'http://10.66.50.140:30016';
 }
 }
 
 
 _.each(domainApis, (apis, domainName) => {
 _.each(domainApis, (apis, domainName) => {

@@ -20,20 +20,26 @@ const config = {
     apiDomain: apiDomain,
     apiDomain: apiDomain,
     loggers: {
     loggers: {
         infoFile: {
         infoFile: {
-            close: true,
             name: 'info',
             name: 'info',
-            level: 'error',
-            filename: 'logs/info.log',
-            maxFiles: 7
+            level: 'info',
+            filename: '/Data/logs/yoho-shop-manage/info.log',
+            maxFiles: 7,
+            timestamp() {
+                return new Date().toString();
+            }
         },
         },
         errorFile: {
         errorFile: {
             name: 'error',
             name: 'error',
             level: 'error',
             level: 'error',
-            filename: 'logs/error.log',
+            filename: '/Data/logs/yoho-shop-manage/error.log',
             handleExceptions: true,
             handleExceptions: true,
-            maxFiles: 7
+            maxFiles: 7,
+            timestamp() {
+                return new Date().toString();
+            }
         },
         },
         console: {
         console: {
+            close: true,
             level: 'info',
             level: 'info',
             colorize: 'all',
             colorize: 'all',
             prettyPrint: true
             prettyPrint: true