lith пре 3 година
родитељ
комит
a2ed97ed7b

+ 14 - 14
.github/workflows/action-main.yml

@@ -63,7 +63,7 @@ jobs:
         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_name: Sers-ServiceCenter-net5.0-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -72,7 +72,7 @@ jobs:
         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_name: Sers-ServiceCenter-net6.0-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -81,7 +81,7 @@ jobs:
         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_name: Sers-ServiceCenter-netcoreapp2.1-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -90,7 +90,7 @@ jobs:
         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_name: Sers-ServiceCenter-netcoreapp2.2-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -99,7 +99,7 @@ jobs:
         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_name: Sers-ServiceCenter-netcoreapp3.0-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -108,7 +108,7 @@ jobs:
         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_name: Sers-ServiceCenter-netcoreapp3.1-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -117,7 +117,7 @@ jobs:
         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_name: Sers-Station-net5.0-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -126,7 +126,7 @@ jobs:
         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_name: Sers-Station-net6.0-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -135,7 +135,7 @@ jobs:
         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_name: Sers-Station-netcoreapp2.1-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -144,7 +144,7 @@ jobs:
         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_name: Sers-Station-netcoreapp2.2-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -153,7 +153,7 @@ jobs:
         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_name: Sers-Station-netcoreapp3.0-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -162,7 +162,7 @@ jobs:
         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_name: Sers-Station-netcoreapp3.1-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
       - uses: actions/upload-release-asset@v1
@@ -197,6 +197,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/Sers-压测-${{ env.release_version }}.zip
-          asset_name: Sers-压测-${{ env.release_version }}.zip
+          asset_path: ${{ env.release_dirPath }}/Sers-StressTest-${{ env.release_version }}.zip
+          asset_name: Sers-StressTest-${{ env.release_version }}.zip
           asset_content_type: application/zip

+ 6 - 6
Publish/DevOps/release-bash/41.压测-copy.sh → Publish/DevOps/release-bash/41.StressTest-copy.sh

@@ -12,7 +12,7 @@ export basePath=/root/temp/svn
 
 #---------------------------------------------------------------------
 #(x.2)
-publishPath=$basePath/Publish/release/release/压测
+publishPath=$basePath/Publish/release/release/StressTest
 mkdir -p $publishPath
 
 
@@ -31,15 +31,15 @@ set -e
 echo 'publish Client'
 cd /root/code/dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient
 dotnet build --configuration Release
-dotnet publish --configuration Release --output /root/code/Publish/release/release/压测/CL压测netcoreapp2.1/CmClient
+dotnet publish --configuration Release --output /root/code/Publish/release/release/StressTest/CL压测netcoreapp2.1/CmClient
 
 echo 'publish Server'
 cd /root/code/dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmServer
 dotnet build --configuration Release
-dotnet publish --configuration Release --output /root/code/Publish/release/release/压测/CL压测netcoreapp2.1/CmServer
+dotnet publish --configuration Release --output /root/code/Publish/release/release/StressTest/CL压测netcoreapp2.1/CmServer
 
 echo 'copy bat'
-\cp -rf /root/code/Publish/ReleaseFile/压测/CL压测/. /root/code/Publish/release/release/压测/CL压测netcoreapp2.1
+\cp -rf /root/code/Publish/ReleaseFile/StressTest/CL压测/. /root/code/Publish/release/release/StressTest/CL压测netcoreapp2.1
 
 " 
 
@@ -75,7 +75,7 @@ do
 	\cp -rf $appPath/Robot/App.Robot.Station.xml $targetPath/ServiceCenter 
 
 	echo "(x.x.4)copy ReleaseFile"
-	\cp -rf $basePath/Publish/ReleaseFile/压测/单体压测/. $targetPath
+	\cp -rf $basePath/Publish/ReleaseFile/StressTest/单体压测/. $targetPath
 
 
 
@@ -91,7 +91,7 @@ do
 	\cp -rf $appPath/Robot $targetPath
 
 	echo "(x.x.2)copy ReleaseFile"
-	\cp -rf $basePath/Publish/ReleaseFile/压测/分布式压测/. $targetPath
+	\cp -rf $basePath/Publish/ReleaseFile/StressTest/分布式压测/. $targetPath
 
 done
 

+ 4 - 4
Publish/DevOps/release-cmd/41.压测-copy.bat → Publish/DevOps/release-cmd/41.StressTest-copy.bat

@@ -14,7 +14,7 @@ set basePath=%cd%
 
 
 ::(x.2)
-set publishPath=%basePath%/Publish/release/release/箕꿎
+set publishPath=%basePath%/Publish/release/release/StressTest
 
 
 
@@ -37,7 +37,7 @@ dotnet publish --configuration Release --output "%publishPath%\CL箕
 
 
 ::copy bat
