dotnet/Doc/DevOps/github/31.nuget-push.sh

@@ -29,7 +29,7 @@ do
     echo nuget push \$file
     dotnet nuget push \$file -k ${NUGET_KEY} -s ${NUGET_SERVER}
 done
-" 
+" || true
 
 
  

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

@@ -16,7 +16,7 @@ export codePath=/root/temp/svn/dotnet
 echo "(x.2)publish netcoreapp2.1"
 
 export netVersion=netcoreapp2.1 
-bash $codePath/Doc/DevOps/github/41.dotnet-publish-by-netVersion.sh;
+bash $codePath/Doc/DevOps/github/41.dotnet-publish-by-netVersion.bash;
 
 
 
@@ -29,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 $codePath/Doc/DevOps/github/41.dotnet-publish-by-netVersion.sh;
+bash $codePath/Doc/DevOps/github/41.dotnet-publish-by-netVersion.bash;
 
 
 #修改csproj文件中的版本号为2.1

dotnet/Doc/DevOps/github/70.docker-build.sh

@@ -20,35 +20,37 @@ netVersion=net6.0
 #---------------------------------------------------------------------
 echo "(x.2)dotnet-构建项目文件"
 
-echo "copy SersDocker
+echo "copy SersDocker"
 cp -rf "$codePath/Doc/PublishFile/SersDocker/." "$codePath/Doc/Publish/SersDocker"
 
 echo "copy sers"
-cp -rf "$codePath/Doc/SersPublish/$netVersion/ServiceCenter/appsettings.json" "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers"
-cp -rf "$codePath/Doc/SersPublish/$netVersion/ServiceCenter/." "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers/app"
+cp -rf "$codePath/Doc/Publish/SersPublish/$netVersion/ServiceCenter/appsettings.json" "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers"
+cp -rf "$codePath/Doc/Publish/SersPublish/$netVersion/ServiceCenter/." "$codePath/Doc/Publish/SersDocker/docker制作镜像Sers/sers/app"
 
 
-echo "copy sers-demo"
-cp -rf "$codePath/Doc/SersPublish/$netVersion/Demo/appsettings.json" "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers-demo"
-cp -rf "$codePath/Doc/SersPublish/$netVersion/Demo/." "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers-demo/app" 
-
-echo "copy sers-demo-robot"
-cp -rf "$codePath/Doc/SersPublish/$netVersion/Robot/appsettings.json" "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers-demo-robot"
-cp -rf "$codePath/Doc/SersPublish/$netVersion/Robot/." "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers-demo-robot/app"
-
 echo "copy sers-gateway"
-cp -rf "$codePath/Doc/SersPublish/$netVersion/Gateway/appsettings.json" "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers-gateway"
-cp -rf "$codePath/Doc/SersPublish/$netVersion/Gateway/." "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers-gateway/app"
+cp -rf "$codePath/Doc/Publish/SersPublish/$netVersion/Gateway/appsettings.json" "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers-gateway"
+cp -rf "$codePath/Doc/Publish/SersPublish/$netVersion/Gateway/." "$codePath/Doc/Publish/SersDocker/docker制作镜像Sers/sers-gateway/app"
 
 echo "copy sers-gover"
-cp -rf "$codePath/Doc/SersPublish/$netVersion/Gover/appsettings.json" "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers-gover"
-cp -rf "$codePath/Doc/SersPublish/$netVersion/Gover/." "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers-gover/app"
+cp -rf "$codePath/Doc/Publish/SersPublish/$netVersion/Gover/appsettings.json" "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers-gover"
+cp -rf "$codePath/Doc/Publish/SersPublish/$netVersion/Gover/." "$codePath/Doc/Publish/SersDocker/docker制作镜像Sers/sers-gover/app"
+
+
+
+echo "copy sers-demo"
+cp -rf "$codePath/Doc/Publish/SersPublish/$netVersion/Demo/appsettings.json" "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers-demo"
+cp -rf "$codePath/Doc/Publish/SersPublish/$netVersion/Demo/." "$codePath/Doc/Publish/SersDocker/docker制作镜像Sers/sers-demo/app" 
+
+echo "copy sers-demo-robot"
+cp -rf "$codePath/Doc/Publish/SersPublish/$netVersion/Robot/appsettings.json" "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers-demo-robot"
+cp -rf "$codePath/Doc/Publish/SersPublish/$netVersion/Robot/." "$codePath/Doc/Publish/SersDocker/docker制作镜像Sers/sers-demo-robot/app"
 
 
-echo "copy sers-demo-sersall" 
-xcopy  "Sers压测\sers压测-单体压测%netVersion%\ServiceCenter\appsettings.json" "SersDocker\docker部署Sers\sers-demo-sersall" 
-xcopy  "Sers压测\sers压测-单体压测%netVersion%\ServiceCenter" "SersDocker\docker制作镜像Sers\sers-demo-sersall\app" /e /i /r /y
 
