Browse Source

deploy script add

hante 2 days ago
parent
commit
c653ed2fb6

+ 19 - 0
commit.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e  # 오류 발생 시 즉시 종료
+
+if [ -z "$1" ]; then
+  echo "❗️ 커밋 메시지를 입력하세요."
+  echo "사용법: ./commit.sh \"커밋 메시지\""
+  exit 1
+fi
+
+COMMIT_MSG="$1"
+
+echo "📦 Git 커밋 및 푸시 시작..."
+
+git add .
+git commit -m "$COMMIT_MSG"
+git push origin master
+git push server master
+
+echo "✅ 완료: '$COMMIT_MSG' 커밋 후 푸시됨"

+ 8 - 13
conf/ggits-comm-server.yml

@@ -1,34 +1,29 @@
-#logging:
-#  config: file:${user.dir}/conf/ggits-comm-server-logback.xml
-
 spring:
   profiles:
-    active: dev
+    active: prod
+
 server:
   port: 9873
 
 application:
-  process-id: 81030
+  process-id: 91030
   ggits-server-ip: 192.168.24.22
   comm-fail-seconds: 30
-
   kafka:
     bootstrap-servers: 192.168.11.23:9092
-    group-id: ggits-comm-server
     enable-node: false
-    enable-sig: true
+    enable-sig: false
 
 logging:
   file:
     path: ${user.home}/logs/ggits-comm-server/
 
 cluster:
-  enabled: true           # default: false
   id: 1
   nodes:
     - id: 1               # must be 1,2,3,...
-      ip: 192.168.20.44
-      port: 13888
+      ip: 192.168.10.81
+      port: 13840
     - id: 2
-      ip: 192.168.20.45
-      port: 13888
+      ip: 192.168.10.82
+      port: 13840

+ 9 - 8
conf/ggits-etlp-server.yml

@@ -1,18 +1,19 @@
 spring:
   profiles:
-    active: dev
+    active: prod
+
 server:
   port: 9874
 
 application:
-  process-id: 81040
+  process-id: 91040
   logging-hist: true
   etlp-int: false
   page-count: 0
   scheduling:
     process-ggits-etlp: 10 3 3 * * *
     ggits-tsinfo-enable: true
-    ggits-tsinfo-process-id: 81050
+    ggits-tsinfo-process-id: 91050
     ggits-tsinfo-url: http://192.168.24.22:9871/info/ps
 
 logging:
@@ -20,13 +21,13 @@ logging:
     path: ${user.home}/logs/ggits-etlp-server/
 
 cluster:
-  enabled: true           # default: false
   id: 1
   nodes:
     - id: 1               # must be 1,2,3,...
-      ip: 192.168.20.60
-      port: 13888
+      ip: 192.168.10.81
+      port: 14840
     - id: 2
-      ip: 192.168.20.99
-      port: 13888
+      ip: 192.168.10.82
+      port: 14840
+
 

+ 2 - 3
conf/ggits-tsinfo-server.yml

@@ -4,8 +4,7 @@ server:
 application:
   process0id: 81050
   ggits-servers: 192.168.10.81,192.168.10.82
-#  sta-path: /home/ggits/EasyTraffic/sta
-  sta-path: C:\KoROAD\Z.GGITS\ggits\EasyTraffic\sta
+  sta-path: /home/ggits/EasyTraffic/sta
   regions:
     - region: L03,7603,41190,부천시
     - region: L04,7604,41210,광명시
@@ -36,6 +35,6 @@ application:
 
 logging:
   file:
-    path: ${user.home}/logs/ggits-tsinfo-server/
+    path: ${user.home}/logs/
 
 

+ 9 - 9
conf/sig-comm-server.yml

@@ -1,29 +1,29 @@
 spring:
   profiles:
-    active: dev
+    active: prod
+
 server:
   port: 9871
 
 application:
-  process-id: 81010
+  process-id: 91010
   comm-binding-port: 7900
   kafka:
     bootstrap-servers: 192.168.11.23:9092
-    group-id: sig-comm-server
     enable-node: false
-    enable-sig: true
+    enable-sig: false
 
 logging:
   file:
     path: ${user.home}/logs/sig-comm-server/
 
 cluster:
-  enabled: true           # default: false
   id: 1
   nodes:
     - id: 1               # must be 1,2,3,...
-      ip: 192.168.20.44
-      port: 13888
+      ip: 192.168.10.81
+      port: 11840
     - id: 2
-      ip: 192.168.20.45
-      port: 13888
+      ip: 192.168.10.82
+      port: 11840
+

+ 8 - 7
conf/sig-todp-server.yml

@@ -1,23 +1,24 @@
 spring:
   profiles:
-    active: dev
+    active: prod
+
 server:
   port: 9872
 
 application:
-  process-id: 81020
+  process-id: 91020
 
 logging:
   file:
     path: ${user.home}/logs/sig-todp-server/
 
 cluster:
-  enabled: true           # default: false
   id: 1
   nodes:
     - id: 1               # must be 1,2,3,...
-      ip: 192.168.20.44
-      port: 13888
+      ip: 192.168.10.81
+      port: 12840
     - id: 2
-      ip: 192.168.20.45
-      port: 13888
+      ip: 192.168.10.82
+      port: 12840
+

+ 26 - 0
conn.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+echo ""
+
+if [ "$1" == "1" ]; then
+    echo "c#1"
+    echo "cvim, cvim123!!, root/*88ubutisig1, utic==>cvim 사용자생성해서 운영함"
+    ssh -p 50022 cvim@192.168.10.81
+
+elif [ "$1" == "2" ]; then
+    echo "교통신호연계서버#2"
+    echo "cvim, cvim123!!"
+    ssh -p 22 cvim@192.168.10.82
+
+elif [ "$1" == "tsinfo" ]; then
+    echo "경기도 긴급차량신호연계서버(ggits-tsinfo-server)"
+    echo "its, its123"
+    ssh -p 49522 its@192.168.24.22
+
+else
+    echo "사용법: $0 [1|2|tsinfo]"
+    exit 1
+fi
+
+
+

+ 29 - 0
deploy-all-xxx.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+set -e  # 오류 발생 시 즉시 종료
+
+APP_NAME=tsi-app-server-0.0.1.jar
+JAR_PATH=./target/$APP_NAME
+
+# 서버 정보 설정
+HOSTS=("10.4.4.40" "10.4.4.41")
+PORTS=("22" "22")
+USERS=("cvim" "cvim")
+REMOTE_PATHS=("/home/cvim/bin/$APP_NAME" "/home/cvim/bin/$APP_NAME")
+
+echo "📦 Starting deployment..."
+
+for i in "${!HOSTS[@]}"; do
+    HOST=${HOSTS[$i]}
+    PORT=${PORTS[$i]}
+    USER=${USERS[$i]}
+    REMOTE_PATH=${REMOTE_PATHS[$i]}
+
+    echo "📦 Deploying to $HOST..."
+    scp -P "$PORT" "$JAR_PATH" "$USER@$HOST:$REMOTE_PATH"
+
+    if [ $? -eq 0 ]; then
+        echo "✅ $HOST 업로드 성공!"
+    else
+        echo "❌ $HOST 업로드 실패. 경로 또는 권한 확인 필요."
+    fi
+done

+ 47 - 0
deploy-comm.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+set -e  # 오류 발생 시 즉시 종료
+
+APP_NAME=sig-comm-server-0.0.1.jar
+JAR_PATH=./sig-comm-server/build/libs/$APP_NAME
+
+# 서버 정보 설정
+HOST1="192.168.10.81"
+PORT1="50022"
+USER1="cvim"
+REMOTE_PATH1="/home/cvim/bin/$APP_NAME"
+
+HOST2="192.168.10.82"
+PORT2="22"
+USER2="cvim"
+REMOTE_PATH2="/home/cvim/bin/$APP_NAME"
+
+echo "📦 Starting deployment..."
+
+if [ "$1" == "1" ]; then
+    echo "교통신호연계서버 #1(sig-comm-server)"
+    echo "cvim, cvim123!!"
+    echo "📦 Deploying to $HOST1..."
+
+    scp -P "$PORT1" "$JAR_PATH" "$USER1@$HOST1:$REMOTE_PATH1"
+    if [ $? -eq 0 ]; then
+        echo "✅ $HOST 업로드 성공!"
+    else
+        echo "❌ $HOST 업로드 실패. 경로 또는 권한 확인 필요."
+    fi
+
+elif [ "$1" == "2" ]; then
+    echo "교통신호연계서버 #2(sig-comm-server)"
+    echo "cvim, cvim123!!"
+    echo "📦 Deploying to $HOST2..."
+	
+    scp -P "$PORT2" "$JAR_PATH" "$USER2@$HOST2:$REMOTE_PATH2"
+    if [ $? -eq 0 ]; then
+        echo "✅ $HOST 업로드 성공!"
+    else
+        echo "❌ $HOST 업로드 실패. 경로 또는 권한 확인 필요."
+    fi
+
+else
+    echo "사용법: $0 [1|2]"
+    exit 1
+fi

+ 47 - 0
deploy-etlp.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+set -e  # 오류 발생 시 즉시 종료
+
+APP_NAME=gits-etlp-server-0.0.1.jar
+JAR_PATH=./gits-etlp-server/build/libs/$APP_NAME
+
+# 서버 정보 설정
+HOST1="192.168.10.81"
+PORT1="50022"
+USER1="cvim"
+REMOTE_PATH1="/home/cvim/bin/$APP_NAME"
+
+HOST2="192.168.10.82"
+PORT2="22"
+USER2="cvim"
+REMOTE_PATH2="/home/cvim/bin/$APP_NAME"
+
+echo "📦 Starting deployment..."
+
+if [ "$1" == "1" ]; then
+    echo "교통신호연계서버 #1(gits-etlp-server)"
+    echo "cvim, cvim123!!"
+    echo "📦 Deploying to $HOST1..."
+
+    scp -P "$PORT1" "$JAR_PATH" "$USER1@$HOST1:$REMOTE_PATH1"
+    if [ $? -eq 0 ]; then
+        echo "✅ $HOST 업로드 성공!"
+    else
+        echo "❌ $HOST 업로드 실패. 경로 또는 권한 확인 필요."
+    fi
+
+elif [ "$1" == "2" ]; then
+    echo "교통신호연계서버 #2(gits-etlp-server)"
+    echo "cvim, cvim123!!"
+    echo "📦 Deploying to $HOST2..."
+	
+    scp -P "$PORT2" "$JAR_PATH" "$USER2@$HOST2:$REMOTE_PATH2"
+    if [ $? -eq 0 ]; then
+        echo "✅ $HOST 업로드 성공!"
+    else
+        echo "❌ $HOST 업로드 실패. 경로 또는 권한 확인 필요."
+    fi
+
+else
+    echo "사용법: $0 [1|2]"
+    exit 1
+fi

+ 47 - 0
deploy-gits.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+set -e  # 오류 발생 시 즉시 종료
+
+APP_NAME=gits-comm-server-0.0.1.jar
+JAR_PATH=./gits-comm-server/build/libs/$APP_NAME
+
+# 서버 정보 설정
+HOST1="192.168.10.81"
+PORT1="50022"
+USER1="cvim"
+REMOTE_PATH1="/home/cvim/bin/$APP_NAME"
+
+HOST2="192.168.10.82"
+PORT2="22"
+USER2="cvim"
+REMOTE_PATH2="/home/cvim/bin/$APP_NAME"
+
+echo "📦 Starting deployment..."
+
+if [ "$1" == "1" ]; then
+    echo "교통신호연계서버 #1(gits-comm-server)"
+    echo "cvim, cvim123!!"
+    echo "📦 Deploying to $HOST1..."
+
+    scp -P "$PORT1" "$JAR_PATH" "$USER1@$HOST1:$REMOTE_PATH1"
+    if [ $? -eq 0 ]; then
+        echo "✅ $HOST 업로드 성공!"
+    else
+        echo "❌ $HOST 업로드 실패. 경로 또는 권한 확인 필요."
+    fi
+
+elif [ "$1" == "2" ]; then
+    echo "교통신호연계서버 #2(gits-comm-server)"
+    echo "cvim, cvim123!!"
+    echo "📦 Deploying to $HOST2..."
+	
+    scp -P "$PORT2" "$JAR_PATH" "$USER2@$HOST2:$REMOTE_PATH2"
+    if [ $? -eq 0 ]; then
+        echo "✅ $HOST 업로드 성공!"
+    else
+        echo "❌ $HOST 업로드 실패. 경로 또는 권한 확인 필요."
+    fi
+
+else
+    echo "사용법: $0 [1|2]"
+    exit 1
+fi

+ 47 - 0
deploy-todp.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+set -e  # 오류 발생 시 즉시 종료
+
+APP_NAME=sig-todp-server-0.0.1.jar
+JAR_PATH=./sig-todp-server/build/libs/$APP_NAME
+
+# 서버 정보 설정
+HOST1="192.168.10.81"
+PORT1="50022"
+USER1="cvim"
+REMOTE_PATH1="/home/cvim/bin/$APP_NAME"
+
+HOST2="192.168.10.82"
+PORT2="22"
+USER2="cvim"
+REMOTE_PATH2="/home/cvim/bin/$APP_NAME"
+
+echo "📦 Starting deployment..."
+
+if [ "$1" == "1" ]; then
+    echo "교통신호연계서버 #1(sig-todp-server)"
+    echo "cvim, cvim123!!"
+    echo "📦 Deploying to $HOST1..."
+
+    scp -P "$PORT1" "$JAR_PATH" "$USER1@$HOST1:$REMOTE_PATH1"
+    if [ $? -eq 0 ]; then
+        echo "✅ $HOST 업로드 성공!"
+    else
+        echo "❌ $HOST 업로드 실패. 경로 또는 권한 확인 필요."
+    fi
+
+elif [ "$1" == "2" ]; then
+    echo "교통신호연계서버 #2(sig-todp-server)"
+    echo "cvim, cvim123!!"
+    echo "📦 Deploying to $HOST2..."
+	
+    scp -P "$PORT2" "$JAR_PATH" "$USER2@$HOST2:$REMOTE_PATH2"
+    if [ $? -eq 0 ]; then
+        echo "✅ $HOST 업로드 성공!"
+    else
+        echo "❌ $HOST 업로드 실패. 경로 또는 권한 확인 필요."
+    fi
+
+else
+    echo "사용법: $0 [1|2]"
+    exit 1
+fi

