From 7aed01323518ade0ffec797632cc9acde3303b5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=A1=E7=89=99=E7=9A=84=E5=B0=8F=E6=9C=8B=E5=8F=8B?= Date: Mon, 31 May 2021 16:22:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djboot.properties=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=ADjboot.shiro.ini=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=9C=AA=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../java/io/jboot/app/JbootApplication.java | 3 ++- .../shiro/JbootShiroWebEnvironment.java | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 src/main/java/io/jboot/support/shiro/JbootShiroWebEnvironment.java diff --git a/pom.xml b/pom.xml index 3ffe76fa..8b6dacec 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.jboot jboot - 3.9.15-SNAPSHOT + 3.9.15-MJL jar jboot diff --git a/src/main/java/io/jboot/app/JbootApplication.java b/src/main/java/io/jboot/app/JbootApplication.java index 6f750b07..ec886721 100644 --- a/src/main/java/io/jboot/app/JbootApplication.java +++ b/src/main/java/io/jboot/app/JbootApplication.java @@ -133,7 +133,8 @@ public class JbootApplication { webBuilder.addListener("org.apache.shiro.web.env.EnvironmentLoaderListener"); webBuilder.addFilter("shiro", "io.jboot.support.shiro.JbootShiroFilter") .addFilterUrlMapping("shiro", urlMapping, DispatcherType.REQUEST); - + webBuilder.getDeploymentInfo().addInitParameter("shiroEnvironmentClass", + "io.jboot.support.shiro.JbootShiroWebEnvironment"); } } diff --git a/src/main/java/io/jboot/support/shiro/JbootShiroWebEnvironment.java b/src/main/java/io/jboot/support/shiro/JbootShiroWebEnvironment.java new file mode 100644 index 00000000..c0a599cc --- /dev/null +++ b/src/main/java/io/jboot/support/shiro/JbootShiroWebEnvironment.java @@ -0,0 +1,18 @@ +package io.jboot.support.shiro; + +import io.jboot.Jboot; +import org.apache.shiro.config.IniFactorySupport; +import org.apache.shiro.web.env.IniWebEnvironment; + +public class JbootShiroWebEnvironment extends IniWebEnvironment { + @Override + protected String[] getDefaultConfigLocations() { + //读取jboot配置文件中的jboot.shiro.ini配置项 + String iniFileName = "classpath:" + Jboot.configValue("jboot.shiro.ini", "shiro.ini"); + return new String[]{ + iniFileName, + DEFAULT_WEB_INI_RESOURCE_PATH, + IniFactorySupport.DEFAULT_INI_RESOURCE_PATH + }; + } +} -- Gitee From e96087e62f966e9b27567fc46db5af9f1ef382a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=A1=E7=89=99=E7=9A=84=E5=B0=8F=E6=9C=8B=E5=8F=8B?= Date: Mon, 31 May 2021 16:25:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djboot.properties=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=ADjboot.shiro.ini=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=9C=AA=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/jboot/app/JbootApplication.java | 3 +-- .../shiro/JbootShiroWebEnvironment.java | 18 ------------------ 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 src/main/java/io/jboot/support/shiro/JbootShiroWebEnvironment.java diff --git a/src/main/java/io/jboot/app/JbootApplication.java b/src/main/java/io/jboot/app/JbootApplication.java index ec886721..6f750b07 100644 --- a/src/main/java/io/jboot/app/JbootApplication.java +++ b/src/main/java/io/jboot/app/JbootApplication.java @@ -133,8 +133,7 @@ public class JbootApplication { webBuilder.addListener("org.apache.shiro.web.env.EnvironmentLoaderListener"); webBuilder.addFilter("shiro", "io.jboot.support.shiro.JbootShiroFilter") .addFilterUrlMapping("shiro", urlMapping, DispatcherType.REQUEST); - webBuilder.getDeploymentInfo().addInitParameter("shiroEnvironmentClass", - "io.jboot.support.shiro.JbootShiroWebEnvironment"); + } } diff --git a/src/main/java/io/jboot/support/shiro/JbootShiroWebEnvironment.java b/src/main/java/io/jboot/support/shiro/JbootShiroWebEnvironment.java deleted file mode 100644 index c0a599cc..00000000 --- a/src/main/java/io/jboot/support/shiro/JbootShiroWebEnvironment.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.jboot.support.shiro; - -import io.jboot.Jboot; -import org.apache.shiro.config.IniFactorySupport; -import org.apache.shiro.web.env.IniWebEnvironment; - -public class JbootShiroWebEnvironment extends IniWebEnvironment { - @Override - protected String[] getDefaultConfigLocations() { - //读取jboot配置文件中的jboot.shiro.ini配置项 - String iniFileName = "classpath:" + Jboot.configValue("jboot.shiro.ini", "shiro.ini"); - return new String[]{ - iniFileName, - DEFAULT_WEB_INI_RESOURCE_PATH, - IniFactorySupport.DEFAULT_INI_RESOURCE_PATH - }; - } -} -- Gitee