Merge pull request '目录迁移' (#16) from dev_chen into main

Reviewed-on: #16

WeiCloud.Fusion/ParkingLotService/ParkLotInfoService/ParkLotInfoService.csproj

@@ -13,9 +13,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\WeiCloud.Core\WeiCloud.Core.csproj" />
+    <ProjectReference Include="..\..\WeiCloud.Utils\WeiCloud.Utils.csproj" />
     <ProjectReference Include="..\ParkingLotEntity\ParkingLotEntity.csproj" />
-    <ProjectReference Include="..\WeiCloud.Core\WeiCloud.Core.csproj" />
-    <ProjectReference Include="..\WeiCloud.Utils\WeiCloud.Utils.csproj" />
   </ItemGroup>
 
 </Project>

WeiCloud.Fusion/ParkingLotService/ParkLotInfoService/ParkingLotDataService.cs

@@ -58,20 +58,20 @@ namespace ParkLotInfoService
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        public async Task<ApiResult<int>> PostParkingLots(ParkingAccessRecordDto dto)
+        public async Task<ApiResult<int>> PostParkingLots(ParkingAccessRecordDto model)
         {
             ApiResult<int> result = new ApiResult<int>() { Code = RequestBackStatuEnum.success.Value, Msg = "接口请求成功" };
             //ParkingAccessRecordDto dto=new ParkingAccessRecordDto();
             try
             {
 
-                //ParkingAccessRecord record = new ParkingAccessRecord() { Id=1,CarCode="001"};
-                //_context.ParkingAccessRecords.Add(record);
-                //var res = await _context.SaveChangesAsync();
-                var str = "8B2B9C1AA8B9E01713980D1275CA2DF7F3A7B1DA11145C2471B6CEBEF8A90A76F01B4C82FA3FBE291EC64650AB1206EBE6B32BD9F76DC5A231ED6C649058518B75F8D3D93C1D2864F4FA74051D3FCFBC038BDF8AE12D88E7CB1F972C194E7DD36FF179E42DD565DED895ECF58A3FB2EDA52E8188B835B405BF86BEC18500985D2D152CCFFEDD5F408F3C467352205780EBDDA6BA6247CA712A8496B82040181A9FD07D1BD7A7FFED450F68E9192A61067BA445C0C53309DFF4A040EF2FCB82CBA399AA351E276223F01130CC588295A6B46C831ECB182D77234FDCA2BF7E105D242BC2C372895CF776EE49469AAA3FBC2C37AA2B6FA37FFA2DEA3A1B7D0A04DE7624B116E4244083E0CC90C641223A08A2EBDAA29C22087BE037C3FB4231D0A0669BCEF0D31011E63F11188EB0918330";
+                ////ParkingAccessRecord record = new ParkingAccessRecord() { Id=1,CarCode="001"};
+                ////_context.ParkingAccessRecords.Add(record);
+                ////var res = await _context.SaveChangesAsync();
+                //var str = "8B2B9C1AA8B9E01713980D1275CA2DF7F3A7B1DA11145C2471B6CEBEF8A90A76F01B4C82FA3FBE291EC64650AB1206EBE6B32BD9F76DC5A231ED6C649058518B75F8D3D93C1D2864F4FA74051D3FCFBC038BDF8AE12D88E7CB1F972C194E7DD36FF179E42DD565DED895ECF58A3FB2EDA52E8188B835B405BF86BEC18500985D2D152CCFFEDD5F408F3C467352205780EBDDA6BA6247CA712A8496B82040181A9FD07D1BD7A7FFED450F68E9192A61067BA445C0C53309DFF4A040EF2FCB82CBA399AA351E276223F01130CC588295A6B46C831ECB182D77234FDCA2BF7E105D242BC2C372895CF776EE49469AAA3FBC2C37AA2B6FA37FFA2DEA3A1B7D0A04DE7624B116E4244083E0CC90C641223A08A2EBDAA29C22087BE037C3FB4231D0A0669BCEF0D31011E63F11188EB0918330";
 
-                var data = AESUtils.DecryptString(str, liFangkey);
-                var model = JsonConvert.DeserializeObject<ParkingAccessRecordDto>(data, settings);
+                //var data = AESUtils.DecryptString(str, liFangkey);
+                //var model = JsonConvert.DeserializeObject<ParkingAccessRecordDto>(data, settings);
                 if (model == null)
                 {
                     result.Msg = "上传数据为空";
@@ -80,7 +80,7 @@ namespace ParkLotInfoService
                 ParkingAccessRecord record = new ParkingAccessRecord() { Id = UidGenerator.Uid(), CarCode = model.CarCode, ChannelId = model.ChannelId, ChannelName = model.ChannelName, Guid = model.GUID, ImagePath = model.ImagePath, InOrOut = model.InOrOut, InTime = model.InTime, ParkId = model.ParkId, PassTime = model.PassTime, ProjectId = model.ProjectId, CreateTime = DateTime.Now };
                 _context.ParkingAccessRecords.Add(record);
                 var res = await _context.SaveChangesAsync();
-                _logger.LogInformation("Doing some work...");
+                _logger.LogInformation($"停车记录插入成功{record.Id}");
             }
             catch (Exception ex)
             {
@@ -97,7 +97,7 @@ namespace ParkLotInfoService
         public async Task<ApiResult<ParkingLotInfoDto>> GetParkingLotInfo(string parkId)
         {
             ApiResult<ParkingLotInfoDto> result = new ApiResult<ParkingLotInfoDto>() { Code = RequestBackStatuEnum.success.Value, Msg = "接口请求成功" };
-            var str = "A28ADF261302B0779371FDF714C286904F19848D4D44A63C5D6C247D98D45A5B23747C490FAD5FF6D8B0ECC046B01FFF431A292A058C82BB0ABFB0FA0A2FCB30DE227AC64EB691E4C10640D3264883986116758B5C984B77FED4F0E5066F2DA232741B99B327A147CA0E3B56821E6FDD4F8626A11855E0610B85D43CF216CDD5F4C0DFEEB508379FBBE9BAAC35559606C30BA045B3816AC7C43FBCF18DADB4ED876562EC3BA87D9ED03A0B0F56EAC6CCFB529724E7C2BF25DA6102A12ED962A4472EDE67D60B059372DB25BF9A377A5C6E7E26312E11D58B796260218F862F74FC276A5B82E259A08BC2B04EAB6345EAE346A73AB9CBFF32E81F2D600C691CA0D9695561AC1693C8F12B8FB10932896D5E1939E46EFBD8AD283DEA7C02C810F12683390F99952D5AD2A4729EFFECDF835C92848F79EAB106A3131A201E7FBF8DF6B4C872F366FBFFD5F9D00DCF9061D9A48A3B56B362ABCA9376A4B4F46353679E91CAFD58635BE966AFD23B985FB31AF01B0B51BFFA13E6113DB0A95931AF0FCC2256E6F5F660A248A74CAA0A7AD26FE0CF76F0FF5CFAA0A62B9FC2181A07202A149F87844A41CB32D28119580741FBAF981AE0B4658038512ACEA68B7ABA148606721AE6213F61D0187DD7AA5727B2D71D112DC91E74B2875E26BD6A90EFE4587B907EC95270867C31201AFDADE3CDEE9823277FCFFE65B51F18D839B9E62A8E5DE3C173A6AC19C710ED9043F19EE59EF0B45BAF21B9A92246082ACE5533A7604C6BAFEA57E89BE457B98FACD75012E400C18D8EC186025728FEE917E3AD7967E0AF361DBF3C36C3A1B852259BBD427AB317B7E4EC53B408D91523A35E2133DFB7A68141BA27A221BA2D4FC81D7629";
+            //var str = "A28ADF261302B0779371FDF714C286904F19848D4D44A63C5D6C247D98D45A5B23747C490FAD5FF6D8B0ECC046B01FFF431A292A058C82BB0ABFB0FA0A2FCB30DE227AC64EB691E4C10640D3264883986116758B5C984B77FED4F0E5066F2DA232741B99B327A147CA0E3B56821E6FDD4F8626A11855E0610B85D43CF216CDD5F4C0DFEEB508379FBBE9BAAC35559606C30BA045B3816AC7C43FBCF18DADB4ED876562EC3BA87D9ED03A0B0F56EAC6CCFB529724E7C2BF25DA6102A12ED962A4472EDE67D60B059372DB25BF9A377A5C6E7E26312E11D58B796260218F862F74FC276A5B82E259A08BC2B04EAB6345EAE346A73AB9CBFF32E81F2D600C691CA0D9695561AC1693C8F12B8FB10932896D5E1939E46EFBD8AD283DEA7C02C810F12683390F99952D5AD2A4729EFFECDF835C92848F79EAB106A3131A201E7FBF8DF6B4C872F366FBFFD5F9D00DCF9061D9A48A3B56B362ABCA9376A4B4F46353679E91CAFD58635BE966AFD23B985FB31AF01B0B51BFFA13E6113DB0A95931AF0FCC2256E6F5F660A248A74CAA0A7AD26FE0CF76F0FF5CFAA0A62B9FC2181A07202A149F87844A41CB32D28119580741FBAF981AE0B4658038512ACEA68B7ABA148606721AE6213F61D0187DD7AA5727B2D71D112DC91E74B2875E26BD6A90EFE4587B907EC95270867C31201AFDADE3CDEE9823277FCFFE65B51F18D839B9E62A8E5DE3C173A6AC19C710ED9043F19EE59EF0B45BAF21B9A92246082ACE5533A7604C6BAFEA57E89BE457B98FACD75012E400C18D8EC186025728FEE917E3AD7967E0AF361DBF3C36C3A1B852259BBD427AB317B7E4EC53B408D91523A35E2133DFB7A68141BA27A221BA2D4FC81D7629";
             try
             {
                 ////测试ip
@@ -111,7 +111,7 @@ namespace ParkLotInfoService
                     result.Msg = "没有查到停车场信息";
                     return result;
                 }
-                var data = AESUtils.DecryptString(str, liFangkey);
+                var data = AESUtils.DecryptString(restr, liFangkey);
                 var model = JsonConvert.DeserializeObject<ParkingLotInfoDto>(data, settings);
                 if (model == null || model.Code != 0)
                 {