From c6ca897becc6cc810b39899a3ca97e3966a7adf7 Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Mon, 18 May 2020 14:52:11 +0800
Subject: [PATCH] =?UTF-8?q?A=20=E6=B7=BB=E5=8A=A0=E5=85=B3=E4=BA=8E?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2web=E7=89=88=E6=9C=AC=E5=8F=B7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spug_api/spug/settings.py                  | 2 +-
 spug_web/src/libs/index.js                 | 1 +
 spug_web/src/pages/system/setting/About.js | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/spug_api/spug/settings.py b/spug_api/spug/settings.py
index 05974059..b92af2a4 100644
--- a/spug_api/spug/settings.py
+++ b/spug_api/spug/settings.py
@@ -121,7 +121,7 @@
     re.compile('/apis/.*'),
 )
 
-SPUG_VERSION = 'v2.2.5'
+SPUG_VERSION = 'v2.2.6'
 
 # override default config
 try:
diff --git a/spug_web/src/libs/index.js b/spug_web/src/libs/index.js
index c61697eb..938c98bb 100644
--- a/spug_web/src/libs/index.js
+++ b/spug_web/src/libs/index.js
@@ -8,3 +8,4 @@ import _http from './http';
 export * from './functools';
 export * from './router';
 export const http = _http;
+export const VERSION = 'v2.2.6';
diff --git a/spug_web/src/pages/system/setting/About.js b/spug_web/src/pages/system/setting/About.js
index 8c5bcfe2..7fed35e3 100644
--- a/spug_web/src/pages/system/setting/About.js
+++ b/spug_web/src/pages/system/setting/About.js
@@ -7,7 +7,7 @@ import React from 'react';
 import styles from './index.module.css';
 import { Descriptions, Spin } from "antd";
 import { observer } from 'mobx-react'
-import { http } from 'libs';
+import { http, VERSION } from 'libs';
 
 
 @observer
@@ -36,7 +36,8 @@ class About extends React.Component {
           <Descriptions.Item label="操作系统">{info['system_version']}</Descriptions.Item>
           <Descriptions.Item label="Python版本">{info['python_version']}</Descriptions.Item>
           <Descriptions.Item label="Django版本">{info['django_version']}</Descriptions.Item>
-          <Descriptions.Item label="Spug版本">{info['spug_version']}</Descriptions.Item>
+          <Descriptions.Item label="Spug API版本">{info['spug_version']}</Descriptions.Item>
+          <Descriptions.Item label="Spug Web版本">{VERSION}</Descriptions.Item>
           <Descriptions.Item label="官网文档">
             <a href="https://spug.dev" target="_blank" rel="noopener noreferrer">https://spug.dev</a>
           </Descriptions.Item>