admin/AdvisorServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新脚本及配置文件

Browse Source
This commit is contained in:
easonzhu 2025-02-25 14:56:01 +08:00
parent 620825100e
commit fdb8371ed1
15 changed files with 181 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
deploy_frontend.sh
View File

@ -1,41 +0,0 @@
#!/bin/bash
# 当前服务器上的文件路径
HTML_ZIP_FILE="/tmp/h5.zip /tmp/syAdmin.zip"
# 目标服务器信息（格式：IP地址:端口）
SERVERS=(
"172.26.1.9:22"
"172.26.1.15:22"
)
# 目标路径
TARGET_DIR="/home/ubuntu"
# 1. 循环拷贝文件到所有服务器
for SERVER in "${SERVERS[@]}"; do
# 获取 IP 和端口
IP=$(echo $SERVER | cut -d ':' -f 1)
PORT=$(echo $SERVER | cut -d ':' -f 2)
# 拷贝 JAR 文件到目标服务器
echo "Copying HTML_ZIP_FILE to $IP:$TARGET_DIR"
scp -P $PORT $HTML_ZIP_FILE ubuntu@$IP:$TARGET_DIR
done
echo "Files copied to all servers."
# 2. 所有文件拷贝完成后，执行服务器上的release_html.sh
for SERVER in "${SERVERS[@]}"; do
# 获取 IP 和端口
IP=$(echo $SERVER | cut -d ':' -f 1)
PORT=$(echo $SERVER | cut -d ':' -f 2)
# 执行 release_html.sh 脚本
echo "Executing release_html.sh on $IP"
ssh -p $PORT ubuntu@$IP "sudo bash /home/ubuntu/release_html.sh"
done
echo "All html released."
echo "All tasks completed."

0
shell/prod/deploy_advisor.sh → shell/prod/advisor/deploy/deploy_advisor.sh
View File

41
shell/prod/advisor/win/deploy_prod.bat Normal file
View File

@ -0,0 +1,41 @@
@echo off
:: 1. 设置动态参数
set REMOTE_IP=119.29.151.152
set REMOTE_PORT=22101
set REMOTE_PATH=/tmp
set REMOTE_USER=ubuntu
set DEPLOY_SCRIPT=/home/ubuntu/deploy_advisor.sh
:: 2. 运行 Maven 打包
echo Running mvn clean package...
:: call mvn clean package -P thin-jar
call mvn clean package
:: 检查是否打包成功
IF %ERRORLEVEL% NEQ 0 (
echo Maven build failed, exiting...
exit /b %ERRORLEVEL%
)
:: 3. 将 JAR 包传输到 Linux 服务器
echo Copying JAR file to Linux server...
call scp -P %REMOTE_PORT% target\AdvisorServer-2.6.7.jar %REMOTE_USER%@%REMOTE_IP%:%REMOTE_PATH%
:: 检查 SCP 命令是否成功
IF %ERRORLEVEL% NEQ 0 (
echo File transfer failed, exiting...
exit /b %ERRORLEVEL%
)
:: 4. 通过 SSH 运行 deploy.sh 脚本
echo Running deploy_advisor.sh script on Linux server...
call ssh -p %REMOTE_PORT% %REMOTE_USER%@%REMOTE_IP% "bash %DEPLOY_SCRIPT%"
:: 检查 SSH 命令是否成功
IF %ERRORLEVEL% NEQ 0 (
echo Failed to start the application, exiting...
exit /b %ERRORLEVEL%
)
echo Deployment successful!

77
shell/prod/h5/deploy/deploy_h5.sh Normal file
View File

