Merge branch 'master' of https://gitcode.com/hk_openRepo/OpenRepo_Portal into junjie_dev

# Conflicts:
#	src/views/Jyh/Search/Components/BatchVerify.vue

src/views/Jyh/Version/Detail/SubscriptionModal.vue

@@ -54,6 +54,10 @@ const sendSubscribe = async () => {
       type: 'error'
     })
   } else {
+    Message({
+      message: '订阅成功！',
+      type: 'success'
+    })
     emit('close');
   }
 }

src/views/Jyh/Version/Detail/VulnerabilitiesList.vue

@@ -103,7 +103,7 @@
     
     <!-- 漏洞详情 -->
     <d-drawer v-model="vulnDetailVisable" style="width: auto;">
-      <VulnerabilityDetail :vulnId="currentVuln.id"></VulnerabilityDetail>
+      <VulnerabilityDetail :vulnId="currentVuln.id" :vulnInfo="currentVuln"></VulnerabilityDetail>
     </d-drawer>
   </div>
 </template>

src/views/Jyh/Version/Detail/VulnerabilityDetail.vue

@@ -1,21 +1,21 @@
 <template>
   <div class="vuln-detail-container">
-    <div class="vuln-title mb-2">{{ vulnDetail.id }}</div>
+    <div class="vuln-title mb-2">{{ vulnDetail.vulnId }}</div>
     <div class="vuln-sub-title mb-3">
-      <span>{{ vulnDetail.cveId || '--' }}</span>
+      <span>{{ vulnDetail.cweId || '--' }}</span>
       <span class="split-line"></span>
-      <span><span class="release-time">发布时间：</span>{{ vulnDetail.releaseTime || '--' }}</span>
+      <span><span class="release-time">发布时间：</span>{{ vulnDetail.publishDate || '--' }}</span>
     </div>
     <Card simple class="jyh-card mb-4">
       <div class="card-title">漏洞名称</div>
       <d-row class="mb-3">
         <d-col :span="12">
           <span class="card-key width-90">漏洞名称</span>
-          <span class="card-val">{{vulnDetail.id || '--'}}</span>
+          <span class="card-val">{{vulnDetail.vulnId || '--'}}</span>
         </d-col>
         <d-col :span="12">
           <span class="card-key width-90">关联漏洞编号</span>
-          <span class="card-val">{{vulnDetail.cnvdId || '--'}}</span>
+          <span class="card-val">{{vulnDetail.cweId || '--'}}</span>
         </d-col>
       </d-row>
       <d-row class="mb-3">
@@ -28,8 +28,7 @@
         <d-col :span="24">
           <span class="card-key width-90">额外信息</span>
           <span class="card-val">
-            <a v-for="link in vulnDetail.links" class="devui-link" :href="link" target="_blank" rel="noreferrer noopener">{{link}}</a>
-            <span v-if="!vulnDetail.links || vulnDetail.links.length === 0">--</span>
+            <span class="card-val">{{vulnDetail.extraInfo || '--'}}</span>
           </span>
         </d-col>
       </d-row>
@@ -37,8 +36,7 @@
         <d-col :span="24">
           <span class="card-key width-90">补丁链接</span>
           <span class="card-val">
-            <a v-for="link in vulnDetail.links2" class="devui-link" :href="link" target="_blank" rel="noreferrer noopener">{{link}}</a>
-            <span v-if="!vulnDetail.links || vulnDetail.links.length === 0">--</span>
+            <span class="card-val">{{vulnDetail.patchLink || '--'}}</span>
           </span>
         </d-col>
       </d-row>
@@ -48,11 +46,11 @@
       <d-row class="mb-3">
         <d-col :span="12">
           <span class="card-key width-90">严重性</span>
-          <span class="card-val">{{vulnDetail.id || '--'}}</span>
+          <span class="card-val">{{vulnDetail.severity || '--'}}</span>
         </d-col>
         <d-col :span="12">
           <span class="card-key width-90">分值</span>
-          <span class="card-val">{{vulnDetail.code || '--'}}</span>
+          <span class="card-val">{{vulnDetail.cvssScore || '--'}}</span>
         </d-col>
       </d-row>
     </Card>
@@ -61,21 +59,21 @@
       <d-row class="mb-3">
         <d-col :span="12">
           <span class="card-key width-90">攻击向量</span>
-          <span class="card-val">{{vulnDetail.id || '--'}}</span>
+          <span class="card-val">{{vulnDetail.attackVector || '--'}}</span>
         </d-col>
         <d-col :span="12">
           <span class="card-key width-90">攻击复杂度</span>
-          <span class="card-val">{{vulnDetail.complexity || '--'}}</span>
+          <span class="card-val">{{vulnDetail.attackComplexity || '--'}}</span>
         </d-col>
       </d-row>
       <d-row class="mb-3">
         <d-col :span="12">
           <span class="card-key width-90">用户交互</span>
