Merge branch 'refs/heads/master' into feature/adapt_namespce_export

# Conflicts:
#	src/components/GlobalHeader/index.js

Author: Aias00

src/models/global.js

@@ -21,7 +21,7 @@ import {
   queryPlatform,
   getAllPlugins,
   getNamespaceList,
-  asyncOnePlugin,
+  asyncByPluginAndNamespace,
   getUserPermissionByToken,
 } from "../services/api";
 import { getIntlContent } from "../utils/IntlUtils";
@@ -83,7 +83,7 @@ export default {
     },
     *asyncPlugin(params, { call }) {
       const { payload } = params;
-      const json = yield call(asyncOnePlugin, payload);
+      const json = yield call(asyncByPluginAndNamespace, payload);
       if (json.code === 200) {
         message.success(getIntlContent("SHENYU.COMMON.RESPONSE.SYNC.SUCCESS"));
       } else {

src/services/api.js

@@ -567,13 +567,23 @@ export async function asyncConfigImport(params) {
   });
 }
 
-// 同步单个插件
+// sync on plugin
 export async function asyncOnePlugin(params) {
   return request(`${baseUrl}/namespacePlugin/syncPluginData?id=${params.id}`, {
     method: `PUT`,
   });
 }
 
+// sync by plugin and namespace
+export async function asyncByPluginAndNamespace(params) {
+  return request(
+    `${baseUrl}/namespacePlugin/syncPluginData?id=${params.id}&namespaceId=${params.namespaceId}`,
+    {
+      method: `PUT`,
+    },
+  );
+}
+
 // get plugin dropdown list
 export async function getPluginDropDownList() {
   return request(`${baseUrl}/plugin/all`, {