tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

Browse Source
This commit is contained in:
myname 2025-02-24 14:51:46 +09:00
commit 6d7c673d49
7 changed files with 76 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pom.xml
View File

@ -551,6 +551,28 @@
<version>1.0.0.71</version>
</dependency>
<!-- MyBatis -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.5.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mybatis/mybatis-spring -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
<version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.3.22.RELEASE</version>
</dependency>
</dependencies>

2
src/main/resources/egovframework/egovProps/globals_local.properties
View File

@ -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

6
src/main/resources/egovframework/spring/com/context-sqlMap.xml
View File

@ -43,9 +43,9 @@
<bean id="mybatisSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
<property name="dataSource" ref="mybatisDataSource" />
<property name="mapperLocations" value="classpath:/egovframework/sqlmap/config/mappers/**/*.xml" />
<property name="transactionFactory">
<bean class="org.apache.ibatis.transaction.managed.ManagedTransactionFactory" />
</property>
<!-- <property name="transactionFactory"> -->
<!-- <bean class="org.apache.ibatis.transaction.managed.ManagedTransactionFactory" /> -->
<!-- </property> -->
<property name="configLocation" value="classpath:/egovframework/spring/com/mybatis-config.xml"/>
</bean>
<bean id="mybatisSession" class="org.mybatis.spring.SqlSessionTemplate">

39
src/main/resources/egovframework/spring/com/context-transaction.xml
View File

@ -7,11 +7,20 @@
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd">
<!-- transaction 설정 -->
<bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<!-- <bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="dataSource"/>
</bean>
<tx:advice id="txAdvice" transaction-manager="txManager">
<property name="dataSource" ref="mybatisDataSource" />
</bean> -->
<bean id="txManager1" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="dataSource"/>
</bean>
<bean id="txManager2" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="mybatisDataSource"/>
</bean>
<tx:advice id="txAdvice1" transaction-manager="txManager1">
<tx:attributes>
<tx:method name="*" rollback-for="Exception"/>
</tx:attributes>
@ -28,7 +37,27 @@
execution(* kcc.xxx..*Impl.*(..)) or
execution(* seed.com..*Service.*(..))
"/>
<aop:advisor advice-ref="txAdvice" pointcut-ref="requiredTx" />
<aop:advisor advice-ref="txAdvice1" pointcut-ref="requiredTx" />
</aop:config>
<tx:advice id="txAdvice2" transaction-manager="txManager2">
<tx:attributes>
<tx:method name="*" rollback-for="Exception"/>
</tx:attributes>
</tx:advice>
<aop:config>
<aop:pointcut id="requiredTx"
expression="
execution(* kcc.let..impl.*Impl.*(..)) or
execution(* kcc.com..*Impl.*(..)) or
execution(* kcc.ve..*Impl.*(..)) or
execution(* kcc.kccadr..*Impl.*(..)) or
execution(* kccadr..*Impl.*(..)) or
execution(* kcc.xxx..*Impl.*(..)) or
execution(* seed.com..*Service.*(..))
"/>
<aop:advisor advice-ref="txAdvice2" pointcut-ref="requiredTx" />
</aop:config>
</beans>

2
src/main/resources/egovframework/sqlmap/com/pdf/Pdf_SQL_Oracle.xml
View File

@ -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

12
src/main/webapp/META-INF/context.xml
View File

@ -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"
/>
<Resource
name="jndi/dev"
@ -21,6 +25,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"
/>
<Resource
name="jndi/svr"
@ -31,6 +39,10 @@
type="javax.sql.DataSource"
url="jdbc:oracle:thin:@211.245.106.125:1521/kofairdb"
factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
validationQuery="select 1 from dual"
maxActive="50"
maxIdle="20"
maxWait="60000"
/>
<!-- 심볼릭링크 걸린 폴더를 tomcat이 허용하도록 설정(보안상 기본값 false) -->
<Resources allowLinking="true"/>

5
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp
View File

@ -5022,9 +5022,10 @@ function docOpen(obj) {
<option value="">이전결재보기</option>
</select>
<c:if test="${memberId == masterData.caseExaminer && (memberPosition == '0912000000' || memberPosition == '0911000000')}">
<c:if test="${masterData.statePro == '0402000000'}">
<!-- 알림톡 자동 발송으로 대체 -->
<%-- <c:if test="${masterData.statePro == '0402000000'}">
<button type="button" class="btn btn_text btn_36 gray_fill btn-default fl" onclick="smsAutoPopOpen('${caseNo}', '1');">조사관배정SMS</button>
</c:if>
</c:if> --%>
<c:if test="${masterData.statePro == '0403000000'}">
<button type="button" class="btn btn_text btn_36 gray_fill btn-default fl" onclick="smsAutoPopOpen('${caseNo}', '2');">출석조사SMS</button>
</c:if>