dotnet/Doc/DevOps/github/40.dotnet-publish.sh

@@ -1,5 +1,6 @@
 set -e
 
+#  cd $codePath/Doc/DevOps/github; bash 40.dotnet-publish.sh;
 
 #---------------------------------------------------------------------
 #(x.1)参数
@@ -15,7 +16,7 @@ export codePath=/root/temp/svn/dotnet
 echo "(x.2)publish netcoreapp2.1"
 
 export netVersion=netcoreapp2.1 
-bash 41.dotnet-publish-by-netVersion.sh;
+bash $codePath/Doc/DevOps/github/41.dotnet-publish-by-netVersion.sh;
 
 
 
@@ -28,7 +29,7 @@ cd $codePath
 sed -i 's/netcoreapp2.1/net6.0/g'  `grep -a 'netcoreapp2.1' . -rl --include *.csproj`
 
 export netVersion=net6.0
-bash 41.dotnet-publish-by-netVersion.sh;
+bash $codePath/Doc/DevOps/github/41.dotnet-publish-by-netVersion.sh;
 
 
 #修改csproj文件中的版本号为2.1

dotnet/Doc/DevOps/github/50.sers压测CL-publish.sh

@@ -11,26 +11,32 @@ export codePath=/root/temp/svn/dotnet
 
  
 
-#---------------------------------------------- 
-echo "(x.2)publish netcoreapp2.1"
 
-export netVersion=netcoreapp2.1 
-bash 41.dotnet-publish-by-netVersion.sh;
+#----------------------------------------------
+echo "(x.2)dotnet-publish"
+
+docker run -i --rm \
+--env LANG=C.UTF-8 \
+-v $codePath:/root/code \
+serset/dotnet:6.0-sdk \
+bash -c "
+set -e
+
+echo 'publish Client'
+cd /root/code/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient
+dotnet build --configuration Release
+dotnet publish --configuration Release --output /root/code/Doc/Publish/CL压测/CmClient
+
+echo 'publish Server'
+cd /root/code/Library/Sers/Sers.CL/Test/CommunicationManage/CmServer
+dotnet build --configuration Release
+dotnet publish --configuration Release --output /root/code/Doc/Publish/CL压测/CmServer     
+" 
 
 
 
 
-#---------------------------------------------- 
-echo "(x.3)publish net6.0"
 
-#修改csproj文件中的版本号为6.0
-cd $codePath
-sed -i 's/netcoreapp2.1/net6.0/g'  `grep -a 'netcoreapp2.1' . -rl --include *.csproj`
 
-export netVersion=net6.0
-bash 41.dotnet-publish-by-netVersion.sh;
 
 
-#修改csproj文件中的版本号为2.1
-cd $codePath
-sed -i 's/net6.0/netcoreapp2.1/g'  `grep -a 'net6.0' . -rl --include *.csproj`

dotnet/Doc/DevOps/github/51.sers压测-publish.sh

