lith 4 years ago
parent
commit
d080f21efe

+ 0 - 38
dotnet/Doc/Publish/ZZZ_copySersStatic.bat

@@ -1,38 +0,0 @@
-
-::(x.1)
-@echo "copy PublishFile"
-xcopy  "..\PublishFile\SersPublish" "SersPublish" /e /i /r /y
-
-
-::(x.2)ServiceCenter
-@echo "copy ServiceCenter wwwroot"
-xcopy  "..\..\ServiceCenter\App.Gover.Gateway\wwwroot" "SersPublish\ServiceCenter\wwwroot" /e /i /r /y
-
-@echo "copy  xml of ServiceCenter"
-xcopy  "..\..\ServiceCenter\App.ServiceCenter\bin\Debug\netcoreapp2.1\*.xml" "SersPublish\ServiceCenter" /i /r /y
-
-
-
-::(x.3)Gover
-@echo "copy Gover wwwroot"
-xcopy  "..\..\ServiceCenter\App.Gover.Gateway\wwwroot" "SersPublish\Gover\wwwroot" /e /i /r /y
-
-
-
-::(x.4)Robot
-@echo "copy Robot wwwroot"
-xcopy  "..\..\ServiceStation\Demo\StressTest\App.Robot.Station\wwwroot" "SersPublish\Robot\wwwroot" /e /i /r /y
- 
-@echo "copy  xml of Robot"
-xcopy  "..\..\ServiceStation\Demo\StressTest\App.Robot.Station\bin\Debug\netcoreapp2.1\*.xml" "SersPublish\Robot" /i /r /y
-
-
- 
-::(x.5)
-@echo "copy  xml of Demo"
-xcopy  "..\..\ServiceStation\Demo\SersLoader\Did.SersLoader.Demo\bin\Debug\netcoreapp2.1\*.xml" "SersPublish\Demo" /i /r /y
-
-
-
-@echo succeed
- 

+ 13 - 12
dotnet/Doc/Publish/pack SersDocker.bat

@@ -1,29 +1,30 @@
 
+set netVersion=net5.0
 
 @echo "copy  SersDocker"
 xcopy  "..\PublishFile\SersDocker" "SersDocker" /e /i /r /y
 
 @echo "copy Demo"
-xcopy  "SersPublish\Demo\appsettings.json" "SersDocker\docker窒扰Sers\Demo" 
-xcopy  "SersPublish\Demo" "SersDocker\docker秶釬噩砉Sers\demo_station\root\app\Demo" /e /i /r /y
+xcopy  "SersPublish\%netVersion%\Demo\appsettings.json" "SersDocker\docker窒扰Sers\Demo" 
+xcopy  "SersPublish\%netVersion%\Demo" "SersDocker\docker秶釬噩砉Sers\demo_station\root\app\Demo" /e /i /r /y
 
 @echo "copy Gateway"
-xcopy  "SersPublish\Gateway\appsettings.json" "SersDocker\docker窒扰Sers\Gateway" 
-xcopy  "SersPublish\Gateway" "SersDocker\docker秶釬噩砉Sers\gateway\root\app\Gateway" /e /i /r /y
+xcopy  "SersPublish\%netVersion%\Gateway\appsettings.json" "SersDocker\docker窒扰Sers\Gateway" 
+xcopy  "SersPublish\%netVersion%\Gateway" "SersDocker\docker秶釬噩砉Sers\gateway\root\app\Gateway" /e /i /r /y
 
 @echo "copy Gover"
-xcopy  "SersPublish\Gover\appsettings.json" "SersDocker\docker窒扰Sers\Gover" 
-xcopy  "SersPublish\Gover" "SersDocker\docker秶釬噩砉Sers\gover\root\app\Gover" /e /i /r /y
+xcopy  "SersPublish\%netVersion%\Gover\appsettings.json" "SersDocker\docker窒扰Sers\Gover" 
+xcopy  "SersPublish\%netVersion%\Gover" "SersDocker\docker秶釬噩砉Sers\gover\root\app\Gover" /e /i /r /y
 
 @echo "copy Robot"
