Merge branch 'feature/temp' of serset/Vit.Linq into develop

Publish/DevOps2/build-cmd/30.nuget-pack.bat

@@ -1,23 +1,23 @@
 @echo off
 
-::(x.1)获取basePath
+::1 get basePath
 set curPath=%cd%
 cd /d "%~dp0"
 cd /d ../../..
 set basePath=%cd%
 set nugetPath=%basePath%/Publish/release/release/nuget
 
-::(x.2)查找所有需要发布nuget的项目并发布
+::2 find nuget projects and pack
 for /f "delims=" %%f in ('findstr /M /s /i "<pack>nuget</pack>" *.csproj') do (
 	echo pack %basePath%\%%f\..
 	cd /d "%basePath%\%%f\.."
 	dotnet build --configuration Release
 	dotnet pack --configuration Release --output "%nugetPath%"
-	@if errorlevel 1 (echo . & echo .  & echo 出错，请排查！& pause) 
+	@if errorlevel 1 (echo . & echo .  & echo error & pause) 
 )
 
 
-echo %~n0.bat 执行成功！
+echo %~n0.bat success
 
 
 cd /d "%curPath%"

Publish/DevOps2/build-cmd/40.Station-publish(net5.0).bat

@@ -1,18 +1,18 @@
 @echo off
 
 
-::(x.1)初始化
+:: #1 init
 set netVersion=net5.0
 
 
-::(x.2)修改要发布项目的netcore版本号
+:: #2 change netcore version
 VsTool.exe replace -r --path "../../.." --file "App.Gateway.csproj|App.Gover.Gateway.csproj|App.ServiceCenter.csproj|Did.SersLoader.Demo.csproj|App.Robot.Station.csproj" --old "<TargetFramework>net6.0</TargetFramework>" --new "<TargetFramework>%netVersion%</TargetFramework>"
 
 
 
 
 
-::(x.3)发布项目
+:: #3 publish
 call "40.Station-publish.bat"
 
 
@@ -20,12 +20,12 @@ call "40.Station-publish.bat"
 
 
 
-::(x.4)还原项目的版本号
+:: #4 revert netcore version
 VsTool.exe replace -r --path "../../.." --file "App.Gateway.csproj|App.Gover.Gateway.csproj|App.ServiceCenter.csproj|Did.SersLoader.Demo.csproj|App.Robot.Station.csproj" --old "<TargetFramework>%netVersion%</TargetFramework>" --new "<TargetFramework>net6.0</TargetFramework>"
 
 
 
 
 
-echo %~n0.bat 执行成功！
+echo %~n0.bat success
 cd /d "%curPath%"

Publish/DevOps2/build-cmd/40.Station-publish(netcoreapp2.1).bat

@@ -1,18 +1,18 @@
 @echo off
 
 
-::(x.1)初始化
+:: #1 init
 set netVersion=netcoreapp2.1
 
 
-::(x.2)修改要发布项目的netcore版本号
+:: #2 change netcore version
 VsTool.exe replace -r --path "../../.." --file "App.Gateway.csproj|App.Gover.Gateway.csproj|App.ServiceCenter.csproj|Did.SersLoader.Demo.csproj|App.Robot.Station.csproj" --old "<TargetFramework>net6.0</TargetFramework>" --new "<TargetFramework>%netVersion%</TargetFramework>"
 
 
 
 
 
-::(x.3)发布项目
+:: #3 publish
 call "40.Station-publish.bat"
 
 
@@ -20,12 +20,12 @@ call "40.Station-publish.bat"
 
 
 
-::(x.4)还原项目的版本号
+:: #4 revert netcore version
 VsTool.exe replace -r --path "../../.." --file "App.Gateway.csproj|App.Gover.Gateway.csproj|App.ServiceCenter.csproj|Did.SersLoader.Demo.csproj|App.Robot.Station.csproj" --old "<TargetFramework>%netVersion%</TargetFramework>" --new "<TargetFramework>net6.0</TargetFramework>"
 
 
 
 
 
-echo %~n0.bat 执行成功！
+echo %~n0.bat success
 cd /d "%curPath%"

Publish/DevOps2/build-cmd/40.Station-publish.bat

@@ -1,17 +1,17 @@
 @echo off
 
