From b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:55:21 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
index c7c9be5..6da8e9d 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
@@ -1,9 +1,11 @@
-// var my_api_server_url = 'http://zuul.kidgrow.com/';
- // var my_api_server_url = 'http://192.168.2.240:8888/';
-var my_api_server_url = 'http://127.0.0.1:8888/';
+ var my_api_server_url = 'http://127.0.0.1:8888/';
// var my_api_server_url = 'http://192.168.2.240:8888/';
-// var my_api_server_url = 'http://open.zuul.kidgrow.cloud/';
-// var my_api_server_url = 'http://uat.zuul.kidgrow.cloud/';
-// var my_api_server_url = 'https://zuul.kidgrow.cloud/';
-//var my_api_server_url = 'http://123.57.164.62:8888/';
+//var my_api_server_url = 'http://open.zuul.kidgrow.cloud/';
+ // var my_api_server_url = 'zuul.kidgrow.cloud/';
+//var my_api_server_url = 'https://zuul.kidgrow.cloud/';
+
+if(my_api_server_url.indexOf("http")<0)
+{
+ my_api_server_url=((nowUrl=window.location.href.indexOf("ttps://")>0))?"https://"+my_api_server_url:"http://"+my_api_server_url;
+}
--
Gitblit v1.8.0