Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pcfront

.env.production

@@ -2,6 +2,6 @@
 ENV = 'production'
 NODE_ENV = 'production'
 # base api
-VUE_APP_BASE_API = 'http://api.zthymaoyi.com'
+VUE_APP_BASE_API = 'http://api1.eliangeyun.com'
 # VUE_APP_BASE_API = 'http://106.15.236.176/ob/'
 VUE_APP_CONTEXT = /

jest.config.js

@@ -23,5 +23,5 @@ module.exports = {
     'lcov',
     'text-summary'
   ],
-  testURL: 'http://api.zthymaoyi.com/'
+  testURL: 'http://api.eliangeyun.com/'
 }

nginx.conf.default

@@ -1,6 +1,6 @@
 server {
     listen       80;
-    server_name  api.zthymaoyi.com;
+    server_name  api.eliangeyun.com;
 
     charset     utf-8;
     access_log  /var/log/nginx/log/host.access.log  main;