dev

conf/ggits-comm-server.yml

@@ -1,12 +1,13 @@
 spring:
   profiles:
-    active: test
+    active: dev
+server:
+  port: 9873
 
 application:
-  kafka:
-    producer:
-      dd:
-    consumer:
-
   ggits-server-ip: 192.168.24.22
-#  ggits-server-ip: 127.0.0.1
+  process-id: 81012
+
+  kafka:
+    bootstrap-servers: 192.168.11.23:9092
+    group-id: ggits-comm-server

src/main/java/com/ggits/comm/server/scheduler/SigCommScheduler.java

@@ -25,20 +25,20 @@ public class SigCommScheduler {
     public void onShutDown() {
     }
 
-    @Async
-    @Scheduled(cron = "* * * * * *")  // 1초 주기 작업 실행
-    public void staticsForPacketSecond() {
-        //Elapsed elapsed = new Elapsed();
-        //TsiTpmsManager.getInstance().resetSecond();
-        //log.info("{}", String.format("%25s: %s", "staticsForPacketSecond", TimeUtils.elapsedTimeStr(elapsed.nanoSeconds())));
-    }
+//    @Async
+//    @Scheduled(cron = "* * * * * *")  // 1초 주기 작업 실행
+//    public void staticsForPacketSecond() {
+//        //Elapsed elapsed = new Elapsed();
+//        //TsiTpmsManager.getInstance().resetSecond();
+//        //log.info("{}", String.format("%25s: %s", "staticsForPacketSecond", TimeUtils.elapsedTimeStr(elapsed.nanoSeconds())));
+//    }
 
-    @Async
-    @Scheduled(cron = "0/5 * * * * *")  // 5초 주기 작업 실행
-    public void checkKafkaServerAlive() {
-//        Elapsed elapsed = new Elapsed();
-//        log.info("{}", String.format("%25s: %s", "checkKafkaServerAlive", TimeUtils.elapsedTimeStr(elapsed.nanoSeconds())));
-    }
+//    @Async
+//    @Scheduled(cron = "0/5 * * * * *")  // 5초 주기 작업 실행
+//    public void checkKafkaServerAlive() {
+////        Elapsed elapsed = new Elapsed();
+////        log.info("{}", String.format("%25s: %s", "checkKafkaServerAlive", TimeUtils.elapsedTimeStr(elapsed.nanoSeconds())));
+//    }
 
     @Async
     @Scheduled(cron = "0/5 * * * * *")  // 5초 주기 작업 실행

src/main/resources/application.yml

@@ -15,19 +15,13 @@ spring:
       enabled: always
   datasource:
     hikari:
-#      driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-#      jdbc-url: jdbc:log4jdbc:oracle:thin:@115.91.94.42:1521:HANTE
-      driver-class-name: oracle.jdbc.OracleDriver
-      jdbc-url: jdbc:oracle:thin:@115.91.94.42:1521:HANTE
-      username: sigtest
-      password: sigtest
       connection-test-query: SELECT 1 FROM DUAL
       minimumIdle: 5
       maximumPoolSize: 20
       idleTimeout: 30000
 
 server:
-  port: 9871
+  port: 9873
 management:
   endpoints:
     web:
@@ -36,7 +30,7 @@ management:
 
 application:
   ggits-server-ip: 192.168.24.22
-  process-id: 81010
+  process-id: 81012
   packet-workers: 0
   packet-queue-size: 0
   dbms-workers: 0
@@ -65,10 +59,10 @@ spring:
       on-profile: dev
   datasource:
     hikari:
-      driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      jdbc-url: jdbc:log4jdbc:oracle:thin:@115.91.94.42:1521:HANTE
-      username: siguser
-      password: siguser
+      driver-class-name: oracle.jdbc.OracleDriver
+      jdbc-url: jdbc:oracle:thin:@192.168.10.68:1521:CVIBDB
+      username: sigtest
+      password: sigtest
 
 ---
 spring:
@@ -81,15 +75,3 @@ spring:
       jdbc-url: jdbc:oracle:thin:@192.168.10.68:1521:CVIBDB
       username: siguser
       password: siguser
-
----
-spring:
-  config:
-    activate:
-      on-profile: test
-  datasource:
-    hikari:
-      driver-class-name: oracle.jdbc.OracleDriver
-      jdbc-url: jdbc:oracle:thin:@192.168.10.68:1521:CVIBDB
-      username: sigtest
-      password: sigtest

src/main/resources/logback-spring-appender.xml

@@ -73,19 +73,6 @@
         </rollingPolicy>
     </appender>
 
-    <appender name="FILE_STATISTICS" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_PATH}${LOG_FILE_NAME_STATISTICS}</file>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <charset>${LOG_CHARSET}</charset>
-            <pattern>${LOG_PATTERN_STATISTICS}</pattern>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_NAME_STATISTICS}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
-            <maxFileSize>${MAX_FILESIZE}</maxFileSize>
-            <maxHistory>${MAX_HISTORY}</maxHistory>
-        </rollingPolicy>
-    </appender>
-
     <appender name="FILE_SCHEDULE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${LOG_PATH}${LOG_FILE_NAME_SCHEDULE}</file>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">

src/main/resources/logback-spring.xml

@@ -3,8 +3,8 @@
     <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
 
     <property name="APP_CLASS_PATH"  value="com.ggits.comm.server"/>
-    <property name="PROJECT_PREFIX"  value="ggits"/>
-    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}-comm-server"/>
+    <property name="PROJECT_PREFIX"  value="ggits-comm"/>
+    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}-server"/>
     <property name="ROOT_LOG_LEVEL"  value="INFO"/>
     <property name="LOG_CHARSET"     value="UTF-8" />
     <property name="LOG_PATH"        value="${user.home}/logs/${PROJECT_NAME}/"/>
@@ -17,7 +17,6 @@
     <property name="LOG_FILE_NAME_SESSION"     value="${PROJECT_PREFIX}-session.log"/>
     <property name="LOG_FILE_NAME_SQL"         value="${PROJECT_PREFIX}-sql.log"/>
     <property name="LOG_FILE_NAME_SCHEDULE"    value="${PROJECT_PREFIX}-schedule.log"/>
-    <property name="LOG_FILE_NAME_STATISTICS"  value="${PROJECT_PREFIX}-statistics.log"/>
 
     <property name="MAX_FILESIZE" value="10MB"/>
     <property name="MAX_HISTORY"  value="10"/>
@@ -27,8 +26,6 @@
     <property name="LOG_PATTERN_SESSION"     value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_SQL"         value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_SCHEDULE"    value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
-    <property name="LOG_PATTERN_STATISTICS"  value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
-<!--    <property name="LOG_PATTERN_CONSOLE"     value="[%d{HH:mm:ss.SSS}] %highlight([%5level]) %highlight(${PID:-}): %cyan(%msg) %n"/>-->
     <property name="LOG_PATTERN_CONSOLE"     value="[%d{HH:mm:ss.SSS}] [%5level] %msg %n"/>
 
     <springProfile name="!xxx">
@@ -51,12 +48,6 @@
         <appender-ref ref="FILE_ERROR"/>
     </logger>
 
-    <logger name="${APP_CLASS_PATH}.service" level="INFO" additivity="false">
-        <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="FILE_STATISTICS"/>
-        <appender-ref ref="FILE_ERROR"/>
-    </logger>
-
     <logger name="${APP_CLASS_PATH}.scheduler" level="INFO" additivity="false">
         <appender-ref ref="CONSOLE"/>
         <appender-ref ref="FILE_SCHEDULE"/>

src/main/resources/mybatis/mapper/IntMapper.xml

@@ -15,7 +15,7 @@
                NVL(A.MAIN_INTNO,   0) AS mainIntNo,
                NVL(A.GROUP_NO,     0) AS groupNo,
                NVL(A.NODE_ID,      0) AS nodeId
-        FROM TB_INT A, TB_REGION_GGITS B
+        FROM TB_INT A, TB_GGITS_REGION B
         WHERE A.REGION_CD = B.REGION_CD
           AND A.REGION_CD = #{regionCd}
         ]]>

src/main/resources/mybatis/mapper/RegionCenterMapper.xml

@@ -8,7 +8,7 @@
         SELECT A.REGION_CD AS regionCd,
                A.REGION_NO AS ggitsRegionNo,
                B.REGION_ID AS regionId
-        FROM TB_REGION_GGITS A, TB_REGION_CENTER B
+        FROM TB_GGITS_REGION A, TB_REGION_CENTER B
         WHERE A.REGION_CD = B.REGION_CD
         ]]>
     </select>
@@ -49,7 +49,7 @@
                      NVL(A.COMM_HIST_YN,'N')              AS COMM_HIST_YN
               FROM TB_REGION_CENTER A, TB_REGION_CENTER_SVC B
               WHERE A.REGION_CD = B.REGION_CD(+)
-             ) B, TB_REGION_GGITS C
+             ) B, TB_GGITS_REGION C
         WHERE A.REGION_CD = B.REGION_CD
           AND B.REGION_CD = C.REGION_CD
         ]]>