diff --git a/auth/pom.xml b/auth/pom.xml index bfdb9d5..63b666e 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -15,7 +15,16 @@ + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + com.alibaba.csp + sentinel-datasource-nacos + com.alibaba.cloud @@ -31,6 +40,11 @@ + + + com.bonus + common-datasource + com.cvicse.embedded @@ -41,28 +55,21 @@ + + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config + + + + org.springframework.boot + spring-boot-starter-tomcat + + - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - + @@ -96,6 +103,9 @@ org.springframework.boot spring-boot-maven-plugin 2.6.2 + + true + diff --git a/gateway/pom.xml b/gateway/pom.xml index b62a6ba..e312843 100644 --- a/gateway/pom.xml +++ b/gateway/pom.xml @@ -39,6 +39,12 @@ org.springframework.cloud spring-cloud-starter-gateway + + + org.springframework.boot + spring-boot-starter-tomcat + + @@ -156,6 +162,9 @@ org.springframework.boot spring-boot-maven-plugin 2.6.2 + + true + diff --git a/modules/bmw/src/main/resources/static/js/publicJs.js b/modules/bmw/src/main/resources/static/js/publicJs.js index 9bcc7b5..37d0a45 100644 --- a/modules/bmw/src/main/resources/static/js/publicJs.js +++ b/modules/bmw/src/main/resources/static/js/publicJs.js @@ -1,8 +1,11 @@ -let DATA_URL="http://192.168.0.14:29110" -var ctxPath = "http://192.168.0.14:29110/bmw" +let host=window.location.host; +//数据ip地址 +let DATA_URL=window.location.protocol+"//"+host; +var ctxPath = DATA_URL+"/bmw" var currentHostname = window.location.hostname; + // //测试 // var loginPath = "http://" + currentHostname + ":9200"; // var systemPath = "http://" + currentHostname + ":1910"; @@ -12,19 +15,10 @@ var fileUrl =DATA_URL+ "/file"; var planUrl = DATA_URL+ "/ynPlan"; var oiPlanUrl = DATA_URL+ "/oiPlan"; -//112.29.103.165:1616 -//正式环境 -// var loginPath = "http://" + currentHostname + ":1616/auth"; -// var systemPath = "http://" + currentHostname + ":1616/system"; -// var filePath = "http://" + currentHostname + ":1616/file"; -// var fileUrl = "http://" + currentHostname + ":1616/file"; -// var planUrl = "http://" + currentHostname + ":1616/ynPlan"; -// var oiPlanUrl = "http://" + currentHostname + ":1616/oiPlan"; //文件预览 // let filePreviewUrl = "http://192.168.0.14:8012/onlinePreview?url="; let filePreviewUrl = "http://" + currentHostname + ":8012/onlinePreview?url="; - function getContextPath() { var pathName = document.location.pathname; var index = pathName.substr(1).indexOf("/"); diff --git a/modules/bmw/src/main/resources/static/login.html b/modules/bmw/src/main/resources/static/login.html index 211c53c..b06ce90 100644 --- a/modules/bmw/src/main/resources/static/login.html +++ b/modules/bmw/src/main/resources/static/login.html @@ -109,8 +109,6 @@ contentType : "application/json; charset=utf-8", url : DATA_URL + '/auth/login', data : JSON.stringify({ - // "username" : username, - // "password" : password, "username" : encryptCBC(username), "password" : encryptCBC(password), "jwtToken" : jwtToken