From b67760b6a71492551571812cb29af9b97c614563 Mon Sep 17 00:00:00 2001
From: Hinse <756681202@qq.com>
Date: Fri, 7 Jan 2022 16:23:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=8E=AF=E5=A2=83=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Waste.Web.Entry/appsettings.Development.json  |  11 ++++-------
 Waste.Web.Entry/appsettings.json              |   9 ++++-----
 WasteConsoleTest/WasteConsoleTest/Program.cs  |   4 ++--
 .../WasteConsoleTest/WSocketClientHelp.cs     |   6 +++---
 ...asteHexTest.csproj.AssemblyReference.cache | Bin 90939 -> 181872 bytes
 .../obj/WasteHexTest.csproj.nuget.dgspec.json |   2 +-
 .../obj/WasteHexTest.csproj.nuget.g.props     |   2 +-
 WasteHexTest/obj/project.assets.json          |   2 +-
 WasteHexTest/obj/project.nuget.cache          |   2 +-
 9 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/Waste.Web.Entry/appsettings.Development.json b/Waste.Web.Entry/appsettings.Development.json
index 5173757..6dee831 100644
--- a/Waste.Web.Entry/appsettings.Development.json
+++ b/Waste.Web.Entry/appsettings.Development.json
@@ -1,10 +1,7 @@
 {
-  "DetailedErrors": true,
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
+  "logfile": "e:/errlog/waste.ybhdmob.com", //日志文件路径
+  "NirvanaConnection": "Server=123.60.2.99,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;",
+  "RabbitmqSetting": { //rabbitmq配置
+    "DBConnection": "Server=123.60.2.99,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;" //数据保存库
   }
 }
diff --git a/Waste.Web.Entry/appsettings.json b/Waste.Web.Entry/appsettings.json
index 94a0620..7410ca0 100644
--- a/Waste.Web.Entry/appsettings.json
+++ b/Waste.Web.Entry/appsettings.json
@@ -34,8 +34,8 @@
     "ClockSkew": 5, // 杩囨湡鏃堕棿瀹归敊鍊硷紝long 绫诲瀷锛屽崟浣嶇锛岄粯璁� 5绉�
     "Algorithm": "HS256" // 鍔犲瘑绠楁硶锛宻tring 绫诲瀷锛岄粯璁� SecurityAlgorithms.HmacSha256
   },
-  "logfile": "e:/errlog/waste.ybhdmob.com", //鏃ュ織鏂囦欢璺緞
-  "NirvanaConnection": "Server=123.60.2.99,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;",
+  "logfile": "d:/errlog/waste.ybhdmob.com", //鏃ュ織鏂囦欢璺緞
+  "NirvanaConnection": "Server=localhost,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;",
   "SZTestDevPlatSetting": { //鑻忓窞璁惧鎺ュ叆骞冲彴璁剧疆,娴嬭瘯鐜
     "ApiUrl": "https://bright.ljflytjl.cn:9101",
     "UserId": "18e76eb9-9154-4b43-bcfe-f80671ab8e79",
@@ -55,7 +55,7 @@
     "Port": 5672,
     "UserName": "liuzl",
     "Password": "liuzl",
-    "DBConnection": "Server=123.60.2.99,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;" //鏁版嵁淇濆瓨搴�
+    "DBConnection": "Server=localhost,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;" //鏁版嵁淇濆瓨搴�
   },
   "IsTask": "false", //瀹氭椂浠诲姟鏄惁寮�鍚�
   "SoftName": "宸ㄩ紟鐗╄仈缃戞暟瀛楀钩鍙�", //杞欢鍚嶇О
@@ -64,6 +64,5 @@
   "Version": "1.0", //杞欢鐗堟湰
   "copyright": "宸ㄩ紟鐗╄仈缃戞暟瀛楀钩鍙�", //鐗堟潈鎵�鏈�
   "LoginProvider": "CookieAndSession", //鐧诲綍淇℃伅淇濆瓨浣嶇疆
-  "LoginProviderKey": "waste_loginuserkey", //鐧诲綍瀵嗛挜
-  "APIURL": "http://waste.jt-sky.com" //鎺ュ彛璇锋眰鍩熷悕
+  "LoginProviderKey": "waste_loginuserkey" //鐧诲綍瀵嗛挜
 }
