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`,
+      url: `/api/v1/home/software/valid`,
-      method: 'POST',
+      method: 'post',
-      data: {
+      data,
-        softwareId,
+      headers: {
-        current: 1,
+        'Content-Type': 'multipart/form-data', // 设置请求头
-        size: 99999
+      },
-      }
     })
   );
-};
+}
+
+// 个人中心-获取预警列表
+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,
+    })
+  );
+}

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,
     });
 }

src/components/FileUploadButton/index.vue

@@ -56,7 +56,7 @@ const handleFileUpload = async (event) => {
   const file = event.target.files[0]; // 获取选择的文件
   if (file) {
     // 检查文件类型
-    if (file.type === 'text/xml' || file.name.endsWith('.xml')) {
+    if (file.type === 'text/xml' || file.name.endsWith('.xml') || file.name.endsWith('.xlsx')) {
       loading.value = true; // 显示加载状态
       try {
         await props.onFileUpload(file); // 调用父组件传递的上传方法

src/components/Header/Notice.vue

@@ -24,7 +24,7 @@ const getCounts = () => {
 };
 
 onMounted(() => {
-  getCounts();
+  // getCounts();
   addEventListener('updateNotice', debounce((count: number) => {
     counts.value = count;
   }, 500));

src/views/Jyh/Home/index.vue

@@ -59,7 +59,7 @@
         <div class="info-title">
           <div class="sub-title">
             <img src="@/assets/imgs/home/informIcon@2x.png">
-            <span>信息公示</span>
+            <span>预警公告</span>
           </div>
           <a class="devui-link" @click="checkMore">更多 ></a>
         </div>
@@ -89,7 +89,7 @@
     </div>
   </div>
 
-  <d-modal class="warning-modal" v-model="warningModalVisable" title="主题：" style="width: 600px;">
+  <d-modal class="warning-modal" v-model="warningModalVisable" title="" style="width: 600px;">
     <EarlyWarningDetail :warningData="currentWarning" :type="'user'"></EarlyWarningDetail>
   </d-modal>
 </template>

src/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="warning-detail-container">
     <div class="warning-title">
-      <div>{{ warningData.subject }}</div>
+      <div style="padding-right: 20px;">{{ warningData.subject }}</div>
       <div class="sub-title mt-3">
         <div>
           <span>重要性</span>
@@ -20,7 +20,7 @@
         :toolbar-config="toolbarConfig"
       ></d-editor-md>
     </div>
-    <div :style="{'border-radius': propsData.type === 'user' ? '6px' : 0}" class="warning-from">{{warningData.group}} {{ warningData.pulishTime }}</div>
+    <div :style="{'border-radius': propsData.type === 'user' ? '6px' : 0}" class="warning-from">{{warningData.group}} {{ warningData.publishTime }}</div>
     <div v-if="propsData.type === 'system'" class="warning-operation">
       <d-button @click="confirm" variant="solid" class="mr-2">确定</d-button>
       <d-button @click="$emit('close')">取消</d-button>
@@ -40,7 +40,8 @@ const toolbarConfig = [
   ['ul', 'ol', 'checklist', 'code', 'link', 'image', 'table'],
 ];
 const mode = ref('readonly');
-warningData.value = JSON.parse(propsData.warningData.alertMsg ?? JSON.stringify({
+console.log(propsData.warningData)
+warningData.value = propsData.warningData ?? {
   subject: '【漏洞排查预警】ApacheIgnite远程代码执行漏洞排查（CVE-2024-52577)',
   importance: '高',
   group: '可信开源代码库运营团队',
@@ -49,7 +50,7 @@ warningData.value = JSON.parse(propsData.warningData.alertMsg ?? JSON.stringify(
 近日，安全中心发现Apache lgnite远程代码执行漏洞（CVE-2024-52577）。在 2.6.0<Apache Ignite< 2.17.0版本中，由于lgnite未能正确实施类序列化过滤器，攻击者能够利用恶意序列化对象绕过安全检查，从而在服务器端反序列化时触发任意代码的执行。经可信开源代码库运营团队评审漏洞技术定级2级/3级，若不满足利用条件可举证降为6级。请你按要求在XX时间内完成修复。
 ## 二、修复方案
 升级Apache Ignite至安全版本：2.17.0`
