dev

.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8" />
+</project>

ggits-comm-server/build.gradle

@@ -52,7 +52,9 @@ jar {
     enabled = false
 }
 
-tasks.withType(JavaCompile) {
+compileJava.options.encoding = 'UTF-8'
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:unchecked'
     options.deprecation = true
+    options.encoding = 'UTF-8'
 }

ggits-comm-server/src/main/java/com/sig/ggits/comm/server/dto/NET.java

@@ -1,11 +0,0 @@
-package com.sig.ggits.comm.server.dto;
-
-public class NET {
-
-    public final static int CLOSED = 0; /* 종료된 상태 */
-    public final static int LOGIN_WAIT = 1;      /* 최초 연결후 로그인 기다림 */
-    public final static int CONNECTED= 2;      /* 로그인 성공 */
-    public final static int DBASE_TRANS = 3;     /* database trans state */
-    public final static int DATA_TRANS = 4;      /* data trans state */
-
-}

ggits-comm-server/src/main/java/com/sig/ggits/comm/server/dto/NetState.java

@@ -1,71 +0,0 @@
-package com.sig.ggits.comm.server.dto;
-
-import io.netty.channel.Channel;
-import lombok.Data;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-@Data
-public class NetState {
-
-    private int netState;
-    private Channel channel;
-    private long connectCount;
-    private long lastCommTime;
-    private Date connectTime;
-    private Date disconnectTime;
-
-    public NetState() {
-        init();
-    }
-    public void init() {
-        this.netState = NET.CLOSED;
-        this.channel = null;
-        this.connectCount = 0;
-        this.lastCommTime = 0;
-        this.connectTime = null;
-        this.disconnectTime = null;
-    }
-
-    public void setLastCommTime() {
-        this.lastCommTime = System.currentTimeMillis();
-    }
-    public void connect(Channel channel) {
-        this.netState = NET.LOGIN_WAIT;
-        this.channel = channel;
-        this.connectCount++;
-        this.connectTime = new Date();
-        setLastCommTime();
-    }
-    public void loginOk() {
-        //this.netState = NET.CONNECTED;
-        this.netState = NET.DATA_TRANS;
-    }
-    public void disConnect() {
-        this.netState = NET.CLOSED;
-        this.channel = null;
-        this.disconnectTime = new Date();
-    }
-    public boolean isActive() {
-        return this.channel != null && this.channel.isActive();
-    }
-    public String getConnectTimeString() {
-        if (this.connectTime == null) {
-            return "----/--/-- --:--:--";
-        }
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(this.connectTime);
-        return (new SimpleDateFormat("yyyy/MM/dd HH:mm:ss")).format(cal.getTime());
-    }
-
-    public String getDisconnectTimeString() {
-        if (this.disconnectTime == null) {
-            return "----/--/-- --:--:--";
-        }
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(this.disconnectTime);
-        return (new SimpleDateFormat("yyyy/MM/dd HH:mm:ss")).format(cal.getTime());
-    }
-}

ggits-etlp-server/build.gradle

@@ -50,7 +50,9 @@ jar {
     enabled = false
 }
 
-tasks.withType(JavaCompile) {
+compileJava.options.encoding = 'UTF-8'
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:unchecked'
     options.deprecation = true
+    options.encoding = 'UTF-8'
 }

ggits-tsinfo-server/build.gradle

@@ -53,7 +53,9 @@ jar {
     enabled = false
 }
 
-tasks.withType(JavaCompile) {
+compileJava.options.encoding = 'UTF-8'
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:unchecked'
     options.deprecation = true
+    options.encoding = 'UTF-8'
 }

sig-comm-server/build.gradle

@@ -52,7 +52,9 @@ jar {
     enabled = false
 }
 
-tasks.withType(JavaCompile) {
+compileJava.options.encoding = 'UTF-8'
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:unchecked'
     options.deprecation = true
+    options.encoding = 'UTF-8'
 }

sig-comm-server/src/main/java/com/sig/comm/server/config/ApplicationConfig.java

@@ -1,9 +1,9 @@
 package com.sig.comm.server.config;
 
 import com.its.common.network.tcp.server.NettyServerConfig;
-import com.sig.comm.server.dto.NetState;
 import com.sig.comm.server.dto.RelayCenter;
 import com.sig.comm.server.repository.ApplicationRepository;
+import com.sig.common.dto.NetState;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;

sig-comm-server/src/main/java/com/sig/comm/server/controller/SigCommServerController.java

@@ -1,8 +1,8 @@
 package com.sig.comm.server.controller;
 
-import com.sig.comm.server.dto.NET;
 import com.sig.comm.server.dto.RegionCenter;
 import com.sig.comm.server.repository.ApplicationRepository;
+import com.sig.common.dto.NET;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,23 +21,23 @@ public class SigCommServerController {
 
     @GetMapping(value = "", produces = {"application/json; charset=utf8"})
     public String info() {
-        String sep = System.getProperty("line.separator");
+        String sep = System.lineSeparator();
         String heading = "---------------------------------------------------------------------------------------------------------";
 
         RegionCenter center = ApplicationRepository.center;
 
         StringBuilder sb = new StringBuilder();
-        sb.append(heading + sep);
-        sb.append("UTIC Local Signal Communication Server" + sep);
-        sb.append(heading + sep);
+        sb.append(heading).append(sep);
+        sb.append("UTIC Local Signal Communication Server").append(sep);
+        sb.append(heading).append(sep);
         sb.append(String.format("%s, %s",
-                center.getRegionCd(), center.getIpAddress() + sep));
-        sb.append(heading + sep);
+                center.getRegionCd(), center.getIpAddress())).append(sep);
+        sb.append(heading).append(sep);
         sb.append(String.format("%s %-15.15s %-8.8s %-20.20s %-20.20s %-20.20s %s",
                 "---", "IP Address", "Network",
                 "Connect Time", "Disconnect Time",
-                "Last Comm Time", "Center Name") + sep);
-        sb.append(heading + sep);
+                "Last Comm Time", "Center Name")).append(sep);
+        sb.append(heading).append(sep);
         int total = 0;
         int onLine = 0;
         List<String> keySet = new ArrayList<>(this.repo.getCenterMap().keySet());
@@ -57,12 +57,12 @@ public class SigCommServerController {
                     region.getRegionCd(), region.getIpAddress(), commStatus,
                     region.getNetState().getConnectTimeString(), region.getNetState().getDisconnectTimeString(),
                     region.getNetState().getLastCommTimeString(),
-                    region.getRegionNm()) + sep);
+                    region.getRegionNm())).append(sep);
 
         }
-        sb.append(heading + sep);
-        sb.append(String.format("Total : %d, OnLine(Connect): %d", total, onLine) + sep);
-        sb.append(heading + sep);
+        sb.append(heading).append(sep);
+        sb.append(String.format("Total : %d, OnLine(Connect): %d", total, onLine)).append(sep);
+        sb.append(heading).append(sep);
         return sb.toString();
     }
 

sig-comm-server/src/main/java/com/sig/comm/server/dto/NET.java

@@ -1,13 +0,0 @@
-package com.sig.comm.server.dto;
-
-public class NET {
-
-    private NET() {}
-
-    public final static int CLOSED = 0; /* 종료된 상태 */
-    public final static int LOGIN_WAIT = 1;      /* 최초 연결후 로그인 기다림 */
-    public final static int CONNECTED= 2;      /* 로그인 성공 */
-    public final static int DBASE_TRANS = 3;     /* database trans state */
-    public final static int DATA_TRANS = 4;      /* data trans state */
-
-}

sig-comm-server/src/main/java/com/sig/comm/server/dto/RegionCenter.java

@@ -1,6 +1,8 @@
 package com.sig.comm.server.dto;
 
 import com.sig.comm.server.xnet.server.process.request.SigCommRequest;
+import com.sig.common.dto.NET;
+import com.sig.common.dto.NetState;
 import io.netty.channel.ChannelFuture;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sig-comm-server/src/main/java/com/sig/comm/server/dto/RelayCenter.java

@@ -1,5 +1,6 @@
 package com.sig.comm.server.dto;
 
+import com.sig.common.dto.NetState;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

sig-comm-server/src/main/java/com/sig/comm/server/entity/TbRegionCenter.java

@@ -1,7 +1,7 @@
 package com.sig.comm.server.entity;
 
-import com.sig.comm.server.dto.NetState;
 import com.sig.comm.server.dto.RegionCenter;
+import com.sig.common.dto.NetState;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

sig-comm-server/src/main/java/com/sig/comm/server/repository/ApplicationRepository.java

@@ -4,12 +4,16 @@ import com.its.common.network.NettyUtils;
 import com.its.common.utils.Elapsed;
 import com.sig.comm.server.dao.mapper.IntMapper;
 import com.sig.comm.server.dao.mapper.RegionCenterMapper;
-import com.sig.comm.server.dto.*;
+import com.sig.comm.server.dto.IntDto;
+import com.sig.comm.server.dto.RegionCenter;
+import com.sig.comm.server.dto.RelayCenter;
 import com.sig.comm.server.entity.TbInt;
 import com.sig.comm.server.entity.TbRegionCenter;
 import com.sig.comm.server.entity.TbRegionCenterComm;
 import com.sig.comm.server.process.dbms.DbmsData;
 import com.sig.comm.server.process.dbms.DbmsDataProcess;
+import com.sig.common.dto.NET;
+import com.sig.common.dto.NetState;
 import io.netty.channel.Channel;
 import io.netty.util.AttributeKey;
 import lombok.Getter;

sig-comm-server/src/test/java/com/sig/comm/server/SigCommServerApplicationTests.java

@@ -1,11 +1,11 @@
 package com.sig.comm.server;
 
 import com.its.common.utils.ByteUtils;
-import com.sig.comm.server.dto.NetState;
 import com.sig.comm.server.dto.RegionCenter;
 import com.sig.comm.server.xnet.server.process.protocol.SigCommPacket;
 import com.sig.comm.server.xnet.server.process.response.RecvPacketDto;
 import com.sig.comm.server.xnet.server.process.response.SigSignalMap;
+import com.sig.common.dto.NetState;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 
@@ -159,7 +159,7 @@ public class SigCommServerApplicationTests {
 
         @Override
         public Thread newThread(Runnable r) {
-            return new Thread(r, Name + ++count); // Mythread-x 형태로 쓰레드 이름 설정
+            return new Thread(r, Name + ++count);
         }
     }
 

sig-common/src/main/java/com/sig/common/dto/NET.java

@@ -0,0 +1,13 @@
+package com.sig.common.dto;
+
+public class NET {
+
+    private NET() {}
+
+    public static final int CLOSED = 0; /* 종료된 상태 */
+    public static final int LOGIN_WAIT = 1;      /* 최초 연결후 로그인 기다림 */
+    public static final int CONNECTED= 2;      /* 로그인 성공 */
+    public static final int DBASE_TRANS = 3;     /* database trans state */
+    public static final int DATA_TRANS = 4;      /* data trans state */
+
+}

sig-comm-server/src/main/java/com/sig/comm/server/dto/NetState.java → sig-common/src/main/java/com/sig/common/dto/NetState.java

@@ -1,4 +1,4 @@
-package com.sig.comm.server.dto;
+package com.sig.common.dto;
 
 import io.netty.channel.Channel;
 import lombok.Data;
@@ -23,6 +23,7 @@ public class NetState {
     public NetState() {
         init();
     }
+
     public void init() {
         this.state = NET.CLOSED;
         this.channel = null;

sig-consumer/build.gradle

@@ -39,7 +39,9 @@ jar {
     enabled = false
 }
 
-tasks.withType(JavaCompile) {
+compileJava.options.encoding = 'UTF-8'
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:unchecked'
     options.deprecation = true
+    options.encoding = 'UTF-8'
 }

sig-todp-server/build.gradle

@@ -51,7 +51,9 @@ jar {
     enabled = false
 }
 
-tasks.withType(JavaCompile) {
+compileJava.options.encoding = 'UTF-8'
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:unchecked'
     options.deprecation = true
+    options.encoding = 'UTF-8'
 }