From 182fd9e8b0bdd1b8164470e701b52b3b1e56096e Mon Sep 17 00:00:00 2001
From: JohnYan <84345999@qq.com>
Date: Mon, 14 Feb 2022 16:21:35 +0800
Subject: [PATCH] v5.2

---
 .gitignore              |  4 +++-
 README.md               | 25 +++++++++++++++----------
 log/.keep               |  0
 manage.py               | 10 ++++++++++
 smartcharts/embeded.py  | 34 ----------------------------------
 smartcharts/settings.py |  3 ++-
 6 files changed, 30 insertions(+), 46 deletions(-)
 create mode 100644 log/.keep
 delete mode 100644 smartcharts/embeded.py

diff --git a/.gitignore b/.gitignore
index 39155b9..d1755c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 # Project exclude paths
-/venv/
\ No newline at end of file
+/venv/
+/.idea/
+.gitignore
\ No newline at end of file
diff --git a/README.md b/README.md
index 8472a33..89ccc1d 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
 </p>
 
 <p align="center">
-    <img src="https://img.shields.io/badge/Release-V5.1-green.svg" alt="Downloads">
+    <img src="https://img.shields.io/badge/Release-V5.2-green.svg" alt="Downloads">
 	<a target="_blank" href="https://www.python.org/downloads/release/python-390/">
 		<img src="https://img.shields.io/badge/Python-3.6+-green.svg" />
 	</a>
@@ -132,16 +132,8 @@ API服务, smartchart可以让你轻松完成
 
 ------------------------------------------------
 ### 数据库支持说明
-Smartchart理论上可以支持任意的数据源
+Smartchart理论上可以支持任意的数据源, 详见文档中使用说明
 
-- 默认支持的有mysql,sqlite,API,EXCEL数据, 你可以使用python连接器扩展任意数据源
-- SQL Server     需安装 pip install pymssql
-- ORACLE         需安装 pip install cx_Oracle
-- GP,Postgrep    需安装 pip install psycopg2
-- Impala         需安装 pip install impyla
-- DB2            需安装 pip install ibm_db
-- Python         需安装 pip install pandas, openpyxl
-- ....
 
 ### 联系我们与帮助
 **安装及使用问题,可加以下微信号**
@@ -201,6 +193,19 @@ v5.1
 - 增加一键实现滚动表格及图片轮播图形, 增加一键实现边框效果
 - 增强体验去除默认加载地图js, 所有非常用js改为动态加载
 v5.1.10 增加rem与px互转功能,优化模板开发体验
+v5.2
+- 优化通用数据集开发
+- 自由模式开发序号问题解决
+- 增加频幕日志打印
+- 增加样式可视化开发
+- 增加仪表盘版本控制,备份恢复
+- 增加仪表盘服务器之间同步
+- 增加资源文件上传功能
+- 增加对clickhouse,达梦等数据库支持
+- 增加JDBC连接器
+- Echarts升级到5.3
+- 首页增加主题选择
+- 仪表盘V,R,E增加图标防呆
 ```
 
 
diff --git a/log/.keep b/log/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/manage.py b/manage.py
index dbd67c0..ffe3b4d 100755
--- a/manage.py
+++ b/manage.py
@@ -5,6 +5,15 @@ import sys
 
 
 def main():
+    SMARTCHART = '''
+         _____       ___  ___       ___   _____    _____   _____   _   _       ___   _____    _____
+        /  ___/     /   |/   |     /   | |  _  \  |_   _| /  ___| | | | |     /   | |  _  \  |_   _|
+        | |___     / /|   /| |    / /| | | |_| |    | |   | |     | |_| |    / /| | | |_| |    | |
+        \___  \   / / |__/ | |   / / | | |  _  /    | |   | |     |  _  |   / / | | |  _  /    | |
+         ___| |  / /       | |  / /  | | | | \ \    | |   | |___  | | | |  / /  | | | | \ \    | |
+        /_____/ /_/        |_| /_/   |_| |_|  \_\   |_|   \_____| |_| |_| /_/   |_| |_|  \_\   |_|
+        www.smartchart.cn   version: 5.2
+    '''
     """Run administrative tasks."""
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'smartcharts.settings')
     try:
@@ -15,6 +24,7 @@ def main():
             "available on your PYTHONPATH environment variable? Did you "
             "forget to activate a virtual environment?"
         ) from exc
+    print(SMARTCHART)
     execute_from_command_line(sys.argv)
 
 
diff --git a/smartcharts/embeded.py b/smartcharts/embeded.py
deleted file mode 100644
index f2d161b..0000000
--- a/smartcharts/embeded.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import time
-import hashlib
-import os
-
-"""
-参数说明：
-id: 用户名（在smartchart平台中管理）
-stamp: 时间戳(1970年1月1日到生成时间的毫秒数)
-token: 采用sha1加密, token=SHA1(链接秘钥+stamp+id)
-	   链接秘钥默认smartchart,
-	   请在环境变量设定SMART_KEY替换（重要）
-url: 登录成功后跳转链接
-"""
-
-SMART_CHART_URL = 'http://127.0.0.1:8000'
-LOGIN_URL = SMART_CHART_URL + '/echart/smart_login?id={id}&stamp={stamp}&token={token}&url={url}'
-SMART_KEY = os.environ.get('SMART_KEY', 'smartchart')
-
-
-def get_smarturl(username, url='/'):
-    stamp = int(time.time() * 1000)
-    id = username
-    res = SMART_KEY + str(stamp) + id
-    token = hashlib.sha1(res.encode('utf-8')).hexdigest()
-    LOGIN_DICT = {
-        "id": id,
-        "stamp": stamp,
-        "token": token,
-        "url": url
-    }
-
-    # 拼接好的url,直接访问
-    visit_url = LOGIN_URL.format(**LOGIN_DICT)
-    return visit_url
diff --git a/smartcharts/settings.py b/smartcharts/settings.py
index 3ae3e11..e00954e 100644
--- a/smartcharts/settings.py
+++ b/smartcharts/settings.py
@@ -21,7 +21,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '#$lc1_v_)tof%192ew9fow#o+1#d1qu84d@c11y*sgjqkkl*&b'
+SECRET_KEY = '#$lc1_v_)tof%192ew9fww#o+1#d1qu84d@c11y*sgjqkkl*&b'
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
@@ -130,6 +130,7 @@ USE_TZ = False
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.1/howto/static-files/
 # 开启STATIC_ROOT后执行: python manage.py collectstatic
+# 执行完后注释掉
 # STATIC_ROOT = os.path.join(BASE_DIR, "static")
 STATIC_URL = '/static/'
 STATICFILES_DIRS = [