From 5e3474cc305e7f3e796f1f01648bd788e7d08265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= <dhji@palnet.co.kr>
Date: Wed, 13 Sep 2023 13:12:23 +0900
Subject: [PATCH] =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=8D=BC=ED=8B=B0=20?=
 =?UTF-8?q?=EB=B0=8F=20=EB=A1=9C=EA=B7=B8=20=EC=84=A4=EC=A0=95=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pav-server/src/main/resources/application.yml |  98 +------------
 .../resources/config/log/logback-spring.xml   |   2 +-
 pav-socket/src/main/resources/application.yml | 131 +++++-------------
 .../src/main/resources/application.yml        |  76 ++++------
 4 files changed, 65 insertions(+), 242 deletions(-)

diff --git a/pav-server/src/main/resources/application.yml b/pav-server/src/main/resources/application.yml
index f2f4636..cbf486e 100644
--- a/pav-server/src/main/resources/application.yml
+++ b/pav-server/src/main/resources/application.yml
@@ -5,19 +5,8 @@ spring:
   jackson:
     time-zone: Asia/Seoul
   
-#  mvc:
-#    view:
-#      prefix: /WEB-INF/jsp/
-#      suffix: .jsp 
-  
 logging:
   config: classpath:config/log/logback-spring.xml
-#  level:
-#    org:
-#      hibernate:
-#        type:
-#          descriptor:
-#            sql: trace
 
 ---
 
@@ -28,10 +17,6 @@ spring:
   devtools:
     livereload:
       enabled: true
-#  redis: 
-#    host: ec2-54-180-88-137.ap-northeast-2.compute.amazonaws.com
-#    port: 6379
-#    database: 3
   servlet:
     multipart:
       enabled: true
@@ -45,24 +30,6 @@ spring:
       ddl-auto: none
     properties:
       hibernate:
-#        use_sql_comments: true
-#        use_sql_comments: false
-#        show_sql: true
-#        format_sql: true
-  rabbitmq:
-    host: 192.168.0.26
-    port: 5672
-    username: palnet
-    password: palnet!234
-    listener:
-      simple:
-        acknowledge-mode: manual
-        retry:
-          enabled: true
-          initial-interval: 3s
-          max-interval: 10s
-          max-attempts: 2
-          multiplier: 2
 
 server:
   port: 8080
@@ -83,15 +50,6 @@ netty:
     thread:
         boss: 1
         worker: 1
-message:
-  app:
-    queue-name: app.drone.queue
-    exchange-name: app.drone.exchange
-    routing-key: app.drone.routing.#
-  websocket:
-    queue-name: websocket.drone.queue
-    exchange-name: websocket.drone.exchange
-    routing-key: websocket.drone.routing.#
 
 api:
   naver:
@@ -108,10 +66,6 @@ spring:
   devtools:
     livereload:
       enabled: true
-#  redis: 
-#    host: ec2-54-180-88-137.ap-northeast-2.compute.amazonaws.com
-#    port: 6379
-#    database: 3
   jpa:
     hibernate:
       naming:
@@ -157,7 +111,7 @@ spring:
   devtools:
     livereload:
       enabled: true
-#  redis: 
+#  redis:
 #    host: qrcode-redis-common.lh9tsq.ng.0001.apn2.cache.amazonaws.com
 #    port: 6379
 #    database: 1
@@ -171,20 +125,6 @@ spring:
         use_sql_comments: false
         show_sql: false
         format_sql: false
-  rabbitmq:
-    host: 211.253.38.218
-    port: 5672
-    username: palnet
-    password: palnet1234
-    listener:
-      simple:
-        acknowledge-mode: manual
-        retry:
-          enabled: true
-          initial-interval: 3s
-          max-interval: 10s
-          max-attempts: 2
-          multiplier: 2
 
 server:
   port: 8080
@@ -209,15 +149,6 @@ netty:
     thread:
         boss: 1
         worker: 1
-message:
-  app:
-    queue-name: app.drone.queue
-    exchange-name: app.drone.exchange
-    routing-key: app.drone.routing.#
-  websocket:
-    queue-name: websocket.drone.queue
-    exchange-name: websocket.drone.exchange
-    routing-key: websocket.drone.routing.#
 
 api:
   naver:
@@ -234,10 +165,6 @@ spring:
   devtools:
     livereload:
       enabled: true
-#  redis: 
-#    host: qrcode-redis-common.lh9tsq.ng.0001.apn2.cache.amazonaws.com
-#    port: 6379
-#    database: 1
   jpa:
     hibernate:
       naming:
@@ -248,20 +175,6 @@ spring:
         use_sql_comments: false
         show_sql: false
         format_sql: false
