From 3dd6c8d707357060db233d3c3b21a9b95d5826b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Tue, 5 Dec 2023 10:24:44 +0900 Subject: [PATCH] =?UTF-8?q?=EC=84=9C=EB=B2=84=EC=9D=B4=EC=A0=84=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- document/dron_test/pav-warning.js | 7 +++++-- pav-server/src/main/resources/application-database.yml | 4 ++-- pav-server/src/main/resources/application.yml | 3 ++- .../src/main/resources/config/log/logback-spring.xml | 2 +- .../src/main/java/com/palnet/comn/model/UtmModel.java | 1 - pav-socket/src/main/resources/application.yml | 6 ++++-- .../palnet/server/controller/SocketReceiverController.java | 4 ++-- pav-websocket/src/main/resources/application.yml | 1 + 8 files changed, 17 insertions(+), 11 deletions(-) diff --git a/document/dron_test/pav-warning.js b/document/dron_test/pav-warning.js index b3337f2..9207b9e 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 5bbec65..82c28b6 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 a7b707c..4104734 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 3d4023d..698ea9e 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 0ae4f96..275f6a9 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 1def7c8..08dbe47 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 befdae3..af22a5e 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 e34808a..b73a87e 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/