From a31113f0928f432687eeb1f96e49851798672d89 Mon Sep 17 00:00:00 2001 From: zhangxiaofeng <1939543722@qq.com> Date: Mon, 14 Oct 2024 11:44:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=20ISF=E3=80=81AMS=E6=97=A5=E5=BF=97=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BC=98=E5=8C=96=202.=E8=A1=A5=E5=85=85ISF=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E9=87=8D=E5=8F=91=E7=9A=84=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/djy.Service/Ams/AmsService.cs | 4 +- web/djy.Service/ISF/IsfService.cs | 16 +++-- .../PublishProfiles/FolderProfile.pubxml.user | 2 +- .../FolderProfile-linux.pubxml.user | 2 +- web/djy_AfrApi/djy_AfrApi.csproj.user | 2 +- web/djy_IsfApi/Program.cs | 4 +- .../PublishProfiles/FolderProfile.pubxml.user | 5 +- web/djy_IsfApi/Properties/launchSettings.json | 8 ++- web/djy_IsfApi/appsettings.Production.json | 70 +++++++++++++++++++ web/djy_IsfApi/djy_IsfApi.csproj | 8 +++ web/djy_IsfApi/djy_IsfApi.csproj.user | 4 +- 11 files changed, 109 insertions(+), 16 deletions(-) create mode 100644 web/djy_IsfApi/appsettings.Production.json diff --git a/web/djy.Service/Ams/AmsService.cs b/web/djy.Service/Ams/AmsService.cs index fff26e2..58e4f01 100644 --- a/web/djy.Service/Ams/AmsService.cs +++ b/web/djy.Service/Ams/AmsService.cs @@ -960,7 +960,7 @@ namespace djy.Service.Ams } history.Operator = user.SHOWNAME; - history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + msg + errorInfo; + history.Remark = $"{user.SHOWNAME}于{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}{history.State}，失败原因：{msg}{errorInfo}"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); } @@ -995,7 +995,7 @@ namespace djy.Service.Ams history.State = "删除发送成功"; } history.Operator = user.SHOWNAME; - history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送了单据"; + history.Remark = $"{user.SHOWNAME}于{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}{history.State}"; hisList.Add(history); } DbBus.Get(DbList.AMSCenter).Insert(hisList).ExecuteAffrows(); diff --git a/web/djy.Service/ISF/IsfService.cs b/web/djy.Service/ISF/IsfService.cs index e7b878b..c74053a 100644 --- a/web/djy.Service/ISF/IsfService.cs +++ b/web/djy.Service/ISF/IsfService.cs @@ -345,8 +345,14 @@ namespace djy.Service.Isf var fin = new FinanceService(); var master = DbBus.Get(DbList.AMSCenter).Select().Where(x => (x.IsDel == false || x.IsDel == null) && x.CompID == user.CompId && x.GID == oid).ToOne(); + if (master == null) + { + req.Code = 201; + req.Message = "未检索到此单据，可能没有发送权限，请切换相关账号后重试"; + return req; + } var comlist = DbBus.Get(DbList.AMSCenter).Select().Where(x => (x.IsDel == false || x.IsDel == null) && x.PID == oid).ToList(); - if (msgType == "4" && (master.MateState == "海关删除" || master.MateState != "S1" || master.MateState != "02")) + if (msgType == "4" && (master.MateState == "海关删除" || master.MateState != "S1" || master.MateState != "02" || master.MateState != "01")) { req.Code = 201; req.Message = "当前状态不能重发！如有疑问，请联系相关客服！"; @@ -482,6 +488,7 @@ namespace djy.Service.Isf //} gethtml = await HttpHelp.Post(dic, url.PARAMVALUE, PsotType.Urlencoded); + //gethtml = ""; _LogsAdd("SendDE", "post", $"ISF接口调用返回{oid}：{gethtml}"); } @@ -519,6 +526,7 @@ namespace djy.Service.Isf //} gethtml = await HttpHelp.Post(dic, url.PARAMVALUE, PsotType.Urlencoded); + //gethtml = ""; _LogsAdd("SendDE", "post", $"ISF接口调用返回{oid}：{gethtml}"); } @@ -558,7 +566,7 @@ namespace djy.Service.Isf } history.Operator = user.SHOWNAME; - history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + msg + " "; + history.Remark = $"{user.SHOWNAME}于{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}{history.State}失败，失败原因：{msg} "; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); req.Code = 201; req.Message = "操作失败," + msg; @@ -600,7 +608,7 @@ namespace djy.Service.Isf } history.Operator = user.SHOWNAME; - history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + errorInfo + " "; + history.Remark = $"{user.SHOWNAME}于{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}{history.State}失败，失败原因：{errorInfo} "; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); req.Code = 201; req.Message = "操作失败," + msg + errorInfo; @@ -633,7 +641,7 @@ namespace djy.Service.Isf } history.Operator = user.SHOWNAME; - history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送了单据"; + history.Remark = $"{user.SHOWNAME}于{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}{history.State}"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); diff --git a/web/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/web/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user index c12fe25..7fd886e 100644 --- a/web/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/web/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\Code\djyweb_ams\web\djy.WebApi\bin\publish\net5 - True|2024-06-06T03:24:16.6496999Z;True|2024-06-05T10:16:26.0118620+08:00;True|2024-06-05T10:14:00.4318685+08:00;True|2024-04-03T09:23:32.8437777+08:00;True|2024-02-20T08:48:34.1425408+08:00;True|2023-06-16T09:09:45.1637530+08:00;True|2023-06-15T17:35:47.2298327+08:00;True|2022-10-24T13:58:36.8728872+08:00;True|2022-10-11T17:36:04.7506103+08:00;True|2022-09-29T09:16:51.0738556+08:00;True|2022-09-29T09:12:44.1994050+08:00;True|2022-09-29T09:05:28.1343572+08:00;True|2022-09-28T17:22:24.8692737+08:00;True|2022-09-28T16:15:13.4883777+08:00;True|2022-09-28T10:59:23.5270093+08:00;True|2022-08-31T10:01:14.0996702+08:00;True|2022-08-29T11:10:30.2643117+08:00;True|2022-08-29T10:55:49.0496591+08:00;True|2022-08-16T10:30:57.6816257+08:00;True|2022-08-15T17:50:55.2965000+08:00;True|2022-08-12T18:07:20.4848662+08:00;True|2022-08-12T17:46:41.1829405+08:00;True|2022-08-12T15:08:58.5925841+08:00;True|2022-07-20T16:18:49.1737260+08:00;True|2022-07-14T13:44:55.2043481+08:00;True|2022-07-13T10:21:13.3628429+08:00;True|2022-07-12T15:45:11.4672604+08:00;True|2022-07-12T10:48:29.8013532+08:00;True|2022-07-04T09:32:18.4540585+08:00;True|2022-07-01T17:34:50.7575127+08:00;True|2022-07-01T15:51:14.9076477+08:00;True|2022-06-30T15:06:12.0032112+08:00;True|2022-06-30T15:05:33.2540874+08:00;True|2022-06-30T10:26:41.3365814+08:00;True|2022-06-30T09:56:20.9021741+08:00;True|2022-06-30T08:53:10.0864638+08:00;True|2022-06-29T17:05:03.3034364+08:00;True|2022-06-29T16:50:10.1873653+08:00;True|2022-06-29T16:32:36.1524378+08:00;True|2022-06-29T15:56:09.9746651+08:00;True|2022-06-29T10:56:16.8088978+08:00;True|2022-06-29T08:54:20.5334051+08:00;True|2022-06-28T19:41:08.7023145+08:00;True|2022-06-28T19:26:28.7000486+08:00;True|2022-06-28T19:14:38.4827828+08:00;True|2022-06-28T18:56:21.8997711+08:00;True|2022-06-28T17:46:58.3643830+08:00;True|2022-06-28T17:10:20.1461539+08:00;True|2022-06-28T16:09:53.0805413+08:00;True|2022-06-28T15:52:30.2951989+08:00;True|2022-06-28T11:01:29.3265564+08:00;True|2022-06-28T10:35:04.6353020+08:00;True|2022-06-28T10:25:10.0426356+08:00;True|2022-06-28T10:22:28.8860296+08:00;True|2022-06-28T10:10:33.8758083+08:00;True|2022-06-28T10:03:21.1254163+08:00;True|2022-06-28T09:15:06.8911689+08:00;True|2022-06-27T17:07:03.5262846+08:00;True|2022-06-27T16:51:26.5898864+08:00;True|2022-06-27T16:28:43.2026298+08:00;True|2022-06-27T16:28:18.9494990+08:00;True|2022-06-27T16:27:16.7453474+08:00;True|2022-06-27T16:18:19.4634998+08:00;True|2022-06-27T16:02:41.1823096+08:00;True|2022-06-27T15:43:51.5116456+08:00;True|2022-06-27T15:23:40.6693098+08:00;True|2022-06-27T15:22:19.3671271+08:00;True|2022-06-27T14:41:57.2976612+08:00;True|2022-06-27T14:33:00.0677612+08:00;True|2022-06-27T14:24:08.5216447+08:00;True|2022-06-27T14:02:02.8566739+08:00;True|2022-06-27T09:23:01.1910441+08:00;True|2022-06-24T10:33:51.1549131+08:00;True|2022-06-24T09:59:03.2881122+08:00;True|2022-06-24T09:15:37.5422200+08:00;True|2022-06-23T15:11:47.3175395+08:00;True|2022-06-17T09:45:32.1714267+08:00;True|2022-06-16T17:03:22.3921843+08:00;True|2022-06-16T15:35:33.2295367+08:00;True|2022-06-16T15:21:17.5490522+08:00;True|2022-06-16T14:53:00.4693599+08:00;True|2022-06-10T14:25:18.7355725+08:00;True|2022-06-09T18:13:39.8032757+08:00;True|2022-06-09T17:57:35.8696074+08:00;True|2022-06-01T17:48:15.4107624+08:00;True|2022-05-31T16:09:22.2674554+08:00;True|2022-05-31T14:15:19.3700456+08:00;True|2022-05-18T09:06:11.5118231+08:00;True|2022-05-17T16:08:22.9679914+08:00;True|2022-02-07T09:32:52.8608715+08:00;True|2022-01-29T15:30:35.5581322+08:00;True|2022-01-29T15:13:03.4191677+08:00;True|2022-01-29T14:52:16.3700211+08:00;True|2022-01-29T14:48:59.8000767+08:00;True|2022-01-29T14:45:14.4545309+08:00;True|2022-01-29T14:38:57.6540259+08:00;True|2022-01-29T13:36:16.2370205+08:00;True|2022-01-29T11:46:45.8432136+08:00;True|2022-01-29T11:20:54.2763765+08:00;True|2022-01-29T11:16:23.0172880+08:00; + True|2024-08-28T01:41:00.2696034Z;True|2024-08-14T18:42:40.9295318+08:00;True|2024-07-09T14:24:30.5920260+08:00;True|2024-06-06T11:24:16.6496999+08:00;True|2024-06-05T10:16:26.0118620+08:00;True|2024-06-05T10:14:00.4318685+08:00;True|2024-04-03T09:23:32.8437777+08:00;True|2024-02-20T08:48:34.1425408+08:00;True|2023-06-16T09:09:45.1637530+08:00;True|2023-06-15T17:35:47.2298327+08:00;True|2022-10-24T13:58:36.8728872+08:00;True|2022-10-11T17:36:04.7506103+08:00;True|2022-09-29T09:16:51.0738556+08:00;True|2022-09-29T09:12:44.1994050+08:00;True|2022-09-29T09:05:28.1343572+08:00;True|2022-09-28T17:22:24.8692737+08:00;True|2022-09-28T16:15:13.4883777+08:00;True|2022-09-28T10:59:23.5270093+08:00;True|2022-08-31T10:01:14.0996702+08:00;True|2022-08-29T11:10:30.2643117+08:00;True|2022-08-29T10:55:49.0496591+08:00;True|2022-08-16T10:30:57.6816257+08:00;True|2022-08-15T17:50:55.2965000+08:00;True|2022-08-12T18:07:20.4848662+08:00;True|2022-08-12T17:46:41.1829405+08:00;True|2022-08-12T15:08:58.5925841+08:00;True|2022-07-20T16:18:49.1737260+08:00;True|2022-07-14T13:44:55.2043481+08:00;True|2022-07-13T10:21:13.3628429+08:00;True|2022-07-12T15:45:11.4672604+08:00;True|2022-07-12T10:48:29.8013532+08:00;True|2022-07-04T09:32:18.4540585+08:00;True|2022-07-01T17:34:50.7575127+08:00;True|2022-07-01T15:51:14.9076477+08:00;True|2022-06-30T15:06:12.0032112+08:00;True|2022-06-30T15:05:33.2540874+08:00;True|2022-06-30T10:26:41.3365814+08:00;True|2022-06-30T09:56:20.9021741+08:00;True|2022-06-30T08:53:10.0864638+08:00;True|2022-06-29T17:05:03.3034364+08:00;True|2022-06-29T16:50:10.1873653+08:00;True|2022-06-29T16:32:36.1524378+08:00;True|2022-06-29T15:56:09.9746651+08:00;True|2022-06-29T10:56:16.8088978+08:00;True|2022-06-29T08:54:20.5334051+08:00;True|2022-06-28T19:41:08.7023145+08:00;True|2022-06-28T19:26:28.7000486+08:00;True|2022-06-28T19:14:38.4827828+08:00;True|2022-06-28T18:56:21.8997711+08:00;True|2022-06-28T17:46:58.3643830+08:00;True|2022-06-28T17:10:20.1461539+08:00;True|2022-06-28T16:09:53.0805413+08:00;True|2022-06-28T15:52:30.2951989+08:00;True|2022-06-28T11:01:29.3265564+08:00;True|2022-06-28T10:35:04.6353020+08:00;True|2022-06-28T10:25:10.0426356+08:00;True|2022-06-28T10:22:28.8860296+08:00;True|2022-06-28T10:10:33.8758083+08:00;True|2022-06-28T10:03:21.1254163+08:00;True|2022-06-28T09:15:06.8911689+08:00;True|2022-06-27T17:07:03.5262846+08:00;True|2022-06-27T16:51:26.5898864+08:00;True|2022-06-27T16:28:43.2026298+08:00;True|2022-06-27T16:28:18.9494990+08:00;True|2022-06-27T16:27:16.7453474+08:00;True|2022-06-27T16:18:19.4634998+08:00;True|2022-06-27T16:02:41.1823096+08:00;True|2022-06-27T15:43:51.5116456+08:00;True|2022-06-27T15:23:40.6693098+08:00;True|2022-06-27T15:22:19.3671271+08:00;True|2022-06-27T14:41:57.2976612+08:00;True|2022-06-27T14:33:00.0677612+08:00;True|2022-06-27T14:24:08.5216447+08:00;True|2022-06-27T14:02:02.8566739+08:00;True|2022-06-27T09:23:01.1910441+08:00;True|2022-06-24T10:33:51.1549131+08:00;True|2022-06-24T09:59:03.2881122+08:00;True|2022-06-24T09:15:37.5422200+08:00;True|2022-06-23T15:11:47.3175395+08:00;True|2022-06-17T09:45:32.1714267+08:00;True|2022-06-16T17:03:22.3921843+08:00;True|2022-06-16T15:35:33.2295367+08:00;True|2022-06-16T15:21:17.5490522+08:00;True|2022-06-16T14:53:00.4693599+08:00;True|2022-06-10T14:25:18.7355725+08:00;True|2022-06-09T18:13:39.8032757+08:00;True|2022-06-09T17:57:35.8696074+08:00;True|2022-06-01T17:48:15.4107624+08:00;True|2022-05-31T16:09:22.2674554+08:00;True|2022-05-31T14:15:19.3700456+08:00;True|2022-05-18T09:06:11.5118231+08:00;True|2022-05-17T16:08:22.9679914+08:00;True|2022-02-07T09:32:52.8608715+08:00;True|2022-01-29T15:30:35.5581322+08:00;True|2022-01-29T15:13:03.4191677+08:00;True|2022-01-29T14:52:16.3700211+08:00;True|2022-01-29T14:48:59.8000767+08:00;True|2022-01-29T14:45:14.4545309+08:00;True|2022-01-29T14:38:57.6540259+08:00;True|2022-01-29T13:36:16.2370205+08:00; \ No newline at end of file diff --git a/web/djy_AfrApi/Properties/PublishProfiles/FolderProfile-linux.pubxml.user b/web/djy_AfrApi/Properties/PublishProfiles/FolderProfile-linux.pubxml.user index 7a65b5a..95e96d6 100644 --- a/web/djy_AfrApi/Properties/PublishProfiles/FolderProfile-linux.pubxml.user +++ b/web/djy_AfrApi/Properties/PublishProfiles/FolderProfile-linux.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\Code\djyweb_ams\web\djy_AfrApi\bin\Release\net5.0\publish-linux\ - True|2024-05-28T06:07:50.0360648Z;True|2024-05-28T09:32:29.9349960+08:00;True|2024-03-14T16:13:19.0717213+08:00;True|2024-03-08T11:13:30.3644089+08:00;True|2024-02-29T08:54:35.9996054+08:00;True|2024-02-04T14:34:07.9001297+08:00;True|2024-01-29T17:48:24.1888961+08:00;True|2024-01-29T14:55:22.3697340+08:00;True|2024-01-26T15:18:26.3618341+08:00;True|2024-01-26T14:55:05.3552141+08:00;True|2024-01-25T17:09:15.3482577+08:00;False|2024-01-25T17:08:55.2779489+08:00;True|2024-01-25T16:46:48.0925564+08:00; + True|2024-06-27T01:58:53.8755953Z;True|2024-05-28T14:07:50.0360648+08:00;True|2024-05-28T09:32:29.9349960+08:00;True|2024-03-14T16:13:19.0717213+08:00;True|2024-03-08T11:13:30.3644089+08:00;True|2024-02-29T08:54:35.9996054+08:00;True|2024-02-04T14:34:07.9001297+08:00;True|2024-01-29T17:48:24.1888961+08:00;True|2024-01-29T14:55:22.3697340+08:00;True|2024-01-26T15:18:26.3618341+08:00;True|2024-01-26T14:55:05.3552141+08:00;True|2024-01-25T17:09:15.3482577+08:00;False|2024-01-25T17:08:55.2779489+08:00;True|2024-01-25T16:46:48.0925564+08:00; \ No newline at end of file diff --git a/web/djy_AfrApi/djy_AfrApi.csproj.user b/web/djy_AfrApi/djy_AfrApi.csproj.user index 66a42f1..c452643 100644 --- a/web/djy_AfrApi/djy_AfrApi.csproj.user +++ b/web/djy_AfrApi/djy_AfrApi.csproj.user @@ -4,7 +4,7 @@ ApiControllerEmptyScaffolder root/Common/Api djy_AfrApi_正式环境 - D:\Code\djyweb_ams\web\djy_AfrApi\Properties\PublishProfiles\FolderProfile-Windows.pubxml + D:\Code\djyweb_ams\web\djy_AfrApi\Properties\PublishProfiles\FolderProfile-linux.pubxml ProjectDebugger diff --git a/web/djy_IsfApi/Program.cs b/web/djy_IsfApi/Program.cs index 12aebee..d2d1c68 100644 --- a/web/djy_IsfApi/Program.cs +++ b/web/djy_IsfApi/Program.cs @@ -25,11 +25,11 @@ namespace djy_IsfApi }).ConfigureAppConfiguration((ctx, builder) => { if (ctx.HostingEnvironment.EnvironmentName == Microsoft.AspNetCore.Hosting.EnvironmentName.Production) { - builder.AddJsonFile("appsettings.json"); + //builder.AddJsonFile("appsettings.json"); } else { - builder.AddJsonFile("appsettings.Development.json"); + //builder.AddJsonFile("appsettings.Development.json"); } }).ConfigureLogging(logging => { //Nlog־ logging.ClearProviders(); diff --git a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user index 502b768..3e012e0 100644 --- a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,7 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - <_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\bin\Release\net5.0\publish\ - True|2023-04-26T03:02:16.1912307Z;True|2022-10-13T11:22:56.6976734+08:00;True|2022-09-29T14:06:18.1120086+08:00;True|2022-08-25T13:52:10.9522475+08:00;True|2022-08-25T10:41:51.2753305+08:00;True|2022-08-11T14:45:29.1942046+08:00;True|2022-08-11T11:53:01.3573178+08:00;True|2022-08-11T11:45:09.8023314+08:00;True|2022-07-07T11:27:16.6078315+08:00;True|2022-07-05T16:26:03.2409062+08:00;True|2022-07-05T16:24:40.7410506+08:00;True|2022-07-04T17:29:37.9437422+08:00;True|2022-07-04T11:51:52.2386090+08:00;True|2022-07-04T11:51:11.4558393+08:00;True|2022-07-04T09:35:17.7702978+08:00;True|2022-07-01T17:41:17.1936764+08:00;True|2022-07-01T17:32:54.2967210+08:00;True|2022-07-01T16:13:16.7902814+08:00;True|2022-07-01T15:53:11.0569260+08:00;True|2022-07-01T09:54:42.5780181+08:00;True|2022-06-30T15:28:48.8212173+08:00;True|2022-06-30T15:07:27.8048719+08:00;True|2022-06-30T14:23:02.1357807+08:00;True|2022-06-30T14:07:07.8696769+08:00;True|2022-06-30T09:14:19.1360602+08:00;True|2022-06-29T16:34:08.2367476+08:00; + <_PublishTargetUrl>D:\Code\djyweb_ams\web\djy_IsfApi\bin\Release\net5.0\publish\ + True|2024-08-28T01:44:42.7670147Z;True|2024-08-07T16:35:29.6488716+08:00;True|2023-04-26T11:02:16.1912307+08:00;True|2022-10-13T11:22:56.6976734+08:00;True|2022-09-29T14:06:18.1120086+08:00;True|2022-08-25T13:52:10.9522475+08:00;True|2022-08-25T10:41:51.2753305+08:00;True|2022-08-11T14:45:29.1942046+08:00;True|2022-08-11T11:53:01.3573178+08:00;True|2022-08-11T11:45:09.8023314+08:00;True|2022-07-07T11:27:16.6078315+08:00;True|2022-07-05T16:26:03.2409062+08:00;True|2022-07-05T16:24:40.7410506+08:00;True|2022-07-04T17:29:37.9437422+08:00;True|2022-07-04T11:51:52.2386090+08:00;True|2022-07-04T11:51:11.4558393+08:00;True|2022-07-04T09:35:17.7702978+08:00;True|2022-07-01T17:41:17.1936764+08:00;True|2022-07-01T17:32:54.2967210+08:00;True|2022-07-01T16:13:16.7902814+08:00;True|2022-07-01T15:53:11.0569260+08:00;True|2022-07-01T09:54:42.5780181+08:00;True|2022-06-30T15:28:48.8212173+08:00;True|2022-06-30T15:07:27.8048719+08:00;True|2022-06-30T14:23:02.1357807+08:00;True|2022-06-30T14:07:07.8696769+08:00;True|2022-06-30T09:14:19.1360602+08:00;True|2022-06-29T16:34:08.2367476+08:00; + \ No newline at end of file diff --git a/web/djy_IsfApi/Properties/launchSettings.json b/web/djy_IsfApi/Properties/launchSettings.json index 6bd802a..6e3fe0f 100644 --- a/web/djy_IsfApi/Properties/launchSettings.json +++ b/web/djy_IsfApi/Properties/launchSettings.json @@ -14,7 +14,13 @@ "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger", "publishAllPorts": true }, - "NetCore": { + "ISF-正式环境": { + "commandName": "Project", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Production" + } + }, + "ISF-开发环境": { "commandName": "Project", "launchBrowser": true, "launchUrl": "swagger/index.html", diff --git a/web/djy_IsfApi/appsettings.Production.json b/web/djy_IsfApi/appsettings.Production.json new file mode 100644 index 0000000..34c50b8 --- /dev/null +++ b/web/djy_IsfApi/appsettings.Production.json @@ -0,0 +1,70 @@ +{ + // 此文件为正式环境使用的配置文件 + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "AllowedHosts": "*", + "Urls": "http://*:30818", + "WebConfig": { + "IdentServerUrl": "http://djy-identity.myshipping.net", + "WebId": 236, + "Area": "山东省|青岛市|市南区", + "DesKey": "2Fv6I7oV6AlCFEbN", + "jwt_Audience": "admin", + "jwt_Issuer": "shuosoft", + "jwt_Secretkey": "IBFoxBpwAW2rSDIsYiHJL5aZ3Rpr5Uaph4t6Eqm2Fv6I7oV6AlCFEbNWRXyJT653iOFIbWOcOF3sMRSSUelRSbIL6RzOCOfIk3hhxyn9Aj4HxEE08zqlRloA0CWX7MQ0", + "jwt_Expiration": 1440, + "StrFilte": "肏,妈妈,操你妈,草泥马,屌,傻逼,骚逼,王八蛋,你妈的,+,=,-,_,/,*,&,@,.,,,*", + "ShopPower": 1, + "ConnName": "sqldb", + "cache_time": 10, + "WebHostUrl": "https://zh-userapi.jingyiji.net", + "Redis": "127.0.0.1,defaultDatabase=9,", + "RedisDb": "9", + "Rbmq_Host": "172.31.85.169:13866", + "Rbmq_UserName": "ams", + "Rbmq_Password": "djy_ams", + "Rbmq_Sqlhost": "Data Source =47.104.73.97,6761; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true", + "DapperDbString": "Data Source =47.104.73.97,6762; Initial Catalog=AMS; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true;", + "requesterDea": "HWCDDS", + "DataConnList": [ + { + "SysKey": "AMS", + "TitleName": "AMS", + "Index": 100, + "DataType": 1, + "Status": 0, + "ConnString": "Data Source=47.104.73.97,6762; Initial Catalog=AMS; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true;" + }, + { + "SysKey": "Common", + "TitleName": "Common", + "Index": 100, + "DataType": 1, + "Status": 0, + "ConnString": "Data Source=47.104.73.97,6762; Initial Catalog=CommonDB; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true;" + }, + { + "SysKey": "djydb", + "TitleName": "pingtai", + "Index": 100, + "DataType": 1, + "Status": 0, + "ConnString": "Data Source =47.104.73.97,6761; Initial Catalog=DsPingTai; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true" + + }, + { + "SysKey": "logsdb", + "TitleName": "日志库", + "Index": 100, + "DataType": 1, + "Status": 0, + "ConnString": "Data Source=47.104.73.97,6761,1433; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true" + } + ] + } +} diff --git a/web/djy_IsfApi/djy_IsfApi.csproj b/web/djy_IsfApi/djy_IsfApi.csproj index 96916b5..1d4a67a 100644 --- a/web/djy_IsfApi/djy_IsfApi.csproj +++ b/web/djy_IsfApi/djy_IsfApi.csproj @@ -19,4 +19,12 @@ + + + PreserveNewest + true + PreserveNewest + + + diff --git a/web/djy_IsfApi/djy_IsfApi.csproj.user b/web/djy_IsfApi/djy_IsfApi.csproj.user index 0c764e8..fcaf3c9 100644 --- a/web/djy_IsfApi/djy_IsfApi.csproj.user +++ b/web/djy_IsfApi/djy_IsfApi.csproj.user @@ -1,10 +1,10 @@  - D:\DjyDoc\git\djyweb_ams\web\djy_IsfApi\Properties\PublishProfiles\FolderProfile.pubxml + FolderProfile MvcControllerEmptyScaffolder root/Common/MVC/Controller - NetCore + ISF-正式环境 ProjectDebugger