diff --git a/pom.xml b/pom.xml index 26b341e..8d8f355 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,8 @@ xservice-mysql-starter xservice-schedule-starter xservice-http-starter + xservice-parent-starter + xservice-parent-starter/xservice-web-starter @@ -70,157 +72,6 @@ - - - - - org.springframework.cloud - spring-cloud-starter-sleuth - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - org.springframework.boot - spring-boot-starter-security - - - - - org.springframework.security - spring-security-oauth2-authorization-server - ${spring.authorization.server.version} - - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - - - org.springframework.security - spring-security-oauth2-jose - 5.7.11 - - - - - mysql - mysql-connector-java - ${mysql.version} - - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${mybatis-spring-boot.version} - - - org.springframework.boot - spring-boot-starter-aop - - - - - org.springframework.boot - spring-boot-starter-data-redis - - - - - org.apache.rocketmq - rocketmq-spring-boot-starter - ${rocketmq.version} - - - - - org.projectlombok - lombok - ${lombok.version} - provided - - - - - org.springframework.boot - spring-boot-starter-web - - - - commons-io - commons-io - 2.18.0 - - - - com.github.pagehelper - pagehelper - 5.3.3 - - - - org.mapstruct - mapstruct - 1.5.5.Final - - - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - - - com.google.guava - guava - 32.0.1-android - - - org.apache.commons - commons-collections4 - 4.2 - - - org.apache.commons - commons-lang3 - 3.15.0 - - - - - com.alibaba.fastjson2 - fastjson2 - 2.0.51 - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.jcraft - jsch - 0.1.55 - - - diff --git a/xservice-cache-starter/pom.xml b/xservice-cache-starter/pom.xml index 9d39e52..fb97df7 100644 --- a/xservice-cache-starter/pom.xml +++ b/xservice-cache-starter/pom.xml @@ -18,4 +18,12 @@ UTF-8 + + + com.xiang + xservice-parent-starter + 2.0 + + + \ No newline at end of file diff --git a/xservice-common/pom.xml b/xservice-common/pom.xml index 1a97fe2..14a6bb3 100644 --- a/xservice-common/pom.xml +++ b/xservice-common/pom.xml @@ -19,5 +19,17 @@ + + + com.xiang + xservice-web-starter + 2.0 + + + com.xiang + xservice-parent-starter + 2.0 + + \ No newline at end of file diff --git a/xservice-common/src/main/java/com/xiang/xservice/basic/exception/CustomAccessDeniedHandler.java b/xservice-common/src/main/java/com/xiang/xservice/basic/exception/CustomAccessDeniedHandler.java deleted file mode 100644 index 6da4440..0000000 --- a/xservice-common/src/main/java/com/xiang/xservice/basic/exception/CustomAccessDeniedHandler.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.xiang.xservice.basic.exception; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.xiang.xservice.basic.common.resp.Result; -import com.xiang.xservice.basic.exception.code.ErrorCode; -import lombok.extern.slf4j.Slf4j; -import org.springframework.security.access.AccessDeniedException; -import org.springframework.security.web.access.AccessDeniedHandler; -import org.springframework.stereotype.Component; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -/** - * 用户403鉴权失败异常捕获 - */ -@Slf4j -@Component -public class CustomAccessDeniedHandler implements AccessDeniedHandler { - @Override - public void handle(HttpServletRequest request, - HttpServletResponse response, - AccessDeniedException accessDeniedException) throws IOException, ServletException { - response.setContentType("application/json;charset=UTF-8"); - response.setStatus(HttpServletResponse.SC_FORBIDDEN); - log.error("======用户鉴权失败======"); - Result result = Result.error(ErrorCode.USER_DENIED_ACCESS); - response.getWriter().write(new ObjectMapper().writeValueAsString(result)); - } -} diff --git a/xservice-common/src/main/java/com/xiang/xservice/basic/exception/CustomAuthenticationEntryPoint.java b/xservice-common/src/main/java/com/xiang/xservice/basic/exception/CustomAuthenticationEntryPoint.java deleted file mode 100644 index 96645d6..0000000 --- a/xservice-common/src/main/java/com/xiang/xservice/basic/exception/CustomAuthenticationEntryPoint.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.xiang.xservice.basic.exception; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.xiang.xservice.basic.common.resp.Result; -import com.xiang.xservice.basic.exception.code.ErrorCode; -import lombok.extern.slf4j.Slf4j; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.web.AuthenticationEntryPoint; -import org.springframework.stereotype.Component; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -/** - * 用户未鉴权异常处理器 - */ -@Slf4j -@Component -public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint { - @Override - public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { - response.setContentType("application/json;charset=UTF-8"); - response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); - log.error("========用户未进行验证鉴权=========="); - Result result = Result.error(ErrorCode.NOT_AUTHORIZATION); - response.getWriter().write(new ObjectMapper().writeValueAsString(result)); - } -} diff --git a/xservice-http-starter/pom.xml b/xservice-http-starter/pom.xml index f8d7758..473673b 100644 --- a/xservice-http-starter/pom.xml +++ b/xservice-http-starter/pom.xml @@ -24,6 +24,16 @@ guava-retrying 2.0.0 + + com.xiang + xservice-web-starter + 2.0 + + + com.xiang + xservice-parent-starter + 2.0 + diff --git a/xservice-parent-starter/pom.xml b/xservice-parent-starter/pom.xml new file mode 100644 index 0000000..a0c891c --- /dev/null +++ b/xservice-parent-starter/pom.xml @@ -0,0 +1,152 @@ + + + 4.0.0 + + com.xiang + xservice-basic + 2.0 + + + xservice-parent-starter + 2.0 + + + 17 + 17 + UTF-8 + + + + + + + org.springframework.boot + spring-boot-starter-aop + + + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + mysql + mysql-connector-java + ${mysql.version} + + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + ${mybatis-spring-boot.version} + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + org.apache.rocketmq + rocketmq-spring-boot-starter + ${rocketmq.version} + + + + + org.projectlombok + lombok + ${lombok.version} + + + + + commons-io + commons-io + 2.18.0 + + + + + com.github.pagehelper + pagehelper + 5.3.3 + + + + + org.mapstruct + mapstruct + 1.5.5.Final + + + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + + + com.google.guava + guava + 32.0.1-android + + + org.apache.commons + commons-collections4 + 4.2 + + + org.apache.commons + commons-lang3 + 3.15.0 + + + + + com.alibaba.fastjson2 + fastjson2 + 2.0.51 + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.jcraft + jsch + 0.1.55 + + + + + org.springframework.security + spring-security-oauth2-jose + 5.7.11 + + + + \ No newline at end of file diff --git a/xservice-parent-starter/xservice-web-starter/pom.xml b/xservice-parent-starter/xservice-web-starter/pom.xml new file mode 100644 index 0000000..f0fe20b --- /dev/null +++ b/xservice-parent-starter/xservice-web-starter/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + com.xiang + xservice-basic + 2.0 + ../../pom.xml + + + xservice-web-starter + 2.0 + + + 17 + 17 + UTF-8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + \ No newline at end of file