diff --git a/pom.xml b/pom.xml index ee03dd1..64ffffc 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,7 @@ udf-starter-datasource udf-starter-connection-pool-druid udf-starter-qrcode + udf-starter-auth @@ -132,6 +133,12 @@ udf-starter-qrcode ${udf-starter.version} + + + org.itkk.udf + udf-starter-auth + ${udf-starter.version} + diff --git a/udf-starter-auth/.checkstyle b/udf-starter-auth/.checkstyle new file mode 100644 index 0000000..7589bde --- /dev/null +++ b/udf-starter-auth/.checkstyle @@ -0,0 +1,7 @@ + + + + + + + diff --git a/udf-starter-auth/.gitignore b/udf-starter-auth/.gitignore new file mode 100644 index 0000000..c541155 --- /dev/null +++ b/udf-starter-auth/.gitignore @@ -0,0 +1,4 @@ +/target/ +/bin/ +/.classpath +/.project diff --git a/udf-starter-auth/pom.xml b/udf-starter-auth/pom.xml new file mode 100644 index 0000000..6ad0b96 --- /dev/null +++ b/udf-starter-auth/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + udf-starter-auth + udf-starter-auth + jar + http://itkk.org:81 + + + org.itkk.udf + udf-starter + 1.0 + + + + + org.itkk.udf + udf-starter-core + + + org.itkk.udf + udf-starter-rms + + + + com.netflix.zuul + zuul-core + + + diff --git a/udf-starter-auth/src/main/java/org/itkk/udf/auth/AuthConfig.java b/udf-starter-auth/src/main/java/org/itkk/udf/auth/AuthConfig.java new file mode 100644 index 0000000..cad9dd4 --- /dev/null +++ b/udf-starter-auth/src/main/java/org/itkk/udf/auth/AuthConfig.java @@ -0,0 +1,11 @@ +package org.itkk.udf.auth; + +import org.springframework.context.annotation.Configuration; + +/** + * AuthConfig + */ +@Configuration +public class AuthConfig { + +} diff --git a/udf-starter-rms/src/main/java/org/itkk/udf/rms/RmsFilter.java b/udf-starter-auth/src/main/java/org/itkk/udf/auth/RmsFilter.java similarity index 91% rename from udf-starter-rms/src/main/java/org/itkk/udf/rms/RmsFilter.java rename to udf-starter-auth/src/main/java/org/itkk/udf/auth/RmsFilter.java index f17241e..e74b3db 100644 --- a/udf-starter-rms/src/main/java/org/itkk/udf/rms/RmsFilter.java +++ b/udf-starter-auth/src/main/java/org/itkk/udf/auth/RmsFilter.java @@ -1,13 +1,16 @@ -package org.itkk.udf.rms; +package org.itkk.udf.auth; import com.netflix.zuul.ZuulFilter; import com.netflix.zuul.context.RequestContext; import org.apache.commons.lang3.StringUtils; import org.itkk.udf.core.exception.AuthException; +import org.itkk.udf.rms.Constant; +import org.itkk.udf.rms.RmsProperties; import org.itkk.udf.rms.meta.ApplicationMeta; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.netflix.zuul.filters.support.FilterConstants; +import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; @@ -16,6 +19,7 @@ import static com.netflix.zuul.context.RequestContext.getCurrentContext; /** * RmsFilter */ +@Component public class RmsFilter extends ZuulFilter { /** @@ -33,7 +37,7 @@ public class RmsFilter extends ZuulFilter { @Override public Object run() { //获得request - RequestContext ctx = RequestContext.getCurrentContext(); + RequestContext ctx = getCurrentContext(); //获得应用元数据 ApplicationMeta applicationMeta = rmsProperties.getApplication().get(springApplicationName); //判空 diff --git a/udf-starter-rms/pom.xml b/udf-starter-rms/pom.xml index 4921001..cf583ab 100644 --- a/udf-starter-rms/pom.xml +++ b/udf-starter-rms/pom.xml @@ -20,10 +20,5 @@ org.itkk.udf udf-starter-core - - - com.netflix.zuul - zuul-core - diff --git a/udf-starter-rms/src/main/java/org/itkk/udf/rms/RmsConfig.java b/udf-starter-rms/src/main/java/org/itkk/udf/rms/RmsConfig.java index 9071349..efbfc1e 100644 --- a/udf-starter-rms/src/main/java/org/itkk/udf/rms/RmsConfig.java +++ b/udf-starter-rms/src/main/java/org/itkk/udf/rms/RmsConfig.java @@ -7,7 +7,6 @@ package org.itkk.udf.rms; import lombok.Data; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.context.annotation.Bean; @@ -39,17 +38,6 @@ public class RmsConfig { @NotNull private String rmsPathPatterns; - /** - * rmsFilter - * - * @return RmsFilter - */ - @Bean - @ConditionalOnBean(name = "zuulServlet") - public RmsFilter rmsFilter() { - return new RmsFilter(); - } - /** * 描述 : restTemplate *