From b64c48e7613cae9defd17184c6fd62a5b28bc52f Mon Sep 17 00:00:00 2001 From: bleachtred Date: Mon, 7 Nov 2022 10:51:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8Delasticsearch?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=88=86=E8=AF=8D=E5=99=A8=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin-descriptor.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/plugin-descriptor.properties b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/plugin-descriptor.properties index 4583ebcb..a6805872 100644 --- a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/plugin-descriptor.properties +++ b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/plugin-descriptor.properties @@ -34,7 +34,7 @@ description=IK Analyzer for Elasticsearch # # 'version': plugin's version -version=7.17.2 +version=7.17.6 # # 'name': the plugin name name=analysis-ik @@ -53,4 +53,4 @@ java.version=1.8 # elasticsearch release. This version is checked when the plugin # is loaded so Elasticsearch will refuse to start in the presence of # plugins with the incorrect elasticsearch.version. -elasticsearch.version=7.17.2 +elasticsearch.version=7.17.6 From 7c9ca3a24cfb7e9b05ed027c455ba3862f7721b4 Mon Sep 17 00:00:00 2001 From: bleachtred Date: Mon, 7 Nov 2022 11:19:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8Delasticsearch?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=88=86=E8=AF=8D=E5=99=A8=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons-codec-1.9.jar | Bin .../commons-logging-1.2.jar | Bin .../config/IKAnalyzer.cfg.xml | 0 .../config/extra_main.dic | 0 .../config/extra_single_word.dic | 0 .../config/extra_single_word_full.dic | 0 .../config/extra_single_word_low_freq.dic | 0 .../config/extra_stopword.dic | 0 .../config/main.dic | 0 .../config/preposition.dic | 0 .../config/quantifier.dic | 0 .../config/stopword.dic | 0 .../config/suffix.dic | 0 .../config/surname.dic | 0 .../elasticsearch-analysis-ik-7.17.6.jar} | Bin 54931 -> 54930 bytes .../httpclient-4.5.2.jar | Bin .../httpcore-4.4.4.jar | Bin .../plugin-descriptor.properties | 0 .../plugin-security.policy | 0 19 files changed, 0 insertions(+), 0 deletions(-) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/commons-codec-1.9.jar (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/commons-logging-1.2.jar (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/config/IKAnalyzer.cfg.xml (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/config/extra_main.dic (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/config/extra_single_word.dic (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/config/extra_single_word_full.dic (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/config/extra_single_word_low_freq.dic (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/config/extra_stopword.dic (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/config/main.dic (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/config/preposition.dic (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/config/quantifier.dic (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/config/stopword.dic (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/config/suffix.dic (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/config/surname.dic (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2/elasticsearch-analysis-ik-7.17.2.jar => elasticsearch-analysis-ik-7.17.6/elasticsearch-analysis-ik-7.17.6.jar} (90%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/httpclient-4.5.2.jar (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/httpcore-4.4.4.jar (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/plugin-descriptor.properties (100%) rename docker/elk/elasticsearch/plugins/{elasticsearch-analysis-ik-7.17.2 => elasticsearch-analysis-ik-7.17.6}/plugin-security.policy (100%) diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/commons-codec-1.9.jar b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/commons-codec-1.9.jar similarity index 100% rename from docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/commons-codec-1.9.jar rename to docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/commons-codec-1.9.jar diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/commons-logging-1.2.jar b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/commons-logging-1.2.jar similarity index 100% rename from docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/commons-logging-1.2.jar rename to docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/commons-logging-1.2.jar diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/IKAnalyzer.cfg.xml b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/IKAnalyzer.cfg.xml similarity index 100% rename from docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/IKAnalyzer.cfg.xml rename to docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/IKAnalyzer.cfg.xml diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/extra_main.dic b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/extra_main.dic similarity index 100% rename from docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/extra_main.dic rename to docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/extra_main.dic diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/extra_single_word.dic b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/extra_single_word.dic similarity index 100% rename from docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/extra_single_word.dic rename to docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/extra_single_word.dic diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/extra_single_word_full.dic b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/extra_single_word_full.dic similarity index 100% rename from docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/extra_single_word_full.dic rename to docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/extra_single_word_full.dic diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/extra_single_word_low_freq.dic b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/extra_single_word_low_freq.dic similarity index 100% rename from docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/extra_single_word_low_freq.dic rename to docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/extra_single_word_low_freq.dic diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/extra_stopword.dic b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/extra_stopword.dic similarity index 100% rename from docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/extra_stopword.dic rename to docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/extra_stopword.dic diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/main.dic b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/main.dic similarity index 100% rename from docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/main.dic rename to docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/main.dic diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/preposition.dic b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/preposition.dic similarity index 100% rename from docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/preposition.dic rename to docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/preposition.dic diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/quantifier.dic b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/quantifier.dic similarity index 100% rename from docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/quantifier.dic rename to docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/quantifier.dic diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/stopword.dic b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/stopword.dic similarity index 100% rename from docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/stopword.dic rename to docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/stopword.dic diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/suffix.dic b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/suffix.dic similarity index 100% rename from docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/suffix.dic rename to docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/suffix.dic diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/surname.dic b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/surname.dic similarity index 100% rename from docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/config/surname.dic rename to docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/config/surname.dic diff --git a/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/elasticsearch-analysis-ik-7.17.2.jar b/docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/elasticsearch-analysis-ik-7.17.6.jar similarity index 90% rename from docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.2/elasticsearch-analysis-ik-7.17.2.jar rename to docker/elk/elasticsearch/plugins/elasticsearch-analysis-ik-7.17.6/elasticsearch-analysis-ik-7.17.6.jar index 508017cb6b6432697c2e9eecbc8ac1b4a05657f2..b8fe5703b6ca90e19dee18c366de6736c0e03562 100644 GIT binary patch delta 1098 zcmYk6Z%7ky7{_nB+nmm(mPSs{XsG?cT3J+PWHq#A^IvXjm9A1#DMN?TFrgCBH~n$` z)F3P~sTZcfxME4mOcb5lyg6r3W?MvL6sClfy^wZ$ehcr-eV*_0`+n~p?%_}`+1yKt zveHQ^h+wZ0!v>{6B%zAEcjK-?jt|g1jvinww*|n%2}cQJ2pX{QR=8OgY9u9SUP2)u z8MN|jG!&WSPJl*oyANnHSxo`$7Dz~-d|?hLV$)1=>H7*UK`;~wl}ECVL*>>``iJNW z7fxOXo5db=#5YW`NGWu?E=OUhHd?_0gI$sx6UIg>^wdv}H~ImeAl9P=u9!Z0_!mx1 zNgc#SzPuO4piQ~4fe_)zdkA5up}-ANX<IC18Q48L^jQ~!)r zw40)eyff087cr!dQ0>dR6#I3N*t`iK&Abnw!K@^oE5_)LW=asa)qBPhcgdtf--lFJ zjiNefDB*aetq4q1^l@71Eway^`UB-{YqmAFeNe7m&R4ttb_?TGo0H!ZG)9%RpVq6c z8`J`Uy)$Ga`qZAA)dSaN&)Yi|lU8Yp8KK5da!jnf^=uTKTl%7PwUoS5^t73#PbhTa zBzI-MUYnK9;f9m{caft+gTsk1^3re`UPswTt4~66u61Z}qz4MAMT}mLZiJ%WTktIL z{>~wQDvQkDJ_taL6#-lvD*%}ELy|QIlqRbJ;FDDikZj8YxNXY=n75q-$gpPvblK$q z3-;pxN5*mB{qYP?=Erk!i}AM@6)1lg4S>>t?L7|cT6W|^>&%1_pl<@_ggG&kI`OLx zIdQUh61Q}d*k$!9?2;gfD;1#3l>!@KbnOM0bEO09pDJQ^1U;H6Td^WhZ*_d*F#F^9 E2c=`6ZU6uP delta 1092 zcmYk6Ye-XJ7{|ArS;KCNzu*`k!s)j<<1JaA5a%v4X}=JoA61rXzO5T))Ka+-{V zV(y+TZ284O?_8-{7**Ri#&pO#_nRxDG&$X;G(yMSq>-rVcCq1ydGu+#Lx1l`Lak2I z`6)@YPbHXNpO;N%tR(_l$necOZb*bX|1wDNBBoDu_)BQfwE_K{dJczeMm`#O8wZDB z-+?rW1Ij@FwJ{?g9{^yODgkOtFbK@R*AMQl@hOu1}W&c&Cp7$SwH* zJr)_jlI1Xf)QSVUtU3NoLSCx^OSXVyD}u_3tpq?}$M!yZ4pjcy%K(l!3IT>3I48o1 zp~{IzedEN*ycsOj&0v?wSE05930+wLr(J2V5`(T}fJIj}K Date: Wed, 9 Nov 2022 15:24:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DIdTokenInvalidExcepti?= =?UTF-8?q?on=E8=BF=87=E6=97=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/security/handler/GlobalExceptionHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java index d11d80f8..2f0af101 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java @@ -1,6 +1,6 @@ package com.ruoyi.common.security.handler; -import cn.dev33.satoken.exception.IdTokenInvalidException; +import cn.dev33.satoken.exception.SameTokenInvalidException; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotPermissionException; import cn.dev33.satoken.exception.NotRoleException; @@ -60,8 +60,8 @@ public class GlobalExceptionHandler { /** * 无效认证 */ - @ExceptionHandler(IdTokenInvalidException.class) - public R handleIdTokenInvalidException(IdTokenInvalidException e, HttpServletRequest request) { + @ExceptionHandler(SameTokenInvalidException.class) + public R handleSameTokenInvalidException(SameTokenInvalidException e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求地址'{}',内网认证失败'{}',无法访问系统资源", requestURI, e.getMessage()); return R.fail(HttpStatus.UNAUTHORIZED, "认证失败，无法访问系统资源");