Merge branch 'wsw' into 'master'

# Conflicts:
#   conflict src/api/jyh/index.ts
#   conflict src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue

src/api/jyh/index.ts

@@ -1,5 +1,6 @@
 import { reqCatchV2, type catchRt } from '@/utils/catch';
 import request from '@/utils/request';
+import * as types from '@/api/repo/types';
 
 // 详情-获取版本信息
 export function releaseInfo(params: { softwareId: string }): Promise<any> {
@@ -142,19 +143,40 @@ export const getVulnDetail = (data): Promise<any> => {
       data
     })
   );
-};
+}
 
-// 获取漏洞数据
-export const dependencyTree = (softwareId: any): Promise<any> => {
+// 迁移批量导入
+export function repoImport(data: types.commonRepoReqType){
   return reqCatchV2(() =>
     request({
-      url: `/api/v1/repo/dependency/tree`,
-      method: 'POST',
-      data: {
-        softwareId,
-        current: 1,
-        size: 99999
-      }
+      url: `/api/v1/home/software/valid`,
+      method: 'post',
+      data,
+      headers: {
+        'Content-Type': 'multipart/form-data', // 设置请求头
+      },
     })
   );
-};
+}
+
+// 个人中心-获取预警列表
+export const getNoticeList = (data): Promise<any> => {
+  return reqCatchV2(() =>
+    request({
+      url: `/api/v1/alert/notice/list`,
+      method: 'POST',
+      data,
+    })
+  );
+}
+
+// 个人中心-获取组织级预警列表
+export const getgroupNoticeList = (data): Promise<any> => {
+  return reqCatchV2(() =>
+    request({
+      url: `/api/v1/alert/group/notice/list`,
+      method: 'POST',
+      data,
+    })
+  );
+}