Merge branch 'groupmealmanage' of http://10.2.1.24:10244/zhaoy/BPA.NewKitChen.Manage into groupmealmanage

.gitignore

@@ -35,3 +35,4 @@
 /BPA.SAAS.Manage.Web.Core/obj
 /BPA.SAAS.Manage.Web.Entry
 /.vs/BPA.SAAS.Manage/FileContentIndex
+/.vs/ProjectEvaluation/bpa.saas.manage.metadata.v7.bin

BPA.SAAS.Manage.Application/AExternalPlatform/Service/DiningPlate/DiningPlateServices.cs

@@ -1,38 +1,38 @@
-using BPA.SAAS.KitChenManage.Core;
-using BPA.SAAS.Manage.Application.AExternalPlatform.BaseDto;
-using BPA.SAAS.Manage.Application.AExternalPlatform.Enum;
-using BPA.SAAS.Manage.Application.AExternalPlatform.Service.DiningPlate.Dtos;
-using BPA.SAAS.Manage.Application.AExternalPlatform.Service.DiningPlate.Services;
-using BPA.SAAS.Manage.Comm.Util;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+//using BPA.SAAS.KitChenManage.Core;
+//using BPA.SAAS.Manage.Application.AExternalPlatform.BaseDto;
+//using BPA.SAAS.Manage.Application.AExternalPlatform.Enum;
+//using BPA.SAAS.Manage.Application.AExternalPlatform.Service.DiningPlate.Dtos;
+//using BPA.SAAS.Manage.Application.AExternalPlatform.Service.DiningPlate.Services;
+//using BPA.SAAS.Manage.Comm.Util;
+//using Newtonsoft.Json;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
 
-namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.DiningPlate
-{
+//namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.DiningPlate
+//{
 
-    [ApiDescriptionSettings("开放平台", Tag = "餐盘管理"), AllowAnonymous]
-    public class DiningPlateServices: IDynamicApiController
-    {
+//    [ApiDescriptionSettings("开放平台", Tag = "餐盘管理"), AllowAnonymous]
+//    public class DiningPlateServices: IDynamicApiController
+//    {
 
-        private readonly IDiningPlateService _diningPlateService;
-        public DiningPlateServices(IDiningPlateService diningPlateService)
-        {
-            _diningPlateService = diningPlateService;
-        }
+//        private readonly IDiningPlateService _diningPlateService;
+//        public DiningPlateServices(IDiningPlateService diningPlateService)
+//        {
+//            _diningPlateService = diningPlateService;
+//        }
 
-        /// <summary>
-        /// 根据二维码修改餐盘信息（有就修改没有就新增）
-        /// </summary>
-        /// <param name="inputDto"></param>
-        /// <returns></returns>
-        [HttpPost("/api/ExternalPlatform/Device/EditDiningPlateByQRCode")]
-        public async Task<bool> EditDiningPlateByQRCode(DiningPlateCreateOrUpdataDto inputDto)
-        {
-            return await _diningPlateService.EditDiningPlateByQRCode(inputDto);
-        }
-    }
-}
+//        /// <summary>
+//        /// 根据二维码修改餐盘信息（有就修改没有就新增）
+//        /// </summary>
+//        /// <param name="inputDto"></param>
+//        /// <returns></returns>
+//        [HttpPost("/api/ExternalPlatform/Device/EditDiningPlateByQRCode")]
+//        public async Task<bool> EditDiningPlateByQRCode(DiningPlateCreateOrUpdataDto inputDto)
+//        {
+//            return await _diningPlateService.EditDiningPlateByQRCode(inputDto);
+//        }
+//    }
+//}

BPA.SAAS.Manage.Application/AExternalPlatform/Service/Goods/Services/GoodsService.cs

@@ -60,6 +60,7 @@ namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.Goods.Services
                 Data = data
             };
         }
+
         /// <summary>
         /// 添加商品
         /// </summary>

