Fix bad routes in WeChatPayController

EasyAbp · Mar 15, 2023 · 29de754 · 29de754
1 parent 0d78dfe
commit 29de754
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,7 +6,7 @@ on:
       - main
 jobs:
   publish:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: NuGet/setup-nuget@v1
@@ -35,39 +35,40 @@ jobs:
         run: dotnet build -c Release
 
 #      - name: dotnet test
-#        run: dotnet test --no-restore --no-build
+#        run: dotnet test -c Release --no-restore --no-build
 
       - name: dotnet pack
-        run: dotnet pack -c Release --no-build -o dest
+        run: dotnet pack -c Release --no-build --property PackageOutputPath=${{ github.workspace }}/nugetPackages/
 
       - name: remove unused packages
         run: |
-          cd dest
-          del * -Exclude EasyAbp.*
-          del * -Exclude *.${{ steps.getVersion.outputs.first_match }}.nupkg
-          del *.Blazor.Host.*
-          del *.Blazor.Server.Host.*
-          del *.Host.Shared.*
-          del *.HttpApi.Host.*
-          del *.IdentityServer.*
-          del *.AuthServer.*
-          del *.Web.Host.*
-          del *.Web.Unified.*
-          del *.HttpApi.Client.ConsoleTestApp.*
-          del *.Tests.*
-          del *.TestBase.*
-          dir -name
+          cd ${{ github.workspace }}/nugetPackages
+          shopt -s extglob
+          rm -f !(EasyAbp.*)
+          rm -f !(*.${{ steps.getVersion.outputs.first_match }}.nupkg)
+          rm -f *.Blazor.Host.*
+          rm -f *.Blazor.Server.Host.*
+          rm -f *.Host.Shared.*
+          rm -f *.HttpApi.Host.*
+          rm -f *.IdentityServer.*
+          rm -f *.AuthServer.*
+          rm -f *.Web.Host.*
+          rm -f *.Web.Unified.*
+          rm -f *.HttpApi.Client.ConsoleTestApp.*
+          rm -f *.Tests.*
+          rm -f *.TestBase.*
+          ls
 
       - name: dotnet nuget push to GitHub
         uses: tanaka-takayoshi/nuget-publish-to-github-packages-action@v2.1
         with:
-          nupkg-path:  'dest\*.nupkg'
+          nupkg-path:  '${{ github.workspace }}/nugetPackages/*.nupkg'
           repo-owner:  'EasyAbp'
           gh-user:  'EasyAbp'
           token:  ${{ secrets.GITHUB_TOKEN }}
 
       - name: dotnet nuget push to NuGet
-        run: dotnet nuget push dest\*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
+        run: dotnet nuget push ${{ github.workspace }}/nugetPackages/*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
 
       - name: determine if the tag exists
         uses: mukunku/tag-exists-action@v1.0.0

diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <LangVersion>latest</LangVersion>
-        <Version>2.3.2</Version>
+        <Version>2.3.3</Version>
         <NoWarn>$(NoWarn);CS1591</NoWarn>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Authors>EasyAbp Team</Authors>

diff --git a/src/Pay/EasyAbp.Abp.WeChat.Pay.HttpApi/Controller/WeChatPayController.cs b/src/Pay/EasyAbp.Abp.WeChat.Pay.HttpApi/Controller/WeChatPayController.cs
@@ -125,7 +125,6 @@ public virtual Task<ActionResult> RefundNotify2Async([CanBeNull] string tenantId
         /// </summary>
         [HttpPost]
         [Route("refund-notify/mch-id/{mchId}")]
-        [Route("refund-notify/tenant-id/{tenantId}/app-id/{appId}")]
         public virtual Task<ActionResult> RefundNotify3Async([CanBeNull] string tenantId, [CanBeNull] string mchId)
         {
             return RefundNotifyAsync(tenantId, mchId);
@@ -136,7 +135,7 @@ public virtual Task<ActionResult> RefundNotify3Async([CanBeNull] string tenantId
         /// 见 <see cref="RefundNotifyAsync"/>
         /// </summary>
         [HttpPost]
-        [Route("refund-notify/tenant-id/{tenantId}/app-id/{appId}")]
+        [Route("refund-notify/tenant-id/{tenantId}/mch-id/{mchId}")]
         public virtual Task<ActionResult> RefundNotify4Async([CanBeNull] string tenantId, [CanBeNull] string mchId)
         {
             return RefundNotifyAsync(tenantId, mchId);