fix: 更新版本信息获取方式

This commit is contained in:
GraceWalk
2022-10-28 17:36:52 +08:00
committed by EricZeng
parent 1a5e2c7309
commit 37037c19f0

View File

@@ -3,12 +3,13 @@ import '@babel/polyfill';
import React, { useState, useEffect, useLayoutEffect } from 'react'; import React, { useState, useEffect, useLayoutEffect } from 'react';
import { BrowserRouter, Switch, Route, useLocation, useHistory } from 'react-router-dom'; import { BrowserRouter, Switch, Route, useLocation, useHistory } from 'react-router-dom';
import { get as lodashGet } from 'lodash'; import { get as lodashGet } from 'lodash';
import { DProLayout, AppContainer, Menu, Utils, Page403, Page404, Page500, Modal } from 'knowdesign'; import { DProLayout, AppContainer, Menu, Utils, Page500, Modal } from 'knowdesign';
import { IconFont } from '@knowdesign/icons'; import { IconFont } from '@knowdesign/icons';
import dantdZhCN from 'knowdesign/es/locale/zh_CN'; import dantdZhCN from 'knowdesign/es/locale/zh_CN';
import dantdEnUS from 'knowdesign/es/locale/en_US'; import dantdEnUS from 'knowdesign/es/locale/en_US';
import { DotChartOutlined } from '@ant-design/icons'; import { DotChartOutlined } from '@ant-design/icons';
import { licenseEventBus } from './constants/axiosConfig'; import { licenseEventBus } from './constants/axiosConfig';
import { Page403, Page404, NoLicense } from './pages/ErrorPages';
import intlZhCN from './locales/zh'; import intlZhCN from './locales/zh';
import intlEnUS from './locales/en'; import intlEnUS from './locales/en';
import registerApps from '../config/registerApps'; import registerApps from '../config/registerApps';
@@ -18,13 +19,21 @@ import { Login } from './pages/Login';
import { getLicenseInfo } from './constants/common'; import { getLicenseInfo } from './constants/common';
import api from './api'; import api from './api';
import ClusterContainer from './pages/index'; import ClusterContainer from './pages/index';
import NoLicense from './pages/NoLicense';
import ksLogo from './assets/ks-logo.png'; import ksLogo from './assets/ks-logo.png';
interface ILocaleMap { interface ILocaleMap {
[index: string]: any; [index: string]: any;
} }
interface VersionInfo {
'git.branch': string;
'git.build.itme': string;
'git.build.version': string;
'git.commit.id': string;
'git.commit.id.abbrev': string;
'git.commit.time': string;
}
const localeMap: ILocaleMap = { const localeMap: ILocaleMap = {
'zh-CN': { 'zh-CN': {
dantd: dantdZhCN, dantd: dantdZhCN,
@@ -106,6 +115,7 @@ const AppContent = (props: { setlanguage: (language: string) => void }) => {
const history = useHistory(); const history = useHistory();
const userInfo = localStorage.getItem('userInfo'); const userInfo = localStorage.getItem('userInfo');
const [curActiveAppName, setCurActiveAppName] = useState(''); const [curActiveAppName, setCurActiveAppName] = useState('');
const [versionInfo, setVersionInfo] = useState<VersionInfo>();
useEffect(() => { useEffect(() => {
if (pathname.startsWith('/config')) { if (pathname.startsWith('/config')) {
@@ -115,6 +125,13 @@ const AppContent = (props: { setlanguage: (language: string) => void }) => {
} }
}, [pathname]); }, [pathname]);
// 获取版本信息
useEffect(() => {
Utils.request(api.getVersionInfo()).then((res: VersionInfo) => {
setVersionInfo(res);
});
}, []);
return ( return (
<DProLayout.Container <DProLayout.Container
headerProps={{ headerProps={{
@@ -142,7 +159,9 @@ const AppContent = (props: { setlanguage: (language: string) => void }) => {
isFixed: false, isFixed: false,
userDropMenuItems: [ userDropMenuItems: [
<Menu.Item key={0}> <Menu.Item key={0}>
<a href="https://github.com/didi/KnowStreaming/releases" target="_blank"></a> <a href="https://github.com/didi/KnowStreaming/releases" rel="noreferrer" target="_blank">
: {versionInfo?.['git.build.version']}
</a>
</Menu.Item>, </Menu.Item>,
<Menu.Item key={1} onClick={logout}> <Menu.Item key={1} onClick={logout}>