@@ -0,0 +1,107 @@
+set -e
+
+
+#---------------------------------------------------------------------
+#(x.1)参数
+args_="
+
+export codePath=/root/temp/svn/dotnet
+
+# "
+
+ 
+
+#---------------------------------------------- 
+echo "(x.2)sers压测-publish单体压测(netcoreapp2.1)"
+
+netVersion=netcoreapp2.1
+basePath=$codePath/Doc/Publish/Sers压测/sers压测-单体压测$netVersion
+mkdir -p $basePath
+
+echo "copy  ServiceCenter"
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/ServiceCenter $basePath
+
+echo "copy demo"
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Demo/wwwroot $basePath/ServiceCenter
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Demo/Did.SersLoader.Demo.dll $basePath/ServiceCenter
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Demo/Did.SersLoader.Demo.pdb $basePath/ServiceCenter
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Demo/Did.SersLoader.Demo.xml $basePath/ServiceCenter 
+
+echo 'copy robot'
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Robot/wwwroot $basePath/ServiceCenter
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Robot/App.Robot.Station.dll $basePath/ServiceCenter
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Robot/App.Robot.Station.pdb $basePath/ServiceCenter
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Robot/App.Robot.Station.xml $basePath/ServiceCenter 
+
+echo 'copy PublishFile'
+\cp -rf $codePath/Doc/PublishFile/Sers压测/单体压测/. $basePath
+
+ 
+
+#---------------------------------------------- 
+echo "(x.3)sers压测-publish单体压测(net6.0)"
+
+netVersion=net6.0
+basePath=$codePath/Doc/Publish/Sers压测/sers压测-单体压测$netVersion
+mkdir -p $basePath
+
+echo "copy  ServiceCenter"
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/ServiceCenter $basePath
+
+echo "copy demo"
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Demo/wwwroot $basePath/ServiceCenter
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Demo/Did.SersLoader.Demo.dll $basePath/ServiceCenter
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Demo/Did.SersLoader.Demo.pdb $basePath/ServiceCenter
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Demo/Did.SersLoader.Demo.xml $basePath/ServiceCenter 
+
+echo 'copy robot'
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Robot/wwwroot $basePath/ServiceCenter
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Robot/App.Robot.Station.dll $basePath/ServiceCenter
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Robot/App.Robot.Station.pdb $basePath/ServiceCenter
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Robot/App.Robot.Station.xml $basePath/ServiceCenter 
+
+echo 'copy PublishFile'
+\cp -rf $codePath/Doc/PublishFile/Sers压测/单体压测/. $basePath
+
+
+
+
+
+#---------------------------------------------- 
+echo "(x.4)sers压测-publish分布式压测(netcoreapp2.1)"
+
+netVersion=netcoreapp2.1
+basePath=$codePath/Doc/Publish/Sers压测/sers压测-分布式压测$netVersion
+mkdir -p $basePath
+
+echo "copy station"
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/ServiceCenter $basePath
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Demo $basePath
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Robot $basePath
+
+echo "copy PublishFile"
+\cp -rf $codePath/Doc/PublishFile/Sers压测/分布式压测/. $basePath
+
+
+
+
+
+#---------------------------------------------- 
+echo "(x.5)sers压测-publish分布式压测(net6.0)"
+
+netVersion=net6.0
+basePath=$codePath/Doc/Publish/Sers压测/sers压测-分布式压测$netVersion
+mkdir -p $basePath
+
+echo "copy station"
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/ServiceCenter $basePath
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Demo $basePath
+\cp -rf $codePath/Doc/Publish/SersPublish/$netVersion/Robot $basePath
+
+echo "copy PublishFile"
+\cp -rf $codePath/Doc/PublishFile/Sers压测/分布式压测/. $basePath
+
+
+
+
+ 

dotnet/Doc/DevOps/github/51.stressTest-CL - 副本.sh

@@ -1,36 +0,0 @@
-set -e
-
-
-#---------------------------------------------------------------------
-#(x.1)参数
-args_="
-
-export codePath=/root/temp/svn/dotnet
-
-# "
-
- 
-
-#---------------------------------------------- 
-echo "(x.2)publish netcoreapp2.1"
-
-export netVersion=netcoreapp2.1 
-bash 41.dotnet-publish-by-netVersion.sh;
-
-
-
-
-#---------------------------------------------- 
-echo "(x.3)publish net6.0"
-
-#修改csproj文件中的版本号为6.0
-cd $codePath
-sed -i 's/netcoreapp2.1/net6.0/g'  `grep -a 'netcoreapp2.1' . -rl --include *.csproj`
-
-export netVersion=net6.0
-bash 41.dotnet-publish-by-netVersion.sh;
-
-
-#修改csproj文件中的版本号为2.1
-cd $codePath
-sed -i 's/net6.0/netcoreapp2.1/g'  `grep -a 'net6.0' . -rl --include *.csproj`

dotnet/Doc/DevOps/github/90.release-build.sh

@@ -19,34 +19,28 @@ export export GIT_SSH_SECRET=xxxxxx
 
 #----------------------------------------------
 echo "(x.2.1)发布文件-创建文件夹及内容"
