添加密码验证及之前修改

yardbook-web/src/views/admin/turnoverrecord/columns.tsx

@@ -41,12 +41,17 @@ export const columns: BasicColumn[] = [
   {
     title: '承运车号',
     dataIndex: 'truckno',
-    width: 50,
+    width: 100,
   },
   {
     title: '箱号',
     dataIndex: 'boxCode',
-    width: 50,
+    width: 100,
+  },
+  {
+    title: '箱号2',
+    dataIndex: 'boxCode2',
+    width: 100,
   },
   {
     title: '箱货总重(kg)',
@@ -54,12 +59,7 @@ export const columns: BasicColumn[] = [
     width: 50,
   },
   {
-    title: '箱号2',
+    dataIndex: 'createDate',
-    dataIndex: 'boxCode2',
-    width: 40,
-  },
-  {
-    dataIndex: 'creatDate',
     title: '创建日期',
     width: 100,
     // componentProps: {

yardbook-web/src/views/admin/yardbook/columns.tsx

@@ -229,21 +229,21 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 22 },
   },
-  // {
+  {
-  //   field: 'ISTwoBox',
+    field: 'ISTwoBox',
-  //   component: 'RadioButtonGroup',
+    component: 'RadioButtonGroup',
-  //   label: '是否双背',
+    label: '是否双背',
-  //   componentProps: {
+    componentProps: {
-  //     options: [
+      options: [
-  //       { label: '否', value: false },
+        { label: '否', value: false },
-  //       { label: '是', value: true },
+        { label: '是', value: true },
-  //     ],
+      ],
-  //   },
+    },
-  //   defaultValue: false,
+    defaultValue: false,
-  //   colProps: {
+    colProps: {
-  //     span: 22,
+      span: 22,
-  //   },
+    },
-  // },
+  },
   {
     field: 'BoxCode2',
     label: '箱号2:',

yardbookapi-service/Api.xml

@@ -402,6 +402,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:DS.WMS.WebApi.Controllers.YardBookAdminController.GetTurnOverRecordList(DS.Module.Core.PageRequest)">
+            <summary>
+            进出场站记录
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:DS.WMS.WebApi.Controllers.YardBookAdminController.DelYardBookInfo(System.String)">
             <summary>
             删除预约信息

yardbookapi-service/DS.WMS.Core/App/Method/AppService.cs

@@ -1,4 +1,5 @@
-using System.Net.Http.Json;
+using System.ComponentModel;
+using System.Net.Http.Json;
 using DS.Module.Core;
 using DS.Module.Core.Extensions;
 using DS.Module.Core.Helpers;
@@ -310,15 +311,33 @@ public class AppService : IAppService
             }
             else
             {
-                var storeArea = db.Queryable<OP_YARD_CTNMNG_STOREAREAINFO>().First(x => x.PID1 == info.BSNO);
+                #region 更新预约班列信息
-                if (storeArea != null)
+
+                var book = db.Queryable<OP_YARD_BOOK>()
+                    .Where(x => x.BoxCode == trainDetail.CNTRNO && x.AREACODE == trainDetail.AREACODE).First();
+                if (book!=null)
                 {
-                    await db.Deleteable(storeArea).ExecuteCommandAsync();
+                    book.TrainId = trainDetail.YARDTRAINGID;
+                    await db.Updateable(book).ExecuteCommandAsync();
                 }
-                else
+
+                #endregion
+                
+                
+                var storeArea = db.Queryable<OP_YARD_CTNMNG_STOREAREAINFO>().First(x => x.CNTRNO == trainDetail.CNTRNO && x.AREACODE == trainDetail.AREACODE);
+                if (storeArea != null)
                 {
-                    return DataResult.Failed("箱位信息不存在");
+                    await db.Deleteable(storeArea).ExecuteCommandAsync();
                 }
+                // var storeArea = db.Queryable<OP_YARD_CTNMNG_STOREAREAINFO>().First(x => x.PID1 == info.BSNO);
+                // if (storeArea != null)
+                // {
+                //     await db.Deleteable(storeArea).ExecuteCommandAsync();
+                // }
+                // else
+                // {
+                //     return DataResult.Failed("箱位信息不存在");
+                // }
             }
 
             info.WORKSTATUS = "已处理";
@@ -434,12 +453,36 @@ public class AppService : IAppService
     {
         int totalCount = 0;
         var userId = user.UserId;
-
+        var sort = new SortCondition
-        var data = db.Queryable<OpWorkDetail>().Where(x => x.OP == Guid.Parse(userId))
+        {
+            SortField = "DODATE",
+            ListSortDirection = ListSortDirection.Descending
+        };
+        // var sorts = new SortCondition[5];
+        // sorts.
+        var page = new PageRequest()
+        {
+            PageCondition = new PageCondition()
+            {
+                PageIndex = query.PageIndex,
+                PageSize = query.PageSize,
+                SortConditions = new SortCondition[]{sort},
+            }
+        };
+        // var data = db.Queryable<OpWorkDetail>().Where(x => x.OP == Guid.Parse(userId))
+        //     .WhereIF(!query.CNTRNO.IsNullOrEmpty(), x => x.BoxCode.Contains(query.CNTRNO.Trim()))
+        //     .WhereIF(!query.StartDate.IsNull(), x => x.DODATE>= query.StartDate && x.DODATE<= query.EndDate)
+        //     .OrderByDescending(x => x.DODATE)
+        //     .ToPageList(query.PageIndex, query.PageSize, ref totalCount).ToList();
+        // return DataResult<List<OpWorkDetail>>.Success(data);
+        //序列化查询条件
+        // var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
+        var data = db.Queryable<OpWorkDetail>()
+            .Where(x => x.OP == Guid.Parse(userId))
             .WhereIF(!query.CNTRNO.IsNullOrEmpty(), x => x.BoxCode.Contains(query.CNTRNO.Trim()))
             .WhereIF(!query.StartDate.IsNull(), x => x.DODATE>= query.StartDate && x.DODATE<= query.EndDate)
             .OrderByDescending(x => x.DODATE)
-            .ToPageList(query.PageIndex, query.PageSize, ref totalCount).ToList();
+            .ToQueryPage(page.PageCondition);
-        return DataResult<List<OpWorkDetail>>.Success(data);
+        return data; 
     }
 }

