Merge pull request #1 from Tynab/develop

Develop
Tynab · Jul 10, 2023 · 2e840f1 · 2e840f1
2 parents 143eff6 + 94861eb
commit 2e840f1
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -75,7 +75,7 @@ services:
     volumes:
       - ./logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml:ro,Z
       - ./logstash/pipeline:/usr/share/logstash/pipeline:ro,Z
-      - ./host/YANLib.HttpApi.Host/Logs:/usr/share/logstash/logs:ro,Z
+      - ./app/yanlib/host/YANLib.HttpApi.Host/Logs:/usr/share/logstash/logs:ro,Z
     ports:
       - 9600:9600
       - 5044:5044

diff --git a/host/YANLib.HttpApi.Host/YANLibHttpApiHostModule.cs b/host/YANLib.HttpApi.Host/YANLibHttpApiHostModule.cs
@@ -1,3 +1,5 @@
+using Elastic.Apm.DiagnosticSource;
+using Elastic.Apm.EntityFrameworkCore;
 using Elastic.Apm.NetCoreAll;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Cors;
@@ -22,10 +24,8 @@
 using Volo.Abp.Modularity;
 using Volo.Abp.Swashbuckle;
 using YANLib.EntityFrameworkCore;
-using static System.StringSplitOptions;
 using static Elastic.Apm.Agent;
-using Elastic.Apm.DiagnosticSource;
-using Elastic.Apm.EntityFrameworkCore;
+using static System.StringSplitOptions;
 
 namespace YANLib;
 [DependsOn(

diff --git a/host/YANLib.HttpApi.Host/appsettings.Development.json b/host/YANLib.HttpApi.Host/appsettings.Development.json
@@ -89,7 +89,7 @@
   },
   "ElasticApm": {
     "ServiceName": "YANLib",
-    "SecretToken": "",
+    "SecretToken": "YXBtOmFkbWluMTIz",
     "ServerUrl": "http://apm-server:8200",
     "Environment": "Development",
     "CaptureBody": "all",

diff --git a/host/YANLib.HttpApi.Host/appsettings.Production.json b/host/YANLib.HttpApi.Host/appsettings.Production.json
@@ -89,7 +89,7 @@
   },
   "ElasticApm": {
     "ServiceName": "YANLib",
-    "SecretToken": "",
+    "SecretToken": "YXBtOmFkbWluMTIz",
     "ServerUrl": "http://apm-server:8200",
     "Environment": "Production",
     "CaptureBody": "all",

diff --git a/lib/YANLib/YANLib.csproj b/lib/YANLib/YANLib.csproj
@@ -18,11 +18,11 @@
     <PackAsTool>False</PackAsTool>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryType>git</RepositoryType>
-    <PackageReleaseNotes>Update bool</PackageReleaseNotes>
+    <PackageReleaseNotes>Update model</PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
     <PackageId>Tynab.YANLib</PackageId>
-    <Version>3.1.8</Version>
+    <Version>3.1.9</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/lib/YANLib/YANModel.cs b/lib/YANLib/YANModel.cs
@@ -5,6 +5,11 @@ namespace YANLib;
 
 public static partial class YANModel
 {
+    public static List<T> ConvertList<T>(this T mdl) where T : class => new() { mdl };
+
+    public static HashSet<T> ConvertHashSet<T>(this T mdl) where T : class => new() { mdl };
+
+    public static T[] ConvertArray<T>(this T mdl) where T : class => new T[1] { mdl };
 
     public static T? ChangeTimeZoneAllProperties<T, T1, T2>(this T? mdl, T1 tzSrc, T2 tzDst) where T : class where T1 : struct where T2 : struct
     {