From 97a1829bec4e23d35b4aaa6dee1f14be9312f89e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lancer=2Ehong=5F=E6=B4=AA=E5=B7=A7=E7=BB=B4?= Date: Fri, 23 Oct 2020 15:59:32 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BE=9D=E8=B5=96=E5=92=8CApiConfi?= =?UTF-8?q?g=E7=9A=84id=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=A4=BE=E5=8C=BA=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...chema-validator-i18n-support-1.0.39_3.jar} | Bin 192263 -> 193750 bytes pom.xml | 32 +++++------------- src/main/java/we/FizzGatewayApplication.java | 2 +- src/main/java/we/plugin/auth/ApiConfig.java | 4 +-- 4 files changed, 12 insertions(+), 26 deletions(-) rename lib/{json-schema-validator-i18n-support-1.0.39_1.jar => json-schema-validator-i18n-support-1.0.39_3.jar} (83%) diff --git a/lib/json-schema-validator-i18n-support-1.0.39_1.jar b/lib/json-schema-validator-i18n-support-1.0.39_3.jar similarity index 83% rename from lib/json-schema-validator-i18n-support-1.0.39_1.jar rename to lib/json-schema-validator-i18n-support-1.0.39_3.jar index 6446081a261aabccdbf8979c83be6d56a9a9a0eb..58aca0f99201c1170e67b4ce1c8bacd636157b8c 100644 GIT binary patch delta 17244 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 aeDH38j_rfFhyu|9(ISAW4DlYs9R5Go1Fl^F delta 16686 zcmZvD1z1#D_ct?0N_UrZBOQXIG)O9?2qGQQIZ7!ZDI6LRB&4NFBvqulQ%dO&MB+O$ z!}VU?|HtzTGv~L~UcL9(bM~6i_3JNYuj6W~pwcMtoe{M4p-;fME$`h33klE<+^+j}QjLz=h6a-W;38ZXDR2kfu( zM4qiE?7X&Fk`Z`UM?y@p_-3Y_a2Uog+0C-d@q{Gt#gYrnoi>6DLX>K$yz^T#x!SgTDS9dE zW1Of%`6{2OKvsVv>xW%K$h@$eg0`Nbtk|z0m$tJ{#H>Q8ZxRHSbLI?-UZmFcRN? z*wS60M{QolGvfK~M590&zx3fq!eoD%CKSJuf_a)#2`9UxqUxy-8!7RZkT;+GQe6fd zXEwRxFO=hOzxE2%9t`me%OtyRm|@?rvNinfh0Dl57{m*8FncQ7RP%P%U{{U0HHge2 zJ#V*Ou$V#!eL~KP)=+tMvsUjtEHLRv4-!r6aaTWmtIgz-?#~O7THZC9-`!>C8K|v0 zr%N72BdgG<;_Z&#WxRqkSOIs$a2jR%zM=~NL1i(oO~X%X9?o-o@g+X_?t+qWp%vU< zNAWO(glbj6GKlyts?@=we#@+%*KqDwPFBdv{Qg{Ti6wS-QCnwc1+~Jo)fT2EPS;HA zF^{$TCBnzi<8w=uvCPCAk70K++HQ1}IPc&^c3`~uLkYGJ13W_Bf3d)u0yNmMg zU;Gx7A6|;_jHs%JcSlqQ#QQ9&1uT%C1m%eJ>;-GL5SknbF)PN>d~gHD!Sj*9F)5?r z=9-@~EQThZP}eb)B4wUeD$^buToVtfcp%Q|L~{)w`zg-lxYmIpn;)b-Q(&W|&(+&z zI{e-sZS!`j;+&z**IeJ>G@f7%6AhUK&RgyHgHv~Ug%l-!a#-z8_5;RrCG|YhRTWBi zas~}PtLtJai(jC^z3P0y4~Ylu&jDZmdbM_)tzz?9D-`mgq6}jV0?TIc)u=Au)9o@J zlNJ-IR7(l*P7I-EltjTxa`;rRP8Q3N5z_zK<(VbQpk74qMxj?VrUHkgl*`;837gv8 zTPAF4s@ScgiNy1&Z3afRCtbF}#_?F8ra8}|3h`uu^BFd!6(ds4!WTUs61P~SC?#&? zI5_O|Y!_SlS|4$Z+=Nw{(?2BKAmrqFLBT*tn>N%FqgKxL$@DPOHl&OZU9ZSi*ug5e z4lnal;?!H3xo_^0?D5QVN)xC=#-X&DGjlf$$fFs{xD43T`P0%`d${w1ix(xaR2@zQuMmRQCpp4NlBKFsX;{9(pW#{MUsBG#QQG}k4#x$zr{BSkD?jTM;q}p z<9cw4SUepVdk%O-+drio5i%Aj)>vi9-W0K%cp-f9WFoF93(d{u?ZoNIk-)(mArGCD zK`>n!vF^mR)-)bX`7jh=qf+HEy>R>KS3}_`VO6x+_?2r|u!LTq`2V7T!&janw?@H1qNGTLIZeLk@7NeKPU==jbOTP5#2vn=kqgVn@l zaf;?$+P1NByDh?7r&GvuAm>ZFIZPg9`Skt9uaZ)i-D427rN%y*ikqwQVZVKTd0|4CGl4%y`V5`n|X;hK|EQfO<>Wv9+A zT}bFZXcSK)Kd2^HA#DC2)z%300r@X?o4jtyN{aJ*mf!@mWY}%u#^0kZgSzq(yat<6 z)#nX!i&Uo)@ea9m*~{tQb_?kW>CKxgYckh)+6w86hBn`3YW9`%mJmcS5q&KsZslg$ z!GA;efJLf$zp=xd%wrZ>Wtv}0o1l=o-23rQ*R6@WW3lovijlPL9OcCssKYB1dO^+0 zhFA^7FP&q)J7vL0~@2JBya_3G?T9>&Im< zTs&ZMj%1bWNMgBc27}b~bX~SM;XpkxL5i==o7kYQKxjzF!&nOc+gHC*p5`DLqJ(X! zSN(M*xF3Fn*~>CvjN2~QeVJ8PF;2`)YsWS$4cEYq%JK|?DO9UD3Y1^eDnvUzM%G}niY;1dTRX}#^iIJCEyt5#Qy)WSI|~$_PyJZv zSZvkDuS#e7C`2@8FIxJ8w78g_Q(j@Eny+!P^rO%8%(h42pFh<8JikP zVW9L(lvnjBGs2_?HfQ?{^M07W?k2dIb^kjp7xB+0J_h3Y11-)Hb=#%eM)u0-PW)VM zP0MEA4if!)>QsJ@$ua%86O1q1@_OR7Lbzh$-dw|S5$vMI<70+rki2Ek>WI?V*@|;< zN=Z%l&k&LQ(iQr&(C8og&NSrAooP7R`-zyMKh%AWta|ETHs&!sCZ@D{V}~K6FP`_j zA@f=Mv6Ij0!lD~09Og5qWkYs2EkD+~)BBWTUtwZ;zy)uTZR{XbEpcnK@253cQv#oV z<4BZ^2C;r~(Gwxf^m^j*0C9Y`-6p@!4i<+R&W2vYo=2Y`=P9Oz;>DTMcF)B%RdxLP z-UQV6bV&0E>Fb+Xdk)h(PG;D#a5?y-eU7###h(U@9Z5uaR-5iWCY`>|L%vgO^7Vy& ze4jqfK?T9cg&k_Z1s{BcuN8o9qF|$-bV>eqg@@mx9^nfh?oEmKl8E748THAS_s(y<8CN% z#RO9f+CNA|Ji7n};sUN0H<*%UIqKQ?>|ZBtmxk{C5H3V zfMKsdjIUWihY%o)0ziy2{*Vv9=H_*X7$Su=4mc3izsanb$A!2fq5(XYfw0xUh#~FB zO92V+(t#4f{vT>H9Yhi-7tRcTmjuAMJOr!e)(uDw(pNCsz()`VlZjcw#0Gi(kD;tJ z-Ms%%#ZluR1ZhFYt^rkPAU}a(<^L)WtpQ~h{1sc%e+QC|kX8f6hyF5QV1@S0K}i7G zIVdJDtPkl%gd*Dj5`hebzVXbL4ha@4C))-kqijlbo zQ&z+81ffDqJ$MvZf%F9^aZRWfL<%Xm!v`{l^bK^mrY8_`2g!@bUFjmI#vl^nhLi@M zHP@G*U7gB7(%>l?>v9K;{}0ujbKD2pS^xaQ+$)H%B@TFC+Nq8s=Y+ zJ)~D)O5hL%@O~W>sCx`~gTMhqz!3z~A5iQXo)ZXw@cADLFaQuIfHfIm`B9GyWO~On z_Jzl>|1{|hdHUz&(s*w=!Q%MS#dbsPsg`TDB)$$@U*clFi*aZ?hrZJ`vcA4-FFvJ> z?V$ZdvFonUn~=mry4(0~j{G0=2k`g_I(aTv@er?$Z6EF4kZjn8xi%(y?`L?NO&do` zfcc_B4X%^; zP}r|l?9*@8@;^1(9*gGY9B<>C%P&%!-FpFQ*2=xuYvuGaeH7Au5qsZ7*_ahM>+OJNG{gbMw2kRoE=pGS!{YiR#g+O4rUHkwS}>E zl9hF$F_l=h4m}Q7u7E{-`=L&E%%fbA-ziBQjT0$JH(Y{9T;Ctthge9gqr z;m1K{{fIHzn0eQpgG{YlA^cqm`$My=b`2d8mAl*>H#J`KJJq$j=CCI`3L$x%!v2J= z$FqWj>)o5W;?Z`hmEweZ9B9Aq&^h$CE3KsSxI~cT#0lAtD!^FwtCfr50?$hmnexM^ zRvZ$PwWf0N6CO3NdhnNOKGF{N;h@T~9#$aU_fRd0eS1GVhJ+`@`mtGRd$G<&+@cA` zq_7L!zK0s~<5e}6=Oo*M3K;vmuazg;bT(q&>JpoF3o<(bZ;iw0IDCW&&1cQRBy(z& z!}Ce}Q(g-2@s`6h!vi>Y6PdEYnD=#vzScoFeyIrLhn;mxGQ>9e*N_0pyL1{fmb1Pr zBC0M0B!G%b9qa7pMlNO%6_T_V~II2;oeMPM4!j$>Jzd6LZ4D!W)5(i|P> zDYf6w*#x|56vF3j=}dEV_@^9`>`U{+LVc9O{|N6=T1hdKn}+wP?!F=Nu9tvt=sahD@X#l?h}Ey+`dINGNiGjph&!>qAyz?Squf4fDBmkF^J z!?CS}zzx`4Qe3upB_ea9$L{V9Y7Q3ik4^9Bx?1R#)x8s;kYmsP8F`e@89Dq=%H=M% ze#*v%@JZ`ChXv~#uC#DABfJA@{as!QR5{JZrlxl+aOZ?73sbT5dtPN}--!{5=X~H^ z#xbrgsBH z`J{GyO{c1pNp$1fYIEh#trwPSEgXVbAFE2)Z_yBK2D}YB|5Z(Mm;or`G%v#weW|Le3e5>lzMHN zlqAho;)(&)RzZQ@qm1{Rp#(kZL=FW-4i90HOXZfFG-`JR)JvwQXUTbKl@;H7hWnV zDtV?1|AjRa@wd^{>KRmF3Q{dU2w8toezmOqoFB$^(#jF+r_1noLn~oak}+=o@plgj z4CNl_DP!#XwkRY1jbGA3v_k}rcan_9?&+)O4-bwH(BKGHix{FwR#%GXjk(yS5Ri$t zDwS{1z?7MBQq1*NMkC$!#X=q2A`2osL$f>4G4dvqJ28mTI}@MZGaSZwx)9^!kl4`RU-MbHGWbX#EStms)eI)}btSDV=TjJ&8);#+GgE6g&*s*>+Gyq8PG#=6 z$>4{U<##0wzIT#-ySv=bRQ75k*XIUF_6qmPx!sJeZ={~QlvPyLp+eTWs_mkRk?82n zlCV%;0+HzQCb7{!OfOJ6ChvO2GM5@}GU=Z6#|i24$q4qmeij@{^HK-ci59u(@3qLD zZLl{Ai>7GURX3Vz*XEq|Cgj0+7ulK}#>cdA#%J+ViTAq)+oHdNm1M#%yxTI&`ShKU zE!A0c$G59*n#<2DSavCIY)2$+z5B|%RIU?;xgFMCuUa#ti)!4pMcBsZ{->8Z^v4H* zlBV)eD!Z;@)r!58(_H8GqWk@C$UGNn{c|x7Ucl;Hl6jfBWj493^TtI7mxt2d(8Omu z%7Aui?f{`kLuzZKRqPNhtjI*d@X-HU5%3arYStTXa1qmguvrG zb6W(Ka!ho#mqVXk2@%W7#Y2tvn(aNC)z?;*JU_g^PxncS@V+~NzSZ#P0{i3ZyBs5X z8sZN)k3Yom6&`;`;j<$M?<`HZ*<3DYyQwAQ`N6HAZRDZ-n{AwW&0n#jyaMR&_sl!O z^<9344s+zOwk`|$zs_3T$i(MsIXd2X6d)eA0}JDe$RkXQ?7K^k7yd-qOzLObt?~6X z-j5W@dCw?s5Z6CuAlkf1WWV`Z%TLiSfyyp7(9er)cDap?Y`fzn{?Vc$rnfwrNwRV< zzVqrYbE5SR5W|yp*F|r7vzO+X$0^74tY$l5*^Azj^nQ!fk!jK7){CjqyKj%lXj5LC z7QBKfy~=Q|yg4A)f9D%RMXNW{oYFlBp%21|G;7<@Y&uGY7R|BR>Fk0u<_7XoF*Gl8 zyq;iN_O?EEJXvjP*yS~1y^65)$Op8mk@ekj;^^!c5X>Iz$uAcjL4gxy`bY(m$%$F8WIE`tPFBca}$Y!!mQ1?XR=>7Hm4_z}ARM!^bw-8!dnj zg*I-2JLa!@$esi~hOW{Yso;Sg;pQwC_(6n##Da${TOCa z7B(!{!nF5uNv(Ml-kt2-mQOJux0~A(yhrm5tz6jR(dZ2rg!%B-mx;wBRZNSM(oE=; ze|2KKHGO`|AOu~V~-E0%Xx2% zCacg_9lo=$cE%Gi<>~riTV;{fwp7I_))`Y#33O9`yFbWc8|p z&?Cy{&bK%BJ)ZA+6*4AASv@Fh{3%9b(pQb$+3;?_rFlvsugv1-M(tyo8~GK6b@IH| zPTF7`KOTP96t7zf%ZZd0#C}{kLl!&lNafbzLqs#mY14z&T7YuV`?k)V^3P|^Xd{EQ zq;EN*hsX5+5~Rwy$PVxwF~tXKhn# zU}e36)h1N^*``Z~NSm>Ym}~{tzUbV)?4Lw!=p}74ppkG`;hRftCxbB@UC4-@2tL5;zW^# zT}85-gy3VHT24Fc9>OKHEYOU1gX-qYE6NK$1az&FCH6^-PH01Gk~kvU(>QXrbj5^Z zVb#gl3b>P}eeBWInlGw21*2ofzewrG-(T72zY!>L&Ml!YiDOtOJtIn>p?H!VTE+MJ zZcUP)ea5e6>gOMhvQ8rDUWC25Da(@=C#spPmYn})MEmAbdc0Irs4u$C>&Dy6@lw(n zuO3%0W{;a!ggVqK=iM}L6fRdMnMiUib+w1>+j{JO{_vf@Tz`{%H;K0L=?`w|&PjEf zBnhqjgfI9@bN8t&+S=+~ZEBXE9KL+Y@xVrDWV#}5SK4B{^qTtrtUFS)!5nVGN6HK|-qQdIWR)!Bj_icW7ty za&wp@jxhVh?@x|YUn_C8?)aE-msBq}t@Eb2`mEtETpIqUj4^3jR@3fs-8o-WI!oN^} z8OYcer`lxjqzZ4@hy zENA&|<3$$%I7b_P{c`bXdpawr*Yx#JkU2WyR}!?m*y;U zp^#glFk1TDqLJo1pZaiEfgE8jX{1Nxj?{in#SL~9k4FvrfAAW}Zh9H$DhaGBkZ&=S zvf}-b(3+;}OtchC<}n%ipz*%P4`b`N3-(O=Zkey%!|Pgqb{}m?;=R#ev%(pDPdcH( zVJgwxDOq>RwZBYFU8AYm-k~VLF>a+M?ES(6>YMLwp85tg+-6B?b`WBH|7xr3gsxUZ zZLM=%pV#K*gQfzfbPGRBXNiRayY?4;y6ImADQY#~g8Tew z3+yI(-Kov97>JJ%O8$9FcPhFIj)_*_AO2g6TiJF|tt&&vveQnl9$?A2G}Y&=UHdMD zmC>f!Y#~KA-)tm!XQ3gXG*BkJKS7uVLjIj-Mq5v6Rm@tE<&G@baznJ7|U@4 z&6eO_OY>af=){LAZsO?i(SgnEGOO(B94RHVXlDzNU(p!WCslGA9zrSj(dy074?aCz zV==r@M)!-;Q)B@1W*CP4m)}uAKXp85%xdbFP<)4JUyQzxFa>Y*8x)rv12*Mb4sPUW5`~)zDimgP{*0-{McRZwPH%C2?7oKr?k&|-wSy5jQ zix*nYOaGEKu3gTzMDKUcyoBHVL^YsN?-g#ZOB54qITTr&AJ_?^GRun`bE>k;D&=e=DT<68hKR%H))57 zQAgWw%=pbXPR1-hQ7j%`BGu41bIpyL{qs-n;TX!|nryNc1|@%xcuAkl@wUE!&`D=V z`X&A6RQ&?lcHgXNZ`ytz3InyL{jysE5j~4xN`Rh4)Xk>$eoB9T0+Snd? zn^LJpXtjiUT&yfY0!pej9IyFN;%i(3k%zIL{$oRQj@jb(nddO<*daY{lqwqeKb@r zam_)Y?}fbWO~u@{QA^g=x?_%0Aq{6n`xg1(duTTI3M4|g;+2RSGUeKA(r}oLc-RMa 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 hc!Cb}_20kWb- org.springframework.boot spring-boot-starter-parent - 2.2.9.RELEASE + 2.2.10.RELEASE we fizz-gateway-community 1.0.0 - fizz-gateway + fizz-gateway-community @@ -35,20 +35,17 @@ 1.8 2.13.3 - + 4.1.53.Final + 4.5.13 com.networknt json-schema-validator-i18n-support - 1.0.39_1 + 1.0.39_3 system - ${project.basedir}/lib/json-schema-validator-i18n-support-1.0.39_1.jar + ${project.basedir}/lib/json-schema-validator-i18n-support-1.0.39_3.jar org.springframework.boot @@ -65,16 +62,11 @@ org.springframework.boot spring-boot-starter-log4j2 - com.alibaba fastjson - 1.2.73 + 1.2.74 @@ -141,13 +133,7 @@ commons-io commons-io - 2.6 - - - - commons-codec - commons-codec - 1.14 + 2.8.0 @@ -159,7 +145,7 @@ org.springframework.cloud spring-cloud-starter-netflix-eureka-client - 2.2.4.RELEASE + 2.2.5.RELEASE diff --git a/src/main/java/we/FizzGatewayApplication.java b/src/main/java/we/FizzGatewayApplication.java index 591f6d3..319b5ed 100644 --- a/src/main/java/we/FizzGatewayApplication.java +++ b/src/main/java/we/FizzGatewayApplication.java @@ -10,7 +10,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @SpringBootApplication( exclude = {ErrorWebFluxAutoConfiguration.class, RedisAutoConfiguration.class, RedisReactiveAutoConfiguration.class}, - scanBasePackages = {"we", "com.wh"} + scanBasePackages = {"we"} ) @EnableApolloConfig @EnableDiscoveryClient diff --git a/src/main/java/we/plugin/auth/ApiConfig.java b/src/main/java/we/plugin/auth/ApiConfig.java index 99e7281..c8a15e4 100644 --- a/src/main/java/we/plugin/auth/ApiConfig.java +++ b/src/main/java/we/plugin/auth/ApiConfig.java @@ -45,10 +45,10 @@ public class ApiConfig { public static final byte PREFIX_REWRITE_PROXY_MODE = 2; - @JsonIgnore + // @JsonIgnore public int id; // tb_api_auth.id - @JsonIgnore + // @JsonIgnore public int isDeleted = 0; // tb_api_auth.is_deleted public Set gatewayGroups = new HashSet<>(6);