Merge branch 'master' of http://10.2.1.24:10244/gwb/BPA.KitChen.GroupMeal

.gitignore

@@ -13,9 +13,6 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
-# Mono auto generated files
-mono_crash.*
-
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
@@ -23,19 +20,15 @@ mono_crash.*
 [Rr]eleases/
 x64/
 x86/
-[Ww][Ii][Nn]32/
 [Aa][Rr][Mm]/
 [Aa][Rr][Mm]64/
 bld/
 [Bb]in/
 [Oo]bj/
-[Oo]ut/
 [Ll]og/
-[Ll]ogs/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
-.history/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 
@@ -46,10 +39,9 @@ Generated\ Files/
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-# NUnit
+# NUNIT
 *.VisualState.xml
 TestResult.xml
-nunit-*.xml
 
 # Build Results of an ATL Project
 [Dd]ebugPS/
@@ -64,9 +56,6 @@ project.lock.json
 project.fragment.lock.json
 artifacts/
 
-# ASP.NET Scaffolding
-ScaffoldingReadMe.txt
-
 # StyleCop
 StyleCopReport.xml
 
@@ -133,6 +122,9 @@ _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 
+# JustCode is a .NET coding add-in
+.JustCode
+
 # TeamCity is a build add-in
 _TeamCity*
 
