From 41aebad8ee90f437055af71ab28b19b0c59ad597 Mon Sep 17 00:00:00 2001 From: ZhengWei Date: Mon, 5 Feb 2024 17:29:08 +0800 Subject: [PATCH] 4.4.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.修正:Integer、Long、Float、Double、Boolean、Enum 按数字类型返回,生成的Json不带双引号 --- hy.common.xjava-sources.jar | Bin 957382 -> 957485 bytes hy.common.xjava.jar | Bin 1030261 -> 1030329 bytes pom.xml | 6 +- .../java/org/hy/common/xml/XJSONToJson.java | 61 +++++++------ src/main/resources/META-INF/MANIFEST.MF | 4 +- .../hy.common.xjava/pom.properties | 2 +- .../maven/cn.openapis/hy.common.xjava/pom.xml | 6 +- .../org/hy/common/xml/junit/JU_XHttp_Get.java | 26 ++++++ .../org/hy/common/xml/junit/template/db.xml | 86 +++++++++--------- 9 files changed, 109 insertions(+), 82 deletions(-) diff --git a/hy.common.xjava-sources.jar b/hy.common.xjava-sources.jar index 5e7d4b56a945f95646c1af34157a70b0c6636911..efe6b7ee0e887972d69331f7ad428368b7dffba0 100644 GIT binary patch delta 11624 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

YJ#Z{s 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 DX~!~e diff --git a/hy.common.xjava.jar b/hy.common.xjava.jar index 057b0189e31ea58e0b11ff33837580352b6e159a..5bbbf85758cd770705b5534f784b273a3083ae01 100644 GIT binary patch delta 24981 zcmaGo2|QHa_hanFc*wqQ*>|#M$&!5!m0g5Xl(dk^zJ!$J$r3_YD!a)pTcic4l!Rze zLPRO$f8QJ5O25zNKcA+VIr};H+;i`H?s+SV+Kr#J@z!SK6f77T8XAn`dBcl%4RYke zRGE;dH^=fqFUeBRo47+~oVvbjEb`acGc=O#e`!7XF<)|rA@}<3ES`PB#t)A*q!b;) z&K8#R*rk?xu;Z`kkR9p0C=n_qVm7Rt!ay!QXKkX>tdktme=Pfe^40HU{!|OwN37+l)g{Y^$iert*Nl?rC&Z+Jei}0wp`RC-9I&;MX|qhSoC!y5dendr zb~zGyCLyo8yX1rRhrZ_2ob8_9em2TDKGGaZk8xT5 z>T-_#BJ=jBTdzk}(v8F$ zebS|>{oTPxE8|ig#)C_r?l_grbuZg$3DZx}$9YBGj&GeH=(wETT}nMLx1jze|4y#7 z$j!jzHJ%3$-gEHdN^5(iY^6s6OLMwO%wA)zQzll$m)m9p9gH4_vIeS{NFPXtnv59k zEJO(qvh$bXMF?-7(%i3G*wMTCm9F1u(JzFFvg+zWhEAfoGz;&P^_{+N3^7_3>iXwt zuXs#UJYXHJ{XhuX{l0$TLAluFy@Nm4?oKAVN5(A35FE1Qb1w-Th(8!Tm1J7CYA$SJ zyfN9-tH^A=&CW1Bb45EWXoGVb+lFB&5qr{^*llUZJW@41yQp2Y;Ac*DA)cP{LET2f z$NlU#e0O1dD3W#`sG`T~e3k7`%4UoZ$xlqB_}R8l|0p1qASvy6^+iFCIeuRNm2&Q| zh-9X=REUMU3jUOTj`^MbL#dJv3`&@T)t-E*l&!q>*v8)gM(jv>m)rRBh6-wA67LD#M{YAaWmPGeRu`8YGb7(t9`s;awP^www3JD z9jIVi`B0r&d(`rc%{Ip7H)6)SszfwP9B)1EJYo?_GiPy2hTeMm@)uS_cmj$;4CZ0;=ERIN_P&R20?Gv2Obz;2= zyGQ<-^13|9{_u(H+_~5)YicjwAji&rYbK9FoGw>YiH^;R_m5)BKXf%1A1F|9=-Ymi zK8aL3&y`Mi8SE<0P>!=*(^Ah|D7!+@ zyx;%H*>hPqixShO{b()Gxc&uFt%J`%}}?dB{H4xSUAf3I&i!5K8w9qB&UJH(BZ z(kQ0gbMoN@ik?38*0%3uwK9{7v9|XL9PQ}vSD(Vu6oo*ygbvPh%u@yd0V*lnLOL~+IPOQE@wp|9+`sgO^|TF{u;RhJ#U zPA{Fp^4lv)qVym~y+bGSwG z_QHv)k@7!{Dho~}4hJUf4an&1?7DFf&YdWLzqXzE9#ZG9Q_be0OSa;%kcD##=WV1y z##blOZ7R+>(!6>!O|t?GxjP;y$M2X=_0D=4L7=;47~P>D#2H z8(-LWM1471$x;Y=-fMXs8tZ?Ra>rHLZ-xYxRL4ti7T7%QbspflSyr#X-*U>vb^N=l zdWg;pfpTB5iR!tBE#r)Dxf*d8uEism@wk)v(mGx5W6g?=EIGb&xg4AZc{^g&KKe?q zoh0uL9>MFLy8A7)Hbqk6iA{+*|4xj;C{@|pr;16AW(pfJYxXAhHOP|#g^0xku}3~e z)m*fH;GAjhb?>R#+pfb+buUL}+`L$&4wv^(Iad(c)}HBQ_#9!Fuq}9i9cVZ;=AB8r z_Uq(T)jOS+I7Xf`C11x@oY1ac=~Bo$OcyA8$7A-mqh6aNX11sKHPJVLaGoMow{Y>WO zNweglNt@%OLw~Pvsvw_m6#>s$yPHd&Y?DeB{cPjbKt5}KaC4%FT6SJG(ieF?D)bAi zYk*@-v*ce!>DhVZVHqcgIW1P;5xTHC2@0W~X9Xq5#eo@Rf-(ppd?S@!7?$4);c@@% zFAyW$cL>9Sdm;K-eW6B@bZdG%3Sz5O6FE-;X>tHolxk&rG|8ASu?qCd9|3zM9&Z&u zU+XFrhee%vFT+KST8pR~+YhnU?o>F1qS7P*MBW*q*e@0j9+Dz?K34ds4UPd`bcLu8924B{20^tGvQ5%1+D>By%=HNgmy!B?%(R9ws}^hr&SK zp==QG)p@dUERtpLR4$n&JaL|kj!1ri%!#D&H!u9$8`?&!$RtyuA{RYxNCd=(NhCJK zWX7n>++wm#g_T$(_)#$#15v7k%$({!qz>FzK}Jt9X_JB;PVs~2iQ8_Fy(W##qpb-2 zYO>d8ZV|=n$Zn(G;4LIFSc$@cw&ATmEDJ4Aw^VV+zi!^0hK$*76#&&YZiNSv9E2hXOBhCAh;HyN$S_hK)i=iJ?2OOSEXRpaChc#d5=y zK@c6WV>k954T=Ch8X+)B;;1z?n+%2F8$qZ8Te0kL>M=0f1Gd@Jey2haz-d!hw;4Nts$girO8=!ht`&O)jWrB(o5BvE z5HsvOgw=vOI8p3T#1ALX$ERx zB*aXtR3v96!9b1M6hOO!{1!>*e@3ywDbWy)NU2KBhz1!(OYpf^NDy|`CP$MPCQXGO zQQ5lC@D(*g#SUJ2H1q{aPHDG-gBmuQ8F2NG$Ikivux z6haD5B!UqXzC>$Cn$GCd{SQG;tcPh^Nuz)WAr@rQ>X3fkX{I$KisjK-kj4WF_qh%*XzoHEy2|(RKVY?=2T}V=Z&8Eb; z53~&=&(WU?i?km}vlaaGA{mJm=BiAH1rAIDO9Mk1s20f^v@kk9VW3wVKAHw*dN4g* zA!$OR+4+ZKA`PM@dNI+ZlH#%zOVnVclOc&hXH`cgsIjP`%5;#~je>OMe+B^lEtF_3 zLidtXJO7b)RF+PHWCjS6HvGeej*d93NcW5nO{i8Ix^5Jkwz+L%LuB$1A2`r`kEV@|`1ea$)c%pV89Ss$_;X=210D&W(yiV7SMPVra2B3qFUIvjqSx!g8g)F3L z$U2D9R&~?qkoGBHOCtpXT1uEF8)70V4bj~sExP{+p@h$5gT++v1szxu5FtqA6UYJe zCGz_G~srTw)SAJxv3$b z8P|!99T8YkN5Z1lU8n<$6F3SYcQ>vJO)=usD_qE*fre#Dz*Z;u4XzVSD)jmb;UY%N z<5o$Mz!ifC@ya5ufaI*+GEVXLcv*c14qjcx#gQZ;R~tkCo8?6)h`?X4zeBtPSBu+; zfjsofLFi9#ttvuHOra;mj|i|y5-0-E1rMguQ^1mCz=)$w^lGF5|APoc5U+aZ?~(Si ze-QTpf>7^_3uEc|x$$7`)BKwnvSX_T%Em~{>7vpwa5iKk;AJt%>2po8<@%%}c zCbL{z`-Ojfy>`J$1gls5K0|JXvZLppman+Dt=z1?S--Ddl5U;Q{=D_U&Q)1>eW%WW zlRm4e?axlWRjqB$Tkengx)X!BYbwl}`e?o{qWL)?uQ7EX{CZ6@&my)tXJ1I!9ADE! zMa{(HR!8sVSw5TR;OB0*m7!%_&-<%pM=xJs74>s{hCVMyb5wZFhFaR=g8C@`b8X3; z^X^ve2|p8d&bkwPtkj)YLtosv;z1C6eUNufeYGX3wZpY|z)UjqIoY=OU+SxllC8VG zRNBrGc2K8RJ=?QNHNIg4tIjU5xx5lxnGhU4xo7nXxoGXz<9gowgKzZ3Fh8#6{WSCD z*DT0xwK}lz&?CQU!+M3hDa_PGdmx5qb;3DB=tr)sTk4@U`{x_SJlK9D%DSbES=W2d zac6vTd`@IgyWD#8;KZ9MYh^5x%Rx4B}~B*1^$8=M#J7LdtB_fEa0wEjabvT$KKL= z?%Mcixug_)ppfJ>DG`#iC?2-4*Wfzad44FNrTdQAY0f^}yvKOMM0JMlSiP=|x4N14=o;BF z!y1P3zRjAm!23@?)B37-$GnfdQj>hGXfS$p@125ByDx=B4?Z4!lCP9y&r_6d zsn9Btcdy}jgaf4h_~TdQ;1f5NDd5IuYgIjs@`JBeZw3;mTkTc3cwfC;>pPU9IVYMZ zV$)YTR?HaglbZkjO!1}W9Qe{vy6KpJ4@q>FGG+8@m>fzK`VP@I?^h|{r>wrGDqosi zeM59_-sPS?(VJ_huOwf|yj3Okp*{9>OoV&ro9`AGG7%{$=h}~X#Z@kitRbkFm6=#}E|jRO~*}&a1Q*L~rQ)+Tp32u*WHI-;R*86CvKE=Doji+awzZ zhXp2=Z~yE&chhrntu4b!@KC>dL3{|&NBw2Z$_?qO7hUrWqX-HYcLnjZm%3ARG55c= zxF))Dm-pkDQkFxkR(+#0`vwH>`*YTXPrTTFexF(?*=>or>MLPg%w-(WHR?;Yl9$ve zYHtc=!Zf$(mO?8la+E?)A z$J1A~!v)u(Up-HBX(Jf!S9xdPZ=vYM`SIp7SH+{wds(}l7C7|!o;;M9(^=cbLM;n$ZXtbZ z$7`yzoX&HN92tLqxPQ>^N!Ek$GaBBC)K?#J#WzV~JY@W>xu0vebr5(PRCeklBm&g~Gr zawJ9bN!#&gR&N!y%jT?H?~fSS+tqSs8fVl$FxN?x<|uF}RC*l5ovqs~ki}auT%j;% z0R`=U`)M({b3WyvJ^65?BH>W;6?zsfdyXf^Gc(s~8VO3vd6}0S>3#fdsJNf6?VP&D zP&qO7VfL1maP---9AgQ)wwmVW@hR#;yPNMn9+Ft93mRV3bF>z@(eioOHr_pTY&<~G zTVAx)xMZyFCjTJ`ZzD;wB9r@VpX$r7YZhy62$#w5bLs{dx8uxxFFVxfN z&DY?#Zd+fRKO_<>d^Vn$vaW^vr^YjWhSzFOKl}{0vNktgI;^MlQAp3wt-LAcVCC2E z`y{55ojH>}I$j${e3CRg++A%!kbSaWu1|=|z z9%>oZzR<`YaD3(?xI1l^(_6E(4_WhNX$@;82lk#4zGt3sP4BW#IBd$T+WwWW5;!S& zf8b@yo}X2(D;yPQ!WKkV#6q4-_Fh>llayIzayZKo(Eq{dzIi>FfNHbbjL$*x#$VmH zI9ZNWyRi?~$kokf#5_4;{Q-|@?+yQa=ss2W&x8kIW9;m3(j#WSy_#vE2Rw>2-Rr5& z?LFI`_2eLV?XPYI*?p^L+xoP?|Abe4{&n}Q5#jA_GjB=4d03A1p1e?(yPT#WuO^n0 z<$ZMogUNX;=YG6~%!%MhO+2pLezEw?&X-rsGQXx>mQcZre)t}9QyWM?@Ny9 zTkyY`m4jn_(ul_40yZ&%oyh>_GD$VHzM``C_XRHy_-@M>`;R;hdw1}J z*9*AQvf}e=J$2#nvau<)X!@pFzW|LB4jb*3tY6{V)hAUyzPrrnJN{s$(9o=Cch_aH zUuv1Bl}|NUa;*j%guXSn9Br`bDkrQ<&v3q8aTc><;R_w!zxl-rEj^_)&NQg>)6(~S zJ-6r$W$!p_Vgj#9XlejGi{l+tmiR}w&0Fn&K0=}vvP{xXZ!Yq__4jc@2>0U zGZ{el=zst#e8b%xSNSz|_(1l`@+V~{pSo{JSGv9weHU``&waxGVmxCopE&Jn`n4LFQG%VVm;1Y zJx=yr`MOqe<(vJb$J*}6S+6-rx|S}Te;;1mD>tQMyLO>$XA2kEZ&qt>B-4KZj?swlQanXxVc_7nUx&K=lc1uLz>GbSoO zQ-6z+Bp6Ra%e(D=mG<&a6GYz4+pU3+MsAo)TP^7vT2yH%`h5M{WBW7tFRm00Ps}b+ z?%CK?Qu)3nzx%K!<#M)V=S<~n{8%zv zuh~}jZkUFjjp-e&;36cq-}QH~DD= za`MgsB~0AGZ@*-m4e408J2h3pAI!sc!S`cR)^)CpOB+_xZbRqRv-8d1qsndhBWs!8 zrfV1aM#)=nC+IF(Hh!94yyRZ+cpLrEPJy_3^$50P{+YO{C<-nE_Y0y53DbOXJ-dob zE*8F5_2@SkG}Ecq}fnU#9IGKlj|!xrem*YvdkB zxyw_F*nQT*)P^4(3!Po|&v~}6div3|qcgrC*EQeoWi#Fhe+euz36a>H#$$U+(l0yx zZqQAh?5aJU^4dP97uU2t9htb1$z~;f;A+47E=7~7){3ra=q_W%_PD7tgp-7V9*YZb zV^q99{YoE8w%552IVnRII!tEXiu4NFI(t@s)hf@QDDGKzkUWsf(P4O)HFDB0PqiTD z0&y~R_LWq7XY&>D`D|au4 zNlvHlXuPLcQ>5p|>F)~5W9Hv`33%a)wjvFg*9W}1?X;s8Yczt*j)$iZ^J35FRo6!- z1UV2)#B4t*6^B&n1mudFIL*I39mX;q6(LKIQdhc0{AJcXyR!ZG>-*alG7q@El<0qd z=w?weU97ahP1%UDDWf|hu`gaX^v~i~WJXRzxKmd@!ck{_d+AD0W-EPvp-GlNhv_=+ zrE==Kjije%-D+NCXYWOYWQFUO7887`_Rp-WwP>9D*`jw#wQl6`Fe`n6$zFS&_RDoI zw!h}7jxi80$)s96lFo&X^jWnl+iUd5L7V|qftfuF zDnB18>&@;-(A>K`Ge}br!Xumag%B%{Vj(`>E0}3BWFtQMkl|a{_wT#L+)o~=h<|X) z^APjW#qmSEw>s4v6vRC3o!PmxxS7Ip++M!E?lUov8K3W}k z<>05K|E9OFYUGh$I9u-_y@-7m>{CwU5Z=dio|%yqxBQi5rDBYiViT1tmV6UV;Gr5s)AfA~JrJ6?62qqo@8vQv9^Tv4es}ujk33JW^Lpy`AoGKBV7a*Oc8jT%SgS*|fz^Y450+{8a6@tHpVrSHZkW65#k2Tw=V29-ZO!tAnA zP_*0c-o*PU52ksG@lPzSPIxmKzkVs>rUYwu!VWKo_rHAUo1;9Ggo6TVbfg&yNA7;_ zQ_CoiCGY)Jb9>bPhwo)&>6DXcZBuvO`(sqcN*}+zB!%_qi_dyv!lZP4pQ}$qrV(j(f``cd~~q zc3-vV*tnXKuiUQ)Hm>A!KmgAm;~uVSpL0qGQyl6)-mg4U)aO5I{00vK|%J>)1y-T{;F<&vjqSIBc^vZSD9Jx1k&IQFA zG1n*kf)lrKO>ruxb-7iwGA?L5sTF;4+;~OnsnNMJm_++idX)QJU9Skg6OrbyJj>+r zg}Eh3anO(vYiN8tW4Akp-F)1-Xjxr#zr)i}5m-B+aiA_KY|R$2b(x-wY{|=d#*!L+{z4`>t7o(f4@#${p*tMOD7I+iy=SYKUmX z=D&)8i+%+2;v|=}In^rTc-kn5(=DUGyuu+ia`*OR5qq}J(L^AgpuNzV^UoaQ0Ha5=9+9hV(QREqHF<EFqD(wyQHU2+W6Xr(h-`$(94Lx{2%4Ur}6R`ZeIQsDfsm$PlB zxRYjfh7vvBw}*qhqEoM>(-N+YHDnzbi=^3e^-ye7zJ<@-0y{bn@|?)SDpRJ}4I0EU z<$l9Q&+cD&Ty@=22S4k3=@w@DSAm%_`Mo{z1e!#>J$p0g8l84>z|xC}ZMD5!SS*x$U(*nXMbZM&o0 ztUTf>C!nke#S9=CftCTUHcbr z(loWaF<<1d1U=R^+saD;f!B&V*!mgvZ;#Ur#_zKyP~s@BO5RXpEGay5F=5(JG=*J| z>n<&izGzC`+^K-tDciw^{-eQPUQ_sbD+MZxW5@hPYwmSCJrWrDU?wE8BlA?Q`%+fI zPMSALjBoV6jdaWIc87};gT?2iFHkl2q)|-TUF`OFl$NSvBA_#%`|7aygf-6+_IB*j z&Ol~z-ZKORDvJ5#vS@#8idz2zT;%oNoaoO#SLX25sCXz@Ygk!UB3r`#_V!4kA~yqd z^l3+-`^>UT!>9T(Qlh7Z4N5apVz-reW{G8V3YGC#UKG9K@29A2wr3J9XPTd;xWCN! za$Di0Cy5D~P>Ld^GIn}2z(Gv(NFRmP0W4oQXwUA}gRMhKbP~h0 zYsOZK8Bw{R7^4ElFKc?oeo22(`8A*!{flTA)W2Oufc6|E_FN1Vrjo;MK}8C4#^cD< zA9BX;e#I5sqIx&pKN`wsslJWw1V7J0jpj#}4}4ixsj{i=+f}5CV+|GX_>rnCviWZ- zD&(ro31ft7954MnI9@j}1|8CUX{q;;%Oksv$1>GHx3!Kr)6}BMc3<-CJgP$_KHUK_ zxpIwD{$=2V>^SNA-g< zX_PAy^wLC2AAU*~S8W)XaX1=yUdUXF3m<)mveS}xil8qa&2LFhUo(YznAlNR-sx{h?~?U>i63BodPHJ%&xvTipEQrZGnKC0 zyM4Gb9=ywT9ZM5z98c9!lvKwKJf>+EHTq_3hyG(}leGNSr#4j)v$!L6v3Y2AX0_)1 zlF%N)7+t^{=p{vwR3H`0=rsd(Lkfr0&N3!FAR$t3IcDc+S{NsGMwzD*zH$^!zEPvQrLDM_TMN7B#q~aJ9$L*6VdS7i^ ze%i7t>9vTG(FY&%WZg8suH7aobNbv@bh)n(qCcO~F+HQv8{1{hooIpn8ybJm8T;8p zh2?scN1aF4K98tSjP;Ggjt|P#Em1x#aXw+^tXtx&!;~4tN1OC^4GG=%eZZ3F$K;eo zmAEh%8#QTQcz61zc#g7wxK>p3Rg2Ld2!?q*C^x z%^r%kmevz@pr@hR5GbUfQPNO~@wBCQS`yKDUL`=6TZ1tXPhHrzCWI2LXy# zX-QIPiL`D>vTo595D!-~7Jta3lBjFe0# zja%TpH{_A8uj=gzs+OO=M3yymL02G|Q>>7)-nW-Wxrpt7+G$;%b>CEcC7Gq&AKX@EqZC{|kmP7C6%{T?-{fqCUo87Z zWu)HqDr-d7PmY3k=e}=jhjMlLT*XB*T)-JVOO@ron$I6(&BM!H-x68K&2Bp6OlK7& zVMJ$TVmu}BdCiG=WZU$ZhK9FrKBfASXkUhE5#dq9(9&sZk$k9RDMp^aK7gAsbH5lS zAq^Ag9xSm=UL;Vl4>)$NEbR#tYZ#Y0y3MIBg4{GH((cl3qjn2LYfijfGCSeI#h#2Q zPvLjhJIbnh3-&V{A?N>6k>FLC;3X#%Y-rB4?kU`Uox^?z{DF1mEnfkJ?hZ`~FTI4f zVIg*AyROQvdAKFca}TbP6EralTr>%}qSvRD)oTqF9(AXFZ`3YMR~<@q4x63rChIvP z$P%#_qHyC^q!kjyLl8xNywE{ab-Liz1Y=z zcrsW*$Yh04y38ijvw~^VU~QN1aqo)$ptsG(&P>g@e$%V(%CM6iht>$Klf^Hquk_Wx zP4=dStZD|bbj~}}Lp_dfQ}HD7zoLFO$liFIe@=boqlfCn*GoUEicOAPc{Y0B_z}N! zp+N2D5n)5Ixc4GY9cl!y>_(G9O>QlDd4hYSC=<=XCq?mJmhF{=xKE&`J zB`=A4V*4q;lYrZEJ+XXQjG(zU!L`X=`GOvGRW{GiRVle&IQ2B5ZGwxcs75^hx7Q1?<>L_1A$< zRjRBZqCSB)BQDDyWnY)XK4bC?Ty?$8_oO9)eh1HqqT|%A4z`~}Yc5R2_1o4LVW|0Q zvYjS77BkPUuJ0QxoTW^WXe9(HJ!#O8?`utb6yo_{G3(Sh*$*-MbN8?c`Q8%og6ciw zXBLG|v8>+lnScH9HubyfG${cR(p{6M#AfQN6OH*I-B%lF<45Nn&S+WJn0{wfm2B!8sXkjvv-RHFD{@u2d$ymGzd+ zFHM@hE53Wt|BbQhb)E_$&9`~G?3fX=ez+upa8-ILUm`iIy~g>NxKv5l8~gr}8MTkf8>9x;*U z^KKsO0w;Vz)DE!@Bx8R(@0r{8ouiLuPP!r4qbj3USK`NZ?GuZ{Dds%f1Qfn16~a4O z66Vx@>+Veh1_Hya$Bm0;11ny^gb7+`c3nJnH!LU3Il!LzW%|Ol;@B*$Z{{Ng#JSi~ z?>VEH!b3#zfY^}%>vCC-IKjfBcbYkS@h5nq=}ZZBmwt3d1tu9sK7OGzgGsOOoe|{l z_qo^ex->02_}rnVZz~HYxhK~JM&gfV?tgw#o=p>y(8AcAsJWM@FmXpYvzfpj`}6~E z8`YYCw94#V!Jm5Kd#280jCa$mb}d#;#aGHWw7X4DJO~hzuh!2^Jo$NNbFk`{mlhPB zgkA6Abk(;7m>SP1BrW6S*q%n6)NI~y?_8@-?$>XgPPh1KWec-TNcG&9u)g1v?D_Ol zvPHM5)U;O%QY6dE5_F}TL^E}7CI})P39xqI4At(^;j45B)(2oHBl?Cb4L>N zKU)R8`t-8IVDbuOiO_nUV-xkfcU9GWr(>D}NvzKrXu94ncqdu3;+xMorhl9`BAL5J zJXf^Nry-zK(b>4a(p^5+Vak4mP8PS@QSJDb#3JgG_Z~X8UR}|3jZs=)v#wSo6u%qv zKAH1FU56+3nQ0ceQURG|bcr=i%3bzGLJ17q4;G*?56T~St>h9Z z_nTR2Jl+A`#Hnb^@w?aTcE;I%uO;w~T9TiV9)&s}Kbq=oP=_*)o@7hG6k$U5p=xkb z{J3oF{iDyF3(_W;??*bT?Cy`yXh@Q=Jysm%7d=D4{zG$+nl0fhMbgixTkB3iE{g=D zH)Rif;wYUk2IF$-?}kcntY^zXD}Hd~>L^T?gl8sxAj5l+Ism{aBqP$vq|40sIBoQd z4_L#*h^999NYa@haDe9<3J2{6V(_gBaJuKG6aEY7j2qw=f#;p@w6LHj{u4q*1nm(? z5OM;ISa1w~20g3=gKuI)gAjZ+dPIo`G~7qeH4?!=BN@`!D3d-z~dE6;yE z5piGef$Zp^J}?+!uy`Ffh*pDRxT*DrE5VpS(F*;EMkg?bftol6Gwj^bO%Fq>Is!{W4iusxyS%~hXC&$~p@!`Uo@gZsX_8JT0t1Ov3eaW) z3}QWeg9uK-7{SvxE5l zhlu+x5)6hMo&-d&vmHb_5PQfD;wIBVfU;87W@K0vpc(1bM(p{!lUaR>lo*7;m=+;I zJI7!Jdx#Y)!VFK@K??9`dk8|^K5q|kvj=m6iFxdx93q_#^SiMOZUsoq%uS?6pof>Q z_rEk-Ciu237PNDw>2a~b;(H)^fqzTER*x4EN?z!1=KuqIZV$wbmEZz6QPlCjO#6S- zM#FLr5ZnLDfE1!XuX=<5?S+Hg9YCm;kl#Y^74RQFVs{z0w{R06CnLjP6#lS*Zw&B+ z1Eh;Om&$&6qzHf}z*}t#kr*E=?*LBXyE{VLQBs|;PsfS@$uxLx9W!};lr+tqj}~-c zLFf@lc)<}wK~sPv1T@~ECzxSNCx~0cN{}>ezNfbg3o_<^o51k*4@@we?*v36onGxg z2(~~F9_k}wfft=Xz9C`XK%j%0P|&|enjfZn0Td@hqD5Ns;JCdIE6R|MpjL%{qex*R z!mZhEAY@@!3`Sy$1+6gCK1dB^HQxtVkBj|grBAC6!^5L)5Iq|D_=b-ZRY1lba?t6x zMTQ`JXCFjrYy6JL5S98%hN~1E%yoIw9qau7Jt6Z44JYr1(1WgUIf7c3C!s)>pde~f zp)*K=O4tK@Y?*IJF2J6;^^?F5Jz$jV7K7d(3_H=VA_B02JK$;;hzlNd-b{a6X5*N0 zz;+YFW2-NYo1}a$5I1Up7Wjg7P(=l##j7&IpS(5$BEGzfc^L@s2aTXx^#{ULEPPJJ86ke5&fG0g;^s)l+y2QO15m9xKe{3Gtxmq3#K^WVs_*$Ai|qzv>zsfglG_ zq{#mi#32O9=z(y8Gti*v66W-RNDH^D7eIyk{)Gzhg4j@hF8~xdfsG9QoJ%GNKl6fw zQ1CheP7>S%KN2LPfz1zW24epKfcqG*i31Ip+u%9x%@pj(-{7wWQT_|}uO|Eh0gvXQV732=i@OiN8W)qn z9>rwx@GT#R)V0uzfYV4|S(y6ZrV7r306g^{SiFRc9S%FV=^M%tRDnv8g`fS$GK;XZ z{|8R?gYfV!-^~c__XW6xs!bLYSN9+80fOVN`x__f2a!&m>-hoPi-tcqVKkv4nm=`A zgOs+T#$e>O|3YtFNDDq9p8sQ z0J*?JGB{|7Ob+QDCrUftn2 zjC0d~2yoK>o4{r~e=!|C0+w2&oTeNBQ>#hfFBE8Nh5pFP)e0*O14eiMj}hS#e=&i+ zS4P zOHx>I4Dr$BH>S?3$WgC$QmWOz^p|;Hfqrz zw#HkCUcyz!AxG3Tx?rHm&WEJQGZ@Tr#Nki``Yn_MH4DQsp{h|Y#%RieJivq@fa$tb z_35)DdeFp6BmMUV7O@z*8`6##)AK*Zn8cCTK%X!4M~!@KrKK$JP@e;XvE5>PM?8sM zJ_Kwc5z!aYJ%vjE$zD*2_iiCQl0qV_3W20iza~O}U)dK(P|!7u`=7M1ISD8XuaGFp zPHt{7?;+3^`6MXlC#HcVPl4%+gi8GsK$+Ykp>l5l9}50MRU)X~O1SzoqzCg?VJZJd zo8W0ckzI>W?1ImohM3TSJDub1bOkul4B}+AKYCeQqZr=jSBb#zF@E1 z`wgXot->}_)jtfNUJZ~?onf0AUm{S<5D5x8nMoIV{kKG|#6YQ;2Z^(F#)!f}XCWKZ z`!gXq+dl)ZM?j{SZ1KJoo;nLTp$2J%1Nqx0N%BFvGcBAK4v~6rs}a=gkAI<<37fXc z5CDqz({B{B%)e=B85&)B3KXv>I}FBji}Gbka(L(?RvQM5)OZ*=w>kWL=Rk<2**0-! z&Vi)`$;rQ2CI9|`QQ8h@n`x!s$^S$w01?>G?eJg(BoAvvYzj7u0MNUeP|#>izh&t| zbkOcFG#CLn-v}bAy+y|`{3rslKm)}e3B)i*b+HA}v!S-}XPV{-}`Lha|v;2V=Q) zg>6eY<~daG4P(Bx={1I^LD6k(M9{(*tCGh?A0@b~D=c+tiHes=_@E$4Oo z_`d^tGH*Y1Iui!-6|4?h*Y8Xlgh$rP2w5VDn|U5Y_x?q=DiP9w zozHI;gFpo82_sNVxbOVt@-_va?&N93~9jO$(y4vFPIei6l~Bs`2H<^W^iTlX7STt zZY?1P`w4ZhPuN-^FT(sOn?#C-8)fvs#8&|8qv4iGK>=S#f$Y)Y={ql9rU0g10w4r! zmw&x(H=|x?|Icb5h-@55z@r6y-TM+QUzD+RbvS&pVTs&SNMh0$ko%j5AZuj0p zX=UNb547|!A$2qVFQx)H3a|dg%>rR))gikGa0?TE;`fsQ&0fLcle-m801d*N@(1PGJKvTb78l;T0 z_%oyRXmO@?Bn}j_O4fg!=A(xTFGJvt!RB)TNYyks4dfqq{?Qf`B@7+_unnD>X%V#R z^kByQ07JBO@B0a6N{39);JBm%As&MN3IUG;AT96x2!2EOUp#mq0R8_|xgk&? zCeQqPGceTQH@zh4<~SmyCXfUz_(9GHi^32u8g?D#XL_zcO3@u~wYDV%^3ME44<1H9 z+CP`WK$KhhU#Mkx^Ogsc1yDuV2#Oyz%K|qdkP91s1iD&4g31)qF`*av=euP*ps7)`xjr^?wC^ryN9^|nHq)1id00E3t zFjEPD&g5)ft$wDN8G8b*3hdZ07^y8Tor6fE;DHFFJFRZHK)@|d5;P0^AYHz$hXw|3 zmaDC|1Os?Tq~IwDcz8W`GaGSvK*|ojP1NSo5*T2oJaAEotdC7(?+ie)V0M9#li6aB z1^;g*(v>zFJNFbHsNpMI|Jv>+Kq3XtQ(%JWuWYL3z5-NFO8rLB!|qog2=!v<*T?P0 zffuKM)~(aIR~4b>MIOT-g^uqFL`tDL2?`##KnG8%H+mcrVt3tw@2^-$O9lqw+fTkb0n96 z{da(QTc-_}dxe`fK--3zGB1O)$p=??TjRCpPLk)|iK9fH76F5&Mc`q7@E1>1sr6N$ z^t1m~B9{M|YHT+c2VL|q7+m(hcis=dLsvKNyweu}S^RZ>$pTN8;6wxFkD&T*|AqSR z`4Tv|t!UGh2ME#E#;ru8zgWl>1C(6zUnubS33~V}cxVLbMiPP-@BEGD`E!38jr%nc@^Va0Ic|#%v&#=J3 z4A(ZT;JpTNo?Sm7nJZCP>!mx;;*{q0#r1C6=`efIQ)m67T$GzvjBNq2gVA2|1FA? zzUbY=yV2d&jUeAfz;uwps18VY%qAr1}$t{x@pQ=;Sq{2AZL|9 z`h%_JUoV#w68-rUdPX=K(4)~WLqrv&A}CIHq7-cOkO1tj_U1$C2{Wk1TjQn(GnPS$ zDAA|$CCgPH>vtUdm#7f-07PhL{ys~vRnk>3WH|gI5IxPjrizeehyA_=5lvkl-_pUF86|4BlJapmHL~cB$B0o=#T)jbwXC zP;k6~bo00$fl7IjpuZ|MZ$|Rp08nEu5>(9#55WnQU?7n{?vyOXddY!As01DgY%%NE zF%tdt8=EU?2O`Bj1RlBx!nt|_>_>sgFvCp%7SwH2+Oc_GSWhR6pQ+AA38BQhUOHg7HD>m6mnMEexGk7kmwZ5 zdb2I=l zQDCT-Fi=!^7-%Z8l6+YYEaiE=<*(A9iYctNkr;H*56+P4G zJ4yO=6r~}iRSWdjopZ1ZXa-~xZLL`Gv==eTTH3g6xAn^g=@Q@ZX7*dVt zojbE(7$7@9Vz}8ptOYHF@S(s|#{Lv4b8SQ!N2!XEw=??s46nhe39Jf*4Jvz_WM!c! zUNNi^xbD!x{10GdV2cH8P4GXgL&5_y+g$TR*X&npZX8-KrT{{rB)yYfk<`PR%DVe9 z3%qwhn??HNaFX6i6Ow9%OA;jX#+0Gru$m382&4DX8>JWZGV5t~82*uk8-6xq|EUb2 zZe{~*IigzVn(imnH}NDiH>33lvWa>k$QI{Ch>hFFWUV*fxKF2Rn9v$rKRp^DC0zDL zlKXZUWbr^2QG0(;S}8ME34YvwV>!=r`#~BfTIbLnt+ z2)!qh%v*ya>!hd?Gc^U z7g`=8B~BJIH$L?IISG9WK!?OVJiAk6i0YvYs?4}Hwn7A!^LSWysC(< j9VZ((pkg{bTLR%YDnbK<1Dt3%=UIMwr%xafiC^H*CiJQ^>zNq;hSaea}vH8TFF@W`ABTLrbje!3RX z?VlC0zSk`Uzv@}0(&_(Dpq1MqMyIl~VnS!a%zYl2R*G4h9a&i> zr8zi@A55v$wO!eDE$nSrkafLO*Xq#jY;~nAqEmC-;ey|m_?z_wOgSD7t}Xs}5>~UO zIuQEKJ<@nz2_KXDLiego>D<7gnWhNCIKw%Y$b07-bcovaA?HeHyXLe`bm~NHKeF%e z_`AjJ*@9fH`Tet@Yj#KMnph-*B-81uQ_N&bS>N&9v?65DNI@I zIGN-snzgkko=IjlY-M6qW2^LPj>$3VPxt)d^5R8HoF4a%+dGc-W?==Gx#_b#*L?d) zvNq47F;D2YF0?yx^Mrr0k8oEO#u{j|3*&x-je1`hWFT7FwC<|WOSr^yXMn*&{knmL zblBm!>_#7+`IoAfBGdbYEVJVb#isqsW*nSjUD8WboOQK4O z)NHMukuNCt{M^H`m5LgEk(%ptGKaa?&PsJl5%y(+Txb}TjfHb}8~t|k{8Dklnuttm znGdgAgxyCEc3#~o6x3y$676UZWO&Q2I%Xt$iD@9m&Xx|t-h5Q4Iibobq~B#CH|xne zyDzEPE_%5McB|IK`wl(T6|eG5OgLj_lzLs@&7doNfQr#G^xQG7~YVcS96d&^47 zL`-~Va5#qBdyfc9(P59%C5|37PZzylK}^+PQU%EkI6bA0#T{%EE~yv7fc=co4AsaFYc-3j;_+ZfO2ssHNc zqLQA%@q-nz#2FvF`u&27iqo&$RhNia`<~ieYCdnT*0WGI`jjE)h-gnH-$5TXL1wA7 zZzi){!nPy>mF%s{@sHJ;%#us^uHrQFrgvVdjPJ1<&e-*2Zej8+ysO@;=aV-sOzpPr ziMVLXlO=IOMK78}a>s&LX(w|iwj?Ni8{mmj3=?q)O`ff7dGqe-FWEV#*%SN^al|T( z%Wn(s3iL|{q$O3=e|KEq`s^B5)P1X6DD^Q_l4W)@u4(@<+k|E1lL5S+8IQctv)0Sf z?vawXT&T?F!eM*8a$ab5Q0#sG^rO66mj#mh%4o&6-8M4c^Yjz{yuE_gql%%`97V61 z&-6|8r}+w3DR|~O57ZR2@!w|X-C;7WPTW^z5fVDR=579iN2=(<$U^pPa95ai{LE{y ze8J;wUxir)0_{s_d{?gDQx7GsWeoL6_};y9P{H}r^ehiu+T+`H-;B3cDPAr=K&`oN zblH$OM6&3K)C2dDt%prSvLhV6?xi>_c4*a)xk!3{(ev!X<%>;=@26hf{G8!(YUkyv zyNTI>l+#a!2u>BL^_YB$&on(@!D_7wN{N2=ls{}Gp6<&qQ2TBYBoB)7~G5A|b5O z(s6ou{Lh28RUUqCZmYxBJ6MEK+al=}NY&lJePEwa{%N?lU;NYe$4Z|U-cEiWoOxAa zaGLNk_FQPr6~EWfNgw)$za$N(q<`je_NN&fe#T>PTd3gs884TbTcUSs6ZcS9(W}>4 zs^(kxX3HeC2;+U2OQOGWmdZ|kl6biHZSXgZGMeV0yA_{(C(Ux~jbZO2vgZsPJOt5K zn{25hYjre*P^#cz2w$x!nn0%Na3Ny&>J_mVvKJBJ<>;4mvXW{$$(Nhudu$p zRQpJUVG(=Pb22=X{~3k_?LgRi3c)CpE~_GvKB~loqG9UDcN)0S4&q2xQ2v1uWmS~^ z6HU)or>Ra-=_T9K6{8eEDCvo6pAe4fF!lYY75IoL9zh7zzclVpBM|)1pB|;8|I(nZ z{-}4K3Z*`4r9d^nI~*X+>bX6+WW{o_C^HQVJ3w2i`}R4Kxs3}6WbQQwh`*Y6Af23s zFm=glZR6AEMRlEt92ypkB(oYa_b2nznMhYxSoEOYRiCwCCG*Jt0B%C&xb&98!>B)c z+aVFy-Wg)9?z4S@8co0MsDeU_hX^8RPCWm)tyFE|q)v-o@o7^krJFd>!gVg7HJ^FZ z-9*Vy$vT<$D8xY;=AfuUi;r|kn8MBo{My%ZLKhGQS(dO1hOvp+tkM>rh@2;MFIyRc6ym z!4cOe_)!b_*C@#5^%{UFU3Z9)BzK)+Kh1xj4%|>q!GK<&9Ah337m4!*#RRz#{-bRn znO0E@pm`)o-=Vli&gg$A7yQN(q9x`w7|cY2nz$;;SC%X?WM3M14x!pfYj1Y(Z-0njph|)&i4V#gYPKf z@F?Ku1|miQdS8g0RJ%a&n_RD;;81`X4)g_?q*|s3=0YV>O~?||@USn$OL_re1IhJ_ zHb=?=1p(gg2QiUS*|DwU41%FSos`0dRVMqFTtpCok#I?CLfAMuROw&YGsl2zuOv2; ztn`l?q-%0m4^#mO=(DCm$CEi35qSPQmS@Aw2~rrN;*?66aadN;cXezO%1I(>VHa>{ z)u8Da3xN1Zt$VSZbO?|!#m)3Rg zkglG?ij&2=&tuD}QR|_}SV^)ds3b!;^b~|A{kniPXGG1A5TFnq>9T})eR;P zFG&jd*eztf|J)?yS77BgsFM$YXhotOg~~gzT7NwzsXW2H`lG`LJ{<>dVGzVi*%mEwQA-3#lz!0M7B#<2Q$lBQ}ByLGRK~ zeq=(~0C<2A9a6wpzZ)T?gDC=TJPYytQ-z>(HDKLHhzcG)3o(!cw^BBs`bnTXwaDp4 z`%(`;;mSyejdWa!vW(0E`s*X|AUD2(Th}5K1<}AMQ9zZtJf#vD1qG=DqY6-TH3}k- z8Wkz2$tcjWn?z8dtRTnr$05>hRZ2cIxiA>146{BM75Gqt4-NRxf)5?Zg%`KH1GNpx#G9-He6t`4 z9>sC+kX^9{2?08VNr~Y&T|C-Q=wLrzk7I=i@wh*BG+?0wFyeW|<9x`eKpO+NNQVHd zaDD7v~bMhD9OPzYv71Y>y%jH@PR8u+b|c^^kldXSA1Ba@sOaJxxTdAI}Q zTpPLh(X0w3g8}(PAub9nLwJK1$zYZ#ufWZdyWn3S1p&U);P_E3 zB+zH8{+fitEwTONxsrezOk~ZdL$&QV&OgPW0k5TkL5sf&C%}qk@2?F6fMrsF zs?;|)4{`{9Q-Gp*sUQU=V>okiN8-IS z3(^vZ797b$lzte8&`3awFIgYRfi}EmN>5LEuSnl7fTB&N^sQtRtkI<4{B(#d(~O>u z^vsI>BR9$cX5(p86O7JXDcY1=q^S`4XcQ$cLqK^kk%}+U)1Xrx36z`(`VAc%{EO-F z@P{mjnWSGpPe+~0G;Gj0uYcTd6&_1q06asWMTs#0d~v=<8VVOy()S60ahwf zux&P2J*hpXze%1u5mER^Hi%f@HN7Nxz6WEI6zr1&8i+VeUrJt6puVH79Ls^YNyiuI z^T=xel({Dd%)1BH=)1}8p?wC>s7U*1@Y*(bcsjB=bP?`E2M_0h68grC zKZ^!}uE3q>NZ0uAITT3p&;&%}L45F80el}qfl=Ktf_QX=jA(_Kr15N|n?iUka)(7! zlK`!e>>p@8DOgAsPYr*)3|1Th>i8sd2}`Qjj;AIs3GQm)HOYwt?Jq?F%);x7A!RHo zizkKb!jGd#B!Ol&A}?~#$Q_&URB%NB7+2q0;2Y3TVWf3nAtyX5Y2*l=pR5^m12E%Y zze0$Uw9g4&jWUzK;^h>1S&2A~h%u9H9LI<0p-UUI$q+G;;~o47vRD79XNKpmf+>)% z7C(jXlBnwNDrjghSR6{hsFZ&_zM0%6hyx@*izBlj%X!2Y1Btg4{}`wHmox(F1(?Rk6(IpW=mc*Q?0pSOrl zLDiDLJpu!|G$(<03FL^totzjckdI+801X=4Mv9V>lNkh2MI?YGqIZ5UYR0P+m^o3$ zpiXXIlva<>CLS?#l2@51jiC%;BG%a9&al1uz1Eg|sFTYz3?_X{h{n?#ET3u>?uop9S)U%S6e!!15uu6+~I_0r| z$>6cvd79b6Oj=8h>pzcVe7yQIJVR^O@;S>Tx)H(aT`mXjYgXJ|I}w?rH6ATCXCNLL z&+o6VZJ$|LoHxha@byOeZw{lmQ-R+b-Yn&&YZ<@VwiKD((0-(lR!(D3Y7YAP)zYh_ z_*PZ_%yC`UW9m-QHTRp}Tzg^ra`6JuB4h~1K4-iw^xUVr^a0Ur_OCrF>A@41>Vbzd z3xdb{iIz*20#Do=dZ(CbSuDMej+V^XX7C3!Yc8ec@pnYk&M~D5)|_ahcMp0xLzFG} zGF)_gu!FtgU4X_Z^?T{>3uf$2ESz}*5vG1WZ#jc0Ys8m;Cst=Icy_`1WgMoS^7hFE zWjTgBrxh=jwUj95%8HciNHe@Tt(aZrQW7X_A72{6m(gZ66TB_M#FH<>@VUZ$2Ca^+ zy!(+?bYB^Y>!e=UB|2HUqp3rD!9bnJv~u(-wa%fbVs$6hD-+nZVl&U|JY&+Ld1=4r z^qKIwPQMci-1lF1xGx-Pb-$a}-?J~|%9#j;rzYR|w)MSmm9>BO+*RBDgI!~)+|ps) z7o02>drJe0^5kwW(r7sBPs?O_WX4y1hI{5zW+!i+KP{GUYJMu{LF89^&-d=>p6`hR zr&+Z$b#20rzJLF^_VH8e!PC`wq=DN0r`AKK%kyrT);?ntWcgX69REOc>um1uvmuKh zk*Kqes{7S`Y8<|Q@=bfTqftX~H*Z@X`(l5{4y}xE@bt?#R=tMM^R zU)$H`Q2gQi%CC%*mxDwDlvfT@Uf#F2y=#nkr?t3u!shAM(B^T^>%|9?yz!^4e>QZd z8s`0cXAi}efB?s$o#FFnoZbd)6a1!BL zYZDG4G>O&pc-iu{9RdlpeKt?JDLDEHf85#s1S;x!N+W7M6?AFeEyVckSVt?w_^aYGVOEutqg^3S z`w4Z!?`AJu><~E5<1OTM921RbWmH+s7f*PlC*Jk(LyBI;?gr(X-K>Yq4}J8`oAO<% zA)fx#w?E;A=a=92s&TVMTC0q5QH0tmbtwX;+p(Z6BhtoozfPpEi$yIyJRwzWSwdpA zv*@knP1&DOP4^~h%VLP9^~(MI!#~8C73ikg%AR+7mH zAH~9}JLg`=F5Rt3$a_uYxsorki&ygrtS%QrM{_#wz*cjb7R3aM9Z4hK(q*piH*)v% z;jPx_QneI%SgP4N_JWV*d{(}IX5BS86P4i5U1da;+5v0MQNB5vSf>;8^o57d7%%OL z6b>VD@9KQ5n{cY((#1zyGrWhQWOjTwvb%!!#I)tkD1k(sa=C-oKim`8lg^d=Rnm~H zXF>Jr?3}J>^rTHWf$F}nflBcq@2r>m)UiMz=YxACVtH(Y~!6uv%kzx(!>?1(-$ z+j3)<|Khc;PnDem%0f#==L6@c9Wo}R8+JTCeW1rs!uzsTIyyc+RDJzJp5>0~R$LpwL^*xpUpNZz!c6IB$;{JLP9) z>9({GLsVF!3(VWFB^>L-pU4Cw|DYFK1o!Y{jYZ<~KKex;t*=}?5 z=d~kp^WM|U4`c1d`qKyIdLKmJJ9;Lkz5R8@YZ2Nwzgw?9P`lM=Ia}r6pM@fXSRgeg2mdyNrT&I-JGXxdqI@&|?cf)+|(+4H{@B>~U(KokpR(=z`d#wEMT#n%q_}|F*pmoiS zmpkf79L3@09qmN_Y(ECo_w7qZwhgGYyVyP-+$o@O+&1e)$+1QI%-+^Jp?Hm}ZG%_p zY*Nc&rs9abXE~y`tDj80xkGBT_{1YE-{Ap`oUg3i40oOuz4jj|92ob1cR(}KReYSXz%f+i#5i=^{67HS!>DwP11o|E3rrn8KtOrkS&r%Abu)h>rEqQz! zW$DpjGn%{YJPztD2dl%I^Ju#6xIKJ+A|l+zVGiag{`T{fs@U(R&4WyHbSk0VX98u3 zx_q}-_jxAu&odGPVje4N=bchi-R_u#G7+wZfD32DX*Fru5#NG{l-a(Txr^Y&a`)pCP`le z)0T6&oq7ui)I#>RKV6wZ-d4nZmcQ=y(W5*D-{Trmljpg0!RS^mo@NvB!Ra(i;u%99apwMf+pX4d5Ez({tHszcEeYk zRjumwN6Q}U64S6>DEXn7@#FdRh_YKIo=o;M=HDO-9{uaqrOL!y!&|1M`jfZPPmJcD zT`FoDogltk89LL@xpwW#sg-&jo%XdGUzSUz!jgy)A&XGJL;ysTrP<{i(Z90y7mLPP zR>~Uw(r?_Jc&i`k?O{$yYZ+??Ca)|!EdQmHv=&9ISRi`+!mrA)d=;a?T~po?`84;z z&1VcWSoJ+;zV1veAjVbRy%8T;_Jz2(=JD&H^0tQ)yfcx>n!7%n+4<|sAnE9w(*uE% z^yvpr-@M%3Y*IPG8}HND6I*kr$t_86e0m{@#baJxv(RAwMAqQ-Lr0Vi(tPesWO$@W zOWH{Ei)Iw@30lX{+-$14zSd{(<#PY{m#ePFt97^)7lF|o=3#}Z{4 zkPtcg+4tLuyRuqnixcYs8W%GI{hR#0Z*)bIOQcm+`e=4Ubqj>tA7ItDm@J_!e$IE* zVmUW4?8gCNHFrhE)HGrM2lx8{f$#*5W!}=tfP)zL_7q(tbn?hKzst@|!b6Eh?7~Nz zyq*vZZxFHOJtJ;DL>G0rDp48fDs34)665oJzAbmO{RGu^c6YyyJ}Yz=%NnS7n{vW4 zOjGrsy071KdQj%Aj5aT)NdA!_=YX?jMAFt5(O0j$OK2G3JkLc-)MLtgeet??a=&rv z4z@Wu$0Zv!C}VYJb7{?_+x5!N+FvhzZQl35Sp5fAsP%y{pFqxB-*#?RL0E3MVWE#| zr*Es24vXFN@(Q-<^vyzVuN@wWkaV2U^RF!?t*ss(wS{Anq9%DJpR$j$b~{?XU;G)i zE&5(YO&jwGdY;uN5uL>--^^fOWe5|cVpt|of59eSz^O1bGWVUFpK+% z<=He?kv+hqNa!paetwUh^83?j(~BKh6u+JAoew3vd~!)QobGW9|8imIvP6fHT1C6WHxpUmEgive6UIKAl00t zI`c!nCgrd@UVx6&khP_#oh4Dwf%Z&Or(46#7s0WeNxPh8uJqoJF?<=h<*q<$Zn}Rx%__0h{MWg*2`XxH zV!F$jenXSS540j9-fdZFZ^zvfR#|>I2fTY@XT|c>NQ+${;YXF=?c(i*d3878MzwFP zZqkx7@9}EEJGDC}zdB@_OWeZWU9tLkUpUcxr}Pnrq++({X8dyo2PGNpn&_*n=CE7h z^5u5~$?a9EG zi{z``zt)iVQgf>*6t?e!$Ot>`DRlWWp}V#8aD!gptDUI=^_~uUAn0UPSjb_?>B?=H zY}01_8T(ladc4}CU;Td0^d)-ByMrwqrK^?dc4oYvMJDf*^5A&5j~c`gEh9Z@xoy&> zw`yH~oaK#C>n-U`OBctw4V=%Kl4Mp2b5MHE@_}Bg<<3Nc&#hs@!DyA9qaqXVbzf!r zmbZ`P#i%`h9XM1o%IhJ9-Fwf)a-cmS-q7o&($M{TXCrT!Tns-y9J?ouE;<|Zmjls> zhr0`Wf9YsZ-DTM7PF+S_gd@gfhx;FTOEEs!HftLfQ($$YBM5rRU}!FNn|^eJHJzwq7uJI}^*EC1CfLnlf zhKi@qkWxAPoHCP$yIRBQgzNNG_v}3{@(p9A+rBrA)iE-Ns6Ebc34Gy8%$vmBS!oz| z&U?|^9>{MXj$aTsvdqAtq!mu2bUSZuS$e)H;LuE)<1V)yTm*X)3?_(6|0iU_qtBby zI2Is%VnxUQMVnY=-W_YnPqc|Yd)t0fa6oKDV9Ud-1Gnq`ZWFcD*J&W!8c`o3i0` zLekyav3qLo7vSxVW{N&BOW7`z?#Dhdulft8d+`nPJ=3_C$=0ct8@#nc*@qbEpNOp} z-KYJ`>lGH^6-FmG)84e@nmCSlU-Qta;KbV#=GtmgCoX=e5_V8J9QeI1_aWW(D_qAj zxsJbeGUdvW{xGR-dRx*^b$5rvhg-P9w^XJ?)6{Et|I0{#ZF5{g| z9fezu3V(RWy(>&?SD3HUD}|0iuiH!~C8A1>MVB0txp7=P!Rv|s%W;OnWIEHm)lHqF z)eV{V%K%Vl+lZXdfln0#_kIp&E}7fPD+w`y!Z88Hhf;f zr?P`0eq}{kQ$?BAn83SBf+c7BPEwV$*VCw9p=8wNY$MKxNW62`=XPKaKd!|De~8>aB7UjPSbt4=^Kq8eq1#yrE{abcxx|z>?|fylmHxyRPf@GG`+fy*uox-s;}aLnEFz`` zJ9Fk$XAql>VUa5I&vz!KvJjciB5b$B!~v8hRGohYmKe*`MZ_ ztB_RRJ=_^y(wuDGbxk(Q>U!NPTE`z0L@tp}7xXMSbG?QbDW&RWi%&Mqbg6dvynk-H zt**EimvSyd`<(d2B{W6uHuynQD_SWf@hs75{WbcV<6Tcu6?#gp3V zdVxqOvVD(YI8|qWvT+)hG%TuaoaU5%t=X+Zn8`kl<3QwhtSNgY@A(%dBhC}|9<>JG z3l;3gxKsmt+>4!a2z&IUG?Ma?kML2-_|PQN>~_>(w$0=ncuny8oIPAdeYf@M>$eI- z)=;KSZ|141D=%B03Rj*e`MO5Yoclev(pJ*|tIcnKUDBlfK8XF!LwWjwLRbr~9Y6M= zYZ+U1b*EfgL}Qq22GjCm$DoY;F8MTq2~Ght1e)xpW!~|Fh5awhNH3^Q414XqL^wy; zd|!jx%~M_dT55`T(%G|S3i~tLnmu29ktgoup*?BFohxbCNMFj5eJzeDWvlS8I6mvW z(7j?kF^!%3hqvFWn~5-vH6P$pHQqm5i3=W}(o9tNs6eq&>!V$+WOX3^Lddg_tL_YD z*WB?bm&c@Nw||yrFneyNI!l*Z((Ln9b+t<;ewFmdzlmtMFOQ*7pQ7;+4dxh^`7xNC zh_N@xnOp5rs$EmavW;2v6Ii-@!Tf2oz81!OILJEBb_D;8Y6gqTbZXJ}Qdg>QVpdU> zKi}-!(B0VWH*r^(k>te{aj$#l@CPPR%=w`$SrRg_GcQ<5GBTUD%t+g8mDxLN)m-~x z`}sqxc3boCY6eH{8675^GV*>hrorFG#YOCEHVoS0t;@h!ur1-agvP;|#r?{sE_r-X zd_EjAEzRt)D#~~uJAVi1x`Ln2rH-3##yECn1?Rd7*~u^k&Cm(Pcq-RZmE15rmY}C? zef?33Q_O1Q_T|5PV3eqh{2r2UkXJqIi~`E%AOyMgtK zjQ2gKwrx&(s-4;zV!6d6-5C11vzTH|?B`ugb8a#BXzBH6sg|ez>~ekd@u2+6I|Z%i zKdO5s8lxknT-cH2a_N$X2+2(cN3Q12$*yI`^_nwx)6KR}=Du##>Sjjv6D>I!pw4c+ca zYm>kw=J>@J!YptgTVh2~H-J04io1It(!^(vM8yYoHr^j}kEojy@zpVfiuB$}x&ipt z{=Ba%`3vq53hq@~o7lbFD>nctLulicc}z;}W|RvjTXs6)3y2;@qC-DtU#t zwq5w)(WcUz=uJ>sa(CLZmu-hqRux~jO`Kb9l-rG6N}3IdlXYxLUz1*DaqoEbtxc*Z zLr;f;W+eX@VIH?avnMpxKERgpy1oCZmAcB^osQWyhD(+m*JD(}1P`hbm&cDzzOv8y z<@G2`^38Usu>NQn%||!6Y=aG7a9mEiCukHI)b{;uZ1Qk>-dIZi&dXCUb@Mn+-s^S9z z+`oe&&vr6pIo@9hO|rM+u8?0M{$f+dTk!-MHM)#Ng{uV2DF)2xNBboX(L8J(7&T`o z8}R>ydppHnM2OfH#I`4bWoYsA`NL_dAIt=Ujy(?}ycTvm*JMB`e5to}f9_T{((}-C zE;F6y=PoWV@}!-U)B32MZ^L=xLUXLIv(0rs?eTr}j#8StqD}9m1mzd{KUXE*%UQbe z#8+={nDIg10Ao>@B=t#W%b>UZU#$FV*{ck`aY>h&oochb>W}-#$)jO?ciXx0#*fpH zN%sCTM~jC{WwjWn?Z*lmT*5@Uj(o84lq&0yTqK4 ze3(9RFun_FN!!!$ts!<#j<-=18!<+zo$+mgs-3~(+Z9{zh4a59enouJ8E)${OwZ7N zB%^a&!~1wwOy|nBS0`(1KSm0kY*Mk+8|)}6y_-7lIsXHd=}G%gPTpd;g0;J)hvG)3 za7f*Qe(L^XF^_0+1f@S+Jk~>bBS2lI~UTE$fYMf=sV_>jgr93wjfT77O zfzrMevk6i{d5Ku zzLT&w?U77VU-7}c^DS{Nj=BpoY9BpmSHRk0EAaXRDSu}#K5w#qjMHLhu2pDxtM*Wg zN{h<`MO_I#d?wpWIP#sM;?lGiLo8oKr1%)dXTtA6d}u&;{8&3jlQTo|vhIUlMDJ<2 zQRs1dsJwbm6PL1Y?tQ4O3mR7rrFxnwNO|Fx`ki*;#vR`!@9BnfRHR)w$2-O8SpRFw zu*gHI`YG#tqj2`iDWj2;3$ycyzqa0&Sz~^au}1Z|gLXXSm;1YmqwccbcdG7M&Egj) zHg`@vtdd+99aR1<=#%`5I!Bz?k^PpqcH446_+7?BC-1i{KIvyJ+Ly`)rEjUOm!}!I zr9MC*cBP^GtGl2i^_Z>~RiM|)9eWzkTEXnyH2wC&_CC0B~I;@jtm zf@T~>2VF}o@}<*<4X;|KJSZerKVpDy)Pb?%)fCx1{?L8=^itD zE@#{zF=EJxVThi{UaUr2mAB&t0}j4-Q&A<)C}IZSnS&rbkcvD$f!l6QT(2GS0Q8V@&mtBl?1rm(uf|`MHwL zN)w{YmQI}c@RoMmFb}UoMR7N8gfXZTlUb!9pW#0bk8uDh=G1K1_lEhbrx%=qeZDuR zRh@A%(7|utQ+8p9R)<~XxlFy18+Sea^z`eGm>l76As5Sx2AuXyADRCYo%%a(Z+;~4 z?nBS?&^~5$1E0v=*S(+RFP3|}HJv{8>0-hoQ*o6UO#h7o4tnGLjo+C=%F6uNe{$?` zd>_91oKxgMt3wKNwsxZnjCyNc4K3C}f@i6>{@!;@2YY?naKY`o8}m#Izv%Z6U8{bK zBoQAv)>p$ePM*8p#I;4Buch^zx!nsTER8-0*&P@-+1ruNIeSq zs6FVN(_>%Gzo?~tV<{q*_x1pL{HH!+*rk342{il&SGt04G|9g;SM9j%<>c65DkVqBzRVVG^(XI|x0SSL z`YKRW)v%tp<^82Y)rR6!)8M?3N92h5x56GG!v*JxCAK?-?qTzaH=@)E2v?CYC z%;{R*_fV`wE_Q#0h8!j9IVHv323KUM^OdSqJ4{Anlw5kjGmCA%2N`{eDKxQj=f<6R z^nLoAemHuWj}r)MKY929m&}}(>z?Q6A7XuSuDYYyh#h}5fX*V z%D_IyZUzE@ynSbcg>X(A-KB$U_RnM`P?3^N36bP2L+HMn&*fmJsg@1lDY_{MZ1Wc< z?}|dT>D++W;Q(jCII80Hd4f3Uj0?dPLNA?yz$N|!!5rORMFN*i( z2=)kx!{8E6+8ROlNj8tzf@LbehFI%!gfdiR3JH+HDj+;UVucOP6OvK4fMo}=6%aEW zc^48YE?)(-gcwoz=L*0KpyA<;%Y-|qXv7u56Y|C+un~)i>>$_(D*}&I5}07k zDzGu?@-+f^V-yK&o1;Zp&`o(MRp4yGs}h1gc>@{P+=WVUk)m!8-l03GNIn&WgJhjx zW0(jD=#(TgBbSH?ZqmLxgxzG{L3GP3sGmqWNL8JLK=MW@#BGxCSAst$ilXh}c?ax~ zTEa8l)ch;ay^m4R7`;S;hibq+HkB+!OY(+Eq&;AV8n6%WK@MXz*$p(IH*3H)@}et@ zJX`G4u-Yh(y{7aiW{JNWfn{a!x@Y zDP-%YNAo10^{yIpo}3*Z#)oe4B7th6r9e&*!(L{PIu3lXLC@~O^cm!gm|%7=JWz)emLJ8BJUu*1%$C02vG+94v0dC*^LK(w{J2Vjc{tfjuz{j z8xLG5ZsHVS0h|hOg9SwH7|$#qUQT~*4CdHz_f4)Lot6T)Mv(^dTSDZ+G&>Mi>$%}^ zOVHJPEP<~G7aG7EO68YAqGJO|LC#|X&_=9rbqPm-!Hj~B=q69Z;4w=GJ+1_!dLww# zpYyWA`>a3=h~!3Q!HpM~Duh!+aveJud7HM04V^I z!X_qqexOr0-H4wBZm?eWAcgbv%d3EE6nv1w)_;FQ1W;~YK^%P38sbCK@WdJPC*!s ziIW*_i4)-0hu3Y-APB!C8L^kd!E(0ih_)?2wn!m}D01eGMGy&Vf*7dR0z5iTjlqE9 zi5q@~;7VIa1NG+X z1vZ$AN9Zn zVc-Xvi=T&HU?V}>z5^EJHd)KrgF1&C8x%p6I643&A^XTwaB5H%RZv?$UV9oS=miQk zcVCGEWL9vJkURrPIRXV##wayi+nD2T%qv|_7m$G_iV}kn+vG*5NqVXUKiuTFUSO{g z9YbaaF`dht088YrCsf`E009;N5J!8!#<6Uq`q{-Mpxz#+7vH4b-v(9R-~@4@(d4#F z&XE8IKj7ZFi8J;v%E{skk>^ioXJ9YYHoeML4EA$gcOncBDK5g}&JcM({cm9Sw_dhv zQvC!GP(WL=en-tuW-x3V1C!L|=3syoTp(@K$xCOaEAnq*F!3NJrA?YbJmBZaV4pWQ zCCP!ZejM0-Dj!T)+8h{+&L-AS4!Fq;5=D{1-WY6kD+u!5 z2St$cl;l|+=L)EB0-5^fL?vwJ3Xu=)_#=2#@@AayKXZ-x;Sfn~Q10Ul7>wp7FHPYu zu8uTyZs zjqd9WhOlFO%Mqn=Ft5itzl;Z<)~{3TJs|=d>#<&cR}g5nk}QBiEB`^vo&e&#^9K?` zTlD;vV{d{87|cm9^zPaeTOVBD37MnKbhiFuOExG@bI|mgoBcs6Ibd}!h#S?nQN`w3 zu7Ul%Ao8K>QZEqj59E3q{Mic*NH zcN_S@QBv}HrNIZ7wpiEzfy1Qa2A2hAM6o4HWC)xj6+{hOKhw!`7>t6sAk+FAQ-tw@ z;BkL2Z-67I=mAr4l>gnr?q_A7;u66!Pi+&wI{OBGaPE}6M)39nR`>F4fWYxn7TC^j zJs}>B-?5J1XnYzg2BW%3-(8^%Lg0KV^j9cX^GwMZ;B@Q%I1wVbK?odRB|DLG3^-vc zw*dl2SXuwBS9)KFbS{D_$_5R*d6~JYv_Z(g9}++hXL-KaBh@(2BCVGk*Ph$LC6U2XN0$bcn7jzzK)J5J4~2+hp`)7+DB8sjDFC5$Nl)acP9eLXU$U zA`UTtv^Ea^8at1fe)jY;H3Mjh-)NalrZ}SFOaBi90CF?_hTF#aY5bK%s`cwd4 zu-Tm(ptv(&+D5Wnfk3aj$PhTJObye9f%yu7gu(#yt7iiQ&NuU;&?N-g^5PFf2Y&-c zpHT=G4xrjMe;_tAQ79CFK*D2W$p0gj@c%bbiEZ8084$QPDCUD3vWdamftiVrJ*q2! z2y}6O{G*El9wM%Hv=0dMnHnyL24lDGb1WAOj-WC9Pkw(7UfSLd#{5<=h;PpCD8~lb z`Uns+a?d^#0o2NgA&@kx?7tNn(pVea+`RHWg-Xc75#VGs>iLDUKu^m$6`aQALW>Tk zvU}G{unw*T>zK`h=2LORq&#ven*lb7gqTqNH#fg7rGUyX14-IEYcWdw;TJ+#eSF^? zIs#NHgYkIt5{Xd;VO4+~WGD%+EI7@LI;a%|9PE?(15qOfy~*QqIRe=$Zh*ikZ}K3_ z6Ad7e@&?E^8e&67gq%q&za`M?riC$>9UC)+xe4b-Lk6hTIYb_>jmS$Qr@L{mcFej% z2VwwZ_ZMP;OJcxs3#rjM1WGggBgF!<$3hSq_Og`h^x94gCZX-$jHbK%;U{P4=v#9y zMLn=|zy0r;WVQGYD+~Mys79=2o&!enW;P(U=hpr4MIeu#8=&@c5c$;k5P&E%7^vW? zSV#+2J-^;x49^2Hi3cT1Bgf5Y;Oz73ftMl}4ewu!NnY09&;8%g|C!=f(-lxRi{P_) zy4r6AJ0*a8I>bTS(0nDv0srb;{!qDLa9o}GfBHs?JkKG1P%d)dvv~*<58ogQjKzX8Fnd(UnKtDD0- z{}y*U?3e(VqE)4>Z!3NYl(jQZ4w`wx&k?vM0Ww3G-df?fF@Pxsbd$|DF&?m9B6JXS z@xs}X8{0r%x(hy98}wi>uX4%JAZO)aaDE;Ke@a|$o8O5bTCd9+aFe9GA1#V)7l6Na>iU9%>*}# zn^R)~S6zViqun6|h`Y4^5vPUCQ`VtJ2 zr_A`UPEbIz;1+AMSQf0C1{tHzU=L?97p?%^1W=BfnR-^px<8~rtVkcoOb79*u8~u* zKON!{MvTnAt$uk96yPoPe+OV52736pDZL!*#X!%v>46v0p`HV6lz8yM0hC4HA}B9} zy!|2|&#*W#pLFL-^*jYr6rLe|N>@OlD1A!OT&>twa8_1oJz52|NK zGwFgsOJ-9ET!D{et>5HVWPui1$cO#2z=8EoKoq@SrN0EIn#BlJ5DqP-=Yo%10v>~B zFR(8HNtcl!@KOXOxE4U@ognWpqcH~uxgMX+v7`#t`7Jibw?$r>2Z=Z%ua-gj+c&!2rdMk(C z<Sx?vBr6Tsvtn7`U>FL;M~0RQYuFv13@wb-r&HxX%<6* z~2KuekChM+3WHFt~>y_pJUgm%umij|wkPF^?mxbtizB(&*0*q9_AfnCd zm}WIZQW$wB1o`2uz!jh`Z#zO2hu?0;tHaq>)|;*rfv#(jp^sOfy=ZM{ea^|50AoBa z7>qVgRBv_2tfBePRllC?|vMS7lSpx`z27S$yGoFkGoJRcoPKyzH)Wlxe5e& zbdL;y7gCU4yT*JCP#0_eP-$VEIy^nxRl432lkbek<$`ifVgC0am{dJk2)wz1;qMdQ z9z>sLGa2%1#&iCCo(!KenZF7OrfcuNf3X;9LHLDW@P-R|n0S5N;pFQ;)yp?zC}|43 zk%NB}{Au;iGkN@}*ZFy%(^G(+ws}-KF!e_Wf`f0Z>vJjs`gVUJL*Ts_yVzBl^y6^sCV9Rrz8deOEA3Hv+ z@v*1}Lt2mizYnrOXDf!t@7wzhL@8yt7~p^)0vjw&Ufn?+q2fw`io8eb zWbpP5K6<3Tl6NM+R|v)GS*B zGsy_(WfB__2-Y7AWPY%Xf&5JIDWWBj1)*}ml;!Iqy@AV=oegNJN^pOq z<-i0#1P0ND@F@pcnytyu4jTfwo1stx0yWr>AqQsy80mqP|0~mKLz;@h@MUP^=DHfK zxeAoT1Tohalw^oOpCFNCzmifH6i9wRWeH_O(-@?nbs#}2rv+`h`_dWK4}VA?8bJeT zNK`+PG-DB@(Z_nuN4MSU;KF#H=bZDNbKdv8=iK*Ykl6!hwpxW&GaqN+B;`|sT!KV^ zW1~JRl2Xh0sFRSFMa+S?v(}C%q+s$n8oj%kc(Zwryq39tye7YzT4d=mY6i*i%66tk z`mtYCEm(&rz8`7VA=*s)vyt-4IyLA)!*ro2<1Lz<*{x3?_g_<+8OcX4u6lH%-S0d4 zJE86<9!xmt_u9$%MLyZes7tByu{IDCJcyr3zfc>WA<8>Ab@PwrdKrt+2=C2HB1+P& zc21r2!S1Ld&Ebz>-o>Taig4Os>YEk`GyjmSSL=HRr_%Be(xeEh8CX+R(2ap!;>p(x zxW8BBo5&0B*{CxLMz!~;P$qE)L|46zOB?)nRjq^m+SJ;g2P)q}To27g;_?eCyyr)M zneHSUl_x97=YRN5itiaz@j|A>sQ{!09;?!Haz7y4{wakPpCmzXKRPr7g_e%vi(kG% z%OPl~Em>Ia(>FRD#K&2>*%@Q)(K#626bw)M{k_hwZDb)+K{2(NAT${bY4J3I+Lxra zLRko;(g-JA42f)ACzTdYaOrpmcPy&KBd7VOmF^`2L<w#NhutuYMXiy@)`*;SCnhhCL|4x*{9eGNZyITzT#Ya6-9%eu zlfcn.openapis hy.common.xjava - 4.4.7 + 4.4.8 jar cn.openapis.hy.common.xjava @@ -54,7 +54,7 @@ cn.openapis hy.common.base - 1.0.178 + 1.0.181 provided @@ -75,7 +75,7 @@ cn.openapis hy.common.tpool - 1.3.5 + 1.3.6 provided diff --git a/src/main/java/org/hy/common/xml/XJSONToJson.java b/src/main/java/org/hy/common/xml/XJSONToJson.java index 27b9bf64..e51da96d 100644 --- a/src/main/java/org/hy/common/xml/XJSONToJson.java +++ b/src/main/java/org/hy/common/xml/XJSONToJson.java @@ -39,6 +39,7 @@ * @author ZhengWei(HY) * @version V1.0 2021-12-09 * V2.0 2022-06-22 添加:支持特殊类型ExpireMap的转Json + * V3.0 2024-02-05 修正:Integer、Long、Float、Double、Boolean、Enum 按数字类型返回,生成的Json不带双引号 */ public class XJSONToJson { @@ -226,9 +227,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,boolean i_JavaData) + public static Boolean toJson(XJSON i_XJson ,Map i_ParserObjects ,boolean i_JavaData) { - return String.valueOf(i_JavaData); + return i_JavaData; } @@ -245,9 +246,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,Boolean i_JavaData) + public static Boolean toJson(XJSON i_XJson ,Map i_ParserObjects ,Boolean i_JavaData) { - return i_JavaData.toString(); + return i_JavaData; } @@ -264,9 +265,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,Enum i_JavaData) + public static Integer toJson(XJSON i_XJson ,Map i_ParserObjects ,Enum i_JavaData) { - return i_JavaData.toString(); + return i_JavaData.ordinal(); } @@ -359,9 +360,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,short i_JavaData) + public static Short toJson(XJSON i_XJson ,Map i_ParserObjects ,short i_JavaData) { - return String.valueOf(i_JavaData); + return i_JavaData; } @@ -378,9 +379,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,Short i_JavaData) + public static Short toJson(XJSON i_XJson ,Map i_ParserObjects ,Short i_JavaData) { - return i_JavaData.toString(); + return i_JavaData; } @@ -397,9 +398,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,int i_JavaData) + public static Integer toJson(XJSON i_XJson ,Map i_ParserObjects ,int i_JavaData) { - return String.valueOf(i_JavaData); + return i_JavaData; } @@ -416,9 +417,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,Integer i_JavaData) + public static Integer toJson(XJSON i_XJson ,Map i_ParserObjects ,Integer i_JavaData) { - return i_JavaData.toString(); + return i_JavaData; } @@ -435,9 +436,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,long i_JavaData) + public static Long toJson(XJSON i_XJson ,Map i_ParserObjects ,long i_JavaData) { - return String.valueOf(i_JavaData); + return i_JavaData; } @@ -454,9 +455,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,Long i_JavaData) + public static Long toJson(XJSON i_XJson ,Map i_ParserObjects ,Long i_JavaData) { - return i_JavaData.toString(); + return i_JavaData; } @@ -473,15 +474,15 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,double i_JavaData) + public static Double toJson(XJSON i_XJson ,Map i_ParserObjects ,double i_JavaData) { if ( i_XJson.getDigit() != null ) { - return String.valueOf(Help.round(i_JavaData ,i_XJson.getDigit())); + return Help.round(i_JavaData ,i_XJson.getDigit()); } else { - return ((Double)i_JavaData).toString(); + return i_JavaData; } } @@ -499,15 +500,15 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,Double i_JavaData) + public static Double toJson(XJSON i_XJson ,Map i_ParserObjects ,Double i_JavaData) { if ( i_XJson.getDigit() != null ) { - return String.valueOf(Help.round(i_JavaData ,i_XJson.getDigit())); + return Help.round(i_JavaData ,i_XJson.getDigit()); } else { - return i_JavaData.toString(); + return i_JavaData; } } @@ -525,15 +526,15 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,float i_JavaData) + public static Double toJson(XJSON i_XJson ,Map i_ParserObjects ,float i_JavaData) { if ( i_XJson.getDigit() != null ) { - return String.valueOf(Help.round(i_JavaData ,i_XJson.getDigit())); + return Help.round(i_JavaData ,i_XJson.getDigit()); } else { - return ((Float)i_JavaData).toString(); + return Double.valueOf(i_JavaData); } } @@ -551,15 +552,15 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,Float i_JavaData) + public static Double toJson(XJSON i_XJson ,Map i_ParserObjects ,Float i_JavaData) { if ( i_XJson.getDigit() != null ) { - return String.valueOf(Help.round(i_JavaData ,i_XJson.getDigit())); + return Help.round(i_JavaData ,i_XJson.getDigit()); } else { - return i_JavaData.toString(); + return Double.valueOf(i_JavaData); } } diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF index 41c0c160..47305a81 100644 --- a/src/main/resources/META-INF/MANIFEST.MF +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ -Manifest-Version: 4.4.7 +Manifest-Version: 4.4.8 Created-By: HY.ZhengWei@qq.com 2011 -Specification-Version: 4.4.7 2024-01-10 +Specification-Version: 4.4.8 2024-02-05 SourceCode: https://github.com/HY-ZhengWei/XJava SourceCodeChina: https://gitee.com/HY-ZhengWei/XJava Build-JDK: 11 diff --git a/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.properties b/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.properties index 7d7b4c12..b0823469 100644 --- a/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.properties +++ b/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.properties @@ -1,3 +1,3 @@ -version=4.4.7 +version=4.4.8 groupId=org artifactId=hy.common.xjava diff --git a/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.xml b/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.xml index b3850dce..a0dc4e22 100644 --- a/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.xml +++ b/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.xml @@ -6,7 +6,7 @@ org hy.common.xjava - 4.4.7 + 4.4.8 jar cn.openapis.hy.common.xjava @@ -54,7 +54,7 @@ cn.openapis hy.common.base - 1.0.178 + 1.0.181 provided @@ -75,7 +75,7 @@ cn.openapis hy.common.tpool - 1.3.5 + 1.3.6 provided diff --git a/src/test/java/org/hy/common/xml/junit/JU_XHttp_Get.java b/src/test/java/org/hy/common/xml/junit/JU_XHttp_Get.java index 7a33d09b..fbac05f8 100644 --- a/src/test/java/org/hy/common/xml/junit/JU_XHttp_Get.java +++ b/src/test/java/org/hy/common/xml/junit/JU_XHttp_Get.java @@ -1,5 +1,8 @@ package org.hy.common.xml.junit; +import java.util.HashMap; +import java.util.Map; + import org.hy.common.StringHelp; import org.hy.common.xml.XHttp; import org.junit.Test; @@ -11,6 +14,29 @@ public class JU_XHttp_Get { + @Test + public void test_requestGet02() + { + XHttp v_XHttp = new XHttp(); + + v_XHttp.setProtocol("http"); + v_XHttp.setIp("10.1.50.93"); + v_XHttp.setPort(8080); + v_XHttp.setUrl("/mes/outHelpLeaveAndReturnConfirm/returnListMsg.do"); + v_XHttp.setCharset("UTF-8"); + v_XHttp.setRequestType(1); + v_XHttp.setContentType("application/json"); + + Map v_UrlParams = new HashMap(); + + System.out.println(v_XHttp.request(v_UrlParams ,"{\"token\": \":token\", \"timestamp\": \":timestamp\", \"sign\": \":sign\"}")); + + + System.out.println(XHttp.requestGet("http://10.1.50.93:8080/mes/outHelpLeaveAndReturnConfirm/returnListMsg.do?")); + } + + + @Test public void test_requestGet() { diff --git a/src/test/java/org/hy/common/xml/junit/template/db.xml b/src/test/java/org/hy/common/xml/junit/template/db.xml index 163e9279..1c233d73 100644 --- a/src/test/java/org/hy/common/xml/junit/template/db.xml +++ b/src/test/java/org/hy/common/xml/junit/template/db.xml @@ -2,19 +2,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - org.hy.common.xml.junit.template.TableInfo - setter(colValue) - nameDB - - - - - + FROM sys.tables A + ,sys.columns B + ,sys.systypes C + WHERE A.object_id = B.object_id + AND B.user_type_id = C.xusertype + ORDER BY A.name ,B.column_id + ]]> + + + + org.hy.common.xml.junit.template.TableInfo + setter(colValue) + nameDB + + + + + \ No newline at end of file