-}));
+};
 const confirm = () => {
   emit('close');
 };

src/views/Jyh/PersonalCenter/Detail/EarlyWarningOrganization.vue

@@ -1,15 +1,18 @@
 <template>
   <Card simple class="jyh-card mt-3">
     <div class="mb-3">
-      <d-table class="jyh-table jyh-table-2" :header-bg="true" :data="licenseTableData">
+      <d-table v-if="tableData.length>0" class="jyh-table jyh-table-2" :header-bg="true" :data="tableData">
-        <d-column field="code" header="时间"></d-column>
+        <d-column field="updateTime" header="时间">
+          <template #default="scope">
+            <span>{{ formatTime(scope.row.updateTime, 'YYYY-MM-DD') }}</span>
+          </template>
+        </d-column>
         <d-column field="name" header="标题">
           <template #default="scope">
             <a @click="openWarningDetail(scope.row)">{{ scope.row.name }}</a>
           </template>
         </d-column>
-        <d-column field="detail" header="详情"></d-column>
+        <d-column field="alertMsg" header="详情"></d-column>
-        <d-column field="owner" header="订阅人"></d-column>
         <d-column field="level" header="级别">
           <template #default="scope, text">
             <d-status v-if="scope.row.level === 4" type="error">危险</d-status>
@@ -25,7 +28,17 @@
           </template>
         </d-column>
       </d-table>
+      <NoData v-else :small="false"></NoData>
     </div>
+
+
+    <div class="mt-20 mb-20 flex justify-end">
+      <d-pagination size="md" :page-size-options="[10, 20, 50]" :total="pager.total"
+                    v-model:pageSize="pager.pageSize" v-model:pageIndex="pager.pageIndex" :max-items="5"
+                    :can-change-page-size="true" :can-view-total="true" total-item-text="总计" @page-index-change="changeIndex()"
+                    @page-size-change="changeSize()" />
+    </div>
+
   </Card>
 
   <d-modal class="warning-modal" v-model="warningModalVisable" title="">
@@ -34,25 +47,45 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import EarlyWarningDetail from '@/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue';
+import NoData from "@/components/NoData/NoData.vue";
+import { getgroupNoticeList, getNoticeList } from '@/api/jyh';
 
-const licenseTableData = ref([
+const tableData = ref([
-  { code: '05822156', name: 'MIT License', detail: 'integer', owner: 'admin', level: 4, status: 1 },
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 4, status: 1 },
-  { code: '05822156', name: 'MIT License', detail: 'integer', owner: 'admin', level: 3, status: 2 },
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 3, status: 2 },
-  { code: '05822156', name: 'MIT License', detail: 'integer', owner: 'admin', level: 2, status: 2 },
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 2, status: 1 },
-  { code: '05822156', name: 'MIT License', detail: 'integer', owner: 'admin', level: 1, status: 2 }
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 1, status: 2 }
 ]);
-
+const pager = ref({
+  total: 0,
+  pageIndex: 1,
+  pageSize: 10
+});
 const warningModalVisable = ref(false);
 const currentWarning = ref();
 const openWarningDetail = (row) => {
   warningModalVisable.value = true;
-  currentWarning.value = row;
+  currentWarning.value = JSON.parse(row.alertMsg ?? '{}');
 };
 const colseWarningDetail = () => {
   warningModalVisable.value = false;
 };
+
+const getList = async() => {
+  const { data, error } = await getgroupNoticeList({  current: 1,size: pager.value.pageSize  });
+  if (!error && data) {
+    tableData.value = data.data.data.records;
+    pager.value.total = data.data.data.total;
+  }
+};
+
+onMounted(async() => {
+  getList();
+});
+
+
 </script>
 
 <style scoped lang="scss">

src/views/Jyh/PersonalCenter/Detail/EarlyWarningPerson.vue

@@ -1,14 +1,18 @@
 <template>
   <Card simple class="jyh-card mt-3">
     <div class="mb-3">