-::启用变量延迟
+::enable delayed arguments
 setlocal EnableDelayedExpansion
 
 
-::(x.1)获取basePath
+:: #1 get basePath
 set curPath=%cd%
 cd /d "%~dp0"
 cd /d ../../..
 set basePath=%cd%
 
 
-::(x.2)获取netVersion
+:: #2 get netVersion
 set netVersion=net6.0
 for /f "tokens=3 delims=><" %%a in ('type %basePath%\dotnet\ServiceCenter\App.ServiceCenter\App.ServiceCenter.csproj^|findstr "<TargetFramework>.*TargetFramework"') do set netVersion=%%a
 
@@ -22,7 +22,7 @@ echo dotnet version: %netVersion%
 
 
 
-::(x.3)查找所有需要发布的项目并发布
+:: #3 find projects and publish
 for /f "delims=" %%f in ('findstr /M /s /i "<publish>" *.csproj') do (
 	::get name
 	for /f "tokens=3 delims=><" %%a in ('type "%basePath%\%%f"^|findstr "<publish>.*publish"') do set name=%%a
@@ -32,7 +32,7 @@ for /f "delims=" %%f in ('findstr /M /s /i "<publish>" *.csproj') do (
 	cd /d "%basePath%\%%f\.."
 	dotnet build --configuration Release
 	dotnet publish --configuration Release --output "%publishPath%\!name!"
-	@if errorlevel 1 (echo . & echo .  & echo 出错，请排查！& pause) 
+	@if errorlevel 1 (echo . & echo .  & echo error & pause) 
 
 	::copy xml
 	xcopy  "bin\Release\%netVersion%\*.xml" "%publishPath%\!name!" /i /r /y
@@ -40,12 +40,12 @@ for /f "delims=" %%f in ('findstr /M /s /i "<publish>" *.csproj') do (
 
 
 
-::(x.4)copy dir
+:: #4 copy dir
 xcopy "%basePath%\Publish\ReleaseFile\Station" "%publishPath%" /e /i /r /y
 
 
 
-::(x.5)copy ServiceCenter
+:: #5 copy ServiceCenter
 xcopy "%publishPath%\ServiceCenter" "%basePath%\Publish\release\release\ServiceCenter(%netVersion%)\ServiceCenter" /e /i /r /y
 xcopy "%publishPath%\01.ServiceCenter.bat" "%basePath%\Publish\release\release\ServiceCenter(%netVersion%)"
 xcopy "%publishPath%\01.Start-4580.bat" "%basePath%\Publish\release\release\ServiceCenter(%netVersion%)"
@@ -53,6 +53,5 @@ xcopy "%publishPath%\01.Start-4580.bat" "%basePath%\Publish\release\release\Serv
 
 
 
-echo %~n0.bat 执行成功！
-
+echo %~n0.bat success
 cd /d "%curPath%"

Publish/DevOps2/build-cmd/41.StressTest-publish.bat

@@ -1,11 +1,11 @@
 @echo off
 
-::启用变量延迟
+::enable delayed arguments
 setlocal EnableDelayedExpansion
 
 
 
-::(x.1)获取basePath
+:: #1 get 获取basePath
 set curPath=%cd%
 cd /d "%~dp0"
 cd /d ../../..
@@ -13,7 +13,7 @@ set basePath=%cd%
 
 
 
-::(x.2)
+:: #2
 set publishPath=%basePath%/Publish/release/release/StressTest
 
 
@@ -21,19 +21,19 @@ set publishPath=%basePath%/Publish/release/release/StressTest
 
 
 echo ------------------------------------------------------------------
-echo "(x.3)发布CL压测"
+echo "#3 publish CL stressTest"
 
 ::Client
 cd /d "%basePath%\dotnet\Library\Sers\Sers.CL\Test\CommunicationManage\CmClient"
 dotnet build --configuration Release
 dotnet publish --configuration Release --output "%publishPath%\CL压测net6.0\CmClient"
-@if errorlevel 1 (echo . & echo .  & echo 出错，请排查！& pause) 
+@if errorlevel 1 (echo . & echo .  & echo error & pause) 
 
 ::Server
 cd /d "%basePath%\dotnet\Library\Sers\Sers.CL\Test\CommunicationManage\CmServer"
 dotnet build --configuration Release
 dotnet publish --configuration Release --output "%publishPath%\CL压测net6.0\CmServer"
-@if errorlevel 1 (echo . & echo .  & echo 出错，请排查！& pause) 
+@if errorlevel 1 (echo . & echo .  & echo error & pause) 
 
 
 ::copy bat
@@ -43,7 +43,7 @@ xcopy  "%basePath%\Publish\ReleaseFile\StressTest\CL压
 
 
 echo ------------------------------------------------------------------
-::(x.4)发布Sers压测
+:: #4 publish Sers stressTest
 for %%i in (net6.0) do (  
 	set netVersion=%%i
 	set appPath=%basePath%/Publish/release/release/Station^(!netVersion!^)
@@ -90,8 +90,7 @@ for %%i in (net6.0) do (
  
 
 
-echo %~n0.bat 执行成功！
-
+echo %~n0.bat success
 cd /d "%curPath%"
 
 

Publish/DevOps2/build-cmd/50.docker-image-create.bat

@@ -4,23 +4,23 @@
 echo %~n0.bat start...
 
 
-::(x.1)获取basePath
+:: #1 get basePath
 set curPath=%cd%
 cd /d "%~dp0"
 cd /d ../../..
 set basePath=%cd%
 
-::(x.2)
+:: #2
 set publishPath=%basePath%/Publish/release/release/Station(net6.0)
 set dockerPath=%basePath%/Publish/release/release/docker-image
 rd /s /q "%dockerPath%"
 
 
-::(x.3)copy dir
+:: #3 copy dir
 xcopy "%basePath%/Publish/ReleaseFile/docker-image" "%dockerPath%" /e /i /r /y
 
 
-::(x.4)copy station 
+:: #4 copy station 
 xcopy  "%publishPath%/ServiceCenter" "%dockerPath%/sers/app" /e /i /r /y
 xcopy  "%publishPath%/Gateway" "%dockerPath%/sers-gateway/app" /e /i /r /y
 xcopy  "%publishPath%/Gover" "%dockerPath%/sers-gover/app" /e /i /r /y
@@ -32,6 +32,5 @@ xcopy  "%basePath%/Publish/release/release/压测/单体压测net6.0/ServiceCent
 
 
 
-echo %~n0.bat 执行成功！
-
+echo %~n0.bat success
 cd /d "%curPath%"

Publish/DevOps2/build-cmd/51.docker-deploy-copy.bat

@@ -4,24 +4,24 @@
 echo %~n0.bat start...
 
 
-::(x.1)获取basePath
+::#1 get basePath
 set curPath=%cd%
 cd /d "%~dp0"
 cd /d ..\..\..
 set basePath=%cd%
 
 
-::(x.2)
+:: #2
 set publishPath=%basePath%\Publish\release\release\Station(net6.0)
 set dockerPath=%basePath%\Publish\release\release\docker-deploy
 rd /s /q "%dockerPath%"
 
 
-::(x.3)copy dir
+:: #3 copy dir
 xcopy "%basePath%\Publish\ReleaseFile\docker-deploy" "%dockerPath%" /e /i /r /y
 
 
-::(x.4)copy station 
+:: #4 copy station 
 xcopy "%publishPath%\ServiceCenter\appsettings.json" "%dockerPath%\sers"
 xcopy "%publishPath%\Gateway\appsettings.json" "%dockerPath%\sers-gateway"
 xcopy "%publishPath%\Gover\appsettings.json" "%dockerPath%\sers-gover"
@@ -32,6 +32,5 @@ xcopy "%basePath%\Publish\release\release\压测\单体压测net6.0\ServiceCente
 
 
 
-echo %~n0.bat 执行成功！
-
+echo %~n0.bat success
 cd /d "%curPath%"

Publish/DevOps2/build-cmd/清理-所有.bat → Publish/DevOps2/build-cmd/Clean-All.bat

@@ -4,6 +4,6 @@ VsTool.exe delete --path "..\..\.." --file "*.suo|*.user" --directory "obj|bin|.
 rd /s/q ..\..\release
 
 
-echo %~n0.bat Ö´ĐгɚŚŁĄ
+echo %~n0.bat success
 
 pause

Publish/DevOps2/build-cmd/一键发布.bat → Publish/DevOps2/build-cmd/OneKey Release.bat

@@ -16,6 +16,6 @@ call "51.docker-deploy-copy.bat"
 echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
 
 
-echo %~n0.bat Ö´Ðгɹ¦£¡
+echo %~n0.bat success
 
 pause

Publish/DevOps2/build-cmd/三级版本号-改为下一temp版.bat → Publish/DevOps2/build-cmd/Version-To-NextTemp.bat

@@ -1,17 +1,17 @@
 @echo off
 
-::(x.1)get csproj
+:: #1 get csproj
 for /f "delims=" %%a in ('findstr /M /s /i /r "<pack> <publish>" "..\..\..\*.csproj"') do set "csproj=%%~a"
 ::echo %csproj%
 
-::(x.2)get version
+:: #2 get version
 for /f "tokens=3 delims=><" %%a in ('type %csproj%^|findstr "<Version>.*Version"') do set version=%%a
 
 :: set version=2.1.3
 :: echo  %version%
 
 
-::(x.3)get v1 v2 v3
+:: #3 get v1 v2 v3
 for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
 
 :: v1 v2 v3
@@ -20,27 +20,27 @@ for /f "tokens=2 delims=." %%i in ("%numVersion%") do set v2=%%i
 for /f "tokens=3 delims=." %%i in ("%numVersion%") do set v3=%%i
 
 
-::(x.4)newVersion
+:: #4 newVersion
 set /a v3=1+%v3%
 set newVersion=%v1%.%v2%.%v3%-temp
 :: echo %newVersion%
 
 
  
-::(x.5)调用工具 替换csproj文件中的版本号
-echo 自动修改版本号 [%version%]-^>[%newVersion%]
+:: #5 replace version in csproj
+echo replace verion [%version%]-^>[%newVersion%]
 echo.
 
 VsTool.exe replace -r --path "..\..\.." --file "*.csproj" --old "<Version>%version%</Version>" --new "<Version>%newVersion%</Version>"
 VsTool.exe replace -r --path "..\..\.." --file "packages.config" --old "%version%" --new "%newVersion%"
 
 
-::(x.6)调用工具 替换docker镜像命令中的版本号
+:: #6 replace version in docker image file
 VsTool.exe replace -r --path "..\..\..\Publish\ReleaseFile\docker-image" --file "*.md" --old "%version%" --new "%newVersion%"
 
 
 echo.
 echo.
 echo.
-echo 已经成功修改版本号 [%version%]-^>[%newVersion%]
+echo replace version success [%version%]-^>[%newVersion%]
 pause

Publish/DevOps2/build-cmd/三级版本号-改为preview版.bat → Publish/DevOps2/build-cmd/Version-To-Preview.bat

@@ -1,17 +1,17 @@
 @echo off
 
-::(x.1)get csproj
+:: #1 get csproj
 for /f "delims=" %%a in ('findstr /M /s /i /r "<pack> <publish>" "..\..\..\*.csproj"') do set "csproj=%%~a"
 ::echo %csproj%
 
-::(x.2)get version
+:: #2 get version
 for /f "tokens=3 delims=><" %%a in ('type %csproj%^|findstr "<Version>.*Version"') do set version=%%a
 
 :: set version=2.1.3
 :: echo  %version%
 
 
-::(x.3)get v1 v2 v3
+:: #3 get v1 v2 v3
 for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
 
 :: v1 v2 v3
@@ -20,14 +20,14 @@ for /f "tokens=2 delims=." %%i in ("%numVersion%") do set v2=%%i
 for /f "tokens=3 delims=." %%i in ("%numVersion%") do set v3=%%i
 
 
-::(x.4)newVersion
+:: #4 newVersion
 :: set /a v3=1+%v3%
 set newVersion=%v1%.%v2%.%v3%-preview
 :: echo %newVersion%
 
 
  
-::(x.5)调用工具 替换csproj文件中的版本号
+:: #5 replace version in csproj
 echo 自动修改版本号 [%version%]-^>[%newVersion%]
 echo.
 
@@ -35,12 +35,12 @@ VsTool.exe replace -r --path "..\..\.." --file "*.csproj" --old "<Version>%versi
 VsTool.exe replace -r --path "..\..\.." --file "packages.config" --old "%version%" --new "%newVersion%"
 
 
-::(x.6)调用工具 替换docker镜像命令中的版本号
+:: #6 replace version in docker image file
 VsTool.exe replace -r --path "..\..\..\Publish\ReleaseFile\docker-image" --file "*.md" --old "%version%" --new "%newVersion%"
 
 
 echo.
 echo.
 echo.
-echo 已经成功修改版本号 [%version%]-^>[%newVersion%]
+echo replace version success [%version%]-^>[%newVersion%]
 pause

Publish/DevOps2/build-cmd/三级版本号-改为release版.bat → Publish/DevOps2/build-cmd/Version-To-Release.bat

@@ -1,17 +1,17 @@
 @echo off
 
-::(x.1)get csproj
+:: #1 get csproj
 for /f "delims=" %%a in ('findstr /M /s /i /r "<pack> <publish>" "..\..\..\*.csproj"') do set "csproj=%%~a"
 ::echo %csproj%
 
-::(x.2)get version
+:: #2 get version
 for /f "tokens=3 delims=><" %%a in ('type %csproj%^|findstr "<Version>.*Version"') do set version=%%a
 
 :: set version=2.1.3
 :: echo  %version%
 
 
-::(x.3)get v1 v2 v3
+:: #3 get v1 v2 v3
 for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
 
 :: v1 v2 v3
@@ -20,24 +20,24 @@ for /f "tokens=2 delims=." %%i in ("%numVersion%") do set v2=%%i
 for /f "tokens=3 delims=." %%i in ("%numVersion%") do set v3=%%i
 
 
-::(x.4)newVersion
+:: #4 newVersion
 :: set /a v3=1+%v3%
 set newVersion=%v1%.%v2%.%v3%
 :: echo %newVersion%
 echo [%version%]-^>[%newVersion%]
 
  
-::(x.5)调用工具 替换csproj文件中的版本号
+:: #5 replace version in csproj
 VsTool.exe replace -r --path "..\..\.." --file "*.csproj" --old "<Version>%version%</Version>" --new "<Version>%newVersion%</Version>"
 VsTool.exe replace -r --path "..\..\.." --file "packages.config" --old "%version%" --new "%newVersion%"
 
 
-::(x.6)调用工具 替换docker镜像命令中的版本号
+:: #6 replace version in docker image file
 VsTool.exe replace -r --path "..\..\..\Publish\ReleaseFile\docker-image" --file "*.md" --old "%version%" --new "%newVersion%"
 
 
 echo.
 echo.
 echo.
-echo 已经成功修改版本号 [%version%]-^>[%newVersion%]
+echo replace version success [%version%]-^>[%newVersion%]
 pause

Publish/DevOps2/build-cmd/三级版本号-getVersion.bat → Publish/DevOps2/build-cmd/Version-getVersion.bat

@@ -1,20 +1,20 @@
 @echo off
 
-::»ñÈ¡µ±Ç°°æ±¾ºÅ
+:: get current version
 
 
-::(x.1)get csproj
+:: #1 get csproj
 for /f "delims=" %%a in ('findstr /M /s /i /r "<pack> <publish>" "..\..\..\*.csproj"') do set "csproj=%%~a"
 echo %csproj%
 
-::(x.2)get version
+:: #2 get version
 for /f "tokens=3 delims=><" %%a in ('type %csproj%^|findstr "<Version>.*Version"') do set version=%%a
 
 :: set version=2.1.3
 :: echo  %version%
 
 
-::(x.3)get v1 v2 v3
+:: #3 get v1 v2 v3
 for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
 
 :: v1 v2 v3
@@ -23,7 +23,7 @@ for /f "tokens=2 delims=." %%i in ("%numVersion%") do set v2=%%i
 for /f "tokens=3 delims=." %%i in ("%numVersion%") do set v3=%%i
 
 
-::(x.4)newVersion
+:: #4 newVersion
 ::set /a v3=1+%v3%
 set  newVersion=%v1%.%v2%.%v3%-preview
 echo [%version%]-^>[%newVersion%]