github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

升级shiro到2.0.4

pull/8550/head
JEECG 2025-05-22 10:55:16 +08:00
parent d6ccc4a326
commit 62937f14fb
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java
View File

@ -1,6 +1,6 @@
package org.jeecg.common.util.encryption; package org.jeecg.common.util.encryption;
import org.apache.shiro.codec.Base64; import org.apache.shiro.lang.codec.Base64;
import javax.crypto.Cipher; import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec; import javax.crypto.spec.SecretKeySpec;

22
jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
View File

@ -11,6 +11,7 @@ import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.spring.LifecycleBeanPostProcessor; import org.apache.shiro.spring.LifecycleBeanPostProcessor;
import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor; import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
import org.apache.shiro.spring.web.ShiroFilterFactoryBean; import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
import org.apache.shiro.spring.web.ShiroUrlPathHelper;
import org.apache.shiro.web.mgt.DefaultWebSecurityManager; import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
import org.crazycake.shiro.*; import org.crazycake.shiro.*;
import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.CommonConstant;
@ -352,16 +353,17 @@ public class ShiroConfig {
return manager; return manager;
} }
// /** /**
// * 解决 ShiroRequestMappingConfig 获取 requestMappingHandlerMapping Bean 冲突 * 解决 ShiroRequestMappingConfig 获取 requestMappingHandlerMapping Bean 冲突
// * spring-boot-autoconfigure:3.4.5 和 spring-boot-actuator-autoconfigure:3.4.5 * spring-boot-autoconfigure:3.4.5 和 spring-boot-actuator-autoconfigure:3.4.5
// */ */
// @Primary @Primary
// @Bean @Bean
// public RequestMappingHandlerMapping shiroRequestMappingHandlerMapping( public RequestMappingHandlerMapping overridedRequestMappingHandlerMapping() {
// @Qualifier("requestMappingHandlerMapping") RequestMappingHandlerMapping handlerMapping) { RequestMappingHandlerMapping mapping = new RequestMappingHandlerMapping();
// return handlerMapping; mapping.setUrlPathHelper(new ShiroUrlPathHelper());
// } return mapping;
}
private List<String> rebuildUrl(String[] bases, String[] uris) { private List<String> rebuildUrl(String[] bases, String[] uris) {
List<String> urls = new ArrayList<>(); List<String> urls = new ArrayList<>();

2
jeecg-boot/pom.xml
View File

@ -67,7 +67,7 @@
<aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version> <aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
<aliyun.oss.version>3.17.3</aliyun.oss.version> <aliyun.oss.version>3.17.3</aliyun.oss.version>
<!-- shiro --> <!-- shiro -->
<shiro.version>1.13.0</shiro.version> <shiro.version>2.0.4</shiro.version>
<shiro-redis.version>3.2.3</shiro-redis.version> <shiro-redis.version>3.2.3</shiro-redis.version>
<java-jwt.version>4.5.0</java-jwt.version> <java-jwt.version>4.5.0</java-jwt.version>
<codegenerate.version>1.4.9</codegenerate.version> <codegenerate.version>1.4.9</codegenerate.version>