BPA.SAAS.Manage.Application/AExternalPlatform/Service/Material/Services/MaterialService.cs

@@ -37,8 +37,6 @@ namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.Material.Service
         /// <returns></returns>
         public async Task<PageUtil<List<MaterialDto>>> GetMaterialPageList(MaterialPageInputDto inputDto)
         {
-
-
             int total = new RefAsync<int>();
             var data = SqlSugarDb.Db.Queryable<BPA_Batching, BPA_BatchingType, BPA_BatchingUint>((a, b, c) =>
                 new JoinQueryInfos(JoinType.Left, a.Batching_Type == b.Id,
@@ -264,7 +262,7 @@ namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.Material.Service
                 }
                 else
                 {
-                    if (material != null && material.Id == materialData.Id)
+                    if (material != null && material.Id != materialData.Id)
                     {
                         throw Oops.Oh(ErrorCodeEnum.Code10017);
                     }

BPA.SAAS.Manage.Application/AExternalPlatform/Service/ThirdpartyPush/Services/ThirdpartyPushService.cs

@@ -143,7 +143,7 @@ namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.ThirdpartyPush.S
                         productKey = b.Key,
                         productName = b.Name,
                         productVersion = c.Vesion,
-                        type = 2
+                        type = 2,
 
                     })
                     .ToListAsync();

BPA.SAAS.Manage.Application/AExternalPlatform/Service/WeighingService/Dtos/GoodsDto.cs

@@ -0,0 +1,47 @@
+using BPA.SAAS.Manage.Application.DataBase.Dtos.Goods;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.WeighingService.Dtos
+{
+
+    public class GoodsTypeDto
+    {
+        //类别ID
+        public string Id { get; set; }
+        //类别名称
+        public string Name { get; set; }
+        //排序
+        public int Sort { get; set; }
+
+
+        public List<GoodsDto> Foods;
+    }
+
+    public class GoodsDto
+    {
+        // 编号
+        public string Id { get; set; }
+
+        // 图片地址
+        public string Cover{ get; set; }
+
+        // 名称
+        public string Name { get; set; }
+
+        // vip价格
+        public decimal VipPrice { get; set; }
+
+        // 价格
+        public decimal Price { get; set; }
+
+        //排序
+        public int Sort { get; set; }
+
+        public string GoodsTypeId { get; set; }
+
+    }
+}

BPA.SAAS.Manage.Application/AExternalPlatform/Service/WeighingService/Services/IWeighingService.cs

@@ -0,0 +1,19 @@
+using BPA.SAAS.Manage.Application.AExternalPlatform.Service.WeighingService.Dtos;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.WeighingService.Services
+{
+    public interface IWeighingService
+    {
+
+        /// <summary>
+        /// 获取商品信息
+        /// </summary>
+        /// <returns></returns>
+         Task<List<GoodsTypeDto>> GetGoodsInfo();
+    }
+}

BPA.SAAS.Manage.Application/AExternalPlatform/Service/WeighingService/Services/WeighingService.cs

@@ -0,0 +1,68 @@
+using BPA.KitChen.GroupMeal.SqlSugar;
+using BPA.SAAS.Manage.Application.AExternalPlatform.Service.WeighingService.Dtos;
+using BPA.SAAS.Manage.Core.DataBase;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.WeighingService.Services
+{
+    public class WeighingService : IWeighingService, ITransient
+    {
+
+        /// <summary>
+        /// 获取商品信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("/api/ExternalPlatform/WeighingService/GetGoodsInfo")]
+        public async Task<List<GoodsTypeDto>> GetGoodsInfo()
+        {
+            //获取商品类型
+            var goodsType = await SqlSugarDb.Db.Queryable<BPA_GoodsType>()
+                .OrderBy(x => x.Sort)
+                .Where(x=>x.IsDeleted==0)
+                .Select(x => new GoodsTypeDto()
+                {
+                    Id = x.Id,
+                    Name = x.Name,
+                    Sort = x.Sort,
+                }).ToListAsync();
+
+            //获取商品
+            var goodsList = await SqlSugarDb.Db.Queryable<BPA_GoodsInfo>().OrderBy(x => x.Sort)
+                .Where(x => x.IsDeleted == 0)
+                .Select(x => new GoodsDto()
+                {
+                    Id = x.Id,
+                    Name = x.Name,
+                    Sort = x.Sort,
+                    Cover = x.ImgUrl,
+                    GoodsTypeId = x.GoodsTypeId,
+                    Price = x.Price,
+                    VipPrice=x.Price
+                }).ToListAsync();
+
+            ////获取商品属性价格
+            //var goodsPriceList = await SqlSugarDb.Db.Queryable<BPA_GoodsAttributePrice>().ToListAsync();
+            //foreach (var goods in goodsList)
+            //{
+            //    var data = goodsPriceList.Where(x=>x.GoodsId==goods.Id).ToList();
+            //    if (data!=null)
+            //    {
+            //        goods.Price = data.FirstOrDefault()!.Price;
+            //        goods.VipPrice = goods.Price;
+            //    }
+            //}
+
+            foreach (var item in goodsType)
+            {
+                var data = goodsList.Where(x => x.GoodsTypeId == item.Id).ToList();
+                item.Foods = data;
+            }
+
+            return goodsType;
+        }
+    }
+}

BPA.SAAS.Manage.Application/AExternalPlatform/Service/WeighingService/WeighingServices.cs

@@ -0,0 +1,34 @@
+using BPA.SAAS.Manage.Application.AExternalPlatform.Service.CheckService.Services;
+using BPA.SAAS.Manage.Application.AExternalPlatform.Service.WeighingService.Dtos;
+using BPA.SAAS.Manage.Application.AExternalPlatform.Service.WeighingService.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.WeighingService
+{
+
+    [ApiDescriptionSettings("开放平台", Tag = "称重接口"), AllowAnonymous]
+    public class WeighingServices: IDynamicApiController
+    {
+
+        private readonly IWeighingService _weighingService;
+        public WeighingServices(IWeighingService weighingService)
+        {
+            _weighingService = weighingService;
+        }
+
+
+        /// <summary>
+        /// 获取商品信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("/api/ExternalPlatform/WeighingService/GetGoodsInfo")]
+        public async Task<List<GoodsTypeDto>> GetGoodsInfo()
+        {
+            return await _weighingService.GetGoodsInfo();
+        }
+    }
+}

BPA.SAAS.Manage.Application/BPA.SAAS.Manage.Application.csproj

@@ -30,4 +30,10 @@
 		<ProjectReference Include="..\BPA.SAAS.Manage.Core\BPA.SAAS.Manage.Core.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Folder Include="AExternalPlatform\Service\Authorization\Dtos\" />
+	  <Folder Include="AExternalPlatform\Service\Authorization\Services\" />
+	  <Folder Include="AExternalPlatform\Service\CheckService\Dtos\" />
+	</ItemGroup>
+
 </Project>

BPA.SAAS.Manage.Application/DataBase/GoodsServices.cs

@@ -148,6 +148,18 @@ namespace BPA.SAAS.Manage.Application.DataBase
         {
             return await _goodsService.GetGoods(id);
         }
+
+        /// <summary>
+        /// 更具id查询商品信息列表
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        [HttpPost("/api/goods/GetGoodsListByIds")]
+        public async Task<List<GoodsInfoBaseView>> GetGoodsListByIds(List<string> ids)
+        {
+            return await _goodsService.GetGoodsListByIds(ids);
+        }
+
         ///// <summary>
         ///// 设备上传商品数据
         ///// </summary>

BPA.SAAS.Manage.Application/DataBase/Interface/IGoodsService.cs

@@ -73,6 +73,16 @@ namespace BPA.SAAS.Manage.Application.DataBase.Interface
         /// <param name="id"></param>
         /// <returns></returns>
         Task<GoodsInfoBaseView> GetGoods(string id);
+
+
+        /// <summary>
+        /// 更具id查询商品信息
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        Task<List<GoodsInfoBaseView>> GetGoodsListByIds(List<string> ids);
+
+
         ///// <summary>
         ///// 设备上传商品数据
         ///// </summary>

BPA.SAAS.Manage.Application/DataBase/Services/GoodsService.cs

@@ -96,7 +96,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services
                     GoodsTypeName = b.IsDeleted == 0 ? b.Name : "",
                     Descritption = a.Descritption,
                     IsDeleted = a.IsDeleted,
-         
+                    a.GroupId,
                     // CreateAt = a.CreateAt,
                     GoodsUintId = a.GoodsUintId,
                     ForeignKeyRe = a.ForeignKeyRe,
@@ -202,8 +202,10 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services
                 if (goods == null) throw Oops.Oh("商品不存在");
                 var goodsbom = _db.Queryable<BPA_GoodsBom>().Where(x => x.Goods_Id == id).ToList();
                 var goodsTechnology = _db.Queryable<BPA_GoodsTechnologyAction>().Where(x => x.GoodsId == id).ToList();
+                //var FoodMenuGoods = _db.Queryable<BPA_FoodMenuGoods>().Where(x => x.GoodsId == id).ToList();
                 await _db.Deleteable(goodsbom).ExecuteCommandAsync();
                 await _db.Deleteable(goodsTechnology).ExecuteCommandAsync();
+                //await _db.Deleteable(FoodMenuGoods).ExecuteCommandAsync();
                 var res = await _db.Deleteable(goods).ExecuteCommandAsync();
                 _db.Ado.CommitTran();
                 return res > 0;
@@ -460,7 +462,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services
                     GoodsUintName = SqlFunc.Subqueryable<BPA_GoodsUint>().Where(s => s.Id == a.GoodsUintId && s.IsDeleted == 0).Select(s => s.Name),
                     //GoodsAttributeList = new List<GoodsAttributeList>()
                 }).FirstAsync();
