Browse Source

Merge branch 'feature/url_window' of duanxiaoduan/tmr-admin into develop

duanxiaoduan 1 year ago
parent
commit
45ddc2cda0
1 changed files with 3 additions and 3 deletions
  1. 3 3
      src/utils/request.js

+ 3 - 3
src/utils/request.js

@@ -11,11 +11,11 @@ if (DoMainString) {
   URL = DoMainString
 }
 
-var reg = /http:\/\/.*\.[0-9]{1,4}(:[\w]+)?/g
+var reg =  /(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)/;
 var browserUrl = window.location.hostname
-
+console.log("========url===",reg.test(browserUrl))
 if (reg.test(browserUrl)){
-  URL = browserUrl + ":8082"
+  URL = window.location.protocol +"//"+ browserUrl + ":8082"
 }
 
 Cookies.set('url',URL)