A>nrkKO+1d;co`-r@MvutT3a(JRr=2!W;xsPKVXq
zi1S_XpA`QY@m~=CCGlSu{|)gq59HVwFQ9SQ4w`_yh<***O@D;FO86*j2kxEU1Vs^Sr$mkl6BQ;(8G1ex
z6P`1wL#C|XEw#H*TR3x%@S|e);V7FsbD#M4iX9hwNU}XF{siqLPtgQo+=TDS98*!)
zdKBK*WBB{1Wu_*6SlLOdi^7=Wo2Xu?rg*4P_%^W}vR8-jox=1&|B0er(MP2=Dz!1G
z9TB@*_}#+q5oRy;dZK8r>@^BL8`>wDeWJNnG~;3q34ciV!@^8p->Sfb?0Zydk4o(e
zQmd%aJ5_q8a{ihyVRa`(17VCP`Xx+*Xc|P*C`_B!4&gh5?@)PUI)(2=ga-n>5+N#@
zsAytRJ0f71%5KQDOE;?Y-iUi#;UFVeu!RUt2sO`lG_XAiUy{9(g#j
zCVtqnlRjM>#u`OmglUl4M)BLkb_mlcelPSd6!(fgDtt`%5wW|4*(3g5DCd;y73HWf
z`=s_>@yEp;66Ub@6VRtiCPaT!_!op%@B|Llm{)QZKkVH}50-?zlCziRr9o;NrM69M
zhcKPu_d@?)CB34L3Lg_b2Yz`lC;W&oyQOxI_@iR?33IRbW6<9m925PxFo&e}u=q#C
ze?ff0b?hGmN#hI^P4dT;dyKjG^_t`?OrtQZ(9f9BD*85II;6H!{HXXb@pDjan2{6Z
zh%mdQc8~a@V)qGiulQro-!WrM^y9)DlG+LIPtTYT{-`jDPxAC}p7r84h~MhlNhg=K
z;wt)0)Fym~@KLcj)Lv7XliCrf-7Wm6PmVBV}Wv
z85hkVseN2(k4XHZ!jK>5x^nW%4EniUkDqg^@N>J(Vq2lPsJvA)ZD8uujPN<|x0mOH
z9})g`;YTIT7;68ud`xP`g?U_RUlU7(JE@_93Z>mbj#&YF;mlU>+bUXxZxg;-_(&n=
zmJvS(%|BG+L^C4%?ZO`rJBHfVD#oOC988`1n($P#lUgdNNLs`bT4)jW!kP8r^D|p$
z9h%|FR?)Nxp9Aw~Wloq8VMfJ{fmf@>gdfK@KaH$Lf~+4Ce;oWRp(C*IPG7kxQv+F-Mx2y8Bt
z6Mnp$<4lOJRIsKVHXCZKkWAp`LVLv@uV5urGOtvM5;hy^6(&;2wWDIkggGL#rE1pHSF@(AnrFXPn20c=V#kCT7ypRZ@X4~*$+DN&h}fL)BjS&X
zoe<`T_(~1Oudm^~T5BXX@khX8ri2-Vk6s8*wX9KUSzj-b+qyf+5zKGAGRk%aY0Q)lh5U!Xvz`hE9Caxei!2S{bNw}ig0Q+b7vv7s6
z0oJQD;#->^el?zvZKRVa2>)a%gz
zpG!BuKbJlTzX{LDHo*QB{5kXy_;ctc_;cyw@aNJe;LoE^!k<~_wZZje)ui)HTdVzH{hQ~55r$XkHTL>{{(+AeH;E_
z`e*p((|6#XPv3)o0sRR61@vS1OXvysOX#QYm(tJRFQtEjzl5*vx6*InpMicXg1?&9(-qW<=XeLno8#*s&exqK`m@_6w}V#T8V5gVuHf3}H3t10
zuAk)V=HqHgK36TAyM-7nvK4H`+NW*hjgnC_s;oc*v+f
zXw)Ax>JJ+A2Wh{I$3a8)h@pGL&^==49+7$kTyp7PeQEtcWFI
z4r-xAwGVgoXDn$8_|6^iOxC8(19izzEIqtFvc-H@TVS1?v6=6xp}4*N=Yy7=tdRq;
zHq}3bgP3~g`mM2aY)xdKuRlVW;mnG7bVVc^q3+>KHa5`IkxC?D(JYSROw+1ZGM0`<
zDeo8~b3pVaNk4H|DHzy!{OWsHXDS^|ngTPfX_8~u%qZq6b7ZeC
zJDjSlGb!(ApAU@8^IEWvJUz5to$9-`tKSjZYPR1o9<(_gOZ3YqV~D#`L+NNt7xGvz
zzZU0AcC(RfF>;=6x$;t+kT;|fB9zjYqYXHL#Rp>4C8>00@vgEq65Se4A_NX(C(bwl
z;&%^iiKM%usX+;fx$hZM6N^k2(
zp=Q$RGzUVTMKZ#zPsjS>Q6x%un=m|mZfVJ~d7Cy#p2l!a)lO5}P&TzW5^ZYB;?F1h
zh7hQ8pfA?nAM3XnEV;pWB9@kQi?$q9mgrI*ZVREszM(B!_^r(5)(s^RZl*1hi4F86
zhI`^!r*P8n+c9K_ZKyXBOLu2ugFRc*si7@f?aH1=dP^*84Xa&Y?zK9OekN_cb4NCo
z{$CbLPhHuS+?+}eMEKy2B&Jn$q>`KCTZYo2vs=&ySI7;qL}Z6}8N1%h
zV0{{AnrPOpFozRy`A_`qiVd;NSX;>`KA`BsYgd^JHyTL}+ZD#r7d{*Biznh)NA2LY
z%OZ&(tTD`Scl?GJtxQC=ko%}C$98d-3MWaX?@-MdJgJM83Eahii7YX+YWsCS9<(;ng6km!pEcYC_eg`
zCk&jh&8b=uk8DY%GTC@ELy1flAB7!f+6)hoamM21j>%sNj(hRjvTDD}EF$#B+Hjx@XFwa#aqPw-{Rq;;
zpKkT!kZC%Gx6Pq}Br=f?(I!IfrW-W`=0I7;uoZhvJb7J{Jp&ex2fS5$P8!r-DqtrImEt{e8hDn`(r!I6TbCk#uDQ*hP{A!Jo!_H{+8(AC7!$`x=Hh`
z(9LohZpL^=bC76h(lPF+p7t2y6s1+`D~hw@jtJ245IC5;nEH`Im;syx@I?^!-1C2n
z!V@ON8&(v*22)nWZcyAdw&j=j*ye64s4A~Sd9P94XOv$x$_I?{L8Clql;1SUaictJ
zl;8E=zkJh&%AUmEs>!dY;OZih^YUM8dwjK;>cfA3fv>78cZZ^Sd=&&A3Fzez%3|P{
zQdJ&TE6^uj4fgV5EAskk%ZA|ueGo(xzg`4+_lQz9tivMJry9Zi&Om;@-eTFV5=Z#5
zU52*Usda%GJ-(#HDRW~LWJIe#m&yi^Q;q5iB7`OIlp3w%_IN6k3bnQ-kErm>a4S^j
z?%r~<@@6mZUg4>&nM751%kovKnU@E>)RW1LAYBYy`E|~YSIE}@nrAneii4+gOhe6t3)
z%B*v&fS@|dsdClShrN0%2Wz`EWdmv>E6f(`Ds;(QVyrqftWApJcS}xV$rOR|WT7cC
z@(0!GY0^MdDUZ0_ma0~oWA7wu!(NxluH*b=9C*5HIN5ckt-{*!8lzP=
z36(23Q{^TR6{En1g)!3x0&grGgEtUzK>#Bccvy3=L1WFaTL31AB`fP|qauDaI6Gfw
z?rNPrV$)Su>VuEKoMlihtScMii1e4@f&;%_pa7&
z_O6yszG`ieg^O_3RdFK2gEYLJ*cC<4QUno7M#^7owT082$p)P)?lL0G-gKExVY-D$BFG}@nbIJke;r(ChRHOW$PW;la{0ch&4n0ITgGGF1cqd`YT#uZt
z>Wp6Fy`hfkl-e3Sq5<=2RrP$?O+WSIRld`%^ReqO?xH8TQ8~ulmdy3)eZ%bYv68#l
z%YCcEJ6|4Am#B{fhxffnRNZ8is2@6Ag&9t
zCnCyuggeG`!7=C3X5JjZ4`{7bX!S7%m~>H*Z(HEL$BB%Ffj)t`Ej*#oFz_cZH_Sqp
zLMx7W7N)wtbfO|*^xG9$dMr8R-Pyvei1!=<*+m*XnF4;7QN>XxHtP=JF;N@dk=9OYd!Cd@`B?S&ioL^
zF`RiJa9{hF4;MW|{*7H)rBM5^9CdaW$4y5p(-RU0gL^{aV1!RZ96Tm)V&Y)wo{)S_
z&^Y5p?up6gI99UbW+9*9@YuyMe^fKCt6Cp!@XWz6pI!7z{dS1sIMe2bIF3_8eh3Wc
zaed~rZUyt0;-Qrj5#=}*t=zn{?jlPr{L}@WYNS=ia+0y)*!PMh7(b?p*sMn_X-gzh*RRFRiTEJyZTF~!T}j+zj^lnU
z%hpuBvrOYJbyT5Hup9Sc61ek#`^UJEh$kV94sx6NtJHLia_(I=aUuJyHgeYf}R|IiWOU)Lo(!%8`Kg0isi?CE5l
zb^P1WSL`L~l_Q54_Hk^|WzRP?$bBDul!jKJYKr;(o6nL
zT7K~XD95HC-K;>NAZmoth!e-Nmw4y{zsI{7zrxF}*|Jv;Y9nBAI}&9Ux)hN9y5Bp7
zpbB!zLKO$UWr|4r+qVjOZT?$8eLMzuSg0C&2jUIjd1P*57(I#r;ZVbCHE^`wrKP1mlx^8AW#4n=F55st
z`aJvWkCHjxdEf7y^PTT9BWY%=wO8Is9wPE$d+RNthf(sYRqWfF9IAt-{9};5UiicM
zhm|!ytnb+x&x8llsV(WqKsXvnCR5pPUo4y+N`~Xf@QRDO!vm@QSW`(!(QG61`c9%X
zikCjUICh`e+60{%4k&Ypt_0)P*(>it*@`WUji^*gRnMCV&R<>=umAWn(+CK)qMMfRHiqp>({$sBTJU(ot~IhrMuk40^FSUag4Gl#V4*5OSYr3>&x0
zi8x-ZXx9PXcmEfUfU0W#TX(mw`TPBc|MW(1^Edt%clG_QO)&yX_`Hf2pPN+DsHc_a
zuFHuOCXeG)RCxoncVF197!mk9vwcC++@|Ka&GQy>K#dZxWAlg_ZX`NqKF*Ut_}$rb
zJh>&qiUqCu>8s(=ZdwGN&yfwQF6~-@ay9V!nZWIdR39+Ea0*i{KZS}4`Mmg_N;8G@
z{1KX3vHb?yAFyfY)VU}tv8}^44$N;cMcBB%ygS!lf(>kuJ_bIz$ln|A(U{nkh3tQ-
zpfONExd87|E=;xm1~h+e;r=2Yjr!SMBX+0Q39*kBFdr@82v-)ag}=U-?TrO&x56)?
z-Nnzr-|u7QaZ$dBwtVz7{Zk-FMao`pIsH3T7yIad!urqno`cl_yw~?=uh&Pv(|F&X
zBYp@y9*4g{W#)TgPx7$e?c*F?CbrG~#y~aww&3gnw2o*Y`kTU+3q$lLjqM#?wzv7%
z{w2+oDLqrDqli)0T*P&orEW(_Gy3PDErNnT
zML=5xy;0m;6a8s
zfX)IMBoF#9-$TTiT_@;yK?Rf*#A~pN0(8Bg%P?47G=pvsl)&(GQ3dT1)G7PTq@1AF
z1)WU01)VNYPN9zo8jvUrbhDrjOO(^;``UL5&ini$(>#BFc;D9zkCaWjB3M&|Ycb3i`63Go^*A>8pY+
zlPJA(zn}p@F*+dVBeGwdz9Hyo*)K^41*y`)5IrjBpr9M*TY~(O%ZKROg0@PO57S{m
z|0q#DM&A+i6H(qu-xqX~M7fiGBxsT3@_G7+pjuIWfu0cbH9=pcrvxn&^mY1~pbgUA
zBlN7Gzm@h5(S)D_QuhNoD(C~U-;e1Ui1mro4uc(rbqil`KTx#6Xo;MD1R@?cN6nXD4nD9Tru}9QOI_x
zQML7-EwX3-o%Z7Snp4Ch;9k%A`kcI;?R7hqp3i>z>`$&eLt5!94yaSL^;V!1{B-9-
z{doL+fX_ltinUu=--?qqedMId0Dl^?(QMU;&U7KW?!(w`j$KC++Co(|qtN%gOH{9g
zsspQ#qtODzwQkjKq3S?XEwWHtOR2>cdad|FYS2Retlg~6u+US!JJnJP6>Iy{3JX2u
zJD`RvRIGhhon@h?d`Hz93l(dcCv2god}n)RTc}uD=Q-0tPx*#CO%^KFKJJ-sp_hDL
z^t4#0L3`M<$U-mqe&{*hLJiulJ5%1*|YS9jPKVYHqg2%j9S*S((m3N~96>6I-R9;Z0
zMJ+TNxoojeJ961-q1gp$Q}HhP7SVpoNwPKB`@3p<(S7Ep4IYfjhN~g@(1yX;}*`58S5>S!h_>uWh%`^1wmu
zdJ7F}-_~|mXnEiVD!v|JQ{cccCX-=t&p)sS7>j
zLQgx8LeCiJh%#R6M4Nr}R-OJ%@-vsxMyxcEuKZV*(nhQ_k*@qVm(oV8G?A`+)}^!&
zD@~*;pK~c~#7YzC%71q$ZNy3w>BCeoG9yOcI!rHORqQJ2z2
ztTd6X{JBeMBUYM7SH9p<+K81V(v>f|ls00eiFD;JTuK|U(nPxQmoBA^SZN|%`I1X%
zBUYM7SN_VSv=J*!q$_{zQrd`>CeoEJyOcI!rHORqZ(K?nvC>4k^0zLfjaX?SUHOVj
zX(LveNLT*OrL++%O{6RTpG#>YR+>mxzUorih?OSNm9M#!He#iTbmi||N*l4#M7r{I
zm(oV8G?A|S50}zLtTd6X{DVtrBUYM7SN_qZv=J*!q$}TWDQ(0`6Y0wTbSZ7bN)zeI
zKe?1PVx@_6<$t-9He#iTbmf~arHxo=B3=1sm(oV8G?A`+%cZmtD@~*;Nzp$E=bBZ?D;f2r90faer_2+DF0vG=7fcsjpl1
z6}ny4uzpTEKD%93`}=mguaa(~Dr~sFNi(sXgl!hKYHTNCtHD-_tq$8M*uvQAv7L&o
z0o!bBjo41Zb~?5*u$_tRENo|EI|tjj*qX4-!8RA$JZ$r^HDg5&HqL5wUTx*TE{d
zQ&<_OqWfS^rU!(nm+znT3cr8OQzRyADUOyB+@)19UTkZ{Hi|u0>_V}N#V&;n5+3Y=
zvP*ovqps4W;%^i`B7R)_0r)EJcCx)i?5NlWVS_X-n#1D%MEobE_F1tnh<#nGri@TI
zRVlk+YsEH-Jy&c*Y+US!*gdd8x*4Am%IP*??hxi~Fe)i3=Tj)QOzbSNjbi7CT`IOq
z?4@EOutAFBzMh{3)SFA>nrkKO+1d;co`-r@MvutT3a(JRr=2!W;xsPKVXq
zi1S_XpA`QY@m~=CCGlSu{|)gq59HVwFQ9SQ4w`_yh<***O@D;FO86*j2kxEU1Vs^Sr$mkl6BQ;(8G1ex
z6P`1wL#C|XEw#H*TR3x%@S|e);V7FsbD#M4iX9hwNU}XF{siqLPtgQo+=TDS98*!)
zdKBK*WBB{1Wu_*6SlLOdi^7=Wo2Xu?rg*4P_%^W}vR8-jox=1&|B0er(MP2=Dz!1G
z9TB@*_}#+q5oRy;dZK8r>@^BL8`>wDeWJNnG~;3q34ciV!@^8p->Sfb?0Zydk4o(e
zQmd%aJ5_q8a{ihyVRa`(17VCP`Xx+*Xc|P*C`_B!4&gh5?@)PUI)(2=ga-n>5+N#@
zsAytRJ0f71%5KQDOE;?Y-iUi#;UFVeu!RUt2sO`lG_XAiUy{9(g#j
zCVtqnlRjM>#u`OmglUl4M)BLkb_mlcelPSd6!(fgDtt`%5wW|4*(3g5DCd;y73HWf
z`=s_>@yEp;66Ub@6VRtiCPaT!_!op%@B|Llm{)QZKkVH}50-?zlCziRr9o;NrM69M
zhcKPu_d@?)CB34L3Lg_b2Yz`lC;W&oyQOxI_@iR?33IRbW6<9m925PxFo&e}u=q#C
ze?ff0b?hGmN#hI^P4dT;dyKjG^_t`?OrtQZ(9f9BD*85II;6H!{HXXb@pDjan2{6Z
zh%mdQc8~a@V)qGiulQro-!WrM^y9)DlG+LIPtTYT{-`jDPxAC}p7r84h~MhlNhg=K
z;wt)0)Fym~@KLcj)Lv7XliCrf-7Wm6PmVBV}Wv
z85hkVseN2(k4XHZ!jK>5x^nW%4EniUkDqg^@N>J(Vq2lPsJvA)ZD8uujPN<|x0mOH
z9})g`;YTIT7;68ud`xP`g?U_RUlU7(JE@_93Z>mbj#&YF;mlU>+bUXxZxg;-_(&n=
zmJvS(%|BG+L^C4%?ZO`rJBHfVD#oOC988`1n($P#lUgdNNLs`bT4)jW!kP8r^D|p$
z9h%|FR?)Nxp9Aw~Wloq8VMfJ{fmf@>gdfK@KaH$Lf~+4Ce;oWRp(C*IPG7kxQv+F-Mx2y8Bt
z6Mnp$<4lOJRIsKVHXCZKkWAp`LVLv@uV5urGOtvM5;hy^6(&;2wWDIkggGL#rE1pHSF@(AnrFXPn20c=V#kCT7ypRZ@X4~*$+DN&h}fL)BjS&X
zoe<`T_(~1Oudm^~T5BXX@khX8ri2-Vk6s8*wX9KUSzj-b+qyf+5zKGAGRk%aY0Q)lh5U!Xvz`hE9Caxei!2S{bNw}ig0Q+b7vv7s6
z0oJQD;#->^el?zvZKRVa2>)a%gz
zpG!BuKbJlTzX{LDHo*QB{5kXy_;ctc_;cyw@aNJe;LoE^!k<~_wZZje)ui)HTdVzH{hQ~55r$XkHTL>{{(+AeH;E_
z`e*p((|6#XPv3)o0sRR61@vS1OXvysOX#QYm(tJRFQtEjzl5*vx6*InpMicXg1?&9(-qW<=XeLno8#*s&exqK`m@_6w}V#T8V5gVuHf3}H3t10
zuAk)V=HqHgK36TAyM-7nvK4H`+NW*hjgnC_s;oc*v+f
zXw)Ax>JJ+A2Wh{I$3a8)h@pGL&^==49+7$kTyp7PeQEtcWFI
z4r-xAwGVgoXDn$8_|6^iOxC8(19izzEIqtFvc-H@TVS1?v6=6xp}4*N=Yy7=tdRq;
zHq}3bgP3~g`mM2aY)xdKuRlVW;mnG7bVVc^q3+>KHa5`IkxC?D(JYSROw+1ZGM0`<
zDeo8~b3pVaNk4H|DHzy!{OWsHXDS^|ngTPfX_8~u%qZq6b7ZeC
zJDjSlGb!(ApAU@8^IEWvJUz5to$9-`tKSjZYPR1o9<(_gOZ3YqV~D#`L+NNt7xGvz
zzZU0AcC(RfF>;=6x$;t+kT;|fB9zjYqYXHL#Rp>4C8>00@vgEq65Se4A_NX(C(bwl
z;&%^iiKM%usX+;fx$hZM6N^k2(
zp=Q$RGzUVTMKZ#zPsjS>Q6x%un=m|mZfVJ~d7Cy#p2l!a)lO5}P&TzW5^ZYB;?F1h
zh7hQ8pfA?nAM3XnEV;pWB9@kQi?$q9mgrI*ZVREszM(B!_^r(5)(s^RZl*1hi4F86
zhI`^!r*P8n+c9K_ZKyXBOLu2ugFRc*si7@f?aH1=dP^*84Xa&Y?zK9OekN_cb4NCo
z{$CbLPhHuS+?+}eMEKy2B&Jn$q>`KCTZYo2vs=&ySI7;qL}Z6}8N1%h
zV0{{AnrPOpFozRy`A_`qiVd;NSX;>`KA`BsYgd^JHyTL}+ZD#r7d{*Biznh)NA2LY
z%OZ&(tTD`Scl?GJtxQC=ko%}C$98d-3MWaX?@-MdJgJM83Eahii7YX+YWsCS9<(;ng6km!pEcYC_eg`
zCk&jh&8b=uk8DY%GTC@ELy1flAB7!f+6)hoamM21j>%sNj(hRjvTDD}EF$#B+Hjx@XFwa#aqPw-{Rq;;
zpKkT!kZC%Gx6Pq}Br=f?(I!IfrW-W`=0I7;uoZhvJb7J{Jp&ex2fS5$P8!r-DqtrImEt{e8hDn`(r!I6TbCk#uDQ*hP{A!Jo!_H{+8(AC7!$`x=Hh`
z(9LohZpL^=bC76h(lPF+p7t2y6s1+`D~hw@jtJ245IC5;nEH`Im;syx@I?^!-1C2n
z!V@ON8&(v*22)nWZcyAdw&j=j*ye64s4A~Sd9P94XOv$x$_I?{L8Clql;1SUaictJ
zl;8E=zkJh&%AUmEs>!dY;OZih^YUM8dwjK;>cfA3fv>78cZZ^Sd=&&A3Fzez%3|P{
zQdJ&TE6^uj4fgV5EAskk%ZA|ueGo(xzg`4+_lQz9tivMJry9Zi&Om;@-eTFV5=Z#5
zU52*Usda%GJ-(#HDRW~LWJIe#m&yi^Q;q5iB7`OIlp3w%_IN6k3bnQ-kErm>a4S^j
z?%r~<@@6mZUg4>&nM751%kovKnU@E>)RW1LAYBYy`E|~YSIE}@nrAneii4+gOhe6t3)
z%B*v&fS@|dsdClShrN0%2Wz`EWdmv>E6f(`Ds;(QVyrqftWApJcS}xV$rOR|WT7cC
z@(0!GY0^MdDUZ0_ma0~oWA7wu!(NxluH*b=9C*5HIN5ckt-{*!8lzP=
z36(23Q{^TR6{En1g)!3x0&grGgEtUzK>#Bccvy3=L1WFaTL31AB`fP|qauDaI6Gfw
z?rNPrV$)Su>VuEKoMlihtScMii1e4@f&;%_pa7&
z_O6yszG`ieg^O_3RdFK2gEYLJ*cC<4QUno7M#^7owT082$p)P)?lL0G-gKExVY-D$BFG}@nbIJke;r(ChRHOW$PW;la{0ch&4n0ITgGGF1cqd`YT#uZt
z>Wp6Fy`hfkl-e3Sq5<=2RrP$?O+WSIRld`%^ReqO?xH8TQ8~ulmdy3)eZ%bYv68#l
z%YCcEJ6|4Am#B{fhxffnRNZ8is2@6Ag&9t
zCnCyuggeG`!7=C3X5JjZ4`{7bX!S7%m~>H*Z(HEL$BB%Ffj)t`Ej*#oFz_cZH_Sqp
zLMx7W7N)wtbfO|*^xG9$dMr8R-Pyvei1!=<*+m*XnF4;7QN>XxHtP=JF;N@dk=9OYd!Cd@`B?S&ioL^
zF`RiJa9{hF4;MW|{*7H)rBM5^9CdaW$4y5p(-RU0gL^{aV1!RZ96Tm)V&Y)wo{)S_
z&^Y5p?up6gI99UbW+9*9@YuyMe^fKCt6Cp!@XWz6pI!7z{dS1sIMe2bIF3_8eh3Wc
zaed~rZUyt0;-Qrj5#=}*t=zn{?jlPr{L}@WYNS=ia+0y)*!PMh7(b?p*sMn_X-gzh*RRFRiTEJyZTF~!T}j+zj^lnU
z%hpuBvrOYJbyT5Hup9Sc61ek#`^UJEh$kV94sx6NtJHLia_(I=aUuJyHgeYf}R|IiWOU)Lo(!%8`Kg0isi?CE5l
zb^P1WSL`L~l_Q54_Hk^|WzRP?$bBDul!jKJYKr;(o6nL
zT7K~XD95HC-K;>NAZmoth!e-Nmw4y{zsI{7zrxF}*|Jv;Y9nBAI}&9Ux)hN9y5Bp7
zpbB!zLKO$UWr|4r+qVjOZT?$8eLMzuSg0C&2jUIjd1P*57(I#r;ZVbCHE
-
-
-
-
-
-
\ No newline at end of file
diff --git a/HybirdFrameworkServices/obj/Debug/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs b/HybirdFrameworkServices/obj/Debug/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs
deleted file mode 100644
index ed92695..0000000
--- a/HybirdFrameworkServices/obj/Debug/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-//
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = ".NET 6.0")]
diff --git a/HybirdFrameworkServices/obj/Debug/net6.0/HybirdFr.0BD36F9B.Up2Date b/HybirdFrameworkServices/obj/Debug/net6.0/HybirdFr.0BD36F9B.Up2Date
deleted file mode 100644
index e69de29..0000000
diff --git a/HybirdFrameworkServices/obj/Debug/net6.0/HybirdFrameworkServices.GlobalUsings.g.cs b/HybirdFrameworkServices/obj/Debug/net6.0/HybirdFrameworkServices.GlobalUsings.g.cs
deleted file mode 100644
index 8578f3d..0000000
--- a/HybirdFrameworkServices/obj/Debug/net6.0/HybirdFrameworkServices.GlobalUsings.g.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-global using global::System;
-global using global::System.Collections.Generic;
-global using global::System.IO;
-global using global::System.Linq;
-global using global::System.Net.Http;
-global using global::System.Threading;
-global using global::System.Threading.Tasks;
diff --git a/HybirdFrameworkServices/obj/Debug/net6.0/HybirdFrameworkServices.csproj.BuildWithSkipAnalyzers b/HybirdFrameworkServices/obj/Debug/net6.0/HybirdFrameworkServices.csproj.BuildWithSkipAnalyzers
deleted file mode 100644
index e69de29..0000000
diff --git a/HybirdFrameworkServices/obj/HybirdFrameworkServices.csproj.nuget.g.targets b/HybirdFrameworkServices/obj/HybirdFrameworkServices.csproj.nuget.g.targets
deleted file mode 100644
index 6a3c0bd..0000000
--- a/HybirdFrameworkServices/obj/HybirdFrameworkServices.csproj.nuget.g.targets
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/HybirdFrameworkRepository/BaseRepository.cs b/Repository/BaseRepository.cs
similarity index 99%
rename from HybirdFrameworkRepository/BaseRepository.cs
rename to Repository/BaseRepository.cs
index 4409ae4..443350a 100644
--- a/HybirdFrameworkRepository/BaseRepository.cs
+++ b/Repository/BaseRepository.cs
@@ -1,9 +1,9 @@
using System.Linq.Expressions;
using SqlSugar;
-using HybirdFrameworkEntity.DbModel;
-using HybirdFrameworkEntity.Common;
+using Entity.DbModel;
+using Entity.Common;
-namespace HybirdFrameworkRepository
+namespace Repository
{
public abstract class BaseRepository where T : class, new()
{
diff --git a/HybirdFrameworkRepository/HybirdFrameworkRepository.csproj b/Repository/Repository.csproj
similarity index 84%
rename from HybirdFrameworkRepository/HybirdFrameworkRepository.csproj
rename to Repository/Repository.csproj
index c7d82a5..0a27dc0 100644
--- a/HybirdFrameworkRepository/HybirdFrameworkRepository.csproj
+++ b/Repository/Repository.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/HybirdFrameworkRepository/SqlSugarExtensions.cs b/Repository/SqlSugarExtensions.cs
similarity index 92%
rename from HybirdFrameworkRepository/SqlSugarExtensions.cs
rename to Repository/SqlSugarExtensions.cs
index 206c94d..57ace95 100644
--- a/HybirdFrameworkRepository/SqlSugarExtensions.cs
+++ b/Repository/SqlSugarExtensions.cs
@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace HybirdFrameworkRepository
+namespace Repository
{
internal static class SqlSugarExtensions
{
diff --git a/HybirdFrameworkRepository/System/Class1.cs b/Repository/System/Class1.cs
similarity index 79%
rename from HybirdFrameworkRepository/System/Class1.cs
rename to Repository/System/Class1.cs
index c5b014f..b0002e1 100644
--- a/HybirdFrameworkRepository/System/Class1.cs
+++ b/Repository/System/Class1.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
{
internal class Class1
{
diff --git a/HybirdFrameworkRepository/System/SysBatteryReplaceLogRepository.cs b/Repository/System/SysBatteryReplaceLogRepository.cs
similarity index 80%
rename from HybirdFrameworkRepository/System/SysBatteryReplaceLogRepository.cs
rename to Repository/System/SysBatteryReplaceLogRepository.cs
index b5d82de..61d57a5 100644
--- a/HybirdFrameworkRepository/System/SysBatteryReplaceLogRepository.cs
+++ b/Repository/System/SysBatteryReplaceLogRepository.cs
@@ -1,4 +1,4 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
{
public class SysBatteryReplaceLogRepository : BaseRepository
{
diff --git a/HybirdFrameworkRepository/System/SysDataSourceRepository.cs b/Repository/System/SysDataSourceRepository.cs
similarity index 71%
rename from HybirdFrameworkRepository/System/SysDataSourceRepository.cs
rename to Repository/System/SysDataSourceRepository.cs
index 87af5f7..81c00b1 100644
--- a/HybirdFrameworkRepository/System/SysDataSourceRepository.cs
+++ b/Repository/System/SysDataSourceRepository.cs
@@ -1,7 +1,7 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
using SqlSugar;
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
{
public class SysDataSourceRepository : BaseRepository
{
diff --git a/HybirdFrameworkRepository/System/SysDicDataRepository.cs b/Repository/System/SysDicDataRepository.cs
similarity index 70%
rename from HybirdFrameworkRepository/System/SysDicDataRepository.cs
rename to Repository/System/SysDicDataRepository.cs
index f663ba5..c2e3555 100644
--- a/HybirdFrameworkRepository/System/SysDicDataRepository.cs
+++ b/Repository/System/SysDicDataRepository.cs
@@ -1,7 +1,7 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
using SqlSugar;
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
{
public class sysDicDataRepository : BaseRepository
{
diff --git a/HybirdFrameworkRepository/System/SysDicTypeRepository.cs b/Repository/System/SysDicTypeRepository.cs
similarity index 70%
rename from HybirdFrameworkRepository/System/SysDicTypeRepository.cs
rename to Repository/System/SysDicTypeRepository.cs
index a4a1ee5..c695b58 100644
--- a/HybirdFrameworkRepository/System/SysDicTypeRepository.cs
+++ b/Repository/System/SysDicTypeRepository.cs
@@ -1,7 +1,7 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
using SqlSugar;
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
{
public class sysDicTypeRepository : BaseRepository
{
diff --git a/HybirdFrameworkRepository/System/SysMenuRepository.cs b/Repository/System/SysMenuRepository.cs
similarity index 69%
rename from HybirdFrameworkRepository/System/SysMenuRepository.cs
rename to Repository/System/SysMenuRepository.cs
index f2be8ce..84f8674 100644
--- a/HybirdFrameworkRepository/System/SysMenuRepository.cs
+++ b/Repository/System/SysMenuRepository.cs
@@ -1,7 +1,7 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
using SqlSugar;
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
{
public class SysMenuRepository : BaseRepository
{
diff --git a/HybirdFrameworkRepository/System/SysMessageRepository.cs b/Repository/System/SysMessageRepository.cs
similarity index 70%
rename from HybirdFrameworkRepository/System/SysMessageRepository.cs
rename to Repository/System/SysMessageRepository.cs
index 705ad7f..20f43d2 100644
--- a/HybirdFrameworkRepository/System/SysMessageRepository.cs
+++ b/Repository/System/SysMessageRepository.cs
@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
using SqlSugar;
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
{
public class sysMessageRepository : BaseRepository
{
diff --git a/HybirdFrameworkRepository/System/SysRoleMenuRepository.cs b/Repository/System/SysRoleMenuRepository.cs
similarity index 71%
rename from HybirdFrameworkRepository/System/SysRoleMenuRepository.cs
rename to Repository/System/SysRoleMenuRepository.cs
index 82e8dff..38c5e3a 100644
--- a/HybirdFrameworkRepository/System/SysRoleMenuRepository.cs
+++ b/Repository/System/SysRoleMenuRepository.cs
@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
using SqlSugar;
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
{
public class sysRoleMenuRepository : BaseRepository
{
diff --git a/HybirdFrameworkRepository/System/SysRoleRepository.cs b/Repository/System/SysRoleRepository.cs
similarity index 69%
rename from HybirdFrameworkRepository/System/SysRoleRepository.cs
rename to Repository/System/SysRoleRepository.cs
index e13cc6c..c79ad5c 100644
--- a/HybirdFrameworkRepository/System/SysRoleRepository.cs
+++ b/Repository/System/SysRoleRepository.cs
@@ -1,7 +1,7 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
using SqlSugar;
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
{
public class sysRoleRepository : BaseRepository
{
diff --git a/HybirdFrameworkRepository/System/SysUserRepository.cs b/Repository/System/SysUserRepository.cs
similarity index 76%
rename from HybirdFrameworkRepository/System/SysUserRepository.cs
rename to Repository/System/SysUserRepository.cs
index 9a9c0e6..6a4f5b4 100644
--- a/HybirdFrameworkRepository/System/SysUserRepository.cs
+++ b/Repository/System/SysUserRepository.cs
@@ -1,9 +1,9 @@
using HybirdFrameworkCore.Autofac.Attribute;
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
using SqlSugar;
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
{
[Scope("SingleInstance")]
public class SysUserRepository : BaseRepository
diff --git a/HybirdFrameworkRepository/System/SysUserRoleRepository.cs b/Repository/System/SysUserRoleRepository.cs
similarity index 71%
rename from HybirdFrameworkRepository/System/SysUserRoleRepository.cs
rename to Repository/System/SysUserRoleRepository.cs
index cab95dc..0e291b6 100644
--- a/HybirdFrameworkRepository/System/SysUserRoleRepository.cs
+++ b/Repository/System/SysUserRoleRepository.cs
@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
using SqlSugar;
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
{
public class sysUserRoleRepository : BaseRepository
{
diff --git a/HybirdFrameworkRepository/UnitOfWork/Class1.cs b/Repository/UnitOfWork/Class1.cs
similarity index 77%
rename from HybirdFrameworkRepository/UnitOfWork/Class1.cs
rename to Repository/UnitOfWork/Class1.cs
index d1f5cfa..814519e 100644
--- a/HybirdFrameworkRepository/UnitOfWork/Class1.cs
+++ b/Repository/UnitOfWork/Class1.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace HybirdFrameworkRepository.UnitOfWork
+namespace Repository.UnitOfWork
{
internal class Class1
{
diff --git a/HybirdFrameworkRepository/UnitOfWork/UnitOfWork.cs b/Repository/UnitOfWork/UnitOfWork.cs
similarity index 95%
rename from HybirdFrameworkRepository/UnitOfWork/UnitOfWork.cs
rename to Repository/UnitOfWork/UnitOfWork.cs
index 40a98b4..a8ceb6d 100644
--- a/HybirdFrameworkRepository/UnitOfWork/UnitOfWork.cs
+++ b/Repository/UnitOfWork/UnitOfWork.cs
@@ -1,7 +1,7 @@
using HybirdFrameworkCore.Autofac.Attribute;
using SqlSugar;
-namespace HybirdFrameworkRepository.UnitOfWork
+namespace Repository.UnitOfWork
{
[Scope("SingleInstance")]
public class UnitOfWork
diff --git a/HybirdFrameworkServices/BaseServices.cs b/Service/BaseServices.cs
similarity index 99%
rename from HybirdFrameworkServices/BaseServices.cs
rename to Service/BaseServices.cs
index 5cace70..9a4b8bb 100644
--- a/HybirdFrameworkServices/BaseServices.cs
+++ b/Service/BaseServices.cs
@@ -1,5 +1,5 @@
-using HybirdFrameworkEntity.Common;
-using HybirdFrameworkRepository;
+using Entity.Common;
+using Repository;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -8,7 +8,7 @@ using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
-namespace HybirdFrameworkServices
+namespace Service
{
public class BaseServices where T : class, new()
{
diff --git a/HybirdFrameworkServices/Charger/Client/ChargerClient.cs b/Service/Charger/Client/ChargerClient.cs
similarity index 85%
rename from HybirdFrameworkServices/Charger/Client/ChargerClient.cs
rename to Service/Charger/Client/ChargerClient.cs
index 0de0f3d..dccdb22 100644
--- a/HybirdFrameworkServices/Charger/Client/ChargerClient.cs
+++ b/Service/Charger/Client/ChargerClient.cs
@@ -1,10 +1,10 @@
using HybirdFrameworkCore.Autofac.Attribute;
using HybirdFrameworkDriver.Session;
using HybirdFrameworkDriver.TcpClient;
-using HybirdFrameworkServices.Charger.Codec;
-using HybirdFrameworkServices.Charger.Handler;
+using Service.Charger.Codec;
+using Service.Charger.Handler;
-namespace HybirdFrameworkServices.Charger.Client;
+namespace Service.Charger.Client;
///
/// 示例程序
diff --git a/HybirdFrameworkServices/Charger/Client/ChargerServer.cs b/Service/Charger/Client/ChargerServer.cs
similarity index 62%
rename from HybirdFrameworkServices/Charger/Client/ChargerServer.cs
rename to Service/Charger/Client/ChargerServer.cs
index 66bf615..086b8ad 100644
--- a/HybirdFrameworkServices/Charger/Client/ChargerServer.cs
+++ b/Service/Charger/Client/ChargerServer.cs
@@ -1,9 +1,9 @@
using HybirdFrameworkCore.Autofac.Attribute;
using HybirdFrameworkDriver.TcpServer;
-using HybirdFrameworkServices.Charger.Codec;
-using HybirdFrameworkServices.Charger.Handler;
+using Service.Charger.Codec;
+using Service.Charger.Handler;
-namespace HybirdFrameworkServices.Charger.Client;
+namespace Service.Charger.Client;
///
/// 示例程序
diff --git a/HybirdFrameworkServices/Charger/Client/ClientMgr.cs b/Service/Charger/Client/ClientMgr.cs
similarity index 88%
rename from HybirdFrameworkServices/Charger/Client/ClientMgr.cs
rename to Service/Charger/Client/ClientMgr.cs
index dcd493f..427eb0e 100644
--- a/HybirdFrameworkServices/Charger/Client/ClientMgr.cs
+++ b/Service/Charger/Client/ClientMgr.cs
@@ -2,9 +2,9 @@
using Autofac;
using HybirdFrameworkCore.Autofac;
using HybirdFrameworkCore.Autofac.Attribute;
-using HybirdFrameworkServices.Charger.Msg.Host.Req;
+using Service.Charger.Msg.Host.Req;
-namespace HybirdFrameworkServices.Charger.Client;
+namespace Service.Charger.Client;
///
/// 示例程序
diff --git a/HybirdFrameworkServices/Charger/Codec/Decoder.cs b/Service/Charger/Codec/Decoder.cs
similarity index 73%
rename from HybirdFrameworkServices/Charger/Codec/Decoder.cs
rename to Service/Charger/Codec/Decoder.cs
index bb230cc..9f583d5 100644
--- a/HybirdFrameworkServices/Charger/Codec/Decoder.cs
+++ b/Service/Charger/Codec/Decoder.cs
@@ -1,9 +1,9 @@
using DotNetty.Buffers;
using DotNetty.Codecs;
using DotNetty.Transport.Channels;
-using HybirdFrameworkServices.Charger.Msg.Charger.Req;
+using Service.Charger.Msg.Charger.Req;
-namespace HybirdFrameworkServices.Charger.Codec;
+namespace Service.Charger.Codec;
public class Decoder : ByteToMessageDecoder
{
diff --git a/HybirdFrameworkServices/Charger/Codec/Encoder.cs b/Service/Charger/Codec/Encoder.cs
similarity index 86%
rename from HybirdFrameworkServices/Charger/Codec/Encoder.cs
rename to Service/Charger/Codec/Encoder.cs
index 9aa7817..9b420ac 100644
--- a/HybirdFrameworkServices/Charger/Codec/Encoder.cs
+++ b/Service/Charger/Codec/Encoder.cs
@@ -3,7 +3,7 @@ using DotNetty.Codecs;
using DotNetty.Transport.Channels;
using HybirdFrameworkDriver.Common;
-namespace HybirdFrameworkServices.Charger.Codec;
+namespace Service.Charger.Codec;
public class Encoder : MessageToByteEncoder
{
diff --git a/HybirdFrameworkServices/Charger/Common/ChargerConst.cs b/Service/Charger/Common/ChargerConst.cs
similarity index 64%
rename from HybirdFrameworkServices/Charger/Common/ChargerConst.cs
rename to Service/Charger/Common/ChargerConst.cs
index 2592e03..f35ce7e 100644
--- a/HybirdFrameworkServices/Charger/Common/ChargerConst.cs
+++ b/Service/Charger/Common/ChargerConst.cs
@@ -1,4 +1,4 @@
-namespace HybirdFrameworkServices.Charger.Common;
+namespace Service.Charger.Common;
public class ChargerConst
{
diff --git a/HybirdFrameworkServices/Charger/Handler/AuthResHandler.cs b/Service/Charger/Handler/AuthResHandler.cs
similarity index 89%
rename from HybirdFrameworkServices/Charger/Handler/AuthResHandler.cs
rename to Service/Charger/Handler/AuthResHandler.cs
index a83b8ac..23c702c 100644
--- a/HybirdFrameworkServices/Charger/Handler/AuthResHandler.cs
+++ b/Service/Charger/Handler/AuthResHandler.cs
@@ -1,10 +1,10 @@
using DotNetty.Transport.Channels;
using HybirdFrameworkCore.Autofac.Attribute;
using HybirdFrameworkDriver.Session;
-using HybirdFrameworkServices.Charger.Msg.Charger.Resp;
using log4net;
+using Service.Charger.Msg.Charger.Resp;
-namespace HybirdFrameworkServices.Charger.Handler
+namespace Service.Charger.Handler
{
///
/// 接收到鉴权帧
diff --git a/HybirdFrameworkServices/Charger/Handler/IBaseHandler.cs b/Service/Charger/Handler/IBaseHandler.cs
similarity index 63%
rename from HybirdFrameworkServices/Charger/Handler/IBaseHandler.cs
rename to Service/Charger/Handler/IBaseHandler.cs
index 69f8216..aa755cc 100644
--- a/HybirdFrameworkServices/Charger/Handler/IBaseHandler.cs
+++ b/Service/Charger/Handler/IBaseHandler.cs
@@ -1,6 +1,6 @@
using DotNetty.Transport.Channels;
-namespace HybirdFrameworkServices.Charger.Handler;
+namespace Service.Charger.Handler;
public interface IBaseHandler : IChannelHandler
{
diff --git a/HybirdFrameworkServices/Charger/Handler/LoginHandler.cs b/Service/Charger/Handler/LoginHandler.cs
similarity index 91%
rename from HybirdFrameworkServices/Charger/Handler/LoginHandler.cs
rename to Service/Charger/Handler/LoginHandler.cs
index 3b7e227..1ba63b5 100644
--- a/HybirdFrameworkServices/Charger/Handler/LoginHandler.cs
+++ b/Service/Charger/Handler/LoginHandler.cs
@@ -1,11 +1,11 @@
using DotNetty.Transport.Channels;
using HybirdFrameworkCore.Autofac.Attribute;
using HybirdFrameworkDriver.Session;
-using HybirdFrameworkServices.Charger.Msg.Charger.Req;
-using HybirdFrameworkServices.Charger.Msg.Host.Resp;
using log4net;
+using Service.Charger.Msg.Charger.Req;
+using Service.Charger.Msg.Host.Resp;
-namespace HybirdFrameworkServices.Charger.Handler
+namespace Service.Charger.Handler
{
///
/// 3.3.3 充放电机登陆签到
diff --git a/HybirdFrameworkServices/Charger/Msg/APCI.cs b/Service/Charger/Msg/APCI.cs
similarity index 92%
rename from HybirdFrameworkServices/Charger/Msg/APCI.cs
rename to Service/Charger/Msg/APCI.cs
index 514d299..9aeb697 100644
--- a/HybirdFrameworkServices/Charger/Msg/APCI.cs
+++ b/Service/Charger/Msg/APCI.cs
@@ -1,7 +1,7 @@
using HybirdFrameworkDriver.Common;
-using HybirdFrameworkServices.Charger.Common;
+using Service.Charger.Common;
-namespace HybirdFrameworkServices.Charger.Msg
+namespace Service.Charger.Msg
{
public abstract class APCI : IToBytes
{
diff --git a/HybirdFrameworkServices/Charger/Msg/ASDU.cs b/Service/Charger/Msg/ASDU.cs
similarity index 96%
rename from HybirdFrameworkServices/Charger/Msg/ASDU.cs
rename to Service/Charger/Msg/ASDU.cs
index 55dfae0..6b9a387 100644
--- a/HybirdFrameworkServices/Charger/Msg/ASDU.cs
+++ b/Service/Charger/Msg/ASDU.cs
@@ -1,8 +1,8 @@
using DotNetty.Buffers;
using HybirdFrameworkCore.Utils;
-using HybirdFrameworkServices.Charger.Common;
+using Service.Charger.Common;
-namespace HybirdFrameworkServices.Charger.Msg
+namespace Service.Charger.Msg
{
public class ASDU : APCI
{
diff --git a/HybirdFrameworkServices/Charger/Msg/Charger/Req/Login.cs b/Service/Charger/Msg/Charger/Req/Login.cs
similarity index 97%
rename from HybirdFrameworkServices/Charger/Msg/Charger/Req/Login.cs
rename to Service/Charger/Msg/Charger/Req/Login.cs
index d3ddbec..bec3a5d 100644
--- a/HybirdFrameworkServices/Charger/Msg/Charger/Req/Login.cs
+++ b/Service/Charger/Msg/Charger/Req/Login.cs
@@ -1,6 +1,6 @@
using HybirdFrameworkCore.Autofac.Attribute;
-namespace HybirdFrameworkServices.Charger.Msg.Charger.Req
+namespace Service.Charger.Msg.Charger.Req
{
///
/// 3.3.3 充放电机登陆签到
diff --git a/HybirdFrameworkServices/Charger/Msg/Charger/Resp/AuthRes.cs b/Service/Charger/Msg/Charger/Resp/AuthRes.cs
similarity index 92%
rename from HybirdFrameworkServices/Charger/Msg/Charger/Resp/AuthRes.cs
rename to Service/Charger/Msg/Charger/Resp/AuthRes.cs
index f8ef764..ba23bc8 100644
--- a/HybirdFrameworkServices/Charger/Msg/Charger/Resp/AuthRes.cs
+++ b/Service/Charger/Msg/Charger/Resp/AuthRes.cs
@@ -1,6 +1,6 @@
using HybirdFrameworkCore.Autofac.Attribute;
-namespace HybirdFrameworkServices.Charger.Msg.Charger.Resp
+namespace Service.Charger.Msg.Charger.Resp
{
///
/// 3.3.2 充放电机应答鉴权认证
diff --git a/HybirdFrameworkServices/Charger/Msg/Host/Req/Auth.cs b/Service/Charger/Msg/Host/Req/Auth.cs
similarity index 96%
rename from HybirdFrameworkServices/Charger/Msg/Host/Req/Auth.cs
rename to Service/Charger/Msg/Host/Req/Auth.cs
index b522b8f..9dda312 100644
--- a/HybirdFrameworkServices/Charger/Msg/Host/Req/Auth.cs
+++ b/Service/Charger/Msg/Host/Req/Auth.cs
@@ -1,6 +1,6 @@
using HybirdFrameworkCore.Autofac.Attribute;
-namespace HybirdFrameworkServices.Charger.Msg.Host.Req
+namespace Service.Charger.Msg.Host.Req
{
///
/// 3.3.1 监控平台鉴权认证
diff --git a/HybirdFrameworkServices/Charger/Msg/Host/Resp/LogSignMessage.cs b/Service/Charger/Msg/Host/Resp/LogSignMessage.cs
similarity index 97%
rename from HybirdFrameworkServices/Charger/Msg/Host/Resp/LogSignMessage.cs
rename to Service/Charger/Msg/Host/Resp/LogSignMessage.cs
index 5fe2b00..b29cfe4 100644
--- a/HybirdFrameworkServices/Charger/Msg/Host/Resp/LogSignMessage.cs
+++ b/Service/Charger/Msg/Host/Resp/LogSignMessage.cs
@@ -1,6 +1,6 @@
using HybirdFrameworkCore.Autofac.Attribute;
-namespace HybirdFrameworkServices.Charger.Msg.Host.Resp
+namespace Service.Charger.Msg.Host.Resp
{
///
/// 3.3.4 监控平台应答充电设备登录签到报文
diff --git a/HybirdFrameworkServices/HybirdFrameworkServices.csproj b/Service/Service.csproj
similarity index 84%
rename from HybirdFrameworkServices/HybirdFrameworkServices.csproj
rename to Service/Service.csproj
index b6d54f4..38d4a93 100644
--- a/HybirdFrameworkServices/HybirdFrameworkServices.csproj
+++ b/Service/Service.csproj
@@ -20,8 +20,8 @@
-
-
+
+
diff --git a/HybirdFrameworkServices/System/SysBatteryReplaceLogServices.cs b/Service/System/SysBatteryReplaceLogServices.cs
similarity index 82%
rename from HybirdFrameworkServices/System/SysBatteryReplaceLogServices.cs
rename to Service/System/SysBatteryReplaceLogServices.cs
index 8fc54a1..dbfdaf1 100644
--- a/HybirdFrameworkServices/System/SysBatteryReplaceLogServices.cs
+++ b/Service/System/SysBatteryReplaceLogServices.cs
@@ -1,10 +1,10 @@
using HybirdFrameworkCore.Autofac.Attribute;
-using HybirdFrameworkEntity.DbModel;
-using HybirdFrameworkRepository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Entity.DbModel;
+using Repository.System;
+using Repository.UnitOfWork;
-namespace HybirdFrameworkServices.System
+namespace Service.System
{
[Scope("SingleInstance")]
public class SysBatteryReplaceLogServices : BaseServices
diff --git a/HybirdFrameworkServices/System/SysDataSourceServices.cs b/Service/System/SysDataSourceServices.cs
similarity index 74%
rename from HybirdFrameworkServices/System/SysDataSourceServices.cs
rename to Service/System/SysDataSourceServices.cs
index bebbf7f..660052a 100644
--- a/HybirdFrameworkServices/System/SysDataSourceServices.cs
+++ b/Service/System/SysDataSourceServices.cs
@@ -1,9 +1,9 @@
using HybirdFrameworkCore.Autofac.Attribute;
-using HybirdFrameworkEntity.DbModel;
-using HybirdFrameworkRepository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Entity.DbModel;
+using Repository.System;
+using Repository.UnitOfWork;
-namespace HybirdFrameworkServices.System
+namespace Service.System
{
[Scope("SingleInstance")]
public class SysDataSourceServices : BaseServices
diff --git a/HybirdFrameworkServices/System/SysDicDataServices.cs b/Service/System/SysDicDataServices.cs
similarity index 70%
rename from HybirdFrameworkServices/System/SysDicDataServices.cs
rename to Service/System/SysDicDataServices.cs
index 7871ebd..3b20ab0 100644
--- a/HybirdFrameworkServices/System/SysDicDataServices.cs
+++ b/Service/System/SysDicDataServices.cs
@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
-using HybirdFrameworkRepository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Entity.DbModel;
+using Repository.System;
+using Repository.UnitOfWork;
-namespace HybirdFrameworkServices.System
+namespace Service.System
{
public class sysDicDataServices : BaseServices
{
diff --git a/HybirdFrameworkServices/System/SysDicTypeServices.cs b/Service/System/SysDicTypeServices.cs
similarity index 70%
rename from HybirdFrameworkServices/System/SysDicTypeServices.cs
rename to Service/System/SysDicTypeServices.cs
index 6b5f83f..487796d 100644
--- a/HybirdFrameworkServices/System/SysDicTypeServices.cs
+++ b/Service/System/SysDicTypeServices.cs
@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
-using HybirdFrameworkRepository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Entity.DbModel;
+using Repository.System;
+using Repository.UnitOfWork;
-namespace HybirdFrameworkServices.System
+namespace Service.System
{
public class sysDicTypeServices : BaseServices
{
diff --git a/HybirdFrameworkServices/System/SysMenuServices.cs b/Service/System/SysMenuServices.cs
similarity index 68%
rename from HybirdFrameworkServices/System/SysMenuServices.cs
rename to Service/System/SysMenuServices.cs
index 821c098..71f7a3e 100644
--- a/HybirdFrameworkServices/System/SysMenuServices.cs
+++ b/Service/System/SysMenuServices.cs
@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
-using HybirdFrameworkRepository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Entity.DbModel;
+using Repository.System;
+using Repository.UnitOfWork;
-namespace HybirdFrameworkServices.System
+namespace Service.System
{
public class SysMenuServices : BaseServices
{
diff --git a/HybirdFrameworkServices/System/SysMessageServices.cs b/Service/System/SysMessageServices.cs
similarity index 70%
rename from HybirdFrameworkServices/System/SysMessageServices.cs
rename to Service/System/SysMessageServices.cs
index c19e16e..22b1f96 100644
--- a/HybirdFrameworkServices/System/SysMessageServices.cs
+++ b/Service/System/SysMessageServices.cs
@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
-using HybirdFrameworkRepository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Entity.DbModel;
+using Repository.System;
+using Repository.UnitOfWork;
-namespace HybirdFrameworkServices.System
+namespace Service.System
{
public class sysMessageServices : BaseServices
{
diff --git a/HybirdFrameworkServices/System/SysRoleMenuServices.cs b/Service/System/SysRoleMenuServices.cs
similarity index 70%
rename from HybirdFrameworkServices/System/SysRoleMenuServices.cs
rename to Service/System/SysRoleMenuServices.cs
index 2b49441..56253d2 100644
--- a/HybirdFrameworkServices/System/SysRoleMenuServices.cs
+++ b/Service/System/SysRoleMenuServices.cs
@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
-using HybirdFrameworkRepository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Entity.DbModel;
+using Repository.System;
+using Repository.UnitOfWork;
-namespace HybirdFrameworkServices.System
+namespace Service.System
{
public class sysRoleMenuServices : BaseServices
{
diff --git a/HybirdFrameworkServices/System/SysRoleServices.cs b/Service/System/SysRoleServices.cs
similarity index 69%
rename from HybirdFrameworkServices/System/SysRoleServices.cs
rename to Service/System/SysRoleServices.cs
index 0853f1d..6b4e160 100644
--- a/HybirdFrameworkServices/System/SysRoleServices.cs
+++ b/Service/System/SysRoleServices.cs
@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
-using HybirdFrameworkRepository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Entity.DbModel;
+using Repository.System;
+using Repository.UnitOfWork;
-namespace HybirdFrameworkServices.System
+namespace Service.System
{
public class sysRoleServices : BaseServices
{
diff --git a/HybirdFrameworkServices/System/SysUserRoleServices.cs b/Service/System/SysUserRoleServices.cs
similarity index 70%
rename from HybirdFrameworkServices/System/SysUserRoleServices.cs
rename to Service/System/SysUserRoleServices.cs
index 0d99cfb..46df5e4 100644
--- a/HybirdFrameworkServices/System/SysUserRoleServices.cs
+++ b/Service/System/SysUserRoleServices.cs
@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
-using HybirdFrameworkRepository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Entity.DbModel;
+using Repository.System;
+using Repository.UnitOfWork;
-namespace HybirdFrameworkServices.System
+namespace Service.System
{
public class sysUserRoleServices : BaseServices
{
diff --git a/HybirdFrameworkServices/System/SysUserServices.cs b/Service/System/SysUserServices.cs
similarity index 73%
rename from HybirdFrameworkServices/System/SysUserServices.cs
rename to Service/System/SysUserServices.cs
index 8663fb1..e3534a6 100644
--- a/HybirdFrameworkServices/System/SysUserServices.cs
+++ b/Service/System/SysUserServices.cs
@@ -1,9 +1,9 @@
using HybirdFrameworkCore.Autofac.Attribute;
-using HybirdFrameworkEntity.DbModel;
-using HybirdFrameworkRepository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Entity.DbModel;
+using Repository.System;
+using Repository.UnitOfWork;
-namespace HybirdFrameworkServices.System
+namespace Service.System
{
[Scope("SingleInstance")]
public class SysUserServices : BaseServices
diff --git a/WebStarter/Controllers/WeatherForecastController.cs b/WebStarter/Controllers/WeatherForecastController.cs
index 6baf012..2a1a23e 100644
--- a/WebStarter/Controllers/WeatherForecastController.cs
+++ b/WebStarter/Controllers/WeatherForecastController.cs
@@ -1,6 +1,6 @@
-using HybirdFrameworkServices.System;
+using Entity.DbModel;
using Microsoft.AspNetCore.Mvc;
-using HybirdFrameworkEntity.DbModel;
+using Service.System;
namespace WebStarter.Controllers
{
diff --git a/WebStarter/WebStarter.csproj b/WebStarter/WebStarter.csproj
index fff4ed2..d1e55c8 100644
--- a/WebStarter/WebStarter.csproj
+++ b/WebStarter/WebStarter.csproj
@@ -16,8 +16,8 @@
-
-
+
+
diff --git a/WinFormStarter/WinFormStarter.csproj b/WinFormStarter/WinFormStarter.csproj
index 1cfba00..d1217c7 100644
--- a/WinFormStarter/WinFormStarter.csproj
+++ b/WinFormStarter/WinFormStarter.csproj
@@ -17,9 +17,9 @@
-
-
-
+
+
+
diff --git a/WpfStarter/MainWindow.xaml.cs b/WpfStarter/MainWindow.xaml.cs
index 3a2ad63..06f4cf1 100644
--- a/WpfStarter/MainWindow.xaml.cs
+++ b/WpfStarter/MainWindow.xaml.cs
@@ -2,8 +2,8 @@
using System.Windows;
using Autofac;
using HybirdFrameworkCore.Autofac;
-using HybirdFrameworkEntity.DbModel;
-using HybirdFrameworkServices.System;
+using Entity.DbModel;
+using Service.System;
using log4net;
namespace WpfStarter
diff --git a/WpfStarter/WpfStarter.csproj b/WpfStarter/WpfStarter.csproj
index 4f1a594..3f8d2be 100644
--- a/WpfStarter/WpfStarter.csproj
+++ b/WpfStarter/WpfStarter.csproj
@@ -27,9 +27,9 @@
-
-
-
+
+
+
diff --git a/hybirdMyFrame.sln b/hybirdMyFrame.sln
index 9542d02..a044641 100644
--- a/hybirdMyFrame.sln
+++ b/hybirdMyFrame.sln
@@ -3,27 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.9.34701.34
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HybirdFramework.Core", "HybirdFramework.Core", "{0E784680-8280-4C47-8D2D-6405AC892164}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HybirdFramework.Entity", "HybirdFramework.Entity", "{6203689E-8261-4814-BFC2-013188AED6A1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HybirdFramework.Repository", "HybirdFramework.Repository", "{348F9459-2A59-47EB-B801-0CF907DFD8EC}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HybirdFramework.Services", "HybirdFramework.Services", "{5F67ED42-6437-4FC6-86D2-0495DE990BC4}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebStarter", "WebStarter\WebStarter.csproj", "{61B1609B-97EE-48E4-ADA6-4F1A832B8D33}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HybirdFrameworkCore", "HybirdFrameworkCore\HybirdFrameworkCore.csproj", "{5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HybirdFrameworkRepository", "HybirdFrameworkRepository\HybirdFrameworkRepository.csproj", "{01D2CC15-F1FD-4E22-845A-2D2473662860}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Repository", "Repository\Repository.csproj", "{01D2CC15-F1FD-4E22-845A-2D2473662860}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HybirdFrameworkServices", "HybirdFrameworkServices\HybirdFrameworkServices.csproj", "{A6C2AA7F-B2A2-4AE0-AE84-49BE36B990EC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Service", "Service\Service.csproj", "{A6C2AA7F-B2A2-4AE0-AE84-49BE36B990EC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinFormStarter", "WinFormStarter\WinFormStarter.csproj", "{A6757DAD-EF5A-41FD-9323-F3FCF05ED777}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HybirdFrameworkEntity", "HybirdFrameworkEntity\HybirdFrameworkEntity.csproj", "{C2380814-15D4-491D-ADF2-ADC68617C3FA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HybirdFramework.Driver", "HybirdFramework.Driver", "{EF6B2DEC-ADAA-4A6D-AE93-0F98A555B265}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Entity", "Entity\Entity.csproj", "{C2380814-15D4-491D-ADF2-ADC68617C3FA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HybirdFrameworkDriver", "HybirdFrameworkDriver\HybirdFrameworkDriver.csproj", "{6ACFA707-E72E-4BA1-8262-9F2E5B758D46}"
EndProject
@@ -33,6 +23,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Starter", "Starter", "{E0B9
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfStarter", "WpfStarter\WpfStarter.csproj", "{17044C11-3794-4938-BA80-C061BD871AE0}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{D528B94E-8D0A-4A14-A78F-8240ADF3E7C4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Business", "Business", "{C9515084-B676-4C33-9FE7-E0B860493A4F}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -80,15 +74,15 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A} = {0E784680-8280-4C47-8D2D-6405AC892164}
- {01D2CC15-F1FD-4E22-845A-2D2473662860} = {348F9459-2A59-47EB-B801-0CF907DFD8EC}
- {A6C2AA7F-B2A2-4AE0-AE84-49BE36B990EC} = {5F67ED42-6437-4FC6-86D2-0495DE990BC4}
- {C2380814-15D4-491D-ADF2-ADC68617C3FA} = {6203689E-8261-4814-BFC2-013188AED6A1}
- {6ACFA707-E72E-4BA1-8262-9F2E5B758D46} = {EF6B2DEC-ADAA-4A6D-AE93-0F98A555B265}
{8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8} = {E0B949DC-17FE-414D-8898-937A317BB853}
{17044C11-3794-4938-BA80-C061BD871AE0} = {E0B949DC-17FE-414D-8898-937A317BB853}
{61B1609B-97EE-48E4-ADA6-4F1A832B8D33} = {E0B949DC-17FE-414D-8898-937A317BB853}
{A6757DAD-EF5A-41FD-9323-F3FCF05ED777} = {E0B949DC-17FE-414D-8898-937A317BB853}
+ {6ACFA707-E72E-4BA1-8262-9F2E5B758D46} = {D528B94E-8D0A-4A14-A78F-8240ADF3E7C4}
+ {5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A} = {D528B94E-8D0A-4A14-A78F-8240ADF3E7C4}
+ {C2380814-15D4-491D-ADF2-ADC68617C3FA} = {C9515084-B676-4C33-9FE7-E0B860493A4F}
+ {01D2CC15-F1FD-4E22-845A-2D2473662860} = {C9515084-B676-4C33-9FE7-E0B860493A4F}
+ {A6C2AA7F-B2A2-4AE0-AE84-49BE36B990EC} = {C9515084-B676-4C33-9FE7-E0B860493A4F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3E10BF3D-9914-44B1-A6AA-FCF013C3F155}