AFR

.gitignore

@@ -0,0 +1,8 @@
+################################################################################
+# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
+################################################################################
+
+/web/djy.Model/AFR/生成实体类/AFRCntrno.cs
+/web/djy.Model/AFR/生成实体类/AFRHouse.cs
+/web/djy.Model/AFR/生成实体类/AFRMaster.cs
+/web/djy.Model/AFR/生成实体类/AFRMasterHistory.cs

web/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# CS1591: 缺少对公共可见类型或成员的 XML 注释
+dotnet_diagnostic.CS1591.severity = suggestion

web/djy.IService/Afr/IAfrService.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace djy.IService.Afr
+{
+    public interface IAfrService
+    {
+    }
+}

web/djy.Model/AFR/AFRCntrno.cs

@@ -0,0 +1,165 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace djy.Model.Afr
+{
+
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table(Name = "AFR_Cntrno", DisableSyncStructure = true)]
+    public partial class AFRCntrno
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string GID { get; set; }
+
+        /// <summary>
+        /// 货代提单号唯一编号 同货代提单号，原始修改删除重发报文，该值要一致
+        /// </summary>
+        public string BusinessId { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CompID { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CompName { get; set; }
+
+        /// <summary>
+        /// 货主箱标志
+        /// </summary>
+        public string ContainerMark { get; set; }
+
+        /// <summary>
+        /// 箱号
+        /// </summary>
+        public string ContainerNo { get; set; }
+
+        /// <summary>
+        /// 箱型
+        /// </summary>
+        public string ContainerType { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 危品联系人（选填）
+        /// </summary>
+        public string DangerContact { get; set; }
+
+        /// <summary>
+        /// 危品联系人电话（选填）
+        /// </summary>
+        public string DangerContactTel { get; set; }
+
+        /// <summary>
+        /// 危品等级（条件必填）
+        /// </summary>
+        public string DangerGrade { get; set; }
+
+        /// <summary>
+        /// 危品备注（选填）
+        /// </summary>
+        public string DangerMemo { get; set; }
+
+        /// <summary>
+        /// 件数
+        /// </summary>
+        public int? Digit { get; set; }
+
+        /// <summary>
+        /// 品名
+        /// </summary>
+        public string EnProductName { get; set; }
+
+        /// <summary>
+        /// 毛重
+        /// </summary>
+        public double? GrossWeight { get; set; }
+
+        /// <summary>
+        /// HSCode
+        /// </summary>
+        public string Hscode { get; set; }
+
+        /// <summary>
+        /// 燃点，摄氏度（选填）
+        /// </summary>
+        public string Ignite { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool? IsDel { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? LastUpdate { get; set; }
+
+        /// <summary>
+        /// 原产国（选填）
+        /// </summary>
+        public string OriginCountry { get; set; }
+
+        /// <summary>
+        /// 原产国国家代码（选填）
+        /// </summary>
+        public string OriginCountryCode { get; set; }
+
+        /// <summary>
+        /// 包装
+        /// </summary>
+        public string Packing { get; set; }
+
+        /// <summary>
+        /// 包装代码
+        /// </summary>
+        public string PackingCode { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string PID { get; set; }
+
+        /// <summary>
+        /// 封号
+        /// </summary>
+        public string SealNo { get; set; }
+
+        /// <summary>
+        /// 唛头
+        /// </summary>
+        public string ShippingMark { get; set; }
+
+        /// <summary>
+        /// UN CODE（条件必填）
+        /// </summary>
+        public string UnCode { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string UserID { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 体积
+        /// </summary>
+        public double? Volume { get; set; }
+
+    }
+
+}

web/djy.Model/AFR/AFRHouse.cs

@@ -0,0 +1,177 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace djy.Model.Afr
+{
+
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table(Name = "AFR_House", DisableSyncStructure = true)]
+    public partial class AFRHouse
+    {
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string GID { get; set; }
+
+        /// <summary>
+        /// 货代提单号唯一编号	 同货代提单号，原始修改删除重发报文，该值要一致
+        /// </summary>
+        public string BusinessId { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CompID { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CompName { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 货代提单号 修改报文，该值不可以变更
+        /// 
+        /// </summary>
+        public string HouseBillNo { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool? IsDel { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? LastUpdate { get; set; }
+
+        /// <summary>
+        /// 通知人地址
+        /// </summary>
+        public string NotifyAddress { get; set; }
+
+        /// <summary>
+        /// 通知人城市
+        /// </summary>
+        public string NotifyCity { get; set; }
+
+        /// <summary>
+        /// 通知人联系人
+        /// </summary>
+        public string NotifyContact { get; set; }
+
+        /// <summary>
+        /// 通知人国家
+        /// </summary>
+        public string NotifyCountry { get; set; }
+
+        /// <summary>
+        /// 通知人国家代码
+        /// </summary>
+        public string NotifyCountryCode { get; set; }
+
+        /// <summary>
+        /// 通知人名称
+        /// </summary>
+        public string NotifyName { get; set; }
+
+        /// <summary>
+        /// 通知人联系人电话
+        /// </summary>
+        public string NotifyTel { get; set; }
+
+        /// <summary>
+        /// 收货人地址
+        /// </summary>
+        public string ReceiveAddress { get; set; }
+
+        /// <summary>
+        /// 收货人城市
+        /// </summary>
+        public string ReceiveCity { get; set; }
+
+        /// <summary>
+        /// 收货人联系人
+        /// </summary>
+        public string ReceiveContact { get; set; }
+
+        /// <summary>
+        /// 收货人国家
+        /// </summary>
+        public string ReceiveCountry { get; set; }
+
+        /// <summary>
+        /// 收货人国家代码
+        /// </summary>
+        public string ReceiveCountryCode { get; set; }
+
+        /// <summary>
+        /// 收货人名称
+        /// </summary>
+        public string ReceiveName { get; set; }
+
+        /// <summary>
+        /// 收货人联系人电话
+        /// </summary>
+        public string ReceiveTel { get; set; }
+
+        /// <summary>
+        /// 发货人地址
+        /// </summary>
+        public string SendAddress { get; set; }
+
+        /// <summary>
+        /// 发货人城市
+        /// </summary>
+        public string SendCity { get; set; }
+
+        /// <summary>
+        /// 发货人联系人
+        /// </summary>
+        public string SendContact { get; set; }
+
+        /// <summary>
+        /// 发货人国家
+        /// </summary>
+        public string SendCountry { get; set; }
+
+        /// <summary>
+        /// 发货人国家代码
+        /// </summary>
+        public string SendCountryCode { get; set; }
+
+        /// <summary>
+        /// 发货人名称
+        /// </summary>
+        public string SendName { get; set; }
+
+        /// <summary>
+        /// 发货人联系人电话
+        /// </summary>
+        public string SendTel { get; set; }
+
+        /// <summary>
+        /// 货代单运编号（选填）
+        /// </summary>
+        public string ShippingNo { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string UserID { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string UserName { get; set; }
+
+    }
+
+}

web/djy.Model/AFR/AFRMaster.cs

@@ -0,0 +1,135 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace djy.Model.Afr
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table(Name = "AFR_Master", DisableSyncStructure = true)]
+    public partial class AFRMaster
+    {
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string GID { get; set; }
+
+        /// <summary>
+        /// 运输条款代码
+        /// </summary>
+        public string Clause { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CompID { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CompName { get; set; }
+
+        /// <summary>
+        /// 整箱/拼箱
+        /// </summary>
+        public string ConsignmentType { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 卸货港全称
+        /// </summary>
+        public string DischargeHarbour { get; set; }
+
+        /// <summary>
+        /// 卸货港五字码
+        /// </summary>
+        public string DischargeHarbourCode { get; set; }
+
+        /// <summary>
+        /// 预计到达日期
+        /// </summary>
+        public DateTime? EstimatedArrivalTime { get; set; }
+
+        /// <summary>
+        /// 申报运输类型
+        /// </summary>
+        public string FilingType { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool? IsDel { get; set; }
+
+        /// <summary>
+        /// 交货地全称（条件）申报运输类型Tranship时，必填
+        /// </summary>
+        public string LastForeignHarbour { get; set; }
+
+        /// <summary>
+        /// 交货地五字码（条件）申报运输类型Tranship时，必填
+        /// </summary>
+        public string LastForeignHarbourCode { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? LastUpdate { get; set; }
+
+        /// <summary>
+        /// 预计开船日期
+        /// </summary>
+        public DateTime? LoadDate { get; set; }
+
+        /// <summary>
+        /// 装货港全称
+        /// </summary>
+        public string LoadHarbour { get; set; }
+
+        /// <summary>
+        /// 装货港五字码
+        /// </summary>
+        public string LoadHarbourCode { get; set; }
+
+        /// <summary>
+        /// 船东提单号
+        /// </summary>
+        public string MBLNO { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ShipCompany { get; set; }
+
+        /// <summary>
+        /// 船东单运编号（选填）
+        /// </summary>
+        public string ShippingNo { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string UserID { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Vessel { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Voyno { get; set; }
+
+    }
+
+}

web/djy.Model/AFR/AFRMasterHistory.cs

@@ -0,0 +1,51 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace djy.Model.Afr
+{
+
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table(Name = "AFR_MasterHistory", DisableSyncStructure = true)]
+    public partial class AFRMasterHistory
+    {
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string GID { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string AMID { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Operator { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? SendTime { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string State { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Type { get; set; }
+
+    }
+
+}

web/djy.Model/AFR/生成实体类/__razor.cshtml.txt

@@ -0,0 +1,66 @@
+using FreeSql.DatabaseModel;@{
+var gen = Model as RazorModel;
+
+Func<string, string> GetAttributeString = attr => {
+	if (string.IsNullOrEmpty(attr)) return "";
+	return string.Concat(", ", attr.Trim('[', ']')).Trim(',');
+};
+Func<string, string> GetDefaultValue = defval => {
+    if (string.IsNullOrEmpty(defval)) return "";
+    return " = " + defval + ";";
+};
+}@{
+switch (gen.fsql.Ado.DataType) {
+	case FreeSql.DataType.PostgreSQL:
+@:using System;
+@:using System.Collections;
+@:using System.Collections.Generic;
+@:using System.Linq;
+@:using System.Reflection;
+@:using System.Threading.Tasks;
+@:using Newtonsoft.Json;
+@:using FreeSql.DataAnnotations;
+@:using System.Net;
+@:using Newtonsoft.Json.Linq;
+@:using System.Net.NetworkInformation;
+@:using NpgsqlTypes;
+@:using Npgsql.LegacyPostgis;
+		break;
+	case FreeSql.DataType.SqlServer:
+	case FreeSql.DataType.MySql:
+	default:
+@:using System;
+@:using System.Collections;
+@:using System.Collections.Generic;
+@:using System.Linq;
+@:using System.Reflection;
+@:using System.Threading.Tasks;
+@:using Newtonsoft.Json;
+@:using FreeSql.DataAnnotations;
+		break;
+}
+}
+
+namespace @gen.NameSpace {
+
+@if (false == false) {
+	@:/// <summary>
+	@:/// @gen.table.Comment.Replace("\r\n", "\n").Replace("\n", "\r\n		/// ")
+	@:/// </summary>
+}
+	[@GetAttributeString(gen.GetTableAttribute())]
+	public partial class @gen.GetCsName(gen.FullTableName) {
+
+	@foreach (var col in gen.columns) {
+
+		if (false == false) {
+		@:/// <summary>
+		@:/// @col.Comment.Replace("\r\n", "\n").Replace("\n", "\r\n		/// ")
+		@:/// </summary>
+		}
+		@:public @gen.GetCsType(col) @gen.GetCsName(col.Name) { get; set; }@GetDefaultValue(gen.GetColumnDefaultValue(col, false))
+@:
+	}
+	}
+@gen.GetMySqlEnumSetDefine()
+}

web/djy.Model/AFR/生成实体类/__重新生成.bat

@@ -0,0 +1,2 @@
+
+FreeSql.Generator -Razor "__razor.cshtml.txt" -NameOptions 0,0,0,1 -NameSpace djy.Model.Afr -DB "SqlServer,Data Source=60.209.125.238,32009;Initial Catalog=DevAMS;User Id=sa;Password=Djy@Sql2022.test;" -Filter "View+StoreProcedure" -Match "AFR" -FileName "{name}.cs"

web/djy.Model/AFRDto/AFRMasterDto.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace djy.Model.AFRDto
+{
+    public class AFRMasterDto
+    {
+    }
+}

web/djy.Model/AFRDto/AFRMasterPageDataDto.cs

@@ -0,0 +1,20 @@
+namespace djy.Model.AFRDto
+{
+    public class AFRMasterPageDataDto
+    {
+        /// <summary>
+        /// 查询类型（1：草稿箱列表 2：已发送列表）
+        /// </summary>
+        public int Type { get; set; }
+
+        /// <summary>
+        /// 当前页
+        /// </summary>
+        public int Page { get; set; }
+
+        /// <summary>
+        /// 每页数量
+        /// </summary>
+        public int Limit { get; set; }
+    }
+}

web/djy.Model/djy.Model.csproj

@@ -24,6 +24,10 @@
     <None Remove="djy.Model.xml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\.editorconfig" Link=".editorconfig" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Djy.Common\Common.csproj" />
   </ItemGroup>

web/djy.Service/Afr/AfrService.cs

@@ -0,0 +1,15 @@
+using djy.IService.Afr;
+using djy.Service.DjyService;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace djy.Service.AFR
+{
+    public class AfrService : DbContext, IAfrService
+    {
+        
+    }
+}

web/djy.Service/DjyService/DbContext.cs

@@ -25,15 +25,15 @@ namespace djy.Service.DjyService
         /// <summary>
         ///大简云平台老库
         /// </summary>
-        public const string djyolddb  = "djydb";
+        public const string djyolddb = "djydb";
         /// <summary>
         /// AMS
         /// </summary>
-        public const string AMSCenter  = "AMS";
+        public const string AMSCenter = "AMS";
         /// <summary>
         /// 日志库
         /// </summary>
-        public const string Logsdb  = "logsdb";
+        public const string Logsdb = "logsdb";
 
         /// <summary>
         /// Common库
@@ -49,12 +49,12 @@ namespace djy.Service.DjyService
     /// <summary>
     /// 数据库操作类
     /// </summary>
-    public  class DbContext  
+    public class DbContext
     {
         /// <summary>
         /// 数据库连接池
         /// </summary>
-        public static IdleBus<IFreeSql> DbBus=new IdleBus<IFreeSql>(TimeSpan.FromSeconds(20));
+        public static IdleBus<IFreeSql> DbBus = new IdleBus<IFreeSql>(TimeSpan.FromSeconds(20));
 
         /// <summary>
         /// RedisDB
@@ -65,11 +65,11 @@ namespace djy.Service.DjyService
         /// 数据库连接池初始化
         /// </summary>
         /// <returns></returns>
-        public static bool DbBusInit() {
+        public static bool DbBusInit()
+        {
 
             foreach (var item in sysOptionConfig.Webconfig.DataConnList)
             {
-
                 if (item.SysKey == DbList.Logsdb)//日志库允许自动更新表结构
                 {
                     DbBus.Register(item.SysKey, () => new FreeSqlBuilder().UseConnectionString((DataType)item.DataType, item.ConnString)

web/djy.WebApi/djy_AmsApi.csproj.user

@@ -4,7 +4,7 @@
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
     <NameOfLastUsedPublishProfile>C:\Project\DJYAMS\djyweb_ams\web\djy.WebApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
-    <ActiveDebugProfile>IIS Express</ActiveDebugProfile>
+    <ActiveDebugProfile>djy_AmsApi</ActiveDebugProfile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>

web/djy_AfrApi/Controllers/AfrController.cs

@@ -1,10 +1,14 @@
 using Common.Utilities;
+using djy.IService.Afr;
 using djy.Model;
+using djy.Model.Afr;
+using djy.Model.AFRDto;
 using djy_AfrApi.HttpContextUser;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace djy_AfrApi.Controllers
@@ -13,22 +17,30 @@ namespace djy_AfrApi.Controllers
     {
         private readonly ILogger logger;
         private readonly IUser user;
-        private readonly ILogger bigLogger;
+        private readonly IAfrService afrService;
 
-        public AfrController(ILogger<AfrController> logger, ILoggerFactory loggerFactory, IUser user)
+        //private readonly ILogger bigLogger; 
+
+        public AfrController(ILogger<AfrController> logger,
+                             IUser user,
+                             IAfrService afrService)
         {
             this.logger = logger;
             this.user = user;
+            this.afrService = afrService;
 
             // 获取ILogger对象
-            bigLogger = loggerFactory.CreateLogger("BigDataLogger"); // 通过指定名称获取ILogger对象
+            //ILoggerFactory loggerFactory,
+            //bigLogger = loggerFactory.CreateLogger("BigDataLogger"); // 通过指定名称获取ILogger对象
         }
 
         #region 查询接口
-        [HttpGet("Load")]
-        public async Task<MessageModel> Load()
+        [HttpGet("[action]")]
+        public async Task<MessageModel<List<AFRMaster>>> PageData(AFRMasterPageDataDto input)
         {
-            return MessageModel.Success("12312", new { ff = "11", fff = "22" });
+            var data = afrService.Load();
+
+            return default;
         }
 
         [HttpGet("[action]")]

web/djy_AfrApi/HttpContextUser/AspNetUser.cs

@@ -23,13 +23,16 @@ namespace djy_AfrApi.HttpContextUser
                 var user = accessor.HttpContext.Items["CurrentUser"] as User;
                 if (user != null)
                 {
-                    accessor.HttpContext.Items["CurrentUser"] = user;
                     return user;
                 }
 
                 var userId = accessor.HttpContext.User?.Claims?.FirstOrDefault(c => c.Type == "loginid")?.Value;
-                var user2 = userService.GetUserInfo(userId);
-                if (user2.Data != null) return user2.Data;
+                var userTemp = userService.GetUserInfo(userId);
+                if (userTemp.Data != null)
+                {
+                    accessor.HttpContext.Items["CurrentUser"] = userTemp.Data;
+                    return userTemp.Data;
+                }
 
                 throw new Exception("获取当前登录用户时发生异常");
             }

web/djy_AfrApi/Milldlewares/ExceptionHandlerMiddleware.cs

@@ -1,5 +1,6 @@
 using djy.Model;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System;
 using System.Net;
@@ -10,17 +11,19 @@ namespace djy_AfrApi.Middlewares
     public class ExceptionHandlerMiddleware
     {
         private readonly RequestDelegate _next;
+        private readonly ILogger<ExceptionHandlerMiddleware> logger;
 
-        public ExceptionHandlerMiddleware(RequestDelegate next)
+        public ExceptionHandlerMiddleware(RequestDelegate next, ILogger<ExceptionHandlerMiddleware> logger)
         {
             _next = next;
+            this.logger = logger;
         }
 
         public async Task Invoke(HttpContext context)
         {
             try
             {
-                //_ = int.Parse("");
+                _ = int.Parse("");
                 await _next(context);
             }
             catch (Exception ex)
@@ -32,7 +35,8 @@ namespace djy_AfrApi.Middlewares
         private async Task HandleExceptionAsync(HttpContext context, Exception e)
         {
             if (e == null) return;
-            // TODO ：记录日志
+            
+            logger.LogError(WriteLog("ExceptionHandlerMiddleware中捕获的全局异常", e));
 
             await WriteExceptionAsync(context, e).ConfigureAwait(false);
         }
@@ -56,5 +60,17 @@ namespace djy_AfrApi.Middlewares
                 .WriteAsync(JsonConvert.SerializeObject(new MessageModel() { code = 500, message = message }))
                 .ConfigureAwait(false);
         }
+
+        /// <summary>
+        /// 自定义返回格式
+        /// </summary>
+        /// <param name="throwMsg"></param>
+        /// <param name="ex"></param>
+        /// <returns></returns>
+        public string WriteLog(string throwMsg, Exception ex)
+        {
+            return string.Format("\r\n【自定义错误】：{0} \r\n【异常类型】：{1} \r\n【异常信息】：{2} \r\n【堆栈调用】：{3}\r\n自定义异常结束", new object[] { throwMsg,
+                ex.GetType().Name, ex.Message, ex.StackTrace });
+        }
     }
 }

web/djy_AfrApi/Milldlewares/RequRespLogMiddleware.cs

@@ -31,19 +31,11 @@ namespace djy_AfrApi.Milldlewares
                 //// 存储请求数据
                 var request = context.Request;
                 var sr = new StreamReader(request.Body);
-                RequestLogInfo requestResponse = new RequestLogInfo()
-                {
-                    Path = request.Path,
-                    QueryString = request.QueryString.ToString(),
-                    BodyData = await sr.ReadToEndAsync()
-                };
-                var content = JsonConvert.SerializeObject(requestResponse);
                 
-                if (!string.IsNullOrEmpty(content))
-                {
-                    _logger.LogInformation($"请求 - {context.TraceIdentifier}{Environment.NewLine}{content}");
-                    request.Body.Position = 0;
-                }
+                var bodyData = await sr.ReadToEndAsync();
+               
+                _logger.LogInformation($"请求 - {context.TraceIdentifier}{Environment.NewLine}[Path]:{request.Path}  [QueryString]:{request.QueryString}{Environment.NewLine}[Body]:{bodyData}");
+                request.Body.Position = 0;
 
                 // 存储响应数据
                 using (MemoryStream memoryStream = new MemoryStream())
@@ -62,7 +54,7 @@ namespace djy_AfrApi.Milldlewares
                         string responseBody = new StreamReader(memoryStream).ReadToEnd();
 
                         // 记录响应内容
-                        _logger.LogInformation($"响应 - {context.TraceIdentifier} - {_stopwatch.ElapsedMilliseconds}ms{Environment.NewLine}StatusCode:{context.Response.StatusCode}{Environment.NewLine}{responseBody}");
+                        _logger.LogInformation($"响应 - {context.TraceIdentifier} - {_stopwatch.ElapsedMilliseconds}ms{Environment.NewLine}[StatusCode]:{context.Response.StatusCode}  [Body]:{responseBody}");
 
                         // 将响应内容写回原始响应流
                         memoryStream.Seek(0, SeekOrigin.Begin);

web/djy_AfrApi/NLog.config

@@ -52,7 +52,7 @@
   </targets>
 
   <rules>
-    <!--TRACE,DEBUG,INFO,WARN,ERROR,FATAL-->
+    <!--Min TRACE,DEBUG,INFO,WARN,ERROR,FATAL Max-->
     
     <!--此路由设置了final，所以当此路由被匹配到时。不会再匹配此路由下面的路由。未匹配到此路由时才会继续匹配下一个路由-->
     <logger name="Microsoft.*" maxlevel="Warning" final="true" />

web/djy_AfrApi/appsettings.Development.json

@@ -28,8 +28,8 @@
     "Rbmq_Host": "",
     "Rbmq_UserName": "admin",
     "Rbmq_Password": "admin",
-    "Rbmq_Sqlhost": "Data Source =60.209.125.238; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true",
-    "DapperDbString": "Data Source =60.209.125.238,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;",
+    "Rbmq_Sqlhost": "Data Source =60.209.125.238; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true",
+    "DapperDbString": "Data Source =60.209.125.238,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true;",
     "DataConnList": [
       {
         "SysKey": "AMS",
@@ -37,7 +37,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;"
+        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true;"
       },
       {
         "SysKey": "Common",
@@ -45,7 +45,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;"
+        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true;"
       },
       {
         "SysKey": "djydb",
@@ -53,7 +53,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true"
+        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true"
       },
       {
         "SysKey": "logsdb",
@@ -61,7 +61,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true"
+        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true"
       }
     ]
   }

web/djy_AfrApi/appsettings.Staging.json

@@ -28,8 +28,8 @@
     "Rbmq_Host": "",
     "Rbmq_UserName": "admin",
     "Rbmq_Password": "admin",
-    "Rbmq_Sqlhost": "Data Source =60.209.125.238; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true",
-    "DapperDbString": "Data Source =60.209.125.238,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;",
+    "Rbmq_Sqlhost": "Data Source =60.209.125.238; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true",
+    "DapperDbString": "Data Source =60.209.125.238,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true;",
     "DataConnList": [
       {
         "SysKey": "AMS",
@@ -37,7 +37,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;"
+        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true;"
       },
       {
         "SysKey": "Common",
@@ -45,7 +45,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;"
+        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true;"
       },
       {
         "SysKey": "djydb",
@@ -53,7 +53,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true"
+        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true"
       },
       {
         "SysKey": "logsdb",
@@ -61,7 +61,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true"
+        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true"
       }
     ]
   }

web/djy_IsfApi/appsettings.Development.json

@@ -27,8 +27,8 @@
     "Rbmq_Host": "",
     "Rbmq_UserName": "admin",
     "Rbmq_Password": "admin",
-    "Rbmq_Sqlhost": "Data Source =60.209.125.238; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true",
-    "DapperDbString": "Data Source =60.209.125.238,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;",
+    "Rbmq_Sqlhost": "Data Source =60.209.125.238; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true",
+    "DapperDbString": "Data Source =60.209.125.238,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true;",
     "requesterDea": "nbforwarder",
     "DataConnList": [
 
@@ -38,7 +38,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;"
+        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true;"
       },
       {
         "SysKey": "Common",
@@ -46,7 +46,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;"
+        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true;"
       },
       {
         "SysKey": "djydb",
@@ -54,7 +54,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true"
+        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true"
 
       },
       {
@@ -63,7 +63,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true"
+        "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =sa; Password=Djy@Sql2022.test;pooling=true"
 
       }
 

web/djy_ams.sln

@@ -27,7 +27,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "djy_IsfApi", "djy_IsfApi\dj
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "djy_Report", "djy_Report\djy_Report.csproj", "{A201194B-42CA-41BF-8123-7DB5D332C940}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "djy_AfrApi", "djy_AfrApi\djy_AfrApi.csproj", "{E798A4EC-13E8-4681-8DB7-CB9F3C32A3EE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "djy_AfrApi", "djy_AfrApi\djy_AfrApi.csproj", "{E798A4EC-13E8-4681-8DB7-CB9F3C32A3EE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A168654F-F0E2-408D-8BA1-D71AD5C00850}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution