From a433c059a999abc2e785d62ce17c499303fc2289 Mon Sep 17 00:00:00 2001 From: riverflow <3011499946@qq.com> Date: Thu, 21 Aug 2025 17:56:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90wxLogin=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itmk-base-parent/dependency_tree.txt | Bin 0 -> 296046 bytes .../itmk-base-parent/itmk-base-web/pom.xml | 6 + .../com/itmk/config/RestTemplateConfig.java | 14 ++ .../wxapi/controller/WxLoginController.java | 49 +++++-- order-app/src/pages/mine/mine.vue | 134 +++++++++++++++--- 5 files changed, 168 insertions(+), 35 deletions(-) create mode 100644 api-interface/itmk-base-parent/dependency_tree.txt create mode 100644 api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/config/RestTemplateConfig.java diff --git a/api-interface/itmk-base-parent/dependency_tree.txt b/api-interface/itmk-base-parent/dependency_tree.txt new file mode 100644 index 0000000000000000000000000000000000000000..4e2785a474212102a62a362529bda6f1206c08aa GIT binary patch literal 296046 zcmeHwTW=jXlID3{VE=<3yD>OYSr8h@eX8jPm2aggTlQFTm8&to zeRt!_Pa!fh$xKEj$;>=94C{8t2r?KEj2p@S_kX|J{bBd-yWj8rwENrc$?h+^7rX1- zt^B)@|8L|kuXpcvALaW8`TBnMt+_5 z*|)n-GTXPimom#g$t+*W=O1^^cm1CIzuX8d-tB&pIe#xO@1*BmD0MCUUkUy01!9eV z-wDq5GLF9m#vB^qi>CEE`FdMrd{2Z&er%|cI>KLse&1Ib8&{}3!ruvPei7=tmG9TW z5l$K)1@B~J*YerT?pNWRTlxKZ_j9x2&*hUJWZmy&Mec-$j^&^G^r+SANO%yijvH>l z3f>9Cd-?uR;2sNvPeKD=c_F{yuW#f#`hY`!5Lln22jD|4-^)+mKXUS3K7S>BKgidQ z!joM#J_Gv`gKK>BSI^R)oZW7b)(y! z?yerz?^xFOx6LYcsk{xzQ5kA$@8jLG-MJ@W?N9g3r&g{%6^Q9Pe=6A1dpvFA%C&zo zDpyaN`MDlrvWpeBjOav0Z)<;HYJb|9@!0s?OsO%_b;wpV$b8O*^!s$9?4Qeyak?St z|55flShe@UU+!nvZQO&;WjDHf*qQpD??q1ZbF0Lo=d(na_uJ~8md>M;_pSzB%Rc9* znrj8XnQe-ZH?L&3qK@7AzO=MON2`5ItExr!OeDy*x25;s-sak;>}}6P)?JUWS)4RB zu%-Q(5&osA{ps$+*xokZGvj>E#9Ft|^GvwG(*E2y-*Z`83;bt|t&qOHwEZmYmHWRG z+hQHs3A=z>C3xnDyIjf6@XdyHf!E@d|0*$uYx(+8tde7iyt%&&dGN4WunRtIZ0)pO z`^MJMURH|+`d)X~F|F#iJv58Pr}a{62JUaunEZdSDc^jIl739}xW&6&Iq_T0<8t_x zY1RxR5PNlckEfmXsn$$723j+g_K0*?+A|W6N+SpPkaowKd`mxE>8<HjM zV=sA)mrdn~pV^03cqRWKuj&2vjW?`@?nvyc4Wer&T>-r?9nUHwH)^rXhUfG6pzHUg=7MQO6c(S! zyc3q#OR*x?p9#$?uhS*8Et9rb0enr{&X?W;J0E7H7*b>szOw5vCiRRKTH3>6wzP+@ znBJbz0ZV(^d>v$JsINLJzvW2zfnM^d&FsW8u}rsAJ#;O0IcmmHRg3DC_wv*2?(g#b zw)gu`t`5G)N%J3GY8y_x-(IXP*UxG#_}QT`J>a+1y*phtsF&7eXKUs38rP80;j*b} zX~SpR!p=Q~wuk~bZthEg|EZPNU6yH#)4$A|9jj~Aha002;#HQMprigF?5eeR8#=(J z9Cyfb*)_MT0ouCuL~@kJvVXcgbT7LgGG?|DBd}6!Hgj7gJgdAQQy zukmrS#zX54&iAQ8&PQZ@OXo`3b8g#o{oT#QauFNwt!{tcOYhgU4b!||VIA_oJ=Rg1n&wRQ zpe<<{(DME6zl10CC+2~09`ud;ziplL1m`0A1E20`lTA+P#q)ozmvxUOwzOT^Z+mFo zrqX(ewNkHA?R@nr&oDZJ<|ADYrxWbuma4rPu(M3kF-6~(jIn! zr9JjYTYFOTkoLTgwEH|bmse>iD<7&n!_v??{54lLs3#qwlHO-fZvV1b#7`e7Iwo0a z5vTW{MeN$AO1tYZHYV5d(50&u-$3$ws?u`2c-#}VA$PB&O6Ys3EV^!P{kRj2{gYUd z_u_xzeunmM@jL`0x2P##m7NbG-iscp_OjZOIHROC`WW~7Z4b|$T;Cc(Hrh1T*ro1N zhbSHG3cX>OXt$jw3CIbh*`b=-NbliV+T{jPxz?N??klrszV>>}Ut8`Tx^8N>J(b-< z|8|HHG92U7ogj7B=}JwSJ;&Gr&I&4}$94~un)DvD=Un?#d(QP38xtd(miCCzTH2$M zKfV2_#FT99k@-o7k4h0+d)s&r@w33^S)KIppEogbOM4srpBd@@%s5}1CA83o=X28M ziB2S91%Z-p6^|_&Dvq#eEgjDC(&R zTTlPoM5>R2N-&MzU?))9YwY`)Ev|K~0Jz$xvRYs`HT{*VRYv0S(B^8J72XyP)(Z@P_e-^sWf8G1_G;kj4i~E$uUUU!Ay&rW}uxZzR9$2$x?fNq33*fA< zs~ec!zEJFO3M=-&wC@ZVOoi8WPgYiuX<+a8*9taTkB zCvCdZ_j7mZZNc+fA9Zck@@aCGOKs)!9$Ja1d9+kJIUR#mVk(9)Ip>WV7Wl9e)7#TN zwzP+hXlbuArIt$H!O?Q9*^;%&5Hyrq8{NloWKA(DVN7PRN6;hGb17pz-0cIYJzyQf|Iqd+nu* z$T2)=zt7mnXmi+lKv&p$!0xd0pygrf0o%jUgONE~59`bsnX}+vWX{&ZI&((mEI1gM zv-DtO&enr9)9F&h$eaZSBXhPMR*7O{&VqxHIa?3bi>K2{BXbrk8kw{8(Q16l*!Y5y z6^~V`K%=74!G?$DZf$*FRa^0(4&C0zPJ^=vG+@PtjRt&)!rI3wZLmbK=iBh`o>prg zyUg*fRvR8xgV_48BE;Iqs&7$oXQu(~sIjgO-X5~`fgNL&IrOp09Qs&g4t3sE8laDz z2COKz@Bw@WI}Mm?wc)YbbkNpTe&d*|yyNyN^+y-_X;VYl5~)tC82U zn&~~RfoAuqPtATQ`@Uuu4p+0|o|g~u|5k4M$JZBzeBgNBwvB76 z@o`zTF-_|1E?uv&9%^@K`xNaC=}#Y%Yxz~0$N40l7aZ>!;<0dUaBF8Ir`1l3Q!F2~ zZT1@IpIWu2IYLVxt=@N7Qsf#|g9Qt7gti{k9d2A>`bn$z(|c(3zNH5uYLIDZow?=+E!5H+p{j?gwA<_K+lm?O0IvC{xGe>Uz! zMIiDOwy`lsXzRlqp|y`y+B8RK!=rCGT6k1nbF}o)_Z)3~>@;AG&_;txv%dA=f6b*J zCsN-!r7z(4$yO(OSS{v_r3J_r$qQ1MSq0fHfPn}3Z-!m*BgPT*yA{n75PT+ z{zc~gFS|d>_kR-#{8jo+{r8>dOZXXo3(ycSU(1Z&3r(IpocuZ3eU{(e23n_4JKpNM zM;uRNH1T$+pY$o-{|jL~Y2~QKIsduPODnIRHz%!L30HuB(f76R%O{}_Uuwje_}|KB z|1AH<*O%kLIJ+4jR8>RKE`Th}$`y8)Vz7srn z{Sq`Kf2a4-jNz2CX^2Ky@)FusB@L^jKaYJ6t>`P^7GJ*nm2oTfbv+?h{#xn201IS0 z_c+93MA%Uvdrm6G`5(}3j55PMQzQnGskzgyT;E@>y=c{(>j94UX|5a(zvB=%{-tpH zXW`##;b8akzS(_l#rkse#C`yOn3W_$ZFy6iwoR=a0c6cB96o0|`jw_TZFxsqlT_|>r|x|1`)AoH-isv$J%qY7()zbz>pc-I4V#8BkhF>m7mH_m zOC&xOgN~k7Qo5XN(`w4Y8(dXKIp(@gL|f_U<3p67y?6rPZQcp;CTS-K_xQRWjQeY0 zPA$C#vAqHHwA-<65HW(c|3l;L--*tJ7yC-=nopvW+rROp9z>0J2RmzK+pz-Femnoy zhn3PBZ|Z69)ZGOZrhh-~m=CL;uURXve^tQ!KIPRiLLTDF;eJSnTSwbpao@>8QJa#^bi<-#V`JIW)|*umSB{ifW>?sEdmPrS{NBkhV{W1i7}5 zgLD~Kv#w8(fRr@_hr9JsJ&l^H?Q%F?>O=JLw#nPR7fsB!`w)q|X)K!d?|XTz_ImfT z{67~99-5rLaW90`lh&SgkNy5pXc*&$>{_QHx#>NSmGj%D>?~R-m^LOi7E10R?nGme zV?S=H3*SC^?>CLzh!~>ZirI}&D`d=RAv&0`*39;$%NwLqt&a4)g8SC*WFEf==OOQS z-Q<9lt>ar8?ZL@DeRXGWw>Yoavkz0#=U7-WT^G^e7@8C1M$&E^B_|tfYiy39qLi^Q1?OLs|zSHU+5RKC8`_{Q~OX~s&@M*6S z@Fi4w-is963(vooofK9KP2qT@|B&v}HsLh_ceiOu{@#Yy80K!w_+4WS-8TC|`}e)<8K|;DHW)hwB9XBc zq#5`$%{I614=xI$8fHuaG#0AuzwQsvQSBA%{yt~TWBMO=ENs=s7^Bt)@hkM4GW0WU zUugHijjgT?Uiw9*%qArlB73CZ7|*K}mEMC^lxv?NCCC`K9%EzT?Le0HprWNc?ypF1 z&wGI^?NJAl-kx^?S=!s?%Qr*P;qx{iOMBaVc@t1Ne7+Tu-k!GrS=y_#9BziHtz(9D zj$JQ7lRJ8=r+gt+z;-Qp&0LUj(7(4$R^z_0eEd(L&uMGZN`c+e{hTkh>*rQ|jvYWL zIi@}Rwuf!U`!vQ)1tnGpoZY6V)#`b z49@EslNI$D(tBv+RsFgY>0*_U_81$J8_OZsaKkG+#sO0~h0>)IS1S%xv08nw=(uJj(GFt3TVnug|A(*N5t_fFE&4U!k}^yWKrLoo-#KhW*(t zHRHYJNx@ftw)PE*YvYudKkH(t+q1Y+vg=wk#8bq4HwU}QN7-q{YmNH7!WsB6yOz;d zWNL8UGc8}H_PMo>!awYY?0VK7lI5?F+Hmlewh$`{+i+?0{YmOp)2mkRvJ4Vxd>i`b-X{{W7=oO(pWrypn+bySav)UuzQ03OK?}y9H^J%V} zt8`V)b??9*rX}z5qpzD0VUAn!@m|w8`m5y;r)ti%P)=8RE2kqWzn!X0wFVX$KK%1fxzWWLF zC!&#QRU>+O53x!Ya~P`{p~aor!@*XsFP-<%avSlw?n?C6hMGBL)xgz0)m-i27Ak=$ zMHa0&H0=`X>)X@w4I0qsx5SQ_Bl@dy%3M|rrAM|3q^)fY1y{XyKQOp*rZGI zpZKmiY)roVw)UNava;5_1Co#)6X>qM+|>fdx2a2>f3~T7rGs@QCrA&^zz@Rl}G1 z_q}LR+VyF=7qXzc&!OnvX_Vsb?5N@NukKA-;F7p>`udXDTx4wYo?_h3)z+!5jk{Yu z{k9nJmBwffg|BMSRyk4Wr<{29c=OJoaAKVMbdOHwIQ7-gLn$}5Py21ZoPFA90t@}Y zm2G8NU(0UG7swnxwzXupO0*x_rT%iAb2nEuhTpx?Zdi+b>7|u3c)lWN;9hx47~F?UVW8gVpK{(bs* zAI72ZFSU4xYwf&>9*pi=Vp+^Lr1oIe`{XgYl9JKDEgG)JnDl5yBXvX$GGz_$RqBSn zqvcw2iYa!Mg?AuRKBXv8xUod*u@6O}+OKXnDQesHegwp|N!=CDLp`H(ep`1|BZcE~ z&=#EN(@*XB%SVbH4kz9<)&B4{Z{>w7oECDt*5=1~~Kr(4&9 zcxM8qDss^o9O~0jIrLDnb-tz6r5sMEd=h?r+f=lmmMEQL+dZdnFd{K}j^fMGt993b z)_|k6a`@pzp?T*A@@2d`1fJlpQpNDD(HMB^50=pN0H4Ei9PdAc+o5CpXo}Ow!#{0b zU#HPDu6xq@ht@=OyV6}b|MW4ha5&aSH+~(bXSZdDa^Sk53Tkk(-hB6E>FzG|=FwR> zRB5Rkdh)0%4u?ZgzxhclW8NbJ4+K?bF^ePAdJ3n0x%ul51?SUStqIM{D#xBbR-bHv zWADU9Kvfz}xPFj5A7j3e|DU{{_6?{0D4!y8xR-XgTjsO0fp16amH8O$JJf^uMCJCh znjVcuv)0-9dPADoZ>yHYp=juJtQsVsO=XQ(fAbhA-MS1wM=R&!tz>wKFNFJtq#)L6 z3g<&k4lU+3#J#2I4W9LBs#^PEQ+CEQ3gQ+H)F8KYw$H8FVk)O;D-&Tpy%WpG<8`alx zw>Lol4S8Dbg(Ic-SPutVb#J=GuvKmBxZYo(sjEmGtn^l%$9aE^@g5G>`<52(lIvTs zj=JI2b0h&Lt(4MZob9)@^Y*%HC5CK`G5W{&Jbksm@onld+Hkq497Y-q;gemBdg*Rahqn^{*2q`)j^_=NFTubG6;Lx9kzi(9rO0R3oBH7mMi`II; z^vWT>_A*b+kXDMP^X|Isi?z@moQ$lN(pPmn-m=_|N0~;=YtiTTa*qY#ZqVHyB^vj$ z#n$DRT2};+F>-NiRoT>DiLuKVorKDN}r;q1k4v#x;p+^O`NLuGKMPf6v@bMY*;W3Qr`_pRu|53*aM?ssTE@5(f*ef=JL z$yiXkDrfRminRJ(P*Z7lD12FyzRHnGL*>YAo$pDfm`ZPm59vKwxKDkjlgB6scre9x zO7EdJNVxMYV>oc@2ePKxW30X2Ad%jlcVMKq*Ov7D(&ZE_*XsL~;yFsBqZqxuQ(4U| z+1K&-W&Fk`RBOJIf2iu*HyK0h3wrO|UVefNe&58G^=<&@|L%QWHaLtp6OJ`z;@=uI zCS`tGdlY2dcK)_k8xq%E9gVbX>lKtKtI$1*xfl8RD6)swi(Wrua!^O&;@|#l2;;q( z$JgFg`EuFzG3i2m&uQZUsU1)0X|W0C9i~c-?qVm&vIhMLUr#YmdWNJ^y+iFWwoj^enBHDn9+J1$ z*79wRN#~&XJV)=)QCPi0SXk?iAhzk|D)Kb~7?NK-6Y00X9)`+hNbxvK#ueEDNf zq-u+d$q8hawWO&%D7((bNReGD1|7>G$l~})r*H!!fb+PAmaC(!O5wJuq1rml`E|$Q z0rCzn-u#cd7~8im_CLqH9h!xT*)K!A7==;W^v5Rp6Y{c9i~L43-Rq{_@SXgGcd>5d z4w6suiJQZ7`Q!)jW$&9T#d8_IKZB!IucHSY;^vLh6892^!rf`Be^>HFoi#wwfDZ+atMI0>1ZFDb(i#e|6j)bdLWJ z4|KO3kxx?ld{G)t0YLQ<;92V|zSbXLrsx4ipQO0h9NEc$vj5xbGd(9Gs z=r-0jPQf9oTz!RSkDgeHy@7~VdJozgu6?S#;d+dXiN1oRJuEm&d%UZe-u|@l?=0<+ zIZJPk`@n7OZSy^oNSFmaZu+pbx6Rj4<`C@3={xzD4#=-RU~&4?*SO8qrp~b1Z6<1I zRGGwgGHo+Y^CHhq4|+_?xmydydYtTjyMra#@9|{!-|~0W`s272l4}`*;743TJ5CIe z#-1F87#(5|)Sp$V#P^pt1lJeyh>hU%fv#?>q(=95r7zy`QEzQ7Ok@hN@8*Pw`uH}) z`E!5TL`U+D61!1Oh=7$FB5PCftvBwG%{xZaqUMHpkr^T_o1ANXmYpAI9pxM&?WepD zS&NmAA7KUL8l4B_UHz?G-{GJ9P9l=ONUi`eTD-aPO8##%=Mj!F4|((99%0{}c{t}Yx~Rzd zbKx3&Li7SF{DZ7C@5OK5lJEbOY3^ljKt>rh zVZ04c+H45un+})_M-U(}m z;bPv?VUT9-cJO#qG(H#7(7~|J#PuabV-Ped-KVDyp&j=hJFSoo)6qL0O!#@UqJsd&8{^t=?_C9tCUno#??g@*Nc`*yCBX_x5qWXFUdLLH$;-N^bfR z(EBN^=||v1)3BY8E_W`+gt)+P2J!5{)=SqAsO(m#UEPfMcP@OYJ!;|8-7sZ#ajlrqt zquYt1v@1)v%kU&Q_L27QIOB>}2;o^G(t&JjtOfTA_@C4F3)=8q&BI!`6iqO+7sX)n zoIqO^L;mm-*zhyUjGLM9d9dAirS`s=2R8lk?po%7P5-?FY^^vb1Do-Hy0C$B9-o{^ zfB575ahHQloMpy+_Hg=Wj?Bksa@Is9=Z-rpJ9%J-d9Wnx^Jd?eOOx=p&zl%q8Q6H; zYOd_yzOs<)h2j6S`~!baS`JML6})7oyE{%P#|6uc$G zK|w#{n)$VT#!B17GxzN%7^9fT`lu)B@}}J=@mlkldg7GcByNeoyR^vH!wdC4CG`+H zWc(1k*!`UMP3Y%i9;jwO;Fv1-^D>W#;utJAS)RJAM?MpJzp@o4JwxiE_A zW64i1J*8Q4O->qbwDde+&6mZ&$Vmzg%?{Y5q>qEruOGs3YHcKYPYVaJ}lHthcWMdh^3Gnsd2?wYGaMVeNeKb#HJU3_dG#oWXB z9z+$blwTG*<7>9Lhx1WW=Ds9$-m_#|cgl1Qo?jZf)po?{LZ4aY4msi7PA+Pr-eN8M zVVeRklUQYb%KSmK(B57Te=JszbNFu^V#h-y!q?}3*NJg zc7hFWKKp=qqBOobYob(n>@o{pz3VwgJb?M3wD~TFH(&hW!k{P5oA^ea^|j#TJ&(EY zrt9bB@P>0YQ~aBYCKr>&&(9)xo6>k$OJ09{SqoktFY8j5z`G1zT`t5|ypOX!oq20# zZM?{6=ktrx^#<_fv+Hbl^VxM4yo}lBSzp#hr08cvD)YsiE}Ol)K3={5YTO^pJKw8l zZnf)|<;EL}ua?9MnT+MtO5;t9tK_6JU_tlQ=4arI#qZ0~8TV){F<(%48NAEzRbD+c z78gB#ycH=oUfi{&RrIJ5(AaJ)QfeJZYQ%xD+;Ss)Yqqa%T_IUiH`&R?;7Xm3K*b*#syR}uZOo^jOFr--+P<(98w)>@bNIQXV!&2fbFN9}Piv(uN` z^^BwDK8M=xa9o)$q}JmPW}rgrQkNblk(2JV>4BU|Xy30r4#szuUzhkeYVP}pCWrkw zzW-ZKUKn2ptxH{c@b&Taj)ON>)LfUaf6JRBmLG?ncTOFN=9riLj+|8YuF`eBl<8hl z9C}p|5p(Oyi+oMQuLI%Dt~dj9vDp_z-pTu_KR0)|`nTNrKkwy^*PG^L5x!q}+q}z) zdtN^_9&qfQ+<33>&AG9>r``bAuLi=~(&1g&DrKSDREO}!&I**r8{Yj&=`Q{Saq4Q#i?Z-K>#7-C?W|@y-Ls-JK0#kTw2urvUU>cT~9)qOh z;W22wa1}7tB`21cZJiSfIVmLjOJl)GTC^qn-tg_a@pWM~yF3=?r1DsxldM?6(WxPd zO~C@Gu<#hO$hNthG?jv^RrBn-xeXr!pk|AvwpGyra^hIpzavsT9 z$JeD67W=+`9;urdnu{F^qA6j`A6tFqnQiOxEE-kFiRB_{jpxM@^DCFeVzO14|KNU~RQ_eddzOiT7XQs`EuYr}u zgVR4T%RDFDfG1{~=f)GW&hz34z3PWk<9YcSR!z)5%R3*QKP=C0vHG*zbc@xO)x-l0 z+xG{i=mW$K!?*ZjK6UW$e#U(BiRtTlcrb!o^WjakA^G7wkLB^u1ImXdW*_Fp6SG6| z;$ieXv_84<#Q1s*c(9kG*rQsT15b3ye7blTJK~Gf@YBv8>bb^hlBVH@hHcNYHh$PT zKAmgh@A@6}{UF*!X_t z8b+m@vaV6-Tcb*;IRDgKK}RE2hmEga>=j#_l|d#rWJ9F#G`Y%+DP=TvOQYmy?Dj~x z(ZuT&msly@`f0PF%F!nFPU{$O_PXj)qrv{Tj+H{)cg(M^FX0$X zEZVfhXlTc;Wu@@u%zF5SdUY+d;XSA88I9d%EwxYK-lF(uVEF)ZyT(FmJo+9a>?+@X zwpv@rlg4WOn02l_nz-$^1a0D@iN#pU@eSj;VVPRfXqbDi%QvW5rMK!N02Kf^N1b#XQ5q+4Yn&FLu&u~Rqf`5|s5=VQsI7Mt z)Qojjgqh6{E!Hs#MhKRrh2HzS^eAZCEISI#y)8Y8HE`$ILtRf!TCgH5q`_m7T4ofW z@6w~-YgEgRqU$kCU5PnXPTy~djY6}pIk_@~9h$knZ`8rgx`p*&&#$5TlxK}YXzn$z zGd8t0?3!gM%k#0hyBvGhdQQs{g>2~lx-(|br+ggy6h9_}H!SI;@zU3=KVSNj_3?7& zUji@o`ucdeyDxz^Tro1t&$@Tl{0{lu#!Xer-ciBZtX!o4Z~cJR#u&z7-uc0sK0fW< z%I#JA-RIp8a>jIFAKTp@TCtP1Z}E-QAvurjQ#L$2El>kbxZ=*~j~w$s zL@Zoc*Tz#rA8khu;f|tr%^f(ma?{)KuKoMIx%ut0e5H&aiXCe~iNMWzKgz9gA4QY= zrsEH*mce<8FHz4hLSWT2=c228{iO6=Bae|cj(2Z_tKQ33Xj*d2+vevN!bvys33<(L zwQu+;)CzNlT&J`qrM_wLU|Z*s2LTiJTm5nOtw6q$ml{LV#Qjijq}6NTW=P2s;p?|D z{$F>WBn?~+#r5|ax7l^N9bk_|hftDYd)%Yy9?&NRUUa8k@?{i$}uEdka zmo9mZYRZn{!w6T1wzc^1I6^P{;rx>g#?)O)&oSct$}t%9f3^19-6aZsEVWaGczvDs zxjGs1?Ji)w`&Km13(*kwjdr5m?COthJL-{> zM=cC~8MeEUk}LNb&k;r;B3p%fGj!b=nLa3`+a>{FwRe>sSXV1x7f6 zVS^Ela#>(7PdINbxKA+@jj@b_Il6h{IBU-N&xJ9Srf$z+c57%H?L7xF_VhuA#W=@7 zXSSjo^s%*^Gxq-dV;X&SIssOK?#4FCJd5o0jt}RJJ**+S(ETy1{eV@~pYweO)WeCj z#o|2qVng(Y9jB=`tg^QSKjd0GhikD1erWu)i+fR5@~@SMVqTPahqZ)K{^rK}H(>*#bRI-8=Hoj9kF?B}361HTAbdenkcZj+i>V0%z^fD?p5A{ZYkk zCh)EJ2FRH7bA;{_LDO($_uBeg6^hrYPu1Tad^^MUF%k7sS&i8q=}^_T%nOxP zf)6up|D}(WR-O;F#9p%I9i$x%Ny$~kqD*-!1GuL++dv~t%BNe1G~G*X`X|{>u%q0F zyno*PUA`j!1pf}dQ7=Lhx(L!*cZxQrXsrPEK-2)-N<8gWa%`x;@jpe40CgQ>(%3n> zpHsi-=SmImKwFEE3s4h%xckH>q2Z0>EI~(9B9SWH9oDtld##jmF)jYot8&1ajO%^Z z1M6n%0WP=nz*<{-AfsTx!B@y^J*+e5o1PXNe2vrA!#Z=mfN8;jS^*n%`Kp8k2k&39 z^?+Y$>A}1EZ9S|r=j+`T9DLu(*26k;-0y-|yafyTSa}Q98EUd@czEB7wU1S+AZ}>Y zE9hgV0Z*8x%txy;aJO)mZrw;O?sgiE<&HyBn;h|}`Oq}K<6y;Y@$s=~q}4%-?Or~t zu1?mtBUa5i%PvPvhsAezd=8ictIL7;VX+R!MlZf;)1M>n9nS>|Ymx^Rt%_W*?EDp@ z7cG%I<2n1 zaNeyiyVIbGTZ87jqAjm^W}*NA8!pRgAeM{m?tV~&z0|%)W%BRwLVs8#QIpFDQjb;ms=kz zeBRnvQ9-x_)+M-!FZI@@Fy1$+Php-VuRqsR?XT~D=CCMOwdl{aZ)xc1rq~{sb3Dvw zuYWwgMYIO`(6$8KbTn~Gsm6NI+w{j%hkFp~=yT69qhS@mdPV~udhMfO9HBPfTsB^G zpEf6te^;rh!Nu{>=nk=l(J-!2f2EWL>i=@TT4pqidG`5c+Gt?IPK!N|202GVIb6?Z zrpJ^@&}MoJYMrAA@0wG%7KKXQDI(@We+r_cT%ZxqO zUoWluUe9>I`F=(B`A zjE~3d3+tc{E1dG|r~Pxvs^z-*w;}p;Bh!T8=$7u^@b=&oJGIVucoXrO#sk~su*TER zF-+$lP$rc=tgGwqr^}2-PfM+5Jn+#%_RmuEiP>Z88&5ZTRfC_OJ=DGS`KO=PT6#R) zjMviR$+v%{>!0{~^|NHl(x;z4TXsCW138cVlViOuWIxVj&*vG>y7-wlHm_&B;^R?2 zG2LFxv0kz9(Dnq~)-oQAo2_L$>L=D7kMc>|ALL6P_1Ehv5>HreJjy3)p^x&(8peZ6 zOgKKa%zDMg!?$H>^YhSnRPJiZdwe{6zh*u3aduh>`dr8^6!Hg$=%ap6nel}E_oc?8 zcSLmkujR%AE!_9t*Ek-P>$ZL_%g?OJ2+=20rOwwXOY-y3c*6VXa`XxBr%R2eU-3@= zbh+`Yi=X>d@^$C~E(yukGUL%(T>AQXsquhI)GoxBLI&rIRZv54rc@|Ba|L#$V&s4 z16pnby4Nl>0++|Ii~ts1E>4^_f}9#@$_V=J2F%fk(?$T^S#lLP>Sad&yKKo3@U_@w zM*ur)*%2(uiSR2^Z}mvAQ0&r(5iHAzr%hC1Nj|^`mgPi@VA*{EmASDyT)VZor8tqd zdMu|8P(j>%^QG?Ih!HGnp08 zWi1qpU|9LeB8Z| zwl}+1ECydl=_*>B6YuGv=KYvya`{{GLGuJNYg>BIYYTX^xj{YJR|n*3cu zS-b`QQmExV**8@GAb-DYe!3O9{wnXHk2_B zAG^y+Z_-5#M9fm?*Zg#|zObM4_Qo+?ln-O-E|?3WtNpAsM|U@|1!K(KN?FG#7_9@F@oFk7@*0EoAF>P+T>yGQ3sTjfGDYl=J{Ark6^>DiUO~s_O zMWrz@YF>kSjE>jAREr}R?XEE=Mzw2T;%zB)FxmI)Y4XGyGiuCkExU2Wy_ z0%Xe7bdnd4`PLnB3!b8la%lZ-_d&kiHlE`BgNJx4f4LXF0bTLgop2F6MEZ)y(!=@i zd+{t&q3k^-z7=_YAv)?_;#tQ{%&`3z=qva+-L|v@F62{Z3AFVLwLj|fw`2*l zDdb{#?a1Iep&DYcZy&V!H$n$+wrjtapS2BjHrpt@V$$>UL1%+MQ~gWV$K6Hh^K?k> z_x5Wh~=mG}4Egg9@+!^3wpaSOO~eHa7)$LvIRHjfAFfZ6B)7 z-^apv7sA^^n#hI?n$Mp@No;zvy_3hX*t)z_7F(CcmcXX3W##3Pvxgf@yXywN@i{WC zuPi(n#|B=_J2Snjx<9jexTr~U&nqm~b#cKO%{wo>i@CdA%%9i71&cX1F3_s4hfkXN zy*jvP)z`uWkEk9l-|CK8KNcOu*Btxnm3Kxwe_9?3)}k~Py@jnSxp^t3cXgG<0u4}_ zVtOx9*|{*LSb8qVEb$JbvaO(%Fe*{gb6VvxW5`eYakwWp(7~Un#BqSS`SQO68b6tue}BUF=6{ak6DNwv`T3BOy6q zVkXBD3(--=;~nYa$IlB9HdS7Tu%L57r1zQ^BK)G95Lw5Z7h>*};a&GR z$H;r#@c;_Sm7$79^R!#A%3g^b`c`c84`RQS}s?Bf6C!~3#UC3JN z;Kr5@a(C_WLGG?;X~@n?pHAoSnAKNTxN$j+@rKqRbXQP4c7+_1-WXi1Imi#UD-B$| zx#QKGd+zblL+Z=k{P8ja)E%$JMW(J>Y`m;Jn64?}aOv;m9xwIoobfXI*`@DXxSH+G z510Av+;BCcT@NmO>#6*px$*vZ=faKg!#uc}|IR&L&3NaA3r)rxcL~U9^-`zPZgDcK z(FW^Y)YrbWTO8yZ5E-MK%D160GJ2d3qQ)q5LS&56hp4NR=Q~zrdock&*W}LC#Pgf3 zO(?SoPu{n@8A;k!cCQ;px)U$_P9jFfk{d;Y+I=q6E8x{2><`s z#Gh>t_B{w={<_+@eHlG(&OA9i()J|a18cNpOv9wYR$rn7YeV8@MYqeGbV-RU1Z?u{oS$ z!$`?<_~LRG=T$34*sTtuT^eop=$F>S2RW*V4^mVQA1eXo;cMG&!*X8=pGJAzPRVhU z!w0_T>+W*+=r`7yALmhGevAZkwRTB-?Oit&6a5amK1-h&S1D3BJVnd=R|L<1}29imo_4m`n=~b z&DVIOPgxuoZ)pF`IS;;3TXr6N^RqM#=0LleEhnumB(hX`J^0#CSy~}JR(c-1kH73Z zaC3S2d6ZvsL~nQoswDRUOZjz2JxqD61svgBKc~C{OL%w8i-q?Zmz5PnO~STc-nsBT z0H)L4DqVO)AHyuY|Kmbm`X3|GwZI)Atutslwm`Y=OtXh%UIy<>Od0d%a>nkQ~BwG73OAJgQxVAa&4^KvFl>RyT-7q+E`VB>wU+%ZZDs0 zt#Q|rlsQje@G*{!E0yWkCwm@Y)X^LL7 zK~3GCEKoJ0J+Aj`P*WqL7O0xF&O27kQ@5e!*U8(|!SQ&h?N*7Bw^JaV>hh#|KghX6 z$hWG^ecIw?kM{3;weGFl{ehE4?wvbW{J2dKzEWxr_wu}ZSuqql)7vrn`Mr61&hOpM z58~EGjfTf^NOA4ahpT5Ha>J!>>O+m^_blV3H|oR9K?QoB`JrNW&JPv4b8e`tzRnL7 zyK`=+^cM3&EwNhk26K;<-d}#GC02{xUGA~61~fNRR(A;G~{BT(# zSpsgEbvqS1xdeS#`Iw&$taZ!}m-lp)fLlgC@Sd*x9EDRyeosm_oJi`fj0OowLiU zXk;E|1T?a{<~rwY4E=kFw zZimp_!Ja|!XVT73Ar7M%#vE`pKb0G<)=s+7PRUR8>7dn;4sH%AFh7->2E6k*KU7$H zxuLq-fpT(}RyXEdEv;tE4HcGoZn|o<;`mtg+zv*dw_Z~A`%=({+SU>{MWA;9$K)di zK0V!93m>D~KDM}4$uU2y#j!*N>QEEWjr`cOlGSk_d8HIK){E7_rj@O=u(7_Z4mNi~ zj%wtR>vqxj3BL9#iw%}}Eo@qCSZCebO*%E!Ertydi~PDoYazRotc?xalUpmt=Eid% z`LSVr`VvqZ8#G$}xrL>h?-At2raAf$ElbP}_`>@@srk|BsW(4h3iD|&+q4Id(X&@t22U8thfHjN^ zag90gF2XvPN<<|39FD9Sve7l>bkcaaH8AmR!8(}g?0h(jUW+4G@l=C)yjQITrt@UI z=k6{Y&zgngsgH@iD^9es8UWV(@cU<_#-O=*L|2y@gPt>WBZz0*O3^{jq`EO6r>Qpo zGT$+RL#)#C@3$;@Lnf;9+Iel>hJu<2&0KG(O7E?_!}&)3fqrjfhwfI~bw5XS9(MBK zcC5-fk+#F<;C+BXIP2#3)55YRH!vSt>maT zL#^egiILSDbupH)vtxXU8J4k};u!V5hkCrKH$l|HsCPuv#8{hi^j?X2bJQCrYGQ=G zt*HT+na_`rFCz4JDnuQ4YA!cbhcK40HZZ%8wShU-#;CV<(!lODH|Xh&2e|`i8VSk=EO>z8kks%PzO^jj^I98V@~~3q@{R| zH3v23#A<^&n8FdC+|~i$h2t(=OsWIReqVD<+jica;{9{}Sr~n18}&fze;cM-k%r&< zufFsv*JADPrWY#MLe*~JK6{~)_8F^ui@$BcO2Vmo{V?2^g*|R{4#8!8%rp%*40pOd z8-|;vy+RdlLvZ`&xzcy9VYp@1jddgW*Nu03IaCW9 ztA^Hxjko*ElkW7noz33A;k|WFW5*1s^{}aZ$4Cq8lCm)u zhi5CN39sco`up7v5ASySzwICIsK@PLI6r&TWE8?}c(#pg)XUe{iM#(+V<$NG-i@6M z`IV5?aj%#1JI-C|odD{%&ufRu8pISGZ5b<~5oy+l1#0ZXv>&syQ{cSFY9R`jp8|aA zD)(yfrK{XfS@)G6YO0-U;Vjl~_PWv-IANbBPUJj>P)x(Dg=-GSC^t^I^y1c=oX~X6HkXMeTgpVGG2q9H~A9 zHeYBPU(so>!?t6dagRyF9GaxTW<=DsmWa5fNDyB=DFqv2C<7a|eL2{WgEHf0T|_C^ zkb_dN%dI6NB4x(STNBE_=Ghk;Z1U~69-Ia{O@B{;9joW*>ey+p)AaWg*nHux486}I z)rmQ10dkX9^t6!r#p0E(9`UW1-e~}_1~w8ttw-KHp=v0i^&T; z)t;F$cKXO^JY%POI&{`!+URb9Zs*8YZoIGGS)XAYdzz02?QS1?ELWaq?7R;pg=fNJ z&!3G|h+D|YcJI&bW@NjcBO4n!anx?tyXK=6)2xZDNpX&pv7;F%?S;aRrXcD-WSTB=ZBVBMsRadc9m4G`nQQ>BbYlR#}MgTY5w(Wu}Ze=NcQM%=w_@lm*_9mTPR>8}mWS zIn(s|w-gTH`Mz8;eb(sFe9-JxbX-muUCcE$;>ias=S+FaX0EYaCg*fg_>Ff}<{H~o zMt*}&ozHRrw0ye^pxJ$ym@FXEnRBM;x!iFM!PxRyHP}t9kw)0i;oTX~>`{UtXgOz^ z({eyfv)u=b&ormyfM``t$zql@k48e~2r;32&~ozIl&DmEO{YYqhM?utZ#nmR+_0IG z-!8K1w<%Gn_$s8=il%6CW^8iF!juR`e5TW44&i-4PkZK>DWK((dO*u(Tk1K^Tr9fG|%=PK~c;avR28#!`8o07SUX(Y@uC%@&~ z>k(VY$!|RMV_gMkF;GwM@MRtlW3yYTv3Dq@LWBI|8e8l&hiPMrLz|Mh8-ixHk%pkz zt-(07De;gYXm)KGhsIBAvcRZEh~K6`i%FIp8h8qtBG1?WEu06$z3tXrW*C}P_YOm| zT3pDDg=+~g(<#uxnc`{Cn0*PaseNp?rz*xF`Jm~^9*bnbYYdMK(5zBF1dXR(a*d5Q zgXV)~)xASA<$04_W8=-8R%l@zf=G>hO&MkD%feJ>VL6=!jZwB-V~d?_m^wDdcCNAU zeup?YnhG4W)PjcdDhE`GP~Q6VUH9ovUuuX_&B#qN!TpxC{z zFq9nBwR>Hmv7p}07DEn0vFq{vO4}o;p|P+Yf35_ipTHlIM&3s_e=Iqu>+U%7^^5*& z|GtHjB;hw_YQJZLlO{e7=v{w^`{{|y?%#L6-~DO#H#yhCQ6KGYw{s__LwX6$PV|;Y~`LJ$ByU)`8Z2(@{dc<3OC!_eW;glyb-gvvzPx>?N|Anxg z$c(OcKQ|n@mlb;@a|O5Jr(5CiUu85OWX_*t9kH6vMKX?>|KG^Z_YH5qlF|RB>G4`% zeUjGq((8qMzY#t3WcSYrG=B0h>;5>?+WdT#`jUy89EK^a^M3U zU&yRUhpAZqTh{Q&?mwHgRK5XE-pNQ`3DqdS)cy|JQA0gwY2tOCKq9asT+6C}`(JwW zz}s}FAR_(8=)sXuH*qcUjPF`Tbu0XWF=92qMR!?7nUji`tD`Tt*G9cI#jYF8f;|@h zpNl5v3ab=3?%`?PBazEfX_qD=ssnr*g&guucwOmBSo-^3Mue4k)8J8^0Ny}+6nlLt z_AXqksP=W(_*cb4T5<=~wsB3sbq&w*2jQW6k$a^SW=q=zJmo%xX6N4>tznCuH#0ta z9C3UUz9h^WOP8}S4&KK6EO{J0uRAJ(3ees!9^r&P({;cK;0)dP8uayZ>dww~>6RUL z6st|Q59}amR-NJ_H})-DuKV<_--(1B%l~Os9Y^=oo-1R|>DrS=`#esqGUhQ6iqk7G zPU^#N?-Ij)nXhNZag9qf_jjw6HP5D-hI6iEHw|k}`;H^hEyM`D&?58>P+GvyU|=MS*?D;!7J{TcS(ZeLhErZ4r)EcYoCe`g;!Rug}vCdVU*_ zbk(`uHQp*?HHeB_H$L4j%?kb`HVr&qco@&cvw&aAmWXok@B7BTf>%l}YyaTKI=u=D z6>rnRLssg=ZNt!d_?UByao*TUjBtG;>aT127Ni^__9^*7JdC5=e+gIJ$#>#{hX;TB zdFOY=m*Dr^2|vO@_pNYxL?_9-#!>iRRTtVu)YW;gUFM9XEvIddw7nKeuQQ>8(h5KC zMJC_N*E^x#Yw?TlsZxp~gIvz1lMEa$ zLEWF^KeXYszzOZzT!XPz{g@xdrV*#K9n>G0qleSteO=ns^8KA0UOq;F`T!e+IGXP2 zSVr@s$hseuoIaNJD1Mc7LTn$izm=a6e|3LTi6Q+{qB(ZDPuXYt5idxNb*J^mO0G(? zr!_WuFO)*ofLtAlo@$G|=$@BCTUY@~Q_A{ut}Z{~JCS9cJ!Iw>5 zB}8NYQ_VNhf>Ub@{ER4lJT9E3OWM0pZi|dM`JKo&BH3+9&*5m*dhMMFyQ1Pc651fY zgFFp#TJDp*_X#Wxz|u896dUjMAuo~^U#6V-(w1**uUcAh`ncL!aX!r$%|TWNdI2v0 zyOo_XN(&Emcd~9|Dc9aHED7CF=sS_VG)@^wd!=k+ASK>O-q*LBr;Ngnaws?3#saBA zCh?VI=X~y%KAJg{!6;ylKwHAIz}Ote+Qwwz)hWCGwT$kAH@Yc%zh#VFPVVBjQHOf4 zy;kt&U`ZhB4o{{1JGhp$3edf3Kfoq~Cb^KmjqPKW*-lvzSU2CdWNP}Fa4tu?zssCI z%Rj^npG%$4&4YJwv-?-69CCC(&I@}{N~SYJdz;kuXF6r|sXf{}U>nE1P{z@~HU@Ho z()pcOv3C-EfDhn)=B|$%JGl}%4pywgiJA}69h6V21K^Am^Ba-l_mVqC<%ZUtzzX?Z zY`)h56Z#18H~kCnLk^JpRw;n}jB~`0h4E3eXO0*PY#!9Ayce9DKmLk}f;*WnD}eA* zEaul9iLOJse>inSbMg9;pzC3w2X`&x!uz`geH!}8>6GAz{C#!GxX`Cch( z5Y6bXd@H)}MzrLo z4qw}L*f#feGfFQ7HfmR2il*~NpQ87mdodP!jzi@;J{q?s)3G?~+(m+2WHcOWw8lZ( zT!$Tv5qhlLT@&5Me)U--fHT5R`-bMOme9==)P&Z;jz$`d<&1o-2~2*3Rcrs+m3%`j z`ZUoIrQ2Bkh;#*p=>m)9mnI^wd%I$tMhE4tJK^kGp(a)Wk!faC{NHHnxGJ~!%3xKX z8BpD3Tbs7!qhrEoU~9mp(JDsrfxkZSR?y-q85q%+6-F(f>)}f}EFk#A{lD$y6V^sE zTd{96h2vJ>hrFcg>pY|Iefdy~%08|!U2dTfxsSQ*IkfWkRq_yg^CMZOUxa7g$Up4m zu9EjicnMP4{yan<+Qc6UO5Ux($P^0e_WN{%RL?op8&ySoiE8LDKt&VC%p*JzUt5RKQ>}4sLUngLLhWlC%(VSGrT?w03w?R6%AI7z z+q1{-V=~mXBimjEcM0euV0zwIAs=L4Lw$qqvqK)Rlcvy_(n_pYNpQ|*=}RBx=LVBT zPs5+}`AQ>3>Aq=u_x@4l0}Jo_My6on;p7kWa9762y*LSum$SyH+veZ)8oMfV#4K>4 zZc2^%X~HOc-5%z*)UlwqpEsgU37wr%W599vwC8?`cntWoOpUs&BE5X;e!cI12u*1d zg1%4W6y+!32<)XFWsk%OKmJ`Sf#Jo$AL*XUeA3vCq4Su}19kBIag4)15=ou^4>SBf z67~Jp-T#uG{vtEPxxpum)rmVn&gAF2U}b!0guZTkl3{e1Uu=Ys|8IoXZ6oBqm1}II z|Ii3==L=5#hG|%y!)+M)eE6+!#~*h8d-uEEI`rGxaFuV}AK_m`df}(OmD#{2L&l&&# literal 0 HcmV?d00001 diff --git a/api-interface/itmk-base-parent/itmk-base-web/pom.xml b/api-interface/itmk-base-parent/itmk-base-web/pom.xml index bc07b76..46c4e1a 100644 --- a/api-interface/itmk-base-parent/itmk-base-web/pom.xml +++ b/api-interface/itmk-base-parent/itmk-base-web/pom.xml @@ -69,6 +69,12 @@ com.github.penggle kaptcha + + + org.apache.httpcomponents + httpclient + 4.5.13 + diff --git a/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/config/RestTemplateConfig.java b/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/config/RestTemplateConfig.java new file mode 100644 index 0000000..b2b0273 --- /dev/null +++ b/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/config/RestTemplateConfig.java @@ -0,0 +1,14 @@ +package com.itmk.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestTemplate; + +@Configuration +public class RestTemplateConfig { + + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } +} \ No newline at end of file diff --git a/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/wxapi/controller/WxLoginController.java b/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/wxapi/controller/WxLoginController.java index 181c278..c535165 100644 --- a/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/wxapi/controller/WxLoginController.java +++ b/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/wxapi/controller/WxLoginController.java @@ -5,55 +5,74 @@ import com.itmk.web.wxapi.entity.Code2Session; import com.itmk.web.wxapi.entity.LoginParm; import com.itmk.web.wxapi.entity.LoginVo; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - -import java.util.HashMap; -import java.util.Map; +import org.springframework.web.client.RestTemplate; @Slf4j @RestController @RequestMapping("/wxapi/user") public class WxLoginController { + + @Autowired + private RestTemplate restTemplate; + @Value("${Wechat.Applets.appId}") private String appId; + @Value("${Wechat.Applets.appSecret}") private String appSecret; + //小程序登录 @PostMapping("/wxLogin") public ResultVo wxLogin(@RequestBody LoginParm parm){ String code = parm.getCode(); log.info("wxlogin - code: " + code); - String url = "https://api.weixin.qq.com/sns/jscode2session"; - Map param = new HashMap<>(); - param.put("appid", appId); - param.put("secret", appSecret); - param.put("js_code", code); - param.put("grant_type", "authorization_code"); - log.info("param: " + param); + try { - //发送请求 - String wxResult = HttpClientUtil.doGet(url, param); + // 构建请求URL + String url = "https://api.weixin.qq.com/sns/jscode2session" + + "?appid=" + appId + + "&secret=" + appSecret + + "&js_code=" + code + + "&grant_type=authorization_code"; + + log.info("Request URL: " + url); + + // 使用 RestTemplate 发送请求 + ResponseEntity response = restTemplate.getForEntity(url, String.class); + String wxResult = response.getBody(); + + log.info("WeChat API response: " + wxResult); + //转换参数 Code2Session userJson = FastJsonTools.getJson(wxResult, Code2Session.class); log.info("userJson: " + userJson); - if(userJson == null) throw new BusinessException(500,"小程序获取open失败"); + + if(userJson == null || userJson.getOpenid() == null) { + throw new BusinessException(500,"小程序获取open失败"); + } + String openid = userJson.getOpenid(); String sessionKey = userJson.getSession_key(); log.info("openid: " + openid); log.info("sessionKey: " + sessionKey); + LoginVo vo = new LoginVo(); vo.setOpenid(openid); vo.setSessionKey(sessionKey); + return ResultUtils.success("获取成功",vo); } catch (Exception e) { e.printStackTrace(); - log.error(String.format("WxLoginController.wxLogin Error", e)); + log.error("WxLoginController.wxLogin Error", e); + return ResultUtils.error("小程序获取open失败: " + e.getMessage()); } - return ResultUtils.error("小程序获取open失败"); } } \ No newline at end of file diff --git a/order-app/src/pages/mine/mine.vue b/order-app/src/pages/mine/mine.vue index 059c713..d206dfa 100644 --- a/order-app/src/pages/mine/mine.vue +++ b/order-app/src/pages/mine/mine.vue @@ -27,34 +27,128 @@ onShow } from '@dcloudio/uni-app'; import { - ref + ref, + onMounted } from 'vue' //昵称 - const nickName = ref('大幕孤烟直') + const nickName = ref('微信用户') //头像 const avatarUrl = ref('/static/user.jpg') + // 页面加载时从缓存读取用户信息 + onMounted(() => { + const storedAvatar = uni.getStorageSync('avatarUrl') + const storedNickName = uni.getStorageSync('nickName') + + if (storedAvatar && storedNickName) { + nickName.value = storedNickName + avatarUrl.value = storedAvatar + console.log('从缓存加载用户信息:', storedNickName, storedAvatar) + } + }) + //获取头像点击事件 const getUserInfo = () => { - console.log('获取头像') - if (uni.getStorageSync('avatarUrl') && uni.getStorageSync('nickName')) { - nickName.value = uni.getStorageSync('nickName') - avatarUrl.value = uni.getStorageSync('avatarUrl') - } else { - uni.getUserProfile({ - desc: '用于头像昵称展示', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写 - success: (res) => { - console.log(res) - nickName.value = res.userInfo.nickName - avatarUrl.value = res.userInfo.avatarUrl - uni.setStorageSync('avatarUrl', res.userInfo.avatarUrl); - uni.setStorageSync('nickName', res.userInfo.nickName); + console.log('获取用户信息') + + // 检查是否已授权 + uni.getSetting({ + success: (res) => { + if (res.authSetting['scope.userInfo']) { + // 显示加载提示 + uni.showLoading({ + title: '获取用户信息中...' + }) + // 已授权，直接获取用户信息 + uni.getUserInfo({ + success: (res) => { + console.log('已授权用户信息:', res) + // 确保使用正确的数据路径 + const userInfo = res.userInfo || {} + nickName.value = userInfo.nickName || '未知用户' + + // 处理头像URL，添加时间戳避免缓存 + let avatar = userInfo.avatarUrl || '/static/user.jpg' + if (avatar !== '/static/user.jpg') { + // 添加时间戳参数避免缓存 + avatar += (avatar.includes('?') ? '&' : '?') + 't=' + + new Date().getTime() + } + avatarUrl.value = avatar + + // 存储到本地 + uni.setStorageSync('avatarUrl', avatar); + uni.setStorageSync('nickName', nickName.value); + + console.log('更新后的用户信息:', nickName.value, avatarUrl.value) + // 显示成功提示 + uni.showToast({ + title: '信息更新成功', + icon: 'success' + }) + }, + fail: (err) => { + uni.hideLoading() + console.log('获取用户信息失败:', err) + uni.showToast({ + title: '获取信息失败', + icon: 'none' + }) + } + }) + } else { + // 未授权，弹出授权窗口 + uni.showModal({ + title: '用户信息授权', + content: '需要获取您的头像和昵称', + success: (res) => { + if (res.confirm) { + // 用户点击确定 + uni.getUserProfile({ + desc: '用于完善会员资料', + success: (res) => { + console.log('授权成功:', res) + // 确保使用正确的数据路径 + const userInfo = res.userInfo || {} + nickName.value = userInfo.nickName || + '未知用户' + + // 处理头像URL，添加时间戳避免缓存 + let avatar = userInfo.avatarUrl || + '/static/user.jpg' + if (avatar !== '/static/user.jpg') { + // 添加时间戳参数避免缓存 + avatar += (avatar.includes('?') ? '&' : + '?') + 't=' + new Date() + .getTime() + } + avatarUrl.value = avatar + + // 存储到本地 + uni.setStorageSync('avatarUrl', avatar); + uni.setStorageSync('nickName', nickName + .value); + + console.log('更新后的用户信息:', nickName.value, + avatarUrl.value) + }, + fail: (err) => { + console.log('授权失败:', err) + uni.showToast({ + title: '授权失败', + icon: 'none' + }) + } + }) + } + } + }) } - }) - } + }, + fail: (err) => { + console.log('检查授权设置失败:', err) + } + }) } - onShow(() => { - getUserInfo() - })