diff --git a/.env.prod b/.env.prod index 94c37a72..51bd702b 100644 --- a/.env.prod +++ b/.env.prod @@ -21,7 +21,7 @@ VUE_APP_BASE_API = '' PUBLIC_PATH = '' # ws地址 -VUE_APP_WS_API = 'ws://100.64.0.45:48080' +VUE_APP_WS_API = 'ws://10.1.17.10:48080' # 二级部署路径 VUE_APP_APP_NAME ='yudao-admin' diff --git a/.gitignore b/.gitignore index a2ab4206..d465621c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,6 @@ selenium-debug.log *.local package-lock.json -echarts.js \ No newline at end of file +echarts.js +sync_line_sczg_prod.bat +sync_line_sczg_aliyun.bat \ No newline at end of file diff --git a/sync_line_sczg_prod.bat b/sync_line_sczg_prod.bat index b49b1029..a6090b25 100644 --- a/sync_line_sczg_prod.bat +++ b/sync_line_sczg_prod.bat @@ -1,68 +1,68 @@ -@echo off -setlocal enabledelayedexpansion -set cmdstr=rsync -set zipfile=cwrsync.zip -set downurl=https://itefix.net/download/free/cwrsync_6.3.0_x64_free.zip -set currpath=%~dp0 -set "rsynchome=%ProgramFiles%\%zipfile:~0,-4%" -set passfile=%temp%\.password -set syncdir=dist/ -:: Ҫͬ -set accountwithost=kszny@100.64.0.45::line -set "password=kszny@123" -set "runcommand=%cmdstr% --port=873 -rlptvz --progress --password-file=%passfile% --exclude=google.exe --exclude=Lodap.zip %syncdir% %accountwithost%" - -where %cmdstr% >nul 2>nul -::д˵ڸ -if %errorlevel% neq 0 ( - ::δذװδѹװĿ¼ - if not exist "%rsynchome%" ( - :: ԱȨ - echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\runAsAdmin.vbs" - echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\runAsAdmin.vbs" - "%temp%\runAsAdmin.vbs" - :: ҪԱȨ޲ܴĿ¼ - mkdir "%rsynchome%" - del "%temp%\runAsAdmin.vbs" - exit /B - ) - - :: ʹpowershellcurl - powershell curl -o %temp%\%zipfile% %downurl% - :: ѹ - tar -xf "%temp%\%zipfile%" -C "%rsynchome%" - echo "%cmdstr%Ѿװ%rsynchome%Ŀ¼" - - :: ·Ƿ PATH - set "found=false" - for %%I in ("%PATH:;=";"%") do ( - if /I "%%~I"=="%rsynchome%\bin" ( - set "found=true" - ) - ) - - :: δõpathУӵpath - if "!found!"=="false" ( - :: עе PATH ͨsetxʽֵȳ1024ַͻᱻض - reg add "HKCU\Environment" /v PATH /t REG_EXPAND_SZ /d "%PATH%;%rsynchome%\bin" /f - ) - -) - -::ǰĿ¼ûdistĿ¼ -if not exist "%currpath%%syncdir%" ( - echo ǰĿ¼ûҪͬ%syncdir%Ŀ¼Ҫͬ%syncdir%Ŀ¼ǰĿ¼£ -) else ( - echo !password!>%passfile% - echo ͬʼԺ... - !runcommand! && ( - echo ͬ! - ) || ( - echo !runcommand! - echo ͬʧܣȷǷVPN - ) - del %passfile% -) - -endlocal -pause +@echo off +setlocal enabledelayedexpansion +set cmdstr=rsync +set zipfile=cwrsync.zip +set downurl=https://itefix.net/download/free/cwrsync_6.3.0_x64_free.zip +set currpath=%~dp0 +set "rsynchome=%ProgramFiles%\%zipfile:~0,-4%" +set passfile=%temp%\.password +set syncdir=dist/ +:: Ҫͬ +set accountwithost=kszny@100.64.0.45::line +set "password=kszny@123" +set "runcommand=%cmdstr% --port=873 -rlptvz --progress --password-file=%passfile% --exclude=google.exe --exclude=Lodap.zip %syncdir% %accountwithost%" + +where %cmdstr% >nul 2>nul +::д˵ڸ +if %errorlevel% neq 0 ( + ::δذװδѹװĿ¼ + if not exist "%rsynchome%" ( + :: ԱȨ + echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\runAsAdmin.vbs" + echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\runAsAdmin.vbs" + "%temp%\runAsAdmin.vbs" + :: ҪԱȨ޲ܴĿ¼ + mkdir "%rsynchome%" + del "%temp%\runAsAdmin.vbs" + exit /B + ) + + :: ʹpowershellcurl + powershell curl -o %temp%\%zipfile% %downurl% + :: ѹ + tar -xf "%temp%\%zipfile%" -C "%rsynchome%" + echo "%cmdstr%Ѿװ%rsynchome%Ŀ¼" + + :: ·Ƿ PATH + set "found=false" + for %%I in ("%PATH:;=";"%") do ( + if /I "%%~I"=="%rsynchome%\bin" ( + set "found=true" + ) + ) + + :: δõpathУӵpath + if "!found!"=="false" ( + :: עе PATH ͨsetxʽֵȳ1024ַͻᱻض + reg add "HKCU\Environment" /v PATH /t REG_EXPAND_SZ /d "%PATH%;%rsynchome%\bin" /f + ) + +) + +::ǰĿ¼ûdistĿ¼ +if not exist "%currpath%%syncdir%" ( + echo ǰĿ¼ûҪͬ%syncdir%Ŀ¼Ҫͬ%syncdir%Ŀ¼ǰĿ¼£ +) else ( + echo !password!>%passfile% + echo ͬʼԺ... + !runcommand! && ( + echo ͬ! + ) || ( + echo !runcommand! + echo ͬʧܣȷǷVPN + ) + del %passfile% +) + +endlocal +pause