diff --git a/adc-da-jwtLogin/pom.xml b/adc-da-jwtLogin/pom.xml index 6d199da8..930ab3c1 100644 --- a/adc-da-jwtLogin/pom.xml +++ b/adc-da-jwtLogin/pom.xml @@ -21,7 +21,6 @@ 1.8 UTF-8 UTF-8 - 2.6.6 @@ -30,18 +29,6 @@ adc-da-sys 3.0.0 - - - net.sf.ehcache - ehcache-core - ${ehcache.version} - - - net.sf.ehcache - ehcache-web - 2.0.4 - - diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/JWTRealm.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/JWTRealm.java index e70c347e..529af2b5 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/JWTRealm.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/JWTRealm.java @@ -20,7 +20,7 @@ import org.springframework.stereotype.Service; import java.io.Serializable; import java.util.*; -//@Service +@Service public class JWTRealm extends AuthorizingRealm { private static final Logger logger = LoggerFactory.getLogger(JWTRealm.class); diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/DefinitionUrlConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/DefinitionUrlConfig.java index ed910f84..2f338bb1 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/config/DefinitionUrlConfig.java +++ b/adc-da-main/src/main/java/com/adc/da/main/config/DefinitionUrlConfig.java @@ -30,7 +30,7 @@ public class DefinitionUrlConfig { public static Map definitionUrlOptions(){ Map filterRuleMap = new LinkedHashMap<>(); //TODO 此处设置URL过滤规则 默认是全部请求进行拦截,此处设置为不拦截的URL地址 - filterRuleMap.put("/api/auth/login",ANON);//登录接口 + filterRuleMap.put("/api/login",ANON);//登录接口 // swagger接口文档 filterRuleMap.put("/v2/api-docs", "anon"); filterRuleMap.put("/webjars/**", "anon"); diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/ShiroConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/ShiroConfig.java index b1268fa1..4bfc489b 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/config/ShiroConfig.java +++ b/adc-da-main/src/main/java/com/adc/da/main/config/ShiroConfig.java @@ -22,7 +22,7 @@ import javax.servlet.Filter; import java.util.HashMap; import java.util.Map; -//@Configuration +@Configuration @Order(value=1) public class ShiroConfig { @@ -99,7 +99,7 @@ public class ShiroConfig { //ssl:比如/admins/user/**=ssl没有参数,表示安全的url请求,协议为https //user:比如/admins/user/**=user没有参数表示必须存在用户,当登入操作时不做检查 Map definitionMap = DefinitionUrlConfig.definitionUrlOptions(); - definitionMap.put(URL_SUFFIX+"/**", JWT_FILTER_NAME); +// definitionMap.put(URL_SUFFIX+"/**", JWT_FILTER_NAME); return definitionMap; }