From 9dc9a1adb989180d1f23df46e0d183f8fb188f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= Date: Thu, 29 Jan 2026 11:08:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BB=93=E5=8F=AF?= =?UTF-8?q?=E4=BF=A1=E7=AD=89=E7=BA=A7=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/projectHome/explore/index.jsx | 45 +++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/src/forge/projectHome/explore/index.jsx b/src/forge/projectHome/explore/index.jsx index 2f1fec519..5322d3b50 100644 --- a/src/forge/projectHome/explore/index.jsx +++ b/src/forge/projectHome/explore/index.jsx @@ -19,6 +19,9 @@ import img16 from '../image/icon16.png'; import { rollingButton } from "../../../components/button"; const { Search } = Input; function ProjectHomePage(props) { + const {mygetHelmetapi} = props; + const {common} = mygetHelmetapi || {}; + const {governance="http://172.16.6.252:10010"} = common || {}; const carouselEL = createRef() const [current, setCurrent] = useState(0); const [cateList, setCateList] = useState(undefined); @@ -60,6 +63,12 @@ function ProjectHomePage(props) { const topicsLength = topicsByCateId && topicsByCateId.length const LIMIT = !topicsLength ? 30 : 25; + const trustLevelMap = { + 0: '不可信', + 1: '高度可信', + 2: '可信', + } + useEffect(() => { getCate(); // getList(); @@ -118,10 +127,40 @@ function ProjectHomePage(props) { axios.get(url, { params }).then(result => { if (result && result.data) { setTotal(result.data.total_count); - setProjectsList(result.data.projects); - setIsSpin(false); + // 遍历projects,请求供应链治理接口 获取可信等级 + const projectsWithTrustLevel = result.data.projects.map(async project => { + try { + const response = await axios.post(`${governance}/detect/software/trustPage`, + { + softwareName: project.identifier, + size: 1, + current: 1 + } + ); + const { data: records=[] } = response; + const trustLevel = records.length > 0 ? records[0].isTrust : null; + return { + ...project, + trustLevel: trustLevel // 假设返回的数据中有一个 trustLevel 字段 + }; + } catch (error) { + return { + ...project, + trustLevel: null // 如果请求失败,设置 trustLevel 为 null 或其他适当的值 + }; + } + }); + // 等待所有请求完成 + Promise.all(projectsWithTrustLevel).then(updatedProjects => { + setProjectsList(updatedProjects); + setIsSpin(false); + }).catch(error => { + setIsSpin(false); + }); } - }).catch(error => { }) + }).catch(error => { + setIsSpin(false); + }); } function getList() { From a32c2be087ba6ace4916a42058051c9dd231e74d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= Date: Thu, 29 Jan 2026 15:44:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=AF=E4=BF=A1?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E8=A7=92=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/projectHome/explore/index.jsx | 3 ++- src/forge/projectHome/explore/index.scss | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/forge/projectHome/explore/index.jsx b/src/forge/projectHome/explore/index.jsx index 5322d3b50..8b2ea7a82 100644 --- a/src/forge/projectHome/explore/index.jsx +++ b/src/forge/projectHome/explore/index.jsx @@ -288,10 +288,11 @@ function ProjectHomePage(props) { {projectsList.map(i => { const url = i.author ? `/${i.author.login}/${i.identifier}${cateID === 39 ? "" : "/about"}` : `` return
+ {i.trustLevel !== null && trustLevelMap[i.trustLevel] && {trustLevelMap[i.trustLevel]}}
{i.lesson_url && } {/* {!i.lesson_url && } */} -
+
{i.name}
diff --git a/src/forge/projectHome/explore/index.scss b/src/forge/projectHome/explore/index.scss index 68db57880..63949aea9 100644 --- a/src/forge/projectHome/explore/index.scss +++ b/src/forge/projectHome/explore/index.scss @@ -229,6 +229,28 @@ box-shadow: 0 0 12px rgba(92, 102, 193, 0.05); overflow: hidden; + .trustLevel{ + position: absolute; + top: 0px; + right: 0px; + width:72px; + height:29px; + text-align: center; + padding-top: 5px; + font-size: 13px; + clip-path: polygon(12px 0%, 100% 0%, 100% 100%, 0% 100%); + color:#f8952d; + background:linear-gradient(175.67deg,#fdcc97 7.9%,rgba(255, 255, 255, 0) 92.58%); + } + .trustLevel2{ + color: #1c9907; + background:linear-gradient(175.67deg,#bfeab8 7.9%,rgba(255, 255, 255, 0) 92.58%); + } + .trustLevel1{ + color:#6c59ff; + background:linear-gradient(175.67deg,#bfb7ff 7.9%,rgba(255, 255, 255, 0) 92.58%); + } + .task-hide-2 { word-break: break-all; } From ff361a2a82c9764fbacc5f8500da2e0dfd480374 Mon Sep 17 00:00:00 2001 From: liuhengshu <1375360142@qq.com> Date: Fri, 30 Jan 2026 15:58:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E5=8F=AF=E4=BF=A1=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/projectHome/explore/index.jsx | 17 +++++++++-------- src/forge/projectHome/explore/index.scss | 7 ++++++- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/forge/projectHome/explore/index.jsx b/src/forge/projectHome/explore/index.jsx index 8b2ea7a82..c97d4a284 100644 --- a/src/forge/projectHome/explore/index.jsx +++ b/src/forge/projectHome/explore/index.jsx @@ -21,7 +21,8 @@ const { Search } = Input; function ProjectHomePage(props) { const {mygetHelmetapi} = props; const {common} = mygetHelmetapi || {}; - const {governance="http://172.16.6.252:10010"} = common || {}; + // const {governance="http://172.16.6.252:10010"} = common || {}; + const governance=(window.location.hostname=='172.16.6.250'||window.location.hostname=='localhost')?'http://172.16.6.252:10002':'http://27.122.114.160:4000/governanceAdmin' const carouselEL = createRef() const [current, setCurrent] = useState(0); const [cateList, setCateList] = useState(undefined); @@ -64,6 +65,7 @@ function ProjectHomePage(props) { const LIMIT = !topicsLength ? 30 : 25; const trustLevelMap = { + '-1':'待治理', 0: '不可信', 1: '高度可信', 2: '可信', @@ -73,7 +75,7 @@ function ProjectHomePage(props) { getCate(); // getList(); getCateTopic(); - document.title = '菌用开源软件仓库'; + document.title = '军用开源软件仓库'; // 获取总数 getInitCount(); }, []) @@ -123,7 +125,6 @@ function ProjectHomePage(props) { params.language_id = topicId.split(",") params.topic_id = undefined } - axios.get(url, { params }).then(result => { if (result && result.data) { setTotal(result.data.total_count); @@ -137,16 +138,16 @@ function ProjectHomePage(props) { current: 1 } ); - const { data: records=[] } = response; + const records=response.data.data.records||[] const trustLevel = records.length > 0 ? records[0].isTrust : null; return { ...project, - trustLevel: trustLevel // 假设返回的数据中有一个 trustLevel 字段 + trustLevel: trustLevel|| '-1' // 假设返回的数据中有一个 trustLevel 字段 }; } catch (error) { return { ...project, - trustLevel: null // 如果请求失败,设置 trustLevel 为 null 或其他适当的值 + trustLevel: '-1' // 如果请求失败,设置 trustLevel 为 null 或其他适当的值 }; } }); @@ -180,8 +181,8 @@ function ProjectHomePage(props) {
服务可信资源共享
汇聚全球顶尖开源力量,构建安全、协同、创新的软件生态
- {/*
·护航菌事数智
*/} - {/*
汇聚全球顶尖开源力量,构建安全、协同、创新的软件生态,赋能菌事数字化转型与智能化升级
*/} + {/*
·护航军事数智
*/} + {/*
汇聚全球顶尖开源力量,构建安全、协同、创新的软件生态,赋能军事数字化转型与智能化升级
*/}
3 ? 'space-between' : 'space-around'}}> {count.map((item, index)=>{ diff --git a/src/forge/projectHome/explore/index.scss b/src/forge/projectHome/explore/index.scss index 63949aea9..d504eb5ef 100644 --- a/src/forge/projectHome/explore/index.scss +++ b/src/forge/projectHome/explore/index.scss @@ -236,18 +236,23 @@ width:72px; height:29px; text-align: center; - padding-top: 5px; + padding-top: 2px; font-size: 13px; clip-path: polygon(12px 0%, 100% 0%, 100% 100%, 0% 100%); color:#f8952d; background:linear-gradient(175.67deg,#fdcc97 7.9%,rgba(255, 255, 255, 0) 92.58%); } + .trustLevel0{ + color: #FF3838; + background:#FF9A9A; + } .trustLevel2{ color: #1c9907; background:linear-gradient(175.67deg,#bfeab8 7.9%,rgba(255, 255, 255, 0) 92.58%); } .trustLevel1{ color:#6c59ff; + padding-left: 4px; background:linear-gradient(175.67deg,#bfb7ff 7.9%,rgba(255, 255, 255, 0) 92.58%); } From 6a82e6ff4febbfcc2542c82df109bde6882ebed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= Date: Fri, 30 Jan 2026 16:26:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=96=E5=80=BC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/news/list/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/news/list/index.jsx b/src/news/list/index.jsx index 8b701f44f..171111a29 100644 --- a/src/news/list/index.jsx +++ b/src/news/list/index.jsx @@ -106,7 +106,7 @@ function List() { {firstActivity &&
{firstActivity.summary} - {moment(firstActivity.name).format('MM/DD')}
{moment(firstActivity.name).format('HH:MM')}
+ {moment(firstActivity.name).format('MM/DD')}
{moment(firstActivity.name).format('HH:mm')}
}