+echo "copy sers-demo-sersall"
+cp -rf "$codePath/Doc/Publish/Sers压测/sers压测-单体压测$netVersion/ServiceCenter/appsettings.json" "$codePath/Doc/Publish/SersDocker/docker部署Sers/sers-demo-sersall"
+cp -rf "$codePath/Doc/Publish/Sers压测/sers压测-单体压测$netVersion/ServiceCenter" "$codePath/Doc/Publish/SersDocker/docker制作镜像Sers/sers-demo-sersall/app"
 
 
 
@@ -84,9 +86,9 @@ docker buildx ls
 #---------------------------------------------------------------------
 #(x.3.2)docker-构建多架构镜像（ arm、arm64 和 amd64 ）并推送到 Docker Hub
 
-docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+#docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
 
-docker buildx build $codePath/Publish/06.Docker/制作镜像/$name -t $DOCKER_USERNAME/$name:$version -t $DOCKER_USERNAME/$name --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
+#docker buildx build $codePath/Publish/06.Docker/制作镜像/$name -t $DOCKER_USERNAME/$name:$version -t $DOCKER_USERNAME/$name --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
  
 
 

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

@@ -28,30 +28,30 @@ mkdir -p $codePath/Doc/Publish/release/${name}-${version}
  
 
 echo 1.创建 nuget-Sers
-/cp -rf  $codePath/Doc/Publish/nuget $codePath/Doc/Publish/release/${name}-${version}/nuget
+\cp -rf  $codePath/Doc/Publish/nuget/. $codePath/Doc/Publish/release/${name}-${version}/nuget
 
 echo 2.创建 SersPublish
-/cp -rf  $codePath/Doc/Publish/SersPublish $codePath/Doc/Publish/release/${name}-${version}/SersPublish
+\cp -rf  $codePath/Doc/Publish/SersPublish/. $codePath/Doc/Publish/release/${name}-${version}/SersPublish
 
 echo 3.创建 CL压测
-/cp -rf  $codePath/Doc/Publish/CL压测 $codePath/Doc/Publish/release/${name}-${version}/CL压测
+\cp -rf  $codePath/Doc/Publish/CL压测/. $codePath/Doc/Publish/release/${name}-${version}/CL压测
 
 echo 4.创建 Sers压测
-/cp -rf  $codePath/Doc/Publish/Sers压测 $codePath/Doc/Publish/release/${name}-${version}/Sers压测
+\cp -rf  $codePath/Doc/Publish/Sers压测/. $codePath/Doc/Publish/release/${name}-${version}/Sers压测
 
 echo 5.创建 docker制作镜像Sers
-/cp -rf  $codePath/Doc/Publish/SersDocker/docker制作镜像Sers $codePath/Doc/Publish/release/${name}-${version}/docker制作镜像Sers
+\cp -rf  $codePath/Doc/Publish/SersDocker/docker制作镜像Sers/. $codePath/Doc/Publish/release/${name}-${version}/docker制作镜像Sers
 
 echo 6.创建 docker部署Sers
-/cp -rf  $codePath/Doc/Publish/SersDocker/docker部署Sers $codePath/Doc/Publish/release/${name}-${version}/docker部署Sers
+\cp -rf  $codePath/Doc/Publish/SersDocker/docker部署Sers/. $codePath/Doc/Publish/release/${name}-${version}/docker部署Sers
 
 
 
 
 echo "(x.2.3)发布文件-压缩" 
 docker run --rm -i \
