diff --git a/frontend/src/utils/api.ts b/frontend/src/utils/api.ts index 86d4bb3..9279b28 100644 --- a/frontend/src/utils/api.ts +++ b/frontend/src/utils/api.ts @@ -1,4 +1,4 @@ -import axios, { type AxiosRequestConfig, type AxiosError } from 'axios'; +import axios, { type InternalAxiosRequestConfig, type AxiosError } from 'axios'; /** * API配置 @@ -12,7 +12,7 @@ const api = axios.create({ // 请求拦截器 api.interceptors.request.use( - (config: AxiosRequestConfig) => { + (config: InternalAxiosRequestConfig) => { // 如果 baseURL 不是 localhost,自动添加 API Key const baseURL = (config.baseURL as string) || diff --git a/src/scripts/deploy.ps1 b/src/scripts/deploy.ps1 deleted file mode 100644 index 91a0ecf..0000000 --- a/src/scripts/deploy.ps1 +++ /dev/null @@ -1,73 +0,0 @@ -# Deploy script - Upload files to remote server using scp - -# Configuration -$remoteHost = "127.0.0.1" -$remotePort = "1122" -$remoteUser = "cubie" -$keyPath = "d:\163" -$serverDest = "/home/cubie/down/document/bidding/publish/server" -$frontendDest = "/home/cubie/down/document/bidding/publish/frontend" -$srcDest = "/home/cubie/down/document/bidding/" - -# Check if key file exists -if (-not (Test-Path $keyPath)) { - Write-Error "Private key file not found: $keyPath" - exit 1 -} - -# Check if dist directory exists -if (-not (Test-Path "dist")) { - Write-Error "dist directory not found, please run npm run build first" - exit 1 -} - -# Check if frontend directory exists -if (-not (Test-Path "frontend")) { - Write-Error "frontend directory not found" - exit 1 -} - -# Check if src directory exists -if (-not (Test-Path "src")) { - Write-Error "src directory not found" - exit 1 -} - -Write-Host "Starting deployment..." -ForegroundColor Green -Write-Host "Remote server: ${remoteHost}:${remotePort}" -ForegroundColor Cyan -Write-Host "Private key: $keyPath" -ForegroundColor Cyan - -# Upload dist directory contents to server directory -Write-Host "`nUploading dist directory to ${serverDest}..." -ForegroundColor Yellow -scp -i $keyPath -P $remotePort -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r dist/* "${remoteUser}@${remoteHost}:${serverDest}" - -if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to upload dist directory" - exit 1 -} - -Write-Host "dist directory uploaded successfully" -ForegroundColor Green - -# Upload entire frontend directory to publish directory -Write-Host "`nUploading frontend directory to ${frontendDest}..." -ForegroundColor Yellow -scp -i $keyPath -P $remotePort -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r frontend/dist "${remoteUser}@${remoteHost}:${frontendDest}" - -if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to upload frontend directory" - exit 1 -} - -Write-Host "frontend directory uploaded successfully" -ForegroundColor Green - -# Upload entire src directory to bidding directory -Write-Host "`nUploading src directory to ${srcDest}..." -ForegroundColor Yellow -scp -i $keyPath -P $remotePort -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r src "${remoteUser}@${remoteHost}:${srcDest}" - -if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to upload src directory" - exit 1 -} - -Write-Host "src directory uploaded successfully" -ForegroundColor Green - -Write-Host "`nDeployment completed!" -ForegroundColor Green diff --git a/src/scripts/deploy.ts b/src/scripts/deploy.ts index c7ef399..ff7b901 100644 --- a/src/scripts/deploy.ts +++ b/src/scripts/deploy.ts @@ -12,21 +12,36 @@ import * as dotenv from 'dotenv'; dotenv.config(); // Configuration +// const config = { +// host: '127.0.0.1', +// port: 1122, +// username: 'cubie', +// privateKey: fs.readFileSync('d:\\163'), +// passphrase: process.env.SSH_PASSPHRASE || '', +// }; + + const config = { - host: '127.0.0.1', - port: 1122, - username: 'cubie', + host: '139.180.190.142', + port: 2211, + username: 'root', privateKey: fs.readFileSync('d:\\163'), passphrase: process.env.SSH_PASSPHRASE || '', }; -const destinations = { - server: '/home/cubie/down/document/bidding/publish/server', - frontend: '/home/cubie/down/document/bidding/publish/frontend', - src: '/home/cubie/down/document/bidding/', -}; +// const destinations = { +// server: '/home/cubie/down/document/bidding/publish/server', +// frontend: '/home/cubie/down/document/bidding/publish/frontend', +// src: '/home/cubie/down/document/bidding/', +// }; +const destinations = { + server: '/root/bidding/publish/server', + frontend: '/root/bidding/publish/frontend', + src: '/root/bidding/', +}; + async function uploadDirectory( sftp: SftpClient, localPath: string,