-mkdir -p $codePath/Publish/git
-mkdir -p $codePath/Publish/release
-
-cp -rf  $codePath/Publish/04.服务站点 $codePath/Publish/release/04.服务站点
-cp -rf  $codePath/Publish/06.Docker $codePath/Publish/release/06.Docker
-cp -rf  $codePath/Publish/06.Docker/制作镜像/${name}/app $codePath/Publish/release/04.服务站点/${name}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
+mkdir -p $codePath/Doc/Publish/Sers$version
 
+ 
 
+echo 1.创建 nuget-Sers
+/cp -rf  $codePath/Doc/Publish/nuget $codePath/Doc/Publish/Sers$version/nuget-Sers
 
+echo 2.创建 SersPublish
+/cp -rf  $codePath/Doc/Publish/SersPublish $codePath/Doc/Publish/Sers$version/SersPublish
 
+echo 3.创建 CL压测
+/cp -rf  $codePath/Doc/Publish/CL压测 $codePath/Doc/Publish/Sers$version/CL压测
 
+echo 4.创建 Sers压测
+/cp -rf  $codePath/Doc/Publish/Sers压测 $codePath/Doc/Publish/Sers$version/Sers压测
 
+echo 5.创建 docker制作镜像Sers
+/cp -rf  $codePath/Doc/Publish/SersDocker/docker制作镜像Sers $codePath/Doc/Publish/Sers$version/docker制作镜像Sers
 
+echo 6.创建 docker部署Sers
+/cp -rf  $codePath/Doc/Publish/SersDocker/docker部署Sers $codePath/Doc/Publish/Sers$version/docker部署Sers
 
 
 
@@ -56,9 +50,7 @@ cp -rf  $codePath/Publish/06.Docker/制作镜像/${name}/app $codePath/Publish/r
 echo "(x.2.3)发布文件-压缩" 
 docker run --rm -i \
 -v $codePath/Publish:/root/file \
-serset/filezip dotnet FileZip.dll zip -i /root/file/release -o /root/file/git/${name}-${version}.zip
-
- 
+serset/filezip dotnet FileZip.dll zip -i /root/file/Doc/Publish/Sers$version -o /root/file/Doc/Publish/Sers-$version.zip
 
 
 
