auto commit 2.1.9

.github/workflows/action-main.yml

@@ -40,7 +40,10 @@ jobs:
            cd ./Publish/DevOps/github-bash
            bash startup.bash
            echo build succeed!
-
+           
+           echo "appName=Sers" >> $GITHUB_ENV
+           
+           
       - name: release_create
         id: release_create
         uses: actions/create-release@v1
@@ -62,8 +65,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-ServiceCenter(net5.0)-${{ env.release_version }}.zip
-          asset_name: Sers-ServiceCenter-net5.0-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-nuget-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-nuget-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -71,8 +74,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-ServiceCenter(net6.0)-${{ env.release_version }}.zip
-          asset_name: Sers-ServiceCenter-net6.0-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-docker-image-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-docker-image-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -80,8 +83,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-ServiceCenter(netcoreapp2.1)-${{ env.release_version }}.zip
-          asset_name: Sers-ServiceCenter-netcoreapp2.1-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-docker-deploy-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-docker-deploy-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -89,17 +92,19 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-ServiceCenter(netcoreapp2.2)-${{ env.release_version }}.zip
-          asset_name: Sers-ServiceCenter-netcoreapp2.2-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-StressTest-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-StressTest-${{ env.release_version }}.zip
           asset_content_type: application/zip
-
+        
+        
+        
       - uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-ServiceCenter(netcoreapp3.0)-${{ env.release_version }}.zip
-          asset_name: Sers-ServiceCenter-netcoreapp3.0-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-ServiceCenter(net5.0)-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-ServiceCenter-net5.0-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -107,8 +112,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-ServiceCenter(netcoreapp3.1)-${{ env.release_version }}.zip
-          asset_name: Sers-ServiceCenter-netcoreapp3.1-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-ServiceCenter(net6.0)-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-ServiceCenter-net6.0-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -116,8 +121,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-Station(net5.0)-${{ env.release_version }}.zip
-          asset_name: Sers-Station-net5.0-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-ServiceCenter(netcoreapp2.1)-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-ServiceCenter-netcoreapp2.1-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -125,8 +130,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-Station(net6.0)-${{ env.release_version }}.zip
-          asset_name: Sers-Station-net6.0-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-ServiceCenter(netcoreapp2.2)-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-ServiceCenter-netcoreapp2.2-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -134,8 +139,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-Station(netcoreapp2.1)-${{ env.release_version }}.zip
-          asset_name: Sers-Station-netcoreapp2.1-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-ServiceCenter(netcoreapp3.0)-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-ServiceCenter-netcoreapp3.0-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -143,8 +148,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-Station(netcoreapp2.2)-${{ env.release_version }}.zip
-          asset_name: Sers-Station-netcoreapp2.2-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-ServiceCenter(netcoreapp3.1)-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-ServiceCenter-netcoreapp3.1-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -152,8 +157,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-Station(netcoreapp3.0)-${{ env.release_version }}.zip
-          asset_name: Sers-Station-netcoreapp3.0-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-Station(net5.0)-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-Station-net5.0-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -161,8 +166,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-Station(netcoreapp3.1)-${{ env.release_version }}.zip
-          asset_name: Sers-Station-netcoreapp3.1-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-Station(net6.0)-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-Station-net6.0-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -170,8 +175,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-docker-deploy-${{ env.release_version }}.zip
-          asset_name: Sers-docker-deploy-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-Station(netcoreapp2.1)-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-Station-netcoreapp2.1-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -179,8 +184,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-docker-image-${{ env.release_version }}.zip
-          asset_name: Sers-docker-image-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-Station(netcoreapp2.2)-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-Station-netcoreapp2.2-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -188,8 +193,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-nuget-${{ env.release_version }}.zip
-          asset_name: Sers-nuget-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-Station(netcoreapp3.0)-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-Station-netcoreapp3.0-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -197,6 +202,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-StressTest-${{ env.release_version }}.zip
-          asset_name: Sers-StressTest-${{ env.release_version }}.zip
-          asset_content_type: application/zip
+          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-Station(netcoreapp3.1)-${{ env.release_version }}.zip
+          asset_name: ${{ env.appName }}-Station-netcoreapp3.1-${{ env.release_version }}.zip
+          asset_content_type: application/zip