-xcopy  "SersPublish\Robot\appsettings.json" "SersDocker\docker窒扰Sers\Robot" 
-xcopy  "SersPublish\Robot" "SersDocker\docker秶釬噩砉Sers\demo_robot\root\app\Robot" /e /i /r /y
+xcopy  "SersPublish\%netVersion%\Robot\appsettings.json" "SersDocker\docker窒扰Sers\Robot" 
+xcopy  "SersPublish\%netVersion%\Robot" "SersDocker\docker秶釬噩砉Sers\demo_robot\root\app\Robot" /e /i /r /y
 
 @echo "copy ServiceCenter"
-xcopy  "SersPublish\ServiceCenter\appsettings.json" "SersDocker\docker窒扰Sers\ServiceCenter" 
-xcopy  "SersPublish\ServiceCenter" "SersDocker\docker秶釬噩砉Sers\servicecenter\root\app\ServiceCenter" /e /i /r /y
+xcopy  "SersPublish\%netVersion%\ServiceCenter\appsettings.json" "SersDocker\docker窒扰Sers\ServiceCenter" 
+xcopy  "SersPublish\%netVersion%\ServiceCenter" "SersDocker\docker秶釬噩砉Sers\servicecenter\root\app\ServiceCenter" /e /i /r /y
 
 @echo "copy SersAll"
-xcopy  "Sers等极揤聆\ServiceCenter\appsettings.json" "SersDocker\docker窒扰Sers\SersAll" 
-xcopy  "Sers等极揤聆\ServiceCenter" "SersDocker\docker秶釬噩砉Sers\demo_sersall\root\app\ServiceCenter" /e /i /r /y
+xcopy  "Sers等极揤聆\%netVersion%\ServiceCenter\appsettings.json" "SersDocker\docker窒扰Sers\SersAll" 
+xcopy  "Sers等极揤聆\%netVersion%\ServiceCenter" "SersDocker\docker秶釬噩砉Sers\demo_sersall\root\app\ServiceCenter" /e /i /r /y
  

+ 0 - 21
dotnet/Doc/Publish/publish Sers单体压测.bat

@@ -1,21 +0,0 @@
-
-
-@echo "copy  ServiceCenter"
-xcopy  "SersPublish\ServiceCenter" "Sers等极揤聆\ServiceCenter" /e /i /r /y
-
-@echo "copy demo"
-xcopy  "SersPublish\Demo\wwwroot" "Sers等极揤聆\ServiceCenter\wwwroot" /e /i /r /y
-xcopy  "SersPublish\Demo\Did.SersLoader.Demo.dll" "Sers等极揤聆\ServiceCenter" /i /r /y
-xcopy  "SersPublish\Demo\Did.SersLoader.Demo.pdb" "Sers等极揤聆\ServiceCenter" /i /r /y
-xcopy  "SersPublish\Demo\Did.SersLoader.Demo.xml" "Sers等极揤聆\ServiceCenter" /i /r /y
-
-
-@echo "copy  xml of Robot"
-xcopy  "SersPublish\Robot\wwwroot" "Sers等极揤聆\ServiceCenter\wwwroot" /e /i /r /y
-xcopy  "SersPublish\Robot\App.Robot.Station.dll" "Sers等极揤聆\ServiceCenter" /i /r /y
-xcopy  "SersPublish\Robot\App.Robot.Station.pdb" "Sers等极揤聆\ServiceCenter" /i /r /y
-xcopy  "SersPublish\Robot\App.Robot.Station.xml" "Sers等极揤聆\ServiceCenter" /i /r /y
-
-
-@echo "copy PublishFile"
-xcopy  "..\PublishFile\Sers等极揤聆" "Sers等极揤聆" /e /i /r /y

+ 110 - 0
dotnet/Doc/Publish/publish sers(net5.0).bat

@@ -0,0 +1,110 @@
+
+
+set netVersion=net5.0
+
+:: 调用工具 替换csproj
+cd ..\..\..\..
+VsTool.exe replace -r --file "*.csproj" --old "<TargetFramework>netcoreapp2.1</TargetFramework>" --new "<TargetFramework>net5.0</TargetFramework>"
+cd Sers\dotnet\Doc\Publish
+
+echo publish sers
+echo dotnet version: %netVersion%
+
+
+:: 1  publish
+
+cd /d ../../
+
+echo 'publish Gateway'
+cd /d Gateway\App.Gateway
+dotnet build --configuration Release
+dotnet publish --configuration Release --output ..\..\Doc\Publish\SersPublish\%netVersion%\Gateway 
+@if errorlevel 1 (echo . & echo .  & echo 出错,请排查!& pause) 
+cd /d ../../
+ 
+ 
+echo 'publish Gover'
+cd /d ServiceCenter\App.Gover.Gateway
+dotnet build --configuration Release
+dotnet publish --configuration Release --output ..\..\Doc\Publish\SersPublish\%netVersion%\Gover 
+@if errorlevel 1 (echo . & echo .  & echo 出错,请排查!& pause) 
+cd /d ../../
+ 
+echo 'publish ServiceCenter'
+cd /d ServiceCenter\App.ServiceCenter
+dotnet build --configuration Release
+dotnet publish --configuration Release --output ..\..\Doc\Publish\SersPublish\%netVersion%\ServiceCenter
+@if errorlevel 1 (echo . & echo .  & echo 出错,请排查!& pause) 
+cd /d ../../
+
+
+
+
+
+echo 'publish Demo'
+cd /d ServiceStation\Demo\SersLoader\Did.SersLoader.Demo
+dotnet build --configuration Release
+dotnet publish --configuration Release --output ..\..\..\..\Doc\Publish\SersPublish\%netVersion%\Demo
+@if errorlevel 1 (echo . & echo .  & echo 出错,请排查!& pause) 
+cd /d ../../../../
+
+
+echo 'publish Robot'
+cd /d ServiceStation\Demo\StressTest\App.Robot.Station
+dotnet build --configuration Release
+dotnet publish --configuration Release --output ..\..\..\..\Doc\Publish\SersPublish\%netVersion%\Robot
+@if errorlevel 1 (echo . & echo .  & echo 出错,请排查!& pause) 
+cd /d ../../../../
+
+
+ 
+cd /d Doc\Publish
+
+ 
+:: 2 copy Sers Static
+
+::(x.1)
+@echo "copy PublishFile"
+xcopy  "..\PublishFile\SersPublish" "SersPublish\%netVersion%" /e /i /r /y
+
+
+::(x.2)ServiceCenter
+@echo "copy ServiceCenter wwwroot"
+xcopy  "..\..\ServiceCenter\App.Gover.Gateway\wwwroot" "SersPublish\%netVersion%\ServiceCenter\wwwroot" /e /i /r /y
+
+@echo "copy  xml of ServiceCenter"
+xcopy  "..\..\ServiceCenter\App.ServiceCenter\bin\Release\%netVersion%\*.xml" "SersPublish\%netVersion%\ServiceCenter" /i /r /y
+
+
+
+::(x.3)Gover
+@echo "copy Gover wwwroot"
+xcopy  "..\..\ServiceCenter\App.Gover.Gateway\wwwroot" "SersPublish\%netVersion%\Gover\wwwroot" /e /i /r /y
+
+
+
+::(x.4)Robot
+@echo "copy Robot wwwroot"
+xcopy  "..\..\ServiceStation\Demo\StressTest\App.Robot.Station\wwwroot" "SersPublish\%netVersion%\Robot\wwwroot" /e /i /r /y
+ 
+@echo "copy  xml of Robot"
+xcopy  "..\..\ServiceStation\Demo\StressTest\App.Robot.Station\bin\Release\%netVersion%\*.xml" "SersPublish\%netVersion%\Robot" /i /r /y
+
+
+ 
+::(x.5)
+@echo "copy  xml of Demo"
+xcopy  "..\..\ServiceStation\Demo\SersLoader\Did.SersLoader.Demo\bin\Release\%netVersion%\*.xml" "SersPublish\%netVersion%\Demo" /i /r /y
+
+
+
+:: 调用工具 替换csproj
+cd ..\..\..\..
+VsTool.exe replace -r --file "*.csproj" --old "<TargetFramework>net5.0</TargetFramework>" --new "<TargetFramework>netcoreapp2.1</TargetFramework>"
+cd Sers\dotnet\Doc\Publish
+
+echo 'publish sers succeed!'
+echo 'publish sers succeed!'
+echo 'publish sers succeed!'
+
+

+ 105 - 0
dotnet/Doc/Publish/publish sers(netcoreapp2.1).bat

@@ -0,0 +1,105 @@
+
+
+set netVersion=netcoreapp2.1
+
+
+
+
+echo publish sers
+echo dotnet version: %netVersion%
+
+
+:: 1  publish
+
+cd /d ../../
+
+echo 'publish Gateway'
+cd /d Gateway\App.Gateway
+dotnet build --configuration Release
+dotnet publish --configuration Release --output ..\..\Doc\Publish\SersPublish\%netVersion%\Gateway 
+@if errorlevel 1 (echo . & echo .  & echo 出错,请排查!& pause) 
+cd /d ../../
+ 
+ 
+echo 'publish Gover'
+cd /d ServiceCenter\App.Gover.Gateway
+dotnet build --configuration Release
+dotnet publish --configuration Release --output ..\..\Doc\Publish\SersPublish\%netVersion%\Gover 
+@if errorlevel 1 (echo . & echo .  & echo 出错,请排查!& pause) 
+cd /d ../../
+ 
+echo 'publish ServiceCenter'
+cd /d ServiceCenter\App.ServiceCenter
+dotnet build --configuration Release
+dotnet publish --configuration Release --output ..\..\Doc\Publish\SersPublish\%netVersion%\ServiceCenter
+@if errorlevel 1 (echo . & echo .  & echo 出错,请排查!& pause) 
+cd /d ../../
+
+
+
+
+
+echo 'publish Demo'
+cd /d ServiceStation\Demo\SersLoader\Did.SersLoader.Demo
+dotnet build --configuration Release
+dotnet publish --configuration Release --output ..\..\..\..\Doc\Publish\SersPublish\%netVersion%\Demo
+@if errorlevel 1 (echo . & echo .  & echo 出错,请排查!& pause) 
+cd /d ../../../../
+
+
+echo 'publish Robot'
+cd /d ServiceStation\Demo\StressTest\App.Robot.Station
+dotnet build --configuration Release
+dotnet publish --configuration Release --output ..\..\..\..\Doc\Publish\SersPublish\%netVersion%\Robot
+@if errorlevel 1 (echo . & echo .  & echo 出错,请排查!& pause) 
+cd /d ../../../../
+
+
+ 
+cd /d Doc\Publish
+
+ 
+:: 2 copy Sers Static
+
+::(x.1)
+@echo "copy PublishFile"
+xcopy  "..\PublishFile\SersPublish" "SersPublish\%netVersion%" /e /i /r /y
+
+
+::(x.2)ServiceCenter
+@echo "copy ServiceCenter wwwroot"
+xcopy  "..\..\ServiceCenter\App.Gover.Gateway\wwwroot" "SersPublish\%netVersion%\ServiceCenter\wwwroot" /e /i /r /y
+
+@echo "copy  xml of ServiceCenter"
+xcopy  "..\..\ServiceCenter\App.ServiceCenter\bin\Release\%netVersion%\*.xml" "SersPublish\%netVersion%\ServiceCenter" /i /r /y
+
+
+
+::(x.3)Gover
+@echo "copy Gover wwwroot"
+xcopy  "..\..\ServiceCenter\App.Gover.Gateway\wwwroot" "SersPublish\%netVersion%\Gover\wwwroot" /e /i /r /y
+
+
+
+::(x.4)Robot
+@echo "copy Robot wwwroot"
+xcopy  "..\..\ServiceStation\Demo\StressTest\App.Robot.Station\wwwroot" "SersPublish\%netVersion%\Robot\wwwroot" /e /i /r /y
+ 
+@echo "copy  xml of Robot"
+xcopy  "..\..\ServiceStation\Demo\StressTest\App.Robot.Station\bin\Release\%netVersion%\*.xml" "SersPublish\%netVersion%\Robot" /i /r /y
+
+
+ 
+::(x.5)
+@echo "copy  xml of Demo"
+xcopy  "..\..\ServiceStation\Demo\SersLoader\Did.SersLoader.Demo\bin\Release\%netVersion%\*.xml" "SersPublish\%netVersion%\Demo" /i /r /y
+
+
+
+
+
+echo 'publish sers succeed!'
+echo 'publish sers succeed!'
+echo 'publish sers succeed!'
+
+

+ 0 - 57
dotnet/Doc/Publish/publish sers.bat

@@ -1,57 +0,0 @@
-cd /d ../../
-
-echo 'publish Gateway'
-cd /d Gateway\App.Gateway
-dotnet build --configuration Release
-dotnet publish --configuration Release --output ..\..\Doc\Publish\SersPublish\Gateway 
-@if errorlevel 1 (echo . & echo .  & echo 出错,请排查!& pause) 
-cd /d ../../
- 
- 
-echo 'publish Gover'
-cd /d ServiceCenter\App.Gover.Gateway
-dotnet build --configuration Release
-dotnet publish --configuration Release --output ..\..\Doc\Publish\SersPublish\Gover 
-@if errorlevel 1 (echo . & echo .  & echo 出错,请排查!& pause) 
-cd /d ../../
- 
-echo 'publish ServiceCenter'
-cd /d ServiceCenter\App.ServiceCenter
-dotnet build --configuration Release
-dotnet publish --configuration Release --output ..\..\Doc\Publish\SersPublish\ServiceCenter
-@if errorlevel 1 (echo . & echo .  & echo 出错,请排查!& pause) 
-cd /d ../../
-
-
-
-
-
-echo 'publish Demo'
-cd /d ServiceStation\Demo\SersLoader\Did.SersLoader.Demo
-dotnet build --configuration Release
-dotnet publish --configuration Release --output ..\..\..\..\Doc\Publish\SersPublish\Demo
-@if errorlevel 1 (echo . & echo .  & echo 出错,请排查!& pause) 
-cd /d ../../../../
-
-
-echo 'publish Robot'
-cd /d ServiceStation\Demo\StressTest\App.Robot.Station
-dotnet build --configuration Release
-dotnet publish --configuration Release --output ..\..\..\..\Doc\Publish\SersPublish\Robot
-@if errorlevel 1 (echo . & echo .  & echo 出错,请排查!& pause) 
-cd /d ../../../../
-
-
-
- 
-cd /d Doc\Publish
-
-
-call "ZZZ_copySersStatic.bat"
-
-
-echo 'publish sers succeed!'
-echo 'publish sers succeed!'
-echo 'publish sers succeed!'
-
-

+ 24 - 0
dotnet/Doc/Publish/publish sers单体压测(net5.0).bat

@@ -0,0 +1,24 @@
+
+set netVersion=net5.0
+
+
+
+@echo "copy  ServiceCenter"
+xcopy  "SersPublish\%netVersion%\ServiceCenter" "Sers데竟箕꿎\%netVersion%\ServiceCenter" /e /i /r /y
+
+@echo "copy demo"
+xcopy  "SersPublish\%netVersion%\Demo\wwwroot" "Sers데竟箕꿎\%netVersion%\ServiceCenter\wwwroot" /e /i /r /y
+xcopy  "SersPublish\%netVersion%\Demo\Did.SersLoader.Demo.dll" "Sers데竟箕꿎\%netVersion%\ServiceCenter" /i /r /y
+xcopy  "SersPublish\%netVersion%\Demo\Did.SersLoader.Demo.pdb" "Sers데竟箕꿎\%netVersion%\ServiceCenter" /i /r /y
+xcopy  "SersPublish\%netVersion%\Demo\Did.SersLoader.Demo.xml" "Sers데竟箕꿎\%netVersion%\ServiceCenter" /i /r /y
+
+
+@echo "copy  xml of Robot"
+xcopy  "SersPublish\%netVersion%\Robot\wwwroot" "Sers데竟箕꿎\%netVersion%\ServiceCenter\wwwroot" /e /i /r /y
+xcopy  "SersPublish\%netVersion%\Robot\App.Robot.Station.dll" "Sers데竟箕꿎\%netVersion%\ServiceCenter" /i /r /y
+xcopy  "SersPublish\%netVersion%\Robot\App.Robot.Station.pdb" "Sers데竟箕꿎\%netVersion%\ServiceCenter" /i /r /y
+xcopy  "SersPublish\%netVersion%\Robot\App.Robot.Station.xml" "Sers데竟箕꿎\%netVersion%\ServiceCenter" /i /r /y
+
+
+@echo "copy PublishFile"
+xcopy  "..\PublishFile\Sers데竟箕꿎" "Sers데竟箕꿎\%netVersion%" /e /i /r /y