yardbookapi-service/DS.WMS.Core/System/Dtos/ChangePasswordInput.cs

@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using FluentValidation;
 
 namespace DS.WMS.Core.System.Dtos;
@@ -18,6 +19,7 @@ public class ChangePasswordInput
     /// <summary>
     /// 新密码
     /// </summary>
+    [RegularExpression(pattern:@"^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$",ErrorMessage ="新密码至少要包含8个字符，同时包含至少一个大写字母、一个小写字母、一个数字和一个特殊字符")]
     public string NewPassword { get; set; }
     /// <summary>
     /// 确认密码

yardbookapi-service/DS.WMS.Core/System/Dtos/CompanyRegisterInput.cs

@@ -1,4 +1,5 @@
-using FluentValidation;
+using System.ComponentModel.DataAnnotations;
+using FluentValidation;
 
 namespace DS.WMS.Core.System.Dtos;
 
@@ -42,6 +43,7 @@ public class CompanyRegisterInput
     /// <summary>
     /// 密码
     /// </summary>
+    [RegularExpression(pattern:@"^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$",ErrorMessage ="密码至少要包含8个字符，同时包含至少一个大写字母、一个小写字母、一个数字和一个特殊字符")]
     public string Password { get; set; }
     /// <summary>
     /// 重复密码

yardbookapi-service/DS.WMS.Core/System/Dtos/UserInput.cs

@@ -1,4 +1,5 @@
-using DS.Module.Core.Extensions;
+using System.ComponentModel.DataAnnotations;
+using DS.Module.Core.Extensions;
 using DS.WMS.Core.System.Entity;
 using FluentValidation;
 
@@ -23,6 +24,7 @@ public class UserInput
     /// Default:
     /// Nullable:True
     /// </summary>
+    [RegularExpression(pattern:@"^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$",ErrorMessage ="密码至少要包含8个字符，同时包含至少一个大写字母、一个小写字母、一个数字和一个特殊字符")] 
     public string Password { get; set; }
 
     /// <summary>

yardbookapi-service/DS.WMS.Core/System/Method/CompanyService.cs