Publish/DevOps/github-bash/71.file-zip.sh

@@ -7,7 +7,9 @@ args_="
 
 export basePath=/root/temp/svn
 
-export version=`grep '<Version>' $(grep '<pack/>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
+export version=`grep '<Version>' $(grep '<pack>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
+
+export name=Sers
 
 # "
 
@@ -25,11 +27,11 @@ set -e
 
 releasePath=/root/code/Publish/release
 
-for name in \`ls /root/code/Publish/release/release\`
+for dirname in \`ls /root/code/Publish/release/release\`
 do
-  if [ -d \$releasePath/release/\$name ]
+  if [ -d \$releasePath/release/\$dirname ]
   then
-    filezip zip -p -i \$releasePath/release/\$name -o \$releasePath/release-zip/Sers-\${name}-${version}.zip 
+    filezip zip -p -i \$releasePath/release/\$dirname -o \$releasePath/release-zip/${name}-\${dirname}-${version}.zip 
   fi
 done
 

Publish/DevOps/github-bash/73.docker-image-build-push.sh

@@ -7,7 +7,7 @@ args_="
 
 export basePath=/root/temp/svn
 
-export version=`grep '<Version>' $(grep '<pack/>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
+export version=`grep '<Version>' $(grep '<pack>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 
 export DOCKER_USERNAME=serset
 export DOCKER_PASSWORD=xxx
@@ -49,10 +49,16 @@ docker buildx ls
 
 docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
 
-for name in sers sers-gateway sers-gover sers-demo sers-demo-robot 
+
+dockerPath=$basePath/Publish/release/release/docker-image
+
+for dockerName in `ls $dockerPath`
 do
-	echo "docker build $name"
-	docker buildx build $basePath/Publish/release/release/docker-image/$name -t $DOCKER_USERNAME/$name:$version -t $DOCKER_USERNAME/$name --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
+  if [ -d $dockerPath/$dockerName ]
+  then 
+    echo "docker build $dockerName"
+    docker buildx build $dockerPath/$dockerName -t $DOCKER_USERNAME/$dockerName:$version -t $DOCKER_USERNAME/$dockerName --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
+  fi
 done
 
 

Publish/DevOps/github-bash/75.github-push-to-serset-release.sh

@@ -7,7 +7,7 @@ args_="
 
 export basePath=/root/temp/svn
 
-export version=`grep '<Version>' $(grep '<pack/>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
+export version=`grep '<Version>' $(grep '<pack>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 
 export name=ServiceAdaptor
 

Publish/DevOps/github-bash/76.github-push-release.sh

@@ -7,7 +7,7 @@ args_="
 
 export basePath=/root/temp/svn
 
-export version=`grep '<Version>' $(grep '<pack/>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
+export version=`grep '<Version>' $(grep '<pack>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 
 export name=ServiceAdaptor
 

Publish/DevOps/github-bash/startup.bash

@@ -28,7 +28,7 @@ export name=Sers
 
 #----------------------------------------------
 echo "(x.2)get version" 
-export version=`grep '<Version>' $(grep '<pack/>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
+export version=`grep '<Version>' $(grep '<pack>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 echo $version
 
 

Publish/DevOps/release-bash/30.nuget-pack.sh

@@ -25,7 +25,7 @@ docker run -i --rm \
 serset/dotnet:sdk-5.0 \
 bash -c "
 cd /root/code
-for file in \$(grep -a '<pack/>' . -rl --include *.csproj)
+for file in \$(grep -a '<pack>nuget</pack>' . -rl --include *.csproj)
 do
 	echo pack \$file
 	cd /root/code

Publish/DevOps/release-bash/40.Station-publish.sh

@@ -12,7 +12,7 @@ export basePath=/root/temp/svn
 
 #----------------------------------------------
 echo "(x.2)获取netVersion" 
-netVersion=`grep '<TargetFramework>' $(grep '<pack/>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
+netVersion=`grep '<TargetFramework>' $(grep '<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 
 
 publishPath=$basePath/Publish/release/release/Station\($netVersion\)

Publish/DevOps/release-bash/50.docker-image-create.sh

@@ -24,12 +24,24 @@ echo "(x.3)copy dir"
 
 #---------------------------------------------------------------------
 echo "(x.4)copy station"
-
-\cp -rf "$publishPath/ServiceCenter/." "$dockerPath/sers/app"
-\cp -rf "$publishPath/Gateway/." "$dockerPath/sers-gateway/app"
-\cp -rf "$publishPath/Gover/." "$dockerPath/sers-gover/app"
-\cp -rf "$publishPath/Demo/." "$dockerPath/sers-demo/app"
-\cp -rf "$publishPath/Robot/." "$dockerPath/sers-demo-robot/app"
+#查找所有需要发布的项目并copy
+cd $basePath
+for file in $(grep -a '<docker>' . -rl --include *.csproj)
+do
+	cd $basePath
+	
+	#get publishName
+	publishName=`grep '<publish>' $file -r | grep -oP '>(.*)<' | tr -d '<>'`
+	
+	#get dockerName
+	dockerName=`grep '<docker>' $file -r | grep -oP '>(.*)<' | tr -d '<>'`
+
+	echo copy $dockerName
+	\cp -rf "$publishPath/$publishName/." "$dockerPath/$dockerName/app"
+done
+
+
+#copy单体压测
 \cp -rf "$basePath/Publish/release/release/StressTest/单体压测net5.0/ServiceCenter/." "$dockerPath/sers-demo-sersall/app"
  
 

Publish/DevOps/release-bash/startup.bash

@@ -16,7 +16,7 @@ cd $curPath
 
 #----------------------------------------------
 echo "(x.2)get version" 
-export version=`grep '<Version>' $(grep '<pack/>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
+export version=`grep '<Version>' $(grep '<pack>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 echo $version
 
  

Publish/DevOps/release-cmd/30.nuget-pack.bat

@@ -8,7 +8,7 @@ set basePath=%cd%
 set nugetPath=%basePath%/Publish/release/release/nuget
 
 ::(x.2)查找所有需要发布nuget的项目并发布
-for /f "delims=" %%f in ('findstr /M /s /i "<pack/>" *.csproj') do (
+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

Publish/DevOps/release-cmd/72.nuget-push to NugetServer.Sers.bat

@@ -1,17 +0,0 @@
-@echo off 
-
-cd /d ../../release/release/nuget
- 
-for /R %%s in (*.nupkg) do ( 
-echo push %%s 
-dotnet nuget push "%%s"  -k ee28314c-f7fe-2550-bd77-e09eda3d0119  -s http://nuget.sers.cloud:8
-) 
-
-
-cd /d ../../../DevOps/release-cmd
-
-echo %~n0.bat Ö´Ðгɹ¦£¡
-
-pause
-
-:: dotnet nuget delete ServiceAdaptor.NetCore.Sers 1.0.4.75 -k ee28314c-f7fe-2550-bd77-e09eda3d0119  -s http://nuget.sers.cloud --non-interactive

Publish/DevOps/release-cmd/三级版本号-getVersion.bat

@@ -0,0 +1,32 @@
+@echo off
+
+::»ñÈ¡µ±Ç°°æ±¾ºÅ
+
+
+::(x.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
+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
+for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
+
+:: v1 v2 v3
+for /f "tokens=1 delims=." %%i in ("%numVersion%") do set v1=%%i
+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
+::set /a v3=1+%v3%
+set  newVersion=%v1%.%v2%.%v3%-preview
+echo [%version%]-^>[%newVersion%]
+
+
+pause

Publish/DevOps/release-cmd/三级版本号-改为preview版.bat

@@ -1,9 +1,17 @@
 @echo off
 
-::获取当前版本号
+::(x.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
+for /f "tokens=3 delims=><" %%a in ('type %csproj%^|findstr "<Version>.*Version"') do set version=%%a
+
 :: set version=2.1.3
-for /f "tokens=3 delims=><" %%a in ('type ..\..\..\dotnet\Library\Sers\Sers.Core\Sers.Core\Sers.Core.csproj^|findstr "<Version>.*Version"') do set version=%%a
+:: echo  %version%
+
 
+::(x.3)get v1 v2 v3
 for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
 
 :: v1 v2 v3
@@ -12,19 +20,23 @@ 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
 :: set /a v3=1+%v3%
-set  newVersion=%v1%.%v2%.%v3%-preview
+set newVersion=%v1%.%v2%.%v3%-preview
+:: echo %newVersion%
+
 
  
+::(x.5)调用工具 替换csproj文件中的版本号
 echo 自动修改版本号 [%version%]-^>[%newVersion%]
 echo.
 
-:: 调用工具 替换csproj文件中的版本号
-VsTool.exe replace -r --path "..\..\..\dotnet" --file "*.csproj" --old "%version%" --new "%newVersion%"
-VsTool.exe replace -r --path "..\..\..\dotnet" --file "packages.config" --old "%version%" --new "%newVersion%"
+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%"
+
 
-:: 调用工具 替换docker镜像命令中的版本号
-VsTool.exe replace -r --path "..\..\..\Publish\ReleaseFile\docker-image" --file "*.txt" --old "%version%" --new "%newVersion%"
+::(x.6)调用工具 替换docker镜像命令中的版本号
+VsTool.exe replace -r --path "..\..\..\Publish\ReleaseFile\docker-image" --file "*.md" --old "%version%" --new "%newVersion%"
 
 
 echo.

Publish/DevOps/release-cmd/三级版本号-改为release版.bat

@@ -1,9 +1,17 @@
 @echo off
 
-::获取当前版本号
+::(x.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
+for /f "tokens=3 delims=><" %%a in ('type %csproj%^|findstr "<Version>.*Version"') do set version=%%a
+
 :: set version=2.1.3
-for /f "tokens=3 delims=><" %%a in ('type ..\..\..\dotnet\Library\Sers\Sers.Core\Sers.Core\Sers.Core.csproj^|findstr "<Version>.*Version"') do set version=%%a
+:: echo  %version%
 
+
+::(x.3)get v1 v2 v3
 for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
 
 :: v1 v2 v3
@@ -12,19 +20,20 @@ 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
 :: set /a v3=1+%v3%
-set  newVersion=%v1%.%v2%.%v3%
+set newVersion=%v1%.%v2%.%v3%
+:: echo %newVersion%
+echo [%version%]-^>[%newVersion%]
 
  
-echo 自动修改版本号 [%version%]-^>[%newVersion%]
-echo.
+::(x.5)调用工具 替换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%"
 
-:: 调用工具 替换csproj文件中的版本号
-VsTool.exe replace -r --path "..\..\..\dotnet" --file "*.csproj" --old "%version%" --new "%newVersion%"
-VsTool.exe replace -r --path "..\..\..\dotnet" --file "packages.config" --old "%version%" --new "%newVersion%"
 
-:: 调用工具 替换docker镜像命令中的版本号
-VsTool.exe replace -r --path "..\..\..\Publish\ReleaseFile\docker-image" --file "*.txt" --old "%version%" --new "%newVersion%"
+::(x.6)调用工具 替换docker镜像命令中的版本号
+VsTool.exe replace -r --path "..\..\..\Publish\ReleaseFile\docker-image" --file "*.md" --old "%version%" --new "%newVersion%"
 
 
 echo.

Publish/DevOps/release-cmd/三级版本号-改为下一temp版.bat

@@ -1,9 +1,17 @@
 @echo off
 
-::获取当前版本号
+::(x.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
+for /f "tokens=3 delims=><" %%a in ('type %csproj%^|findstr "<Version>.*Version"') do set version=%%a
+
 :: set version=2.1.3
-for /f "tokens=3 delims=><" %%a in ('type ..\..\..\dotnet\Library\Sers\Sers.Core\Sers.Core\Sers.Core.csproj^|findstr "<Version>.*Version"') do set version=%%a
+:: echo  %version%
+
 
+::(x.3)get v1 v2 v3
 for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
 
 :: v1 v2 v3
@@ -12,19 +20,23 @@ 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
 set /a v3=1+%v3%
-set  newVersion=%v1%.%v2%.%v3%-temp
+set newVersion=%v1%.%v2%.%v3%-temp
+:: echo %newVersion%
+
 
  
+::(x.5)调用工具 替换csproj文件中的版本号
 echo 自动修改版本号 [%version%]-^>[%newVersion%]
 echo.
 
-:: 调用工具 替换csproj文件中的版本号
-VsTool.exe replace -r --path "..\..\..\dotnet" --file "*.csproj" --old "%version%" --new "%newVersion%"
-VsTool.exe replace -r --path "..\..\..\dotnet" --file "packages.config" --old "%version%" --new "%newVersion%"
+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%"
+
 
-:: 调用工具 替换docker镜像命令中的版本号
-VsTool.exe replace -r --path "..\..\..\Publish\ReleaseFile\docker-image" --file "*.txt" --old "%version%" --new "%newVersion%"
+::(x.6)调用工具 替换docker镜像命令中的版本号
+VsTool.exe replace -r --path "..\..\..\Publish\ReleaseFile\docker-image" --file "*.md" --old "%version%" --new "%newVersion%"
 
 
 echo.

Publish/ReleaseFile/docker-deploy/sers-cgateway/docker部署cgateway.txt → Publish/ReleaseFile/docker-deploy/sers-cgateway/docker部署cgateway.md

@@ -1,4 +1,4 @@
-docker部署sers-cgateway
+#docker部署sers-cgateway
 
 
 ---------------------------------

Publish/ReleaseFile/docker-deploy/sers-demo-robot/docker部署sers-demo-robot.txt → Publish/ReleaseFile/docker-deploy/sers-demo-robot/docker部署sers-demo-robot.md

@@ -1,4 +1,4 @@
-docker部署sers-demo-robot
+#docker部署sers-demo-robot
 
  
 

Publish/ReleaseFile/docker-deploy/sers-demo-sersall/docker部署sers-demo-sersall.txt → Publish/ReleaseFile/docker-deploy/sers-demo-sersall/docker部署sers-demo-sersall.md

@@ -1,4 +1,4 @@
-docker部署sers-demo-sersall
+#docker部署sers-demo-sersall
  
 ---------------------------------
 #(x.1)文件

Publish/ReleaseFile/docker-deploy/sers-demo/docker部署sers-demo.txt → Publish/ReleaseFile/docker-deploy/sers-demo/docker部署sers-demo.md

@@ -1,4 +1,4 @@
-docker部署sers-demo
+#docker部署sers-demo
 
 
 ---------------------------------

Publish/ReleaseFile/docker-deploy/sers-gateway/docker部署sers-gateway.txt → Publish/ReleaseFile/docker-deploy/sers-gateway/docker部署sers-gateway.md

@@ -1,4 +1,4 @@
-docker部署sers-gateway
+#docker部署sers-gateway
 
  
 

Publish/ReleaseFile/docker-deploy/sers-gover/docker部署sers-gover.txt → Publish/ReleaseFile/docker-deploy/sers-gover/docker部署sers-gover.md

@@ -1,4 +1,4 @@
-docker部署sers-gover
+#docker部署sers-gover
  
 
 ---------------------------------

Publish/ReleaseFile/docker-deploy/sers/docker部署sers.txt → Publish/ReleaseFile/docker-deploy/sers/docker部署sers.md

@@ -1,4 +1,4 @@
-docker部署sers-servicecenter
+#docker部署sers-servicecenter
 
  
 

Publish/ReleaseFile/docker-image/docker导入导出镜像.txt → Publish/ReleaseFile/docker-image/docker导入导出镜像.md

@@ -1,5 +1,5 @@
 #导出镜像
-tag=2.1.8
+tag=2.1.9
 
 docker save -o /root/image/dotnet.2.1.tar serset/dotnet:2.1
 docker save -o /root/image/sers-cgateway-1.2.0.tar serset/sers-cgateway:1.2.0

Publish/ReleaseFile/docker-image/制作镜像Sers.txt → Publish/ReleaseFile/docker-image/制作镜像Sers.md

@@ -37,7 +37,7 @@ cd /root/image
 
 
 #构建镜像并推送到 Docker Hub 
-export tag=2.1.8
+export tag=2.1.9
 
 cd sers
 docker buildx build . -t serset/sers:${tag} -t serset/sers --platform=linux/amd64,linux/arm64,linux/arm/v7 --push

dotnet/Gateway/App.Gateway/App.Gateway.csproj

@@ -2,12 +2,13 @@
 
 	<PropertyGroup>
 		<publish>Gateway</publish>
+		<docker>sers-gateway</docker>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
 	</PropertyGroup>
 

dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Doc/Sers.CL.Ipc.NamedPipe-额外命名管道/Sers.CL.Ipc.NamedPipe.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.8</Version>
+    <Version>2.1.9</Version>
     <Description>https://github.com/serset/Sers</Description>
   </PropertyGroup>
 

dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Sers.CL.Ipc.NamedPipe.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<pack/>
+		<pack>nuget</pack>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.SharedMemory/Sers.CL.Ipc.SharedMemory.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Sers.CL.Socket.Iocp.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<pack/>
+		<pack>nuget</pack>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.ThreadWait/Sers.CL.Socket.ThreadWait.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<pack/>
+		<pack>nuget</pack>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.CL/WebSocket/Sers.CL.WebSocket/Sers.CL.WebSocket.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<pack/>
+		<pack>nuget</pack>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.CL/Zmq/FullDuplex/Sers.CL.Zmq.FullDuplex/Sers.CL.Zmq.FullDuplex.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.CL/Zmq/ThreadWait/Sers.CL.ClrZmq.ThreadWait/Sers.CL.ClrZmq.ThreadWait.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core.Temp.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.8</Version>
+    <Version>2.1.9</Version>
   </PropertyGroup>
   
   <PropertyGroup>

dotnet/Library/Sers/Sers.Core/Sers.Core/Sers.Core.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<pack/>
+		<pack>nuget</pack>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.Gateway/Sers.Gateway/Sers.Gateway.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<pack/>
+		<pack>nuget</pack>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.Hardware/Sers.Hardware/Sers.Hardware.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<pack/>
+		<pack>nuget</pack>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.Serslot/Sers.Serslot/Sers.Serslot.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<pack/>
+		<pack>nuget</pack>
 	</PropertyGroup>
 
 	<PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.ServiceStation/Sers.ServiceStation/Sers.ServiceStation.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<pack/>
+		<pack>nuget</pack>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Vit/Vit.Core/Vit.Core/Vit.Core.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<pack/>
+		<pack>nuget</pack>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Vit/Vit.Net.Http.FormFile/Vit.Net.Http.FormFile.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<pack/>
+		<pack>nuget</pack>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Vit/Vit.WebHost/Vit.WebHost.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<pack/>
+		<pack>nuget</pack>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/ServiceCenter/App.Gover.Gateway/App.Gover.Gateway.csproj

@@ -2,12 +2,13 @@
 
 	<PropertyGroup>
 		<publish>Gover</publish>
+		<docker>sers-gover</docker>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
 	</PropertyGroup>
 

dotnet/ServiceCenter/App.ServiceCenter.NetFx/App.ServiceCenter.NetFx/App.ServiceCenter.NetFx.csproj

@@ -45,29 +45,29 @@
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.CL.Ipc.NamedPipe, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.CL.Ipc.NamedPipe.2.1.8\lib\netstandard2.0\Sers.CL.Ipc.NamedPipe.dll</HintPath>
+    <Reference Include="Sers.CL.Ipc.NamedPipe, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.CL.Ipc.NamedPipe.2.1.9-temp\lib\netstandard2.0\Sers.CL.Ipc.NamedPipe.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.CL.Socket.Iocp, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.CL.Socket.Iocp.2.1.8\lib\netstandard2.0\Sers.CL.Socket.Iocp.dll</HintPath>
+    <Reference Include="Sers.CL.Socket.Iocp, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.CL.Socket.Iocp.2.1.9-temp\lib\netstandard2.0\Sers.CL.Socket.Iocp.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.CL.Socket.ThreadWait, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.CL.Socket.ThreadWait.2.1.8\lib\netstandard2.0\Sers.CL.Socket.ThreadWait.dll</HintPath>
+    <Reference Include="Sers.CL.Socket.ThreadWait, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.CL.Socket.ThreadWait.2.1.9-temp\lib\netstandard2.0\Sers.CL.Socket.ThreadWait.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.CL.WebSocket, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.CL.WebSocket.2.1.8\lib\netstandard2.0\Sers.CL.WebSocket.dll</HintPath>
+    <Reference Include="Sers.CL.WebSocket, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.CL.WebSocket.2.1.9-temp\lib\netstandard2.0\Sers.CL.WebSocket.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.Core, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.Core.2.1.8\lib\netstandard2.0\Sers.Core.dll</HintPath>
+    <Reference Include="Sers.Core, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.Core.2.1.9-temp\lib\netstandard2.0\Sers.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.Gover, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.Gover.2.1.8\lib\netstandard2.0\Sers.Gover.dll</HintPath>
+    <Reference Include="Sers.Gover, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.Gover.2.1.9-temp\lib\netstandard2.0\Sers.Gover.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.Hardware, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.Hardware.2.1.8\lib\netstandard2.0\Sers.Hardware.dll</HintPath>
+    <Reference Include="Sers.Hardware, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.Hardware.2.1.9-temp\lib\netstandard2.0\Sers.Hardware.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.ServiceCenter, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.ServiceCenter.2.1.8\lib\netstandard2.0\Sers.ServiceCenter.dll</HintPath>
+    <Reference Include="Sers.ServiceCenter, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.ServiceCenter.2.1.9-temp\lib\netstandard2.0\Sers.ServiceCenter.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -80,8 +80,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="Vit.Core, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Vit.Core.2.1.8\lib\netstandard2.0\Vit.Core.dll</HintPath>
+    <Reference Include="Vit.Core, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Vit.Core.2.1.9-temp\lib\netstandard2.0\Vit.Core.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

dotnet/ServiceCenter/App.ServiceCenter.NetFx/App.ServiceCenter.NetFx/packages.config

@@ -4,14 +4,14 @@
   <package id="Microsoft.DotNet.PlatformAbstractions" version="2.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.DependencyModel" version="2.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
-  <package id="Sers.CL.Ipc.NamedPipe" version="2.1.8" targetFramework="net461" />
-  <package id="Sers.CL.Socket.Iocp" version="2.1.8" targetFramework="net461" />
-  <package id="Sers.CL.Socket.ThreadWait" version="2.1.8" targetFramework="net461" />
-  <package id="Sers.CL.WebSocket" version="2.1.8" targetFramework="net461" />
-  <package id="Sers.Core" version="2.1.8" targetFramework="net461" />
-  <package id="Sers.Gover" version="2.1.8" targetFramework="net461" />
-  <package id="Sers.Hardware" version="2.1.8" targetFramework="net461" />
-  <package id="Sers.ServiceCenter" version="2.1.8" targetFramework="net461" />
+  <package id="Sers.CL.Ipc.NamedPipe" version="2.1.9" targetFramework="net461" />
+  <package id="Sers.CL.Socket.Iocp" version="2.1.9" targetFramework="net461" />
+  <package id="Sers.CL.Socket.ThreadWait" version="2.1.9" targetFramework="net461" />
+  <package id="Sers.CL.WebSocket" version="2.1.9" targetFramework="net461" />
+  <package id="Sers.Core" version="2.1.9" targetFramework="net461" />
+  <package id="Sers.Gover" version="2.1.9" targetFramework="net461" />
+  <package id="Sers.Hardware" version="2.1.9" targetFramework="net461" />
+  <package id="Sers.ServiceCenter" version="2.1.9" targetFramework="net461" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
-  <package id="Vit.Core" version="2.1.8" targetFramework="net461" />
+  <package id="Vit.Core" version="2.1.9" targetFramework="net461" />
 </packages>

dotnet/ServiceCenter/App.ServiceCenter/App.ServiceCenter.csproj

@@ -2,12 +2,13 @@
 
 	<PropertyGroup>
 		<publish>ServiceCenter</publish>
+		<docker>sers</docker>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
 	</PropertyGroup>
 

dotnet/ServiceCenter/Sers.ServiceCenter/Apm/Sers.Gover.Apm.Txt/Sers.Gover.Apm.Txt.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/ServiceCenter/Sers.ServiceCenter/Apm/Sers.Gover.Apm.Zipkin/Sers.Gover.Apm.Zipkin.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/ServiceCenter/Sers.ServiceCenter/Sers.Gover/Sers.Gover.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<pack/>
+		<pack>nuget</pack>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	
 	<PropertyGroup>
-		<pack/>
+		<pack>nuget</pack>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/ServiceStation/Demo/SersLoader/Did.SersLoader.Demo/Did.SersLoader.Demo.csproj

@@ -2,12 +2,13 @@
 
 	<PropertyGroup>
 		<publish>Demo</publish>
+		<docker>sers-demo</docker>
 	</PropertyGroup>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.8</Version>
+    <Version>2.1.9</Version>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <Description>https://github.com/serset/Sers</Description>
   </PropertyGroup>

dotnet/ServiceStation/Demo/SersLoader/Did.SersLoader.HelloWorld/Did.SersLoader.HelloWorld.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.8</Version>
+    <Version>2.1.9</Version>
     <Description>https://github.com/serset/Sers</Description>
   </PropertyGroup>
 

dotnet/ServiceStation/Demo/Serslot/Did.Serslot.Demo/appsettings.json

@@ -56,7 +56,7 @@
 
 
       /* 超时时间，若不指定则后台任务永不超时。（主动关闭超过此时间的任务,实际任务强制关闭的时间会在1倍超时时间到2倍超时时间内)。单位：ms。*/
-      //"timeout_ms": 300000,
+      "//timeout_ms": 300000,
 
 
       /* 是否 输出本地Api的调用信息到（ApiTrace）Log文件。默认:false */
@@ -89,7 +89,7 @@
 
 
       /* 默认站点名称，可多个,可不指定 */
-      //"apiStationNames": [ "demo" ],
+      "//apiStationNames": [ "demo" ],
 
       /* Api加载器配置 */
       "//ApiLoaders": [
@@ -186,7 +186,7 @@
         "serviceStationName": "SerslotDemo",
 
         /* 服务站点版本信息,若不指定则为入口链接库的版本号 */
-        //"stationVersion": "1.1.9.0",
+        "//stationVersion": "1.1.9.0",
 
         /* [json]服务站点额外信息,可不指定 */
         "info": null
@@ -225,7 +225,7 @@
     /* 处理请求转发的模式,可不指定。可为 Async(默认)、BackgroundTask */
     /* Async 异步转发请求，没有线程数量限制。此模式下extApi的reply无效。 */
     /* BackgroundTask 启动固定数量的线程转发请求，线程数量为Sers.LocalApiService.workThreadCount。 */
-    //"Mode": "BackgroundTask",
+    "//Mode": "BackgroundTask",
 
     /* 额外api。SsApiDesc格式。除了系统api外，可以指定额外api。若指定返回数据（reply）,则直接返回数据；若不指定返回数据，则由host进行处理 */
     "//extApi": [

dotnet/ServiceStation/Demo/Serslot/Did.Serslot.HelloWorld60/Startup.cs

@@ -21,14 +21,36 @@ namespace Did.Serslot.HelloWorld
         public void ConfigureServices(IServiceCollection services)
         {
 
-            services.AddControllers().AddJsonOptions(options =>
+            services.AddControllers()
+                .AddJsonOptions(options =>
             {
+                //Json序列化全局配置
+#if NETCOREAPP3_0_OR_GREATER
+
                 options.JsonSerializerOptions.AddConverter_Newtonsoft();
                 options.JsonSerializerOptions.AddConverter_DateTime();
 
-                options.JsonSerializerOptions.Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All);
+
                 options.JsonSerializerOptions.IncludeFields = true;
+
+                //JsonNamingPolicy.CamelCase首字母小写（默认）,null则为不改变大小写
+                options.JsonSerializerOptions.PropertyNamingPolicy = null;
+                //取消Unicode编码 
+                options.JsonSerializerOptions.Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All);
+                //忽略空值
                 options.JsonSerializerOptions.DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull;
+                //options.JsonSerializerOptions.IgnoreNullValues = true;
+                //允许额外符号
+                options.JsonSerializerOptions.AllowTrailingCommas = true;
+
+#else
+
+                //忽略循环引用
+                options.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore;
+
+                //不更改元数据的key的大小写
+                options.SerializerSettings.ContractResolver = new Newtonsoft.Json.Serialization.DefaultContractResolver();
+#endif
             });
 
         }

dotnet/ServiceStation/Demo/StressTest/App.Robot.Station/App.Robot.Station.csproj

@@ -2,13 +2,14 @@
 
 	<PropertyGroup>
 		<publish>Robot</publish>
+		<docker>sers-demo-robot</docker>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
 		<RunPostBuildEvent>Always</RunPostBuildEvent>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 		<Description>https://github.com/serset/Sers</Description>
 	</PropertyGroup>