\ No newline at end of file
diff --git a/WasteConsoleTest/WasteConsoleTest/Program.cs b/WasteConsoleTest/WasteConsoleTest/Program.cs
index 2ab17e6..6d02f57 100644
--- a/WasteConsoleTest/WasteConsoleTest/Program.cs
+++ b/WasteConsoleTest/WasteConsoleTest/Program.cs
@@ -17,8 +17,8 @@ namespace WasteConsoleTest
     class Program
     {
         private static WSocketClientHelp wSocketClient = null;
-        public static string Secret = "0eMqhAjefL0loGhH";
-        public static string SecretHash = "d28a95b3d5d85ef0";
+        public static string Secret = "MbMH8rycrclA18ZH";
+        public static string SecretHash = "ke3/kUj8Om9rXYYh2cnQ7QlA0f3bZyHkgDFmtMnA1N4==";
         public static string SocketURL = "wss://api.device.suzhou.ljflytjl.cn/device_rpc";
         static async Task Main(string[] args)
         {
diff --git a/WasteConsoleTest/WasteConsoleTest/WSocketClientHelp.cs b/WasteConsoleTest/WasteConsoleTest/WSocketClientHelp.cs
index 329836e..c91e622 100644
--- a/WasteConsoleTest/WasteConsoleTest/WSocketClientHelp.cs
+++ b/WasteConsoleTest/WasteConsoleTest/WSocketClientHelp.cs
@@ -13,9 +13,9 @@ namespace WasteConsoleTest
         ClientWebSocket ws = null;
         Uri uri = null;
         bool isUserClose = false;//鏄惁鏈�鍚庣敱鐢ㄦ埛鎵嬪姩鍏抽棴
-        public static string Secret = "3R3KMr113DLvK8rE";
-        public static string SecretHash = "svfw5C77P+XqyEgZHrLzs45gs9RgdeXXzf6XAqA3p94=";
-        public static string deviceid = "08d961ee-22ae-40a6-8c14-a6b414f614a3";
+        public static string Secret = "MbMH8rycrclA18ZH";
+        public static string SecretHash = "ke3/kUj8Om9rXYYh2cnQ7QlA0f3bZyHkgDFmtMnA1N4=";
+        public static string deviceid = "08d96e7b-a488-468d-8f54-8bf45dccb9b9";
 
         // <summary>
         /// WebSocket鐘舵��
diff --git a/WasteHexTest/obj/Debug/net6.0/WasteHexTest.csproj.AssemblyReference.cache b/WasteHexTest/obj/Debug/net6.0/WasteHexTest.csproj.AssemblyReference.cache
index deda557c4a43a495a35ef8f8cac0097f29c0761b..b3002cddd8852cd5f6c67fc3c52cef2232e244ab 100644
GIT binary patch
delta 7031
zcmZ8md3;pWz4u6NGBY=snaq;RBs19rVr0ueSPV-@QA9(4q>5}=6#)Yz(y&;T5TKML
z0g~T?gMvUn<*77*9Gam-8>B)(Af!|(C`*)DS_D#RRpjZTXS;JR{RcjCe&64|oZq==
zJ+Az-Mm2?_5$K_ZPyytrPgm#tHV@q>#h)e9!$94WJ(a~h`>$xMt5|^o(6?Jm-BcBN
zI-B7*dW#;+emD@u$k6a`4GNIH-D(j%eLt+1(nD#gZiJg*zvgTyWQ$V5NO!~2mH&Ny
z0OjZtK{=R2(h;#hkbJPoY=SbgMddm#nh-)Bh_-lOt9iBnLq|k7Ly<Jgi;U?`zzGei
zJM7zZD)O+pk{$(;og^=EhDJRd6|G!r8cNAuMlF}*1y*hhV}8RG32k<pg$CfEhsJR+
zcKb$-bA#1sA#L_wXrdVQrqc{l9Tt^CxrIKcj&}0%8V9p7knAQ_=VF~HSy*Scd*O4}
z0$nuyWg&~*vvg!6w8z?wrX<8}(($A{cD?~?eR1||#Lec>f>*q&3|MzufrcH|!v-V#
zD(s3^MY5XWfg@AcF{$v)F(B&`yh`pH?JFB0Apr|ieS(YJOrW|%xS6>06dSBdvM3K9
z9!LY5kl^DdA0<)$Ng#Q*5xTv*rT!5$jOX0;NWE0dPZiiTt9f%VGC^(k--M+1RC$5$
z*ggWCDKSvcBMNr+5V1|6zZ|>*zwLP_#AAbwRI{j5xRT0hE|8o;&%#K}qti5NeoTv1
z@(1mwW$AfrHHWy#!N<xp@_^paQo_@{MWMLK)!s#t>>O1-Z+hQQ$VGWi@4HmUfxCTA
za$`JDldg&kiZbu&$Fg!D(?!;#&lIu-DCgH?(6FWTXLUwNaHjul!L8?1K)xKn6fj6-
z#>X7uf~BKW*f`Ma){W8Q<%8%!KG-^t#p*z2BEykBgQQ-;`rE-aLx4SyOod+?T)`QV
zNac_Rz#W-x;f&~@_{_~T!3Q#T2uFm#@?mjd+@IQE|0C6w4|DMp)lN5oZA6p7@LgGv
zc3!jGKc3?_YO@n|WkrB1i`7qcR*g}7QMLu{XDfn>*Bj^ZbFQLn)=$h+3M2QkWiK(q
zdMo|D9z>(uIBL6ujD0c|c8*fW>L*^&6-0t(v@ML6aj((q1d^N|Z4eX*MPpnl7sfRw
zKwz|so>^e~7%k3)W9($e)6<P&m*=SeZF3ywT%HpS-#jBZNmY*QJ{O?ec-c_Nx$C(l
zF7jb6pN)3{E*LxBE~jeAcvhdRroJ0rtm!Pv^GJ`^<gKA$jLu&rNKSa?=P@czAh+KM
z$<I0A^3RzCY*rRL8)|_aQ>@^hXe_O@xsR`C6mHi~c2nYf%9TAenZd{h6JOR;FwUiu
zERZ-^fyDlbI?Xpk@+H<!PJ|n6sn9s-Ny$rrByqAqYpk^V@D$pYBzx*|CicLh7}!}D
z3AYQvVSj-FUDJ$WeNa;BhFb*@5MLlYfo%o1LVQUoZ*^{Z62~4XQsG9Sj<rE&p#@eJ
zT?+9;!p4#aLtp7R_j3swN=(pNtVtMJ(q-VxEj24VSTMCz%pWJU#|Fv^9TMd)Q=#vR
zQ82AiwS=OR0(mdF>G7)+M3VuXWmXRIeHVn<=|KZ)`V6aRMWJQcOX6nWEF^sfzob~m
zn3`iVT?)?tT$x#CkbG>WjqIBBk``TmnNQk0qHKeJk<PNEI$4FPIhtFwbHvOP3J1>R
zgOMp5_KFP-ms?c5RJ_no?uEaXYZW%LVxcDU@Vpq&6*@W|_Roul!Sgh9a2~%qndrrp
zP8u$YG_tHx+{;d4onNI1d~<<4j71X;EvS~BTIZX|#D!A?VxZEpER&MIUL*rSHodx1
zGV9Y;#B|8w#WD(iT>L!4umz$2(m1(4<SkuG&+=AyVDM5qc;lL(_)jMIVA-1z`Tg=J
zn?96<+PW$hHOfQMm&?iOgniW>Y1PSUS}P=P#R^T^^_5mhy0?;ze#W_J)kKYa?^kw7
zwymzBWY)jCS8I0^BtaNVSVynbwP6NJ#Ow~NVU{E}#FDdXLMw-0u*v|xu&!D_;OrU&
zQk*RixyS@<>)8Nhp%CaWSXkqbA=yyFLc)aht1Z`zWU!VERtY(|K?)_M8x4jkP*xvh
z=rtZL-mP9Js`rAsj@1K|3@_JP$=*6STbU6_st)$U7vKlqrBv9I&BhBe<tBudFJ?;B
zW-X-kn>AB<Z84Y<2B)zF_F;>(xD~SoW~$lwwpl@_`l|^}U@QD^?0IP2Hk?wma9n=P
zVX(#tdE1;2^}1&Iv~4Ex+UpOfvTt`N_AiFficH=9E3U>vj&0{HsmUC*BStxQdJKgW
z?hxViH1C{ijP8(zNHGh9r0u)tjzN+emKZT*d*r+jg?MJSmj1Fm52XL*n|@hR*0<P5
zVSe9y(?i<dGK4$~a`rkTtaPuiJC@wv8``p2pqIT9FCjbLVdI2Js@<oO@$Wuh{IYjc
z=zPyCgMIrw8EjI!FLWa?Y4%35QZ?fM-PRHsmk4PXCZHBv@f2McE1KAH$|6?SY=+ML
zk&wP$ks>qqi>SHCh5hrikQ6pMq`3Lbq6%D~l5<kX9paYE>OrwZJIS7dJWh3O2~gBx
z>}=6bPqpxY((Z<~qh^L6VL|RdT^rrI4rxQ9@eo~^ARu8CA1H9@P$cX;q>x3w<F_Y+
zH@<H(^s7i}QY+i0jEuuuRdTJB$C5I6=FF<pr;UES$H0fJ^y2)0kJFG^GsY88Gu-;j
z47Y#3n+mRL>n}Z?`;iAa+xWXg!aLh6r0NJCSIqkpN25fwiK6r$tr3QiwxfKmGfdYp
z3lx21k##%wBYvGoae~H|eYkY&09T#>`;L3m`#(J`w}d1Zc_InAjvKAscif57eMr0z
zo;tx^2vn6mv_&40Px42f)K&Sr7I^jJw>i`eSI?SY_$j+|H2)N<i$HrKWSuhOx5uKx
z@cYwjc-OTF=<+jO>A;RN^r1om?OR#-2(m}v*20fxg%m&8(;*AQ1-m}+z~kpMMdQwG
z<%(Qzq$>hC{~QZh=M<9gXTIsxwJ~^_RMd3cO##vH?@xa5082C+`XrL<Ixn-$SR$bH
zf(7FGTh!kDa%9-Nu<wGGZ&$VoHvR(bLMKJyUOp6r!g>>s3nCsu$gYbKu;ijedb9o_
z-4#P@ltu=9Rw|qp@Zu|W*m2omnACdG==F3Zkx}UYo?{RrdB`6x@m)fA90A2wyi)73
zD|~s8#ui_3kr7w<w9%jwzO)!L>c#Da>@U6WeWxfB;VZ?GwO>5IzVWZ&V85pMn0SpZ
zWKx@;DdfyG{xH-ucKpo*xnF54)4mc(78)pxnE&>|17W#ig)P@z(x0a5uZ7%q({meq
zn%j)qBj}(S`j3N@q-iOpY~CAInf%^2_&b~%<|hBR!Jj2YXz?u@9vO}lg=ZX^u0H}t
zZi-H2mbppstp_7a#Yc2SseFRS)i>{sABJ_63;W2CF8(UemBcFhwl>otyX1~&SuPj<
zeH`iuQ~o7-)dfl4*rlffzu`|~8Ox0P7WnnQ_n-i->xO(_`_3VjJ3V23xc{vmHdL~N
zHQe(N+js0e!{B}>xN8w}MR*tdo|R(5JwGY9%kC8hN`u=!xD5543V-?`6*BHoairni
z+aXlePbQ&RZ;hnQB`5**{y3KlO(R)9u?0m4z3~502B8d@1or#F#x(Nw{SXpoA>=SX
zdr<v;c4(qcxKyY}U`^L>FO3~V!Bamq<G(zN4huDz%Idn@6^*!~8`>gJ!A)U^O-ybC
zj*37cyXxfPv9h0;e||hC9I+%*xj_nI85SIGn2}q!sdMz<9F$_m;bz3Tkg?I<YbBcx
zXW5V$k5#E7I$JXCXG30gYQpPOB-6v8L0=?d-<g<B!E9(n?vhy3goLl69%No<MXVJC
zbDJGS|93_BaFd<N9c0(|f)rI5VwvDTX652ZQr(CP9jKc7<HPhcti_2YN|+lr#UKUu
zaU(0Pa?$?aU##$27xkJ2z#V+ljaWA^GdMU#%KSJ6v0*?V_+ku-guPjOyThNxP*Ed2
zh~2q#tHAI2>F*<6BzGuY(Aerl^3jEh6Oc7X>DsqJ!SGx>aw$B>cy2tB4-SsSlw=Fi
z+f3W^7(=Y8htq|>@E{lN^z*RLy*@})XdmVnI0{!KBgK#ky~(_Sm(g)@k|u!Z6-+^r
z#FN53>z#s}Vgtobq#*WHmnvgeC3rOj$<GN+yt+Gz#V>b97U|Ec-HpC0czt)|2xjy^
z+7|#kp%=2?+((hgV4^;Uym;87$P1;PvPxqL?U@oDT$QRD$A#>83|S28km#bMG*oM3
zWuV~sG^A~yOn-`)lXzjTQ0%E16>sc?qJkN{k+xqltR2tpM=dzhhkD4(#FzRY@mZ7`
z$GH>^3ck@-&je@fn~og1E<dKfP59;XP~<hO3Zq29@a4@=^h*<7#nf`_#XzXim_U7}
z;qwdc?2q`hEaD_g3FZty+E;6QBm>3C@p3hT7rl(Bice)ww^B<{cd#GWf^!BT`8;Jj
zcISlh^4a><C`y%vHWm*b%x6wWjCC+A@Xo=AF9WP2sGTZ~&qQW1v&qqMbhc4LJ-Fs^
zR3TCmq>jsPYn;J?cMhfPEHe0;p`mJH$q(iZLsMys@}hiyIPxjO9V4j7%fk`-_(cr~
zE*ZhcrG|*o!xa912kC%F8Hw0agxO4?QTW72)Gh_Sn@u}WbnPFqk^HkjaLUhky<jw&
zdVFydavN^S7~DPz#bDbLS{8#FpAa*IqLbwK=s6m(w+J(?Wi*=1CJd#zaQ89DE+LPP
zLGsTG!82p@jQ#8xS~9}y$<MI4hU=zMBmVUaIx9^+pM&C59#%eIV{v;9ilyJZQ(<HW
zy=DadVh)N9($%$4i=1a1idP5pZmAYu={z`k9Q~Wgjyv>n8Xe;DjYAH6b6iN(+3_e=
z5gGh?JfaUnA^gYj^rHAYpRSEv%T4(1cpB2eyilQ1CIz3#M@})(bxY&$hxsTDkI83|
z<C21>^Z6CRGspR+Jd3PS<D6$%9SB^+b9#h0Zr?;&z3b^evS?nP$T~ro_ufRL2A_Oh
zFG<dEWD<&zl0Tn>=oefedFkX(B|0X}G1R;$M%Pr9NCv$m!mrmB|1ym?PD6`Crg3}$
z`jBET7ocP%Y4(|wjksGOy_EyO>O#c!bNtUDl%ViG2w`V2`XxQtP>e3n|7Mg>7XFCE
MwI!TIEk)_*KgcDYRsaA1

delta 36
scmey+!@c_$D+e3nd<F&v#@NY$+@90drZRF(pODNb(3rh7oAE*t0M#A~-~a#s

diff --git a/WasteHexTest/obj/WasteHexTest.csproj.nuget.dgspec.json b/WasteHexTest/obj/WasteHexTest.csproj.nuget.dgspec.json
index a9aeee9..21d47c3 100644
--- a/WasteHexTest/obj/WasteHexTest.csproj.nuget.dgspec.json
+++ b/WasteHexTest/obj/WasteHexTest.csproj.nuget.dgspec.json
@@ -54,7 +54,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.100\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.101\\RuntimeIdentifierGraph.json"
         }
       }
     }
diff --git a/WasteHexTest/obj/WasteHexTest.csproj.nuget.g.props b/WasteHexTest/obj/WasteHexTest.csproj.nuget.g.props
index 2f02482..a54f2f9 100644
--- a/WasteHexTest/obj/WasteHexTest.csproj.nuget.g.props
+++ b/WasteHexTest/obj/WasteHexTest.csproj.nuget.g.props
@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.0.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.0.1</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
diff --git a/WasteHexTest/obj/project.assets.json b/WasteHexTest/obj/project.assets.json
index f7ee4e0..ac3eab8 100644
--- a/WasteHexTest/obj/project.assets.json
+++ b/WasteHexTest/obj/project.assets.json
@@ -60,7 +60,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.100\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.101\\RuntimeIdentifierGraph.json"
       }
     }
   }
diff --git a/WasteHexTest/obj/project.nuget.cache b/WasteHexTest/obj/project.nuget.cache
index 0a3bf81..ca7338e 100644
--- a/WasteHexTest/obj/project.nuget.cache
+++ b/WasteHexTest/obj/project.nuget.cache
@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "KxR30MsrEe0B4uPY50ypQkAB7WkjYAQ2+TX/wblVFIFxljAgEcN32jo0JP5Vbzn2h3uchKlvOfnJxewST6yekQ==",
+  "dgSpecHash": "/i1boeyhGlP73OaHsTLDU+EcpQMD5lkJaOoK1RWxq6AelMtgIgMnUAk5xh9sroJ0UEXu+aKTxIfYSAsgYCC1AA==",
   "success": true,
   "projectFilePath": "H:\\liuzl_ybhdmob\\Waste\\WasteHexTest\\WasteHexTest.csproj",
   "expectedPackageFiles": [],