diff --git a/.vs/ProjectEvaluation/seyounth.auto.hs.metadata.v9.bin b/.vs/ProjectEvaluation/seyounth.auto.hs.metadata.v9.bin new file mode 100644 index 0000000..ddc4149 Binary files /dev/null and b/.vs/ProjectEvaluation/seyounth.auto.hs.metadata.v9.bin differ diff --git a/.vs/ProjectEvaluation/seyounth.auto.hs.projects.v9.bin b/.vs/ProjectEvaluation/seyounth.auto.hs.projects.v9.bin new file mode 100644 index 0000000..887c2db Binary files /dev/null and b/.vs/ProjectEvaluation/seyounth.auto.hs.projects.v9.bin differ diff --git a/.vs/ProjectEvaluation/seyounth.auto.hs.strings.v9.bin b/.vs/ProjectEvaluation/seyounth.auto.hs.strings.v9.bin new file mode 100644 index 0000000..58f0ea9 Binary files /dev/null and b/.vs/ProjectEvaluation/seyounth.auto.hs.strings.v9.bin differ diff --git a/.vs/Seyounth.Auto.Hs/DesignTimeBuild/.dtbcache.v2 b/.vs/Seyounth.Auto.Hs/DesignTimeBuild/.dtbcache.v2 new file mode 100644 index 0000000..8e94480 Binary files /dev/null and b/.vs/Seyounth.Auto.Hs/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/Seyounth.Auto.Hs/config/applicationhost.config b/.vs/Seyounth.Auto.Hs/config/applicationhost.config new file mode 100644 index 0000000..0d88f0d --- /dev/null +++ b/.vs/Seyounth.Auto.Hs/config/applicationhost.config @@ -0,0 +1,1016 @@ + + + + + + + +
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ + +
+
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.vs/Seyounth.Auto.Hs/v17/.futdcache.v2 b/.vs/Seyounth.Auto.Hs/v17/.futdcache.v2 new file mode 100644 index 0000000..cb509ad Binary files /dev/null and b/.vs/Seyounth.Auto.Hs/v17/.futdcache.v2 differ diff --git a/Seyounth.Auto.Hs.sln b/Seyounth.Auto.Hs.sln index eea76c4..43bc3e8 100644 --- a/Seyounth.Auto.Hs.sln +++ b/Seyounth.Auto.Hs.sln @@ -1,6 +1,43 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Seyounth.Auto.Hs.Runtime", "Seyounth.Auto.Hs.Runtime\Seyounth.Auto.Hs.Runtime.csproj", "{6966BCFD-A22C-4C83-8171-96BB005F38D4}" +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34616.47 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Share", "Share", "{156E45DF-D59B-4EA0-9BC0-77692BD91E1E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Service", "Service", "{685CBDEC-BE8B-4B23-8EDA-42C0B312322F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "apps", "apps", "{EB48C776-7740-4A71-8E82-B7AE9CFEB7C3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Syc.Basic.Web.WMS.HttpApi.Host", "apps\Syc.Basic.Web.WMS.HttpApi.Host\Syc.Basic.Web.WMS.HttpApi.Host.csproj", "{E3F72AF0-2B74-46B9-837A-A5C1417CFBF8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Syc.Basic.Web.WMS.Application", "services\Syc.Basic.Web.WMS.Application\Syc.Basic.Web.WMS.Application.csproj", "{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Syc.Basic.Web.WMS.Application.Contracts", "services\Syc.Basic.Web.WMS.Application.Contracts\Syc.Basic.Web.WMS.Application.Contracts.csproj", "{A454C322-58E6-4FEB-B709-5E277C7E71B7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Syc.Basic.Web.WMS.Domain", "services\Syc.Basic.Web.WMS.Domain\Syc.Basic.Web.WMS.Domain.csproj", "{B1BFBB4E-0213-4D41-A05B-43C276F9CDAB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Syc.Basic.Web.WMS.Domain.Shared", "services\Syc.Basic.Web.WMS.Domain.Shared\Syc.Basic.Web.WMS.Domain.Shared.csproj", "{7A014245-A193-435C-B1BA-2666EBD86CCA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Syc.Basic.Web.WMS.EntityFrameworkCore", "services\Syc.Basic.Web.WMS.EntityFrameworkCore\Syc.Basic.Web.WMS.EntityFrameworkCore.csproj", "{3B487959-6744-4784-B5F8-F91012F37C70}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Syc.Basic.Web.WMS.HttpApi", "services\Syc.Basic.Web.WMS.HttpApi\Syc.Basic.Web.WMS.HttpApi.csproj", "{68ECAB75-580B-425E-9D84-832E6F6F8BCD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Syc.Basic.Web.WMS.HttpApi.Client", "services\Syc.Basic.Web.WMS.HttpApi.Client\Syc.Basic.Web.WMS.HttpApi.Client.csproj", "{A12CE372-B83A-43A1-86CB-CEAF4B2C4154}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Seyounth.Auto.Hs.Runtime", "share\Seyounth.Auto.Hs.Runtime\Seyounth.Auto.Hs.Runtime.csproj", "{0AA64147-2900-4336-B8B7-B2F385DAD4A2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Seyounth.Auto.Plc", "share\Seyounth.Auto.Plc\Seyounth.Auto.Plc.csproj", "{ECA65280-9549-40C5-9876-21D111D7C811}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Syc.Abp.Application.Contracts", "share\Syc.Abp.Application.Contracts\Syc.Abp.Application.Contracts.csproj", "{3881133B-BE58-46FA-978F-558A53004984}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Syc.Abp.Caching", "share\Syc.Abp.Caching\Syc.Abp.Caching.csproj", "{EB8E5222-4E85-4EBD-9894-33238CE89662}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Syc.Abp.Domain", "share\Syc.Abp.Domain\Syc.Abp.Domain.csproj", "{E0ACC792-32CF-4698-A2DF-5697BD4395F0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Syc.Abp.HttpApi.Client", "share\Syc.Abp.HttpApi.Client\Syc.Abp.HttpApi.Client.csproj", "{68D70001-A1DA-4D99-A828-98346F42C435}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Syc.Authorize.JwtBearer", "share\Syc.Authorize.JwtBearer\Syc.Authorize.JwtBearer.csproj", "{D5714C79-0651-4BAB-80D2-65D73B82E2F1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -8,9 +45,88 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6966BCFD-A22C-4C83-8171-96BB005F38D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6966BCFD-A22C-4C83-8171-96BB005F38D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6966BCFD-A22C-4C83-8171-96BB005F38D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6966BCFD-A22C-4C83-8171-96BB005F38D4}.Release|Any CPU.Build.0 = Release|Any CPU + {E3F72AF0-2B74-46B9-837A-A5C1417CFBF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E3F72AF0-2B74-46B9-837A-A5C1417CFBF8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E3F72AF0-2B74-46B9-837A-A5C1417CFBF8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E3F72AF0-2B74-46B9-837A-A5C1417CFBF8}.Release|Any CPU.Build.0 = Release|Any CPU + {3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}.Release|Any CPU.Build.0 = Release|Any CPU + {A454C322-58E6-4FEB-B709-5E277C7E71B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A454C322-58E6-4FEB-B709-5E277C7E71B7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A454C322-58E6-4FEB-B709-5E277C7E71B7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A454C322-58E6-4FEB-B709-5E277C7E71B7}.Release|Any CPU.Build.0 = Release|Any CPU + {B1BFBB4E-0213-4D41-A05B-43C276F9CDAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B1BFBB4E-0213-4D41-A05B-43C276F9CDAB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B1BFBB4E-0213-4D41-A05B-43C276F9CDAB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B1BFBB4E-0213-4D41-A05B-43C276F9CDAB}.Release|Any CPU.Build.0 = Release|Any CPU + {7A014245-A193-435C-B1BA-2666EBD86CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7A014245-A193-435C-B1BA-2666EBD86CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7A014245-A193-435C-B1BA-2666EBD86CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7A014245-A193-435C-B1BA-2666EBD86CCA}.Release|Any CPU.Build.0 = Release|Any CPU + {3B487959-6744-4784-B5F8-F91012F37C70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3B487959-6744-4784-B5F8-F91012F37C70}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3B487959-6744-4784-B5F8-F91012F37C70}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3B487959-6744-4784-B5F8-F91012F37C70}.Release|Any CPU.Build.0 = Release|Any CPU + {68ECAB75-580B-425E-9D84-832E6F6F8BCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {68ECAB75-580B-425E-9D84-832E6F6F8BCD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {68ECAB75-580B-425E-9D84-832E6F6F8BCD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {68ECAB75-580B-425E-9D84-832E6F6F8BCD}.Release|Any CPU.Build.0 = Release|Any CPU + {A12CE372-B83A-43A1-86CB-CEAF4B2C4154}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A12CE372-B83A-43A1-86CB-CEAF4B2C4154}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A12CE372-B83A-43A1-86CB-CEAF4B2C4154}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A12CE372-B83A-43A1-86CB-CEAF4B2C4154}.Release|Any CPU.Build.0 = Release|Any CPU + {0AA64147-2900-4336-B8B7-B2F385DAD4A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0AA64147-2900-4336-B8B7-B2F385DAD4A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0AA64147-2900-4336-B8B7-B2F385DAD4A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0AA64147-2900-4336-B8B7-B2F385DAD4A2}.Release|Any CPU.Build.0 = Release|Any CPU + {ECA65280-9549-40C5-9876-21D111D7C811}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ECA65280-9549-40C5-9876-21D111D7C811}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ECA65280-9549-40C5-9876-21D111D7C811}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ECA65280-9549-40C5-9876-21D111D7C811}.Release|Any CPU.Build.0 = Release|Any CPU + {3881133B-BE58-46FA-978F-558A53004984}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3881133B-BE58-46FA-978F-558A53004984}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3881133B-BE58-46FA-978F-558A53004984}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3881133B-BE58-46FA-978F-558A53004984}.Release|Any CPU.Build.0 = Release|Any CPU + {EB8E5222-4E85-4EBD-9894-33238CE89662}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EB8E5222-4E85-4EBD-9894-33238CE89662}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EB8E5222-4E85-4EBD-9894-33238CE89662}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EB8E5222-4E85-4EBD-9894-33238CE89662}.Release|Any CPU.Build.0 = Release|Any CPU + {E0ACC792-32CF-4698-A2DF-5697BD4395F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E0ACC792-32CF-4698-A2DF-5697BD4395F0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E0ACC792-32CF-4698-A2DF-5697BD4395F0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E0ACC792-32CF-4698-A2DF-5697BD4395F0}.Release|Any CPU.Build.0 = Release|Any CPU + {68D70001-A1DA-4D99-A828-98346F42C435}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {68D70001-A1DA-4D99-A828-98346F42C435}.Debug|Any CPU.Build.0 = Debug|Any CPU + {68D70001-A1DA-4D99-A828-98346F42C435}.Release|Any CPU.ActiveCfg = Release|Any CPU + {68D70001-A1DA-4D99-A828-98346F42C435}.Release|Any CPU.Build.0 = Release|Any CPU + {D5714C79-0651-4BAB-80D2-65D73B82E2F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5714C79-0651-4BAB-80D2-65D73B82E2F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5714C79-0651-4BAB-80D2-65D73B82E2F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5714C79-0651-4BAB-80D2-65D73B82E2F1}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {E3F72AF0-2B74-46B9-837A-A5C1417CFBF8} = {EB48C776-7740-4A71-8E82-B7AE9CFEB7C3} + {3137A5F4-375A-4FB0-AA4B-7C0380A48BB2} = {685CBDEC-BE8B-4B23-8EDA-42C0B312322F} + {A454C322-58E6-4FEB-B709-5E277C7E71B7} = {685CBDEC-BE8B-4B23-8EDA-42C0B312322F} + {B1BFBB4E-0213-4D41-A05B-43C276F9CDAB} = {685CBDEC-BE8B-4B23-8EDA-42C0B312322F} + {7A014245-A193-435C-B1BA-2666EBD86CCA} = {685CBDEC-BE8B-4B23-8EDA-42C0B312322F} + {3B487959-6744-4784-B5F8-F91012F37C70} = {685CBDEC-BE8B-4B23-8EDA-42C0B312322F} + {68ECAB75-580B-425E-9D84-832E6F6F8BCD} = {685CBDEC-BE8B-4B23-8EDA-42C0B312322F} + {A12CE372-B83A-43A1-86CB-CEAF4B2C4154} = {685CBDEC-BE8B-4B23-8EDA-42C0B312322F} + {0AA64147-2900-4336-B8B7-B2F385DAD4A2} = {156E45DF-D59B-4EA0-9BC0-77692BD91E1E} + {ECA65280-9549-40C5-9876-21D111D7C811} = {156E45DF-D59B-4EA0-9BC0-77692BD91E1E} + {3881133B-BE58-46FA-978F-558A53004984} = {156E45DF-D59B-4EA0-9BC0-77692BD91E1E} + {EB8E5222-4E85-4EBD-9894-33238CE89662} = {156E45DF-D59B-4EA0-9BC0-77692BD91E1E} + {E0ACC792-32CF-4698-A2DF-5697BD4395F0} = {156E45DF-D59B-4EA0-9BC0-77692BD91E1E} + {68D70001-A1DA-4D99-A828-98346F42C435} = {156E45DF-D59B-4EA0-9BC0-77692BD91E1E} + {D5714C79-0651-4BAB-80D2-65D73B82E2F1} = {156E45DF-D59B-4EA0-9BC0-77692BD91E1E} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {45CD52A2-9BCF-4BCE-BFE4-6512506C0D1F} EndGlobalSection EndGlobal diff --git a/apps/Syc.Basic.Web.WMS.HttpApi.Host/Program.cs b/apps/Syc.Basic.Web.WMS.HttpApi.Host/Program.cs index 954f997..5b3d5fc 100644 --- a/apps/Syc.Basic.Web.WMS.HttpApi.Host/Program.cs +++ b/apps/Syc.Basic.Web.WMS.HttpApi.Host/Program.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; +using Syc.Authorize.JwtBearer; namespace Syc.Basic.Web.WMS; diff --git a/apps/Syc.Basic.Web.WMS.HttpApi.Host/Syc.Basic.Web.WMS.HttpApi.Host.csproj b/apps/Syc.Basic.Web.WMS.HttpApi.Host/Syc.Basic.Web.WMS.HttpApi.Host.csproj index acbbeb7..76ef660 100644 --- a/apps/Syc.Basic.Web.WMS.HttpApi.Host/Syc.Basic.Web.WMS.HttpApi.Host.csproj +++ b/apps/Syc.Basic.Web.WMS.HttpApi.Host/Syc.Basic.Web.WMS.HttpApi.Host.csproj @@ -10,7 +10,7 @@ - + @@ -33,8 +33,6 @@ - - diff --git a/apps/Syc.Basic.Web.WMS.HttpApi.Host/WMSHttpApiHostModule.cs b/apps/Syc.Basic.Web.WMS.HttpApi.Host/WMSHttpApiHostModule.cs index 352c04f..5248c81 100644 --- a/apps/Syc.Basic.Web.WMS.HttpApi.Host/WMSHttpApiHostModule.cs +++ b/apps/Syc.Basic.Web.WMS.HttpApi.Host/WMSHttpApiHostModule.cs @@ -23,10 +23,13 @@ using Volo.Abp.Caching; using Volo.Abp.AspNetCore.Mvc.AntiForgery; using System.Net; using StackExchange.Redis; +using Syc.Authorize.JwtBearer; +using Microsoft.Extensions.DependencyInjection.Extensions; namespace Syc.Basic.Web.WMS; [DependsOn( + typeof(JwtBearerAuthenticationModule), typeof(WMSHttpApiModule), typeof(AbpAutofacModule), typeof(WMSApplicationModule), diff --git a/apps/Syc.Basic.Web.WMS.HttpApi.Host/appsettings.json b/apps/Syc.Basic.Web.WMS.HttpApi.Host/appsettings.json index 5649055..89f06cd 100644 --- a/apps/Syc.Basic.Web.WMS.HttpApi.Host/appsettings.json +++ b/apps/Syc.Basic.Web.WMS.HttpApi.Host/appsettings.json @@ -6,7 +6,7 @@ }, "ConnectionStrings": { //"WMSDb": "Server=113.141.94.252,51197;Database=syc_wms_DB; User ID=syc; Password=syc@123456;TrustServerCertificate=True", - "WMSDb": "Server=.;Database=Hyosung_VietNamTY; User ID=sa; Password=seyounth@2025;TrustServerCertificate=True", + "WMSDb": "Server=.;Database=Yulin; User ID=sa; Password=123;TrustServerCertificate=True" }, "AuthServer": { "Authority": "https://localhost:44386", diff --git a/nuget.config b/nuget.config index 205006e..7153913 100644 --- a/nuget.config +++ b/nuget.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/services/Syc.Basic.Web.WMS.Application.Contracts/Syc.Basic.Web.WMS.Application.Contracts.csproj b/services/Syc.Basic.Web.WMS.Application.Contracts/Syc.Basic.Web.WMS.Application.Contracts.csproj index a8847eb..6ba9669 100644 --- a/services/Syc.Basic.Web.WMS.Application.Contracts/Syc.Basic.Web.WMS.Application.Contracts.csproj +++ b/services/Syc.Basic.Web.WMS.Application.Contracts/Syc.Basic.Web.WMS.Application.Contracts.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 Syc.Basic.Web.WMS True $(MSBuildProjectName).xml diff --git a/services/Syc.Basic.Web.WMS.Application/Mapper/SystemMapper.cs b/services/Syc.Basic.Web.WMS.Application/Mapper/SystemMapper.cs index 0be0496..4f9f44f 100644 --- a/services/Syc.Basic.Web.WMS.Application/Mapper/SystemMapper.cs +++ b/services/Syc.Basic.Web.WMS.Application/Mapper/SystemMapper.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Syc.Basic.Web.WMS.Dto; namespace Syc.Basic.Web.Mapper { @@ -22,6 +23,15 @@ namespace Syc.Basic.Web.Mapper .ForMember(dest => dest.DictionaryCode,opt => opt.MapFrom(m => m.dictCode)) .ForMember(dest => dest.Createtime,opt => opt.MapFrom(m => m.createdAt)) .ReverseMap(); + + CreateMap(); + CreateMap(); + + CreateMap() + .ForMember(dest => dest.Net_Weight, opt => opt.MapFrom(m => m.Net_Weight)) + .ForMember(dest => dest.Length, opt => opt.MapFrom(m => m.Length)) + .ReverseMap(); + //CreateMap(); } } } diff --git a/services/Syc.Basic.Web.WMS.Application/Service/AuthService.cs b/services/Syc.Basic.Web.WMS.Application/Service/AuthService.cs index 00180e4..554d309 100644 --- a/services/Syc.Basic.Web.WMS.Application/Service/AuthService.cs +++ b/services/Syc.Basic.Web.WMS.Application/Service/AuthService.cs @@ -24,7 +24,8 @@ using Volo.Abp.Domain.Repositories; namespace Syc.Basic.Web.WMS.Service { - [ApiExplorerSettings(GroupName = "鉴权/授权服务"), Authorize] + //[ApiExplorerSettings(GroupName = "鉴权/授权服务"), Authorize] + [AllowAnonymous] public class AuthService : ApiService, IAuthService { private readonly IJwtTokenService jwtTokenService; @@ -33,11 +34,13 @@ namespace Syc.Basic.Web.WMS.Service private readonly IRepository menuRepository; private readonly ICapPublisher capPublisher; - public AuthService(IJwtTokenService jwtTokenService - , IUserDomainService userDomainService + public AuthService( + IJwtTokenService jwtTokenService + ,IUserDomainService userDomainService , IRoleRepository roleRepository , IRepository menuRepository - , ICapPublisher capPublisher) + //, ICapPublisher capPublisher + ) { this.jwtTokenService = jwtTokenService; this.userDomainService = userDomainService; @@ -51,7 +54,7 @@ namespace Syc.Basic.Web.WMS.Service /// /// /// - [AllowAnonymous] + [HttpPost] public async Task LoginAsync(LoginInput input) { var userDO = await userDomainService.GetUserByAccountAsync(input.UserName); @@ -63,8 +66,8 @@ namespace Syc.Basic.Web.WMS.Service if (!userDO.IsEnable) throw Oops.Oh("用户已被冻结,请联系系统管理员"); - var userInfo = ObjectMapper.Map(userDO.User(), new Identity()); - var token = jwtTokenService.GenerateToken(userInfo); + // var userInfo = ObjectMapper.Map(userDO.User(), new Identity()); + var token = jwtTokenService.GenerateToken(userDO); return new AuthResultDto(token); } @@ -73,6 +76,7 @@ namespace Syc.Basic.Web.WMS.Service /// /// [AllowAnonymous] + [HttpPost] public async Task Logout() { await capPublisher.PublishAsync("mes.test", "测试消息"); diff --git a/services/Syc.Basic.Web.WMS.Application/Syc.Basic.Web.WMS.Application.csproj b/services/Syc.Basic.Web.WMS.Application/Syc.Basic.Web.WMS.Application.csproj index b0736e0..e897afe 100644 --- a/services/Syc.Basic.Web.WMS.Application/Syc.Basic.Web.WMS.Application.csproj +++ b/services/Syc.Basic.Web.WMS.Application/Syc.Basic.Web.WMS.Application.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 Syc.Basic.Web.WMS True $(MSBuildProjectName).xml diff --git a/services/Syc.Basic.Web.WMS.Application/Syc.Basic.Web.WMS.Application.xml b/services/Syc.Basic.Web.WMS.Application/Syc.Basic.Web.WMS.Application.xml index f86b45a..55c1626 100644 --- a/services/Syc.Basic.Web.WMS.Application/Syc.Basic.Web.WMS.Application.xml +++ b/services/Syc.Basic.Web.WMS.Application/Syc.Basic.Web.WMS.Application.xml @@ -36,6 +36,76 @@ + + + 查询纸箱 + + + + + + + 添加纸箱 + + + + + + + 修改纸箱 + + + + + + + 删除纸箱 + + + + + + + 批量删除纸箱 + + + + + + + 查询丝锭 + + + + + + + 添加丝锭 + + + + + + + 修改丝锭 + + + + + + + 删除丝锭 + + + + + + + 批量删除丝锭 + + + + 菜单服务 diff --git a/services/Syc.Basic.Web.WMS.Domain.Shared/Syc.Basic.Web.WMS.Domain.Shared.csproj b/services/Syc.Basic.Web.WMS.Domain.Shared/Syc.Basic.Web.WMS.Domain.Shared.csproj index 2776577..9fe0811 100644 --- a/services/Syc.Basic.Web.WMS.Domain.Shared/Syc.Basic.Web.WMS.Domain.Shared.csproj +++ b/services/Syc.Basic.Web.WMS.Domain.Shared/Syc.Basic.Web.WMS.Domain.Shared.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 Syc.Basic.Web.WMS true @@ -20,6 +20,7 @@ + diff --git a/services/Syc.Basic.Web.WMS.Domain.Shared/WMSDomainSharedModule.cs b/services/Syc.Basic.Web.WMS.Domain.Shared/WMSDomainSharedModule.cs index c2b3c9a..c423be0 100644 --- a/services/Syc.Basic.Web.WMS.Domain.Shared/WMSDomainSharedModule.cs +++ b/services/Syc.Basic.Web.WMS.Domain.Shared/WMSDomainSharedModule.cs @@ -5,6 +5,10 @@ using Volo.Abp.Localization.ExceptionHandling; using Volo.Abp.Modularity; using Volo.Abp.Validation.Localization; using Volo.Abp.VirtualFileSystem; +using Seyounth.Auto.Hs; +using Seyounth.Auto.Hs.Runtime; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Seyounth.Auto.Hs.Runtime.Handlers; namespace Syc.Basic.Web.WMS; @@ -38,5 +42,7 @@ public class WMSDomainSharedModule : AbpModule { options.MapCodeNamespace("WMS", typeof(WMSResource)); }); + + context.Services.AddHs(); } } \ No newline at end of file diff --git a/services/Syc.Basic.Web.WMS.Domain/Syc.Basic.Web.WMS.Domain.csproj b/services/Syc.Basic.Web.WMS.Domain/Syc.Basic.Web.WMS.Domain.csproj index ac27057..69c53ef 100644 --- a/services/Syc.Basic.Web.WMS.Domain/Syc.Basic.Web.WMS.Domain.csproj +++ b/services/Syc.Basic.Web.WMS.Domain/Syc.Basic.Web.WMS.Domain.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 Syc.Basic.Web.WMS diff --git a/services/Syc.Basic.Web.WMS.EntityFrameworkCore/EntityFrameworkCore/BasicDbContextModelCreatingExtensions.cs b/services/Syc.Basic.Web.WMS.EntityFrameworkCore/EntityFrameworkCore/BasicDbContextModelCreatingExtensions.cs index 2fde90d..f049820 100644 --- a/services/Syc.Basic.Web.WMS.EntityFrameworkCore/EntityFrameworkCore/BasicDbContextModelCreatingExtensions.cs +++ b/services/Syc.Basic.Web.WMS.EntityFrameworkCore/EntityFrameworkCore/BasicDbContextModelCreatingExtensions.cs @@ -162,6 +162,18 @@ namespace Syc.Basic.Web.EntityFrameworkCore b.HasOne(e => e.Dictionary).WithMany(e => e.DictionaryItems).HasForeignKey(e => e.DictionaryCode); }); + modelBuilder.Entity(b => + { + b.ToTable(nameof(Box)); + b.ConfigureByConvention(); + }); + + modelBuilder.Entity(b => + { + b.ToTable(nameof(Silk)); + b.ConfigureByConvention(); + }); + return modelBuilder; } } diff --git a/services/Syc.Basic.Web.WMS.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs b/services/Syc.Basic.Web.WMS.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs index 41d5165..4afd86e 100644 --- a/services/Syc.Basic.Web.WMS.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs +++ b/services/Syc.Basic.Web.WMS.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs @@ -72,6 +72,13 @@ public class WMSDbContext : /// public virtual DbSet DictionaryItems { get; set; } + /// + /// 料箱 + /// + public virtual DbSet Boxs { get; set; } + public virtual DbSet Silk { get; set; } + + protected override void OnModelCreating(ModelBuilder builder) { base.OnModelCreating(builder); diff --git a/services/Syc.Basic.Web.WMS.EntityFrameworkCore/Syc.Basic.Web.WMS.EntityFrameworkCore.csproj b/services/Syc.Basic.Web.WMS.EntityFrameworkCore/Syc.Basic.Web.WMS.EntityFrameworkCore.csproj index c43bdba..cead347 100644 --- a/services/Syc.Basic.Web.WMS.EntityFrameworkCore/Syc.Basic.Web.WMS.EntityFrameworkCore.csproj +++ b/services/Syc.Basic.Web.WMS.EntityFrameworkCore/Syc.Basic.Web.WMS.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 Syc.Basic.Web.WMS diff --git a/services/Syc.Basic.Web.WMS.HttpApi.Client/Syc.Basic.Web.WMS.HttpApi.Client.csproj b/services/Syc.Basic.Web.WMS.HttpApi.Client/Syc.Basic.Web.WMS.HttpApi.Client.csproj index de9f62b..1d74e35 100644 --- a/services/Syc.Basic.Web.WMS.HttpApi.Client/Syc.Basic.Web.WMS.HttpApi.Client.csproj +++ b/services/Syc.Basic.Web.WMS.HttpApi.Client/Syc.Basic.Web.WMS.HttpApi.Client.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 Syc.Basic.Web.WMS diff --git a/services/Syc.Basic.Web.WMS.HttpApi/Syc.Basic.Web.WMS.HttpApi.csproj b/services/Syc.Basic.Web.WMS.HttpApi/Syc.Basic.Web.WMS.HttpApi.csproj index bfdc0b4..0a3940f 100644 --- a/services/Syc.Basic.Web.WMS.HttpApi/Syc.Basic.Web.WMS.HttpApi.csproj +++ b/services/Syc.Basic.Web.WMS.HttpApi/Syc.Basic.Web.WMS.HttpApi.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 Syc.Basic.Web.WMS diff --git a/share/Seyounth.Auto.Hs.Runtime/Handlers/OnWarningHandler.cs b/share/Seyounth.Auto.Hs.Runtime/Handlers/OnWarningHandler.cs index ff267de..9938352 100644 --- a/share/Seyounth.Auto.Hs.Runtime/Handlers/OnWarningHandler.cs +++ b/share/Seyounth.Auto.Hs.Runtime/Handlers/OnWarningHandler.cs @@ -12,4 +12,12 @@ public class OnWarning(int first, int second) : IRequest public abstract class OnWarningHandler : IRequestHandler { public abstract Task Handle(OnWarning request, CancellationToken cancellationToken); +} + +public class DefaultOnWarningHandler : OnWarningHandler +{ + public override Task Handle(OnWarning request, CancellationToken cancellationToken) + { + return Task.CompletedTask; + } } \ No newline at end of file diff --git a/share/Seyounth.Auto.Hs.Runtime/Handlers/WeighSpindleRequestHandler.cs b/share/Seyounth.Auto.Hs.Runtime/Handlers/WeighSpindleRequestHandler.cs index 8091545..bffa8a5 100644 --- a/share/Seyounth.Auto.Hs.Runtime/Handlers/WeighSpindleRequestHandler.cs +++ b/share/Seyounth.Auto.Hs.Runtime/Handlers/WeighSpindleRequestHandler.cs @@ -17,4 +17,12 @@ public class WeighSpindleRequest : IRequest public abstract class WeighSpindleRequestHandler : IRequestHandler { public abstract Task Handle(WeighSpindleRequest request, CancellationToken cancellationToken); +} + +public class DefaultWeighSpindleRequestHandler : WeighSpindleRequestHandler +{ + public override Task Handle(WeighSpindleRequest request, CancellationToken cancellationToken) + { + return Task.FromResult(""); + } } \ No newline at end of file diff --git a/share/Seyounth.Auto.Hs.Runtime/HsAutoRuntime.cs b/share/Seyounth.Auto.Hs.Runtime/HsAutoRuntime.cs index bf99cd3..d6676ec 100644 --- a/share/Seyounth.Auto.Hs.Runtime/HsAutoRuntime.cs +++ b/share/Seyounth.Auto.Hs.Runtime/HsAutoRuntime.cs @@ -18,7 +18,7 @@ public class HsAutoRuntime : IHsAutoRuntime private readonly IPrinterService _printers; public HsAutoRuntime(IPlcService plcService, IMediator mediator, IBalanceService balances, IScannerService scanners, - ILogger logger, IPrinterService printers) + IPrinterService printers,ILogger logger) { _printers = printers; _mediator = mediator; diff --git a/share/Seyounth.Auto.Hs.Runtime/HsExtensions.cs b/share/Seyounth.Auto.Hs.Runtime/HsExtensions.cs index 2136d10..edd6ac8 100644 --- a/share/Seyounth.Auto.Hs.Runtime/HsExtensions.cs +++ b/share/Seyounth.Auto.Hs.Runtime/HsExtensions.cs @@ -28,8 +28,14 @@ public static class HsExtensions services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddHostedService(); - services.AddHostedService(); + #region 接口调试阶段先注释 + //services.AddHostedService(); + // services.AddHostedService(); + #endregion + services.AddMediatR(cfg => + { + cfg.RegisterServicesFromAssembly(typeof(OnWarningHandler).Assembly); + }); return services; } } \ No newline at end of file diff --git a/share/Syc.Abp.Application.Contracts/Syc.Abp.Application.Contracts.csproj b/share/Syc.Abp.Application.Contracts/Syc.Abp.Application.Contracts.csproj index ad6eddf..afe5302 100644 --- a/share/Syc.Abp.Application.Contracts/Syc.Abp.Application.Contracts.csproj +++ b/share/Syc.Abp.Application.Contracts/Syc.Abp.Application.Contracts.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 enable enable diff --git a/share/Syc.Abp.Caching/Syc.Abp.Caching.csproj b/share/Syc.Abp.Caching/Syc.Abp.Caching.csproj index 30e108f..ab4d12d 100644 --- a/share/Syc.Abp.Caching/Syc.Abp.Caching.csproj +++ b/share/Syc.Abp.Caching/Syc.Abp.Caching.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable diff --git a/share/Syc.Abp.Domain/Syc.Abp.Domain.csproj b/share/Syc.Abp.Domain/Syc.Abp.Domain.csproj index c828f7f..fcff82a 100644 --- a/share/Syc.Abp.Domain/Syc.Abp.Domain.csproj +++ b/share/Syc.Abp.Domain/Syc.Abp.Domain.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 enable enable Syc.Abp.Domain diff --git a/share/Syc.Abp.HttpApi.Client/Syc.Abp.HttpApi.Client.csproj b/share/Syc.Abp.HttpApi.Client/Syc.Abp.HttpApi.Client.csproj index b6f07d9..2ee4440 100644 --- a/share/Syc.Abp.HttpApi.Client/Syc.Abp.HttpApi.Client.csproj +++ b/share/Syc.Abp.HttpApi.Client/Syc.Abp.HttpApi.Client.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable diff --git a/share/Syc.Authorize.JwtBearer/Syc.Authorize.JwtBearer.csproj b/share/Syc.Authorize.JwtBearer/Syc.Authorize.JwtBearer.csproj index 7b86648..d6c1744 100644 --- a/share/Syc.Authorize.JwtBearer/Syc.Authorize.JwtBearer.csproj +++ b/share/Syc.Authorize.JwtBearer/Syc.Authorize.JwtBearer.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable