From 24e3a4c835491910936a0580bd2d6f382f2cddd7 Mon Sep 17 00:00:00 2001
From: zhangchunhong <xlzhangyang@gmail.com>
Date: Sun, 29 Nov 2020 16:44:14 +0800
Subject: [PATCH] 删除多余文件，调整依赖
---
/dev/null | 5 -----
hbbohua-water-webapp/pom.xml | 6 +++++-
hbbohua-water-webapp/src/main/webapp/WEB-INF/web.xml | 21 ++++++++++++++-------
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/hbbohua-water-webapp/pom.xml b/hbbohua-water-webapp/pom.xml
index 6aa46a5..53399c2 100644
--- a/hbbohua-water-webapp/pom.xml
+++ b/hbbohua-water-webapp/pom.xml
@@ -21,7 +21,11 @@
<artifactId>hbbohua-water-web</artifactId>
<version>${project.parent.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>com.ooxsoft.platform</groupId>
+ <artifactId>ooxsoft-platform-web</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
<!--选配组件===========================================-->
<!--JAX-RS RESTful Web Service-->
<dependency>
diff --git a/hbbohua-water-webapp/src/main/webapp/WEB-INF/web.xml b/hbbohua-water-webapp/src/main/webapp/WEB-INF/web.xml
index 9f88c1f..d3cf791 100644
--- a/hbbohua-water-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/hbbohua-water-webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,14 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
-
-<web-app>
- <display-name>Archetype Created Web Application</display-name>
-</web-app>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0">
+ <!--配置SSL -->
+ <!-- <security-constraint>-->
+ <!-- <web-resource-collection>-->
+ <!-- <web-resource-name>SSL</web-resource-name>-->
+ <!-- <url-pattern>/*</url-pattern>-->
+ <!-- </web-resource-collection>-->
+ <!-- <user-data-constraint>-->
+ <!-- <transport-guarantee>CONFIDENTIAL</transport-guarantee>-->
+ <!-- </user-data-constraint>-->
+ <!-- </security-constraint>-->
+</web-app>
\ No newline at end of file
diff --git a/hbbohua-water-webapp/src/main/webapp/index.jsp b/hbbohua-water-webapp/src/main/webapp/index.jsp
deleted file mode 100644
index c38169b..0000000
--- a/hbbohua-water-webapp/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-<h2>Hello World!</h2>
-</body>
-</html>
--
Gitblit v1.9.1