From c5cf4b8fe92b5a5b317ead49a81c43dcca0edf3e Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Thu, 17 Mar 2022 13:21:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5):=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E6=97=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=87=E9=80=89=E4=BA=BA=E6=98=AF=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/schedule/ScheduleMaintain.vue       |  2 +-
 .../api/definition/components/import/ApiSchedule.vue   |  2 +-
 .../components/common/components/MsScheduleEdit.vue    | 10 ++++++++--
 .../project/notification/TaskNotification.vue          |  4 ++--
 .../track/plan/components/ScheduleMaintain.vue         |  2 +-
 frontend/src/business/components/xpack                 |  2 +-
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue b/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
index 0746412400..c69b93079d 100644
--- a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
+++ b/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
@@ -185,7 +185,7 @@ export default {
       });
     },
     initUserList() {
-      this.result = this.$get('user/ws/member/list/' + getCurrentWorkspaceId(), response => {
+      this.result = this.$post('/user/project/member/list', {projectId: getCurrentProjectID()}, response => {
         this.scheduleReceiverOptions = response.data;
       });
 
diff --git a/frontend/src/business/components/api/definition/components/import/ApiSchedule.vue b/frontend/src/business/components/api/definition/components/import/ApiSchedule.vue
index 5898c2c72e..b7ff2c75d2 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiSchedule.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiSchedule.vue
@@ -248,7 +248,7 @@ export default {
     },
 
     initUserList() {
-      this.result = this.$get('user/ws/member/list/' + getCurrentWorkspaceId(), response => {
+      this.result = this.$post('/user/project/member/list', {projectId: getCurrentProjectID()},response => {
         this.scheduleReceiverOptions = response.data;
       });
     },
diff --git a/frontend/src/business/components/common/components/MsScheduleEdit.vue b/frontend/src/business/components/common/components/MsScheduleEdit.vue
index 2fde5c990b..9722203171 100644
--- a/frontend/src/business/components/common/components/MsScheduleEdit.vue
+++ b/frontend/src/business/components/common/components/MsScheduleEdit.vue
@@ -41,7 +41,13 @@
 </template>
 
 <script>
-import {getCurrentUser, getCurrentWorkspaceId, listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import {
+  getCurrentProjectID,
+  getCurrentUser,
+  getCurrentWorkspaceId,
+  listenGoBack,
+  removeGoBackListener
+} from "@/common/js/utils";
 import Crontab from "../cron/Crontab";
 import CrontabResult from "../cron/CrontabResult";
 import {cronValidate} from "@/common/js/cron";
@@ -112,7 +118,7 @@ export default {
     initUserList() {
 
 
-      this.result = this.$get('user/ws/member/list/' + getCurrentWorkspaceId(), response => {
+      this.result = this.$post('/user/project/member/list', {projectId: getCurrentProjectID()}, response => {
         this.scheduleReceiverOptions = response.data;
       });
 
diff --git a/frontend/src/business/components/project/notification/TaskNotification.vue b/frontend/src/business/components/project/notification/TaskNotification.vue
index 09f3c948e7..c5fb953ad1 100644
--- a/frontend/src/business/components/project/notification/TaskNotification.vue
+++ b/frontend/src/business/components/project/notification/TaskNotification.vue
@@ -77,7 +77,7 @@
 </template>
 
 <script>
-import {getCurrentUser, getCurrentWorkspaceId} from "@/common/js/utils";
+import {getCurrentProjectID, getCurrentUser} from "@/common/js/utils";
 import JenkinsNotification from "@/business/components/project/notification/jenkins/JenkinsNotification";
 import TestPlanTaskNotification from "@/business/components/project/notification/track/TestPlanTaskNotification";
 import TestReviewNotification from "@/business/components/project/notification/track/TestReviewNotification";
@@ -160,7 +160,7 @@ export default {
     },
 
     initUserList() {
-      this.result = this.$get('user/ws/member/list/' + getCurrentWorkspaceId(), response => {
+      this.result = this.$post('/user/project/member/list', {projectId: getCurrentProjectID()}, response => {
         this.jenkinsReceiverOptions = response.data;
         this.reviewReceiverOptions = response.data;
         this.defectReceiverOptions = response.data;
diff --git a/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue b/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue
index 3f17e43d28..e0546f8ada 100644
--- a/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue
+++ b/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue
@@ -265,7 +265,7 @@ export default {
       });
     },
     initUserList() {
-      this.result = this.$get('user/ws/member/list/' + getCurrentWorkspaceId(), response => {
+      this.result = this.$post('/user/project/member/list', {projectId: getCurrentProjectID()}, response => {
         this.scheduleReceiverOptions = response.data;
       });
     },
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index ed3f0a6630..8add0b0a2c 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit ed3f0a6630c6f986fba4f9817f51310a6d37f5aa
+Subproject commit 8add0b0a2cc869390734c0a04590f6a945e61cda