修改配置

usertest
cjy 4 months ago
parent 2bdec981c6
commit 5cd45b8d06

@ -2,7 +2,7 @@
"DBInfo": { "DBInfo": {
"DefaultDbConnId": "1288018625843826688", "DefaultDbConnId": "1288018625843826688",
"DefaultDbType": 0, "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": [ "DBS": [
{ {
"ConnId": "1595354960864874496", "ConnId": "1595354960864874496",

@ -14,19 +14,19 @@
}, },
"Cors": { "Cors": {
"PolicyName": "WMSCore.API", "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": { "DBInfo": {
"DefaultDbConnId": "1288018625843826688", "DefaultDbConnId": "1288018625843826688",
"DefaultDbType": 0, "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": [ "DBS": [
{ {
"ConnId": "1288018625843826680", "ConnId": "1288018625843826680",
"DBType": 0, "DBType": 0,
"Enabled": false, "Enabled": false,
"HitRate": 40, "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"
} }
] ]
}, },

@ -14,19 +14,19 @@
}, },
"Cors": { "Cors": {
"PolicyName": "WMSCore.API", "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": { "DBInfo": {
"DefaultDbConnId": "1288018625843826688", "DefaultDbConnId": "1288018625843826688",
"DefaultDbType": 0, "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": [ "DBS": [
{ {
"ConnId": "1288018625843826680", "ConnId": "1288018625843826680",
"DBType": 0, "DBType": 0,
"Enabled": false, "Enabled": false,
"HitRate": 40, "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"
} }
] ]
}, },

@ -14,19 +14,19 @@
}, },
"Cors": { "Cors": {
"PolicyName": "WMSCore.API", "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": { "DBInfo": {
"DefaultDbConnId": "1288018625843826688", "DefaultDbConnId": "1288018625843826688",
"DefaultDbType": 0, "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": [ "DBS": [
{ {
"ConnId": "1288018625843826680", "ConnId": "1288018625843826680",
"DBType": 0, "DBType": 0,
"Enabled": false, "Enabled": false,
"HitRate": 40, "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 "RemainHours": 2
}, },
"PrintService": { "PrintService": {
"IP": "60.209.125.238", "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com",
"Port": "3009", "Port": "3009",
"AccessKey": "1777229107311022080", "AccessKey": "1777229107311022080",
"AccessSecret": "d816e6fe938f24e2f205db129d31286a", "AccessSecret": "d816e6fe938f24e2f205db129d31286a",
@ -69,7 +69,7 @@
"GetJsonPrintInfoUrl": "/printApi/OpenPrint/GetOpenJsonPrintInfo" "GetJsonPrintInfoUrl": "/printApi/OpenPrint/GetOpenJsonPrintInfo"
}, },
"DjyService": { "DjyService": {
"IP": "60.209.125.238", "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com",
"Port": "35100", "Port": "35100",
"AccessKey": "6b050e757c1e405489e19602dd81ebbe", "AccessKey": "6b050e757c1e405489e19602dd81ebbe",
"AccessSecret": "51d564741c761e0760f62d904f13c193009e74d0af9f72e2dc67f9320b8ae42580e2339745aee1bf", "AccessSecret": "51d564741c761e0760f62d904f13c193009e74d0af9f72e2dc67f9320b8ae42580e2339745aee1bf",

@ -129,6 +129,8 @@ namespace DS.WMS.Core.Op.Dtos
public string PWD { get; set; } public string PWD { get; set; }
public string Gid { get; set; } public string Gid { get; set; }
public string PushBackKey { get; set; }
public string PushBackSecret { get; set; }
public List<BillTraceUnsubscribeList> Children { get; set; } public List<BillTraceUnsubscribeList> Children { get; set; }
} }
public class BillTraceUnsubscribeList public class BillTraceUnsubscribeList

@ -15,6 +15,7 @@ using Logger = NLog.Logger;
using Mapster; using Mapster;
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
using DS.Module.Core.Constants; using DS.Module.Core.Constants;
using Microsoft.AspNetCore.Http;
namespace DS.WMS.Core.Op.Method namespace DS.WMS.Core.Op.Method
{ {
@ -26,6 +27,7 @@ namespace DS.WMS.Core.Op.Method
private readonly ISaasDbService saasService; private readonly ISaasDbService saasService;
private readonly ICommonService commonService; private readonly ICommonService commonService;
private readonly ISeaExportCommonService seaComService; private readonly ISeaExportCommonService seaComService;
private readonly IHttpContextAccessor accessor;
private static readonly Logger _logger = LogManager.GetCurrentClassLogger(); private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
/// <summary> /// <summary>
/// ///
@ -39,6 +41,7 @@ namespace DS.WMS.Core.Op.Method
saasService = _serviceProvider.GetRequiredService<ISaasDbService>(); saasService = _serviceProvider.GetRequiredService<ISaasDbService>();
commonService = _serviceProvider.GetRequiredService<ICommonService>(); commonService = _serviceProvider.GetRequiredService<ICommonService>();
seaComService = _serviceProvider.GetRequiredService<ISeaExportCommonService>(); seaComService = _serviceProvider.GetRequiredService<ISeaExportCommonService>();
accessor = _serviceProvider.GetRequiredService<IHttpContextAccessor>();
} }
/// <summary> /// <summary>
/// 插入货运动态 /// 插入货运动态
@ -74,8 +77,10 @@ namespace DS.WMS.Core.Op.Method
continue; continue;
} }
} }
var tenantDb = saasService.GetBizDbScopeById(user.TenantId); var tenantId= accessor.HttpContext.Request.Headers["PushBackKey"].FirstOrDefault();
var tenantDb = saasService.GetBizDbScopeById(tenantId);
var businessId = item.BookingId; var businessId = item.BookingId;
//TODO
var list = await tenantDb.Queryable<BookingStatus>().Filter(null, true) var list = await tenantDb.Queryable<BookingStatus>().Filter(null, true)
.InnerJoin<SysDictData>((d, t) => d.StatusCode == t.Value && d.StatusGroup == "booking_status_group_billtrace" && d.BusinessId == businessId).Select((d, t) => new .InnerJoin<SysDictData>((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, Name = t.Name,
Value = t.Value Value = t.Value
}).ToListAsync(); }).ToListAsync();
// var list = await tenantDb.Queryable<BookingStatus>().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<BookingStatusLog>().Where(x => x.BusinessId == businessId && x.Group == "yunzong").FirstAsync(); var oldLog = await tenantDb.Queryable<BookingStatusLog>().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 #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") if (item.Status == "ATD" || item.Status == "ETD" || item.Status == "ATA" || item.Status == "ETA" || item.Status == "MDGETA" || item.Status == "MDGATA")
{ {
var config = await tenantDb.Queryable<SysConfig>().FirstAsync(x => x.Code == TenantParamCode.ENABLE_STATUS_TO_SAILING_DATE); var config = await db.Queryable<SysConfig>().FirstAsync(x => x.Code == TenantParamCode.ENABLE_STATUS_TO_SAILING_DATE);
if (config.IsNotNull() && config.Value == "YES") if (config.IsNotNull() && config.Value == "YES")
{ {

@ -162,7 +162,8 @@ namespace DS.WMS.Core.Op.Method
Children = new List<BillTraceUnsubscribeList>(), Children = new List<BillTraceUnsubscribeList>(),
Key = userKey, Key = userKey,
PWD = userPwd, PWD = userPwd,
Gid = userId Gid = userId,
PushBackKey= user.TenantId.ToString(),
}; };
foreach (var item in req) foreach (var item in req)
{ {

@ -14,19 +14,19 @@
}, },
"Cors": { "Cors": {
"PolicyName": "WMSCore.API", "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": { "DBInfo": {
"DefaultDbConnId": "1288018625843826688", "DefaultDbConnId": "1288018625843826688",
"DefaultDbType": 0, "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": [ "DBS": [
{ {
"ConnId": "1288018625843826680", "ConnId": "1288018625843826680",
"DBType": 0, "DBType": 0,
"Enabled": false, "Enabled": false,
"HitRate": 40, "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" ] "FileType": [ ".xls", ".xlsx", ".pdf", ".txt", ".pms" ]
}, },
"PrintService": { "PrintService": {
"IP": "60.209.125.238", "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com",
"Port": "3009", "Port": "3009",
"AccessKey": "1777229107311022080", "AccessKey": "1777229107311022080",
"AccessSecret": "d816e6fe938f24e2f205db129d31286a", "AccessSecret": "d816e6fe938f24e2f205db129d31286a",
@ -61,6 +61,6 @@
"InvoiceApi": { "InvoiceApi": {
"UserKey": "", "UserKey": "",
"UserSecret": "", "UserSecret": "",
"BaseUrl": "http://60.209.125.238:26650" "BaseUrl": "http://rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com:26650"
} }
} }

@ -14,19 +14,19 @@
}, },
"Cors": { "Cors": {
"PolicyName": "WMSCore.API", "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": { "DBInfo": {
"DefaultDbConnId": "1288018625843826688", "DefaultDbConnId": "1288018625843826688",
"DefaultDbType": 0, "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": [ "DBS": [
{ {
"ConnId": "1288018625843826680", "ConnId": "1288018625843826680",
"DBType": 0, "DBType": 0,
"Enabled": false, "Enabled": false,
"HitRate": 40, "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 "RemainHours": 2
}, },
"PrintService": { "PrintService": {
"IP": "60.209.125.238", "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com",
"Port": "3009", "Port": "3009",
"AccessKey": "1777229107311022080", "AccessKey": "1777229107311022080",
"AccessSecret": "d816e6fe938f24e2f205db129d31286a", "AccessSecret": "d816e6fe938f24e2f205db129d31286a",
@ -69,7 +69,7 @@
"GetJsonPrintInfoUrl": "/printApi/OpenPrint/GetOpenJsonPrintInfo" "GetJsonPrintInfoUrl": "/printApi/OpenPrint/GetOpenJsonPrintInfo"
}, },
"DjyService": { "DjyService": {
"IP": "60.209.125.238", "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com",
"Port": "35100", "Port": "35100",
"AccessKey": "6b050e757c1e405489e19602dd81ebbe", "AccessKey": "6b050e757c1e405489e19602dd81ebbe",
"AccessSecret": "51d564741c761e0760f62d904f13c193009e74d0af9f72e2dc67f9320b8ae42580e2339745aee1bf", "AccessSecret": "51d564741c761e0760f62d904f13c193009e74d0af9f72e2dc67f9320b8ae42580e2339745aee1bf",

@ -13,12 +13,12 @@
}, },
"Cors": { "Cors": {
"PolicyName": "WMSCore.API", "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": { "DBInfo": {
"DefaultDbConnId": "1288018625843826688", "DefaultDbConnId": "1288018625843826688",
"DefaultDbType": 0, "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": [ "DBS": [
{ {
"ConnId": "1595354960864874496", "ConnId": "1595354960864874496",

@ -13,12 +13,12 @@
}, },
"Cors": { "Cors": {
"PolicyName": "WMSCore.API", "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": { "DBInfo": {
"DefaultDbConnId": "1288018625843826688", "DefaultDbConnId": "1288018625843826688",
"DefaultDbType": 0, "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": [ "DBS": [
{ {
"ConnId": "1595354960864874496", "ConnId": "1595354960864874496",

@ -14,19 +14,19 @@
}, },
"Cors": { "Cors": {
"PolicyName": "WMSCore.API", "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": { "DBInfo": {
"DefaultDbConnId": "1288018625843826688", "DefaultDbConnId": "1288018625843826688",
"DefaultDbType": 0, "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": [ "DBS": [
{ {
"ConnId": "1288018625843826680", "ConnId": "1288018625843826680",
"DBType": 0, "DBType": 0,
"Enabled": false, "Enabled": false,
"HitRate": 40, "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" ] "FileType": [ ".xls", ".xlsx", ".pdf", ".jpg", ".png", ".txt", ".pms" ]
}, },
"PrintService": { "PrintService": {
"IP": "60.209.125.238", "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com",
//"IP": "localhost", //"IP": "localhost",
"Port": "3009", "Port": "3009",
"AccessKey": "1777229107311022080", "AccessKey": "1777229107311022080",

@ -14,19 +14,19 @@
}, },
"Cors": { "Cors": {
"PolicyName": "WMSCore.API", "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": { "DBInfo": {
"DefaultDbConnId": "1288018625843826688", "DefaultDbConnId": "1288018625843826688",
"DefaultDbType": 0, "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": [ "DBS": [
{ {
"ConnId": "1288018625843826680", "ConnId": "1288018625843826680",
"DBType": 0, "DBType": 0,
"Enabled": false, "Enabled": false,
"HitRate": 40, "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 "RemainHours": 2
}, },
"PrintService": { "PrintService": {
"IP": "60.209.125.238", "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com",
"Port": "3009", "Port": "3009",
"AccessKey": "1777229107311022080", "AccessKey": "1777229107311022080",
"AccessSecret": "d816e6fe938f24e2f205db129d31286a", "AccessSecret": "d816e6fe938f24e2f205db129d31286a",
@ -70,7 +70,7 @@
"LocalPrintUrl": "http://localhost:2999/printApi/OpenPrint/GetOpenJsonPrintInfoAsync" "LocalPrintUrl": "http://localhost:2999/printApi/OpenPrint/GetOpenJsonPrintInfoAsync"
}, },
"DjyService": { "DjyService": {
"IP": "60.209.125.238", "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com",
"Port": "35100", "Port": "35100",
"AccessKey": "6b050e757c1e405489e19602dd81ebbe", "AccessKey": "6b050e757c1e405489e19602dd81ebbe",
"AccessSecret": "51d564741c761e0760f62d904f13c193009e74d0af9f72e2dc67f9320b8ae42580e2339745aee1bf", "AccessSecret": "51d564741c761e0760f62d904f13c193009e74d0af9f72e2dc67f9320b8ae42580e2339745aee1bf",
@ -94,7 +94,7 @@
"Environment": "TEST" "Environment": "TEST"
}, },
"RedisInfo": { "RedisInfo": {
"RedisConfig": "60.209.125.238:36379,password=,defaultDatabase=15" "RedisConfig": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com:36379,password=,defaultDatabase=15"
}, },
"BCCompare": { "BCCompare": {
"Url": "http://localhost:5110/api/TaskBookingAmendmentParser/ExcuteBookingAmendmentCompare" "Url": "http://localhost:5110/api/TaskBookingAmendmentParser/ExcuteBookingAmendmentCompare"

@ -9,7 +9,7 @@
"AllowedHosts": "*", "AllowedHosts": "*",
"ConnectionStrings": { "ConnectionStrings": {
"DbType": "0", // MySql = 0, SqlServer 1, "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": { "SwaggerDoc": {
"ContactName": "WmsPrintAPI", "ContactName": "WmsPrintAPI",

@ -14,19 +14,19 @@
}, },
"Cors": { "Cors": {
"PolicyName": "WMSCore.API", "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": { "DBInfo": {
"DefaultDbConnId": "1288018625843826688", "DefaultDbConnId": "1288018625843826688",
"DefaultDbType": 0, "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": [ "DBS": [
{ {
"ConnId": "1288018625843826680", "ConnId": "1288018625843826680",
"DBType": 0, "DBType": 0,
"Enabled": false, "Enabled": false,
"HitRate": 40, "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"
} }
] ]
}, },

@ -14,12 +14,12 @@
}, },
"Cors": { "Cors": {
"PolicyName": "WMSCore.API", "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": { "DBInfo": {
"DefaultDbConnId": "1288018625843826688", "DefaultDbConnId": "1288018625843826688",
"DefaultDbType": 0, "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": [ "DBS": [
{ {
"ConnId": "1595354960864874496", "ConnId": "1595354960864874496",
@ -40,7 +40,7 @@
"Description": "Wms Admin API" "Description": "Wms Admin API"
}, },
"PrintService": { "PrintService": {
"IP": "60.209.125.238", "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com",
"Port": "3009", "Port": "3009",
"AccessKey": "1777229107311022080", "AccessKey": "1777229107311022080",
"AccessSecret": "d816e6fe938f24e2f205db129d31286a", "AccessSecret": "d816e6fe938f24e2f205db129d31286a",
@ -49,7 +49,7 @@
"GetJsonPrintInfoUrl": "/printApi/OpenPrint/GetOpenJsonPrintInfo" "GetJsonPrintInfoUrl": "/printApi/OpenPrint/GetOpenJsonPrintInfo"
}, },
"DjyService": { "DjyService": {
"IP": "60.209.125.238", "IP": "rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com",
"Port": "35100", "Port": "35100",
"AccessKey": "6b050e757c1e405489e19602dd81ebbe", "AccessKey": "6b050e757c1e405489e19602dd81ebbe",
"AccessSecret": "51d564741c761e0760f62d904f13c193009e74d0af9f72e2dc67f9320b8ae42580e2339745aee1bf", "AccessSecret": "51d564741c761e0760f62d904f13c193009e74d0af9f72e2dc67f9320b8ae42580e2339745aee1bf",

Loading…
Cancel
Save