修改token冲突及 自动登录
This commit is contained in:
parent
d806602343
commit
b30372c4cd
|
|
@ -1,6 +1,10 @@
|
|||
server.port=11998
|
||||
server.servlet.context-path=/gzDigitalSignage
|
||||
spring.datasource.url=jdbc:mysql://192.168.0.16:4419/gz_digital_signage?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
#spring.datasource.url=jdbc:mysql://192.168.0.16:4419/gz_digital_signage?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
#spring.datasource.username=root
|
||||
#spring.datasource.password=Bonus@admin123!
|
||||
|
||||
spring.datasource.url=jdbc:mysql://192.168.0.7:13309/dzkb?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
spring.datasource.username=root
|
||||
spring.datasource.password=Bonus@admin123!
|
||||
#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/gz_digital_signage?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
|
|
@ -23,10 +27,14 @@ mybatis.type-aliases-package=com.bonus.digitalSignage.*.vo
|
|||
#spring.redis.database=6
|
||||
#spring.redis.password=Bonus@admin123!
|
||||
|
||||
spring.redis.host=127.0.0.1
|
||||
spring.redis.port=6379
|
||||
spring.redis.database=6
|
||||
#spring.redis.host=127.0.0.1
|
||||
#spring.redis.port=6379
|
||||
#spring.redis.database=6
|
||||
|
||||
spring.redis.host=192.168.0.7
|
||||
spring.redis.port=16381
|
||||
spring.redis.database=6
|
||||
spring.redis.password=Bonus@admin123!
|
||||
|
||||
# \u65E5\u5FD7
|
||||
logging.config=classpath:logback-boot.xml
|
||||
|
|
@ -79,7 +87,7 @@ csp.enable-webgl=true
|
|||
|
||||
# 跨域配置
|
||||
# 允许的源(多个用逗号分隔)
|
||||
cors.allowed-origins=http://localhost:11998,http://127.0.0.1:11998,http://192.168.0.39:11998,http://192.168.0.14:11998,http://36.33.26.201:11998
|
||||
cors.allowed-origins=http://localhost:11998,http://127.0.0.1:11998,http://192.168.0.39:11998,http://192.168.0.14:11998,http://36.33.26.201:11998,http://ggfwpt.ahbonus.cn:17789
|
||||
|
||||
# 允许的HTTP方法
|
||||
cors.allowed-methods=GET,POST,PUT,DELETE,OPTIONS
|
||||
|
|
|
|||
|
|
@ -3,26 +3,30 @@ let aqEnnable = true;//是否开启安全验证
|
|||
// console.log(ctxPath)
|
||||
var url=window.location.href;
|
||||
// console.log(url)
|
||||
let http=window.location.protocol;
|
||||
let host=window.location.host;
|
||||
let dataUrl = http+"//"+host+"/gzDigitalSignage/";
|
||||
|
||||
let test_url="http://192.168.0.14:11998/gzDigitalSignage";
|
||||
let dev_url="http://36.33.26.201:21100/gzDigitalSignage";
|
||||
let local_url="http://192.168.0.38:11998/gzDigitalSignage";
|
||||
let dataUrl = "http://112.27.246.86:21997/gzDigitalSignage"
|
||||
|
||||
if(url.indexOf("36.33.26.201")!=-1){
|
||||
dataUrl = dev_url;
|
||||
}else if(url.indexOf("127.0.0.1")!=-1 || url.indexOf("localhost")!=-1 || url.indexOf("192.168.0.38")!=-1){
|
||||
dataUrl = local_url
|
||||
}else if(url.indexOf("192.168.0.14")!=-1){
|
||||
dataUrl = test_url
|
||||
}else{
|
||||
if(url.indexOf(":8000")!=-1){
|
||||
dataUrl = "http://192.168.0.14:8000/gzDigitalSignage"
|
||||
}
|
||||
if(url.indexOf(":11997")!=-1){
|
||||
dataUrl = "http://192.168.0.14:21997/gzDigitalSignage"
|
||||
}
|
||||
}
|
||||
// let test_url="http://192.168.0.14:11998/gzDigitalSignage";
|
||||
// let dev_url="http://36.33.26.201:21100/gzDigitalSignage";
|
||||
// let local_url="http://192.168.0.38:11998/gzDigitalSignage";
|
||||
// let dataUrl = "http://112.27.246.86:21997/gzDigitalSignage"
|
||||
|
||||
// if(url.indexOf("36.33.26.201")!=-1){
|
||||
// dataUrl = dev_url;
|
||||
// }else if(url.indexOf("127.0.0.1")!=-1 || url.indexOf("localhost")!=-1 || url.indexOf("192.168.0.38")!=-1){
|
||||
// dataUrl = local_url
|
||||
// }else if(url.indexOf("192.168.0.14")!=-1){
|
||||
// dataUrl = test_url
|
||||
// }else{
|
||||
// if(url.indexOf(":8000")!=-1){
|
||||
// dataUrl = "http://192.168.0.14:8000/gzDigitalSignage"
|
||||
// }
|
||||
// if(url.indexOf(":11997")!=-1){
|
||||
// dataUrl = "http://192.168.0.14:21997/gzDigitalSignage"
|
||||
// }
|
||||
// }
|
||||
|
||||
// console.log(dataUrl)
|
||||
let imgUrl = dataUrl + '/files';
|
||||
|
|
|
|||
Loading…
Reference in New Issue