17 Commits

Author SHA1 Message Date
b652e9f9cc 작성일 시:분:초 표시 하도록 추가
All checks were successful
Main-Build / build-and-push (push) Successful in 32s
2025-12-11 16:01:12 +09:00
778747ba7e maven-cache 스토리지 방식 변경 (RWO > RWX)
All checks were successful
Main-Build / build-and-push (push) Successful in 44s
2025-12-11 15:57:04 +09:00
baccdcdf5f 날짜 형식 변환
All checks were successful
Main-Build / build-and-push (push) Successful in 1m2s
2025-12-11 15:41:03 +09:00
a396981ebb 날짜처리 에러 부분 수정
All checks were successful
Main-Build / build-and-push (push) Successful in 40s
2025-12-11 15:17:40 +09:00
179fd7d95c JSTL fmt:formatDate 이 LocalDateTime 처리 불가하기 때문에 재처리 기능 추가
All checks were successful
Main-Build / build-and-push (push) Successful in 42s
2025-12-11 13:40:17 +09:00
78b5561e7a mysql 8.4.7 로 원복
All checks were successful
Main-Build / build-and-push (push) Successful in 32s
소스 수정으로 localdatetime 문제 해결 진행
2025-12-11 12:03:29 +09:00
031a7fad81 mysql 8.4.7 테스트 - 1
All checks were successful
Main-Build / build-and-push (push) Successful in 29s
2025-12-11 11:12:08 +09:00
49b7f0b984 구 개발디비로 테스트 변경
All checks were successful
Main-Build / build-and-push (push) Successful in 26s
2025-12-11 10:58:08 +09:00
680bbce797 mysql connector 버전에 따른 localdatetime 포맷 문제 발생으로 구버전 라이브러리로 복원 - 2
All checks were successful
Main-Build / build-and-push (push) Successful in 26s
2025-12-11 10:42:30 +09:00
8a54aee412 mysql connector 버전에 따른 localdatetime 포맷 문제 발생으로 구버전 라이브러리로 복원
All checks were successful
Main-Build / build-and-push (push) Successful in 31s
2025-12-11 10:40:18 +09:00
049fe4ee29 mysql 8.4.7 로 변경 테스트 - 4
All checks were successful
Main-Build / build-and-push (push) Successful in 35s
2025-12-11 10:23:03 +09:00
000e3145bd mysql 8.4.7 로 변경 테스트 - 3
All checks were successful
Main-Build / build-and-push (push) Successful in 27s
2025-12-11 09:44:58 +09:00
862c73bd38 mysql 8.4.7 로 변경 테스트 - 2
All checks were successful
Main-Build / build-and-push (push) Successful in 26s
2025-12-11 09:37:28 +09:00
2f7fcc5081 mysql 8.4.7 로 변경 테스트
All checks were successful
Main-Build / build-and-push (push) Successful in 27s
2025-12-11 09:32:54 +09:00
a7cfad592b Merge pull request 'stage 추가' (#22) from feature/add-stage into master
All checks were successful
Main-Build / build-and-push (push) Successful in 28s
Reviewed-on: #22
Reviewed-by: saydev <gomdobi@sayinfo.co.kr>
2025-12-10 07:49:37 +00:00
51847f834f Merge pull request 'stage 추가' (#21) from feature/add-stage into master
All checks were successful
Main-Build / build-and-push (push) Successful in 36s
Reviewed-on: #21
Reviewed-by: saydev <gomdobi@sayinfo.co.kr>
2025-12-10 07:02:52 +00:00
85b7ba26d5 Merge pull request 'stage 버전 추가' (#20) from feature/add-stage into master
All checks were successful
Main-Build / build-and-push (push) Successful in 37s
Reviewed-on: #20
Reviewed-by: saydev <gomdobi@sayinfo.co.kr>
2025-12-10 06:54:07 +00:00
9 changed files with 73 additions and 34 deletions

2
Jenkinsfile vendored
View File

@@ -67,7 +67,7 @@ spec:
emptyDir: {}
- name: maven-cache
persistentVolumeClaim:
claimName: maven-repo-pvc
claimName: maven-repo-pvc-rwx
"""
) {
node(L) {

42
pom.xml
View File

@@ -229,16 +229,28 @@
<!-- </dependency>-->
<!-- Database -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.31</version>
</dependency>
<!-- mysql 5.X -->
<!-- <dependency>-->
<!-- <groupId>mysql</groupId>-->
<!-- <artifactId>mysql-connector-java</artifactId>-->
<!-- <version>5.1.31</version>-->
<!-- </dependency>-->
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.4</version>
</dependency>
<!-- mysql 8.4.7 -->
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>9.5.0</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.6</version>
</dependency>
<!-- Logging (Log4j 2 + SLF4J) -->
<!-- <dependency>
@@ -532,17 +544,17 @@
<!-- </dependency>-->
<!-- &lt;!&ndash; Add other system jars similarly if compilation fails &ndash;&gt;-->
<dependency>
<groupId>com.tmax.tibero</groupId>
<artifactId>tibero-jdbc</artifactId>
<version>5.0</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.tmax.tibero</groupId>-->
<!-- <artifactId>tibero-jdbc</artifactId>-->
<!-- <version>5.0</version>-->
<!-- </dependency>-->
<dependency>
<groupId>oracle</groupId>
<artifactId>ojdbc14</artifactId>
<version>10.2.0.4.0</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>oracle</groupId>-->
<!-- <artifactId>ojdbc14</artifactId>-->
<!-- <version>10.2.0.4.0</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.acube</groupId>

View File

@@ -27,11 +27,18 @@ Globals.DbType =mysql
#Globals.Password =sksrhdqnffkr
## \uC138\uC774\uD5EC\uD504\uB370\uC2A4\uD06C
Globals.DriverClassName=com.mysql.jdbc.Driver
# mysql 5.X
#Globals.DriverClassName=com.mysql.jdbc.Driver
# mysql 8.4.7
Globals.DriverClassName=com.mysql.cj.jdbc.Driver
#\uC6B4\uC601
#Globals.Url=jdbc:mysql://192.168.0.217:3306/helpdesk_db?characterEncoding=utf8
#\uAC1C\uBC1C
Globals.Url=jdbc:mysql://192.168.0.114:13314/helpdesk_db?characterEncoding=utf8
## mysql 5.X
#Globals.Url=jdbc:mysql://192.168.0.114:13316/helpdesk_db?characterEncoding=utf8
## mysql 8.4.7
Globals.Url=jdbc:mysql://192.168.0.114:13316/helpdesk_db?characterEncoding=utf8
Globals.UserName =helpdesk
Globals.Password =helpdesk

View File

@@ -27,11 +27,18 @@ Globals.DbType =mysql
#Globals.Password =sksrhdqnffkr
## \uC138\uC774\uD5EC\uD504\uB370\uC2A4\uD06C
Globals.DriverClassName=com.mysql.jdbc.Driver
# mysql 5.X
#Globals.DriverClassName=com.mysql.jdbc.Driver
# mysql 8.4.7
Globals.DriverClassName=com.mysql.cj.jdbc.Driver
#\uC6B4\uC601
#Globals.Url=jdbc:mysql://192.168.0.217:3306/helpdesk_db?characterEncoding=utf8
#\uAC1C\uBC1C
Globals.Url=jdbc:mysql://192.168.0.114:13314/helpdesk_db?characterEncoding=utf8
## mysql 5.X
#Globals.Url=jdbc:mysql://192.168.0.114:13316/helpdesk_db?characterEncoding=utf8
## mysql 8.4.7
Globals.Url=jdbc:mysql://192.168.0.114:13316/helpdesk_db?characterEncoding=utf8
Globals.UserName =helpdesk
Globals.Password =helpdesk
@@ -55,7 +62,7 @@ Globals.OrgNm=\uC138\uC774\uC815\uBCF4\uAE30\uC220
Globals.OrgCode=8188
#Globals.AccessIp=10
Globals.SiteTitle=\uC138\uC774\uC815\uBCF4\uAE30\uC220 Help-desk (\uB85C\uCEEC)
Globals.SiteTitle=\uC138\uC774\uC815\uBCF4\uAE30\uC220 Help-desk (\uAC1C\uBC1C)
#Globals.MobileStartPage=/mobile/intro.do
Globals.MobileStartPage=/login.do
PushUrl=http://www.sejong.go.kr/sotong

View File

@@ -129,9 +129,11 @@
<tbody>
<c:forEach var="list" items="${commentList }">
<tr>
<th class="left" colspan="3">
등록자 : ${list.userNm } | 등록일시 : <fmt:formatDate value="${list.createDate }" pattern="yyyy.MM.dd hh:mm"/>
<c:if test="${loginVO.name eq list.userNm }">&nbsp;<a href="#" onclick="fn_egov_comment_delete('${list.brdReplySeq }', '${commentVO.parentUrl}');">[삭제]</a> </c:if>
<th class="left" colspan="3">
등록자 : ${list.userNm } | 등록일시 :
<fmt:parseDate value="${list.createDate}" pattern="yyyy-MM-dd'T'HH:mm:ss" var="parsedCreateDate"/>
<fmt:formatDate value="${parsedCreateDate}" pattern="yyyy.MM.dd HH:mm"/>
<c:if test="${loginVO.name eq list.userNm }">&nbsp;<a href="#" onclick="fn_egov_comment_delete('${list.brdReplySeq }', '${commentVO.parentUrl}');">[삭제]</a></c:if>
</th>
</tr>
<tr>

View File

@@ -72,7 +72,11 @@
<td><a href="#view" onclick="return fn_egov_select('${list.userSeq}')">${list.userNm} (${list.userId})</a></td>
<td>${list.tel}</td>
<td>${list.deptNm}</td>
<td><fmt:formatDate value="${list.createDate }" pattern="yyyy-MM-dd" /></td>
<td>
<fmt:parseDate value="${list.createDate}" pattern="yyyy-MM-dd'T'HH:mm:ss" var="createdDate"/>
<fmt:formatDate value="${createdDate}" pattern="yyyy-MM-dd"/>
</td>
<td>${list.userType}</td>
</tr>
</c:forEach>

View File

@@ -25,10 +25,14 @@
<c:set var="now" value="<%= new java.util.Date() %>" />
<div class="location_box">
<div class="loc_h3"><h3>${prjNm} <%=MainGlobals.MENU_HDB%>
(<span class="year-text"><fmt:formatDate value="${now}" pattern="yyyy" /> 년 - </span><span class="sts-a">접수: ${hdbStsA}</span>,
<span class="sts-b">처리중: ${hdbStsB}</span>,
<span class="sts-c">완료: ${hdbStsC}</span> )
<div class="loc_h3"><h3>${prjNm} <%=MainGlobals.MENU_HDB%>
(
<span class="year-text">
<fmt:formatDate value="${now}" pattern="yyyy" /> 년 -
</span>
<span class="sts-a">접수: ${hdbStsA}</span>,
<span class="sts-b">처리중: ${hdbStsB}</span>,
<span class="sts-c">완료: ${hdbStsC}</span> )
</h3><span></span></div>
<span class="loccation"><img src="/images/admin/loccation_home.png" alt="홈" /> > <strong><%=MainGlobals.MENU_HDB%></strong></span>
</div>
@@ -111,7 +115,10 @@
<img src="/images/admin/cf_tit_ic.png">
</c:if>
</td>
<td>${list.createDate}</td>
<td>
<fmt:parseDate value="${list.createDate}" pattern="yyyy-MM-dd'T'HH:mm:ss" var="parsedCreateDate"/>
<fmt:formatDate value="${parsedCreateDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
</td>
<td>${list.rdCnt }</td>
<%-- <td>${list.compScdDate}</td> --%>
</tr>

View File

@@ -43,8 +43,8 @@
<tr>
<th>등록일</th>
<td class="left">
<%-- <fmt:formatDate value="${dmsHdbVO.createDate}" pattern="yyyy-MM-dd" /> --%>
${dmsDtbVO.createDate}
<fmt:parseDate value="${dmsHdbVO.createDate}" pattern="yyyy-MM-dd'T'HH:mm:ss" var="parsedCreateDate"/>
<fmt:formatDate value="${parsedCreateDate}" pattern="yyyy-MM-dd" />
</td>
</tr>
<tr>

View File

@@ -45,8 +45,8 @@
<tr>
<th>등록일</th>
<td class="left">
<%-- <fmt:formatDate value="${dmsHdbVO.createDate}" pattern="yyyy-MM-dd" /> --%>
${dmsHdbVO.createDate}
<fmt:parseDate value="${dmsHdbVO.createDate}" pattern="yyyy-MM-dd'T'HH:mm:ss" var="createdDate"/>
<fmt:formatDate value="${createdDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
</td>
</tr>
<tr>