linjj
/
emr_record_czry
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

改用druid连接池

Browse Source
master
lixin 6 years ago
parent 65f1f537a1
commit 681566c847
7 changed files with 110 additions and 83 deletions
Show Stats Download Patch File Download Diff File

29
pom.xml
Unescape Escape View File

@ -34,7 +34,6 @@
<servlet.version>2.4</servlet.version> <servlet.version>2.4</servlet.version>
<jsp.version>2.1</jsp.version> <jsp.version>2.1</jsp.version>
<jstl.version>1.2</jstl.version> <jstl.version>1.2</jstl.version>
<c3p0.version>0.9.5-pre6</c3p0.version>
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version> <hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
<postgresql.version>9.2-1004-jdbc4</postgresql.version> <postgresql.version>9.2-1004-jdbc4</postgresql.version>
<activiti.version>5.17.0</activiti.version> <activiti.version>5.17.0</activiti.version>
@ -51,7 +50,7 @@
<slf4j.version>1.6.4</slf4j.version> <slf4j.version>1.6.4</slf4j.version>
<json-lib.version>2.4</json-lib.version> <json-lib.version>2.4</json-lib.version>
<jackson.version>2.9.4</jackson.version> <jackson.version>2.9.4</jackson.version>
<druid.version>1.0.9</druid.version> <druid.version>1.1.22</druid.version>
<httpclient.version>4.3.5</httpclient.version> <httpclient.version>4.3.5</httpclient.version>
<javax-servlet-api.version>4.0.1</javax-servlet-api.version> <javax-servlet-api.version>4.0.1</javax-servlet-api.version>
<jsp-api.version>2.0</jsp-api.version> <jsp-api.version>2.0</jsp-api.version>
@ -143,6 +142,13 @@
<version>${mysql.version}</version> <version>${mysql.version}</version>
</dependency> </dependency>
<!-- sql-server -->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>7.4.1.jre8</version>
</dependency>
<!-- 连接池 --> <!-- 连接池 -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
@ -255,10 +261,9 @@
<version>5.0.0</version> <version>5.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jstl</groupId> <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId> <artifactId>jstl</artifactId>
<version>${jstl.version}</version> <version>${jstl.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<!-- <dependency> <!-- <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
@ -364,12 +369,6 @@
<version>${groovy.version}</version> <version>${groovy.version}</version>
</dependency>--> </dependency>-->
<dependency>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
<version>${c3p0.version}</version>
</dependency>
<!--<dependency> <!--<dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
@ -535,7 +534,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>emr_record</finalName> <finalName>emr_record</finalName>
<plugins> <plugins>
@ -560,15 +558,6 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.2</version>
<configuration>
<path>/emr_record</path>
<port>8083</port>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

2
src/main/java/com/emr/vo/PdfWaterSetVo.java
Unescape Escape View File

@ -2,7 +2,9 @@ package com.emr.vo;
import com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet; import com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data @Data
public class PdfWaterSetVo extends EmrPdfWaterSet { public class PdfWaterSetVo extends EmrPdfWaterSet {
private String allSrc; private String allSrc;

61
src/main/resources/config/applicationContext.xml
Unescape Escape View File

@ -28,26 +28,54 @@
<context:property-placeholder ignore-resource-not-found="true" location="classpath:/config/*.properties"/> <context:property-placeholder ignore-resource-not-found="true" location="classpath:/config/*.properties"/>
<!--配置数据源--> <!--配置数据源-->
<bean id="master" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close"> <bean id="master" class="com.alibaba.druid.pool.DruidDataSource" destroy-method="close">
<property name="driverClass" value="${jdbc.driver}"/> <!--数据库连接驱动--> <property name="driverClassName" value="${jdbc.driver}"/> <!--数据库连接驱动-->
<property name="jdbcUrl" value="${jdbc.url}"/> <!--数据库地址--> <property name="url" value="${jdbc.url}"/> <!--数据库地址-->
<property name="user" value="${jdbc.username}"/> <!--用户名--> <property name="username" value="${jdbc.username}"/> <!--用户名-->
<property name="password" value="${jdbc.password}"/> <!--密码--> <property name="password" value="${jdbc.password}"/> <!--密码-->
<property name="maxPoolSize" value="40"/> <!-- 最大连接数--> <property name="initialSize" value="100"/> <!-- 初始化连接池内的数据库连接-->
<property name="minPoolSize" value="1"/> <!--最小连接数--> <property name="maxActive" value="1000"/>
<property name="initialPoolSize" value="10"/> <!-- 初始化连接池内的数据库连接--> <property name="maxWait" value="60000"/>
<property name="maxIdleTime" value="20"/> <!--最大空闲时间--> <property name="minEvictableIdleTimeMillis" value="300000"/>
<property name="keepAlive" value="true"/>
<property name="timeBetweenEvictionRunsMillis" value="-1"/>
<property name="minIdle" value="20"/>
<property name="removeAbandoned" value="true"/>
<property name="removeAbandonedTimeout" value="180"/>
<property name="logAbandoned" value="true"/>
<property name="testWhileIdle" value="true"/>
<property name="validationQuery" value="SELECT 'x'"/>
<property name="testOnBorrow" value="false"/>
<property name="testOnReturn" value="false"/>
<property name="poolPreparedStatements" value="true"/>
<property name="maxPoolPreparedStatementPerConnectionSize" value="20"/>
<property name="filters" value="stat,wall,slf4j"/>
<property name="connectionProperties" value="druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000"/>
</bean> </bean>
<bean id="salve" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close"> <bean id="salve" class="com.alibaba.druid.pool.DruidDataSource" destroy-method="close">
<property name="driverClass" value="${jdbc.driver}"/> <!--数据库连接驱动--> <property name="driverClassName" value="${jdbc.driver}"/> <!--数据库连接驱动-->
<property name="jdbcUrl" value="${jdbc.url2}"/> <!--数据库地址--> <property name="url" value="${jdbc.url2}"/> <!--数据库地址-->
<property name="user" value="${jdbc.username2}"/> <!--用户名--> <property name="username" value="${jdbc.username2}"/> <!--用户名-->
<property name="password" value="${jdbc.password2}"/> <!--密码--> <property name="password" value="${jdbc.password2}"/> <!--密码-->
<property name="maxPoolSize" value="40"/> <!-- 最大连接数--> <property name="initialSize" value="100"/> <!-- 初始化连接池内的数据库连接-->
<property name="minPoolSize" value="1"/> <!--最小连接数--> <property name="maxActive" value="1000"/>
<property name="initialPoolSize" value="10"/> <!-- 初始化连接池内的数据库连接--> <property name="maxWait" value="60000"/>
<property name="maxIdleTime" value="20"/> <!--最大空闲时间--> <property name="minEvictableIdleTimeMillis" value="300000"/>
<property name="keepAlive" value="true"/>
<property name="timeBetweenEvictionRunsMillis" value="-1"/>
<property name="minIdle" value="20"/>
<property name="removeAbandoned" value="true"/>
<property name="removeAbandonedTimeout" value="180"/>
<property name="logAbandoned" value="true"/>
<property name="testWhileIdle" value="true"/>
<property name="validationQuery" value="SELECT 'x'"/>
<property name="testOnBorrow" value="false"/>
<property name="testOnReturn" value="false"/>
<property name="poolPreparedStatements" value="true"/>
<property name="maxPoolPreparedStatementPerConnectionSize" value="20"/>
<property name="filters" value="stat,wall,slf4j"/>
<property name="connectionProperties" value="druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000"/>
</bean> </bean>
<bean id="dataSource" class="com.emr.annotation.DynamicDataSource"> <bean id="dataSource" class="com.emr.annotation.DynamicDataSource">
@ -144,7 +172,6 @@
</bean> </bean>
<bean id="securityManager" class="org.apache.shiro.web.mgt.DefaultWebSecurityManager"> <bean id="securityManager" class="org.apache.shiro.web.mgt.DefaultWebSecurityManager">
<!--<property name="realm" ref="userRealm"/> <!--<property name="realm" ref="userRealm"/>
<property name="sessionManager" ref="sessionManager"/> <property name="sessionManager" ref="sessionManager"/>

BIN
src/main/webapp/WEB-INF/lib/sqljdbc4-2.0.jar
View File

Binary file not shown.

6
src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomList.jsp
Unescape Escape View File

@ -12,6 +12,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv=X-UA-Compatible IE=EmulateIE7> <meta http-equiv=X-UA-Compatible IE=EmulateIE7>
<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css" type="text/css">
<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css"> <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css">
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script type="text/javascript" src="${path}/static/js/html5shiv.min.js"></script> <script type="text/javascript" src="${path}/static/js/html5shiv.min.js"></script>
@ -121,11 +122,6 @@
.table-hover > tbody > tr:hover > th { .table-hover > tbody > tr:hover > th {
cursor: pointer; cursor: pointer;
} }
/**固定列样式*/
.fixed-table-body-columns{
top:391px!important;
/*height:226px!important;*/
}
.fht-cell{width:70px!important;} .fht-cell{width:70px!important;}
</style> </style>
</head> </head>

7
src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
Unescape Escape View File

@ -12,6 +12,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv=X-UA-Compatible IE=EmulateIE7> <meta http-equiv=X-UA-Compatible IE=EmulateIE7>
<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css" type="text/css">
<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css"> <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css">
<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.4/css/select2.min.css" rel="stylesheet"/> <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.4/css/select2.min.css" rel="stylesheet"/>
@ -145,12 +146,6 @@
cursor: pointer; cursor: pointer;
} }
/**固定列样式*/
.fixed-table-body-columns {
top:48%!important;
/*height:226px!important;*/
}
.fht-cell { .fht-cell {
width: 75px !important; width: 75px !important;
} }

34
src/main/webapp/index.jsp
Unescape Escape View File

@ -18,19 +18,24 @@
</style> </style>
<![endif]--> <![endif]-->
<style> <style>
body { margin-right: -15px; margin-bottom: -15px; }
.navbar-custom-menu { .navbar-custom-menu {
padding-right: 20px; padding-right: 20px;
} }
.hidden-xs { .hidden-xs {
max-width: 200px; max-width: 200px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.logo { .logo {
height: 59px !important; height: 59px !important;
} }
.container-fluid {
margin: 0;
padding: 0;
}
.indexSelected { .indexSelected {
background-color: #42515F; background-color: #42515F;
} }
@ -47,7 +52,7 @@
var path = "${path}" var path = "${path}"
</script> </script>
</head> </head>
<body class="skin-blue" onkeydown="disabledPrint()"> <body class="hold-transition skin-blue sidebar-mini" onkeydown="disabledPrint()">
<input type="hidden" id="token" value="<%=token%>"/> <input type="hidden" id="token" value="<%=token%>"/>
<input type="hidden" id="roleId" value="${CURRENT_USER.roleId}"/> <input type="hidden" id="roleId" value="${CURRENT_USER.roleId}"/>
<!--webSocket所需--> <!--webSocket所需-->
@ -57,7 +62,7 @@
<input type="hidden" id="POWER_JSP" value="<%=POWER_JSP%>"> <input type="hidden" id="POWER_JSP" value="<%=POWER_JSP%>">
<input type="hidden" id="webSocketUrl" value="<%=WEBSOCKET_URLHEAD%>"> <input type="hidden" id="webSocketUrl" value="<%=WEBSOCKET_URLHEAD%>">
<input type="hidden" id="strSplit" value="<%=STR_SPLIT%>"> <input type="hidden" id="strSplit" value="<%=STR_SPLIT%>">
<div class=""> <div class="wrapper">
<header class="main-header"> <header class="main-header">
<!--logo--> <!--logo-->
<div class=" logo"> <div class=" logo">
@ -90,20 +95,24 @@
<c:when test="${CURRENT_USER.remark == '' || CURRENT_USER.remark == null || CURRENT_USER.remark == 'null'}"> <c:when test="${CURRENT_USER.remark == '' || CURRENT_USER.remark == null || CURRENT_USER.remark == 'null'}">
<c:choose> <c:choose>
<c:when test="${CURRENT_USER.userPosition != null && CURRENT_USER.userPosition != '' && CURRENT_USER.userPosition != 'null'}"> <c:when test="${CURRENT_USER.userPosition != null && CURRENT_USER.userPosition != '' && CURRENT_USER.userPosition != 'null'}">
<p class="hidden-xs" title="${CURRENT_USER.userPosition}">${CURRENT_USER.userPosition}</p> <p class="hidden-xs"
title="${CURRENT_USER.userPosition}">${CURRENT_USER.userPosition}</p>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p class="hidden-xs" title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</p> <p class="hidden-xs"
title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</p>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:choose> <c:choose>
<c:when test="${CURRENT_USER.userPosition != null && CURRENT_USER.userPosition != '' && CURRENT_USER.userPosition != 'null'}"> <c:when test="${CURRENT_USER.userPosition != null && CURRENT_USER.userPosition != '' && CURRENT_USER.userPosition != 'null'}">
<p class="hidden-xs" title="${CURRENT_USER.userPosition}(${CURRENT_USER.remark})">${CURRENT_USER.userPosition}(${CURRENT_USER.remark})</p> <p class="hidden-xs"
title="${CURRENT_USER.userPosition}(${CURRENT_USER.remark})">${CURRENT_USER.userPosition}(${CURRENT_USER.remark})</p>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p class="hidden-xs" title="${CURRENT_USER.userName}(${CURRENT_USER.remark})">${CURRENT_USER.userName}(${CURRENT_USER.remark})</p> <p class="hidden-xs"
title="${CURRENT_USER.userName}(${CURRENT_USER.remark})">${CURRENT_USER.userName}(${CURRENT_USER.remark})</p>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:otherwise> </c:otherwise>
@ -210,7 +219,8 @@
<div class="page-content-wrapper"> <div class="page-content-wrapper">
<div class="page-content"> <div class="page-content">
<div class="container-fluid"> <div class="container-fluid">
<iframe class="row-fluid" style="width:100%;height:100%;" src="${path}/commom/commomList" id="iFrame1" name="iFrame1" scrolling="yes" frameborder="0"></iframe> <iframe class="row-fluid" style="width:100%;height:100%;" src="${path}/commom/commomList"
id="iFrame1" name="iFrame1" scrolling="yes" frameborder="0"></iframe>
</div> </div>
</div> </div>
</div> </div>
@ -228,5 +238,13 @@
</div> </div>
<script type="text/javascript" src="${path}/static/js/menu.js?time=2019-12-15"></script> <script type="text/javascript" src="${path}/static/js/menu.js?time=2019-12-15"></script>
<%@ include file="/WEB-INF/jspf/webSocket.jspf" %> <%@ include file="/WEB-INF/jspf/webSocket.jspf" %>
<script>
$(document).ready(function () {
const headerHeight = $(".main-header").height() || 0;
const footerHeight = ($(".main-footer").height() || 0) + 31;
const windowHeight = $(window).height();
$("#iFrame1").css("height", windowHeight - headerHeight - footerHeight - 37);
})
</script>
</body> </body>
</html> </html>

Write Preview
Loading…
Cancel
Save