From 8b7c75249a83b45dd53cc2177bb61bfa3d7e55cb Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 02 Mar 2021 18:30:01 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 29ebdc5..c15d5b8 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,5 +1,11 @@
-// var my_api_server_url = 'http://zuul.kidgrow.com/';
+// 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://127.0.0.1:8888/';
-var my_api_server_url = 'http://uat-zuul.kidgrow.cloud/';
+// var my_api_server_url = 'http://open.zuul.kidgrow.cloud/';
+// var my_api_server_url = 'https://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