@@ -143,11 +135,6 @@ _TeamCity*
 .axoCover/*
 !.axoCover/settings.json
 
-# Coverlet is a free, cross platform Code Coverage Tool
-coverage*.json
-coverage*.xml
-coverage*.info
-
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
@@ -195,8 +182,6 @@ PublishScripts/
 
 # NuGet Packages
 *.nupkg
-# NuGet Symbol Packages
-*.snupkg
 # The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
@@ -221,8 +206,6 @@ BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
 *.appx
-*.appxbundle
-*.appxupload
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
@@ -272,9 +255,7 @@ ServiceFabricBackup/
 *.bim.layout
 *.bim_*.settings
 *.rptproj.rsuser
-*- [Bb]ackup.rdl
-*- [Bb]ackup ([0-9]).rdl
-*- [Bb]ackup ([0-9][0-9]).rdl
+*- Backup*.rdl
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -310,6 +291,10 @@ paket-files/
 # FAKE - F# Make
 .fake/
 
+# JetBrains Rider
+.idea/
+*.sln.iml
+
 # CodeRush personal settings
 .cr/personal
 
@@ -353,15 +338,11 @@ ASALocalRun/
 
 # BeatPulse healthcheck temp database
 healthchecksdb
-
-# Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
-
-# Ionide (cross platform F# VS Code tools) working folder
-.ionide/
-
-# Fody - auto-generated XML schema
-FodyWeavers.xsd
-/BPA.Kitchen.Api/orderExcels
-/BPA.Kitchen.Api/wwwroot/uploadFiles
-/BPA.Kitchen.Api/Properties/launchSettings.json
+/BPA.KitChen.GroupMeal/obj/Debug/net6.0/BPA.KitChen.GroupMeal.assets.cache
+/BPA.KitChen.GroupMeal/obj/Debug/net6.0/BPA.KitChen.GroupMeal.csproj.FileListAbsolute.txt
+/BPA.KitChen.GroupMeal.SqlSugar/obj/Debug/net6.0/BPA.KitChen.GroupMeal.SqlSugar.assets.cache
+/BPA.KitChen.GroupMeal.SqlSugar/obj/Debug/net6.0/BPA.KitChen.GroupMeal.SqlSugar.csproj.FileListAbsolute.txt
+/BPA.KitChen.GroupMeal.Core/obj/Debug/net6.0/BPA.KitChen.GroupMeal.Core.assets.cache
+/BPA.KitChen.GroupMeal.Core/obj/Debug/net6.0/BPA.KitChen.GroupMeal.Core.csproj.FileListAbsolute.txt
+/BPA.KitChen.GroupMeal.Application/obj/Debug/net6.0/BPA.KitChen.GroupMeal.Application.assets.cache
+/BPA.KitChen.GroupMeal.Application/obj/Debug/net6.0/BPA.KitChen.GroupMeal.Application.csproj.FileListAbsolute.txt

BPA.KitChen.GroupMeal.Application/Service/Gate/GateService.cs

@@ -24,7 +24,7 @@ namespace BPA.KitChen.GroupMeal.Application.Service.Gate
 {
 
     [ApiDescriptionSettings("一卡通", Tag = "档口管理", SplitCamelCase = false)]
-    public class GateService : IDynamicApiController, ITransient, IGateService
+    public class GateService : SupperRepository, IDynamicApiController, ITransient, IGateService
     {
 
 
@@ -161,10 +161,13 @@ namespace BPA.KitChen.GroupMeal.Application.Service.Gate
                 db.Deleteable<BPA_GateSetUp>(data).ExecuteCommand();
             }
             var key = $"GateSet";
-            ServiceQueryPush.QueryPush.PushMQ("add", key, MQEnum.Push);
+                 //TODO:MQ;
+           // ServiceQueryPush.QueryPush.PushMQ("add", key, MQEnum.Push);
             return await db.Insertable<BPA_GateSetUp>(inputDto.Adapt<List<BPA_GateSetUp>>())
                  .CallEntityMethod(m => m.Create()).ExecuteCommandAsync() > 0;
         }
+
+
         [HttpPost("/api/GateInfo/GetGateFood")]
         public async Task<List<GateFoodInputDto>> GetGateFood(GateFoodQueryInputDto inputDto)
         {
@@ -188,122 +191,24 @@ namespace BPA.KitChen.GroupMeal.Application.Service.Gate
 
 
 
+        /// <summary>
+        /// 删除档口
+        /// </summary>
+        /// <param name="inputDto"></param>
+        /// <returns></returns>
 
-
-
-
-
-
-
-
-
-        //    /// <summary>
-        //    /// 新增
-        //    /// </summary>
-        //    /// <param name="inputDto"></param>
-        //    /// <returns></returns>
-        //    public async Task<bool> Add(GateCreateOrUpdateDto inputDto)
-        //    {
-        //        var res= await SqlSugarDb.Db.Insertable<BPA_Gate>(inputDto.Adapt<BPA_Gate>())
-        //            .ExecuteCommandAsync();
-        //        return res > 0;
-        //    }
-
-
-        //    /// <summary>
-        //    /// 修改
-        //    /// </summary>
-        //    /// <param name="inputDto"></param>
-        //    /// <returns></returns>
-        //    public async Task<bool> Update(GateCreateOrUpdateDto inputDto)
-        //    {
-        //        var data = await SqlSugarDb.Db.Queryable<BPA_Gate>().FirstAsync(x => x.Id == inputDto.Id);
-
-        //        data.Name = inputDto.Name;
-        //        data.Mode = inputDto.Mode;
-        //        data.Price = inputDto.Price;
-        //        data.ShopId = inputDto.ShopId;
-        //        data.Remaek = inputDto.Remaek;
-
-        //        var res = await SqlSugarDb.Db.Updateable<BPA_Gate>(data)
-        //            .ExecuteCommandAsync();
-        //        return res > 0;
-        //    }
-
-        //    /// <summary>
-        //    /// 分页
-        //    /// </summary>
-        //    /// <param name="inputDto"></param>
-        //    /// <returns></returns>
-        //    [HttpPost]
-        //    public async Task<PageOutDto> GetPage(GatePageDto inputDto)
-        //    {
-        //        var total = new RefAsync<int>();
-        //        var data = await SqlSugarDb.Db.Queryable<BPA_Gate>()
-        //            .WhereIF(!string.IsNullOrEmpty(inputDto.ShopId), x => x.ShopId == inputDto.ShopId)
-        //            .WhereIF(!string.IsNullOrEmpty(inputDto.Name), x => x.Name.Contains(inputDto.Name))
-        //            .WhereIF(inputDto.Mode.HasValue, x => x.Mode == inputDto.Mode)
-        //            .OrderBy(a => a.CreateAt, OrderByType.Desc)
-        //            .ToPageListAsync(inputDto.Current, inputDto.PageSize, total);
-
-        //        return new PageOutDto()
-        //        {
-        //            Data = data,
-        //            Total = total
-
-        //        };
-        //    }
-
-        //    /// <summary>
-        //    /// 删除
-        //    /// </summary>
-        //    /// <param name="id"></param>
-        //    /// <returns></returns>
-        //    public async Task<bool> Del(string id)
-        //    {
-        //        var data = await SqlSugarDb.Db.Queryable<BPA_Gate>().FirstAsync(x => x.Id == id);
-
-        //        var res = await SqlSugarDb.Db.Updateable<BPA_Gate>()
-        //            .SetColumns(it => new BPA_Gate { IsDelete = true })//类只能在表达示里面不能提取
-        //            .Where(it => it.Id == id)
-        //            .ExecuteCommandAsync();
-
-        //        return res > 0;
-        //    }
-
-
-        //    /// <summary>
-        //    /// 状态
-        //    /// </summary>
-        //    /// <param name="inputDto"></param>
-        //    /// <returns></returns>
-        //    public async Task<bool> Enable(GateCreateOrUpdateDto inputDto)
-        //    {
-        //        var data = await SqlSugarDb.Db.Queryable<BPA_Gate>().Where(x => inputDto.Id == x.Id).ToListAsync();
-        //        foreach (var item in data)
-        //        {
-        //            item.Status = inputDto.Status;
-        //        }
-        //        var res = await SqlSugarDb.Db.Updateable<BPA_Gate>(data).ExecuteCommandAsync();
-        //        return res > 0;
-        //    }
-
-
-        //    /// <summary>
-        //    /// 获取全部
-        //    /// </summary>
-        //    /// <param name="shopId"></param>
-        //    /// <returns></returns>
-        //    public async Task<List<GateDto>> GetGateAllList(string shopId)
-        //    {
-
-        //        return await SqlSugarDb.Db.Queryable<BPA_Gate>()
-        //            .Select(x =>new GateDto()
-        //            {
-        //                Id=x.Id.SelectAll(),
-        //            } )
-        //            .ToListAsync();
-        //    }
-
+        [HttpPost("/api/GateInfo/del")]
+        public async Task<bool> Del(string id)
+        {
+            var data = await db.Queryable<BPA_Gate>().FirstAsync(x => x.Id == id);
+            if (data == null)
+            {
+                throw Oops.Oh($"删除的数据不存在");
+            }
+            data.IsDeleted = 1;
+            var res = await db.Updateable<BPA_Gate>(data)
+                .CallEntityMethod(m => m.Delete()).ExecuteCommandAsync();
+            return res > 0;
+        }
     }
 }

BPA.KitChen.GroupMeal.Application/Service/PayCardInfo/Dto/PayCardInfoDto.cs

@@ -0,0 +1,60 @@
+
+using BPA.KitChen.GroupMeal.Core.Enum;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.KitChen.GroupMeal.Application.Service.PayCardInfo.Dto
+{
+    public class PayCardInfoAddDto
+    {
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary> 
+        ///  档口id
+        /// </summary> 
+        public string GateId { get; set; }
+        /// <summary> 
+        ///  间隔时间
+        /// </summary> 
+        public int SleepTime { get; set; }
+        /// <summary>
+        /// 读取地址
+        /// </summary>
+        public string Address { get; set; }
+        public CommonStatus Status { get; set; } = CommonStatus.DISABLE;
+    }
+    public class PayCardInfoUpdateDto
+    {
+        /// <summary> 
+        ///  id
+        /// </summary> 
+        public string Id { get; set; }
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary> 
+        ///  档口id
+        /// </summary> 
+        public string GateId { get; set; }
+        /// <summary> 
+        ///  间隔时间
+        /// </summary> 
+        public int SleepTime { get; set; }
+        /// <summary>
+        /// 读取地址
+        /// </summary>
+        public string Address { get; set; }
+        public CommonStatus Status { get; set; }
+    }
+    public class PayCardInfoEnableDto
+    {
+        public string Id { get; set; }
+        public CommonStatus Status { get; set; }
+    }
+}

BPA.KitChen.GroupMeal.Application/Service/PayCardInfo/Dto/PayCardInfoQueryDto.cs

@@ -0,0 +1,38 @@
+
+using BPA.KitChen.GroupMeal.Core.Enum;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.KitChen.GroupMeal.Application.Service.PayCardInfo.Dto
+{
+    public class PayCardInfoQueryDto
+    {
+        /// <summary> 
+        ///  id
+        /// </summary> 
+        public string Id { get; set; }
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary> 
+        ///  档口id
+        /// </summary> 
+        public string GateId { get; set; }
+        public string GateName { get; set; }
+        /// <summary> 
+        ///  间隔时间
+        /// </summary> 
+        public int SleepTime { get; set; }
+        public CommonStatus Status { get; set; } = CommonStatus.DISABLE;
+        public DateTime? UpdateAt { get; set; }
+        public DateTime CreateAt { get; set; }
+        /// <summary>
+        /// 读取地址
+        /// </summary>
+        public string Address { get; set; }
+    }
+}

BPA.KitChen.GroupMeal.Application/Service/PayCardInfo/Dto/PayCardInfoQueryInputDto.cs

@@ -0,0 +1,25 @@
+
+using BPA.KitChen.GroupMeal.Application.BaseDto;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.KitChen.GroupMeal.Application.Service.PayCardInfo.Dto
+{
+    public class PayCardInfoQueryInputDto : PageInputBase
+    {
+        /// <summary> 
+        ///  
+        /// </summary> 
+        public string GateId { get; set; }
+    }
+    public class PayCardInfoQueryAllInputDto
+    {
+        /// <summary> 
+        ///  
+        /// </summary> 
+        public string GateId { get; set; }
+    }
+}

BPA.KitChen.GroupMeal.Application/Service/PayCardInfo/IPayCardInfoService.cs

@@ -0,0 +1,21 @@
+using BPA.KitChen.GroupMeal.Application.BaseDto;
+using BPA.KitChen.GroupMeal.Application.Service.PayCardInfo.Dto;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.KitChen.GroupMeal.Application.Service.PayCardInfo
+{
+    public interface IPayCardInfoService
+    {
+        Task<PageUtil> GetGateList(PayCardInfoQueryInputDto inputDto);
+      
+        Task<List<PayCardInfoQueryDto>> GetGateAllList(PayCardInfoQueryAllInputDto inputDto);
+
+        Task<bool> Add(PayCardInfoAddDto inputDto);
+        Task<bool> Update(PayCardInfoUpdateDto inputDto);
+        Task<bool> Enable(PayCardInfoEnableDto inputDto);
+    }
+}

BPA.KitChen.GroupMeal.Application/Service/PayCardInfo/PayCardInfoService.cs

@@ -0,0 +1,173 @@
+
+using BPA.KitChen.GroupMeal.Application.BaseDto;
+using BPA.KitChen.GroupMeal.Application.Service.PayCardInfo.Dto;
+using BPA.KitChen.GroupMeal.Core.Entity;
+using BPA.KitChen.GroupMeal.SqlSugar;
+using Furion.DependencyInjection;
+using Furion.DynamicApiController;
+using Furion.FriendlyException;
+using Mapster;
+using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace BPA.KitChen.GroupMeal.Application.Service.PayCardInfo
+{
+    [ApiDescriptionSettings("一卡通", Tag = "刷卡机管理")]
+    public class PayCardInfoService : SupperRepository, IDynamicApiController, IPayCardInfoService, ITransient
+    {
+        private readonly SqlSugarScope db;
+
+        public PayCardInfoService()
+        {
+            db = SqlSugarDb.Db; ;   // 推荐操作
+        }
+
+        /// <summary>
+        /// 添加刷卡机
+        /// </summary>
+        /// <param name="inputDto"></param>
+        /// <returns></returns>
+        [HttpPost("/api/PayCard/add")]
+        public async Task<bool> Add(PayCardInfoAddDto inputDto)
+        {
+            var data = db.Queryable<BPA_PayCard>().Where(x => inputDto.Address == x.Address).ToList();
+            if (data.Count > 0)
+            {
+                return false;
+            }
+            return await db.Insertable<BPA_PayCard>(inputDto.Adapt<BPA_PayCard>())
+                 .CallEntityMethod(m => m.Create()).ExecuteCommandAsync() > 0;
+        }
+
+        /// <summary>
+        /// 修改刷卡机状态
+        /// </summary>
+        /// <param name="inputDto"></param>
+        /// <returns></returns>
+        [HttpPost("/api/PayCard/enable")]
+        public async Task<bool> Enable(PayCardInfoEnableDto inputDto)
+        {
+            var data = await db.Queryable<BPA_Gate>().Where(x => inputDto.Id == x.Id).ToListAsync();
+            foreach (var item in data)
+            {
+                item.Status = inputDto.Status;
+            }
+            var res = await db.Updateable<BPA_Gate>(data)
+              .CallEntityMethod(m => m.Modify()).ExecuteCommandAsync();
+            return res > 0;
+        }
+
+        /// <summary>
+        /// 获取撒卡机列表
+        /// </summary>
+        /// <param name="inputDto"></param>
+        /// <returns></returns>
+        [HttpGet("/api/PayCard/gatealllist")]
+        public async Task<List<PayCardInfoQueryDto>> GetGateAllList([FromQuery]  PayCardInfoQueryAllInputDto inputDto)
+        {
+            var total = new RefAsync<int>();
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            if (!string.IsNullOrEmpty(inputDto.GateId))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "a.GateId", ConditionalType = ConditionalType.Equal, FieldValue = inputDto.GateId });
+            }
+
+            return await db.Queryable<BPA_PayCard, BPA_Gate>((a, b) =>
+                      new JoinQueryInfos(JoinType.Inner, a.GateId == b.Id))
+                .Where((a, b) => a.IsDeleted == 0)
+                   .Where(conModels)
+               .OrderBy((a, b) => a.CreateAt, OrderByType.Desc)
+               .Select((a, b) => new PayCardInfoQueryDto
+               {
+                   Id = a.Id.SelectAll(),
+                   GateName = b.Name
+               })
+               .ToListAsync();
+        }
+
+        /// <summary>
+        /// //根据门店ID查询 档口分页列表
+        /// </summary>
+        /// <param name="inputDto"></param>
+        /// <returns></returns>
+        [HttpGet("/api/PayCard/gateList")]
+        public async Task<PageUtil> GetGateList([FromQuery]  PayCardInfoQueryInputDto inputDto)
+        {
+            var total = new RefAsync<int>();
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            if (!string.IsNullOrEmpty(inputDto.GateId))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "a.GateId", ConditionalType = ConditionalType.Equal, FieldValue = inputDto.GateId });
+            }
+
+            var data = await db.Queryable<BPA_PayCard , BPA_Gate>((a, b) =>
+                      new JoinQueryInfos(JoinType.Inner, a.GateId == b.Id))
+                .Where((a, b) => a.IsDeleted == 0)
+                   .Where(conModels)
+               .OrderBy((a, b) => a.CreateAt, OrderByType.Desc)
+               .Select((a, b) => new PayCardInfoQueryDto
+               {
+                   Id = a.Id.SelectAll(),
+                   GateName = b.Name
+               })
+               .ToPageListAsync(inputDto.Current, inputDto.PageSize, total);
+            return new PageUtil()
+            {
+                Data = data,
+                Total = total
+
+            };
+        }
+       
+        
+        /// <summary>
+        /// 修改刷卡机
+        /// </summary>
+        /// <param name="inputDto"></param>
+        /// <returns></returns>
+        [HttpPost("/api/PayCard/update")]
+        public async Task<bool> Update(PayCardInfoUpdateDto inputDto)
+        {
+            var data = await db.Queryable<BPA_PayCard>().Where(x => inputDto.Id == x.Id).FirstAsync();
+            if (data.Address != inputDto.Address)
+            {
+                var newdata = db.Queryable<BPA_PayCard>().Where(x => inputDto.Address == x.Address).ToList();
+                if (newdata.Count > 0)
+                {
+                    return false;
+                }
+            }
+            data.Name = inputDto.Name;
+            data.GateId = inputDto.GateId;
+            data.SleepTime = inputDto.SleepTime;
+            data.Address = inputDto.Address;
+            data.Status = inputDto.Status;
+            var res = await db.Updateable<BPA_PayCard>(data)
+               .CallEntityMethod(m => m.Modify()).ExecuteCommandAsync();
+            return res > 0;
+        }
+
+
+        /// <summary>
+        /// 删除刷卡机
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpPost("/api/PayCard/del")]
+        public async Task<bool> Del(string id)
+        {
+            var data = await db.Queryable<BPA_PayCard>().FirstAsync(x =>x.Id==id);
+            if (data == null)
+            {
+                throw Oops.Oh($"删除的数据不存在");
+            }
+            data.IsDeleted = 1;
+            var res = await db.Updateable<BPA_PayCard>(data)
+                .CallEntityMethod(m => m.Delete()).ExecuteCommandAsync();
+            return res > 0;
+        }
+    }
+}

BPA.KitChen.GroupMeal.Application/Service/Shop/ShopService.cs

@@ -43,7 +43,7 @@ namespace BPA.KitChen.GroupMeal.Application.Service.Shop
 
         public async Task<List<ShopEntity>> GetAllList()
         {
-            var data = await SqlSugarDb.Db.Queryable<ShopEntity>().ToListAsync();
+            var data = await SqlSugarDb.Db.Queryable<ShopEntity>().Where(x=>x.IsDeleted==0).ToListAsync();
             return data;
         }
 

BPA.KitChen.GroupMeal.Application/obj/BPA.KitChen.GroupMeal.Application.csproj.nuget.dgspec.json

@@ -1,231 +0,0 @@
-{
-  "format": 1,
-  "restore": {
-    "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Application\\BPA.KitChen.GroupMeal.Application.csproj": {}
-  },
-  "projects": {
-    "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Application\\BPA.KitChen.GroupMeal.Application.csproj": {
-      "version": "1.0.0",
-      "restore": {
-        "projectUniqueName": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Application\\BPA.KitChen.GroupMeal.Application.csproj",
-        "projectName": "BPA.KitChen.GroupMeal.Application",
-        "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Application\\BPA.KitChen.GroupMeal.Application.csproj",
-        "packagesPath": "C:\\Users\\gwbvi\\.nuget\\packages\\",
-        "outputPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Application\\obj\\",
-        "projectStyle": "PackageReference",
-        "fallbackFolders": [
-          "E:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-        ],
-        "configFilePaths": [
-          "C:\\Users\\gwbvi\\AppData\\Roaming\\NuGet\\NuGet.Config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
-        ],
-        "originalTargetFrameworks": [
-          "net6.0"
-        ],
-        "sources": {
-          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "http://10.2.1.25:10243/repository/bpa/index.json": {},
-          "https://api.nuget.org/v3/index.json": {}
-        },
-        "frameworks": {
-          "net6.0": {
-            "targetAlias": "net6.0",
-            "projectReferences": {
-              "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj": {
-                "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj"
-              },
-              "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj": {
-                "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj"
-              }
-            }
-          }
-        },
-        "warningProperties": {
-          "warnAsError": [
-            "NU1605"
-          ]
-        }
-      },
-      "frameworks": {
-        "net6.0": {
-          "targetAlias": "net6.0",
-          "imports": [
-            "net461",
-            "net462",
-            "net47",
-            "net471",
-            "net472",
-            "net48",
-            "net481"
-          ],
-          "assetTargetFallback": true,
-          "warn": true,
-          "frameworkReferences": {
-            "Microsoft.NETCore.App": {
-              "privateAssets": "all"
-            }
-          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
-        }
-      }
-    },
-    "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj": {
-      "version": "1.0.0",
-      "restore": {
-        "projectUniqueName": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj",
-        "projectName": "BPA.KitChen.GroupMeal.Core",
-        "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj",
-        "packagesPath": "C:\\Users\\gwbvi\\.nuget\\packages\\",
-        "outputPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\obj\\",
-        "projectStyle": "PackageReference",
-        "fallbackFolders": [
-          "E:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-        ],
-        "configFilePaths": [
-          "C:\\Users\\gwbvi\\AppData\\Roaming\\NuGet\\NuGet.Config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
-        ],
-        "originalTargetFrameworks": [
-          "net6.0"
-        ],
-        "sources": {
-          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "http://10.2.1.25:10243/repository/bpa/index.json": {},
-          "https://api.nuget.org/v3/index.json": {}
-        },
-        "frameworks": {
-          "net6.0": {
-            "targetAlias": "net6.0",
-            "projectReferences": {}
-          }
-        },
-        "warningProperties": {
-          "warnAsError": [
-            "NU1605"
-          ]
-        }
-      },
-      "frameworks": {
-        "net6.0": {
-          "targetAlias": "net6.0",
-          "dependencies": {
-            "EasyNetQ": {
-              "target": "Package",
-              "version": "[7.8.0, )"
-            },
-            "Furion": {
-              "target": "Package",
-              "version": "[4.9.1.15, )"
-            },
-            "Furion.Extras.Authentication.JwtBearer": {
-              "target": "Package",
-              "version": "[4.9.1.15, )"
-            },
-            "Furion.Extras.ObjectMapper.Mapster": {
-              "target": "Package",
-              "version": "[4.9.1.15, )"
-            },
-            "Microsoft.NETCore.App": {
-              "target": "Package",
-              "version": "[2.2.8, )"
-            },
-            "SqlSugarCore": {
-              "target": "Package",
-              "version": "[5.1.4.129, )"
-            }
-          },
-          "imports": [
-            "net461",
-            "net462",
-            "net47",
-            "net471",
-            "net472",
-            "net48",
-            "net481"
-          ],
-          "assetTargetFallback": true,
-          "warn": true,
-          "frameworkReferences": {
-            "Microsoft.NETCore.App": {
-              "privateAssets": "all"
-            }
-          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
-        }
-      }
-    },
-    "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj": {
-      "version": "1.0.0",
-      "restore": {
-        "projectUniqueName": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj",
-        "projectName": "BPA.KitChen.GroupMeal.SqlSugar",
-        "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj",
-        "packagesPath": "C:\\Users\\gwbvi\\.nuget\\packages\\",
-        "outputPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\obj\\",
-        "projectStyle": "PackageReference",
-        "fallbackFolders": [
-          "E:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-        ],
-        "configFilePaths": [
-          "C:\\Users\\gwbvi\\AppData\\Roaming\\NuGet\\NuGet.Config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
-        ],
-        "originalTargetFrameworks": [
-          "net6.0"
-        ],
-        "sources": {
-          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "http://10.2.1.25:10243/repository/bpa/index.json": {},
-          "https://api.nuget.org/v3/index.json": {}
-        },
-        "frameworks": {
-          "net6.0": {
-            "targetAlias": "net6.0",
-            "projectReferences": {
-              "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj": {
-                "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj"
-              }
-            }
-          }
-        },
-        "warningProperties": {
-          "warnAsError": [
-            "NU1605"
-          ]
-        }
-      },
-      "frameworks": {
-        "net6.0": {
-          "targetAlias": "net6.0",
-          "dependencies": {
-            "System.Linq.Dynamic.Core": {
-              "target": "Package",
-              "version": "[1.3.7, )"
-            }
-          },
-          "imports": [
-            "net461",
-            "net462",
-            "net47",
-            "net471",
-            "net472",
-            "net48",
-            "net481"
-          ],
-          "assetTargetFallback": true,
-          "warn": true,
-          "frameworkReferences": {
-            "Microsoft.NETCore.App": {
-              "privateAssets": "all"
-            }
-          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
-        }
-      }
-    }
-  }
-}

BPA.KitChen.GroupMeal.Application/obj/BPA.KitChen.GroupMeal.Application.csproj.nuget.g.props

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
-    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\gwbvi\.nuget\packages\;E:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
-    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
-  </PropertyGroup>
-  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\gwbvi\.nuget\packages\" />
-    <SourceRoot Include="E:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
-  </ItemGroup>
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.25\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.25\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.props')" />
-  </ImportGroup>
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\gwbvi\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
-    <PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">C:\Users\gwbvi\.nuget\packages\microsoft.codeanalysis.analyzers\3.3.4</PkgMicrosoft_CodeAnalysis_Analyzers>
-  </PropertyGroup>
-</Project>

BPA.KitChen.GroupMeal.Application/obj/BPA.KitChen.GroupMeal.Application.csproj.nuget.g.targets

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)system.text.json\6.0.9\buildTransitive\netcoreapp3.1\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\6.0.9\buildTransitive\netcoreapp3.1\System.Text.Json.targets')" />
-    <Import Project="$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.6\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.6\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets')" />
-  </ImportGroup>
-</Project>

BPA.KitChen.GroupMeal.Core/Common/RabbitMq/Config/MQFactory.cs

@@ -1,110 +1,111 @@
 
-//using EasyNetQ;
-//using System;
-//using System.Collections.Generic;
-//using System.Linq.Expressions;
-//using System.Text;
-//using System.Threading.Tasks;
+using EasyNetQ;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
+using System.Linq.Expressions;
 
-//namespace BPA.Kitchen.Core.RabbitMq.Config
-//{
-//    public class MQFactory
-//    {
-//        private volatile static IBus Bus = null;
-//        /// <summary>
-//        /// 创建链接
-//        /// </summary>
-//        /// <returns></returns>
-//        public static IBus CreateMQ()
-//        {
-//            Console.WriteLine("MQ地址:" + Furion.App.Configuration["RabbitMQ"].ToString());
-//            if (Bus == null)
-//                Bus = RabbitHutch.CreateBus(Furion.App.Configuration["RabbitMQ"].ToString());
-//            return Bus;
-//        }
-//        /// <summary>
-//        /// 释放链接
-//        /// </summary>
-//        public static void DisposeBus()
-//        {
-//            Bus?.Dispose();
-//        }
-//        /// <summary>
-//        /// 同步执行
-//        /// </summary>
-//        /// <typeparam name="T"></typeparam>
-//        /// <param name="Param"></param>
-//        /// <returns></returns>
-//        public static bool SendMQ<T>(PushEntity<T> Param) 
-//        {
-//            try
-//            {
-//                if (Bus == null)
-//                    CreateMQ();
-//                new PushManage().SendMQ(Param, Bus);
-//                return true;
-//            }
-//            catch (Exception ex)
-//            {
-//                Console.WriteLine(ex);
-//              //  BPALog.WriteLog(ex.Message, LogEnum.Error, ex: ex);
-//                return false;
-//            }
-//        }
-//        /// <summary>
-//        /// 推荐异步执行
-//        /// </summary>
-//        /// <typeparam name="T"></typeparam>
-//        /// <param name="Param"></param>
-//        /// <returns></returns>
-//        public static async Task SendMQAsync<T>(PushEntity<T> Param) where T : class
-//        {
+namespace BPA.Kitchen.Core.RabbitMq.Config
+{
+    public class MQFactory
+    {
+        private volatile static IBus Bus = null;
+        /// <summary>
+        /// 创建链接
+        /// </summary>
+        /// <returns></returns>
+        public static IBus CreateMQ()
+        {
+            Console.WriteLine("MQ地址:" + Furion.App.Configuration["RabbitMQ"].ToString());
+            if (Bus == null)
+                Bus = RabbitHutch.CreateBus(Furion.App.Configuration["RabbitMQ"].ToString());
+            return Bus;
+        }
+        /// <summary>
+        /// 释放链接
+        /// </summary>
+        public static void DisposeBus()
+        {
+            Bus?.Dispose();
+        }
+        /// <summary>
+        /// 同步执行
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="Param"></param>
+        /// <returns></returns>
+        public static bool SendMQ<T>(PushEntity<T> Param) 
+        {
+            try
+            {
+                if (Bus == null)
+                    CreateMQ();
+                new PushManage().SendMQ(Param, Bus);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex);
+                //BPALog.WriteLog(ex.Message, LogEnum.Error, ex: ex);
+                return false;
+            }
+        }
+        /// <summary>
+        /// 推荐异步执行
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="Param"></param>
+        /// <returns></returns>
+        public static async Task SendMQAsync<T>(PushEntity<T> Param) where T : class
+        {
 
-//            if (Bus == null)
-//                CreateMQ();
-//            await new PushManage().SendMQAsync(Param, Bus);
-//        }
-//        /// <summary>
-//        /// 订阅消息
-//        /// </summary>
-//        /// <typeparam name="TAccept"></typeparam>
-//        /// <param name="Args"></param>
-//        public static void Subscriber<TAccept, T>(AcceptEntity Args) where TAccept : IAccept, new() where T : new()
-//        {
-//            if (Bus == null)
-//                CreateMQ();
-//            if (string.IsNullOrEmpty(Args.ExchangeName))
-//                return;
-//            Expression<Action<IAccept>> methodCall;
-//            IExchange EX = null;
-//            if (Args.SendType == MQEnum.Sub)
-//            {
-//                EX = Bus.Advanced.ExchangeDeclare(Args.ExchangeName, ExchangeType.Fanout);
-//            }
-//            if (Args.SendType == MQEnum.Push)
-//            {
-//                EX = Bus.Advanced.ExchangeDeclare(Args.ExchangeName, ExchangeType.Direct);
-//            }
-//            if (Args.SendType == MQEnum.Top)
-//            {
-//                EX = Bus.Advanced.ExchangeDeclare(Args.ExchangeName, ExchangeType.Topic);
-//            }
-//            IQueue queue = Bus.Advanced.QueueDeclare(Args.QueeName ?? null);
-//            Bus.Advanced.Bind(EX, queue, Args.RouteName);
-//            Bus.Advanced.Consume(queue, (body, properties, info) => Task.Factory.StartNew(() =>
-//            {
-//                try
-//                {
-//                    var message = Encoding.UTF8.GetString(body);
-//                    //处理消息
-//                    methodCall = job => job.AcceptMQ<T>(message);
-//                    methodCall.Compile()(new TAccept());
-//                }
-//                catch (Exception ex)
-//                {
-//                    throw ex;
-//                }
-//            }));
-//        }
-//    }
-//}
+            if (Bus == null)
+                CreateMQ();
+            await new PushManage().SendMQAsync(Param, Bus);
+        }
+        /// <summary>
+        /// 订阅消息
+        /// </summary>
+        /// <typeparam name="TAccept"></typeparam>
+        /// <param name="Args"></param>
+        public static void Subscriber<TAccept, T>(AcceptEntity Args) where TAccept : IAccept, new() where T : new()
+        {
+            //if (Bus == null)
+            //    CreateMQ();
+            //if (string.IsNullOrEmpty(Args.ExchangeName))
+            //    return;
+            //Expression<Action<IAccept>> methodCall;
+            //IExchange EX = null;
+            //if (Args.SendType == MQEnum.Sub)
+            //{
+            //    EX = Bus.Advanced.ExchangeDeclare(Args.ExchangeName, ExchangeType.Fanout);
+            //}
+            //if (Args.SendType == MQEnum.Push)
+            //{
+            //    EX = Bus.Advanced.ExchangeDeclare(Args.ExchangeName, ExchangeType.Direct);
+            //}
+            //if (Args.SendType == MQEnum.Top)
+            //{
+            //    EX = Bus.Advanced.ExchangeDeclare(Args.ExchangeName, ExchangeType.Topic);
+            //}
+            //IQueue queue = Bus.Advanced.QueueDeclare(Args.QueeName ?? null);
+            //Bus.Advanced.Bind(EX, queue, Args.RouteName);
+            //Bus.Advanced.Consume(queue, (body, properties, info) => Task.Factory.StartNew(() =>
+            //{
+            //    try
+            //    {
+            //        var message = Encoding.UTF8.GetString(body);
+            //        //处理消息
+            //        methodCall = job => job.AcceptMQ<T>(message);
+            //        methodCall.Compile()(new TAccept());
+            //    }
+            //    catch (Exception ex)
+            //    {
+            //        throw ex;
+            //    }
+            //}));
+        }
+    }
+}

BPA.KitChen.GroupMeal.Core/Common/RabbitMq/Config/PushManage.cs

@@ -1,81 +1,81 @@
-//using EasyNetQ;
-//using EasyNetQ.Topology;
-//using System;
-//using System.Collections.Generic;
-//using System.Text;
-//using Newtonsoft.Json;
-//using System.Threading.Tasks;
+using EasyNetQ;
+using EasyNetQ.Topology;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Newtonsoft.Json;
+using System.Threading.Tasks;
 
-//namespace BPA.Kitchen.Core.RabbitMq.Config
-//{
-//    public class PushManage
-//    {
-//        /// <summary>
-//        /// 发布消息队列异步
-//        /// </summary>
-//        /// <typeparam name="T"></typeparam>
-//        /// <param name="Param"></param>
-//        /// <param name="Bus"></param>
-//        /// <returns></returns>
-//        public async Task SendMQAsync<T>(PushEntity<T> Param, IBus Bus) 
-//        {
-//            //one to one
-//            var msg = new Message<T>(Param.BodyData);
-//            IExchange EX = null;
-//            if (Param.SendType == MQEnum.Sub)
-//            {
-//                EX = Bus.Advanced.ExchangeDeclare(Param.ExchangeName, ExchangeType.Fanout);
-//            }
-//            if (Param.SendType == MQEnum.Push)
-//            {
-//                EX = Bus.Advanced.ExchangeDeclare(Param.ExchangeName, ExchangeType.Direct);
-//            }
-//            if (Param.SendType == MQEnum.Top)
-//            {
-//                EX = Bus.Advanced.ExchangeDeclare(Param.ExchangeName, ExchangeType.Topic);
-//            }
-//            await Bus.Advanced.PublishAsync(EX, Param.RouteName, false, msg).ContinueWith(t =>
-//            {
-//                //消息投递失败
-//                if (!t.IsCompleted && t.IsFaulted)
-//                {
-//                    //    //将消息记录到数据库轮询
-//                    //    IRepository Repository = new Repository();
-//                    //    SystemLog Log = new SystemLog
-//                    //    {
-//                    //        LogName = "消息队列",
-//                    //        Source = "发布队列",
-//                    //        EventData = JsonConvert.SerializeObject(Param.BodyData)
-//                    //    };
-//                    //    Repository.Insert(Log);
+namespace BPA.Kitchen.Core.RabbitMq.Config
+{
+    public class PushManage
+    {
+        /// <summary>
+        /// 发布消息队列异步
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="Param"></param>
+        /// <param name="Bus"></param>
+        /// <returns></returns>
+        public async Task SendMQAsync<T>(PushEntity<T> Param, IBus Bus) 
+        {
+            ////one to one
+            //var msg = new Message<T>(Param.BodyData);
+            //IExchange EX = null;
+            //if (Param.SendType == MQEnum.Sub)
+            //{
+            //    EX = Bus.Advanced.ExchangeDeclare(Param.ExchangeName, ExchangeType.Fanout);
+            //}
+            //if (Param.SendType == MQEnum.Push)
+            //{
+            //    EX = Bus.Advanced.ExchangeDeclare(Param.ExchangeName, ExchangeType.Direct);
+            //}
+            //if (Param.SendType == MQEnum.Top)
+            //{
+            //    EX = Bus.Advanced.ExchangeDeclare(Param.ExchangeName, ExchangeType.Topic);
+            //}
+            //await Bus.Advanced.PublishAsync(EX, Param.RouteName, false, msg).ContinueWith(t =>
+            //{
+            //    //消息投递失败
+            //    if (!t.IsCompleted && t.IsFaulted)
+            //    {
+            //        //    //将消息记录到数据库轮询
+            //        //    IRepository Repository = new Repository();
+            //        //    SystemLog Log = new SystemLog
+            //        //    {
+            //        //        LogName = "消息队列",
+            //        //        Source = "发布队列",
+            //        //        EventData = JsonConvert.SerializeObject(Param.BodyData)
+            //        //    };
+            //        //    Repository.Insert(Log);
                     
-//                }
-//            });
-//        }
-//        /// <summary>
-//        /// 发布消息队列同步
-//        /// </summary>
-//        /// <typeparam name="T"></typeparam>
-//        /// <param name="Param"></param>
-//        /// <param name="Bus"></param>
-//        public void SendMQ<T>(PushEntity<T> Param, IBus Bus) 
-//        {
-//            //one to one
-//            var msg = new Message<T>(Param.BodyData);
-//            IExchange EX = null;
-//            if (Param.SendType == MQEnum.Sub)
-//            {
-//                EX = Bus.Advanced.ExchangeDeclare(Param.ExchangeName, ExchangeType.Fanout);
-//            }
-//            if (Param.SendType == MQEnum.Push)
-//            {
-//                EX = Bus.Advanced.ExchangeDeclare(Param.ExchangeName, ExchangeType.Direct);
-//            }
-//            if (Param.SendType == MQEnum.Top)
-//            {
-//                EX = Bus.Advanced.ExchangeDeclare(Param.ExchangeName, ExchangeType.Topic);
-//            }
-//            Bus.Advanced.Publish(EX, Param.RouteName, false, msg);
-//        }
-//    }
-//}
+            //    }
+            //});
+        }
+        /// <summary>
+        /// 发布消息队列同步
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="Param"></param>
+        /// <param name="Bus"></param>
+        public void SendMQ<T>(PushEntity<T> Param, IBus Bus) 
+        {
+            ////one to one
+            //var msg = new Message<T>(Param.BodyData);
+            //IExchange EX = null;
+            //if (Param.SendType == MQEnum.Sub)
+            //{
+            //    EX = Bus.Advanced.ExchangeDeclare(Param.ExchangeName, ExchangeType.Fanout);
+            //}
+            //if (Param.SendType == MQEnum.Push)
+            //{
+            //    EX = Bus.Advanced.ExchangeDeclare(Param.ExchangeName, ExchangeType.Direct);
+            //}
+            //if (Param.SendType == MQEnum.Top)
+            //{
+            //    EX = Bus.Advanced.ExchangeDeclare(Param.ExchangeName, ExchangeType.Topic);
+            //}
+            //Bus.Advanced.Publish(EX, Param.RouteName, false, msg);
+        }
+    }
+}

BPA.KitChen.GroupMeal.Core/Common/RabbitMq/Publisher/ServiceQueryPush.cs

@@ -37,9 +37,7 @@ namespace BPA.Kitchen.Core.RabbitMq.Publisher
                 entity.ExchangeName = "Message.Topic";
                 entity.RouteName = Key;
             }
-
-            return true;
-            //   return await MQFactory.SendMQAsync(entity).ContinueWith(t => { return t.IsCompleted ? true : false; });
+            return await MQFactory.SendMQAsync(entity).ContinueWith(t => { return t.IsCompleted ? true : false; });
         }
         public bool PushMQ<T>(T Entity, string Key, MQEnum MQType = MQEnum.Push) 
         {
@@ -69,8 +67,7 @@ namespace BPA.Kitchen.Core.RabbitMq.Publisher
                 entity.ExchangeName = "Message.Topic";
                 entity.RouteName = Key;
             }
-            return true;
-          //  return MQFactory.SendMQ(entity);
+            return MQFactory.SendMQ(entity);
         }
     }
 }

BPA.KitChen.GroupMeal.Core/Entity/BPA_Gate.cs

@@ -30,6 +30,8 @@ namespace BPA.KitChen.GroupMeal.Core.Entity
         /// </summary> 
         public int Mode { get; set; } = 0;
         public decimal Price { get; set; }
+
+        [SugarColumn(ColumnDataType = "nvarchar(1000)", IsNullable = true)]
         public string Remaek { get; set; }
     }
 }

BPA.KitChen.GroupMeal.Core/Entity/BPA_PayCard.cs

@@ -0,0 +1,35 @@
+using BPA.KitChen.GroupMeal.Core.Entity.Base;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.KitChen.GroupMeal.Core.Entity
+{
+    /// <summary>
+    /// 刷卡机
+    /// </summary>
+    [SugarTable("bpa_paycard")]
+    public class BPA_PayCard : IBaseGroupIdEntity
+    {
+
+        /// <summary> 
+        ///  
+        /// </summary> 
+        public string Name { get; set; }
+        /// <summary> 
+        ///  
+        /// </summary> 
+        public string GateId { get; set; }
+        /// <summary> 
+        ///  
+        /// </summary> 
+        public int SleepTime { get; set; }
+        /// <summary>
+        /// 读取地址
+        /// </summary>
+        public string Address { get; set; }
+    }
+}

BPA.KitChen.GroupMeal.Core/RequestAnalysis/UserAnalysis.cs

@@ -0,0 +1,21 @@
+using Furion;
+using Microsoft.AspNetCore.Http;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.Kitchen.Core.Common.RequestAnalysis
+{
+  public  class UserAnalysis
+    {
+        public UserAnalysis()
+        {
+           
+            //CurrentUser.AppId = App.HttpContext.Request.Headers["AppId"];
+            //CurrentUser.TenantId = App.HttpContext.Request.Headers["TenantId"];
+
+        }
+    }
+}

BPA.KitChen.GroupMeal.Core/obj/BPA.KitChen.GroupMeal.Core.csproj.nuget.dgspec.json

@@ -1,94 +0,0 @@
-{
-  "format": 1,
-  "restore": {
-    "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj": {}
-  },
-  "projects": {
-    "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj": {
-      "version": "1.0.0",
-      "restore": {
-        "projectUniqueName": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj",
-        "projectName": "BPA.KitChen.GroupMeal.Core",
-        "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj",
-        "packagesPath": "C:\\Users\\gwbvi\\.nuget\\packages\\",
-        "outputPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\obj\\",
-        "projectStyle": "PackageReference",
-        "fallbackFolders": [
-          "E:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-        ],
-        "configFilePaths": [
-          "C:\\Users\\gwbvi\\AppData\\Roaming\\NuGet\\NuGet.Config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
-        ],
-        "originalTargetFrameworks": [
-          "net6.0"
-        ],
-        "sources": {
-          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "http://10.2.1.25:10243/repository/bpa/index.json": {},
-          "https://api.nuget.org/v3/index.json": {}
-        },
-        "frameworks": {
-          "net6.0": {
-            "targetAlias": "net6.0",
-            "projectReferences": {}
-          }
-        },
-        "warningProperties": {
-          "warnAsError": [
-            "NU1605"
-          ]
-        }
-      },
-      "frameworks": {
-        "net6.0": {
-          "targetAlias": "net6.0",
-          "dependencies": {
-            "EasyNetQ": {
-              "target": "Package",
-              "version": "[7.8.0, )"
-            },
-            "Furion": {
-              "target": "Package",
-              "version": "[4.9.1.15, )"
-            },
-            "Furion.Extras.Authentication.JwtBearer": {
-              "target": "Package",
-              "version": "[4.9.1.15, )"
-            },
-            "Furion.Extras.ObjectMapper.Mapster": {
-              "target": "Package",
-              "version": "[4.9.1.15, )"
-            },
-            "Microsoft.NETCore.App": {
-              "target": "Package",
-              "version": "[2.2.8, )"
-            },
-            "SqlSugarCore": {
-              "target": "Package",
-              "version": "[5.1.4.129, )"
-            }
-          },
-          "imports": [
-            "net461",
-            "net462",
-            "net47",
-            "net471",
-            "net472",
-            "net48",
-            "net481"
-          ],
-          "assetTargetFallback": true,
-          "warn": true,
-          "frameworkReferences": {
-            "Microsoft.NETCore.App": {
-              "privateAssets": "all"
-            }
-          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
-        }
-      }
-    }
-  }
-}

BPA.KitChen.GroupMeal.Core/obj/BPA.KitChen.GroupMeal.Core.csproj.nuget.g.props

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
-    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\gwbvi\.nuget\packages\;E:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
-    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
-  </PropertyGroup>
-  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\gwbvi\.nuget\packages\" />
-    <SourceRoot Include="E:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
-  </ItemGroup>
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)microsoft.netcore.app\2.2.8\build\netcoreapp2.2\Microsoft.NETCore.App.props" Condition="Exists('$(NuGetPackageRoot)microsoft.netcore.app\2.2.8\build\netcoreapp2.2\Microsoft.NETCore.App.props')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.25\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.25\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.props')" />
-  </ImportGroup>
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\gwbvi\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
-    <PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">C:\Users\gwbvi\.nuget\packages\microsoft.codeanalysis.analyzers\3.3.4</PkgMicrosoft_CodeAnalysis_Analyzers>
-  </PropertyGroup>
-</Project>

BPA.KitChen.GroupMeal.Core/obj/BPA.KitChen.GroupMeal.Core.csproj.nuget.g.targets

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)system.text.json\6.0.9\buildTransitive\netcoreapp3.1\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\6.0.9\buildTransitive\netcoreapp3.1\System.Text.Json.targets')" />
-    <Import Project="$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.6\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.6\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets')" />
-    <Import Project="$(NuGetPackageRoot)netstandard.library\2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('$(NuGetPackageRoot)netstandard.library\2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.netcore.app\2.2.8\build\netcoreapp2.2\Microsoft.NETCore.App.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.netcore.app\2.2.8\build\netcoreapp2.2\Microsoft.NETCore.App.targets')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets')" />
-  </ImportGroup>
-</Project>

BPA.KitChen.GroupMeal.SqlSugar/SqlSugarDb.cs

@@ -56,10 +56,41 @@ namespace BPA.KitChen.GroupMeal.SqlSugar
             //添加默认值
             DataExecuting(db);
 
-            // 配置租户过滤器
-            var tenantId = App.User?.FindFirst(ClaimConst.GroupId)?.Value;
-            db.QueryFilter.AddTableFilter<IBaseGroupIdEntity>(u => u.GroupId == tenantId);
-            db.QueryFilter.AddTableFilter<IBaseOPEntity>(u => u.IsDeleted ==0);
+            //// 配置租户过滤器
+            //var tenantId = App.User?.FindFirst(ClaimConst.GroupId)?.Value;
+            //db.QueryFilter.AddTableFilter<IBaseGroupIdEntity>(u => u.GroupId == tenantId);
+
+            //db.QueryFilter.AddTableFilter<IBaseOPEntity>(u => u.IsDeleted ==0);
+            var types = Assembly.Load("BPA.KitChen.GroupMeal.Core").GetTypes()
+                .Where(x => x.GetCustomAttribute<SugarTable>() != null);
+
+            foreach (var entityType in types)
+            {
+
+                if (entityType.GetProperty("GroupId") != null)//判断实体类中包含属性
+                {
+                    var groupId = string.IsNullOrWhiteSpace(CurrentUser.TenantId)
+                        ? App.User?.FindFirst(ClaimConst.GroupId)?.Value
+                        : CurrentUser.TenantId;
+                    //构建动态Lambda
+                    var lambda = DynamicExpressionParser.ParseLambda
+                    (new[] { Expression.Parameter(entityType, "it") },
+                        typeof(bool), $"{nameof(IBaseGroupIdEntity.GroupId)} ==  @0",
+                        groupId);
+                    db.QueryFilter.Add(new TableFilterItem<object>(entityType, lambda, true)); //将Lambda传入过滤器
+                }
+
+                if (entityType.GetProperty("IsDeleted") != null) //判断实体类中包含属性
+                {
+                    //构建动态Lambda
+                    var lambda = DynamicExpressionParser.ParseLambda
+                    (new[] { Expression.Parameter(entityType, "it") },
+                        typeof(bool), $"{nameof(IBaseOPEntity.IsDeleted)} ==  @0",
+                        false);
+                    db.QueryFilter.Add(new TableFilterItem<object>(entityType, lambda, true)); //将Lambda传入过滤器
+                }
+
+            }
 
 
             //var types = Assembly.Load("BPA.KitChen.GroupMeal.Core").GetTypes()

BPA.KitChen.GroupMeal.SqlSugar/SupperRepository.cs

@@ -0,0 +1,31 @@
+using BPA.Kitchen.Core.Common.RequestAnalysis;
+using Furion.FriendlyException;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.KitChen.GroupMeal.SqlSugar
+{
+    public class SupperRepository: UserAnalysis
+    {
+        public async Task<T> BaseAction<T>(SqlSugarClient db, Func<T> action, Func<T> defualtActoion, string msg)
+        {
+            try
+            {
+                db.BeginTran();
+                var res = action.Invoke();
+                db.CommitTran();
+                return await Task.FromResult(res);
+            }
+            catch (Exception ex)
+            {
+                db.RollbackTran();
+                //BPALog.WriteLog(msg + ":" + ex.Message, LogEnum.Error, null, ex);
+                throw Oops.Oh(ex.Message);
+            }
+        }
+    }
+}

BPA.KitChen.GroupMeal.SqlSugar/obj/BPA.KitChen.GroupMeal.SqlSugar.csproj.nuget.dgspec.json

@@ -1,164 +0,0 @@
-{
-  "format": 1,
-  "restore": {
-    "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj": {}
-  },
-  "projects": {
-    "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj": {
-      "version": "1.0.0",
-      "restore": {
-        "projectUniqueName": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj",
-        "projectName": "BPA.KitChen.GroupMeal.Core",
-        "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj",
-        "packagesPath": "C:\\Users\\gwbvi\\.nuget\\packages\\",
-        "outputPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\obj\\",
-        "projectStyle": "PackageReference",
-        "fallbackFolders": [
-          "E:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-        ],
-        "configFilePaths": [
-          "C:\\Users\\gwbvi\\AppData\\Roaming\\NuGet\\NuGet.Config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
-        ],
-        "originalTargetFrameworks": [
-          "net6.0"
-        ],
-        "sources": {
-          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "http://10.2.1.25:10243/repository/bpa/index.json": {},
-          "https://api.nuget.org/v3/index.json": {}
-        },
-        "frameworks": {
-          "net6.0": {
-            "targetAlias": "net6.0",
-            "projectReferences": {}
-          }
-        },
-        "warningProperties": {
-          "warnAsError": [
-            "NU1605"
-          ]
-        }
-      },
-      "frameworks": {
-        "net6.0": {
-          "targetAlias": "net6.0",
-          "dependencies": {
-            "EasyNetQ": {
-              "target": "Package",
-              "version": "[7.8.0, )"
-            },
-            "Furion": {
-              "target": "Package",
-              "version": "[4.9.1.15, )"
-            },
-            "Furion.Extras.Authentication.JwtBearer": {
-              "target": "Package",
-              "version": "[4.9.1.15, )"
-            },
-            "Furion.Extras.ObjectMapper.Mapster": {
-              "target": "Package",
-              "version": "[4.9.1.15, )"
-            },
-            "Microsoft.NETCore.App": {
-              "target": "Package",
-              "version": "[2.2.8, )"
-            },
-            "SqlSugarCore": {
-              "target": "Package",
-              "version": "[5.1.4.129, )"
-            }
-          },
-          "imports": [
-            "net461",
-            "net462",
-            "net47",
-            "net471",
-            "net472",
-            "net48",
-            "net481"
-          ],
-          "assetTargetFallback": true,
-          "warn": true,
-          "frameworkReferences": {
-            "Microsoft.NETCore.App": {
-              "privateAssets": "all"
-            }
-          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
-        }
-      }
-    },
-    "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj": {
-      "version": "1.0.0",
-      "restore": {
-        "projectUniqueName": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj",
-        "projectName": "BPA.KitChen.GroupMeal.SqlSugar",
-        "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj",
-        "packagesPath": "C:\\Users\\gwbvi\\.nuget\\packages\\",
-        "outputPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\obj\\",
-        "projectStyle": "PackageReference",
-        "fallbackFolders": [
-          "E:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-        ],
-        "configFilePaths": [
-          "C:\\Users\\gwbvi\\AppData\\Roaming\\NuGet\\NuGet.Config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
-        ],
-        "originalTargetFrameworks": [
-          "net6.0"
-        ],
-        "sources": {
-          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "http://10.2.1.25:10243/repository/bpa/index.json": {},
-          "https://api.nuget.org/v3/index.json": {}
-        },
-        "frameworks": {
-          "net6.0": {
-            "targetAlias": "net6.0",
-            "projectReferences": {
-              "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj": {
-                "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj"
-              }
-            }
-          }
-        },
-        "warningProperties": {
-          "warnAsError": [
-            "NU1605"
-          ]
-        }
-      },
-      "frameworks": {
-        "net6.0": {
-          "targetAlias": "net6.0",
-          "dependencies": {
-            "System.Linq.Dynamic.Core": {
-              "target": "Package",
-              "version": "[1.3.7, )"
-            }
-          },
-          "imports": [
-            "net461",
-            "net462",
-            "net47",
-            "net471",
-            "net472",
-            "net48",
-            "net481"
-          ],
-          "assetTargetFallback": true,
-          "warn": true,
-          "frameworkReferences": {
-            "Microsoft.NETCore.App": {
-              "privateAssets": "all"
-            }
-          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
-        }
-      }
-    }
-  }
-}

BPA.KitChen.GroupMeal.SqlSugar/obj/BPA.KitChen.GroupMeal.SqlSugar.csproj.nuget.g.props

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
-    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\gwbvi\.nuget\packages\;E:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
-    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
-  </PropertyGroup>
-  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\gwbvi\.nuget\packages\" />
-    <SourceRoot Include="E:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
-  </ItemGroup>
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.25\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.25\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.props')" />
-  </ImportGroup>
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\gwbvi\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
-    <PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">C:\Users\gwbvi\.nuget\packages\microsoft.codeanalysis.analyzers\3.3.4</PkgMicrosoft_CodeAnalysis_Analyzers>
-  </PropertyGroup>
-</Project>

BPA.KitChen.GroupMeal.SqlSugar/obj/BPA.KitChen.GroupMeal.SqlSugar.csproj.nuget.g.targets

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)system.text.json\6.0.9\buildTransitive\netcoreapp3.1\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\6.0.9\buildTransitive\netcoreapp3.1\System.Text.Json.targets')" />
-    <Import Project="$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.6\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.6\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets')" />
-  </ImportGroup>
-</Project>

BPA.KitChen.GroupMeal.sln

@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34024.191
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPA.KitChen.GroupMeal", "BPA.KitChen.GroupMeal\BPA.KitChen.GroupMeal.csproj", "{B368D2BC-706E-487C-AE1A-2D76D0AAC696}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPA.KitChen.GroupMeal", "BPA.KitChen.GroupMeal\BPA.KitChen.GroupMeal.csproj", "{B368D2BC-706E-487C-AE1A-2D76D0AAC696}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPA.KitChen.GroupMeal.Application", "BPA.KitChen.GroupMeal.Application\BPA.KitChen.GroupMeal.Application.csproj", "{7676C2B1-63AF-48CC-AB2B-2130323C1A0E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPA.KitChen.GroupMeal.Application", "BPA.KitChen.GroupMeal.Application\BPA.KitChen.GroupMeal.Application.csproj", "{7676C2B1-63AF-48CC-AB2B-2130323C1A0E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPA.KitChen.GroupMeal.Core", "BPA.KitChen.GroupMeal.Core\BPA.KitChen.GroupMeal.Core.csproj", "{0261F1E3-5512-4058-AF5A-D068ACDC6382}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPA.KitChen.GroupMeal.Core", "BPA.KitChen.GroupMeal.Core\BPA.KitChen.GroupMeal.Core.csproj", "{0261F1E3-5512-4058-AF5A-D068ACDC6382}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPA.KitChen.GroupMeal.SqlSugar", "BPA.KitChen.GroupMeal.SqlSugar\BPA.KitChen.GroupMeal.SqlSugar.csproj", "{9E50DE23-D3D9-4604-9B76-71BEA8605B5E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPA.KitChen.GroupMeal.SqlSugar", "BPA.KitChen.GroupMeal.SqlSugar\BPA.KitChen.GroupMeal.SqlSugar.csproj", "{9E50DE23-D3D9-4604-9B76-71BEA8605B5E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

BPA.KitChen.GroupMeal/appsettings.json

@@ -5,17 +5,17 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "JWTSettings": {
-    "ValidateIssuerSigningKey": true,
-    "IssuerSigningKey": "RxOodrJLkXzGx8nFFgLbfMP42sOXqUKwwXVpAyS7KNuERILEfWzzHonRTe3GTbtYo8LXxiSL5gl5NhrGmgO4A4ili5",
-    "ValidateIssuer": true,
-    "ValidIssuer": "blckb",
-    "ValidateAudience": true,
-    "ValidAudience": "blckb",
-    "ValidateLifetime": true,
-    "ExpiredTime": 200,
-    "ClockSkew": 5
-  },
+  //"JWTSettings": {
+  //  "ValidateIssuerSigningKey": true,
+  //  "IssuerSigningKey": "RxOodrJLkXzGx8nFFgLbfMP42sOXqUKwwXVpAyS7KNuERILEfWzzHonRTe3GTbtYo8LXxiSL5gl5NhrGmgO4A4ili5",
+  //  "ValidateIssuer": true,
+  //  "ValidIssuer": "blckb",
+  //  "ValidateAudience": true,
+  //  "ValidAudience": "blckb",
+  //  "ValidateLifetime": true,
+  //  "ExpiredTime": 200,
+  //  "ClockSkew": 5
+  //},
   "DBConnectionStr": "server=10.2.1.21;Port=3306;Database=bpa_kitchen_groupmeal;Uid=root;Pwd=cygadmin;",
   "AllowedHosts": "*"
 }

BPA.KitChen.GroupMeal/obj/BPA.KitChen.GroupMeal.csproj.nuget.dgspec.json

@@ -1,304 +0,0 @@
-{
-  "format": 1,
-  "restore": {
-    "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.csproj": {}
-  },
-  "projects": {
-    "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Application\\BPA.KitChen.GroupMeal.Application.csproj": {
-      "version": "1.0.0",
-      "restore": {
-        "projectUniqueName": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Application\\BPA.KitChen.GroupMeal.Application.csproj",
-        "projectName": "BPA.KitChen.GroupMeal.Application",
-        "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Application\\BPA.KitChen.GroupMeal.Application.csproj",
-        "packagesPath": "C:\\Users\\gwbvi\\.nuget\\packages\\",
-        "outputPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Application\\obj\\",
-        "projectStyle": "PackageReference",
-        "fallbackFolders": [
-          "E:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-        ],
-        "configFilePaths": [
-          "C:\\Users\\gwbvi\\AppData\\Roaming\\NuGet\\NuGet.Config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
-        ],
-        "originalTargetFrameworks": [
-          "net6.0"
-        ],
-        "sources": {
-          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "http://10.2.1.25:10243/repository/bpa/index.json": {},
-          "https://api.nuget.org/v3/index.json": {}
-        },
-        "frameworks": {
-          "net6.0": {
-            "targetAlias": "net6.0",
-            "projectReferences": {
-              "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj": {
-                "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj"
-              },
-              "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj": {
-                "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj"
-              }
-            }
-          }
-        },
-        "warningProperties": {
-          "warnAsError": [
-            "NU1605"
-          ]
-        }
-      },
-      "frameworks": {
-        "net6.0": {
-          "targetAlias": "net6.0",
-          "imports": [
-            "net461",
-            "net462",
-            "net47",
-            "net471",
-            "net472",
-            "net48",
-            "net481"
-          ],
-          "assetTargetFallback": true,
-          "warn": true,
-          "frameworkReferences": {
-            "Microsoft.NETCore.App": {
-              "privateAssets": "all"
-            }
-          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
-        }
-      }
-    },
-    "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj": {
-      "version": "1.0.0",
-      "restore": {
-        "projectUniqueName": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj",
-        "projectName": "BPA.KitChen.GroupMeal.Core",
-        "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj",
-        "packagesPath": "C:\\Users\\gwbvi\\.nuget\\packages\\",
-        "outputPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\obj\\",
-        "projectStyle": "PackageReference",
-        "fallbackFolders": [
-          "E:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-        ],
-        "configFilePaths": [
-          "C:\\Users\\gwbvi\\AppData\\Roaming\\NuGet\\NuGet.Config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
-        ],
-        "originalTargetFrameworks": [
-          "net6.0"
-        ],
-        "sources": {
-          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "http://10.2.1.25:10243/repository/bpa/index.json": {},
-          "https://api.nuget.org/v3/index.json": {}
-        },
-        "frameworks": {
-          "net6.0": {
-            "targetAlias": "net6.0",
-            "projectReferences": {}
-          }
-        },
-        "warningProperties": {
-          "warnAsError": [
-            "NU1605"
-          ]
-        }
-      },
-      "frameworks": {
-        "net6.0": {
-          "targetAlias": "net6.0",
-          "dependencies": {
-            "EasyNetQ": {
-              "target": "Package",
-              "version": "[7.8.0, )"
-            },
-            "Furion": {
-              "target": "Package",
-              "version": "[4.9.1.15, )"
-            },
-            "Furion.Extras.Authentication.JwtBearer": {
-              "target": "Package",
-              "version": "[4.9.1.15, )"
-            },
-            "Furion.Extras.ObjectMapper.Mapster": {
-              "target": "Package",
-              "version": "[4.9.1.15, )"
-            },
-            "Microsoft.NETCore.App": {
-              "target": "Package",
-              "version": "[2.2.8, )"
-            },
-            "SqlSugarCore": {
-              "target": "Package",
-              "version": "[5.1.4.129, )"
-            }
-          },
-          "imports": [
-            "net461",
-            "net462",
-            "net47",
-            "net471",
-            "net472",
-            "net48",
-            "net481"
-          ],
-          "assetTargetFallback": true,
-          "warn": true,
-          "frameworkReferences": {
-            "Microsoft.NETCore.App": {
-              "privateAssets": "all"
-            }
-          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
-        }
-      }
-    },
-    "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj": {
-      "version": "1.0.0",
-      "restore": {
-        "projectUniqueName": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj",
-        "projectName": "BPA.KitChen.GroupMeal.SqlSugar",
-        "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj",
-        "packagesPath": "C:\\Users\\gwbvi\\.nuget\\packages\\",
-        "outputPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\obj\\",
-        "projectStyle": "PackageReference",
-        "fallbackFolders": [
-          "E:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-        ],
-        "configFilePaths": [
-          "C:\\Users\\gwbvi\\AppData\\Roaming\\NuGet\\NuGet.Config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
-        ],
-        "originalTargetFrameworks": [
-          "net6.0"
-        ],
-        "sources": {
-          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "http://10.2.1.25:10243/repository/bpa/index.json": {},
-          "https://api.nuget.org/v3/index.json": {}
-        },
-        "frameworks": {
-          "net6.0": {
-            "targetAlias": "net6.0",
-            "projectReferences": {
-              "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj": {
-                "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj"
-              }
-            }
-          }
-        },
-        "warningProperties": {
-          "warnAsError": [
-            "NU1605"
-          ]
-        }
-      },
-      "frameworks": {
-        "net6.0": {
-          "targetAlias": "net6.0",
-          "dependencies": {
-            "System.Linq.Dynamic.Core": {
-              "target": "Package",
-              "version": "[1.3.7, )"
-            }
-          },
-          "imports": [
-            "net461",
-            "net462",
-            "net47",
-            "net471",
-            "net472",
-            "net48",
-            "net481"
-          ],
-          "assetTargetFallback": true,
-          "warn": true,
-          "frameworkReferences": {
-            "Microsoft.NETCore.App": {
-              "privateAssets": "all"
-            }
-          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
-        }
-      }
-    },
-    "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.csproj": {
-      "version": "1.0.0",
-      "restore": {
-        "projectUniqueName": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.csproj",
-        "projectName": "BPA.KitChen.GroupMeal",
-        "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.csproj",
-        "packagesPath": "C:\\Users\\gwbvi\\.nuget\\packages\\",
-        "outputPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal\\obj\\",
-        "projectStyle": "PackageReference",
-        "fallbackFolders": [
-          "E:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-        ],
-        "configFilePaths": [
-          "C:\\Users\\gwbvi\\AppData\\Roaming\\NuGet\\NuGet.Config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
-        ],
-        "originalTargetFrameworks": [
-          "net6.0"
-        ],
-        "sources": {
-          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "http://10.2.1.25:10243/repository/bpa/index.json": {},
-          "https://api.nuget.org/v3/index.json": {}
-        },
-        "frameworks": {
-          "net6.0": {
-            "targetAlias": "net6.0",
-            "projectReferences": {
-              "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Application\\BPA.KitChen.GroupMeal.Application.csproj": {
-                "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Application\\BPA.KitChen.GroupMeal.Application.csproj"
-              },
-              "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj": {
-                "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.Core\\BPA.KitChen.GroupMeal.Core.csproj"
-              },
-              "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj": {
-                "projectPath": "D:\\Work\\BPA.KitChen.GroupMeal\\BPA.KitChen.GroupMeal.SqlSugar\\BPA.KitChen.GroupMeal.SqlSugar.csproj"
-              }
-            }
-          }
-        },
-        "warningProperties": {
-          "warnAsError": [
-            "NU1605"
-          ]
-        }
-      },
-      "frameworks": {
-        "net6.0": {
-          "targetAlias": "net6.0",
-          "imports": [
-            "net461",
-            "net462",
-            "net47",
-            "net471",
-            "net472",
-            "net48",
-            "net481"
-          ],
-          "assetTargetFallback": true,
-          "warn": true,
-          "frameworkReferences": {
-            "Microsoft.AspNetCore.App": {
-              "privateAssets": "none"
-            },
-            "Microsoft.NETCore.App": {
-              "privateAssets": "all"
-            }
-          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
-        }
-      }
-    }
-  }
-}

BPA.KitChen.GroupMeal/obj/BPA.KitChen.GroupMeal.csproj.nuget.g.props

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
-    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\gwbvi\.nuget\packages\;E:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
-    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
-  </PropertyGroup>
-  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\gwbvi\.nuget\packages\" />
-    <SourceRoot Include="E:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
-  </ItemGroup>
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.25\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.25\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.props')" />
-  </ImportGroup>
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\gwbvi\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
-    <PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">C:\Users\gwbvi\.nuget\packages\microsoft.codeanalysis.analyzers\3.3.4</PkgMicrosoft_CodeAnalysis_Analyzers>
-  </PropertyGroup>
-</Project>

BPA.KitChen.GroupMeal/obj/BPA.KitChen.GroupMeal.csproj.nuget.g.targets

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)system.text.json\6.0.9\buildTransitive\netcoreapp3.1\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\6.0.9\buildTransitive\netcoreapp3.1\System.Text.Json.targets')" />
-    <Import Project="$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.6\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.6\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets')" />
-  </ImportGroup>
-</Project>