diff --git a/pom.xml b/pom.xml index 2df42f2e..c29a2663 100644 --- a/pom.xml +++ b/pom.xml @@ -551,6 +551,28 @@ 1.0.0.71 + + + org.mybatis + mybatis + 3.5.6 + + + + + org.mybatis + mybatis-spring + 2.0.6 + + + + + org.springframework + spring-jdbc + 4.3.22.RELEASE + + + diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 1bc09ef9..102a3b51 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -261,5 +261,5 @@ ppurio.from=15881490 #pdf \uBCC0\uD658 pdf.filePath=/inputFile -pdf.hostUri=http://192.168.0.38:8081 +pdf.hostUri=http://192.168.0.34:8081 pdf.serverUrl=http://192.168.0.31:8888 \ No newline at end of file diff --git a/src/main/resources/egovframework/spring/com/context-sqlMap.xml b/src/main/resources/egovframework/spring/com/context-sqlMap.xml index bf64374d..20684dea 100644 --- a/src/main/resources/egovframework/spring/com/context-sqlMap.xml +++ b/src/main/resources/egovframework/spring/com/context-sqlMap.xml @@ -43,9 +43,9 @@ - - - + + + diff --git a/src/main/resources/egovframework/spring/com/context-transaction.xml b/src/main/resources/egovframework/spring/com/context-transaction.xml index ad96126a..544944e6 100644 --- a/src/main/resources/egovframework/spring/com/context-transaction.xml +++ b/src/main/resources/egovframework/spring/com/context-transaction.xml @@ -7,11 +7,20 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd"> - + + + + + + + + + + + @@ -28,7 +37,27 @@ execution(* kcc.xxx..*Impl.*(..)) or execution(* seed.com..*Service.*(..)) "/> - + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/com/pdf/Pdf_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/com/pdf/Pdf_SQL_Oracle.xml index eeaae712..989efcdf 100644 --- a/src/main/resources/egovframework/sqlmap/com/pdf/Pdf_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/com/pdf/Pdf_SQL_Oracle.xml @@ -10,7 +10,7 @@ SELECT AA.CASE_NO AS caseNo , BB.FILE_NAME AS fileName - , BB.FILE_PATH || BB.FILE_ORGNAME AS resultFilePath + , REPLACE(BB.FILE_PATH, BB.FILE_ORGNAME, '') || BB.FILE_ORGNAME AS resultFilePath , BB.FILE_EXTENSION AS fileExtension , CC.RCEPT_NO AS rceptNo , E.CODE_NAME AS codeName diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml index 7468c3e1..dc1b116b 100644 --- a/src/main/webapp/META-INF/context.xml +++ b/src/main/webapp/META-INF/context.xml @@ -11,6 +11,10 @@ type="javax.sql.DataSource" url="jdbc:oracle:thin:@192.168.0.60:1524/XE" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" + validationQuery="select 1 from dual" + maxActive="50" + maxIdle="20" + maxWait="60000" /> diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp index 82848fc1..2054c97d 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp @@ -5022,9 +5022,10 @@ function docOpen(obj) { - + + <%-- - + --%>