-  rabbitmq:
-    host: 211.253.38.218
-    port: 5672
-    username: palnet
-    password: palnet1234
-    listener:
-      simple:
-        acknowledge-mode: manual
-        retry:
-          enabled: true
-          initial-interval: 3s
-          max-interval: 10s
-          max-attempts: 2
-          multiplier: 2
 
 server:
   port: 8080
@@ -286,15 +199,6 @@ netty:
     thread:
         boss: 1
         worker: 1
-message:
-  app:
-    queue-name: app.drone.queue
-    exchange-name: app.drone.exchange
-    routing-key: app.drone.routing.#
-  websocket:
-    queue-name: websocket.drone.queue
-    exchange-name: websocket.drone.exchange
-    routing-key: websocket.drone.routing.#
 
 api:
   naver:
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 280b1da..abb43cd 100644
--- a/pav-server/src/main/resources/config/log/logback-spring.xml
+++ b/pav-server/src/main/resources/config/log/logback-spring.xml
@@ -9,7 +9,7 @@
 		<property name="LOG_DIR" value="c:\/project/log/control-server"/>
 	</springProfile>
 	<springProfile name="dev">
-		<property name="LOG_DIR" value="/project/logs/control-server/" />
+		<property name="LOG_DIR" value="/data/logs/server" />
 	</springProfile>
 	<springProfile name="prod">
 		<property name="LOG_DIR" value="/data/logs/server01/" />
diff --git a/pav-socket/src/main/resources/application.yml b/pav-socket/src/main/resources/application.yml
index 0481506..ad40382 100644
--- a/pav-socket/src/main/resources/application.yml
+++ b/pav-socket/src/main/resources/application.yml
@@ -2,12 +2,6 @@ spring:
   config:
     activate:
       on-profile: local
-#  rabbitmq:
-#    host: 192.168.0.26
-#    port: 5672
-#    username: palnet
-#    password: palnet!234
-#    virtual-host: /
 
 netty:
   task:
@@ -24,29 +18,46 @@ netty:
 server:
   port: 8182
 
-#message:
-#  app:
-#    queue-name: app.drone.queue
-#    exchange-name: app.drone.exchange
-#    routing-key: app.drone.routing.#
-#  websocket:
-#    queue-name: websocket.drone.queue
-#    exchange-name: websocket.drone.exchange
-#    routing-key: websocket.drone.routing.#
+app:
+  host: http://127.0.0.1:8080
+web-socket:
+  host: http://127.0.0.1:8181
+
+---
+
+spring:
+  config:
+    activate:
+      on-profile: dev
+
+netty:
+  task:
+    controlinfoTime: 2000
+  socket:
+    port: 8082
+    thread:
+      boss: 1
+      worker: 1
+  websocket:
+    host: 127.0.0.1
+    port: 8081
+
+server:
+  port: 8182
 
 app:
   host: http://127.0.0.1:8080
 web-socket:
   host: http://127.0.0.1:8181
 
-#management:
-#  endpoints:
-#    web:
-#      base-path: /management
-#      path-mapping:
-#        health: health_check
-#      exposure:
-#        include: health, info
+logging:
+  pattern:
+    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/socket/data.log
+  level:
+    com.palnet: info
 
 ---
 
@@ -54,11 +65,6 @@ spring:
   config:
     activate:
       on-profile: dev
-#  rabbitmq:
-#    host: 192.168.0.26
-#    port: 5672
-#    username: guest
-#    password: guest
 
 netty:
   task:
@@ -72,41 +78,17 @@ netty:
 server:
   port: 8182
 
-#message:
-#  app:
-#    queue-name: app.drone.queue
-#    exchange-name: app.drone.exchange
-#    routing-key: app.drone.routing.#
-#  websocket:
-#    queue-name: websocket.drone.queue
-#    exchange-name: websocket.drone.exchange
-#    routing-key: websocket.drone.routing.#
-
 app:
   host: http://211.253.38.218:8080
 web-socket:
   host: http://211.253.38.218:8081
 
-#management:
-#  endpoints:
-#    web:
-#      base-path: /management
-#      path-mapping:
-#        health: health_check
-#      exposure:
-#        include: health, info
-
 ---
 
 spring:
   config:
     activate:
       on-profile: prod
-#  rabbitmq:
-#    host: 211.253.38.218
-#    port: 5672
-#    username: palnet
-#    password: palnet1234
 
 netty:
   task:
@@ -123,16 +105,6 @@ netty:
 server:
   port: 8182
 
-#message:
-#  app:
-#    queue-name: app.drone.queue
-#    exchange-name: app.drone.exchange
-#    routing-key: app.drone.routing.#
-#  websocket:
-#    queue-name: websocket.drone.queue
-#    exchange-name: websocket.drone.exchange
-#    routing-key: websocket.drone.routing.#
-
 logging:
   pattern:
     console: '%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n'
@@ -147,27 +119,12 @@ app:
 web-socket:
   host: http://211.253.38.218:8081
 
-
-#management:
-#  endpoints:
-#    web:
-#      base-path: /management
-#      path-mapping:
-#        health: health_check
-#      exposure:
-#        include: health, info
-
 ---
 
 spring:
   config:
     activate:
       on-profile: prod2
-#  rabbitmq:
-#    host: 211.253.38.218
-#    port: 5672
-#    username: palnet
-#    password: palnet1234
 
 netty:
   task:
@@ -184,16 +141,6 @@ netty:
 server:
   port: 8182
 
-#message:
-#  app:
-#    queue-name: app.drone.queue
-#    exchange-name: app.drone.exchange
-#    routing-key: app.drone.routing.#
-#  websocket:
-#    queue-name: websocket.drone.queue
-#    exchange-name: websocket.drone.exchange
-#    routing-key: websocket.drone.routing.#
-
 logging:
   pattern:
     console: '%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n'
@@ -207,13 +154,3 @@ app:
   host: http://211.253.38.218:8080
 web-socket:
   host: http://211.253.38.218:8081
-
-
-#management:
-#  endpoints:
-#    web:
-#      base-path: /management
-#      path-mapping:
-#        health: health_check
-#      exposure:
-#        include: health, info
\ No newline at end of file
diff --git a/pav-websocket/src/main/resources/application.yml b/pav-websocket/src/main/resources/application.yml
index 208b9b6..bd647ce 100644
--- a/pav-websocket/src/main/resources/application.yml
+++ b/pav-websocket/src/main/resources/application.yml
@@ -2,12 +2,6 @@ spring:
   config:
     activate:
       on-profile: local
-#  rabbitmq:
-#    host: 192.168.0.26
-#    port: 5672
-#    username: palnet
-#    password: palnet!234
-#    virtual-host: /
 
 server:
   port: 8181
@@ -18,15 +12,33 @@ netty:
   websocket:
     port: 8081
 
-#message:
-#  app:
-#    queue-name: app.drone.queue
-#    exchange-name: app.drone.exchange
-#    routing-key: app.drone.routing.#
-#  websocket:
-#    queue-name: websocket.drone.queue
-#    exchange-name: websocket.drone.exchange
-#    routing-key: websocket.drone.routing.#
+app:
+  host: http://127.0.0.1:8080/
+
+---
+
+spring:
+  config:
+    activate:
+      on-profile: dev
+
+server:
+  port: 8181
+
+netty:
+  task:
+    controlinfoTime: 2000
+  websocket:
+    port: 8081
+
+logging:
+  pattern:
+    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/websocket/data.log
+  level:
+    com.palnet: debug
 
 app:
   host: http://127.0.0.1:8080/
@@ -37,11 +49,6 @@ spring:
   config:
     activate:
       on-profile: prod
-#  rabbitmq:
-#    host: 211.253.38.218
-#    port: 5672
-#    username: palnet
-#    password: palnet1234
 
 server:
   port: 8181
@@ -52,22 +59,12 @@ netty:
   websocket:
     port: 8081
 
-#message:
-#  app:
-#    queue-name: app.drone.queue
-#    exchange-name: app.drone.exchange
-#    routing-key: app.drone.routing.#
-#  websocket:
-#    queue-name: websocket.drone.queue
-#    exchange-name: websocket.drone.exchange
-#    routing-key: websocket.drone.routing.#
-
 logging:
   pattern:
     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/websocket/data.log
   level:
     com.palnet: debug
 
@@ -80,11 +77,6 @@ spring:
   config:
     activate:
       on-profile: prod2
-#  rabbitmq:
-#    host: 211.253.38.218
-#    port: 5672
-#    username: palnet
-#    password: palnet1234
 
 server:
   port: 8181
@@ -95,22 +87,12 @@ netty:
   websocket:
     port: 8081
 
-#message:
-#  app:
-#    queue-name: app.drone.queue
-#    exchange-name: app.drone.exchange
-#    routing-key: app.drone.routing.#
-#  websocket:
-#    queue-name: websocket.drone.queue
-#    exchange-name: websocket.drone.exchange
-#    routing-key: websocket.drone.routing.#
-
 logging:
   pattern:
     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/websocket/data.log
   level:
     com.palnet: debug