소스 검색

update 权限更新

A17404李放 3 년 전
부모
커밋
e21dc3b264

+ 1 - 1
nb-common/src/main/java/com/nb/common/config/sa/SaConfig.java

@@ -20,7 +20,7 @@ public class SaConfig {
     private final SaTokenDaoRedisJackson saTokenDaoRedisJackson;
     @PostConstruct
     public void init(){
-//        SaManager.setSaTokenAction(new SaTokenActionDefaultImpl());
+        SaManager.setSaTokenAction(new SaTokenActionDefaultImpl());
         SaManager.setSaTokenDao(saTokenDaoRedisJackson);
     }
 }

+ 2 - 2
nb-common/src/main/java/com/nb/common/config/sa/SaTokenActionDefaultImpl.java

@@ -161,9 +161,9 @@ public class SaTokenActionDefaultImpl implements SaTokenAction {
 	 */
 	public static boolean vagueMatch(String patt, String str) {
 		// 如果表达式不带有*号,则只需简单equals即可 (速度提升200倍)
-		if(str.indexOf("*") == -1) {
+		if(str.contains("*")&&patt.contains("*")) {
 			return patt.equals(str);
 		}
-		return Pattern.matches(str.replaceAll("\\*", ".*"), patt);
+		return Pattern.matches(str.replaceAll("\\*", ".*"), patt)||Pattern.matches(patt.replaceAll("\\*", ".*"), str);
 	}
 }