@@ -65,7 +65,7 @@ public class CompanyService : ICompanyService
         }
 
         var auditCompany = db.Queryable<OP_YARD_COMPANY>().Where(x =>
-            x.TAXNO == model.TaxCode && (x.AuditStatus == AuditStatus.NoAudit.ToEnumInt() && x.AuditStatus == AuditStatus.Auditing.ToEnumInt())).Select(x => x.TAXNO).First();
+            x.TAXNO == model.TaxCode && (x.AuditStatus == AuditStatus.NoAudit.ToEnumInt() || x.AuditStatus == AuditStatus.Auditing.ToEnumInt())).Select(x => x.TAXNO).First();
         if (!auditCompany.IsNullOrEmpty())
         {
             return DataResult.Failed("该企业信息待提交或待审批,请勿重复提交!");

yardbookapi-service/DS.WMS.Core/System/Method/UserService.cs

@@ -633,7 +633,7 @@ public class UserService : IUserService
             var record = new RouteItem
             {
                 Path = "/turnoverrecord",
-                Name = "YardBook",
+                Name = "TurnOverRecord",
                 Meta = new RouteMeta
                 {
                     Title = "进场站记录",

yardbookapi-service/DS.WMS.WebApi/Logs/internal-nlog.txt

@@ -2715,3 +2715,135 @@
 2023-09-26 09:07:04.9414 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.0.1.1159. Product version: 5.0.1+a3718b8417284a90b0f73b2cbba47bc4067f6a3a. GlobalAssemblyCache: False
 2023-09-26 17:59:19.1314 Info AppDomain Shutting down. LogFactory closing...
 2023-09-26 17:59:19.1847 Info LogFactory has been closed.
+2023-10-10 14:29:36.4727 Info Message Template Auto Format enabled
+2023-10-10 14:29:36.5124 Info Loading assembly: NLog.Web.AspNetCore
+2023-10-10 14:29:36.8192 Info Adding target FileTarget(Name=allfile)
+2023-10-10 14:29:36.8192 Info Adding target FileTarget(Name=ownFile-web)
+2023-10-10 14:29:36.8721 Info Adding target ColoredConsoleTarget(Name=console)
+2023-10-10 14:29:36.9813 Info Validating config: TargetNames=allfile, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\YardBookSolution\yardbookapi-service\DS.WMS.WebApi\bin\Debug\net6.0\NLog.config
+2023-10-10 14:29:37.0067 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: console
+2023-10-10 14:29:37.0489 Info Configuration initialized.
+2023-10-10 14:29:37.0816 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.0.1.1159. Product version: 5.0.1+a3718b8417284a90b0f73b2cbba47bc4067f6a3a. GlobalAssemblyCache: False
+2023-10-10 18:13:02.1732 Info AppDomain Shutting down. LogFactory closing...
+2023-10-10 18:13:02.2117 Info LogFactory has been closed.
+2023-10-11 08:53:05.3024 Info Message Template Auto Format enabled
+2023-10-11 08:53:05.3597 Info Loading assembly: NLog.Web.AspNetCore
+2023-10-11 08:53:05.6935 Info Adding target FileTarget(Name=allfile)
+2023-10-11 08:53:05.7110 Info Adding target FileTarget(Name=ownFile-web)
+2023-10-11 08:53:05.7565 Info Adding target ColoredConsoleTarget(Name=console)
+2023-10-11 08:53:05.8916 Info Validating config: TargetNames=allfile, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\YardBookSolution\yardbookapi-service\DS.WMS.WebApi\bin\Debug\net6.0\NLog.config
+2023-10-11 08:53:05.9243 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: console
+2023-10-11 08:53:05.9759 Info Configuration initialized.
+2023-10-11 08:53:06.0021 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.0.1.1159. Product version: 5.0.1+a3718b8417284a90b0f73b2cbba47bc4067f6a3a. GlobalAssemblyCache: False
+2023-10-11 08:56:47.7803 Info AppDomain Shutting down. LogFactory closing...
+2023-10-11 08:56:47.8110 Info LogFactory has been closed.
+2023-10-11 08:57:07.0181 Info Message Template Auto Format enabled
+2023-10-11 08:57:07.0181 Info Loading assembly: NLog.Web.AspNetCore
+2023-10-11 08:57:07.1040 Info Adding target FileTarget(Name=allfile)
+2023-10-11 08:57:07.1040 Info Adding target FileTarget(Name=ownFile-web)
+2023-10-11 08:57:07.1195 Info Adding target ColoredConsoleTarget(Name=console)
+2023-10-11 08:57:07.1564 Info Validating config: TargetNames=allfile, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\YardBookSolution\yardbookapi-service\DS.WMS.WebApi\bin\Debug\net6.0\NLog.config
+2023-10-11 08:57:07.1692 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: console
+2023-10-11 08:57:07.1849 Info Configuration initialized.
+2023-10-11 08:57:07.1910 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.0.1.1159. Product version: 5.0.1+a3718b8417284a90b0f73b2cbba47bc4067f6a3a. GlobalAssemblyCache: False
+2023-10-11 18:04:13.4752 Info AppDomain Shutting down. LogFactory closing...
+2023-10-11 18:04:13.5485 Info LogFactory has been closed.
+2023-10-30 09:42:14.5514 Info Message Template Auto Format enabled
+2023-10-30 09:42:14.5737 Info Loading assembly: NLog.Web.AspNetCore
+2023-10-30 09:42:14.6786 Info Adding target FileTarget(Name=allfile)
+2023-10-30 09:42:14.6836 Info Adding target FileTarget(Name=ownFile-web)
+2023-10-30 09:42:14.6836 Info Adding target ColoredConsoleTarget(Name=console)
+2023-10-30 09:42:14.7290 Info Validating config: TargetNames=allfile, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\YardBookSolution\yardbookapi-service\DS.WMS.WebApi\bin\Debug\net6.0\NLog.config
+2023-10-30 09:42:14.7290 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: console
+2023-10-30 09:42:14.7519 Info Configuration initialized.
+2023-10-30 09:42:14.7600 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.0.1.1159. Product version: 5.0.1+a3718b8417284a90b0f73b2cbba47bc4067f6a3a. GlobalAssemblyCache: False
+2023-10-30 10:05:17.4573 Info AppDomain Shutting down. LogFactory closing...
+2023-10-30 10:05:17.4733 Info LogFactory has been closed.
+2023-10-30 10:05:40.6015 Info Message Template Auto Format enabled
+2023-10-30 10:05:40.6205 Info Loading assembly: NLog.Web.AspNetCore
+2023-10-30 10:05:40.7059 Info Adding target FileTarget(Name=allfile)
+2023-10-30 10:05:40.7059 Info Adding target FileTarget(Name=ownFile-web)
+2023-10-30 10:05:40.7200 Info Adding target ColoredConsoleTarget(Name=console)
+2023-10-30 10:05:40.7492 Info Validating config: TargetNames=allfile, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\YardBookSolution\yardbookapi-service\DS.WMS.WebApi\bin\Debug\net6.0\NLog.config
+2023-10-30 10:05:40.7492 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: console
+2023-10-30 10:05:40.7700 Info Configuration initialized.
+2023-10-30 10:05:40.7756 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.0.1.1159. Product version: 5.0.1+a3718b8417284a90b0f73b2cbba47bc4067f6a3a. GlobalAssemblyCache: False
+2023-10-30 10:28:58.8469 Info AppDomain Shutting down. LogFactory closing...
+2023-10-30 10:28:58.8649 Info LogFactory has been closed.
+2023-10-30 10:29:18.9397 Info Message Template Auto Format enabled
+2023-10-30 10:29:18.9605 Info Loading assembly: NLog.Web.AspNetCore
+2023-10-30 10:29:19.0661 Info Adding target FileTarget(Name=allfile)
+2023-10-30 10:29:19.0728 Info Adding target FileTarget(Name=ownFile-web)
+2023-10-30 10:29:19.0728 Info Adding target ColoredConsoleTarget(Name=console)
+2023-10-30 10:29:19.1256 Info Validating config: TargetNames=allfile, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\YardBookSolution\yardbookapi-service\DS.WMS.WebApi\bin\Debug\net6.0\NLog.config
+2023-10-30 10:29:19.1348 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: console
+2023-10-30 10:29:19.1514 Info Configuration initialized.
+2023-10-30 10:29:19.1514 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.0.1.1159. Product version: 5.0.1+a3718b8417284a90b0f73b2cbba47bc4067f6a3a. GlobalAssemblyCache: False
+2023-10-30 10:31:04.1402 Info AppDomain Shutting down. LogFactory closing...
+2023-10-30 10:31:04.1715 Info LogFactory has been closed.
+2023-10-30 10:33:26.4968 Info Message Template Auto Format enabled
+2023-10-30 10:33:26.5104 Info Loading assembly: NLog.Web.AspNetCore
+2023-10-30 10:33:26.5775 Info Adding target FileTarget(Name=allfile)
+2023-10-30 10:33:26.5775 Info Adding target FileTarget(Name=ownFile-web)
+2023-10-30 10:33:26.5974 Info Adding target ColoredConsoleTarget(Name=console)
+2023-10-30 10:33:26.6327 Info Validating config: TargetNames=allfile, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\YardBookSolution\yardbookapi-service\DS.WMS.WebApi\bin\Debug\net6.0\NLog.config
+2023-10-30 10:33:26.6429 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: console
+2023-10-30 10:33:26.6648 Info Configuration initialized.
+2023-10-30 10:33:26.6745 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.0.1.1159. Product version: 5.0.1+a3718b8417284a90b0f73b2cbba47bc4067f6a3a. GlobalAssemblyCache: False
+2023-10-30 14:59:07.1917 Info AppDomain Shutting down. LogFactory closing...
+2023-10-30 14:59:07.2273 Info LogFactory has been closed.
+2023-10-30 15:00:03.9122 Info Message Template Auto Format enabled
+2023-10-30 15:00:03.9788 Info Loading assembly: NLog.Web.AspNetCore
+2023-10-30 15:00:04.2809 Info Adding target FileTarget(Name=allfile)
+2023-10-30 15:00:04.2809 Info Adding target FileTarget(Name=ownFile-web)
+2023-10-30 15:00:04.3303 Info Adding target ColoredConsoleTarget(Name=console)
+2023-10-30 15:00:04.4580 Info Validating config: TargetNames=allfile, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\YardBookSolution\yardbookapi-service\DS.WMS.WebApi\bin\Debug\net6.0\NLog.config
+2023-10-30 15:00:04.4883 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: console
+2023-10-30 15:00:04.5440 Info Configuration initialized.
+2023-10-30 15:00:04.5659 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.0.1.1159. Product version: 5.0.1+a3718b8417284a90b0f73b2cbba47bc4067f6a3a. GlobalAssemblyCache: False
+2023-10-30 15:01:18.6846 Info AppDomain Shutting down. LogFactory closing...
+2023-10-30 15:01:18.7059 Info LogFactory has been closed.
+2023-10-30 15:01:49.2682 Info Message Template Auto Format enabled
+2023-10-30 15:01:49.2861 Info Loading assembly: NLog.Web.AspNetCore
+2023-10-30 15:01:49.3692 Info Adding target FileTarget(Name=allfile)
+2023-10-30 15:01:49.3692 Info Adding target FileTarget(Name=ownFile-web)
+2023-10-30 15:01:49.3845 Info Adding target ColoredConsoleTarget(Name=console)
+2023-10-30 15:01:49.4207 Info Validating config: TargetNames=allfile, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\YardBookSolution\yardbookapi-service\DS.WMS.WebApi\bin\Debug\net6.0\NLog.config
+2023-10-30 15:01:49.4320 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: console
+2023-10-30 15:01:49.4491 Info Configuration initialized.
+2023-10-30 15:01:49.4491 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.0.1.1159. Product version: 5.0.1+a3718b8417284a90b0f73b2cbba47bc4067f6a3a. GlobalAssemblyCache: False
+2023-10-30 18:12:03.8742 Info AppDomain Shutting down. LogFactory closing...
+2023-10-30 18:12:03.9073 Info LogFactory has been closed.
+2023-11-09 14:47:24.7359 Info Message Template Auto Format enabled
+2023-11-09 14:47:24.7828 Info Loading assembly: NLog.Web.AspNetCore
+2023-11-09 14:47:24.9371 Info Adding target FileTarget(Name=allfile)
+2023-11-09 14:47:24.9371 Info Adding target FileTarget(Name=ownFile-web)
+2023-11-09 14:47:24.9655 Info Adding target ColoredConsoleTarget(Name=console)
+2023-11-09 14:47:25.0325 Info Validating config: TargetNames=allfile, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\YardBookSolution\yardbookapi-service\DS.WMS.WebApi\bin\Debug\net6.0\NLog.config
+2023-11-09 14:47:25.0488 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: console
+2023-11-09 14:47:25.0711 Info Configuration initialized.
+2023-11-09 14:47:25.0870 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.0.1.1159. Product version: 5.0.1+a3718b8417284a90b0f73b2cbba47bc4067f6a3a. GlobalAssemblyCache: False
+2023-11-09 18:03:28.2280 Info AppDomain Shutting down. LogFactory closing...
+2023-11-09 18:03:28.2634 Info LogFactory has been closed.
+2024-01-18 09:38:21.0241 Info Message Template Auto Format enabled
+2024-01-18 09:38:21.0539 Info Loading assembly: NLog.Web.AspNetCore
+2024-01-18 09:38:21.1596 Info Adding target FileTarget(Name=allfile)
+2024-01-18 09:38:21.1596 Info Adding target FileTarget(Name=ownFile-web)
+2024-01-18 09:38:21.1887 Info Adding target ColoredConsoleTarget(Name=console)
+2024-01-18 09:38:21.2542 Info Validating config: TargetNames=allfile, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\YardBookSolution\yardbookapi-service\DS.WMS.WebApi\bin\Debug\net6.0\NLog.config
+2024-01-18 09:38:21.2704 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: console
+2024-01-18 09:38:21.2916 Info Configuration initialized.
+2024-01-18 09:38:21.3114 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.0.1.1159. Product version: 5.0.1+a3718b8417284a90b0f73b2cbba47bc4067f6a3a. GlobalAssemblyCache: False
+2024-01-18 09:45:24.8696 Info AppDomain Shutting down. LogFactory closing...
+2024-01-18 09:45:24.8930 Info LogFactory has been closed.
+2024-01-18 09:45:50.3808 Info Message Template Auto Format enabled
+2024-01-18 09:45:50.4203 Info Loading assembly: NLog.Web.AspNetCore
+2024-01-18 09:45:50.6202 Info Adding target FileTarget(Name=allfile)
+2024-01-18 09:45:50.6333 Info Adding target FileTarget(Name=ownFile-web)
+2024-01-18 09:45:50.6694 Info Adding target ColoredConsoleTarget(Name=console)
+2024-01-18 09:45:50.8532 Info Validating config: TargetNames=allfile, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\YardBookSolution\yardbookapi-service\DS.WMS.WebApi\bin\Debug\net6.0\NLog.config
+2024-01-18 09:45:50.8932 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: console
+2024-01-18 09:45:50.9552 Info Configuration initialized.
+2024-01-18 09:45:50.9949 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.0.1.1159. Product version: 5.0.1+a3718b8417284a90b0f73b2cbba47bc4067f6a3a. GlobalAssemblyCache: False
+2024-01-18 09:49:00.5330 Info AppDomain Shutting down. LogFactory closing...
+2024-01-18 09:49:00.5783 Info LogFactory has been closed.

yardbookapi-service/DS.WMS.WebApi/appsettings.json

@@ -8,7 +8,7 @@
   "AllowedHosts": "*",
   "ConnectionStrings": {
     "DbType": "1",// MySql = 0, SqlServer  1,
-    "DbInfo": "Data Source=60.209.125.238,32009;Initial Catalog=ShippingWeb_DJZ;Persist Security Info=True;User ID=sa;Password=sa@djy.net;Connect Timeout=500;"
+    "DbInfo": "Data Source=60.209.125.238,32009;Initial Catalog=ShippingWeb_DJZ_20230925;Persist Security Info=True;User ID=sa;Password=Djy@Sql2022.test;Connect Timeout=500;"
 //    "DbInfo": "Data Source=Gumang\\SQLEXPRESS;Initial Catalog=ShippingWeb_DJZ;Trusted_Connection=True"
   },
   "JwtSettings": {