diff --git a/package.json b/package.json index 974f6e884..61b5f69d6 100644 --- a/package.json +++ b/package.json @@ -203,7 +203,7 @@ "eslintConfig": { "extends": "react-app" }, - "proxy": "http://172.20.32.203:4000/", + "proxy": "https://testforgeplus.trustie.net/", "port": "3007", "devDependencies": { "@babel/core": "^7.23.6", diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js index 319f95d94..a960c5e54 100644 --- a/src/common/UrlTool.js +++ b/src/common/UrlTool.js @@ -15,7 +15,7 @@ export function getImageUrl(path) { // https://testbdweb.trustie.net // const local = 'http://localhost:3000' path && !path.startsWith('/') && !path.startsWith('http') && (path = '/'.concat(path)); - const local = 'http://172.20.32.202:4000/'; + const local = 'https://testforgeplus.trustie.net'; if (isDev) { return `${local}${path}` } diff --git a/src/forge/AboutUs/AboutUs.jsx b/src/forge/AboutUs/AboutUs.jsx index 7a75fef1a..cd2baa86b 100644 --- a/src/forge/AboutUs/AboutUs.jsx +++ b/src/forge/AboutUs/AboutUs.jsx @@ -169,7 +169,7 @@ function AboutUs(){
-

多层次代码分析

+

军事数智生态市场

支持代码溯源分析、   
许可证风险分析、开源漏洞检测和加固建议   
diff --git a/src/forge/Main/projecthome/Index.jsx b/src/forge/Main/projecthome/Index.jsx index ba33f9c30..74c5eaf02 100644 --- a/src/forge/Main/projecthome/Index.jsx +++ b/src/forge/Main/projecthome/Index.jsx @@ -24,7 +24,7 @@ function Index(props) { useEffect(()=>{ getCate(); - document.title='开源项目'; + document.title='可信代码仓库'; },[]) useEffect(()=>{ diff --git a/src/glcc/home/banner/index.jsx b/src/glcc/home/banner/index.jsx index 381ec9c53..d470a21a2 100644 --- a/src/glcc/home/banner/index.jsx +++ b/src/glcc/home/banner/index.jsx @@ -52,11 +52,11 @@ function Banner({register,current_user}) { {/* style={{backgroundImage:`url(${getImageUrl(i.image)})`}} */}
- { + {/* { k +1 === bannerList.length && (!(current_user && current_user.login)) ?

立即注册

:"" - } + } */}
) diff --git a/src/home/FifthEdition.jsx b/src/home/FifthEdition.jsx index ed60f3c0c..211f38e4b 100644 --- a/src/home/FifthEdition.jsx +++ b/src/home/FifthEdition.jsx @@ -74,11 +74,12 @@ function FifthEdition() { const url =`/topics.json`; Axios.get(url,{params:{ topic_type:"cooperator", - limit:30, + limit:5, group_size:5 }}).then(result=>{ if(result){ - setTopics(result.data.topics); + let datas = result.data.topics; + setTopics(datas); } }).catch(error=>{}) } diff --git a/src/home/Img/2-4-1.png b/src/home/Img/2-4-1.png index 99fe85e22..05838d2dd 100644 Binary files a/src/home/Img/2-4-1.png and b/src/home/Img/2-4-1.png differ diff --git a/src/home/Img/2-4-1_old.png b/src/home/Img/2-4-1_old.png new file mode 100644 index 000000000..99fe85e22 Binary files /dev/null and b/src/home/Img/2-4-1_old.png differ diff --git a/src/home/Img/3-bg-old.png b/src/home/Img/3-bg-old.png new file mode 100644 index 000000000..171172a37 Binary files /dev/null and b/src/home/Img/3-bg-old.png differ diff --git a/src/home/Img/3-bg.png b/src/home/Img/3-bg.png index 171172a37..2bdaccb9f 100644 Binary files a/src/home/Img/3-bg.png and b/src/home/Img/3-bg.png differ diff --git a/src/home/Index.jsx b/src/home/Index.jsx index 5fd935964..3db7672e1 100644 --- a/src/home/Index.jsx +++ b/src/home/Index.jsx @@ -1,7 +1,7 @@ import React , { useEffect , useState } from 'react'; import "./Index.scss"; import TopEdition from './TopEdition'; -// import ThirdEdition from './ThirdEdition'; +import ThirdEdition from './ThirdEdition'; import ThirdeditionXing from './ThirdEditionXing'; import { Anchor } from 'antd'; import F41 from './Img/4-1.png'; @@ -9,7 +9,7 @@ import F42 from './Img/4-2.png'; import F43 from './Img/4-3.png'; import F44 from './Img/4-4.png'; import SecondEdition from './SecondEdition'; -// import FifthEdition from './FifthEdition'; +import FifthEdition from './FifthEdition'; import { TPMIndexHOC } from '../modules/tpm/TPMIndexHOC'; import Axios from 'axios'; @@ -97,13 +97,15 @@ function Index(props) { bannerTab && bannerTab.length > 0 ?