配置不同环境的 跨域设置
This commit is contained in:
parent
22a15fa743
commit
4306e03fe6
|
|
@ -17,6 +17,24 @@
|
||||||
],
|
],
|
||||||
"IgnoreList": [],
|
"IgnoreList": [],
|
||||||
"WindowsBackUpIgnoreList": []
|
"WindowsBackUpIgnoreList": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Name": "marking001",
|
||||||
|
"ServerList": [],
|
||||||
|
"LinuxServerList": [
|
||||||
|
{
|
||||||
|
"UserName": "marking",
|
||||||
|
"Pwd": "0610DBF49053E6779393A74BE1ED4FD2",
|
||||||
|
"Host": "47.109.67.254:10022",
|
||||||
|
"NickName": "marking001",
|
||||||
|
"IIsFireUrl": null,
|
||||||
|
"DockerFireUrl": "",
|
||||||
|
"WindowsServiceFireUrl": null,
|
||||||
|
"LinuxServiceFireUrl": null
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"IgnoreList": [],
|
||||||
|
"WindowsBackUpIgnoreList": []
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"IIsConfig": {
|
"IIsConfig": {
|
||||||
|
|
@ -32,6 +50,15 @@
|
||||||
"DockerEnvName": null,
|
"DockerEnvName": null,
|
||||||
"DockerVolume": null,
|
"DockerVolume": null,
|
||||||
"DockerOther": null
|
"DockerOther": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"EnvName": "marking001",
|
||||||
|
"ConfigName": "",
|
||||||
|
"LinuxEnvParam": null,
|
||||||
|
"DockerPort": null,
|
||||||
|
"DockerEnvName": null,
|
||||||
|
"DockerVolume": null,
|
||||||
|
"DockerOther": null
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
@ -48,6 +75,15 @@
|
||||||
"DockerEnvName": null,
|
"DockerEnvName": null,
|
||||||
"DockerVolume": null,
|
"DockerVolume": null,
|
||||||
"DockerOther": null
|
"DockerOther": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"EnvName": "marking001",
|
||||||
|
"ConfigName": "",
|
||||||
|
"LinuxEnvParam": null,
|
||||||
|
"DockerPort": null,
|
||||||
|
"DockerEnvName": null,
|
||||||
|
"DockerVolume": null,
|
||||||
|
"DockerOther": null
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
@ -64,17 +100,26 @@
|
||||||
"DockerEnvName": null,
|
"DockerEnvName": null,
|
||||||
"DockerVolume": null,
|
"DockerVolume": null,
|
||||||
"DockerOther": null
|
"DockerOther": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"EnvName": "marking001",
|
||||||
|
"ConfigName": "",
|
||||||
|
"LinuxEnvParam": null,
|
||||||
|
"DockerPort": null,
|
||||||
|
"DockerEnvName": null,
|
||||||
|
"DockerVolume": null,
|
||||||
|
"DockerOther": null
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"DockerConfig": {
|
"DockerConfig": {
|
||||||
"Prot": "5192:5192",
|
"Prot": "5192:5192",
|
||||||
"AspNetCoreEnv": "",
|
"AspNetCoreEnv": "",
|
||||||
"LastEnvName": "29dev",
|
"LastEnvName": "marking001",
|
||||||
"RemoveDaysFromPublished": "10",
|
"RemoveDaysFromPublished": "10",
|
||||||
"WorkDir": "",
|
"WorkDir": "",
|
||||||
"Volume": "",
|
"Volume": "",
|
||||||
"Other": "--name wgshare-api -e ASPNETCORE_ENVIRONMENT=Development -e TZ=Asia/Shanghai",
|
"Other": "--name wgshare-api -e ASPNETCORE_ENVIRONMENT=Production -e TZ=Asia/Shanghai",
|
||||||
"EnvPairList": [
|
"EnvPairList": [
|
||||||
{
|
{
|
||||||
"EnvName": "29dev",
|
"EnvName": "29dev",
|
||||||
|
|
@ -84,6 +129,15 @@
|
||||||
"DockerEnvName": "",
|
"DockerEnvName": "",
|
||||||
"DockerVolume": "",
|
"DockerVolume": "",
|
||||||
"DockerOther": "--name wgshare-api -e ASPNETCORE_ENVIRONMENT=Development -e TZ=Asia/Shanghai"
|
"DockerOther": "--name wgshare-api -e ASPNETCORE_ENVIRONMENT=Development -e TZ=Asia/Shanghai"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"EnvName": "marking001",
|
||||||
|
"ConfigName": null,
|
||||||
|
"LinuxEnvParam": null,
|
||||||
|
"DockerPort": "5192:5192",
|
||||||
|
"DockerEnvName": "",
|
||||||
|
"DockerVolume": "",
|
||||||
|
"DockerOther": "--name wgshare-api -e ASPNETCORE_ENVIRONMENT=Production -e TZ=Asia/Shanghai"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,16 @@ namespace WGShare.API
|
||||||
|
|
||||||
|
|
||||||
app.MapControllers();
|
app.MapControllers();
|
||||||
app.MapHub<SessionManageHub>("/session-manage").RequireCors(q => q.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod());
|
|
||||||
|
if (app.Environment.IsDevelopment())
|
||||||
|
{
|
||||||
|
|
||||||
|
app.MapHub<SessionManageHub>("/session-manage").RequireCors(q => q.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
app.MapHub<SessionManageHub>("/session-manage");
|
||||||
|
}
|
||||||
|
|
||||||
app.Run();
|
app.Run();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,11 +14,11 @@
|
||||||
"Expires": 86400
|
"Expires": 86400
|
||||||
},
|
},
|
||||||
"ConnectionStrings": {
|
"ConnectionStrings": {
|
||||||
"metting": "Database=metting;Server=192.168.2.9;Port=3306;Uid=root;Pwd=qwe123!@#;AllowZeroDateTime=True;ConvertZeroDateTime=True;",
|
"metting": "Database=metting;Server=rds-proxy-internal.rwlb.cn-chengdu.rds.aliyuncs.com;Port=3306;Uid=marking;Pwd=poiuytPOIUYT098765)(*&^%;AllowZeroDateTime=True;ConvertZeroDateTime=True;",
|
||||||
"usercenter": "Database=usercenter;Server=192.168.2.9;Port=3306;Uid=root;Pwd=qwe123!@#;AllowZeroDateTime=True;ConvertZeroDateTime=True;"
|
"usercenter": "Database=usercenter;Server=rds-proxy-internal.rwlb.cn-chengdu.rds.aliyuncs.com;Port=3306;Uid=marking;Pwd=poiuytPOIUYT098765)(*&^%;AllowZeroDateTime=True;ConvertZeroDateTime=True;"
|
||||||
},
|
},
|
||||||
"Redis": {
|
"Redis": {
|
||||||
"master": "172.29.33.83:16379,password=poiuyt)(*&^%,defaultDatabase=13,prefix=wgshare:"
|
"master": "172.29.33.83:16379,password=poiuyt)(*&^%,defaultDatabase=6,prefix=wgshare:"
|
||||||
},
|
},
|
||||||
"Agora": {
|
"Agora": {
|
||||||
"appId": "dcfc466a6ecb4a1f972630065dfb1e75",
|
"appId": "dcfc466a6ecb4a1f972630065dfb1e75",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue