dev

conf/application.yml

@@ -2,8 +2,8 @@ application:
   name: 안동시 VMS 통신 서버
   listen-port: 3001
   ftp-home-dir: C:\DRIVE_E\ANDONG_VMS_FTP
-  ftp-server-ip: 115.91.74.42
-  ftp-server-port: 9871
+  ftp-server-ip: 115.91.94.42
+  ftp-server-port: 8871
   ftp-passive-mode: 0
   ftp-user-id: vmsuser
   ftp-user-pswd: vmsuser#1234

conf/debug.properties

@@ -1,5 +1,5 @@
 #system debug setting configuration...
-#Wed Nov 01 16:18:00 KST 2023
+#Wed Nov 01 17:08:30 KST 2023
 packet-info=1001
 packet-dump=1001
 system-debug=false

src/main/java/com/its/app/utils/NettyUtils.java

@@ -170,12 +170,11 @@ public final class NettyUtils {
         // prefer ipv4
         if (!ipv4Result.isEmpty()) {
             for (String ip : ipv4Result) {
-                if (ip.startsWith("127.0") || ip.startsWith("192.168")) {
+                if (ip.startsWith("127.0") || ip.startsWith("0.0")) {
                     continue;
                 }
                 return ip;
             }
-
             return ipv4Result.get(ipv4Result.size() - 1);
         } else if (!ipv6Result.isEmpty()) {
             return ipv6Result.get(0);

src/main/java/com/its/vms/config/ApplicationConfig.java

@@ -1,5 +1,6 @@
 package com.its.vms.config;
 
+import com.its.app.utils.NettyUtils;
 import com.its.app.utils.SysUtils;
 import com.its.vms.domain.VmsConstants;
 import lombok.Getter;
@@ -53,6 +54,12 @@ public class ApplicationConfig {
     protected int connectTimeoutSeconds = 0;
 
     private String ftpHomeDir = "./ftp";
+    private String ftpServerIp = "";
+    private int ftpServerPort = 9871;
+    private int ftpPassiveMode = 0;
+    private String ftpUserId = "vmsuser";
+    private String ftpUserPswd = "vmsuser#1234";
+
     private String ftpFormDir ;  // FTP Form Directory
     private String ftpVideoDir;  // FTP Video Directory
     private String ftpStaticDir; // FTP 정적폼 Directory
@@ -126,6 +133,11 @@ public class ApplicationConfig {
         makeDirectory(this.ftpStaticDir, "ftp Static Form directory");
         makeDirectory(this.ftpImageDir, "ftp Image directory");
 
+        this.ftpServerIp = this.ftpServerIp.trim();
+        if (this.ftpServerIp.isEmpty()) {
+            this.ftpServerIp = NettyUtils.getLocalAddress();
+            log.error("dddddddddddddddddddddddddddddddddd: {}", this.ftpServerIp);
+        }
         if (this.fontSizeRatio == 0f) {
             this.fontSizeRatio = 1.35f;
         }

src/main/java/com/its/vms/ui/MainUI.form

@@ -187,9 +187,9 @@
         <margin top="0" left="4" bottom="0" right="4"/>
         <constraints>
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
-            <minimum-size width="-1" height="250"/>
-            <preferred-size width="-1" height="250"/>
-            <maximum-size width="-1" height="250"/>
+            <minimum-size width="-1" height="300"/>
+            <preferred-size width="-1" height="300"/>
+            <maximum-size width="-1" height="300"/>
           </grid>
         </constraints>
         <properties/>
@@ -211,7 +211,7 @@
                   <font name="Malgun Gothic" size="12" style="0"/>
                   <horizontalAlignment value="2"/>
                   <icon value="static/image/logging.png"/>
-                  <text value="시스템 로그"/>
+                  <text value="시스템 로그    "/>
                 </properties>
               </component>
               <hspacer id="656fd">

src/main/java/com/its/vms/ui/MainUI.java

@@ -581,7 +581,7 @@ public class MainUI {
         pnlControl.add(btnControl, new GridConstraints(0, 6, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         pnlLog = new JPanel();
         pnlLog.setLayout(new GridLayoutManager(2, 1, new Insets(0, 4, 0, 4), -1, -1));
-        rootPanel.add(pnlLog, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, new Dimension(-1, 250), new Dimension(-1, 250), new Dimension(-1, 250), 0, false));
+        rootPanel.add(pnlLog, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, new Dimension(-1, 300), new Dimension(-1, 300), new Dimension(-1, 300), 0, false));
         pnlLogTitle = new JPanel();
         pnlLogTitle.setLayout(new GridLayoutManager(1, 7, new Insets(0, 0, 0, 2), 1, 1));
         pnlLog.add(pnlLogTitle, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
@@ -590,7 +590,7 @@ public class MainUI {
         if (label4Font != null) label4.setFont(label4Font);
         label4.setHorizontalAlignment(2);
         label4.setIcon(new ImageIcon(getClass().getResource("/static/image/logging.png")));
-        label4.setText("시스템 로그");
+        label4.setText("시스템 로그    ");
         pnlLogTitle.add(label4, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final Spacer spacer3 = new Spacer();
         pnlLogTitle.add(spacer3, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));