Merge branch 'master' of https://gitcode.com/hk_openRepo/OpenRepo_Portal into dev-shenjianbin

src/App.vue

@@ -126,10 +126,10 @@ onMounted(() => {
     }
   });
   /** 获取用户组织配额权限 */
-  if (!localStorage.getItem('group_quota')) {
+  // if (!localStorage.getItem('group_quota')) {
-    const { getUserCreateOrg } = getOrgInfo();
+  //   const { getUserCreateOrg } = getOrgInfo();
-    getUserCreateOrg();
+  //   getUserCreateOrg();
-  }
+  // }
   checkoutFirstTime();
 });
 

src/api/user/index.ts

@@ -689,7 +689,7 @@ export function getUserToken(): catchRt<any> {
 // 获取用户信息
 export function getUserInfo(): catchRt<any> {
   return reqCatchV2(() => request({
-    url: '/api/v1/user/oauth/userInfo',
+    url: '/api/v1/user/info',
     method: 'get'
   }, {
     customError: true

src/components/Header/Notice.vue

@@ -1,6 +1,6 @@
 <template>
   <router-link to="/personalCenter?status=all&message_type=mr">
-    <d-badge class="g-notice" :count="counts" :offset="[-2, 4]" :hidden="!counts" status="danger">
+    <d-badge class="g-notice" :count="accountInfo.noticeUnreadNum" :offset="[-2, 4]" :hidden="!accountInfo.noticeUnreadNum" status="danger">
       <d-icon style="font-size: 16px" name="notice" />
     </d-badge>
   </router-link>
@@ -11,7 +11,9 @@ import { ref, onMounted, onBeforeUnmount } from 'vue';
 import { getMessageCount } from '@/api/notice';
 import { addEventListener, offEvent } from '@/utils/eventBus';
 import debounce from 'lodash/debounce';
+import { useAccount } from '@/utils/hooks/useAccount';
 
+const { accountInfo, RemoveInfo } = useAccount();
 const counts = ref(9);
 const getCounts = () => {
   getMessageCount().then((result) => {

src/components/Header/UserAvatar.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="g-user-avatar flex-center ml-1" @click="toggleDropDown">
-    <GAvatar :width="28" :height="28" :name="accountInfo.nickname" :src="accountInfo.avatar"></GAvatar>
+    <GAvatar :width="28" :height="28" :name="accountInfo.username" :src="accountInfo.avatar"></GAvatar>
   </div>
   <d-drawer v-model="visible" class="g-user-drawer-container">
     <div class="g-user-drawer">
       <div class="g-user-drawer-info">
         <div class="g-user-avatar">
-          <GAvatar style="width: 28px" :name="accountInfo.nickname" :src="accountInfo.avatar"></GAvatar>
+          <GAvatar style="width: 28px" :name="accountInfo.username" :src="accountInfo.avatar"></GAvatar>
         </div>
         <div class="g-user-drawer-info-list">
           <div class="g-user-drawer-info-list-name">
-            <span class="break-all">{{ accountInfo.nickname }}</span>
+            <span class="break-all">{{ accountInfo.username?accountInfo.username[0]:'' }}</span>
             <GIcon class="close-icon" name="gt-close" size="12" @click="handleClose" />
           </div>
           <div class="g-user-drawer-info-list-id break-all">@{{ accountInfo.username }}</div>

src/stores/user.ts

@@ -22,7 +22,7 @@ export interface AccountInfo {
 export const useAccountStore = defineStore('accountInfo', () => {
   const cacheInfo = localStorage.getItem('userInfo');
   const isLogin = ref(Boolean(localStorage.getItem('access_token')));
-  const userInfo = cacheInfo ? JSON.parse(cacheInfo) : {};
+  const userInfo = cacheInfo ? JSON.parse(cacheInfo).data : {};
   const accountInfo = reactive<AccountInfo>({
     access_token: localStorage.getItem('access_token') || '',
     refresh_token: localStorage.getItem('refresh_token') || '',

src/utils/request.ts

@@ -16,7 +16,7 @@ const setPassportPrefix = (url: string, method: string) => {
   if (prefix) {
     if (url?.includes('/api/v1/user/')) {
       // 用户信息相关
-      return `${prefix}${url}`;
+      return `${url}`;
     }
     if (url?.includes('/api/v1/oauth/')) {
       // 用户权限

src/views/Jyh/AIRepair/index.vue

@@ -1,4 +1,17 @@
 <template>
+  <div class="info-outside w-full">
+    <div class="info">
+      <div class="flex items-center justify-start w-full gap-1">
+        <img src="@/assets/imgs/jyh/aiIcon.png">
+        <span class="text-base font-medium">AI修复建议:</span>
+      </div>
+      <div>
+        <ul>
+          <li v-for="info in infoList">{{ info }}</li>
+        </ul>
+      </div>
+    </div>
+  </div>
   <div class="ai-container">
     <div class="ai-container-card" style="width: 100%;" v-for="(rowItem, index) in list" :key="index">
       <Panel :expand="rowItem.expand">
@@ -43,6 +56,7 @@
         <template #body>
           <div style="padding: 8px 20px 20px 20px; width: 100%;">
             <Table :tableConfig="tableConfig" :dataSource="rowItem.data.listData"/>
+            <div class="w-full flex items-center justify-end"><span>共{{ rowItem.data.listData.length }}条</span></div>
           </div>
         </template>
       </Panel>
@@ -55,6 +69,11 @@ import { ref } from 'vue';
 import Panel from '@/components/AIRepair/Panel.vue';
 import Table from '@/components/AIRepair/Table.vue';
 
+const infoList = ref([
+  '当前代码主要风险为易受常见的注入攻击，包括命令注入、SQL注入、表达式注入，针对每种攻击，应提供相应的防范措施，如数据校验、使用安全函数和限制程序权限。',
+  '相对上一次检查，【提升点】在于代码基础编码问题少了47.8%，问题总数降低29.3%；'
+])
+
 const tableConfig = ref([
   {
     field: 'securityProblemCode',
@@ -122,6 +141,44 @@ const list = ref([
       ]
     }
   },
+  {
+    expand: true,
+    data: {
+      listData: [
+      {
+          securityProblemCode: '1',
+          type: '安全问题',
+          CWEcode: 'CWE-123',
+          score: 100
+        },
+        {
+          securityProblemCode: '2',
+          type: '安全问题',
+          CWEcode: 'CWE-123',
+          score: 100
+        }
+      ]
+    }
+  },
+  {
+    expand: true,
+    data: {
+      listData: [
+      {
+          securityProblemCode: '1',
+          type: '安全问题',
+          CWEcode: 'CWE-123',
+          score: 100
+        },
+        {
+          securityProblemCode: '2',
+          type: '安全问题',
+          CWEcode: 'CWE-123',
+          score: 100
+        }
+      ]
+    }
+  },
   {
     expand: true,
     data: {
@@ -204,4 +261,26 @@ const list = ref([
   width: 14px;
   height: 14px;
 }
+
+.info-outside {
+  margin: 20px 0;
+  padding: 1px;
+  border-radius: 8px;
+  background-image: linear-gradient(134.79deg, #A4F7DF 0%, #A0CEFB 21%, #5F9AFE 43%, #D9B9FC 62%, #01EFBB 73%, #FBAE46 100%);
+}
+
+.info {
+  padding: 10px 20px;
+  border-radius: 8px;
+  background-color: #ffffff;
+  img {
+    width: 24px;
+    height: 24px;
+  }
+  ul {
+    list-style: disc;
+    padding-left: 18px;
+    line-height: 22px;
+  }
+}
 </style>

src/views/Jyh/PersonalCenter/index.vue

@@ -8,9 +8,9 @@
       </d-breadcrumb>
       <div class="version-detail-header">
         <div class="header-top">
-          <GAvatar style="margin-right: 16px" :src="avatarUrl" name="Vue" :width="72" :height="72"></GAvatar>
+          <GAvatar style="margin-right: 16px" :name="accountInfo.username" :src="accountInfo.avatar" name="Vue" :width="72" :height="72"></GAvatar>
           <div class="pt-24">
-            <div class="header-title1">UserName</div>
+            <div class="header-title1">{{ accountInfo.username || '--' }}</div>
             <div class="header-div">
               <span class="span1">介绍：包含项目管理、代码托管、CI/CD 和制品库等功能，提供完整的研发流程建议的新的团队…</span>
             </div>
@@ -44,11 +44,13 @@ import EarlyWarning from './Detail/EarlyWarning.vue';
 import SubscribeList from './Detail/SubscribeList.vue';
 import OrganizationManage from './OrganizationManage/OrganizationManage.vue';
 import InvitationNoticeList from './Detail/InvitationNoticeList.vue';
+import { useAccount } from '@/utils/hooks/useAccount';
 
 const { namespace } = getOrgInfo();
 const avatarUrl = '/src/assets/imgs/avatar/male.png';
 
 const selectTab = ref('yjtzlb');
+const { accountInfo, RemoveInfo } = useAccount();
 
 // 删除弹窗
 const item = ref('');

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

@@ -0,0 +1,254 @@
+<template>
+  <div class="info w-full">
+    <div class="flex items-center justify-start w-full gap-1">
+      <img src="@/assets/imgs/jyh/infoIcon.png">
+      <span class="text-base font-medium">治理标准:</span>
+    </div>
+    <div>
+      <ul>
+        <li>
+          1、在依赖冲突或者解决依赖软件漏洞的场景下，产品引入的依赖组件与社区的依赖关系不一致，从而通过产品自行录入，由使用方自行维护（可通过“产品快速补包流程维护”，<a class="devui-link">操作指导</a>）。该部分的依赖组件漏洞由产品自行解决。
+        </li>
+        <li>
+          2、点击下面组件编码跳转到组件详情页面，可直接看到基于当前火车过滤的组件依赖路径。
+        </li>
+      </ul>
+    </div>
+  </div>
+  <div class="flex items-center justify-end gap-3 mt-3">
+    <d-button variant="text" icon="export">导出</d-button>
+    <div class="vertical-line"></div>
+    <d-button variant="text" @click="openAll(baseTreeTableData1)">
+      <div v-if="!isAllExpand" class="flex items-center justify-start gap-1">
+        <img style="width: 14px; height: 14px;" src="@/assets/imgs/jyh/openAll.png">
+        全部展开
+      </div>
+      <div v-else class="flex items-center justify-start gap-1">
+        <img style="width: 14px; height: 14px;" src="@/assets/imgs/jyh/closeAll.png">
+        全部关闭
+      </div>
+    </d-button>
+  </div>
+  <Card simple class="jyh-card mt-3">
+    <div class="clear-padding">
+      <d-table ref="table" :data="baseTreeTableData1" >
+        <d-column width="20px" type="index">
+        </d-column>
+        <d-column field="name" header="组件版本名称" show-overflow-tooltip></d-column>
+        <d-column field="groupid" header="groupid"></d-column>
+        <d-column field="code" filterable :filter-list="filterList" @filter-change="handleFilterChange" header="组件编号">
+          <template #default="scope">
+            <a class="devui-link" @click="showDetail = true">{{ scope.row.code }}</a>
+          </template>
+        </d-column>
+        <d-column field="packageName" filterable :filter-list="packageFilterList" @filter-change="handleFilterChange" header="packageName"></d-column>
+        <d-column field="version" filterable :filter-list="versionFilterList" @filter-change="handleFilterChange" header="version"></d-column>
+        <d-column field="language" filterable :filter-list="languageFilterList" @filter-change="handleFilterChange" header="编程语言"></d-column>
+        <d-column field="number" header="组件漏洞数量">
+          <template #default="scope">
+            <a class="devui-link" @click="showDetail = true">{{ scope.row.number }}</a>
+          </template>
+        </d-column>
+      </d-table>
+    </div>
+  </Card>
+  <div class="w-full flex justify-end my-4">
+      <d-pagination
+        size="sm"
+        :total="pager.total"
+        v-model:pageSize="pager.pageSize"
+        v-model:pageIndex="pager.pageIndex"
+        :can-view-total="true"
+        :can-change-page-size="true"
+        :can-jump-page="true"
+        :max-items="5"
+      />
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, reactive } from 'vue';
+const checked = ref(false);
+const showDetail = ref(false);
+const table = ref(null)
+const isAllExpand = ref(false);
+const pager = ref({
+  pageIndex: 1,
+  pageSize: 30,
+  total: 10
+})
+const filterList = ref([{name: '001', value: '001'}, {name: '002', value: '002'}, {name: '003', value: '003'}, {name: '004', value: '004'}])
+const handleFilterChange = (val) => {
+  if (!val.length) {
+    baseTreeTableData1.value = [ ...originSource.value ]
+    return
+  }
+  const filterList = val.map((item) => item.value);
+  baseTreeTableData1.value = originSource.value.filter((item) => filterList.includes(item.code));
+};
+const originSource = ref([
+  {
+    id: '1',
+    name: 'ssl',
+    groupid: '2000000',
+    code: '001',
+    packageName: '包名称',
+    version: '202306',
+    language: 'java',
+    number: '20',
+    children: [
+      {
+        id: '2',
+        name: 'ssl',
+        groupid: '2000000',
+        code: '001',
+        packageName: '包名称',
+        version: '202306',
+        language: 'java',
+        number: '20',
+        children: [
+          {
+            id: '3',
+            name: 'ssl',
+            groupid: '2000000',
+            code: '001',
+            packageName: '包名称',
+            version: '202306',
+            language: 'java',
+            number: '20',
+          },
+          {
+            id: '4',
+            name: 'ssl',
+            groupid: '2000000',
+            code: '001',
+            packageName: '包名称',
+            version: '202306',
+            language: 'java',
+            number: '20',
+          }
+        ]
+      }
+    ]
+  },
+  {
+    id: '5',
+    name: 'ssl',
+    groupid: '2000000',
+    code: '002',
+    packageName: '包名称',
+    version: '202306',
+    language: 'java',
+    number: '10',
+    children: [
+      {
+        id: '6',
+        name: 'ssl',
+        groupid: '2000000',
+        code: '003',
+        packageName: '包名称',
+        version: '202306',
+        language: 'java',
+        number: '20',
+        children: [
+          {
+            id: '7',
+            name: 'ssl',
+            groupid: '2000000',
+            code: '003',
+            packageName: '包名称',
+            version: '202306',
+            language: 'java',
+            number: '11',
+          },
+          {
+            id: '8',
+            name: 'ssl',
+            groupid: '2000000',
+            code: '004',
+            packageName: '包名称',
+            version: '202306',
+            language: 'java',
+            number: '30',
+          }
+        ]
+      }
+    ]
+  },
+  {
+    id: '9',
+    name: 'ssl',
+    groupid: '2000000',
+    code: '001',
+    packageName: '包名称',
+    version: '202306',
+    language: 'java',
+    number: '5',
+  }
+]);
+const baseTreeTableData1 = ref([...originSource.value]);
+
+const packageFilterList = ref(originSource.value.map(item => {
+  return {name: item.packageName, value: item.packageName}
+}))
+
+const versionFilterList = ref(originSource.value.map(item => {
+  return {name: item.version, value: item.version}
+}))
+
+const languageFilterList = ref(originSource.value.map(item => {
+  return {name: item.language, value: item.language}
+}))
+
+const openAll = (tree) => {
+  if (!tree || !tree.length) {
+    return
+  }
+
+  tree.forEach(node => {
+    table.value.store.toggleRowExpansion(node);
+    if (node.children) {
+      openAll(node.children);
+    }
+  })
+  isAllExpand.value = !isAllExpand.value
+}
+
+const sortNumberMethod = (a, b) => {
+  return a.number > b.number
+}
+</script>
+
+<style scoped lang="scss">
+@import 'devui-theme/styles-var/devui-var.scss';
+.clear-padding {
+  margin: -16px -20px;
+}
+:deep(.devui-table__cell) {
+  display: flex;
+  align-items: center;
+  .devui-table__tree-operate {
+    transform: translateY(-3px);
+  }
+}
+
+.info {
+  padding: 10px 20px;
+  border-radius: 4px;
+  background: #E1E8FD;
+  img {
+    width: 14px;
+    height: 14px;
+  }
+  ul {
+    padding-left: 18px;
+    line-height: 22px;
+  }
+}
+
+.vertical-line {
+  width: 1px;
+  height: 20px;
+  background-color: #dcdcdc; /* 设置竖线颜色 */
+  margin: 0 8px; /* 设置竖线与按钮的间距 */
+}
+</style>

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

@@ -46,6 +46,7 @@
       <version-info v-if="selectTab === 'bbxx'" @changeTabs="changeTabs"></version-info>
       <vulnerabilities-list v-else-if="selectTab === 'ldxx'"></vulnerabilities-list>
       <community-info v-else-if="selectTab === 'communityInfo'"></community-info>
+      <Dependence v-else-if="selectTab === 'ylgx'"></Dependence>
       <SBOM v-else-if="selectTab === 'SBOM'" />
       <AIRepair v-else-if="selectTab === 'ai'"></AIRepair>
       <LicenseInfo v-else-if="selectTab === 'licenseInfo'"></LicenseInfo>
@@ -63,6 +64,7 @@ import VersionInfo from './VersionInfo.vue';
 import SBOM from './SBOM.vue';
 import AIRepair from '../../AIRepair/index.vue';
 import LicenseInfo from '../../LicenseInfo/index.vue';
+import Dependence from './Dependency.vue'
 const { namespace } = getOrgInfo();
 const route = useRoute(); // 获取路由对象
 const avatarUrl = '/src/assets/imgs/jyh/工程首字母图标.png';