Skip to content

S
smart_gov_platform
Commit 113e295f authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加网关验证码验证

parent ca115ca5
Show whitespace changes
Inline Side-by-side
Showing with 400 additions and 532 deletions
.idea/libraries/Maven__antlr_antlr_2_7_7.xml → .idea/libraries/Maven__cn_hutool_hutool_all_5_7_14.xml
View file @ 113e295f
<component name="libraryTable"> <component name="libraryTable">
<library name="Maven: antlr:antlr:2.7.7"> <library name="Maven: cn.hutool:hutool-all:5.7.14">
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/antlr/antlr/2.7.7/antlr-2.7.7.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/cn/hutool/hutool-all/5.7.14/hutool-all-5.7.14.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/antlr/antlr/2.7.7/antlr-2.7.7-javadoc.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/cn/hutool/hutool-all/5.7.14/hutool-all-5.7.14-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/antlr/antlr/2.7.7/antlr-2.7.7-sources.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/cn/hutool/hutool-all/5.7.14/hutool-all-5.7.14-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
\ No newline at end of file
.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml deleted 100644 → 0
View file @ ca115ca5
<component name="libraryTable">
<library name="Maven: com.sun.activation:jakarta.activation:1.2.2">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_11.xml deleted 100644 → 0
View file @ ca115ca5
<component name="libraryTable">
<library name="Maven: com.sun.istack:istack-commons-runtime:3.0.11">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/com/sun/istack/istack-commons-runtime/3.0.11/istack-commons-runtime-3.0.11.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/com/sun/istack/istack-commons-runtime/3.0.11/istack-commons-runtime-3.0.11-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/com/sun/istack/istack-commons-runtime/3.0.11/istack-commons-runtime-3.0.11-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_jboss_jandex_2_1_3_Final.xml → .idea/libraries/Maven__io_reactivex_rxjava3_rxjava_3_0_12.xml
View file @ 113e295f
<component name="libraryTable"> <component name="libraryTable">
<library name="Maven: org.jboss:jandex:2.1.3.Final"> <library name="Maven: io.reactivex.rxjava3:rxjava:3.0.12">
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/jboss/jandex/2.1.3.Final/jandex-2.1.3.Final.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/io/reactivex/rxjava3/rxjava/3.0.12/rxjava-3.0.12.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/jboss/jandex/2.1.3.Final/jandex-2.1.3.Final-javadoc.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/io/reactivex/rxjava3/rxjava/3.0.12/rxjava-3.0.12-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/jboss/jandex/2.1.3.Final/jandex-2.1.3.Final-sources.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/io/reactivex/rxjava3/rxjava/3.0.12/rxjava-3.0.12-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
\ No newline at end of file
.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml deleted 100644 → 0
View file @ ca115ca5
<component name="libraryTable">
<library name="Maven: jakarta.persistence:jakarta.persistence-api:2.2.3">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/jakarta/persistence/jakarta.persistence-api/2.2.3/jakarta.persistence-api-2.2.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/jakarta/persistence/jakarta.persistence-api/2.2.3/jakarta.persistence-api-2.2.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/jakarta/persistence/jakarta.persistence-api/2.2.3/jakarta.persistence-api-2.2.3-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml deleted 100644 → 0
View file @ ca115ca5
<component name="libraryTable">
<library name="Maven: jakarta.transaction:jakarta.transaction-api:1.3.3">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/jakarta/transaction/jakarta.transaction-api/1.3.3/jakarta.transaction-api-1.3.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/jakarta/transaction/jakarta.transaction-api/1.3.3/jakarta.transaction-api-1.3.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/jakarta/transaction/jakarta.transaction-api/1.3.3/jakarta.transaction-api-1.3.3-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml deleted 100644 → 0
View file @ ca115ca5
<component name="libraryTable">
<library name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml deleted 100644 → 0
View file @ ca115ca5
<component name="libraryTable">
<library name="Maven: org.glassfish.jaxb:txw2:2.3.3">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/glassfish/jaxb/txw2/2.3.3/txw2-2.3.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/glassfish/jaxb/txw2/2.3.3/txw2-2.3.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/glassfish/jaxb/txw2/2.3.3/txw2-2.3.3-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_2_Final.xml deleted 100644 → 0
View file @ ca115ca5
<component name="libraryTable">
<library name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.2.Final">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/hibernate/common/hibernate-commons-annotations/5.1.2.Final/hibernate-commons-annotations-5.1.2.Final.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/hibernate/common/hibernate-commons-annotations/5.1.2.Final/hibernate-commons-annotations-5.1.2.Final-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/hibernate/common/hibernate-commons-annotations/5.1.2.Final/hibernate-commons-annotations-5.1.2.Final-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_27_Final.xml deleted 100644 → 0
View file @ ca115ca5
<component name="libraryTable">
<library name="Maven: org.hibernate:hibernate-core:5.4.27.Final">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/hibernate/hibernate-core/5.4.27.Final/hibernate-core-5.4.27.Final.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/hibernate/hibernate-core/5.4.27.Final/hibernate-core-5.4.27.Final-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/hibernate/hibernate-core/5.4.27.Final/hibernate-core-5.4.27.Final-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_javassist_javassist_3_27_0_GA.xml → .idea/libraries/Maven__org_javassist_javassist_3_25_0_GA.xml
View file @ 113e295f
<component name="libraryTable"> <component name="libraryTable">
<library name="Maven: org.javassist:javassist:3.27.0-GA"> <library name="Maven: org.javassist:javassist:3.25.0-GA">
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/javassist/javassist/3.27.0-GA/javassist-3.27.0-GA.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/javassist/javassist/3.25.0-GA/javassist-3.25.0-GA.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/javassist/javassist/3.27.0-GA/javassist-3.27.0-GA-javadoc.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/javassist/javassist/3.25.0-GA/javassist-3.25.0-GA-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/javassist/javassist/3.27.0-GA/javassist-3.27.0-GA-sources.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/javassist/javassist/3.25.0-GA/javassist-3.25.0-GA-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
\ No newline at end of file
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_3_8_RELEASE.xml deleted 100644 → 0
View file @ ca115ca5
<component name="libraryTable">
<library name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.3.8.RELEASE">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/boot/spring-boot-starter-data-jpa/2.3.8.RELEASE/spring-boot-starter-data-jpa-2.3.8.RELEASE.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/boot/spring-boot-starter-data-jpa/2.3.8.RELEASE/spring-boot-starter-data-jpa-2.3.8.RELEASE-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/boot/spring-boot-starter-data-jpa/2.3.8.RELEASE/spring-boot-starter-data-jpa-2.3.8.RELEASE-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_gateway_3_1_3.xml → .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_gateway_2_2_7_RELEASE.xml
View file @ 113e295f
<component name="libraryTable"> <component name="libraryTable">
<library name="Maven: org.springframework.cloud:spring-cloud-starter-gateway:3.1.3"> <library name="Maven: org.springframework.cloud:spring-cloud-starter-gateway:2.2.7.RELEASE">
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/cloud/spring-cloud-starter-gateway/3.1.3/spring-cloud-starter-gateway-3.1.3.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/cloud/spring-cloud-starter-gateway/2.2.7.RELEASE/spring-cloud-starter-gateway-2.2.7.RELEASE.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/cloud/spring-cloud-starter-gateway/3.1.3/spring-cloud-starter-gateway-3.1.3-javadoc.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/cloud/spring-cloud-starter-gateway/2.2.7.RELEASE/spring-cloud-starter-gateway-2.2.7.RELEASE-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/cloud/spring-cloud-starter-gateway/3.1.3/spring-cloud-starter-gateway-3.1.3-sources.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/cloud/spring-cloud-starter-gateway/2.2.7.RELEASE/spring-cloud-starter-gateway-2.2.7.RELEASE-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
\ No newline at end of file
.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_3_6_RELEASE.xml deleted 100644 → 0
View file @ ca115ca5
<component name="libraryTable">
<library name="Maven: org.springframework.data:spring-data-jpa:2.3.6.RELEASE">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/data/spring-data-jpa/2.3.6.RELEASE/spring-data-jpa-2.3.6.RELEASE.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/data/spring-data-jpa/2.3.6.RELEASE/spring-data-jpa-2.3.6.RELEASE-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/data/spring-data-jpa/2.3.6.RELEASE/spring-data-jpa-2.3.6.RELEASE-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_springframework_spring_orm_5_2_12_RELEASE.xml deleted 100644 → 0
View file @ ca115ca5
<component name="libraryTable">
<library name="Maven: org.springframework:spring-orm:5.2.12.RELEASE">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/spring-orm/5.2.12.RELEASE/spring-orm-5.2.12.RELEASE.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/spring-orm/5.2.12.RELEASE/spring-orm-5.2.12.RELEASE-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/spring-orm/5.2.12.RELEASE/spring-orm-5.2.12.RELEASE-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_3.xml → .idea/libraries/Maven__org_springframework_spring_test_5_3_21.xml
View file @ 113e295f
<component name="libraryTable"> <component name="libraryTable">
<library name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.3"> <library name="Maven: org.springframework:spring-test:5.3.21">
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/glassfish/jaxb/jaxb-runtime/2.3.3/jaxb-runtime-2.3.3.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/spring-test/5.3.21/spring-test-5.3.21.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/glassfish/jaxb/jaxb-runtime/2.3.3/jaxb-runtime-2.3.3-javadoc.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/spring-test/5.3.21/spring-test-5.3.21-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/glassfish/jaxb/jaxb-runtime/2.3.3/jaxb-runtime-2.3.3-sources.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/spring-test/5.3.21/spring-test-5.3.21-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
\ No newline at end of file
.idea/libraries/Maven__org_springframework_spring_aspects_5_2_12_RELEASE.xml → .idea/libraries/Maven__org_springframework_spring_webflux_5_2_12_RELEASE.xml
View file @ 113e295f
<component name="libraryTable"> <component name="libraryTable">
<library name="Maven: org.springframework:spring-aspects:5.2.12.RELEASE"> <library name="Maven: org.springframework:spring-webflux:5.2.12.RELEASE">
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/spring-aspects/5.2.12.RELEASE/spring-aspects-5.2.12.RELEASE.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/spring-webflux/5.2.12.RELEASE/spring-webflux-5.2.12.RELEASE.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/spring-aspects/5.2.12.RELEASE/spring-aspects-5.2.12.RELEASE-javadoc.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/spring-webflux/5.2.12.RELEASE/spring-webflux-5.2.12.RELEASE-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/spring-aspects/5.2.12.RELEASE/spring-aspects-5.2.12.RELEASE-sources.jar!/" /> <root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/spring-webflux/5.2.12.RELEASE/spring-webflux-5.2.12.RELEASE-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
\ No newline at end of file
.idea/libraries/Maven__org_springframework_spring_webflux_5_3_18.xml deleted 100644 → 0
View file @ ca115ca5
<component name="libraryTable">
<library name="Maven: org.springframework:spring-webflux:5.3.18">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/spring-webflux/5.3.18/spring-webflux-5.3.18.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/spring-webflux/5.3.18/spring-webflux-5.3.18-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../MavenRepository/maven_jar/org/springframework/spring-webflux/5.3.18/spring-webflux-5.3.18-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/base/framework/filter/RequestFilter.java
View file @ 113e295f
...@@ -23,7 +23,7 @@ import java.io.IOException; ...@@ -23,7 +23,7 @@ import java.io.IOException;
* @author: zxfei * @author: zxfei
* @date: 2022/4/20 14:52 * @date: 2022/4/20 14:52
*/ */
@Component //@Component
@Slf4j @Slf4j
public class RequestFilter extends OncePerRequestFilter implements Filter { public class RequestFilter extends OncePerRequestFilter implements Filter {
......
base-manager/src/test/java/com/mortals/httpclient/http-client.env.json
View file @ 113e295f
{ {
"base-local": { "base-local": {
"baseUrl": "http://127.0.0.1:17211/zwfw" "baseUrl": "http://127.0.0.1:17231/base"
}, },
"base-dev": { "base-dev": {
"baseUrl": "http://192.168.0.217:17311/zwfw" "baseUrl": "http://192.168.0.217:17211/base"
}, },
"base-test": { "base-test": {
"baseUrl": "http://192.168.0.98:11071/zwfw" "baseUrl": "http://192.168.0.98:11071/zwfw"
......
base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http
View file @ 113e295f
...@@ -5,8 +5,6 @@ Authorization: {{authToken}} ...@@ -5,8 +5,6 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"siteName":"测试站点",
"areaID":"a9pbna",
"page":1, "page":1,
"size":10 "size":10
} }
......
base-manager/src/test/java/com/mortals/httpclient/system/system.http
View file @ 113e295f
...@@ -31,7 +31,7 @@ Accept: application/json ...@@ -31,7 +31,7 @@ Accept: application/json
###解析token ###解析token
POST {{baseUrl}}/login/parseToken POST {{baseUrl}}/login/parseToken
Content-Type: application/json Content-Type: application/json
Authorization: Bearer {{authToken}} Authorization: {{authToken}}
###短信设置删除 ###短信设置删除
GET {{baseUrl}}/sms/set/delete?id={{SmsSet_id}} GET {{baseUrl}}/sms/set/delete?id={{SmsSet_id}}
......
common-lib/pom.xml
View file @ 113e295f
...@@ -52,12 +52,6 @@ ...@@ -52,12 +52,6 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.6.2</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.kafka</groupId> <groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId> <artifactId>kafka-clients</artifactId>
......
common-lib/src/main/java/com/mortals/xhx/feign/req/BaseQuery.java
View file @ 113e295f
package com.mortals.xhx.feign.req; package com.mortals.xhx.feign.req;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
......
portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserController.java
View file @ 113e295f
...@@ -119,8 +119,8 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic ...@@ -119,8 +119,8 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
this.init(model, context); this.init(model, context);
ret.setCode(code); ret.setCode(code);
ret.setData(model); ret.setData(model);
ret.setDict((Map<String, Object>) model.remove(KEY_RESULT_DICT)); ret.setDict(model.get(KEY_RESULT_DICT)==null?null:(Map<String,Object>)model.remove(KEY_RESULT_DICT));
ret.setMsg(model.remove(MESSAGE_INFO).toString()); ret.setMsg(model.get(MESSAGE_INFO)==null?"":model.remove(MESSAGE_INFO).toString());
return ret; return ret;
} }
......
smart-gateway/pom.xml
View file @ 113e295f
...@@ -104,24 +104,19 @@ ...@@ -104,24 +104,19 @@
<version>1.30.0</version> <version>1.30.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId> <!-- <dependency>
<artifactId>spring-webflux</artifactId> <groupId>org.springframework.boot</groupId>
<version>5.3.18</version> <artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency> </dependency>-->
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-gateway</artifactId> <artifactId>spring-cloud-starter-gateway</artifactId>
<version>3.1.3</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency> </dependency>
<!-- 引入 SpringMVC 相关依赖，并实现对其的自动配置 --> <!-- 引入 SpringMVC 相关依赖，并实现对其的自动配置 -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
...@@ -131,118 +126,9 @@ ...@@ -131,118 +126,9 @@
<groupId>org.springframework.data</groupId> <groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId> <artifactId>spring-data-redis</artifactId>
</dependency> </dependency>
<!-- <dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-core</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-parameter-flow-control</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-datasource-extension</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-datasource-apollo</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-datasource-zookeeper</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-datasource-nacos</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-datasource-redis</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-datasource-consul</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-web-servlet</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-spring-cloud-gateway-adapter</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-transport-simple-http</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-annotation-aspectj</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-dubbo-adapter</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-apache-dubbo-adapter</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-reactor-adapter</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-cluster-server-default</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-cluster-client-default</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-spring-webflux-adapter</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-api-gateway-adapter-common</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-spring-webmvc-adapter</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
<version>${seata.version}</version>
</dependency>-->
</dependencies> </dependencies>
<build> <build>
<resources> <resources>
<resource> <resource>
......
smart-gateway/smart-gateway.iml
View file @ 113e295f
...@@ -23,7 +23,9 @@ ...@@ -23,7 +23,9 @@
<orderEntry type="library" name="Maven: org.apache.axis:axis:1.4" level="project" /> <orderEntry type="library" name="Maven: org.apache.axis:axis:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" /> <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
<orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.5.1" level="project" /> <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.15.RELEASE" level="project" />
<orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" /> <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
<orderEntry type="library" name="Maven: com.mortals.util:mortals-util:1.0.5-SNAPSHOT" level="project" /> <orderEntry type="library" name="Maven: com.mortals.util:mortals-util:1.0.5-SNAPSHOT" level="project" />
...@@ -46,7 +48,22 @@ ...@@ -46,7 +48,22 @@
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.10" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.10" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" />
<orderEntry type="library" name="Maven: org.json:json:20180130" level="project" /> <orderEntry type="library" name="Maven: org.json:json:20180130" level="project" />
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" /> <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
<orderEntry type="library" name="Maven: org.redisson:redisson-spring-boot-starter:3.17.3" level="project" />
<orderEntry type="library" name="Maven: org.redisson:redisson:3.17.3" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.65.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.65.Final" level="project" />
<orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.1" level="project" />
<orderEntry type="library" name="Maven: io.reactivex.rxjava3:rxjava:3.0.12" level="project" />
<orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling:2.0.11.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling-river:2.0.11.Final" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.4" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.19" level="project" />
<orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.1.6" level="project" />
<orderEntry type="library" name="Maven: org.jodd:jodd-core:5.1.6" level="project" />
<orderEntry type="library" name="Maven: org.redisson:redisson-spring-data-27:3.17.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.3.8.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.3.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.3.8.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.3.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.3.8.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.3.8.RELEASE" level="project" />
...@@ -75,16 +92,15 @@ ...@@ -75,16 +92,15 @@
<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.gson:gson:2.8.6" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.76" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.4" level="project" /> <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.8.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.8.1" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.5.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.5.1" level="project" />
<orderEntry type="library" name="Maven: com.github.luben:zstd-jni:1.4.4-7" level="project" /> <orderEntry type="library" name="Maven: com.github.luben:zstd-jni:1.4.4-7" level="project" />
<orderEntry type="library" name="Maven: org.lz4:lz4-java:1.7.1" level="project" /> <orderEntry type="library" name="Maven: org.lz4:lz4-java:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.7.3" level="project" /> <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.7.3" level="project" />
<orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.9.0" level="project" /> <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.9.0" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.6.5" level="project" /> <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.14" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:27.1-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:27.1-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
...@@ -93,36 +109,32 @@ ...@@ -93,36 +109,32 @@
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.2.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.2.0" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.17" level="project" /> <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.17" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.3.8.RELEASE" level="project" /> <orderEntry type="library" name="Maven: cn.dev33:sa-token-reactor-spring-boot-starter:1.30.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.8.RELEASE" level="project" /> <orderEntry type="library" name="Maven: cn.dev33:sa-token-core:1.30.0" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-gateway:2.2.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.8.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.15.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
<orderEntry type="library" name="Maven: jakarta.transaction:jakarta.transaction-api:1.3.3" level="project" /> <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
<orderEntry type="library" name="Maven: jakarta.persistence:jakarta.persistence-api:2.2.3" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-gateway-server:2.2.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.4.27.Final" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.3.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.7.Final" level="project" />
<orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" /> <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.27.0-GA" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.19" level="project" />
<orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.jboss:jandex:2.1.3.Final" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" /> <orderEntry type="library" name="Maven: io.projectreactor.addons:reactor-extra:3.3.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.2.Final" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-webflux:2.3.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.3" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-reactor-netty:2.3.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" /> <orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty:0.9.16.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.3" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.65.Final" level="project" />
<orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.11" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-codec-http2:4.1.65.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.65.Final" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.3.6.RELEASE" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.65.Final" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.65.Final" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:5.2.12.RELEASE" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.65.Final" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.12.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webflux:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.12.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.synchronoss.cloud:nio-multipart-parser:1.1.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.12.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.synchronoss.cloud:nio-stream-storage:1.1.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.8.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.8.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.8.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.8.RELEASE" level="project" />
...@@ -132,6 +144,8 @@ ...@@ -132,6 +144,8 @@
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" /> <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" /> <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.8.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
...@@ -142,10 +156,13 @@ ...@@ -142,10 +156,13 @@
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" /> <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.41" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.41" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.12.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.12.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.12.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.12.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.12.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.12.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.12.RELEASE" level="project" />
...@@ -178,10 +195,6 @@ ...@@ -178,10 +195,6 @@
<orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.6.RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2.2.6.RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2.2.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.7.RELEASE" level="project" />
......
smart-gateway/src/main/java/com/mortals/xhx/GateApiApplication.java
View file @ 113e295f
...@@ -2,6 +2,7 @@ package com.mortals.xhx; ...@@ -2,6 +2,7 @@ package com.mortals.xhx;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
...@@ -10,9 +11,9 @@ import org.springframework.context.annotation.ImportResource; ...@@ -10,9 +11,9 @@ import org.springframework.context.annotation.ImportResource;
import com.mortals.framework.springcloud.boot.BaseWebApplication; import com.mortals.framework.springcloud.boot.BaseWebApplication;
@EnableFeignClients @EnableFeignClients
@SpringBootApplication(scanBasePackages = { "com.mortals" }) @SpringBootApplication(exclude= {DataSourceAutoConfiguration.class},scanBasePackages = { "com.mortals" })
@ServletComponentScan("com.mortals") @ServletComponentScan("com.mortals")
//@ImportResource(locations = { "classpath:config/spring-config.xml" }) @ImportResource(locations = { "classpath:config/spring-config.xml" })
public class GateApiApplication extends BaseWebApplication{ public class GateApiApplication extends BaseWebApplication{
public static void main(String[] args) { public static void main(String[] args) {
......
smart-gateway/src/main/java/com/mortals/xhx/base/framework/config/GatewayConfig.java
View file @ 113e295f
...@@ -5,6 +5,9 @@ import org.springframework.context.annotation.Bean; ...@@ -5,6 +5,9 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
import org.springframework.security.config.web.server.ServerHttpSecurity;
import org.springframework.security.web.server.SecurityWebFilterChain;
/** /**
* 网关限流配置 * 网关限流配置
...@@ -13,10 +16,20 @@ import org.springframework.core.annotation.Order; ...@@ -13,10 +16,20 @@ import org.springframework.core.annotation.Order;
* @date: 2022/6/20 13:52 * @date: 2022/6/20 13:52
*/ */
@Configuration @Configuration
@EnableWebFluxSecurity
public class GatewayConfig { public class GatewayConfig {
@Bean @Bean
@Order(Ordered.HIGHEST_PRECEDENCE) @Order(Ordered.HIGHEST_PRECEDENCE)
public SentinelFallbackHandler sentinelGatewayExceptionHandler() { public SentinelFallbackHandler sentinelGatewayExceptionHandler() {
return new SentinelFallbackHandler(); return new SentinelFallbackHandler();
} }
@Bean
public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
//配置白名单和访问规则，CommonEnum枚举类
http.csrf().disable();
return http.build();
}
} }
\ No newline at end of file
smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/AuthFilter.java
View file @ 113e295f
...@@ -35,7 +35,7 @@ public class AuthFilter { ...@@ -35,7 +35,7 @@ public class AuthFilter {
.notMatch(ignoreWhite.getWhites()) .notMatch(ignoreWhite.getWhites())
.check(r -> { .check(r -> {
// 检查是否登录 是否有token // 检查是否登录 是否有token
StpUtil.checkLogin(); // StpUtil.checkLogin();
// 有效率影响 用于临时测试 // 有效率影响 用于临时测试
// if (log.isDebugEnabled()) { // if (log.isDebugEnabled()) {
// log.debug("剩余有效时间: {}", StpUtil.getTokenTimeout()); // log.debug("剩余有效时间: {}", StpUtil.getTokenTimeout());
......
smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/ForwardAuthFilter.java
View file @ 113e295f
...@@ -21,7 +21,7 @@ public class ForwardAuthFilter implements GlobalFilter { ...@@ -21,7 +21,7 @@ public class ForwardAuthFilter implements GlobalFilter {
ServerHttpRequest newRequest = exchange ServerHttpRequest newRequest = exchange
.getRequest() .getRequest()
.mutate() .mutate()
// 为请求添加 Id-Token 参数 // 为所有请求添加 Id-Token 参数,其它系统验证是否有token 如果没有则是非法服务
.header(SaIdUtil.ID_TOKEN, SaIdUtil.getToken()) .header(SaIdUtil.ID_TOKEN, SaIdUtil.getToken())
.build(); .build();
ServerWebExchange newExchange = exchange.mutate().request(newRequest).build(); ServerWebExchange newExchange = exchange.mutate().request(newRequest).build();
......
smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/GlobalCacheRequestFilter.java
View file @ 113e295f
...@@ -31,6 +31,7 @@ public class GlobalCacheRequestFilter implements GlobalFilter, Ordered { ...@@ -31,6 +31,7 @@ public class GlobalCacheRequestFilter implements GlobalFilter, Ordered {
} }
return chain.filter(exchange.mutate().request(serverHttpRequest).build()); return chain.filter(exchange.mutate().request(serverHttpRequest).build());
}); });
} }
@Override @Override
......
smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/GlobalLogFilter.java
View file @ 113e295f
...@@ -42,7 +42,41 @@ public class GlobalLogFilter implements GlobalFilter, Ordered { ...@@ -42,7 +42,41 @@ public class GlobalLogFilter implements GlobalFilter, Ordered {
@Override @Override
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) { public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
ServerHttpRequest request = exchange.getRequest();
return chain.filter(exchange);
/* if (!customGatewayProperties.getRequestLog()) {
return chain.filter(exchange);
}*/
/* ServerHttpRequest request = exchange.getRequest();
String path = getOriginalRequestUrl(exchange);
String url = request.getMethod().name() + " " + path;
// 打印请求参数
if (isJsonRequest(request)) {
String jsonParam = resolveBodyFromRequest(request);
log.info("开始请求 => URL[{}],参数类型[json],参数:[{}]", url, jsonParam);
} else {
MultiValueMap<String, String> parameterMap = request.getQueryParams();
if (MapUtil.isNotEmpty(parameterMap)) {
log.info("开始请求 => URL[{}],参数类型[param],参数:[{}]", url, JSON.toJSONString(parameterMap));
} else {
log.info("开始请求 => URL[{}],无参数", url);
}
}
exchange.getAttributes().put(START_TIME, System.currentTimeMillis());
return chain.filter(exchange).then(Mono.fromRunnable(() -> {
Long startTime = exchange.getAttribute(START_TIME);
if (startTime != null) {
long executeTime = (System.currentTimeMillis() - startTime);
log.info("结束请求 => URL[{}],耗时:[{}]毫秒", url, executeTime);
}
}));*/
/*ServerHttpRequest request = exchange.getRequest();
String path = getOriginalRequestUrl(exchange); String path = getOriginalRequestUrl(exchange);
String url = request.getMethod().name() + " " + path; String url = request.getMethod().name() + " " + path;
...@@ -69,7 +103,7 @@ public class GlobalLogFilter implements GlobalFilter, Ordered { ...@@ -69,7 +103,7 @@ public class GlobalLogFilter implements GlobalFilter, Ordered {
long executeTime = (System.currentTimeMillis() - startTime); long executeTime = (System.currentTimeMillis() - startTime);
log.debug("结束请求 => URL[{}],耗时:[{}]毫秒", url, executeTime); log.debug("结束请求 => URL[{}],耗时:[{}]毫秒", url, executeTime);
} }
})); }));*/
} }
@Override @Override
......
smart-gateway/src/main/resources/bootstrap.yml
View file @ 113e295f
...@@ -2,6 +2,9 @@ server: ...@@ -2,6 +2,9 @@ server:
tomcat: tomcat:
uri-encoding: utf-8 uri-encoding: utf-8
spring: spring:
main:
web-application-type: reactive
allow-bean-definition-overriding: true
application: application:
name: @project.artifactId@ name: @project.artifactId@
profiles: profiles:
...@@ -11,6 +14,26 @@ spring: ...@@ -11,6 +14,26 @@ spring:
maxFileSize: 100Mb maxFileSize: 100Mb
maxRequestSize: 1000Mb maxRequestSize: 1000Mb
cloud: cloud:
# 网关配置
gateway:
httpclient:
connect-timeout: 1000
response-timeout: 5s
# 打印请求日志(自定义)
requestLog: true
discovery:
locator:
lowerCaseServiceId: true
enabled: true
routes:
# 基础服务
- id: base-manager
# uri: http://127.0.0.1:17211
uri: lb://base-manager
predicates:
- Path=/base/**
# filters:
# - StripPrefix=1
nacos: nacos:
# Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类 # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类
discovery: discovery:
...@@ -23,6 +46,42 @@ spring: ...@@ -23,6 +46,42 @@ spring:
namespace: ${spring.cloud.nacos.discovery.namespace} # Nacos 命名空间 dev 的编号 namespace: ${spring.cloud.nacos.discovery.namespace} # Nacos 命名空间 dev 的编号
file-extension: yaml file-extension: yaml
# 安全配置
security:
# 验证码
captcha:
# 是否开启验证码
enabled: true
# 验证码类型 math 数组计算 char 字符验证
type: MATH
# line 线段干扰 circle 圆圈干扰 shear 扭曲干扰
category: CIRCLE
# 数字验证码位数
numberLength: 1
# 字符验证码长度
charLength: 4
# 防止XSS攻击
xss:
enabled: true
excludeUrls:
- /system/notice
# 不校验白名单
ignore:
whites:
- /code
- /auth/logout
- /base/login/login
- /auth/smsLogin
- /auth/xcxLogin
- /auth/register
- /resource/sms/code
logging:
level:
reactor.netty: DEBUG
org.springframework.cloud.gateway: TRACE
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment