Merge branch 'xgg-saas-platform' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-saas-platform

xgg-saas-platform/app/base/system.js

@@ -197,7 +197,7 @@ class System {
         merchant: dev + ":3101" + path,
         merchant: dev + ":3101" + path,
 
 
         // 订单服务
         // 订单服务
-        order: local + ":3103" + path,
+        order: dev + ":3103" + path,
 
 
         // 发票服务
         // 发票服务
         invoice: dev + ":3105" + path,
         invoice: dev + ":3105" + path,

xgg-saas-platform/app/config/environment.js

@@ -30,6 +30,7 @@ module.exports = function (app) {
     res.header('Access-Control-Allow-Headers', 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild, xggsaasplatformsid');
     res.header('Access-Control-Allow-Headers', 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild, xggsaasplatformsid');
     res.header('Access-Control-Allow-Methods', 'PUT, POST, GET, DELETE, OPTIONS');
     res.header('Access-Control-Allow-Methods', 'PUT, POST, GET, DELETE, OPTIONS');
     // res.header('Access-Control-Allow-Credentials', 'true');
     // res.header('Access-Control-Allow-Credentials', 'true');
+    res.header('content-type', 'text/html;charset=UTF-8');
     if (req.method == 'OPTIONS') {
     if (req.method == 'OPTIONS') {
       res.send(200); //让options请求快速返回/
       res.send(200); //让options请求快速返回/
     }
     }