-            if (!res.IsAttrubute)
+            if (res!=null&&!res.IsAttrubute)
             {
                 res.GoodsAttributeList = await _goodsAttributeService.GetByNameAttribute("默认属性");
             }
@@ -471,6 +473,50 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services
 
             return res;
         }
+
+        /// <summary>
+        /// 更具id查询商品信息
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public async Task<List<GoodsInfoBaseView>> GetGoodsListByIds(List<string> ids)
+        {
+            var res = await _db.Queryable<BPA_GoodsInfo>()
+                .Where((a) => a.IsDeleted == 0 && ids.Contains(a.Id))
+                .OrderBy(a => a.CreateAt, OrderByType.Desc)
+                .Select((a) => new GoodsInfoBaseView
+                {
+                    Id = a.Id,
+                    Code = a.Code,
+                    Name = a.Name,
+                    Price = a.Price,
+                    ImgUrl = a.ImgUrl,
+                    Status = a.Status,
+                    GoodsTypeId = a.GoodsTypeId,
+                    GoodsTypeName = SqlFunc.Subqueryable<BPA_GoodsType>().Where(s => s.Id == a.GoodsTypeId && s.IsDeleted == 0).Select(s => s.Name),
+                    Remark = a.Descritption,
+                    // CreateAt = a.CreateAt,
+                    GoodsUintId = a.GoodsUintId,
+                    IsAttrubute = a.IsAttrubute,
+                    GoodsUintName = SqlFunc.Subqueryable<BPA_GoodsUint>().Where(s => s.Id == a.GoodsUintId && s.IsDeleted == 0).Select(s => s.Name),
+                    //GoodsAttributeList = new List<GoodsAttributeList>()
+                }).ToListAsync();
+
+            foreach (var item in res)
+            {
+                if (!item.IsAttrubute)
+                {
+                    item.GoodsAttributeList = await _goodsAttributeService.GetByNameAttribute("默认属性");
+                }
+                else
+                {
+                    item.GoodsAttributeList = await _goodsAttributeService.GetByGoodsIdAttribute(item.Id);
+                }
+            }
+
+            return res;
+        }
+
         public async Task<bool> ExportGood(IFormFile file)
         {
             bool isReplace = true;

BPA.SAAS.Manage.Application/System/Services/MenuService.cs

@@ -57,7 +57,7 @@ namespace BPA.SAAS.Manage.Application.System.Services
                 Status = t.Status,
                 IsAdmin=t.IsAdmin,
                 Type= t.Type,
-                //TypeName= GetTypeName(t.Type),
+               // TypeName= GetTypeName(t.Type),
                 Children = AllMenus.Where(x => x.Pid == t.Id).Select(x => new MenuTreeDtoOutput
                 {
                     Id = x.Id,
@@ -87,42 +87,13 @@ namespace BPA.SAAS.Manage.Application.System.Services
                         Status = y.Status,
                         IsAdmin=y.IsAdmin,
                         Type = y.Type,
-                       // TypeName = GetTypeName(y.Type),
+                        //TypeName = GetTypeName(y.Type),
                     }).ToList()
                 }).ToList()
             }).ToList();
 
             return data;
         }