@@ -67,7 +59,7 @@ serset/filezip dotnet FileZip.dll zip -i /root/file/release -o /root/file/git/${
 
 #----------------------------------------------
 echo "(x.3)github-提交release文件到release仓库"
-# releaseFile=$codePath/Publish/git/${name}-${version}.zip
+#releaseFile=$codePath/Doc/Publish/Sers-$version.zip
 
 #复制ssh key
 echo "${GIT_SSH_SECRET}" > $codePath/Publish/git/serset

dotnet/Doc/cmd/Sers压缩包-创建.bat

@@ -8,33 +8,33 @@ echo ["%version%"]
 
 cd /d ..\Publish
  
-
-mkdir Publish
 mkdir Publish\Sers%version%
 
 
 
-echo 1.´´½¨ nuget-Sers.zip
-dotnet ../cmd/FileZip/FileZip.dll zip -i "nuget" -o "Publish/Sers%version%/nuget-Sers%version%.zip"
- 
+echo 1.´´½¨ nuget-Sers
+xcopy "nuget" "Publish/Sers%version%/nuget-Sers" /e /i /r /y 
 
-echo 2.´´½¨ SersPublish.zip
-dotnet ../cmd/FileZip/FileZip.dll zip -i "SersPublish" -o "Publish/Sers%version%/SersPublish%version%.zip"
+echo 2.´´½¨ SersPublish
+xcopy "SersPublish" "Publish/Sers%version%/SersPublish" /e /i /r /y
 
-echo 3.´´½¨ CLѹ²â.zip
-dotnet ../cmd/FileZip/FileZip.dll zip -i "CLѹ²â" -o "Publish/Sers%version%/CLѹ²â%version%.zip"
+echo 3.´´½¨ CLѹ²â
+xcopy "CLѹ²â" "Publish/Sers%version%/CLѹ²â" /e /i /r /y
 
-echo 4.´´½¨ Sersѹ²â.zip
-dotnet ../cmd/FileZip/FileZip.dll zip -i "Sersѹ²â" -o "Publish/Sers%version%/Sersѹ²â%version%.zip"
+echo 4.´´½¨ Sersѹ²â
+xcopy "Sersѹ²â" "Publish/Sers%version%/Sersѹ²â" /e /i /r /y
 
+echo 5.´´½¨ dockerÖÆ×÷¾µÏñSers
+xcopy "SersDocker/dockerÖÆ×÷¾µÏñSers" "Publish/Sers%version%/dockerÖÆ×÷¾µÏñSers" /e /i /r /y
 
+echo 6.´´½¨ docker²¿ÊðSers
+xcopy "SersDocker/docker²¿ÊðSers" "Publish/Sers%version%/docker²¿ÊðSers" /e /i /r /y
+ 
 
 
-echo 5.´´½¨ dockerÖÆ×÷¾µÏñSers.zip
-dotnet ../cmd/FileZip/FileZip.dll zip -i "SersDocker/dockerÖÆ×÷¾µÏñSers" -o "Publish/Sers%version%/dockerÖÆ×÷¾µÏñSers%version%.zip"
 
-echo 6.´´½¨ docker²¿ÊðSers.zip
-dotnet ../cmd/FileZip/FileZip.dll zip -i "SersDocker/docker²¿ÊðSers" -o "Publish/Sers%version%/docker²¿ÊðSers%version%.zip" 
+echo 7.´´½¨ Sers%version%.zip
+dotnet ../cmd/FileZip/FileZip.dll zip -i "Publish/Sers%version%" -o "Publish/Sers-%version%.zip" 
 
 
 cd /d ..\cmd

dotnet/Doc/cmd/sers压测-publish单体压测(net6.0).bat

@@ -15,7 +15,7 @@ xcopy  "SersPublish\%netVersion%\Demo\Did.SersLoader.Demo.pdb" "%basePath%\Servi
 xcopy  "SersPublish\%netVersion%\Demo\Did.SersLoader.Demo.xml" "%basePath%\ServiceCenter" /i /r /y
 
 
-@echo "copy  xml of Robot"
+@echo "copy Robot"
 xcopy  "SersPublish\%netVersion%\Robot\wwwroot" "%basePath%\ServiceCenter\wwwroot" /e /i /r /y
 xcopy  "SersPublish\%netVersion%\Robot\App.Robot.Station.dll" "%basePath%\ServiceCenter" /i /r /y
 xcopy  "SersPublish\%netVersion%\Robot\App.Robot.Station.pdb" "%basePath%\ServiceCenter" /i /r /y

dotnet/Doc/cmd/sers压测-publish单体压测(netcoreapp2.1).bat

@@ -15,7 +15,7 @@ xcopy  "SersPublish\%netVersion%\Demo\Did.SersLoader.Demo.pdb" "%basePath%\Servi
 xcopy  "SersPublish\%netVersion%\Demo\Did.SersLoader.Demo.xml" "%basePath%\ServiceCenter" /i /r /y
 
 
-@echo "copy  xml of Robot"
+@echo "copy Robot"
 xcopy  "SersPublish\%netVersion%\Robot\wwwroot" "%basePath%\ServiceCenter\wwwroot" /e /i /r /y
 xcopy  "SersPublish\%netVersion%\Robot\App.Robot.Station.dll" "%basePath%\ServiceCenter" /i /r /y
 xcopy  "SersPublish\%netVersion%\Robot\App.Robot.Station.pdb" "%basePath%\ServiceCenter" /i /r /y

dotnet/Doc/cmd/sers压测CL-publish.bat

@@ -8,7 +8,7 @@ dotnet publish --configuration Release --output ..\..\..\..\..\..\Doc\Publish\CL
 @if errorlevel 1 (echo . & echo .  & echo ³ö´í£¬ÇëÅŲ飡& pause) 
 cd /d ../../../../../../
    
-echo 'publish Client'
+echo 'publish Server'
 cd /d Library\Sers\Sers.CL\Test\CommunicationManage\CmServer
 dotnet build --configuration Release
 dotnet publish --configuration Release --output ..\..\..\..\..\..\Doc\Publish\CLѹ²â\CmServer