From 830d5df4d10ed0f4616bdad52257e361f0e9a323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 7 Aug 2024 14:16:42 +0800 Subject: [PATCH] 'commit' --- .../src/main/resources/bootstrap-dev.yml | 10 +++++++++ .../target/classes/bootstrap-dev.yml | 10 +++++++++ Ylt/gw-charge/target/gw-charge.jar | Bin 39554105 -> 39554105 bytes Ylt/gw-charge/target/gw-charge.jar.original | Bin 618083 -> 618083 bytes .../gwopenapi/filter/ZuulPreFilter.java | 1 + .../src/main/resources/bootstrap-dev.yml | 9 ++++++++ .../target/classes/bootstrap-dev.yml | 9 ++++++++ 操作文档/9、Dockert使用办法.md | 20 ++++++++++++++++-- 8 files changed, 57 insertions(+), 2 deletions(-) diff --git a/Ylt/gw-charge/src/main/resources/bootstrap-dev.yml b/Ylt/gw-charge/src/main/resources/bootstrap-dev.yml index c52e9ca..759d8d4 100644 --- a/Ylt/gw-charge/src/main/resources/bootstrap-dev.yml +++ b/Ylt/gw-charge/src/main/resources/bootstrap-dev.yml @@ -100,10 +100,20 @@ zuul: path: /cheweiapi/** sensitiveHeaders: + #11、黄海自己扩展的JFinal模块 + ZhuQue: + stripPrefix: false + path: /ZhuQue/** + sensitiveHeaders: + # https://blog.csdn.net/qq_39470733/article/details/109474782 # 基于配置的服务器列表：需要在项目配置文件中通过<服务名称>.ribbon.listOfServers进行设置。 # 如user-service.ribbon.listOfServers=http://127.0.0.1:8082,http://127.0.0.1:8083 +ZhuQue: + ribbon: + listOfServers: http://10.10.21.21:8888 + # 用户模块 # D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\rpc\web\UserRpcApiController.java userapi: diff --git a/Ylt/gw-charge/target/classes/bootstrap-dev.yml b/Ylt/gw-charge/target/classes/bootstrap-dev.yml index c52e9ca..759d8d4 100644 --- a/Ylt/gw-charge/target/classes/bootstrap-dev.yml +++ b/Ylt/gw-charge/target/classes/bootstrap-dev.yml @@ -100,10 +100,20 @@ zuul: path: /cheweiapi/** sensitiveHeaders: + #11、黄海自己扩展的JFinal模块 + ZhuQue: + stripPrefix: false + path: /ZhuQue/** + sensitiveHeaders: + # https://blog.csdn.net/qq_39470733/article/details/109474782 # 基于配置的服务器列表：需要在项目配置文件中通过<服务名称>.ribbon.listOfServers进行设置。 # 如user-service.ribbon.listOfServers=http://127.0.0.1:8082,http://127.0.0.1:8083 +ZhuQue: + ribbon: + listOfServers: http://10.10.21.21:8888 + # 用户模块 # D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\rpc\web\UserRpcApiController.java userapi: diff --git a/Ylt/gw-charge/target/gw-charge.jar b/Ylt/gw-charge/target/gw-charge.jar index f66b23a262da64610874b37529181e34f62cf5f3..f0dae1c5528ed138ad9deea80f4cf1b2843f6562 100644 GIT binary patch delta 3240 zcmYk;cYMru9LMqAFPAAuA`UTP#7IICVy`4tM2H{}$q7Pfi`rXNtfsA*8fRZ<(W14h zK^+ydM(MC?wl=ZV?E97T=%atUp1<#XzTdmY?;iJf+~b!!|E^!I@=lC*G5f#c;oIQDMPs^ zvvO5#ian35zV4pQy6bFKavx9Sr3xu;Rag~KMU{{8Req|N@>j)`MU_w`RVfvqN~RTB=rx@7`L)sWvKJwN>p@f@-f4RR`5kby7(xS#?$^s*6fh zY09d)s&v&&byq!9hU%$$sdrUx)knRj-d7)}zN(+z4OTQnWZ`dm#_)6{e|L(NpPRJQs;%~o^N zTs2SG)O@u-EmVutVzopqRd$u5mZ|0HOZAmnp;oF@>TC6lTCLWowdz~-om!{Xs|{+S z+N3tCE$VxX7N*>R0uf`d$5@PO4Mtv^t~Cs&neR`cqv{7u6+oSzS?A)nDpwbxmDYH`GmaOWjs? z)LnH?<*WPZfqJMOsmJPxda9nOf7EmJLcLV4)NA!-YH}abOa%tGfEirD4cx&4Ji!YJ zfj1O}B2W~3z!&_W82CeRus{hY38f$aN<$ea3*{gX%0mUH2$diRDnk{h3e_MOLLd~X zLk$RnaEO4KPzxfVHq?Q-P!H-u184}1pfNOorVs_u5ChGiIkbS5&}bG_XQfNQZ9F9eO|p^n_mUF7$?iU;jN;@52Ys7y3be z_z(ubKo|srVF(O`VK5veS zg>T_ISO@E218js%uoYnq@Bv@&gJR$h#lZq4pd^%n04NP*pe&SwKqwCtpdwU)AgBygpej^@UOwuJ4-KFpG=j#^1e!t=L_-WTgXYizT0$#`h1L)UZ6F@n zLOV!+_K*l2pd)mGBuIwNkOEx{hyMNypE(7Oy|!6>QX`zJ{4t(E_Ca&Hn#{H*2h&Ry z4DG%tkw&oH>qV+j#yQBYcGl!?j}A&P`Pd_}(hP4$nl_&ockW(H=Xg#?no-Cx%{R@6 zpYNRKNI0rq#lnQyU(W?eu@7(u`|qSBzYAKY%>>k<0;&pUEgX%J4gA! z85Wz5^_bayPs38qVP^6=i!FMszu8fxfz`O>`gZzwuEmy9{-oI+9%VHG`JhBCIuz{M zeex`Z#j#z3Y;SHPp{>E Mcg{Xzs?}KYFDyT%%>V!Z delta 3240 zcmYk;c~n$o9EWk|GAx6rfG`50xFCusptvC}fVd!txF9kkDrQ#ZT9!##lqv3jf`g_G zR<@{RrDbF}nzWdy?V5XOtEO0L?)80`PNzSf&wc0jzBA{}nRDjc>dK3O)ygkB!^0d@ z&&S87URr9IUy?a3)jMy)jyxl>Z2AQwEp=7Csk<)QSDP%Jyxiy&!{v}yiZ1g5yo&?8 zP0COn%B(zs8AKA znyPTsOf^>#s)cH)TB+75QngW0s;z3LqE&kpqdKULDptj*c-2XDRtc($>Z-b_?y84M zR6SLa>ZN+CKB})uRw;__*-xdZ{%U|4s0OKYHCSb+Of^Jhsi7)c4O7F_2sKjWs8K3c zjaGTertE5r%2#96I5l1ss0r#GHBsHGCaL?>{ptZVSv{zxsHtk2nyzN3nd%|+u$rYF zQID$G>M=D(6{^S8Ts2QUp`KJl>M8ZKny;Qw3)DhYtQM)oYKdB^mZ{}xg(^{{s!Xj^ zt5mtFP^*I-J zt2fk}YP;H@-coO?o$4J`t=?6;)O+fEwOhH=9<^6}p!TU6^`ZJmeXKrF`_-rFfci`w zREN}I^||^&eW|`uU#oA_x9W&Gs=ial)Nyq}om8jPX>~?@uYOQx)j9Q}`bqt)eo?=w z-_&_^LH({Ss!OU?T~>dnKh+g=Rb5kmsq5;7x~Xod+v<+GtNvb^Gs#qKLtdO#xdge2$%y`c~Eg=9#9ROkn3&>sfCKo|t+ zFc>l*6NW$*425hM2E$ufrSgCTxct@D{ucJK-IuhIe5Xya(^YZg9aK*b5)PKB$2Y;UoAM zK7sx4DI9>$;2<1=!|*wL0bjyb@HKn`-@*|%3g5voI1VS^B%FfNa0b4IAK)yUgCF51 z_!)kIU*R`64;SEfxCob^7B0gd@F!e>t8fkeg6nVtZo)0N4R_!!{B6?TpP_{b4DbLm zc!C#rgAZ817wUr_G=PTC2>c-c0--SkK`>aM34}l>gh5jXhi1?mBA^AdgjUcRBB2dL zL0f1C(a;`ZpaXP-Scrpo=mec10lGj}=my=P2P8sINP=F_8~Q+BNQM+hg?^9*{b2wM zgh7xFgCPSlVF+ZwP{@X1FdRm}NXUUvkPD*?m;U|?|MI%WUPtMqymT~qyJzw_Ue(@a z)ORfluo)SZ?s-);^V%Z2&iik+8QT){c?K=HytcKOKOM@~$ZX_$yZme(X-YYm(XtFx9Hyt#Yot9a4BZ&7#XpzjKK#Tr$ z2P;zSVXhjzoM5=$c-e8t6y{2sZ8w@*>L!kY7~Sulgmkm3NZ&l&eQVCr>&r}5*VzSj RWBI=~``X?Rh|HEW)?061`Y-WKlh0|s!V?F8;w^n1F6aPnYBR_4~rv^YW8Po_h(@Q zVkRJF24WDO6^Pk@m>q~Yw)?YiUWfv!ovs+qX$qvbN5pexv48}QBy(DWXvP%IK#)X8 I3MW4o0HH%6ZU6uP delta 129 zcmaESNA>X?Rh|HEW)?061`Y-W7pI9ls!T3U8;w^n1F6aPnYBR_4~rv^YW8Po_h(@Q zVkRJF24WDO6^Pk@m>q~Yw)?YiUWfv!ovs+qX$qvbN5pexv48}QBy(DWXvP%IK#)X8 I3MW4o0DWB`*Z=?k diff --git a/Ylt/gw-openapi/src/main/java/com/charge/gwopenapi/filter/ZuulPreFilter.java b/Ylt/gw-openapi/src/main/java/com/charge/gwopenapi/filter/ZuulPreFilter.java index 6bbeb77..e91c431 100644 --- a/Ylt/gw-openapi/src/main/java/com/charge/gwopenapi/filter/ZuulPreFilter.java +++ b/Ylt/gw-openapi/src/main/java/com/charge/gwopenapi/filter/ZuulPreFilter.java @@ -101,6 +101,7 @@ public class ZuulPreFilter extends com.netflix.zuul.ZuulFilter { RequestContext ctx = RequestContext.getCurrentContext(); //Map> requestQueryParams = ctx.getRequestQueryParams(); HttpServletRequest request = ctx.getRequest(); + //从Http请求头中获取Authorization String Authorization = request.getHeader("Authorization"); if (Authorization == null) { try { diff --git a/Ylt/gw-saas-mgr/src/main/resources/bootstrap-dev.yml b/Ylt/gw-saas-mgr/src/main/resources/bootstrap-dev.yml index 0406fa4..d91917d 100644 --- a/Ylt/gw-saas-mgr/src/main/resources/bootstrap-dev.yml +++ b/Ylt/gw-saas-mgr/src/main/resources/bootstrap-dev.yml @@ -188,7 +188,16 @@ zuul: path: /openapi/** sensitiveHeaders: + #11、黄海自己扩展的JFinal模块 + ZhuQue: + stripPrefix: false + path: /ZhuQue/** + sensitiveHeaders: # 服务主机注册配置 +ZhuQue: + ribbon: + listOfServers: http://10.10.21.21:8888 + orderbkapi: ribbon: listOfServers: http://ms-admin:7011 diff --git a/Ylt/gw-saas-mgr/target/classes/bootstrap-dev.yml b/Ylt/gw-saas-mgr/target/classes/bootstrap-dev.yml index 0406fa4..d91917d 100644 --- a/Ylt/gw-saas-mgr/target/classes/bootstrap-dev.yml +++ b/Ylt/gw-saas-mgr/target/classes/bootstrap-dev.yml @@ -188,7 +188,16 @@ zuul: path: /openapi/** sensitiveHeaders: + #11、黄海自己扩展的JFinal模块 + ZhuQue: + stripPrefix: false + path: /ZhuQue/** + sensitiveHeaders: # 服务主机注册配置 +ZhuQue: + ribbon: + listOfServers: http://10.10.21.21:8888 + orderbkapi: ribbon: listOfServers: http://ms-admin:7011 diff --git a/操作文档/9、Dockert使用办法.md b/操作文档/9、Dockert使用办法.md index 2e170ea..41b4b7a 100644 --- a/操作文档/9、Dockert使用办法.md +++ b/操作文档/9、Dockert使用办法.md @@ -31,7 +31,6 @@ tee /etc/docker/daemon.json <