@ -0,0 +1,77 @@
#!/bin/bash
FILE_NAME="h5.zip"
# 当前服务器上的文件路径
LOCAL_FILE="/tmp/$FILE_NAME"
# 目标服务器信息（格式：IP地址:端口）
SERVERS=(
"172.26.1.9:22"
"172.26.1.15:22"
)
# 目标路径
TARGET_DIR="/home/ubuntu"
# 目标文件路径
TARGET_FILE="$TARGET_DIR/$FILE_NAME"
# 1. 删除所有服务器上原始包,并拷贝新文件
for SERVER in "${SERVERS[@]}"; do
# 获取 IP 和端口
IP=$(echo $SERVER | cut -d ':' -f 1)
PORT=$(echo $SERVER | cut -d ':' -f 2)
# 删除原始包
echo "Executing release_html.sh on $IP"
ssh -p $PORT ubuntu@$IP "rm -rf $TARGET_DIR/$FILE_NAME"
# 拷贝新文件
echo "Copying $LOCAL_FILE to $IP:$TARGET_DIR"
scp -P $PORT $LOCAL_FILE ubuntu@$IP:$TARGET_DIR
# 执行解压脚本
echo "Executing release_html.sh on $IP"
ssh -p $PORT ubuntu@$IP "sudo bash /home/ubuntu/release_html.sh"
done
# 2. 循环拷贝文件到所有服务器
for SERVER in "${SERVERS[@]}"; do
# 获取 IP 和端口
IP=$(echo $SERVER | cut -d ':' -f 1)
PORT=$(echo $SERVER | cut -d ':' -f 2)
# 拷贝文件（如果文件存在）
if [ -f "$H5_ZIP_FILE" ]; then
echo "Copying H5_ZIP_FILE to $IP:$TARGET_DIR"
scp -P $PORT $H5_ZIP_FILE ubuntu@$IP:$TARGET_DIR
else
echo "File $H5_ZIP_FILE does not exist, skipping."
fi
if [ -f "$ADMIN_ZIP_FILE" ]; then
echo "Copying ADMIN_ZIP_FILE to $IP:$TARGET_DIR"
scp -P $PORT $ADMIN_ZIP_FILE ubuntu@$IP:$TARGET_DIR
else
echo "File $ADMIN_ZIP_FILE does not exist, skipping."
fi
done
echo "Files copied to all servers."
# 2. 所有文件拷贝完成后，执行服务器上的 release_html.sh
for SERVER in "${SERVERS[@]}"; do
# 获取 IP 和端口
IP=$(echo $SERVER | cut -d ':' -f 1)
PORT=$(echo $SERVER | cut -d ':' -f 2)
# 执行 release_html.sh 脚本
echo "Executing release_html.sh on $IP"
ssh -p $PORT ubuntu@$IP "sudo bash /home/ubuntu/release_html.sh"
done
echo "All html released."
echo "All tasks completed."

0
deploy_html.bat → shell/prod/h5/win/deploy_html.bat
View File

0
shell/test/kill.sh → shell/test/advisor/server/kill.sh
View File

0
shell/test/start.sh → shell/test/advisor/server/start.sh
View File

41
shell/test/advisor/win/deploy.bat Normal file
View File

@ -0,0 +1,41 @@
@echo off
:: 1. 设置动态参数
set REMOTE_IP=8.138.144.54
set REMOTE_PORT=22
set REMOTE_PATH=/root
set REMOTE_USER=root
set START_SCRIPT=/root/start.sh
:: 2. 运行 Maven 打包
echo Running mvn clean package...
:: call mvn clean package -P thin-jar
call mvn clean package
:: 检查是否打包成功
IF %ERRORLEVEL% NEQ 0 (
echo Maven build failed, exiting...
exit /b %ERRORLEVEL%
)
:: 3. 将 JAR 包传输到 Linux 服务器
echo Copying JAR file to Linux server...
call scp -P %REMOTE_PORT% target\AdvisorServer-2.6.7.jar %REMOTE_USER%@%REMOTE_IP%:%REMOTE_PATH%
:: 检查 SCP 命令是否成功
IF %ERRORLEVEL% NEQ 0 (
echo File transfer failed, exiting...
exit /b %ERRORLEVEL%
)
:: 4. 通过 SSH 运行 start.sh 脚本
echo Running start.sh script on Linux server...
call ssh -p %REMOTE_PORT% %REMOTE_USER%@%REMOTE_IP% "bash %START_SCRIPT%"
:: 检查 SSH 命令是否成功
IF %ERRORLEVEL% NEQ 0 (
echo Failed to start the application, exiting...
exit /b %ERRORLEVEL%
)
echo Deployment successful!

