Merge branch 'thkim'

egovframe-template-simple-react-contribution/src/pages/admin/schedule/EgovAdminScheduleList.jsx

@@ -207,7 +207,7 @@ function EgovAdminScheduleList(props) {
     });
 
     useEffect(() => {
-        retrieveList(searchCondition);
+        //retrieveList(searchCondition); disabled by thkim
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [searchCondition]);
 

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/impl/EgovIndvdlSchdulManageServiceImpl.java

@@ -183,8 +183,8 @@ public class EgovIndvdlSchdulManageServiceImpl extends EgovAbstractServiceImpl i
 		dto.put("title", tnCmtEvent.getEvtTitle());						// 제목
 		dto.put("location", tnCmtEvent.getEvtLocation());				// 장소
 		dto.put("contents", tnCmtEvent.getEvtContents());				// 내용
-		dto.put("startDate", tnCmtEvent.getEvtStartDt());				// 날짜/시간의 시작 일시
-		dto.put("endDate", tnCmtEvent.getEvtEndDt());					// 날짜/시간의 종료 일시
+		dto.put("startDate", tnCmtEvent.getEvtStartDt().plusHours(9));				// 날짜/시간의 시작 일시
+		dto.put("endDate", tnCmtEvent.getEvtEndDt().plusHours(9));					// 날짜/시간의 종료 일시
 
 		// 문자열로 리턴하도록 수정해야 함.
 

kcsc-back-end/src/main/resources/application-local.properties

@@ -2,6 +2,7 @@
 # Access-Control-Allow-Origin
 Globals.Allow.Origin = http://localhost:3000
 
+
 spring.devtools.livereload.enabled=true
 #Datasource Configuration
 spring.sql.init.encoding=utf-8
@@ -13,8 +14,8 @@ spring.datasource.hikari.maximum-pool-size=4
 #spring.datasource.username=kcsc
 #spring.datasource.password=dbnt0928!
 spring.datasource.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-spring.datasource.url=jdbc:log4jdbc:postgresql://127.0.0.1:5432/kcsc
-#spring.datasource.url=jdbc:log4jdbc:postgresql://118.219.150.34:50503/kcsc
+#spring.datasource.url=jdbc:log4jdbc:postgresql://127.0.0.1:5432/kcsc
+spring.datasource.url=jdbc:log4jdbc:postgresql://118.219.150.34:50503/kcsc
 spring.datasource.username=dbnt0031
 spring.datasource.password=dbnt0928!
 
@@ -24,6 +25,7 @@ spring.jpa.show-sql=true
 spring.jpa.generate-ddl=false
 spring.jpa.hibernate.naming.physical-strategy = org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
 spring.jpa.properties.hibernate.proc.param_null_passing=true
+spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Seoul