-xcopy  "%basePath%\Publish\ReleaseFile\箕꿎\CL箕꿎" "%publishPath%\CL箕꿎netcoreapp2.1" /e /i /r /y
+xcopy  "%basePath%\Publish\ReleaseFile\StressTest\CL箕꿎" "%publishPath%\CL箕꿎netcoreapp2.1" /e /i /r /y
 
 
 
@@ -69,7 +69,7 @@ for %%i in (netcoreapp2.1,net6.0) do (
 	xcopy "!appPath!\Robot\App.Robot.Station.xml" "!targetPath!\ServiceCenter" /i /r /y
 
 	::(x.x.4)copy ReleaseFile
-	xcopy "%basePath%\Publish\ReleaseFile\箕꿎\데竟箕꿎" "!targetPath!" /e /i /r /y
+	xcopy "%basePath%\Publish\ReleaseFile\StressTest\데竟箕꿎" "!targetPath!" /e /i /r /y
 
 
 
@@ -82,7 +82,7 @@ for %%i in (netcoreapp2.1,net6.0) do (
 	xcopy "!appPath!\Robot" "!targetPath!\Robot" /e /i /r /y
 
 	::(x.x.2)copy ReleaseFile
-	xcopy  "%basePath%\Publish\ReleaseFile\箕꿎\롸꼈駕箕꿎" "!targetPath!" /e /i /r /y
+	xcopy  "%basePath%\Publish\ReleaseFile\StressTest\롸꼈駕箕꿎" "!targetPath!" /e /i /r /y
 )
 
 

+ 1 - 1
Publish/DevOps/release-cmd/一键发布.bat

@@ -7,7 +7,7 @@ call "40.Station-publish.bat"
 call "40.Station-publish(net5.0).bat"
 call "40.Station-publish(net6.0).bat"
 
-call "41.ѹ²â-copy.bat"
+call "41.StressTest-copy.bat"
 
 echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
 call "50.docker-image-create.bat"

+ 0 - 0
Publish/ReleaseFile/压测/CL压测/StartClient.bat → Publish/ReleaseFile/StressTest/CL压测/StartClient.bat


+ 0 - 0
Publish/ReleaseFile/压测/CL压测/StartServer.bat → Publish/ReleaseFile/StressTest/CL压测/StartServer.bat


+ 0 - 0
Publish/ReleaseFile/压测/echo qps.md → Publish/ReleaseFile/StressTest/echo qps.md


+ 0 - 0
Publish/ReleaseFile/压测/分布式压测/01 ServiceCenter.bat → Publish/ReleaseFile/StressTest/分布式压测/01 ServiceCenter.bat


+ 0 - 0
Publish/ReleaseFile/压测/分布式压测/01 start 4580.bat → Publish/ReleaseFile/StressTest/分布式压测/01 start 4580.bat


+ 0 - 0
Publish/ReleaseFile/压测/分布式压测/04 Demo.bat → Publish/ReleaseFile/StressTest/分布式压测/04 Demo.bat


+ 0 - 0
Publish/ReleaseFile/压测/分布式压测/05 Robot.bat → Publish/ReleaseFile/StressTest/分布式压测/05 Robot.bat


+ 0 - 0
Publish/ReleaseFile/压测/分布式压测/Demo/appsettings.json → Publish/ReleaseFile/StressTest/分布式压测/Demo/appsettings.json


+ 0 - 0
Publish/ReleaseFile/压测/分布式压测/Robot/Data/App.Robot.json → Publish/ReleaseFile/StressTest/分布式压测/Robot/Data/App.Robot.json


+ 0 - 0
Publish/ReleaseFile/压测/分布式压测/Robot/appsettings.json → Publish/ReleaseFile/StressTest/分布式压测/Robot/appsettings.json


+ 0 - 0
Publish/ReleaseFile/压测/分布式压测/ServiceCenter/appsettings.json → Publish/ReleaseFile/StressTest/分布式压测/ServiceCenter/appsettings.json


+ 0 - 0
Publish/ReleaseFile/压测/单体压测/01 ServiceCenter.bat → Publish/ReleaseFile/StressTest/单体压测/01 ServiceCenter.bat


+ 0 - 0
Publish/ReleaseFile/压测/单体压测/01 start 4580.bat → Publish/ReleaseFile/StressTest/单体压测/01 start 4580.bat


+ 0 - 0
Publish/ReleaseFile/压测/单体压测/ServiceCenter/Data/App.Robot.json → Publish/ReleaseFile/StressTest/单体压测/ServiceCenter/Data/App.Robot.json


+ 0 - 0
Publish/ReleaseFile/压测/单体压测/ServiceCenter/appsettings.json → Publish/ReleaseFile/StressTest/单体压测/ServiceCenter/appsettings.json