-        public string GetTypeName(string type)
-        {
-            var ary = type.Split(',');
-            var name = "";
-            for (int i = 0; i < ary.Length; i++)
-            {
-                if (ary[i] == "0")
-                {
-                    name += "团餐";
-                }
-                if (ary[i] == "1")
-                {
-                    name += "门店";
-                }
-                if (ary[i] == "2")
-                {
-                    name += "后厨";
-                }
-                if (ary[i] == "3")
-                {
-                    name += "公共";
-                }
-                if(i< ary.Length - 1)
-                {
-                    name += ",";
-                }
-            }
-            return name;
-        }
         /// <summary>
         /// 新增菜单
         /// </summary>

BPA.SAAS.Manage.Core/DataBase/BPA_FoodMenuGoods.cs

@@ -0,0 +1,24 @@
+using BPA.SAAS.Manage.Core.Base;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.Manage.Core.DataBase
+{
+    [SugarTable("bpa_foodmenugoods")]
+    public class BPA_FoodMenuGoods : IBaseEntity, IGroupId
+    {
+        /// <summary>
+        /// 菜谱id
+        /// </summary>
+        public string FoodMenuId { get; set; }
+        /// <summary>
+        /// 商品id
+        /// </summary>
+        public string GoodsId { get; set; }
+        public string GroupId { get; set; }
+    }
+}

