diff --git a/document/dron_test/pav-warning.js b/document/dron_test/pav-warning.js
index b3337f28..9207b9e4 100644
--- a/document/dron_test/pav-warning.js
+++ b/document/dron_test/pav-warning.js
@@ -2,9 +2,12 @@ const { getConnection, writeData } = require('./pav-client');
const { getCoordsFormBetweenCoord, dumyData } = require('./pav-utils');
// const host = '192.168.0.30';
-const host = 'localhost';
+// const host = 'localhost';
+// const host = '192.168.100.101';
+const host = '121.190.193.50';
// const host = '211.253.11.189';
-const port = 8082;
+// const port = 8082;
+const port = 6083;
// 기본정보
const prefix = 'PALUTM-';
diff --git a/pav-server/src/main/resources/application-database.yml b/pav-server/src/main/resources/application-database.yml
index 5bbec65b..82c28b67 100644
--- a/pav-server/src/main/resources/application-database.yml
+++ b/pav-server/src/main/resources/application-database.yml
@@ -41,8 +41,8 @@ spring:
datasource:
control:
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
- jdbc-url: jdbc:log4jdbc:mysql://palnet.cexpliz30rwl.ap-northeast-2.rds.amazonaws.com:3306/PAV?characterEncoding=UTF-8&autoReconnect=true&useSSL=false
- username: pav
+ jdbc-url: jdbc:log4jdbc:mysql://192.168.100.102:3306/PAV_KAC?characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+ username: pav-kac
password: palnet!234
minimumidle: 10
maximumpoolsize: 20
diff --git a/pav-server/src/main/resources/application.yml b/pav-server/src/main/resources/application.yml
index a7b707c5..4104734d 100644
--- a/pav-server/src/main/resources/application.yml
+++ b/pav-server/src/main/resources/application.yml
@@ -189,4 +189,5 @@ url:
app:
- host: http://211.253.11.189:8080
+# host: http://211.253.11.189:8080
+ host: http://121.190.193.50:6081
diff --git a/pav-server/src/main/resources/config/log/logback-spring.xml b/pav-server/src/main/resources/config/log/logback-spring.xml
index 3d4023dd..698ea9e9 100644
--- a/pav-server/src/main/resources/config/log/logback-spring.xml
+++ b/pav-server/src/main/resources/config/log/logback-spring.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/pav-socket/src/main/java/com/palnet/comn/model/UtmModel.java b/pav-socket/src/main/java/com/palnet/comn/model/UtmModel.java
index 0ae4f96f..275f6a9c 100644
--- a/pav-socket/src/main/java/com/palnet/comn/model/UtmModel.java
+++ b/pav-socket/src/main/java/com/palnet/comn/model/UtmModel.java
@@ -1,6 +1,5 @@
package com.palnet.comn.model;
-import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/pav-socket/src/main/resources/application.yml b/pav-socket/src/main/resources/application.yml
index 1def7c8f..08dbe473 100644
--- a/pav-socket/src/main/resources/application.yml
+++ b/pav-socket/src/main/resources/application.yml
@@ -86,12 +86,14 @@ logging:
console: '%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n'
file: '%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n'
file:
- name: /data/logs/data.log
+ name: /data/logs/socket/data.log
level:
com.palnet: info
app:
host: http://127.0.0.1:8080
+# host: http://121.190.193.50:8080
web-socket:
- host: http://127.0.0.1:8081
+ host: http://127.0.0.1:8181
+# host: http://121.190.193.50:8181
diff --git a/pav-websocket/src/main/java/com/palnet/server/controller/SocketReceiverController.java b/pav-websocket/src/main/java/com/palnet/server/controller/SocketReceiverController.java
index befdae3a..af22a5e3 100644
--- a/pav-websocket/src/main/java/com/palnet/server/controller/SocketReceiverController.java
+++ b/pav-websocket/src/main/java/com/palnet/server/controller/SocketReceiverController.java
@@ -36,7 +36,7 @@ public class SocketReceiverController {
@PostMapping("/receiver")
public ResponseEntity> receiver(@RequestBody GPModel model) {
- log.info("websocket message : {}", model);
+ log.info("websocket message receiver : {}", model);
// GPModel model = null;
// try {
// model = objectMapper.readValue(message, GPModel.class);
@@ -56,7 +56,7 @@ public class SocketReceiverController {
@PostMapping("/receiver/async")
public Callable asyncReceiver(@RequestBody GPModel model) {
return () -> {
- log.info("websocket message : {}", model);
+ log.info("websocket message receiver async: {}", model);
CtrCntrlModel history = service.modelConvert(model);
// DRON의 대한 식별정보만 이력 관리
historyShareContext.putHistory(model.getObjectId(), history);
diff --git a/pav-websocket/src/main/resources/application.yml b/pav-websocket/src/main/resources/application.yml
index e34808a2..b73a87ec 100644
--- a/pav-websocket/src/main/resources/application.yml
+++ b/pav-websocket/src/main/resources/application.yml
@@ -70,3 +70,4 @@ logging:
app:
host: http://127.0.0.1:8080/
+# host: http://121.190.193.50:8080/