From 5cd45b8d065cfa8c511b3d4b5afffd4e20bec90f Mon Sep 17 00:00:00 2001 From: cjy Date: Fri, 26 Jul 2024 20:43:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.Module.SqlSugar/sqlsugarappsettings.json | 2 +- ds-wms-service/DS.WMS.AdminApi/appsettings.json | 6 +++--- ds-wms-service/DS.WMS.CheckApi/appsettings.json | 6 +++--- .../appsettings.json | 10 +++++----- .../DS.WMS.Core/Op/Dtos/BillTraceReq.cs | 2 ++ .../DS.WMS.Core/Op/Method/DataCallBackService.cs | 16 ++++++++++++++-- .../Op/Method/SeaExportTraceService.cs | 3 ++- ds-wms-service/DS.WMS.FeeApi/appsettings.json | 10 +++++----- .../DS.WMS.FinanceApi/appsettings.json | 10 +++++----- .../DS.WMS.MainApi/appsettings.Development.json | 4 ++-- .../DS.WMS.MainApi/appsettings.Production.json | 4 ++-- ds-wms-service/DS.WMS.MainApi/appsettings.json | 8 ++++---- ds-wms-service/DS.WMS.OpApi/appsettings.json | 12 ++++++------ ds-wms-service/DS.WMS.PrintApi/appsettings.json | 2 +- ds-wms-service/DS.WMS.TaskApi/appsettings.json | 6 +++--- ds-wms-service/DS.WMS.Test/appsettings.json | 8 ++++---- 16 files changed, 62 insertions(+), 47 deletions(-) diff --git a/ds-wms-service/DS.Module.SqlSugar/sqlsugarappsettings.json b/ds-wms-service/DS.Module.SqlSugar/sqlsugarappsettings.json index a1b5d82b..50c43bb2 100644 --- a/ds-wms-service/DS.Module.SqlSugar/sqlsugarappsettings.json +++ b/ds-wms-service/DS.Module.SqlSugar/sqlsugarappsettings.json @@ -2,7 +2,7 @@ "DBInfo": { "DefaultDbConnId": "1288018625843826688", "DefaultDbType": 0, - "DefaultDbString": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_dev", + "DefaultDbString": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_dev", "DBS": [ { "ConnId": "1595354960864874496", diff --git a/ds-wms-service/DS.WMS.AdminApi/appsettings.json b/ds-wms-service/DS.WMS.AdminApi/appsettings.json index 724fc571..e688ec84 100644 --- a/ds-wms-service/DS.WMS.AdminApi/appsettings.json +++ b/ds-wms-service/DS.WMS.AdminApi/appsettings.json @@ -14,19 +14,19 @@ }, "Cors": { "PolicyName": "WMSCore.API", - "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://60.209.125.238:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" + "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" }, "DBInfo": { "DefaultDbConnId": "1288018625843826688", "DefaultDbType": 0, - "DefaultDbString": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_dev", + "DefaultDbString": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_dev", "DBS": [ { "ConnId": "1288018625843826680", "DBType": 0, "Enabled": false, "HitRate": 40, - "Connection": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_log" + "Connection": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_log" } ] }, diff --git a/ds-wms-service/DS.WMS.CheckApi/appsettings.json b/ds-wms-service/DS.WMS.CheckApi/appsettings.json index 99d2d15f..45314178 100644 --- a/ds-wms-service/DS.WMS.CheckApi/appsettings.json +++ b/ds-wms-service/DS.WMS.CheckApi/appsettings.json @@ -14,19 +14,19 @@ }, "Cors": { "PolicyName": "WMSCore.API", - "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://60.209.125.238:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" + "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" }, "DBInfo": { "DefaultDbConnId": "1288018625843826688", "DefaultDbType": 0, - "DefaultDbString": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_dev", + "DefaultDbString": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_dev", "DBS": [ { "ConnId": "1288018625843826680", "DBType": 0, "Enabled": false, "HitRate": 40, - "Connection": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_log" + "Connection": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_log" } ] }, diff --git a/ds-wms-service/DS.WMS.ContainerManagementApi/appsettings.json b/ds-wms-service/DS.WMS.ContainerManagementApi/appsettings.json index a97587c4..dfa98871 100644 --- a/ds-wms-service/DS.WMS.ContainerManagementApi/appsettings.json +++ b/ds-wms-service/DS.WMS.ContainerManagementApi/appsettings.json @@ -14,19 +14,19 @@ }, "Cors": { "PolicyName": "WMSCore.API", - "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://60.209.125.238:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" + "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" }, "DBInfo": { "DefaultDbConnId": "1288018625843826688", "DefaultDbType": 0, - "DefaultDbString": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_dev", + "DefaultDbString": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_dev", "DBS": [ { "ConnId": "1288018625843826680", "DBType": 0, "Enabled": false, "HitRate": 40, - "Connection": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_log" + "Connection": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_log" } ] }, @@ -60,7 +60,7 @@ "RemainHours": 2 }, "PrintService": { - "IP": "60.209.125.238", + "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com", "Port": "3009", "AccessKey": "1777229107311022080", "AccessSecret": "d816e6fe938f24e2f205db129d31286a", @@ -69,7 +69,7 @@ "GetJsonPrintInfoUrl": "/printApi/OpenPrint/GetOpenJsonPrintInfo" }, "DjyService": { - "IP": "60.209.125.238", + "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com", "Port": "35100", "AccessKey": "6b050e757c1e405489e19602dd81ebbe", "AccessSecret": "51d564741c761e0760f62d904f13c193009e74d0af9f72e2dc67f9320b8ae42580e2339745aee1bf", diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/BillTraceReq.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/BillTraceReq.cs index 79c1c356..1d9bc454 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/BillTraceReq.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/BillTraceReq.cs @@ -129,6 +129,8 @@ namespace DS.WMS.Core.Op.Dtos public string PWD { get; set; } public string Gid { get; set; } + public string PushBackKey { get; set; } + public string PushBackSecret { get; set; } public List Children { get; set; } } public class BillTraceUnsubscribeList diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/DataCallBackService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/DataCallBackService.cs index 1febead0..c0b680d1 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/DataCallBackService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/DataCallBackService.cs @@ -15,6 +15,7 @@ using Logger = NLog.Logger; using Mapster; using Microsoft.AspNetCore.Identity; using DS.Module.Core.Constants; +using Microsoft.AspNetCore.Http; namespace DS.WMS.Core.Op.Method { @@ -26,6 +27,7 @@ namespace DS.WMS.Core.Op.Method private readonly ISaasDbService saasService; private readonly ICommonService commonService; private readonly ISeaExportCommonService seaComService; + private readonly IHttpContextAccessor accessor; private static readonly Logger _logger = LogManager.GetCurrentClassLogger(); /// /// @@ -39,6 +41,7 @@ namespace DS.WMS.Core.Op.Method saasService = _serviceProvider.GetRequiredService(); commonService = _serviceProvider.GetRequiredService(); seaComService = _serviceProvider.GetRequiredService(); + accessor = _serviceProvider.GetRequiredService(); } /// /// 插入货运动态 @@ -74,8 +77,10 @@ namespace DS.WMS.Core.Op.Method continue; } } - var tenantDb = saasService.GetBizDbScopeById(user.TenantId); + var tenantId= accessor.HttpContext.Request.Headers["PushBackKey"].FirstOrDefault(); + var tenantDb = saasService.GetBizDbScopeById(tenantId); var businessId = item.BookingId; + //TODO var list = await tenantDb.Queryable().Filter(null, true) .InnerJoin((d, t) => d.StatusCode == t.Value && d.StatusGroup == "booking_status_group_billtrace" && d.BusinessId == businessId).Select((d, t) => new { @@ -86,6 +91,13 @@ namespace DS.WMS.Core.Op.Method Name = t.Name, Value = t.Value }).ToListAsync(); + // var list = await tenantDb.Queryable().Filter(null, true).Where(x=>x.StatusGroup == "booking_status_group_billtrace" && x.BusinessId == businessId).Select(d=> new + //{ + // BusinessId = d.BusinessId, + // StatusCode = d.StatusCode, + // StatusName = d.StatusName, + // StatusTime = d.StatusTime + //}).ToListAsync(); var oldLog = await tenantDb.Queryable().Where(x => x.BusinessId == businessId && x.Group == "yunzong").FirstAsync(); //删除日志详情和日志 @@ -323,7 +335,7 @@ namespace DS.WMS.Core.Op.Method #region 船舶动态：ATD ETD ATA ETA MDGETA MDGATA if (item.Status == "ATD" || item.Status == "ETD" || item.Status == "ATA" || item.Status == "ETA" || item.Status == "MDGETA" || item.Status == "MDGATA") { - var config = await tenantDb.Queryable().FirstAsync(x => x.Code == TenantParamCode.ENABLE_STATUS_TO_SAILING_DATE); + var config = await db.Queryable().FirstAsync(x => x.Code == TenantParamCode.ENABLE_STATUS_TO_SAILING_DATE); if (config.IsNotNull() && config.Value == "YES") { diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportTraceService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportTraceService.cs index 28c4da97..ab9d09db 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportTraceService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportTraceService.cs @@ -162,7 +162,8 @@ namespace DS.WMS.Core.Op.Method Children = new List(), Key = userKey, PWD = userPwd, - Gid = userId + Gid = userId, + PushBackKey= user.TenantId.ToString(), }; foreach (var item in req) { diff --git a/ds-wms-service/DS.WMS.FeeApi/appsettings.json b/ds-wms-service/DS.WMS.FeeApi/appsettings.json index c2487771..c7157ba1 100644 --- a/ds-wms-service/DS.WMS.FeeApi/appsettings.json +++ b/ds-wms-service/DS.WMS.FeeApi/appsettings.json @@ -14,19 +14,19 @@ }, "Cors": { "PolicyName": "WMSCore.API", - "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://60.209.125.238:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" + "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" }, "DBInfo": { "DefaultDbConnId": "1288018625843826688", "DefaultDbType": 0, - "DefaultDbString": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_dev", + "DefaultDbString": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_dev", "DBS": [ { "ConnId": "1288018625843826680", "DBType": 0, "Enabled": false, "HitRate": 40, - "Connection": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_log" + "Connection": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_log" } ] }, @@ -50,7 +50,7 @@ "FileType": [ ".xls", ".xlsx", ".pdf", ".txt", ".pms" ] }, "PrintService": { - "IP": "60.209.125.238", + "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com", "Port": "3009", "AccessKey": "1777229107311022080", "AccessSecret": "d816e6fe938f24e2f205db129d31286a", @@ -61,6 +61,6 @@ "InvoiceApi": { "UserKey": "", "UserSecret": "", - "BaseUrl": "http://60.209.125.238:26650" + "BaseUrl": "http://rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com:26650" } } diff --git a/ds-wms-service/DS.WMS.FinanceApi/appsettings.json b/ds-wms-service/DS.WMS.FinanceApi/appsettings.json index f24a2e84..6d2c4703 100644 --- a/ds-wms-service/DS.WMS.FinanceApi/appsettings.json +++ b/ds-wms-service/DS.WMS.FinanceApi/appsettings.json @@ -14,19 +14,19 @@ }, "Cors": { "PolicyName": "WMSCore.API", - "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://60.209.125.238:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" + "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" }, "DBInfo": { "DefaultDbConnId": "1288018625843826688", "DefaultDbType": 0, - "DefaultDbString": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_dev", + "DefaultDbString": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_dev", "DBS": [ { "ConnId": "1288018625843826680", "DBType": 0, "Enabled": false, "HitRate": 40, - "Connection": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_log" + "Connection": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_log" } ] }, @@ -60,7 +60,7 @@ "RemainHours": 2 }, "PrintService": { - "IP": "60.209.125.238", + "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com", "Port": "3009", "AccessKey": "1777229107311022080", "AccessSecret": "d816e6fe938f24e2f205db129d31286a", @@ -69,7 +69,7 @@ "GetJsonPrintInfoUrl": "/printApi/OpenPrint/GetOpenJsonPrintInfo" }, "DjyService": { - "IP": "60.209.125.238", + "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com", "Port": "35100", "AccessKey": "6b050e757c1e405489e19602dd81ebbe", "AccessSecret": "51d564741c761e0760f62d904f13c193009e74d0af9f72e2dc67f9320b8ae42580e2339745aee1bf", diff --git a/ds-wms-service/DS.WMS.MainApi/appsettings.Development.json b/ds-wms-service/DS.WMS.MainApi/appsettings.Development.json index 15fc6265..3661b1fe 100644 --- a/ds-wms-service/DS.WMS.MainApi/appsettings.Development.json +++ b/ds-wms-service/DS.WMS.MainApi/appsettings.Development.json @@ -13,12 +13,12 @@ }, "Cors": { "PolicyName": "WMSCore.API", - "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://60.209.125.238:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" + "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" }, "DBInfo": { "DefaultDbConnId": "1288018625843826688", "DefaultDbType": 0, - "DefaultDbString": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_dev", + "DefaultDbString": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_dev", "DBS": [ { "ConnId": "1595354960864874496", diff --git a/ds-wms-service/DS.WMS.MainApi/appsettings.Production.json b/ds-wms-service/DS.WMS.MainApi/appsettings.Production.json index 15fc6265..3661b1fe 100644 --- a/ds-wms-service/DS.WMS.MainApi/appsettings.Production.json +++ b/ds-wms-service/DS.WMS.MainApi/appsettings.Production.json @@ -13,12 +13,12 @@ }, "Cors": { "PolicyName": "WMSCore.API", - "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://60.209.125.238:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" + "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" }, "DBInfo": { "DefaultDbConnId": "1288018625843826688", "DefaultDbType": 0, - "DefaultDbString": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_dev", + "DefaultDbString": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_dev", "DBS": [ { "ConnId": "1595354960864874496", diff --git a/ds-wms-service/DS.WMS.MainApi/appsettings.json b/ds-wms-service/DS.WMS.MainApi/appsettings.json index 7473101b..5625b92d 100644 --- a/ds-wms-service/DS.WMS.MainApi/appsettings.json +++ b/ds-wms-service/DS.WMS.MainApi/appsettings.json @@ -14,19 +14,19 @@ }, "Cors": { "PolicyName": "WMSCore.API", - "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://60.209.125.238:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" + "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" }, "DBInfo": { "DefaultDbConnId": "1288018625843826688", "DefaultDbType": 0, - "DefaultDbString": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_dev", + "DefaultDbString": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_dev", "DBS": [ { "ConnId": "1288018625843826680", "DBType": 0, "Enabled": false, "HitRate": 40, - "Connection": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_log" + "Connection": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_log" } ] }, @@ -50,7 +50,7 @@ "FileType": [ ".xls", ".xlsx", ".pdf", ".jpg", ".png", ".txt", ".pms" ] }, "PrintService": { - "IP": "60.209.125.238", + "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com", //"IP": "localhost", "Port": "3009", "AccessKey": "1777229107311022080", diff --git a/ds-wms-service/DS.WMS.OpApi/appsettings.json b/ds-wms-service/DS.WMS.OpApi/appsettings.json index 2658a32b..c16b5d2e 100644 --- a/ds-wms-service/DS.WMS.OpApi/appsettings.json +++ b/ds-wms-service/DS.WMS.OpApi/appsettings.json @@ -14,19 +14,19 @@ }, "Cors": { "PolicyName": "WMSCore.API", - "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://60.209.125.238:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" + "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" }, "DBInfo": { "DefaultDbConnId": "1288018625843826688", "DefaultDbType": 0, - "DefaultDbString": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_dev", + "DefaultDbString": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_dev", "DBS": [ { "ConnId": "1288018625843826680", "DBType": 0, "Enabled": false, "HitRate": 40, - "Connection": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_log" + "Connection": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_log" } ] }, @@ -60,7 +60,7 @@ "RemainHours": 2 }, "PrintService": { - "IP": "60.209.125.238", + "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com", "Port": "3009", "AccessKey": "1777229107311022080", "AccessSecret": "d816e6fe938f24e2f205db129d31286a", @@ -70,7 +70,7 @@ "LocalPrintUrl": "http://localhost:2999/printApi/OpenPrint/GetOpenJsonPrintInfoAsync" }, "DjyService": { - "IP": "60.209.125.238", + "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com", "Port": "35100", "AccessKey": "6b050e757c1e405489e19602dd81ebbe", "AccessSecret": "51d564741c761e0760f62d904f13c193009e74d0af9f72e2dc67f9320b8ae42580e2339745aee1bf", @@ -94,7 +94,7 @@ "Environment": "TEST" }, "RedisInfo": { - "RedisConfig": "60.209.125.238:36379,password=,defaultDatabase=15" + "RedisConfig": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com:36379,password=,defaultDatabase=15" }, "BCCompare": { "Url": "http://localhost:5110/api/TaskBookingAmendmentParser/ExcuteBookingAmendmentCompare" diff --git a/ds-wms-service/DS.WMS.PrintApi/appsettings.json b/ds-wms-service/DS.WMS.PrintApi/appsettings.json index 36579917..b2749571 100644 --- a/ds-wms-service/DS.WMS.PrintApi/appsettings.json +++ b/ds-wms-service/DS.WMS.PrintApi/appsettings.json @@ -9,7 +9,7 @@ "AllowedHosts": "*", "ConnectionStrings": { "DbType": "0", // MySql = 0, SqlServer 1, - "Pro": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_dev" + "Pro": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_dev" }, "SwaggerDoc": { "ContactName": "WmsPrintAPI", diff --git a/ds-wms-service/DS.WMS.TaskApi/appsettings.json b/ds-wms-service/DS.WMS.TaskApi/appsettings.json index 83aed8c6..3196c2e6 100644 --- a/ds-wms-service/DS.WMS.TaskApi/appsettings.json +++ b/ds-wms-service/DS.WMS.TaskApi/appsettings.json @@ -14,19 +14,19 @@ }, "Cors": { "PolicyName": "WMSCore.API", - "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://60.209.125.238:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" + "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" }, "DBInfo": { "DefaultDbConnId": "1288018625843826688", "DefaultDbType": 0, - "DefaultDbString": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_dev", + "DefaultDbString": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_dev", "DBS": [ { "ConnId": "1288018625843826680", "DBType": 0, "Enabled": false, "HitRate": 40, - "Connection": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_log" + "Connection": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_log" } ] }, diff --git a/ds-wms-service/DS.WMS.Test/appsettings.json b/ds-wms-service/DS.WMS.Test/appsettings.json index 283bd822..84514d2b 100644 --- a/ds-wms-service/DS.WMS.Test/appsettings.json +++ b/ds-wms-service/DS.WMS.Test/appsettings.json @@ -14,12 +14,12 @@ }, "Cors": { "PolicyName": "WMSCore.API", - "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://60.209.125.238:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" + "Url": "http://localhost:8000,http://localhost:5999,http://localhost:8088,http://localhost:5173,http://0.0.0.0:5999,http://0.0.0.0:9995,http://localhost:9995,http://rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com:9995,http://localhost:3000,https://localhost:3100,http://47.104.255.182:3100,http://47.104.255.182:3110,https://localhost:3110,http://localhost:8080,http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084" }, "DBInfo": { "DefaultDbConnId": "1288018625843826688", "DefaultDbType": 0, - "DefaultDbString": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_dev", + "DefaultDbString": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_dev", "DBS": [ { "ConnId": "1595354960864874496", @@ -40,7 +40,7 @@ "Description": "Wms Admin API" }, "PrintService": { - "IP": "60.209.125.238", + "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com", "Port": "3009", "AccessKey": "1777229107311022080", "AccessSecret": "d816e6fe938f24e2f205db129d31286a", @@ -49,7 +49,7 @@ "GetJsonPrintInfoUrl": "/printApi/OpenPrint/GetOpenJsonPrintInfo" }, "DjyService": { - "IP": "60.209.125.238", + "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com", "Port": "35100", "AccessKey": "6b050e757c1e405489e19602dd81ebbe", "AccessSecret": "51d564741c761e0760f62d904f13c193009e74d0af9f72e2dc67f9320b8ae42580e2339745aee1bf",