shjung 1 year ago
parent
commit
7c6b6edd6f

+ 9 - 23
app-install/conf/application.yml

@@ -1,6 +1,12 @@
 application:
+  name: 안동시 VMS 통신 서버
   listen-port: 3001
-  ftp-home-dir: C:\DRIVE_E\ANDONG_VMS_FTP
+  ftp-home-dir: C:\ADITS\vms-comm-server\ftp
+  ftp-server-ip: 192.168.10.11
+  ftp-server-port: 9871
+  ftp-passive-mode: 0
+  ftp-user-id: vmsuser
+  ftp-user-pswd: vmsuser#1234
   load-db: true
   check-new-form: false
 
@@ -17,30 +23,10 @@ server:
   port: 8904
 
 spring:
-  profiles:
-    active: dev
-
----
-spring:
-  config:
-    activate:
-      on-profile: dev
-  datasource:
-    hikari:
-      driver-class-name: com.tmax.tibero.jdbc.TbDriver
-      jdbc-url: jdbc:tibero:thin:@115.91.94.42:8629:tibero
-      username: ENC(D/mtjX68HkE=)
-      password: ENC(D/mtjX68HkE=)
-
----
-spring:
-  config:
-    activate:
-      on-profile: prod
   datasource:
     hikari:
       driver-class-name: com.tmax.tibero.jdbc.TbDriver
-      jdbc-url: jdbc:tibero:thin:@115.91.94.42:8629:tibero
+      jdbc-url: jdbc:tibero:thin:@10.10.10.11:8629:Andong_ITS
       username: ENC(D/mtjX68HkE=)
-      password: ENC(D/mtjX68HkE=)
+      password: ENC(zQxSStMUW37QqZ+AJ4OKPg==)
 

+ 1 - 1
app-install/conf/debug.properties

@@ -2,4 +2,4 @@
 #Tue Nov 07 17:54:17 KST 2023
 packet-info=x
 packet-dump=x
-system-debug=true
+system-debug=false

BIN
app-install/fonts/D2Coding.ttc


BIN
app-install/fonts/H2GTRE.TTF


BIN
app-install/fonts/H2MJRE.TTF


BIN
app-install/fonts/NGULIM.TTF


BIN
app-install/fonts/NanumGothic.ttf


BIN
app-install/fonts/NanumGothicBold.ttf


BIN
app-install/fonts/NanumGothicExtraBold.ttf


BIN
app-install/fonts/NanumGothicLight.ttf


BIN
app-install/fonts/batang.ttc


BIN
app-install/fonts/gulim.ttc


BIN
app-install/fonts/malgun.ttf


BIN
app-install/fonts/malgunbd.ttf


BIN
app-install/fonts/malgunsl.ttf


BIN
app-install/vms-comm-server.exe.old


+ 2 - 2
conf/application.yml

@@ -46,7 +46,7 @@ spring:
   datasource:
     hikari:
       driver-class-name: com.tmax.tibero.jdbc.TbDriver
-      jdbc-url: jdbc:tibero:thin:@115.91.94.42:8629:tibero
+      jdbc-url: jdbc:tibero:thin:@10.10.10.11:8629:tibero
       username: ENC(D/mtjX68HkE=)
-      password: ENC(D/mtjX68HkE=)
+      password: ENC(zQxSStMUW37QqZ+AJ4OKPg==)
 

+ 1 - 1
conf/debug.properties

@@ -1,5 +1,5 @@
 #system debug setting configuration...
-#Tue Nov 07 17:50:36 KST 2023
+#Fri Nov 24 13:47:56 KST 2023
 packet-info=1001
 packet-dump=x
 system-debug=false

+ 2 - 1
src/main/java/com/its/vms/domain/VmsForm.java

@@ -283,7 +283,8 @@ public class VmsForm implements Serializable {
             if (StringUtils.isEmpty(pFormObj.getMemSymbLibNmbr())) pFormObj.setMemSymbLibNmbr("1"); //이력저장용
             if (StringUtils.isEmpty(pFormObj.getTextData())) pFormObj.setTextData(" "); //이력저장용
 
-            String bitmapId = String.valueOf(pFormObj.getBitmapId());
+//            String bitmapId = String.valueOf(pFormObj.getBitmapId());
+            String bitmapId = pFormObj.getSymbLibNmbr();
             switch(pFormObj.getObjectType())
             {
                 case   1: //심볼

+ 4 - 1
src/main/java/com/its/vms/domain/VmsFormObject.java

@@ -44,7 +44,8 @@ public class VmsFormObject implements Serializable {
     private int    fontBold;        // 폰트굵기
     private int    textAlign;       // 문자열정열방식
     private String textData;        // 문자열데이터
-    private String memSymbLibNmbr;  // 이미지아이디
+    private String memSymbLibNmbr;  // 이미지아이디(메모리)
+    private String symbLibNmbr;     // 이미지아이디
 
     private Long   ifscId;
     private int    ifscTrafGradCd;
@@ -68,6 +69,7 @@ public class VmsFormObject implements Serializable {
         this.bitmapId = 0;
         this.videoFileName = "";
         this.strmAddr = "";
+        this.symbLibNmbr = "0";
     }
 
     public void setFormObjectInfo(String fontName, TbVmsFormObjectDto obj) {
@@ -92,6 +94,7 @@ public class VmsFormObject implements Serializable {
         this.objectSize = obj.getVmsDsplSize();             // NUMBER(7)	Y	0		VMS 표출 크기(문자:문자길이,이미지:이미지전체크기)
         this.textData   = obj.getVmsDsplTxt();
         this.memSymbLibNmbr = obj.getSymbLibNmbr() + "0";
+        this.symbLibNmbr = obj.getSymbLibNmbr() + "";
 
         this.bitmapType = obj.getBitmapType();
         this.bitmapId = obj.getBitmapId();

+ 1 - 1
src/test/java/com/its/app/VmsCommServerApplicationTests.java

@@ -50,7 +50,7 @@ public class VmsCommServerApplicationTests {
         encryptor.setConfig(config);
 
         String yiits = encryptor.encrypt("adits");
-        String rutis = encryptor.encrypt("adits");
+        String rutis = encryptor.encrypt("ryxhdITS@#");
         log.info("{}", yiits);
         log.info("{}", rutis);
     }