Compare commits
17 Commits
feature/ad
...
b652e9f9cc
| Author | SHA1 | Date | |
|---|---|---|---|
| b652e9f9cc | |||
| 778747ba7e | |||
| baccdcdf5f | |||
| a396981ebb | |||
| 179fd7d95c | |||
| 78b5561e7a | |||
| 031a7fad81 | |||
| 49b7f0b984 | |||
| 680bbce797 | |||
| 8a54aee412 | |||
| 049fe4ee29 | |||
| 000e3145bd | |||
| 862c73bd38 | |||
| 2f7fcc5081 | |||
| a7cfad592b | |||
| 51847f834f | |||
| 85b7ba26d5 |
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@@ -67,7 +67,7 @@ spec:
|
||||
emptyDir: {}
|
||||
- name: maven-cache
|
||||
persistentVolumeClaim:
|
||||
claimName: maven-repo-pvc
|
||||
claimName: maven-repo-pvc-rwx
|
||||
"""
|
||||
) {
|
||||
node(L) {
|
||||
|
||||
42
pom.xml
42
pom.xml
@@ -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>-->
|
||||
<!-- <!– Add other system jars similarly if compilation fails –>-->
|
||||
|
||||
<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>
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 }"> <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 }"> <a href="#" onclick="fn_egov_comment_delete('${list.brdReplySeq }', '${commentVO.parentUrl}');">[삭제]</a></c:if>
|
||||
</th>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user