--no commit message

xiaomiao
Showing 1 changed file with 2 additions and 33 deletions
public/index.html
--- a/public/index.html
View file @ac59973
+++ b/public/index.html
View file @ac59973
 <!--
- * @Description: 
+ * @Description:
 * @Autor: renchao
-<<<<<<< HEAD
- * @LastEditTime: 2023-05-31 16:04:35
-=======
-<<<<<<< HEAD
 * @LastEditTime: 2023-05-30 15:08:51
-=======
- * @LastEditTime: 2023-05-26 16:57:47
->>>>>>> origin/dev
->>>>>>> bus
 -->
 <!DOCTYPE html>
 <html>
@@ -26,31 +18,8 @@
  </title>
 </head>
 <script>
-<<<<<<< HEAD
-  window.baseUrl = location.origin || location.protocol + '//' + location.host
-=======
-<<<<<<< HEAD
  window.baseUrl = location.origin || location.protocol + '//' + location.host
  const authorization = "bearer ATT-7-TiYJVcoDnfhNGs160E6MbQ-QA9Ot3Tby"
-=======
->>>>>>> bus
-  window._config = {
-    // 是否微服务模式，业务系统根据需要读取
-    cloudEnable: false,
-    // 是否启用单点登录
-    casEnable: true,
-    // cas 基地址
-    casBaseURL: 'http://192.168.2.38/cas',
-    services: {
-      // 配置到 contextPath 前一级
-      management: 'http://192.168.2.38',
-      business: 'http://localhost:7001'
-    }
-  }
-<<<<<<< HEAD
-=======
->>>>>>> origin/dev
->>>>>>> bus
  fetch('<%= BASE_URL %>config.json')
    .then(response => response.json())
    .then(config => {
@@ -62,4 +31,4 @@
  <div id="app"></div>
 </body>

-</html>
\ No newline at end of file
+</html>