diff --git a/WGShare.API/AntDeploy.json b/WGShare.API/AntDeploy.json index a88555b..83bbf8a 100644 --- a/WGShare.API/AntDeploy.json +++ b/WGShare.API/AntDeploy.json @@ -17,6 +17,24 @@ ], "IgnoreList": [], "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": { @@ -32,6 +50,15 @@ "DockerEnvName": null, "DockerVolume": null, "DockerOther": null + }, + { + "EnvName": "marking001", + "ConfigName": "", + "LinuxEnvParam": null, + "DockerPort": null, + "DockerEnvName": null, + "DockerVolume": null, + "DockerOther": null } ] }, @@ -48,6 +75,15 @@ "DockerEnvName": null, "DockerVolume": null, "DockerOther": null + }, + { + "EnvName": "marking001", + "ConfigName": "", + "LinuxEnvParam": null, + "DockerPort": null, + "DockerEnvName": null, + "DockerVolume": null, + "DockerOther": null } ] }, @@ -64,17 +100,26 @@ "DockerEnvName": null, "DockerVolume": null, "DockerOther": null + }, + { + "EnvName": "marking001", + "ConfigName": "", + "LinuxEnvParam": null, + "DockerPort": null, + "DockerEnvName": null, + "DockerVolume": null, + "DockerOther": null } ] }, "DockerConfig": { "Prot": "5192:5192", "AspNetCoreEnv": "", - "LastEnvName": "29dev", + "LastEnvName": "marking001", "RemoveDaysFromPublished": "10", "WorkDir": "", "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": [ { "EnvName": "29dev", @@ -84,6 +129,15 @@ "DockerEnvName": "", "DockerVolume": "", "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" } ] }, diff --git a/WGShare.API/Program.cs b/WGShare.API/Program.cs index c7507ab..2f3088d 100644 --- a/WGShare.API/Program.cs +++ b/WGShare.API/Program.cs @@ -110,7 +110,16 @@ namespace WGShare.API app.MapControllers(); - app.MapHub("/session-manage").RequireCors(q => q.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod()); + + if (app.Environment.IsDevelopment()) + { + + app.MapHub("/session-manage").RequireCors(q => q.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod()); + } + else + { + app.MapHub("/session-manage"); + } app.Run(); } diff --git a/WGShare.API/appsettings.json b/WGShare.API/appsettings.json index cc130ac..e4d688f 100644 --- a/WGShare.API/appsettings.json +++ b/WGShare.API/appsettings.json @@ -14,11 +14,11 @@ "Expires": 86400 }, "ConnectionStrings": { - "metting": "Database=metting;Server=192.168.2.9;Port=3306;Uid=root;Pwd=qwe123!@#;AllowZeroDateTime=True;ConvertZeroDateTime=True;", - "usercenter": "Database=usercenter;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=rds-proxy-internal.rwlb.cn-chengdu.rds.aliyuncs.com;Port=3306;Uid=marking;Pwd=poiuytPOIUYT098765)(*&^%;AllowZeroDateTime=True;ConvertZeroDateTime=True;" }, "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": { "appId": "dcfc466a6ecb4a1f972630065dfb1e75",