From 681566c84793b8ea3e06c688c9682c485d2fbc90 Mon Sep 17 00:00:00 2001 From: lixin Date: Wed, 15 Apr 2020 16:23:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=94=A8druid=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E6=B1=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 29 ++----- src/main/java/com/emr/vo/PdfWaterSetVo.java | 2 + .../resources/config/applicationContext.xml | 71 +++++++++++----- src/main/webapp/WEB-INF/lib/sqljdbc4-2.0.jar | Bin 466359 -> 0 bytes .../recordManage/commomSearch/commomList.jsp | 6 +- .../commomSearch/commomListqf.jsp | 7 +- src/main/webapp/index.jsp | 78 +++++++++++------- 7 files changed, 110 insertions(+), 83 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/lib/sqljdbc4-2.0.jar diff --git a/pom.xml b/pom.xml index 69972e5..8b24c45 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,6 @@ 2.4 2.1 1.2 - 0.9.5-pre6 5.0.1.Final 9.2-1004-jdbc4 5.17.0 @@ -51,7 +50,7 @@ 1.6.4 2.4 2.9.4 - 1.0.9 + 1.1.22 4.3.5 4.0.1 2.0 @@ -143,6 +142,13 @@ ${mysql.version} + + + com.microsoft.sqlserver + mssql-jdbc + 7.4.1.jre8 + + com.alibaba @@ -255,10 +261,9 @@ 5.0.0 - jstl + javax.servlet jstl ${jstl.version} - provided - - com.mchange - c3p0 - ${c3p0.version} - - - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + @@ -73,10 +101,10 @@ - + @@ -131,7 +159,7 @@ - + - <% - String POWER_URLHEAD = (String)request.getParameter("POWER_URLHEAD"); - String POWER_JSP = (String)request.getParameter("POWER_JSP"); - String token = (String)request.getSession().getAttribute("token"); + String POWER_URLHEAD = (String) request.getParameter("POWER_URLHEAD"); + String POWER_JSP = (String) request.getParameter("POWER_JSP"); + String token = (String) request.getSession().getAttribute("token"); // String token = (String)request.getParameter("token"); - String WEBSOCKET_URLHEAD = (String)request.getParameter("WEBSOCKET_URLHEAD"); - String STR_SPLIT = (String)request.getParameter("STR_SPLIT"); + String WEBSOCKET_URLHEAD = (String) request.getParameter("WEBSOCKET_URLHEAD"); + String STR_SPLIT = (String) request.getParameter("STR_SPLIT"); %> - + @@ -57,7 +62,7 @@ -
+
<%@ include file="/WEB-INF/jspf/webSocket.jspf" %> +