--v $codePath/Publish:/root/file \
-serset/filezip dotnet FileZip.dll zip -i /root/file/Doc/Publish/release/${name}-${version} -o /root/file/Doc/Publish/release/${name}-${version}.zip
+-v $codePath:/root/file \
+serset/filezip dotnet FileZip.dll zip -p -i /root/file/Doc/Publish/release/${name}-${version} -o /root/file/Doc/Publish/release/${name}-${version}.zip
 
 
 

dotnet/Doc/DevOps/github/startup.sh

@@ -1,5 +1,7 @@
 set -e
 
+# cd /root/temp/svn/dotnet/Doc/DevOps/github;bash startup.sh;
+
 #----------------------------------------------
 #(x.1)当前路径 
 curWorkDir=$PWD
@@ -43,7 +45,9 @@ for file in *.sh
 do
     if [[ $file != "startup.sh" ]]
     then
-        sh $file
+        echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+        echo bash $file
+        bash $file
     fi
 done
 

dotnet/Doc/cmd/docker-build.bat

@@ -11,6 +11,16 @@ xcopy  "SersPublish\%netVersion%\ServiceCenter\appsettings.json" "SersDocker\doc
 xcopy  "SersPublish\%netVersion%\ServiceCenter" "SersDocker\docker秶釬噩砉Sers\sers\app" /e /i /r /y
 
 
+@echo "copy sers-gateway"
+xcopy  "SersPublish\%netVersion%\Gateway\appsettings.json" "SersDocker\docker窒扰Sers\sers-gateway" 
+xcopy  "SersPublish\%netVersion%\Gateway" "SersDocker\docker秶釬噩砉Sers\sers-gateway\app" /e /i /r /y
+
+
+@echo "copy sers-gover"
+xcopy  "SersPublish\%netVersion%\Gover\appsettings.json" "SersDocker\docker窒扰Sers\sers-gover" 
+xcopy  "SersPublish\%netVersion%\Gover" "SersDocker\docker秶釬噩砉Sers\sers-gover\app" /e /i /r /y
+
+
 @echo "copy sers-demo"
 xcopy  "SersPublish\%netVersion%\Demo\appsettings.json" "SersDocker\docker窒扰Sers\sers-demo" 
 xcopy  "SersPublish\%netVersion%\Demo" "SersDocker\docker秶釬噩砉Sers\sers-demo\app" /e /i /r /y
@@ -19,21 +29,13 @@ xcopy  "SersPublish\%netVersion%\Demo" "SersDocker\docker
 xcopy  "SersPublish\%netVersion%\Robot\appsettings.json" "SersDocker\docker窒扰Sers\sers-demo-robot" 
 xcopy  "SersPublish\%netVersion%\Robot" "SersDocker\docker秶釬噩砉Sers\sers-demo-robot\app" /e /i /r /y
 
+
 @echo "copy sers-demo-sersall"
 xcopy  "Sers揤聆\sers揤聆-等极揤聆%netVersion%\ServiceCenter\appsettings.json" "SersDocker\docker窒扰Sers\sers-demo-sersall" 
 xcopy  "Sers揤聆\sers揤聆-等极揤聆%netVersion%\ServiceCenter" "SersDocker\docker秶釬噩砉Sers\sers-demo-sersall\app" /e /i /r /y
 
 
 
-@echo "copy sers-gateway"
-xcopy  "SersPublish\%netVersion%\Gateway\appsettings.json" "SersDocker\docker窒扰Sers\sers-gateway" 
-xcopy  "SersPublish\%netVersion%\Gateway" "SersDocker\docker秶釬噩砉Sers\sers-gateway\app" /e /i /r /y
-
-@echo "copy sers-gover"
-xcopy  "SersPublish\%netVersion%\Gover\appsettings.json" "SersDocker\docker窒扰Sers\sers-gover" 
-xcopy  "SersPublish\%netVersion%\Gover" "SersDocker\docker秶釬噩砉Sers\sers-gover\app" /e /i /r /y
-
-
 cd /d ../cmd