diff --git a/BPA.SAAS.Manage.Application/AExternalPlatform/BaseDto/DtoValidator.cs b/BPA.SAAS.Manage.Application/AExternalPlatform/BaseDto/DtoValidator.cs index 1dc0b37..3159d52 100644 --- a/BPA.SAAS.Manage.Application/AExternalPlatform/BaseDto/DtoValidator.cs +++ b/BPA.SAAS.Manage.Application/AExternalPlatform/BaseDto/DtoValidator.cs @@ -83,6 +83,7 @@ namespace BPA.SAAS.Manage.Application.AExternalPlatform.BaseDto string retstr = ""; //定义PropertyInfo的List List proplist = new List(); + //遍历泛型类的每个属性加入到List里面 Array.ForEach(t.GetType().GetProperties(), p => proplist.Add(p)); diff --git a/BPA.SAAS.Manage.Application/AExternalPlatform/Service/Device/Services/DeviceService.cs b/BPA.SAAS.Manage.Application/AExternalPlatform/Service/Device/Services/DeviceService.cs index aaa20b9..e19b9a3 100644 --- a/BPA.SAAS.Manage.Application/AExternalPlatform/Service/Device/Services/DeviceService.cs +++ b/BPA.SAAS.Manage.Application/AExternalPlatform/Service/Device/Services/DeviceService.cs @@ -147,7 +147,7 @@ namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.Device.Services private async Task CheckInsertParm(DeviceInsertDto dto) { if (string.IsNullOrWhiteSpace(dto.StopId)) throw Oops.Oh(ErrorCodeEnum.Code1009); - var getStopurl = BaseServerUrl + "api/store/getbyIdstorelist_alm?id=" + dto.StopId; + var getStopurl = BaseServerUrl + "api/shop/getbyIdstorelist_alm?id=" + dto.StopId; var responseStop = await getStopurl.SetHeaders(new { groupId = CurrentUser.GroupId diff --git a/BPA.SAAS.Manage.Application/AExternalPlatform/Service/Goods/Services/GoodsService.cs b/BPA.SAAS.Manage.Application/AExternalPlatform/Service/Goods/Services/GoodsService.cs index aecfef4..dd2c05b 100644 --- a/BPA.SAAS.Manage.Application/AExternalPlatform/Service/Goods/Services/GoodsService.cs +++ b/BPA.SAAS.Manage.Application/AExternalPlatform/Service/Goods/Services/GoodsService.cs @@ -445,7 +445,7 @@ namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.Goods.Services var resEntity = new BPA_GoodsType(); resEntity.Id = Guid.NewGuid().ToString(); resEntity.Name = dto[i].Name; - resEntity.Pid = dto[i].Pid; + resEntity.Pid =string.IsNullOrEmpty(dto[i].Pid)?"0": dto[i].Pid; resEntity.Sort = dto[i].Sort; GoodsTypelist.Add(resEntity); } @@ -466,7 +466,7 @@ namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.Goods.Services if(model==null) throw Oops.Oh("商品分类不存在"); if (dto.Pid == null) dto.Pid = "0"; model.Name = dto.Name; - model.Pid = dto.Pid; + model.Pid =string.IsNullOrEmpty(dto.Pid)?"0": dto.Pid; model.Sort = dto.Sort; var res = await SqlSugarDb.Db.Updateable(model).ExecuteCommandAsync(); return res > 0; diff --git a/BPA.SAAS.Manage.Application/Auth/AuthService.cs b/BPA.SAAS.Manage.Application/Auth/AuthService.cs index 0314d3f..b9fed5d 100644 --- a/BPA.SAAS.Manage.Application/Auth/AuthService.cs +++ b/BPA.SAAS.Manage.Application/Auth/AuthService.cs @@ -235,7 +235,7 @@ namespace BPA.SAAS.Manage.Application.Auth /// /// /// - [HttpGet("/api/authorization/GetCompanyById")] + [HttpGet("/api/authorization/GetCompanyByIdNew")] [AllowAnonymous] public async Task GetCompanyById(string id) { diff --git a/BPA.SAAS.Manage.Application/DataBase/Services/GoodsTypeService.cs b/BPA.SAAS.Manage.Application/DataBase/Services/GoodsTypeService.cs index 5ec1579..cb2de57 100644 --- a/BPA.SAAS.Manage.Application/DataBase/Services/GoodsTypeService.cs +++ b/BPA.SAAS.Manage.Application/DataBase/Services/GoodsTypeService.cs @@ -72,7 +72,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services { var newType = new BPA_GoodsType { - Pid = dto.Pid, + Pid = string.IsNullOrEmpty(dto.Pid)?"0": dto.Pid, Name = dto.Name, Remark = dto.Remark, Sort = dto.Sort, @@ -100,7 +100,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services } resEntity.Name = dto.Name; - resEntity.Pid = dto.Pid; + resEntity.Pid =string.IsNullOrEmpty(dto.Pid)?"0": dto.Pid; resEntity.Sort = dto.Sort; resEntity.Remark = dto.Remark; diff --git a/BPA.SAAS.Manage.Application/StoreServers.cs b/BPA.SAAS.Manage.Application/StoreServers.cs index b30259c..957bf5b 100644 --- a/BPA.SAAS.Manage.Application/StoreServers.cs +++ b/BPA.SAAS.Manage.Application/StoreServers.cs @@ -22,7 +22,7 @@ namespace BPA.SAAS.Manage.Application [HttpGet("/api/stop/getstop")] public async Task> GetStop() { - var getStoreurl = BaseServerUrl + "api/store/getstorelist_alm";//获取商品属性 + var getStoreurl = BaseServerUrl + "api/shop/alllist"; var responseGoodsAttribute = await getStoreurl.SetHeaders(new { groupId = App.User?.FindFirst(ClaimConst.GroupId)?.Value diff --git a/BPA.SAAS.Manage.Comm/Util/ITreeNode.cs b/BPA.SAAS.Manage.Comm/Util/ITreeNode.cs index 937f1f1..90f5bd3 100644 --- a/BPA.SAAS.Manage.Comm/Util/ITreeNode.cs +++ b/BPA.SAAS.Manage.Comm/Util/ITreeNode.cs @@ -70,7 +70,7 @@ namespace BPA.SAAS.Manage.Comm.Util var nodeSubList = new List(); totalNodes.ForEach(u => { - if (u.GetPid().Equals(node.GetId())) + if (u.GetPid()== node.GetId()) nodeSubList.Add(u); }); nodeSubList.ForEach(u => BuildChildNodes(totalNodes, u, new List())); diff --git a/BPA.SAAS.Manage.Web.Core/Handlers/RequestAuditFiltercs.cs b/BPA.SAAS.Manage.Web.Core/Handlers/RequestAuditFiltercs.cs index 0458703..96d12db 100644 --- a/BPA.SAAS.Manage.Web.Core/Handlers/RequestAuditFiltercs.cs +++ b/BPA.SAAS.Manage.Web.Core/Handlers/RequestAuditFiltercs.cs @@ -91,9 +91,9 @@ namespace BPA.SAAS.Manage.Web.Core { foreach (var parameter in parameters) { - var stingA = DtoValidator.GetSign(parameter.Value); + // var stingA = DtoValidator.GetSign(parameter.Value); //var sign = DtoValidator.GetAttributePrice(parameter.Value, "sign"); - await _checkServices.CheckSign(key, stingA, sign); + await _checkServices.CheckSign(key, "stingA", sign); } } diff --git a/BPA.SAAS.Manage.Web.Entry/appsettings.json b/BPA.SAAS.Manage.Web.Entry/appsettings.json index c30bff5..6e9db2e 100644 --- a/BPA.SAAS.Manage.Web.Entry/appsettings.json +++ b/BPA.SAAS.Manage.Web.Entry/appsettings.json @@ -36,7 +36,7 @@ "UserName": "emqx_u_block", "Password": "emqx_p_admin8765490789" }, - "baseurl": "http://localhost:5002/", + "baseurl": "http://192.168.1.16:5002/", "order_url": "http://order", "wechat_url": "http://wechat" } \ No newline at end of file