From 0484e1f64df2b07baa4e1ed04775a675d730bcc0 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sat, 11 May 2024 13:43:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{web => }/interceptor/LogInterceptorConfig.java | 2 +- .../interceptor/MobileViewInterceptorConfig.java | 2 +- .../config/{web => server}/DefaultServletConfig.java | 2 +- .../config/{web => server}/SchemeHttpsConfig.java | 9 ++++----- 4 files changed, 7 insertions(+), 8 deletions(-) rename modules/core/src/main/java/com/jeesite/modules/config/{web => }/interceptor/LogInterceptorConfig.java (94%) rename modules/core/src/main/java/com/jeesite/modules/config/{web => }/interceptor/MobileViewInterceptorConfig.java (94%) rename modules/core/src/main/java/com/jeesite/modules/config/{web => server}/DefaultServletConfig.java (93%) rename modules/core/src/main/java/com/jeesite/modules/config/{web => server}/SchemeHttpsConfig.java (94%) diff --git a/modules/core/src/main/java/com/jeesite/modules/config/web/interceptor/LogInterceptorConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/interceptor/LogInterceptorConfig.java similarity index 94% rename from modules/core/src/main/java/com/jeesite/modules/config/web/interceptor/LogInterceptorConfig.java rename to modules/core/src/main/java/com/jeesite/modules/config/interceptor/LogInterceptorConfig.java index 080de94e..ed36cfc6 100644 --- a/modules/core/src/main/java/com/jeesite/modules/config/web/interceptor/LogInterceptorConfig.java +++ b/modules/core/src/main/java/com/jeesite/modules/config/interceptor/LogInterceptorConfig.java @@ -2,7 +2,7 @@ * Copyright (c) 2013-Now http://jeesite.com All rights reserved. * No deletion without permission, or be held responsible to law. */ -package com.jeesite.modules.config.web.interceptor; +package com.jeesite.modules.config.interceptor; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Configuration; diff --git a/modules/core/src/main/java/com/jeesite/modules/config/web/interceptor/MobileViewInterceptorConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/interceptor/MobileViewInterceptorConfig.java similarity index 94% rename from modules/core/src/main/java/com/jeesite/modules/config/web/interceptor/MobileViewInterceptorConfig.java rename to modules/core/src/main/java/com/jeesite/modules/config/interceptor/MobileViewInterceptorConfig.java index dcb6fdd7..65eedef9 100644 --- a/modules/core/src/main/java/com/jeesite/modules/config/web/interceptor/MobileViewInterceptorConfig.java +++ b/modules/core/src/main/java/com/jeesite/modules/config/interceptor/MobileViewInterceptorConfig.java @@ -2,7 +2,7 @@ * Copyright (c) 2013-Now http://jeesite.com All rights reserved. * No deletion without permission, or be held responsible to law. */ -package com.jeesite.modules.config.web.interceptor; +package com.jeesite.modules.config.interceptor; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Configuration; diff --git a/modules/core/src/main/java/com/jeesite/modules/config/web/DefaultServletConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/server/DefaultServletConfig.java similarity index 93% rename from modules/core/src/main/java/com/jeesite/modules/config/web/DefaultServletConfig.java rename to modules/core/src/main/java/com/jeesite/modules/config/server/DefaultServletConfig.java index 250af005..373d2392 100644 --- a/modules/core/src/main/java/com/jeesite/modules/config/web/DefaultServletConfig.java +++ b/modules/core/src/main/java/com/jeesite/modules/config/server/DefaultServletConfig.java @@ -2,7 +2,7 @@ * Copyright (c) 2013-Now http://jeesite.com All rights reserved. * No deletion without permission, or be held responsible to law. */ -package com.jeesite.modules.config.web; +package com.jeesite.modules.config.server; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Configuration; diff --git a/modules/core/src/main/java/com/jeesite/modules/config/web/SchemeHttpsConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/server/SchemeHttpsConfig.java similarity index 94% rename from modules/core/src/main/java/com/jeesite/modules/config/web/SchemeHttpsConfig.java rename to modules/core/src/main/java/com/jeesite/modules/config/server/SchemeHttpsConfig.java index 3b491951..3fef28b5 100644 --- a/modules/core/src/main/java/com/jeesite/modules/config/web/SchemeHttpsConfig.java +++ b/modules/core/src/main/java/com/jeesite/modules/config/server/SchemeHttpsConfig.java @@ -2,18 +2,17 @@ * Copyright (c) 2013-Now http://jeesite.com All rights reserved. * No deletion without permission, or be held responsible to law. */ -package com.jeesite.modules.config.web; +package com.jeesite.modules.config.server; +import javax.servlet.Filter; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; -import javax.servlet.Filter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; - /** * 将请求协议转换为 https * @author ThinkGem