0
shell/test/advisor-server.service → shell/test/env/advisor-server.service vendored
View File

0
shell/test/clear_log.sh → shell/test/env/clear_log.sh vendored
View File

17
shell/test/frontend/deploy.sh Normal file
View File

@ -0,0 +1,17 @@
#!/bin/bash
# 本地文件路径
H5_ZIP="./build/h5.zip"
SY_ADMIN_ZIP="./build/syAdmin.zip"
# 目标服务器信息
SERVER_USER="root" # 修改为目标服务器的用户名
SERVER_IP="47.96.178.171" # 修改为目标服务器的IP地址
SERVER_PATH="/tmp" # 服务器上的目标路径
DEPLOY_SCRIPT="/root/deployHtml.sh" # 部署脚本路径
# 将文件上传到服务器的 /tmp 目录
scp $H5_ZIP $SY_ADMIN_ZIP $SERVER_USER@$SERVER_IP:$SERVER_PATH
# 执行服务器上的部署脚本
ssh $SERVER_USER@$SERVER_IP "bash $DEPLOY_SCRIPT"

1
src/main/java/com/syzb/video/service/admin/AdminVideoInteractionService.java
View File

@ -331,7 +331,6 @@ public class AdminVideoInteractionService {
.eq(VideoLiveMessage::getVideoId, videoId)
.eq(VideoLiveMessage::getType, VideoMessageContentType.VIDEO_CART_ON_SHEFF.value)
.like(VideoLiveMessage::getContent, "上架了")
.groupBy(VideoLiveMessage::getCreateTime)
.orderByAsc(VideoLiveMessage::getCreateTime));
}

4
src/main/resources/dev/tencentConfig.yaml
View File

@ -11,9 +11,9 @@ tencent: #腾讯云配置 测试环境
pushKey: 163b37d858df8a6136f613ebcb067b37 #鉴权Key
liveHost: livetest.sztg.com #播流域名
liveUrl: webrtc://livetest.sztg.com #播流地址
liveKey: "video_dev" #鉴权Key
liveKey: 2wKfFwRB2FNzPJrhMKms #鉴权Key
liveFormat: m3u8 #直播格式
key: 2wKfFwRB2FNzPJrhMKms #防盗链Key
key: ill7YChtUgS2FhcNdNQR #防盗链Key
expireHours: 12 #有效时间，单位小时
callbackKey: video_dev #直播推流、断流、录制回调key，验证回调来源
taskStream: "普通转码" #自动转码任务流（转自适应码流）

1
src/main/resources/prod/advisorServer.yaml
View File

@ -10,7 +10,6 @@ file:
domain:
prefix: https://do.tgsys.sztg.com/
resizePrefix: https://do.tgsys.sztg.com/resize/
scheduledEnable: true
cron:
collectLivingVideo: "20 0/5 * * * ?" #每分钟统计已开始但未结束的视频直播数据
saveVideoCount: "20 1/5 * * * ?" #从cache刷新视频播放量到DB 每分钟的第10s执行

6
src/main/resources/prod/tencentConfig.yaml
View File

@ -11,13 +11,13 @@ tencent: #腾讯云配置
pushKey: 163b37d858df8a6136f613ebcb067b37 #鉴权Key
liveHost: live.tgsys.sztg.com #播流域名
liveUrl: webrtc://live.tgsys.sztg.com #播流地址
liveKey: "video_pro" #鉴权Key
liveKey: nJTCJ3mdAMtkKwBxj53a #鉴权Key
liveFormat: m3u8 #直播格式
key: nJTCJ3mdAMtkKwBxj53a #防盗链Key
key: oGmRTLjHZ0MvV3tbbQ5c #防盗链Key
expireHours: 48 #有效时间，单位小时
callbackKey: video_pro #直播推流、断流、录制回调key，验证回调来源
taskStream: "自适应码流" #自动转码任务流（转自适应码流）
audioVideoType: Transcode #原始流
audioVideoType: RawAdaptive #原始流
rawAdaptiveDefinition: 10 #允许输出的未加密的 转自适应码流模板 ID
playKey: bsMetagPJRID1W7lXQz4 #播放密钥
templateId: 1563626