Merge pull request #3074 from emqx/dev/1.10.3

Sync code from refs/heads/dev/1.10.3 to enterprise
emqx · Dec 4, 2024 · 2455612 · 2455612
2 parents ece85fa + 8e714ad
commit 2455612
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml
@@ -56,9 +56,17 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ vars.AUTH_APP_ID }}
+          private-key: ${{ secrets.AUTH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+
       - name: Create PR in emqx/emqx
         env:
-          GH_TOKEN: ${{ secrets.CI_GITHUB_TOKEN_EMQX_RW }}
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
           EMQX_NAME: emqx
           VERSION: ${{ github.ref_name }}
         run: |
@@ -74,9 +82,17 @@ jobs:
     if: (github.ref == 'refs/heads/enterprise') || startsWith(github.ref, 'refs/tags/e')
     runs-on: ubuntu-latest
     steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ vars.AUTH_APP_ID }}
+          private-key: ${{ secrets.AUTH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+
       - name: Create PR in emqx/emqx
         env:
-          GH_TOKEN: ${{ secrets.CI_GITHUB_TOKEN_EMQX_RW }}
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
           EMQX_NAME: emqx-enterprise
           VERSION: ${{ github.ref_name }}
         run: |

diff --git a/src/i18n/Gateway.js b/src/i18n/Gateway.js
@@ -125,7 +125,7 @@ export default {
   },
   mountPointDesc: {
     zh: `为客户端在 \`SUBSCRIBE\` 和 \`UNSUBSCRIBE\` 请求、\`PUBLISH\` 消息以及 Will Message（如果在 \`CONNECT\` 数据包中提供）中使用的主题添加静态或模板前缀（例如 \`n1/\` 或 \`{'$'}{'{'}username{'}'}/\`）。<br />
-从发布到相应订阅的消息的主题中移除此前缀。
+从发布到相应订阅的消息的主题中将移除此前缀。
 
 支持的占位符包括：
 - \`{'$'}{'{'}username{'}'}\`