+ 24 - 0
dotnet/Doc/Publish/publish sers单体压测(netcoreapp2.1).bat

@@ -0,0 +1,24 @@
+
+set netVersion=netcoreapp2.1
+
+
+
+@echo "copy  ServiceCenter"
+xcopy  "SersPublish\%netVersion%\ServiceCenter" "Sers等极揤聆\%netVersion%\ServiceCenter" /e /i /r /y
+
+@echo "copy demo"
+xcopy  "SersPublish\%netVersion%\Demo\wwwroot" "Sers等极揤聆\%netVersion%\ServiceCenter\wwwroot" /e /i /r /y
+xcopy  "SersPublish\%netVersion%\Demo\Did.SersLoader.Demo.dll" "Sers等极揤聆\%netVersion%\ServiceCenter" /i /r /y
+xcopy  "SersPublish\%netVersion%\Demo\Did.SersLoader.Demo.pdb" "Sers等极揤聆\%netVersion%\ServiceCenter" /i /r /y
+xcopy  "SersPublish\%netVersion%\Demo\Did.SersLoader.Demo.xml" "Sers等极揤聆\%netVersion%\ServiceCenter" /i /r /y
+
+
+@echo "copy  xml of Robot"
+xcopy  "SersPublish\%netVersion%\Robot\wwwroot" "Sers等极揤聆\%netVersion%\ServiceCenter\wwwroot" /e /i /r /y
+xcopy  "SersPublish\%netVersion%\Robot\App.Robot.Station.dll" "Sers等极揤聆\%netVersion%\ServiceCenter" /i /r /y
+xcopy  "SersPublish\%netVersion%\Robot\App.Robot.Station.pdb" "Sers等极揤聆\%netVersion%\ServiceCenter" /i /r /y
+xcopy  "SersPublish\%netVersion%\Robot\App.Robot.Station.xml" "Sers等极揤聆\%netVersion%\ServiceCenter" /i /r /y
+
+
+@echo "copy PublishFile"
+xcopy  "..\PublishFile\Sers等极揤聆" "Sers等极揤聆\%netVersion%" /e /i /r /y

+ 1 - 1
dotnet/Doc/PublishFile/SersDocker/docker制作镜像Sers/demo_robot/Dockerfile

@@ -1,2 +1,2 @@
-FROM serset/dotnet:2.1
+FROM serset/dotnet:5.0
 COPY root /root

+ 1 - 1
dotnet/Doc/PublishFile/SersDocker/docker制作镜像Sers/demo_sersall/Dockerfile

@@ -1,2 +1,2 @@
-FROM serset/dotnet:2.1
+FROM serset/dotnet:5.0
 COPY root /root

+ 1 - 1
dotnet/Doc/PublishFile/SersDocker/docker制作镜像Sers/demo_station/Dockerfile

@@ -1,2 +1,2 @@
-FROM serset/dotnet:2.1
+FROM serset/dotnet:5.0
 COPY root /root

+ 1 - 1
dotnet/Doc/PublishFile/SersDocker/docker制作镜像Sers/gateway/Dockerfile

@@ -1,2 +1,2 @@
-FROM serset/dotnet:2.1
+FROM serset/dotnet:5.0
 COPY root /root

+ 1 - 1
dotnet/Doc/PublishFile/SersDocker/docker制作镜像Sers/gover/Dockerfile

@@ -1,2 +1,2 @@
-FROM serset/dotnet:2.1
+FROM serset/dotnet:5.0
 COPY root /root

+ 1 - 1
dotnet/Doc/PublishFile/SersDocker/docker制作镜像Sers/servicecenter/Dockerfile

@@ -1,2 +1,2 @@
-FROM serset/dotnet:2.1
+FROM serset/dotnet:5.0
 COPY root /root