From cef1f9ad6759da6471e30735353358ec291266f0 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Mon, 11 Oct 2021 17:17:28 +0800 Subject: [PATCH] 1 --- myems-api/config.py | 4 +--- web/src/config.js | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/myems-api/config.py b/myems-api/config.py index f597e100..8431fd53 100644 --- a/myems-api/config.py +++ b/myems-api/config.py @@ -61,9 +61,6 @@ myems_reporting_db = { 'database': 'myems_reporting_db', } -# address for Cookie domain -myems_api_domain = '127.0.0.1' - # indicated in how many minutes to calculate meter energy consumption # 30 for half hourly period # 60 for hourly period @@ -83,3 +80,4 @@ upload_path = '/var/www/html/admin/upload/' # main currency unit currency_unit = 'CNY' + diff --git a/web/src/config.js b/web/src/config.js index b41075d9..4a3733d8 100644 --- a/web/src/config.js +++ b/web/src/config.js @@ -1,4 +1,4 @@ -export const version = '1.2.1'; +export const version = '1.3.0'; export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint export const topNavbarBreakpoint = 'lg'; //export const APIBaseURL = 'http://127.0.0.1:8000'; @@ -16,6 +16,7 @@ export const settings = { currency: '$', isNavbarVerticalCollapsed: false, navbarStyle: 'transparent', - language: 'zh_cn' + language: 'zh_CN' //en, de, zh_CN }; export default { version, navbarBreakPoint, topNavbarBreakpoint, settings, APIBaseURL }; +