-      <d-table class="jyh-table jyh-table-2" :header-bg="true" :data="licenseTableData">
+      <d-table v-if="tableData.length>0" class="jyh-table jyh-table-2" :header-bg="true" :data="tableData">
-        <d-column field="code" header="时间"></d-column>
+        <d-column field="updateTime" header="时间">
+          <template #default="scope">
+            <span>{{ formatTime(scope.row.updateTime, 'YYYY-MM-DD') }}</span>
+          </template>
+        </d-column>
         <d-column field="name" header="标题">
           <template #default="scope">
             <a @click="openWarningDetail(scope.row)">{{ scope.row.name }}</a>
           </template>
         </d-column>
-        <d-column field="detail" header="详情"></d-column>
+        <d-column field="alertMsg" header="详情"></d-column>
         <d-column field="level" header="级别">
           <template #default="scope, text">
             <d-status v-if="scope.row.level === 4" type="error">危险</d-status>
@@ -24,7 +28,17 @@
           </template>
         </d-column>
       </d-table>
+      <NoData v-else :small="false"></NoData>
     </div>
+
+
+    <div class="mt-20 mb-20 flex justify-end">
+      <d-pagination size="md" :page-size-options="[10, 20, 50]" :total="pager.total"
+                    v-model:pageSize="pager.pageSize" v-model:pageIndex="pager.pageIndex" :max-items="5"
+                    :can-change-page-size="true" :can-view-total="true" total-item-text="总计" @page-index-change="changeIndex()"
+                    @page-size-change="changeSize()" />
+    </div>
+
   </Card>
 
   <d-modal class="warning-modal" v-model="warningModalVisable" title="">
@@ -33,25 +47,45 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import EarlyWarningDetail from '@/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue';
+import NoData from "@/components/NoData/NoData.vue";
+import { getNoticeList } from '@/api/jyh';
 
-const licenseTableData = ref([
+const tableData = ref([
-  { code: '05822156', name: 'MIT License', detail: 'integer', level: 4, status: 1 },
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 4, status: 1 },
-  { code: '05822156', name: 'MIT License', detail: 'integer', level: 3, status: 2 },
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 3, status: 2 },
-  { code: '05822156', name: 'MIT License', detail: 'integer', level: 2, status: 1 },
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 2, status: 1 },
-  { code: '05822156', name: 'MIT License', detail: 'integer', level: 1, status: 2 }
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 1, status: 2 }
 ]);
-
+const pager = ref({
+  total: 0,
+  pageIndex: 1,
+  pageSize: 10
+});
 const warningModalVisable = ref(false);
 const currentWarning = ref();
 const openWarningDetail = (row) => {
   warningModalVisable.value = true;
-  currentWarning.value = row;
+  currentWarning.value = JSON.parse(row.alertMsg ?? '{}');
 };
 const colseWarningDetail = () => {
   warningModalVisable.value = false;
 };
+
+const getList = async() => {
+  const { data, error } = await getNoticeList({  current: 1,size: pager.value.pageSize  });
+  if (!error && data) {
+    tableData.value = data.data.data.records;
+    pager.value.total = data.data.data.total;
+  }
+};
+
+onMounted(async() => {
+  getList();
+});
+
+
 </script>
 
 <style scoped lang="scss">

src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="invitation-notice-container">
     <Card simple class="jyh-card mt-3">
-      <div class="mb-3">
+      <div class="mt-3">
         <d-table
           class="jyh-table jyh-table-2"
           :header-bg="true"
@@ -86,12 +86,13 @@ const handleAccept = async (row, type) => {
   });
   if (data?.data?.data?.data) {
     Message({
-      type,
+      type: 'success',
       message: '成功接受',
     });
+    queryInviteListData();
   } else {
     Message({
-      type,
+      type: 'error',
       message: '接受失败',
     });
   }

src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue

@@ -155,7 +155,7 @@ const userInfo = shallowRef<UserInfoType>({
   groupDesc: null,
 });
 const searchOrganizationLoading = ref(false);
