From 69f45097f63c679374f9a95f810e12b444527eb4 Mon Sep 17 00:00:00 2001 From: Ezan Date: Wed, 5 Mar 2025 13:55:48 +0800 Subject: [PATCH] api updated --- .gitignore | 4 ++ deploy-gy-ssh.sh | 69 ++++++++++++++++++++++++++++++++++ deploy-gy.sh | 69 ++++++++++++++++++++++++++++++++++ deploy.sh | 2 +- src/api/inspection.js | 5 ++- src/utils/request.js | 4 +- src/views/Inspection/index.vue | 4 +- 7 files changed, 150 insertions(+), 7 deletions(-) create mode 100644 deploy-gy-ssh.sh create mode 100644 deploy-gy.sh diff --git a/.gitignore b/.gitignore index 403adbc..6a4aa84 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,7 @@ pnpm-debug.log* *.njsproj *.sln *.sw? + +# 部署配置 +deploy.config.sh +*.tar \ No newline at end of file diff --git a/deploy-gy-ssh.sh b/deploy-gy-ssh.sh new file mode 100644 index 0000000..cb75a2e --- /dev/null +++ b/deploy-gy-ssh.sh @@ -0,0 +1,69 @@ +#!/bin/bash + +# 加载配置 +if [ -f "./deploy.config.sh" ]; then + source ./deploy.config.sh +else + echo "配置文件 deploy.config.sh 不存在" + exit 1 +fi + +echo "开始远程部署 - $(date)" + +echo "开始部署您的项目..." + +# 1. 克隆项目代码 +# echo "1. 克隆项目代码..." +# git clone https://git.zhouxhere.com/wonderzhao/cola-web.git + +# 2. 进入项目目录 +# echo "2. 进入项目目录..." +# cd cola-web + +# 3. 安装依赖 +# echo "3. 安装依赖..." +# npm install + +# 4. 构建项目 +# echo "4. 构建项目..." +# npm run build + +# # 5. 构建 Docker 镜像 +# echo "5. 构建 Docker 镜像..." +# docker build -t ${DOCKER_IMAGE_NAME} . + +# # 6. 保存镜像为 tar 文件 +# echo "6. 保存 Docker 镜像..." +# docker save ${DOCKER_IMAGE_NAME} > ${DOCKER_IMAGE_NAME}.tar + +# 7. 传输文件到服务器 +# echo "7. 传输文件到服务器..." +# ssh -p 22 owner@192.168.1.199 +# scp -v -P ${REMOTE_PORT} ${DOCKER_IMAGE_NAME}.tar ${REMOTE_USER}@${REMOTE_HOST}:${REMOTE_PATH}/ + +# 8. 在远程服务器上执行部署 +echo "8. 在远程服务器上执行部署..." +ssh -p ${REMOTE_PORT} ${REMOTE_USER}@${REMOTE_HOST} << EOF + set -e # 遇到错误立即退出 + + echo "===== 开始执行远程部署 =====" + cd ${REMOTE_PATH} + docker load < ${DOCKER_IMAGE_NAME}.tar + docker stop ${DOCKER_CONTAINER_NAME} 2>/dev/null || true + docker rm ${DOCKER_CONTAINER_NAME} 2>/dev/null || true + docker run -d \ + --name ${DOCKER_CONTAINER_NAME} \ + -p ${APP_PORT}:80 \ + --restart unless-stopped \ + ${DOCKER_IMAGE_NAME} +EOF + +echo "部署完成！" +# echo "部署完成！" + +# 10. 检查部署状态 +# echo "10. 检查部署状态..." +# ssh owner@192.168.1.199 "docker ps | grep cola-web" + +# 在另一个终端窗口查看日志 +# tail -f deploy.log \ No newline at end of file diff --git a/deploy-gy.sh b/deploy-gy.sh new file mode 100644 index 0000000..65dbb50 --- /dev/null +++ b/deploy-gy.sh @@ -0,0 +1,69 @@ +#!/bin/bash + +# 加载配置 +if [ -f "./deploy.config.sh" ]; then + source ./deploy.config.sh +else + echo "配置文件 deploy.config.sh 不存在" + exit 1 +fi + +echo "开始远程部署 - $(date)" + +echo "开始部署您的项目..." + +# 1. 克隆项目代码 +# echo "1. 克隆项目代码..." +# git clone https://git.zhouxhere.com/wonderzhao/cola-web.git + +# 2. 进入项目目录 +# echo "2. 进入项目目录..." +# cd cola-web + +# 3. 安装依赖 +# echo "3. 安装依赖..." +# npm install + +# 4. 构建项目 +echo "4. 构建项目..." +npm run build + +# 5. 构建 Docker 镜像 +echo "5. 构建 Docker 镜像..." +docker build -t ${DOCKER_IMAGE_NAME} . + +# 6. 保存镜像为 tar 文件 +echo "6. 保存 Docker 镜像..." +docker save ${DOCKER_IMAGE_NAME} > ${DOCKER_IMAGE_NAME}.tar + +# 7. 传输文件到服务器 +echo "7. 传输文件到服务器..." +# ssh -p 22 owner@192.168.1.199 +scp -v -P ${REMOTE_PORT} ${DOCKER_IMAGE_NAME}.tar ${REMOTE_USER}@${REMOTE_HOST}:${REMOTE_PATH}/ + +# 8. 在远程服务器上执行部署 +echo "8. 在远程服务器上执行部署..." +ssh -p ${REMOTE_PORT} ${REMOTE_USER}@${REMOTE_HOST} << EOF + set -e # 遇到错误立即退出 + + echo "===== 开始执行远程部署 =====" + cd ${REMOTE_PATH} + docker load < ${DOCKER_IMAGE_NAME}.tar + docker stop ${DOCKER_CONTAINER_NAME} 2>/dev/null || true + docker rm ${DOCKER_CONTAINER_NAME} 2>/dev/null || true + docker run -d \ + --name ${DOCKER_CONTAINER_NAME} \ + -p ${APP_PORT}:80 \ + --restart unless-stopped \ + ${DOCKER_IMAGE_NAME} +EOF + +echo "部署完成！" +# echo "部署完成！" + +# 10. 检查部署状态 +# echo "10. 检查部署状态..." +# ssh owner@192.168.1.199 "docker ps | grep cola-web" + +# 在另一个终端窗口查看日志 +# tail -f deploy.log \ No newline at end of file diff --git a/deploy.sh b/deploy.sh index 73d11ef..2e4b850 100644 --- a/deploy.sh +++ b/deploy.sh @@ -29,7 +29,7 @@ docker save cola-web:latest > cola-web.tar # 7. 传输文件到服务器 echo "7. 传输文件到服务器..." -ssh -p 22 owner@192.168.1.199 "mkdir -p web" +ssh -p 22 owner@192.168.1.199 scp -P 22 cola-web.tar owner@192.168.1.199:web/ # 8. 在远程服务器上执行部署 diff --git a/src/api/inspection.js b/src/api/inspection.js index ec3bc76..6a8f7ec 100644 --- a/src/api/inspection.js +++ b/src/api/inspection.js @@ -35,7 +35,8 @@ export function getDeviceList() { // 导出excel export function exportExcel(deviceId, inputTime, shift) { return request({ - url: `/Check/Export/Juice?deviceId=${deviceId}&inputTime=${inputTime}&shift=${shift}`, - method: 'get' + url: `/Check/Export/Juice?deviceTypeId=${deviceId}&inputTime=${inputTime}&shift=${shift}`, + method: 'get', + responseType: 'arraybuffer' // 关键：设置响应类型为 arraybuffer }); } \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index dbb0743..7e83ce2 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,8 +1,8 @@ import axios from 'axios'; const service = axios.create({ - // baseURL: 'http://192.168.1.199:8080/api', // 办公室测试接口 - baseURL: 'http://39.105.9.124:8090/api', // 家用测试接口 + baseURL: 'http://192.168.1.199:8080/api', // 办公室测试接口 + //baseURL: 'http://39.105.9.124:8090/api', // 家用测试接口 timeout: 5000, // 请求超时时间 headers: { "Access-Control-Allow-Origin": "*", diff --git a/src/views/Inspection/index.vue b/src/views/Inspection/index.vue index 89d519e..c4626d7 100644 --- a/src/views/Inspection/index.vue +++ b/src/views/Inspection/index.vue @@ -325,9 +325,9 @@ const handleExport = () => { showInfoMessage('导出全部'); exportExcel(selectedDeviceId.value, selectedDate.value || currentDate, shift.value) .then((response) => { - if (response.data) { + if (response) { // 有数据的处理 - const url = window.URL.createObjectURL(new Blob([response.data])); + const url = window.URL.createObjectURL(new Blob([response])); const link = document.createElement('a'); link.href = url; link.setAttribute('download', 'inspection_data.xlsx');