-          <span class="card-val">{{vulnDetail.compName || '--'}}</span>
+          <span class="card-val">{{vulnDetail.userInteraction || '--'}}</span>
         </d-col>
         <d-col :span="12">
           <span class="card-key width-90">需要特殊权限</span>
-          <span class="card-val">{{vulnDetail.cnvdId || '--'}}</span>
+          <span class="card-val">{{vulnDetail.privilegesRequired || '--'}}</span>
         </d-col>
       </d-row>
     </Card>
@@ -113,7 +111,7 @@
       <d-row class="mb-3">
         <d-col :span="12">
           <span class="card-key width-90">补丁版本</span>
-          <span class="card-val">{{vulnDetail.id || '--'}}</span>
+          <span class="card-val">{{vulnDetail.fixVersion || '--'}}</span>
         </d-col>
         <d-col :span="12">
           <span class="card-key width-90">修复兼容性</span>
@@ -123,7 +121,7 @@
       <d-row>
         <d-col :span="24">
           <span class="card-key width-90">修复建议</span>
-          <span class="card-val">{{vulnDetail.description || '--'}}</span>
+          <span class="card-val">{{vulnDetail.fixIssue || '--'}}</span>
         </d-col>
       </d-row>
     </Card>
@@ -134,22 +132,27 @@
 import { getVulnDetail } from '@/api/repo';
 import { ref } from 'vue';
 
-const propsData = defineProps(['repoId', 'vulnId']);
+const propsData = defineProps(['repoId', 'vulnId', 'vulnInfo']);
 const vulnDetail = ref({
-  id: 'HWPSIRT-2022-29348',
-  cveId: 'CVE-2013-0293',
+  vulnId: 'HWPSIRT-2022-29348',
+  cweId: 'CVE-2013-0293',
   cnvdId: 'CNVD-201105-215',
   name: '',
   code: '',
-  description: '华为开发者社区致力于打造华为开发者专属的官方技术交流平台，帮助开发者探索开发实践、交流心得经验、获悉业界动态、解决开发问题。汇聚华为云社区“华为云”领域博客、问答、视频等精彩内容，形成开发者和技术爱好者交流与分享主阵地。',
-  links: ['/home'],
-  links2: ['/home'],
-  vector: '',
-  complexity: '',
-  interactive: '',
-  releaseTime: '2018-07-31',
+  description: '攻击者通过特制的PUT请求执行任意SQL命令，可能导致数据库内容被操控。',
+  extraInfo: '腾讯云丁安全实验室发现并报告该漏洞。',
+  fixIssue: '使用参数化查询或预编译语句，避免SQL注入。',
+  attackVector: '',
+  attackComplexity: '',
+  userInteraction: '',
+  publishDate: '2018-07-31',
   compName: 'mplayer',
-  version: '1.4',
+  fixVersion: '1.4',
+  "privilegesRequired": "None",
+  "exploitabilityScore": 9.8,
+  "impactScore": 10.0,
+  "cvssScore": 9.9,
+  "severity": "Critical",
 });
 
 const queryVulnDetail = async () => {
@@ -157,6 +160,7 @@ const queryVulnDetail = async () => {
   vulnDetail.value = data;
 };
 // queryVulnDetail();
+// vulnDetail.value = propsData.vulnInfo;
 </script>
 
 <style scoped lang="scss">

src/views/Jyh/Version/Detail/index.vue

@@ -30,7 +30,7 @@
                 <span>订阅漏洞预警通知</span>
               </div>
             </template>
-            <SubscriptionModal @close="colseSubscription" :softwareData="softwareData"></SubscriptionModal>
+            <SubscriptionModal @close="colseSubscription" :softwareData="{id: softwareId}"></SubscriptionModal>
           </d-modal>
         </div>
       </div>
@@ -73,7 +73,7 @@ import SubscriptionModal from '@/views/Jyh/Version/Detail/SubscriptionModal.vue'
 import { releaseInfo } from '@/api/jyh';
 
 const selectTab = ref('bbxx');
-
+const softwareId = ref();
 // 删除弹窗
 const item = ref('');
 const deleteModal = ref();
@@ -96,6 +96,7 @@ const getReleaseInfo = async(versionId) => {
 
 onMounted(() => {
   const versionId = route.params.versionId; // 获取路由参数 versionId
+  softwareId.value = versionId;
   if (versionId) {
     getReleaseInfo(versionId); // 调用接口获取数据
   }
@@ -194,13 +195,6 @@ const signCla = (row: any) => {
   router.push('/cla/' + row.object_id);
 };
 
-const softwareData = ref({
-  name: 'vue',
-  version: '3.5.13',
-  lifecycle: '选中型',
-  risk: '低风险',
-});
-
 const subscribeModalVisable = ref(false);
 const openSubscription = () => {
   subscribeModalVisable.value = true;