BPA.SAAS.Manage.Core/DbContext.cs

@@ -34,6 +34,16 @@ namespace BPA.SAAS.Manage.Core
             };
 
             SqlSugarDb.SqlSugarScope(configConnection);
+
+            SqlSugarDb.SqlSugarScopeLog(new ConnectionConfig()
+            {
+                ConnectionString = connectionConfigs[1].ConnectionString,
+                DbType = DbType.MySql,//设置数据库类型
+                IsAutoCloseConnection = true,//自动释放数据务，如果存在事务，在事务结束后释放
+                InitKeyType = InitKeyType.Attribute, //从实体特性中读取主键自增列信息 
+                ConfigId = "default",
+            });
+
             SqlSugarScope sqlSugar = new SqlSugarScope(configConnection,
                 db =>
                 {

BPA.SAAS.Manage.Core/RequestAnalysis/Class1.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.Manage.Core.RequestAnalysis
+{
+    internal class Class1
+    {
+    }
+}

BPA.SAAS.Manage.Core/RequestAnalysis/UserAnalysis.cs

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

BPA.SAAS.Manage.Core/SqlSugarDb.cs

@@ -16,12 +16,39 @@ namespace BPA.KitChen.GroupMeal.SqlSugar
 
 
         public static SqlSugarScope Db { get; set; }
+        public static SqlSugarScope DbLog { get; set; }
 
         public static SqlSugarScope SqlSugarScope(ConnectionConfig configConnection)
         {
             //全局过滤
 
             Db = new SqlSugarScope(configConnection, db =>
+            {
+                //全局过滤
+                TableFilterItem(db);
+                db.Aop.OnLogExecuting = (sql, pars) =>
+                {
+                    //sql 执行前
+                };
+                db.Aop.OnLogExecuted = (sql, pars) =>
+                {
+                    Console.WriteLine($"当前SQL语句：【{sql}】，参数：【{string.Join(",", pars.Select(t => t.Value))}】");
+                    //sql 执行后
+                };
+                db.Aop.OnError = ex =>
+                {
+                    //sql 异常
+                };
+            });
+
+            return Db;
+        }
+
+        public static SqlSugarScope SqlSugarScopeLog(ConnectionConfig configConnection)
+        {
+            //全局过滤
+
+            DbLog = new SqlSugarScope(configConnection, db =>
             {
                 //全局过滤
                 TableFilterItem(db);

BPA.SAAS.Manage.Web.Core/Handlers/RequestAuditFiltercs.cs

@@ -69,18 +69,34 @@ namespace BPA.SAAS.Manage.Web.Core
             //    var vvvv = stingA;
             //}
 
+            var groupId = httpRequest.Headers["GroupId"];
+            if (!string.IsNullOrEmpty(groupId))
+            {
+                CurrentUser.GroupId = groupId;
+            }
+
             if (requestUrl.ToUpper().Contains("ExternalPlatform".ToUpper()))
             {
 
                 var key = httpRequest.Headers["key"];
                 var sign = httpRequest.Headers["sign"];
+               
                 List<PropertyInfo> proplist = new List<PropertyInfo>();
-                foreach (var parameter in parameters)
+                if (parameters.Count<=0)
                 {
-                    //var stingA = DtoValidator.GetSign(parameter.Value);
                     //var sign = DtoValidator.GetAttributePrice(parameter.Value, "sign");
                     await _checkServices.CheckSign(key, "", sign);
                 }
+                else
+                {
+                    foreach (var parameter in parameters)
+                    {
+                        var stingA = DtoValidator.GetSign(parameter.Value);
+                        //var sign = DtoValidator.GetAttributePrice(parameter.Value, "sign");
+                        await _checkServices.CheckSign(key, stingA, sign);
+                    }
+                }
+               
             }
 
             //============== 这里是执行方法之后获取数据 ====================
@@ -96,7 +112,7 @@ namespace BPA.SAAS.Manage.Web.Core
                 try
                 {
                     //记录日志
-                    await SqlSugarDb.Db.Insertable(new BPA_ThirdpartyRequestLog()
+                    await SqlSugarDb.DbLog.Insertable(new BPA_ThirdpartyRequestLog()
                     {
                         Id = CurrentUser.MessageId,
                         CreateBy = DateTime.Now.ToString(),

BPA.SAAS.Manage.Web.Entry/Properties/launchSettings.json

@@ -14,7 +14,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5001"
+      "applicationUrl": "http://192.168.1.16:5001"
     },
     "Docker": {
       "commandName": "Docker",

BPA.SAAS.Manage.Web.Entry/appsettings.json

@@ -14,6 +14,11 @@
       "ConnectionString": "server=10.2.1.21;Database=bpa_kitchen_groupmealbase;Uid=root;Pwd=cygadmin;Allow Zero Datetime=True;Convert Zero Datetime=True;",
       "DbType": "Mysql",
       "IsAutoCloseConnection": true
+    },
+    {
+      "ConnectionString": "server=10.2.1.21;Database=bpa_kitchen_groupmeallog;Uid=root;Pwd=cygadmin;Allow Zero Datetime=True;Convert Zero Datetime=True;",
+      "DbType": "Mysql",
+      "IsAutoCloseConnection": true
     }
   ],
   "cos_config": {