Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-shops-fe into develop

@@ -19,7 +19,7 @@
      * 因此，UEditor提供了针对不同页面的编辑器可单独配置的根路径，具体来说，在需要实例化编辑器的页面最顶部写上如下代码即可。当然，需要令此处的URL等于对应的配置。
      * window.UMEDITOR_HOME_URL = "/xxxx/xxxx/";
      */
-    window.UMEDITOR_HOME_URL="http://localhost:30012/";
+    window.UMEDITOR_HOME_URL="http://localhost:30016/";
     var URL = window.UMEDITOR_HOME_URL || (function(){
 
         function PathStack() {

@@ -28,10 +28,10 @@ var options = {
     interfaceDefConfig: {
         isJsonRaw: true //设置默认json字符串POST调用
     },
-    loggers: config.loggers,
-    seStore: config.redis,
-    port: 30011,
-    beforeMid: function(app, mids) { //使用handlebars-layouts
+    loggers:config.loggers,               
+    seStore:config.redis,
+    port:config.port,
+    beforeMid:function(app,mids) {//使用handlebars-layouts
         require('handlebars-layouts').register(mids.hbs.handlebars);
         app.use(multipart());
     },
@@ -56,4 +56,4 @@ if (config.logsFile) {
 
 var app = yo(options);
 
-require('./stub/routers')(app); //添加桩服务
\ No newline at end of file
+require('./stub/routers')(app); //添加桩服务

@@ -12,7 +12,7 @@ var config = {
     'development': {
         redis: null,
         apiKey: 'sd4H1ecAqlp',
-
+        port:30016,
         domain: 'http://192.168.102.202:8088/platform',
         loggers: {
             api: {
@@ -32,6 +32,7 @@ var config = {
             host: 'localhost'
         },
         apiKey: 'sd4H1ecAqlp',
+        port:30016,
         domain: 'http://192.168.102.202:8088/platform',
         logsFile: '/Data/logs/node/yohobuy-portal-log/',
         loggers: {
@@ -52,6 +53,7 @@ var config = {
             host: '192.168.74.17'
         },
         apiKey: 'sd4H1ecAqlp',
+        port:30016,
         domain: 'http://192.168.102.202:8081/platform',
         logsFile: '/Data/logs/node/yohobuy-portal-log/',
         loggers: {
@@ -72,6 +74,7 @@ var config = {
             host: 'localhost'
         },
         apiKey: 'sd4H1ecAqlp',
+        port:30016,
         domain: 'http://192.168.81.6:8189/yoho-admin-portal',
         logsFile: '/Data/logs/node/yohobuy-portal-log/',
         loggers: {

@@ -2,10 +2,13 @@
  * 路由接口映射
  * @author h1bomb
  */
-var connfig = require("../staticConfig.js");
+
 var env = process.env.NODE_ENV || 'development';
+var config = require('../config/common');
+
 //接口主域
-exports.domain = 'http://localhost:30011';
+exports.domain = 'http://localhost:'+config.port;
+
 //路由配置
 exports.res =
     [{
@@ -40,4 +43,4 @@ exports.res =
         route: '/',
         method: 'GET',
         view: 'pages/index'
-    }];
\ No newline at end of file
+    }];

@@ -45,7 +45,8 @@ module.exports = function(proxyRoute) {
       }
       //删除提交内容长度，代理会改变长度
       delete options.headers['content-length'];
-
+      //移除GZIP的头部
+      delete options.headers["accept-encoding"];
       //设置代理host
       options.headers['host'] = config.url.replace('http://','');
       if(!req.session.gray) {

 var oldSerDomain = 'http://service.api.yohobuy.com';
+var domain = require('../../config/common').domain;
 module.exports = {
     login: oldSerDomain + '/account/api/v1/profile/login',
     getResourceByPid: oldSerDomain + '/account/api/v1/profile/getResourceByPid',
     getAllResByWebsite: oldSerDomain + '/account/api/v1/resources/getAllResByWebsite',
-    getShopList: 'http://172.16.6.236:8080/platform/ShopsRest/queryShopsByAdminPid',
+    getShopList: domain+'/ShopsRest/queryShopsByAdminPid',
     changeShops:'http://shops.yohobuy.com/index/ajaxshop'
 };
\ No newline at end of file