From e46bf8a8bd19d3573c68fec5822129c92841dd92 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 06 二月 2023 17:34:47 +0800 Subject: [PATCH] 支持同时打war包和jar包 --- src/main/java/com/genersoft/iot/vmp/ServletInitializer.java | 13 ++++++ src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java | 11 +---- pom.xml | 37 ++++++++++++++++++ 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 2943343..7b5306e 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ <version>2.6.7</version> <name>web video platform</name> <description>鍥芥爣28181瑙嗛骞冲彴</description> + <packaging>${project.packaging}</packaging> <repositories> <repository> @@ -56,6 +57,42 @@ <asciidoctor.pdf.output.directory>${project.build.directory}/asciidoc/pdf</asciidoctor.pdf.output.directory> </properties> + <profiles> + <profile> + <id>jar</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <project.packaging>jar</project.packaging> + </properties> + </profile> + <profile> + <id>war</id> + <properties> + <project.packaging>war</project.packaging> + </properties> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.1.0</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> + <dependencies> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/src/main/java/com/genersoft/iot/vmp/ServletInitializer.java b/src/main/java/com/genersoft/iot/vmp/ServletInitializer.java new file mode 100644 index 0000000..d5639f2 --- /dev/null +++ b/src/main/java/com/genersoft/iot/vmp/ServletInitializer.java @@ -0,0 +1,13 @@ +package com.genersoft.iot.vmp; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +public class ServletInitializer extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(VManageBootstrap.class); + } + +} diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java index d0abfbf..c4086b9 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java @@ -2,7 +2,6 @@ import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; import com.genersoft.iot.vmp.service.IMediaServerService; -import org.apache.catalina.connector.ClientAbortException; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; @@ -15,11 +14,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.util.ObjectUtils; -import org.springframework.util.StringUtils; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.ConnectException; @@ -77,9 +74,7 @@ } catch (IOException ioException) { if (ioException instanceof ConnectException) { logger.error("zlm 杩炴帴澶辫触"); - } else if (ioException instanceof ClientAbortException) { - logger.error("zlm: 鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠g悊缁堟"); - } else { + } else { logger.error("zlm 浠g悊澶辫触锛� ", e); } } catch (RuntimeException exception){ @@ -195,9 +190,7 @@ } catch (IOException ioException) { if (ioException instanceof ConnectException) { logger.error("褰曞儚鏈嶅姟 杩炴帴澶辫触"); - } else if (ioException instanceof ClientAbortException) { - logger.error("褰曞儚鏈嶅姟:鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠g悊缁堟"); - } else { + }else { logger.error("褰曞儚鏈嶅姟 浠g悊澶辫触锛� ", e); } } catch (RuntimeException exception){ -- Gitblit v1.8.0