Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/api/jyh/index.ts

src/api/jyh/index.ts

@@ -142,10 +142,36 @@ export const getVulnList = (data): Promise<any> => {
     request({
       url: `/api/v1/repo/vulnerability/page`,
       method: 'post',
-      data,
+      data
     })
   );
-}
+};
+
+// 获取SBOM依赖树
+export const dependencyTree = (softwareId: any): Promise<any> => {
+  return reqCatchV2(() =>
+    request({
+      url: `/api/v1/repo/dependency/tree`,
+      method: 'POST',
+      data: {
+        softwareId,
+        current: 1,
+        size: 99999
+      }
+    })
+  );
+};
+
+// 编辑用户信息（包含订阅默认预警方式）
+export const userEdit = (data: any): Promise<any> => {
+  return reqCatchV2(() =>
+    request({
+      url: `/api/v1/user/edit`,
+      method: 'POST',
+      data
+    })
+  );
+};
 
 // 获取漏洞数据
 export const getVulnDetail = (data): Promise<any> => {
@@ -153,21 +179,21 @@ export const getVulnDetail = (data): Promise<any> => {
     request({
       url: `/api/v1/repo/vulnerability/info`,
       method: 'POST',
-      data,
+      data
     })
   );
-}
+};
 
 // 迁移批量导入
-export function repoImport(data: types.commonRepoReqType){
+export function repoImport(data: types.commonRepoReqType) {
   return reqCatchV2(() =>
     request({
       url: `/api/v1/home/software/valid`,
       method: 'post',
       data,
       headers: {
-        'Content-Type': 'multipart/form-data', // 设置请求头
-      },
+        'Content-Type': 'multipart/form-data' // 设置请求头
+      }
     })
   );
 }
@@ -178,10 +204,10 @@ export const getNoticeList = (data): Promise<any> => {
     request({
       url: `/api/v1/alert/notice/list`,
       method: 'POST',
-      data,
+      data
     })
   );
-}
+};
 
 // 个人中心-获取组织级预警列表
 export const getgroupNoticeList = (data): Promise<any> => {
@@ -189,10 +215,10 @@ export const getgroupNoticeList = (data): Promise<any> => {
     request({
       url: `/api/v1/alert/group/notice/list`,
       method: 'POST',
-      data,
+      data
     })
   );
-}
+};
 
 // 个人中心-获取订阅列表
 export const getSubscribeList = (data): Promise<any> => {

src/api/organizationManage/organizationManageApi.ts

@@ -40,7 +40,7 @@ export function inviteOrganizationMemberApi(params: { groupId: number, username:
 export function deleteOrganizationMemberApi(params: { groupId: number, username: string }): Promise<UnitRes<boolean>> {
     return request({
         url: `/api/v1/group/member/remove`,
-        method: 'delete',
+        method: 'post',
         data: params,
     });
 }