+ 24 - 0
deploy-tsinfo.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e  # 오류 발생 시 즉시 종료
+
+APP_NAME=ggits-tsinfo-server-0.0.1.jar
+JAR_PATH=./ggits-tsinfo-server/build/libs/$APP_NAME
+
+# 서버 정보 설정
+HOST1="192.168.24.22"
+PORT1="49522"
+USER1="its"
+REMOTE_PATH1="/home/its/bin/$APP_NAME"
+
+echo "📦 Starting deployment..."
+
+echo "경기도 긴급차량신호연계서버(ggits-tsinfo-server)"
+echo "its, its123"
+echo "📦 Deploying to $HOST1..."
+
+scp -P "$PORT1" "$JAR_PATH" "$USER1@$HOST1:$REMOTE_PATH1"
+if [ $? -eq 0 ]; then
+	echo "✅ $HOST 업로드 성공!"
+else
+	echo "❌ $HOST 업로드 실패. 경로 또는 권한 확인 필요."
+fi

+ 48 - 0
deploy-xxx.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+set -e  # 오류 발생 시 즉시 종료
+
+APP_NAME=tsi-app-server-0.0.1.jar
+JAR_PATH=./target/$APP_NAME
+
+# 서버 정보 설정
+HOST1="10.4.4.40"
+PORT1="22"
+USER1="cvim"
+REMOTE_PATH1="/home/cvim/bin/$APP_NAME"
+
+HOST2="10.4.4.41"
+PORT2="22"
+USER2="cvim"
+REMOTE_PATH2="/home/cvim/bin/$APP_NAME"
+
+echo "📦 Starting deployment..."
+
+if [ "$1" == "1" ]; then
+    echo "신호 WAS 서버 #1(tsi-app-server)"
+    echo "cvim, cvim123!!"
+    
+    echo "📦 Deploying to $HOST1..."
+    scp -P "$PORT1" "$JAR_PATH" "$USER1@$HOST1:$REMOTE_PATH1"
+
+    if [ $? -eq 0 ]; then
+        echo "✅ $HOST 업로드 성공!"
+    else
+        echo "❌ $HOST 업로드 실패. 경로 또는 권한 확인 필요."
+    fi
+
+elif [ "$1" == "2" ]; then
+    echo "신호 WAS 서버 #2(tsi-app-server)"
+    echo "cvim, cvim123!!"
+    echo "📦 Deploying to $HOST2..."
+    scp -P "$PORT2" "$JAR_PATH" "$USER2@$HOST2:$REMOTE_PATH2"
+
+    if [ $? -eq 0 ]; then
+        echo "✅ $HOST 업로드 성공!"
+    else
+        echo "❌ $HOST 업로드 실패. 경로 또는 권한 확인 필요."
+    fi
+
+else
+    echo "사용법: $0 [1|2]"
+    exit 1
+fi

+ 1 - 2
ggits-comm-server/src/main/java/com/sig/ggits/comm/server/controller/GgitsCommServerRestController.java

@@ -1,6 +1,5 @@
 package com.sig.ggits.comm.server.controller;
 
-import com.its.common.cluster.vo.ClusterNET;
 import com.its.common.cluster.vo.ClusterNode;
 import com.its.common.utils.TimeUtils;
 import com.sig.ggits.comm.server.cluster.ClusterConfig;
@@ -86,7 +85,7 @@ public class GgitsCommServerRestController {
             }
 
             String commStts = center.isCommOnline() ? "Online" : "Offline";
-            sb.append(String.format("%3d c%6d%7d   %-7.7s  %-19.19s  %s",
+            sb.append(String.format("%3d %6.6s  %6s%6d%7d   %-7.7s  %-19.19s  %s",
                     ii++,
                     center.getClusterId() + "/" + center.getRealClusterId(),
                     center.getRegionCd(),