diff --git a/udf-api/pom.xml b/udf-api/pom.xml index a82645e..a0a164b 100644 --- a/udf-api/pom.xml +++ b/udf-api/pom.xml @@ -28,6 +28,7 @@ udf-api-common udf-api-general udf-api-rbac + udf-api-page @@ -40,6 +41,12 @@ pom import + + + org.itkk.udf + udf-api-page + ${udf-api.version} + org.itkk.udf diff --git a/udf-api/udf-api-page/pom.xml b/udf-api/udf-api-page/pom.xml new file mode 100644 index 0000000..f026a58 --- /dev/null +++ b/udf-api/udf-api-page/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + udf-api-page + udf-api-page + jar + https://www.itkk.org/ + + + org.itkk.udf + udf-api + 1.0 + + + + + + org.itkk.udf + udf-api-common + + + + org.itkk.udf + udf-api-rbac + + + diff --git a/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/PageConfiguration.java b/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/PageConfiguration.java new file mode 100644 index 0000000..75884ce --- /dev/null +++ b/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/PageConfiguration.java @@ -0,0 +1,29 @@ +package org.itkk.udf.api.page; + +import org.itkk.udf.api.page.auth.CommonHandlerInterceptor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * 配置类 + */ +@Configuration +public class PageConfiguration implements WebMvcConfigurer { + /** + * commonHandlerInterceptor + */ + @Autowired + private CommonHandlerInterceptor commonHandlerInterceptor; + + /** + * 添加拦截器 + * + * @param registry registry + */ + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(commonHandlerInterceptor).order(1).addPathPatterns("/**"); + } +} diff --git a/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/PageConstant.java b/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/PageConstant.java new file mode 100644 index 0000000..98078e7 --- /dev/null +++ b/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/PageConstant.java @@ -0,0 +1,13 @@ +package org.itkk.udf.api.page; + +/** + * 常量类 + */ +public class PageConstant { + /** + * 私有化构造函数 + */ + private PageConstant() { + + } +} diff --git a/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/PageUtil.java b/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/PageUtil.java new file mode 100644 index 0000000..18f8630 --- /dev/null +++ b/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/PageUtil.java @@ -0,0 +1,16 @@ +package org.itkk.udf.api.page; + +import lombok.extern.slf4j.Slf4j; + +/** + * 工具类 + */ +@Slf4j +public class PageUtil { + /** + * 私有化构造函数 + */ + private PageUtil() { + + } +} diff --git a/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/auth/CommonHandlerInterceptor.java b/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/auth/CommonHandlerInterceptor.java similarity index 97% rename from udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/auth/CommonHandlerInterceptor.java rename to udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/auth/CommonHandlerInterceptor.java index 8955cb1..2dc0d34 100644 --- a/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/auth/CommonHandlerInterceptor.java +++ b/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/auth/CommonHandlerInterceptor.java @@ -1,4 +1,4 @@ -package org.itkk.udf.api.rbac.auth; +package org.itkk.udf.api.page.auth; import lombok.extern.slf4j.Slf4j; diff --git a/udf-api/udf-api-server/src/main/java/org/itkk/udf/api/server/web/HomeController.java b/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/web/HomeController.java similarity index 91% rename from udf-api/udf-api-server/src/main/java/org/itkk/udf/api/server/web/HomeController.java rename to udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/web/HomeController.java index 4d62789..0a8f867 100644 --- a/udf-api/udf-api-server/src/main/java/org/itkk/udf/api/server/web/HomeController.java +++ b/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/web/HomeController.java @@ -1,4 +1,4 @@ -package org.itkk.udf.api.server.web; +package org.itkk.udf.api.page.web; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/RbacConfiguration.java b/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/RbacConfiguration.java index 7725a5b..d90b2f1 100644 --- a/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/RbacConfiguration.java +++ b/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/RbacConfiguration.java @@ -1,7 +1,6 @@ package org.itkk.udf.api.rbac; import org.itkk.udf.api.common.CommonConstant; -import org.itkk.udf.api.rbac.auth.CommonHandlerInterceptor; import org.itkk.udf.api.rbac.auth.WebHandlerInterceptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; @@ -19,12 +18,6 @@ public class RbacConfiguration implements WebMvcConfigurer { @Autowired private WebHandlerInterceptor webHandlerInterceptor; - /** - * commonHandlerInterceptor - */ - @Autowired - private CommonHandlerInterceptor commonHandlerInterceptor; - /** * 添加拦截器 * @@ -32,7 +25,6 @@ public class RbacConfiguration implements WebMvcConfigurer { */ @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(commonHandlerInterceptor).order(1).addPathPatterns("/**"); - registry.addInterceptor(webHandlerInterceptor).order(2).addPathPatterns(CommonConstant.URL_ROOT_WEB_PRIVATE + "**"); + registry.addInterceptor(webHandlerInterceptor).order(1).addPathPatterns(CommonConstant.URL_ROOT_WEB_PRIVATE + "**"); } } diff --git a/udf-api/udf-api-server/pom.xml b/udf-api/udf-api-server/pom.xml index 777c8ee..ecba884 100644 --- a/udf-api/udf-api-server/pom.xml +++ b/udf-api/udf-api-server/pom.xml @@ -30,6 +30,11 @@ org.itkk.udf udf-api-rbac + + + org.itkk.udf + udf-api-page +