From de4f641fbfecfc0831bf9700099bb9f8f0250318 Mon Sep 17 00:00:00 2001
From: shinny-mayanqiong <mayanqiong@shinnytech.com>
Date: Wed, 25 Mar 2020 14:13:57 +0800
Subject: [PATCH] =?UTF-8?q?web:=20=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E5=90=8C=E6=97=B6=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=B5=8B=E8=AF=95=E5=92=8C=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/public/index.html | 5 +++--
 web/src/main.js       | 3 ++-
 web/vue.config.js     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/web/public/index.html b/web/public/index.html
index 1ab4b4a5..030aa20c 100644
--- a/web/public/index.html
+++ b/web/public/index.html
@@ -15,10 +15,10 @@
 <% if (NODE_ENV === 'development') {%>
 
 <script>
+  const TqsdkAddress = '127.0.0.1:53813'
   const GetTqsdkUrl = function () {
     return new Promise(function (resolve, reject) {
-      // resolve({"ins_url": "https://openmd.shinnytech.com/t/md/symbols/latest.json", "md_url": "wss://openmd.shinnytech.com/t/md/front/mobile", "ws_url": "ws://127.0.0.1:61253"})
-      fetch('http://127.0.0.1:54738/urlcors').then(function(response) {
+      fetch('http://' + TqsdkAddress + '/urlcors').then(function(response) {
         response.json().then(function(json){
           resolve(json)
         })
@@ -28,6 +28,7 @@
 </script>
 <% } else if (NODE_ENV === 'production'){%>
 <script>
+  const TqsdkAddress = location.host
   const GetTqsdkUrl = function () {
     return new Promise(function (resolve, reject) {
       fetch('/url').then(function(response) {
diff --git a/web/src/main.js b/web/src/main.js
index 7af4e7c5..acc385f0 100644
--- a/web/src/main.js
+++ b/web/src/main.js
@@ -77,13 +77,14 @@ GetTqsdkUrl().then(function(urlJson){
   })
   Vue.prototype.$tqsdk = Vue.$tqsdk
   Vue.$tqsdk.initMdWebsocket()
-  let tqWs = Vue.$tqsdk.addWebSocket('ws://' + location.host + '/ws')
+  let tqWs = Vue.$tqsdk.addWebSocket(`ws://${TqsdkAddress}/ws`)
   tqWs.on('close', function(){
     store.commit('set_py_file_status', false)
   })
   tqWs.on('open', function(){
     store.commit('set_py_file_status', true)
   })
+
   Vue.$tqsdk.on('rtn_data', function(){
     let backtest = Vue.$tqsdk.get_by_path(['_tqsdk_backtest'])
     if (backtest && backtest.current_dt) {
diff --git a/web/vue.config.js b/web/vue.config.js
index c691eb8c..3a064ef2 100644
--- a/web/vue.config.js
+++ b/web/vue.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   outputDir: '../tqsdk/web',
-  publicPath: 'web/',
+  publicPath: process.env.NODE_ENV === 'production' ? 'web/' : '/',
   lintOnSave: false,
   productionSourceMap: false,
   chainWebpack: config => {