From 2c3752fcd4570eb662b5423dd6b3bc9937b47d63 Mon Sep 17 00:00:00 2001 From: Hinse <756681202@qq.com> Date: Wed, 29 Sep 2021 08:53:06 +0800 Subject: [PATCH] 1 --- Waste.Application/ThirdApiInfo/OpenService.cs | 11 ++++++----- Waste.Application/Waste.Application.csproj | 2 +- Waste.Core/Waste.Core.csproj | 10 +++++----- Waste.Web.Entry/wwwroot/favicon.ico | Bin 5430 -> 9662 bytes 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Waste.Application/ThirdApiInfo/OpenService.cs b/Waste.Application/ThirdApiInfo/OpenService.cs index a6fd3e5..dcf621d 100644 --- a/Waste.Application/ThirdApiInfo/OpenService.cs +++ b/Waste.Application/ThirdApiInfo/OpenService.cs @@ -125,10 +125,11 @@ namespace Waste.Application.ThirdApiInfo { return new ResultInfo(ResultState.FAIL, "设备未找到"); } - var returndata = new GetDevInfoResponseDto { - ResultId= IDGen.NextID(), + var returndata = new GetDevInfoResponseDto + { + ResultId = IDGen.NextID(), UserId = UserId, - PostUrl= ApiUrl + PostUrl = ApiUrl }; //解析协议,IC卡数据@垃圾桶编号@厨余垃圾@7.91 // 00000000003031 40 0F00010009 40 C6E4CBFBC0ACBBF8 40 31352E39 @@ -156,7 +157,7 @@ namespace Waste.Application.ThirdApiInfo } //检查是否为15分钟内第一次上报 var time15 = DateTime.Now.AddMinutes(-15); - if(await dbClient.Queryable().AnyAsync(x=>x.DeviceId == device.Id && x.Registration == returndata.trash && x.CreateTime > time15)) + if (await dbClient.Queryable().AnyAsync(x => x.DeviceId == device.Id && x.Registration == returndata.trash && x.CreateTime > time15)) { _loggerService.AddLogger($"重复垃圾桶编号的数据:{returndata.ToJson()}", 1); return new ResultInfo(ResultState.FAIL, "15分钟内同一垃圾桶编号上报"); @@ -218,7 +219,7 @@ namespace Waste.Application.ThirdApiInfo returndata.ScanningTime = timestamp; string[] paramlist = new string[] { returndata.Weight.ToString(),returndata.trash,returndata.type.ToString(),returndata.ScanningTime.ToString(),returndata.status.ToString() - }; + }; returndata.sign = _suZhouService.GetUserApiSign(returndata.Secret, paramlist); _loggerService.AddLogger($"发送的数据:{returndata.ToJson()}", 1); return new ResultInfo(ResultState.SUCCESS, "success", returndata); diff --git a/Waste.Application/Waste.Application.csproj b/Waste.Application/Waste.Application.csproj index 639af29..269313c 100644 --- a/Waste.Application/Waste.Application.csproj +++ b/Waste.Application/Waste.Application.csproj @@ -15,7 +15,7 @@ - + diff --git a/Waste.Core/Waste.Core.csproj b/Waste.Core/Waste.Core.csproj index 836b069..2da47b9 100644 --- a/Waste.Core/Waste.Core.csproj +++ b/Waste.Core/Waste.Core.csproj @@ -15,11 +15,11 @@ - - - - - + + + + + diff --git a/Waste.Web.Entry/wwwroot/favicon.ico b/Waste.Web.Entry/wwwroot/favicon.ico index 63e859b476eff5055e0e557aaa151ca8223fbeef..c252a00b3c3bcc2b564cc60cfa7f77fdc2ef122e 100644 GIT binary patch literal 9662 zcmc(laY$EJ6vwX`PDCsuBqCZw8xau^ArVm$BSIoZjA#+zB$`A-Ytr^dIAc^q4C#*% z5h1_d7)@fth!G<~LrNlIL~IffCJ|vG72zz(+~<4WyU+W3zxVt7G)sTuc+NfN+;hJ7 z-23jk_cddR_;2}g!`}tww@-|zHpVQ5P?>s2diz@xu*v@IPnqKWw5fp~ev&qqkbB|7 z@KNz6Dcin;+zfpVZN=6K-GDl1ABV4p&zLNhiS#F58JPFN@4`pNON^%n+C#r``qaU% zsxP`n$j$Is6TvZ2Uve4pY@ud-aMk#oh&a8((0my9W~eueHHfV76;BjfA%9|45c^l< zflr!3yeW7&RLPjmxwy2iKywOV8n2ysolCsGHP`Q(hG!9b&#B<#`vWQtb6<2h(P?buag6!ejNhNf54Lu|mJyr0`-BVqY~;tD z{Zu}@zKuQ$={v-;rM-Dd$>vQ5FIsSXVetq1#t61rA7?I^KEJ!Un+{I?c3}grp?)0> z1M+Qj#kp`xPv4bx%&~c$V%-S&?7jo$)v?^$^WkT#=e1_MG3Q-B@{@m@Cfz@6&V}{V z9CStT)6401FE@om1WTG3VwbT>FI8@!FaRmiWg_tVxr zN0{8YtVeG2+D`BDI*X5YlJ7^XrVRXP^CPXx)!dv)4ik=xfINg90qjNP$B#gPWoPReUa}t>~?%Iba z?y9P*^twA~Oq+?b6urHV!F68IwOe)WLjDZ<3i_Uvj`l9d&!M@}ocX#8nK(DqS3lzX z;`zS77X8paB39OW$kUz0r_8p~W`5LBaf7?K@@|wKE=-!IP53W^>#jQk>WkuGr>(nJ zb)-wm&ppQF!uLev8`RXEw`C_seBa1e=k#rZX5lBC^IS}EVs=1RRS(&aAIgum&R@b; zioDV4qz`c3wtdwnWuNVge4g)fmy1}@{mjPjaA5QIg^W4Grr4*zP%RnKbE$KZXbJjW z>~=qZpNDj>eF3f=E;qW2y^Hntqo>IvB&}mGqkX>ii&iYatTO)J;c?P)pl47GDh%lzjk(iI&D`Y3m zJ>n$IpViS%cT!}7qvt<5Lm+oxkLFjhBh4A|9(?qCCeM?1R#86u+9CVyvwiq>6zVU~ZVcs%syl7% zAD=3pa)tS9er%WJs~_^E2ow8dpbh?FJMC;a_y+XKlZ-!QUQsK1Rv}g~7_nmHN&pB+wO-jDR`c}_2mt*Ytx zE8xN1191{|R#XVdRXnd%XT? zvu8DUeO%uuC(JJQ3F-C2M|Qiu0?pW8>6wGBXalDRo^KV%+QH)R}y3sMnq00%NJeSL4*V zG1vFFE!gy~_+Xg5*g6}y^Paxh>ieP1i~gXiFY->P7HR|kR(KP1z}e%R82&jW+8^li zUS;y^Q*JOVCiZ}fk6!hSe#p8L>3gF7O2C5t=76{( zLY|{O?2E{CP{DhwwM>ui!7?%R|2E2VfLsX+dA&I5)z>Ee)k5@RH8|u9qAWufARcH#=)W{@u}_{q@nJ zZt1&AEwAlq4fwyU)?T~y#$omAJou&0TWVL7DQ*iU<+0r5hj*fP_=NWX?aGjAJa&8` upYv@n{#AoPJ-*>fo9ff|I;dCIi=ck3YIibx@n@9hG5ihX8-d%OG5-U~B{iD> literal 5430 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