diff --git a/pom.xml b/pom.xml index 10c110f..90b59e7 100644 --- a/pom.xml +++ b/pom.xml @@ -91,31 +91,12 @@ ${commons-net.version} - - net.sf.json-lib - json-lib - ${json-lib.version} - jdk15 - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - org.apache.httpcomponents httpclient ${httpclient.version} - - - junit - junit - ${junit.version} - test - org.slf4j @@ -138,25 +119,6 @@ mybatis-paginator ${mybatis.paginator.version} - - com.github.pagehelper - pagehelper - ${pagehelper.version} - - - - - - - - - - - - - - - com.alibaba @@ -235,26 +197,6 @@ 1.46 - - - javax.mail - mail - 1.4.5 - - - com.sun.mail - javax.mail - 1.5.4 - - - - - - commons-dbutils @@ -295,26 +237,6 @@ jedis ${jedis.version} - - - - - org.apache.shiro @@ -342,44 +264,11 @@ 4.12 test - - - - - - - - - - com.mchange c3p0 ${c3p0.version} - org.postgresql postgresql @@ -403,40 +292,6 @@ jackson-databind ${jackson.version} - - - - org.mockito - mockito-core - ${mockito.version} - test - - - - - - org.jdom - jdom - 1.1 - - - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.1.0 - - - - - - org.mockito @@ -452,12 +307,6 @@ 4.5.5 - - - org.jdom - jdom - 1.1 - org.apache.maven.plugins maven-resources-plugin @@ -506,11 +355,6 @@ pdfbox 2.0.12 - - - - - @@ -546,6 +390,12 @@ 1.18.8 provided + + + com.microsoft.sqlserver + mssql-jdbc + 8.4.1.jre8 + diff --git a/src/main/resources/config/applicationContext.xml b/src/main/resources/config/applicationContext.xml index 168d2ce..62d60d5 100644 --- a/src/main/resources/config/applicationContext.xml +++ b/src/main/resources/config/applicationContext.xml @@ -34,15 +34,35 @@ - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index d2c25aa..c50af0a 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -1,37 +1,42 @@ -jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver -#jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=emr_record -#jdbc.username=sa -#jdbc.password=xjgs+docus911 +#数据库IP +dataBaseIp=localhost +#数据库名称 +#dataBaseName=yd_record +##数据库密码 +#dataBasePassword=docus702 + +##数据库名称 +dataBaseName=emr_record +#数据库密码 +dataBasePassword=xjgs+docus911 -jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=yd_record +jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver +jdbc.url=jdbc\:sqlserver\://${dataBaseIp}:1433;databaseName=${dataBaseName} jdbc.username=sa -jdbc.password=docus702 - -#Oracle -oracle.driver=oracle.jdbc.driver.OracleDriver -oracle.url=jdbc:oracle:thin:@192.168.10.6:1521/orc1 -oracle.username=pacs -oracle.password=pacs -#hibernate config -hibernate.dialect=org.hibernate.dialect.SQLServerDialect -hibernate.show_sql=true -hibernate.format_sql=true -hibernate.hbm2ddl.auto=update -#hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext -hibernate.current_session_context_class=thread -hibernate.jdbc.batch_size=50 -hibernate.enable_lazy_load_no_trans=true -#\u56FE\u7247\u5730\u5740 -#pictureUrl= +jdbc.password=${dataBasePassword} + +filters: stat +maxActive: 20 +initialSize: 1 +maxWait: 60000 +minIdle: 10 +timeBetweenEvictionRunsMillis: 60000 +minEvictableIdleTimeMillis: 300000 +validationQuery: SELECT 'x' +testWhileIdle: true +testOnBorrow: false +testOnReturn: false +maxOpenPreparedStatements: 20 +removeAbandoned: true +removeAbandonedTimeout: 1800 +logAbandoned: true + +#图片地址 pictureUrl=src\\main\\webapp -#\u83DC\u5355\u63A5\u53E3http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag -#powerUrl=http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag -#POWER_URLHEAD=http://120.27.212.36:8888/power -#power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934\u5982\uFF1Ahttp://192.168.1.3:8081/power -powerUrl=http://localhost:8080/power/font/getMenusByUserIdAndSysFlag -POWER_URLHEAD=http://localhost:8080/power -POWER_JSP=http://localhost:8080/power +powerUrl=http://10.36.116.108:8080/power/font/getMenusByUserIdAndSysFlag +POWER_URLHEAD=http://10.36.116.108:8080/power +POWER_JSP=http://10.36.116.108:8080/power recallReason=医院需要这份文档 HomepageDictionary=http://10.36.116.108:8080/filing/services/HomepageDictionary?wsdl HomepageMethod=CheckData diff --git a/src/main/webapp/WEB-INF/lib/sqljdbc4-2.0.jar b/src/main/webapp/WEB-INF/lib/sqljdbc4-2.0.jar deleted file mode 100644 index 240872c..0000000 Binary files a/src/main/webapp/WEB-INF/lib/sqljdbc4-2.0.jar and /dev/null differ diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index 7570fb8..4bf0663 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -298,7 +298,7 @@