-const hasOrganization = ref(false);
+const hasOrganization = ref(true);
 const organizationInfo = shallowRef<OrganizationInfoType>({
   groupId: 0,
   organizationName: '',
@@ -218,13 +218,14 @@ async function queryUserInfo() {
       userInfo.value = res.data?.data.data;
     }
     if (userInfo.value.groupId) {
-      hasOrganization.value = true;
       organizationInfo.value = {
         groupId: userInfo.value.groupId,
         organizationName: userInfo.value.groupName as string,
         organizationProfile: userInfo.value.groupDesc as string,
       };
       getMemberList();
+    } else {
+      hasOrganization.value = false;
     }
   } catch (e) {
     Message.error('查询用户信息失败');

src/views/Jyh/Search/Components/BatchVerify.vue

@@ -3,7 +3,7 @@
     <div class="search-form">
       <FileUploadButton
         buttonText="批量导入"
-        accept=".xml"
+        accept=".xlsx"
         :onFileUpload="handleFileUpload"
       />
       <d-input
@@ -20,16 +20,16 @@
       <div class="tjsj">
         <span style="height: 14px" class="split"></span>
         <span>可使用：</span>
-        <span class="green" @click="filterVerifyResult(1)">3</span>
+        <span class="green" @click="filterVerifyResult(1)">{{useNum}}</span>
         <span style="height: 14px" class="split"></span>
         <span>有风险：</span>
-        <span class="red" @click="filterVerifyResult(2)">3</span>
+        <span class="red" @click="filterVerifyResult(2)">{{riskNum}}</span>
         <span style="height: 14px" class="split"></span>
         <span>未治理：</span>
-        <span class="yellow" @click="filterVerifyResult(0)">3</span>
+        <span class="yellow" @click="filterVerifyResult(0)">{{noNum}}</span>
       </div>
       <div class="left-btn">
-        <a v-if="isLogin" class="cursor-pointer" href="/static/template.xlsx" download><i class="icon icon-download-2"></i>下载excel模板</a>
+        <a v-if="isLogin" class="cursor-pointer" href="/static/软件存在及可信校验模版.xlsx" download><i class="icon icon-download-2"></i>下载excel模板</a>
         <span v-if="isLogin" style="height: 14px" class="split"></span>
         <d-button v-if="isLogin" class="output-btn" icon="icon-share" variant="text">导出</d-button>
         <span v-if="isLogin" style="height: 14px" class="split"></span>
@@ -55,18 +55,18 @@
           >
             <!-- 自定义列内容 -->
             <template #default="scope">
-              <template v-if="column.key === 'result'">
+              <template v-if="column.key === 'validStatus'">
-                <div v-if="scope.row.result == 1" style="display: flex; align-items: center">
+                <div v-if="scope.row.validStatus == 1" style="display: flex; align-items: center">
                   <d-icon class="mr-1" name="icon-right-o" style="font-size: 14px; color: rgb(80, 212, 171)"></d-icon>
                   <span>可使用</span>
                 </div>
-                <div v-else-if="scope.row.result == 2" style="display: flex; align-items: center">
+                <div v-else-if="scope.row.validStatus == 2" style="display: flex; align-items: center">
                   <d-icon class="mr-1" name="icon-warning-o" style="font-size: 14px; color: rgb(250, 194, 10)"></d-icon>
-                  <span>未治理</span>
+                  <span>有风险</span>
                 </div>
                 <div v-else style="display: flex; align-items: center">
                   <d-icon class="mr-1" name="icon-error-o" style="font-size: 14px; color: rgb(246, 111, 106)"></d-icon>
-                  <span>有风险</span>
+                  <span>未治理</span>
                 </div>
               </template>
               <template v-else-if="column.key === 'versionName'">
@@ -105,7 +105,7 @@
           <template #default="scope">
             <d-button
               variant="text"
-              disabled
+              :disabled="scope.row.validStatus !== 0"
             >
               申请入库
             </d-button>
@@ -113,8 +113,10 @@
         </d-column>
       </d-table>
 
-      <DataPanel v-else skeleton :card="false" :empty="true">
+<!--      <DataPanel v-else skeleton :card="false" :empty="true">-->
-      </DataPanel>
+<!--      </DataPanel>-->
+
+      <NoData v-else :small="false"></NoData>
     </div>
 
     <div class="mt-20 mb-20 flex justify-end">
@@ -136,7 +138,7 @@
 <script setup lang="ts">
 import SettingTitle from '@/components/Setting/SettingTitle/index.vue';
 import SettingText from '@/components/Setting/SettingText/index.vue';
-import { ref, reactive, onMounted } from 'vue';
+import { ref, reactive, onMounted, computed } from 'vue';
 import { getGroupClaList, setGroupClaStatus, deleteGroupCla } from '@/api/cla';
 import { useRouter, useRoute } from 'vue-router';
 import { GModal } from '@/components/Setting/index';
@@ -147,12 +149,43 @@ import { useAccountStore } from '@/stores/user';
 import { storeToRefs } from 'pinia';
 import TableSetting from '@/components/TableSetting/index.vue';
 import FileUploadButton from '@/components/FileUploadButton/index.vue';
-import { releasePage } from '@/api/jyh';
+import { releasePage, repoImport } from '@/api/jyh';
+import NoData from "@/components/NoData/NoData.vue";
+
+const useNum = computed(() => {
+  if (tableData.value.length>0) {
+    return tableData.value.filter(item => item.validStatus === 1).length;
+  } else {
+    return 0;
+  }
+});
+
+const riskNum = computed(() => {
+  if (tableData.value.length>0) {
+    return tableData.value.filter(item => item.validStatus === 2).length;
+  } else {
+    return 0;
+  }
+});
+
+const noNum = computed(() => {
+  if (tableData.value.length>0) {
+    return tableData.value.filter(item => item.validStatus === 0).length;
+  } else {
+    return 0;
+  }
+});
 
 // 处理文件上传
 const handleFileUpload = async (file) => {
   console.log('选择的文件:', file.name);
 
+  const { data, error } = await repoImport({file});
+  if (!error && data) {
+    tableData.value = data.data.data;
+    pager.value.total = data.data.data.length;
+  }
+
   // 模拟文件上传逻辑
   return new Promise((resolve) => {
     setTimeout(() => {
@@ -168,7 +201,7 @@ const { namespace } = getOrgInfo();
 const allTableData = ref([]);
 const tableData = ref([]);
 const columns = ref([
-  { key: 'result', label: '校验结果', visible: true, filterable: true, sortable: false },
+  { key: 'validStatus', label: '校验结果', visible: true, filterable: true, sortable: false },
   { key: 'softwareName', label: '软件名称', visible: true, filterable: true, sortable: false },
   { key: 'softwareVersion', label: '软件版本', visible: true, filterable: true, sortable: false },
   { key: 'securityScore', label: '软件评分', visible: true, filterable: false, sortable: true },
@@ -186,7 +219,7 @@ const currentReusltFilter = ref(null);
 // 定义 tableKey，用于强制刷新表格
 const tableKey = ref(0);
 const pager = ref({
-  total: 10,
+  total: 0,
   pageIndex: 1,
   pageSize: 10
 });
@@ -215,7 +248,7 @@ const getReleaseList = async() => {
 };
 
 onMounted(async() => {
-  getReleaseList();
+  // getReleaseList();
 });
 
 const filterVerifyResult = (type) => {
@@ -252,9 +285,11 @@ const handleBatchImport = async() => { // 多个项目导入
 const gotoDetail = (row) => {
   /*TODO:如果是可使用、有风险的，点击软件版本，可跳转到软件详情页面；如果是未治理的，无法跳转*/
   // 后续请换成params，暂时params传参没传过去
-  router.push({
+  if(row.validStatus == 1 || row.validStatus == 2) {
-    path: 'repoDetail/' + row.version
+    router.push({
-  });
+      path: 'repoDetail/' + row.softwareVersion
+    });
+  }
 };
 // 分页
 const changeIndex = () => {

src/views/Jyh/Search/Components/OssQuery.vue

@@ -76,8 +76,9 @@
         </template>
       </d-table>
 
-      <DataPanel v-else skeleton :card="false" :empty="true">
+<!--      <DataPanel v-else skeleton :card="false" :empty="true">-->
-      </DataPanel>
+<!--      </DataPanel>-->
+      <NoData v-else :small="false"></NoData>
     </div>
 
     <div class="mt-20 mb-20 flex justify-end">