Merge remote-tracking branch 'origin/master'

# Conflicts: # requirements.txt
v0.5 SQL执行板块
2026-11-03 22:06:16 +08:00 · 2019-08-06 15:16:41 +08:00 · 2019-08-06 15:11:13 +08:00 · 2019-07-09 17:56:39 +08:00 · 2019-07-09 17:56:29 +08:00 · 2019-07-09 09:44:38 +00:00
4 changed files with 6 additions and 17 deletions
--- a/README.md
+++ b/README.md
@@ -157,6 +157,7 @@ APISERVER = 'https://192.168.100.111:6443'

 > 进入项目 cd  seal

+> sql/bin/config/config.toml 里面可以设置备份服务器，详情可以  github搜索   goInception
 ```
 chmod +x sql/bin/soar

--- a/requirements.txt
+++ b/requirements.txt
@@ -35,8 +35,7 @@ daphne==2.3.0
 decorator==4.3.0
 defusedxml==0.6.0
 dill==0.2.9
-Django==2.2.2
-django-adminlte-ui==1.1.0
+Django==2.2.4
 django-bootstrap3==11.0.0
 django-bootstrap4==0.0.7
 django-celery-beat==1.4.0
@@ -50,16 +49,6 @@ django-timezone-field==3.0
 djangorestframework==3.9.2
 docutils==0.14
 dramatiq==1.5.0
-Flask==1.0.3
-Flask-Admin==1.5.3
-Flask-AppBuilder==1.12.3
-Flask-Babel==0.12.2
-Flask-Caching==1.3.3
-Flask-Login==0.4.1
-Flask-OpenID==1.2.5
-Flask-SQLAlchemy==2.4.0
-flask-swagger==0.2.13
-Flask-WTF==0.14.2
 flower==0.9.3
 funcsigs==1.0.0
 future==0.16.0
--- a/seal/settings.py
+++ b/seal/settings.py
@@ -31,7 +31,6 @@ ALLOWED_HOSTS = ['*']
 # Application definition

 INSTALLED_APPS = [
-    'adminlteui',
    'django.contrib.admin',
    'django.contrib.auth',
    'django.contrib.contenttypes',
--- a/sql/bin/config/config.toml
+++ b/sql/bin/config/config.toml
@@ -38,10 +38,10 @@ log-rotate = true

 [inc]

-backup_host="192.168.100.200"
-backup_port=3308
-backup_user="root"
-backup_password="123456"
+#backup_host="192.168.100.50"
+#backup_port=3306
+#backup_user="root"
+#backup_password="123456"

 enable_nullable = true
 enable_drop_table = false
Author	SHA1	Message	Date
何全	ccc2409730	Merge remote-tracking branch 'origin/master' # Conflicts: # requirements.txt	2019-08-06 15:16:41 +08:00
何全	58eb0d0a2d	v0.5 SQL执行板块	2019-08-06 15:11:13 +08:00
何全	1eff1bb5cd	Merge pull request #2 from hequan2017/dependabot/pip/parso-0.5.0 Bump parso from 0.2.1 to 0.5.0	2019-07-09 17:56:39 +08:00
何全	e97993605e	Merge pull request #3 from hequan2017/dependabot/pip/django-2.2.3 Bump django from 2.2.2 to 2.2.3	2019-07-09 17:56:29 +08:00
dependabot[bot]	d378331b5d	Bump parso from 0.2.1 to 0.5.0 Bumps [parso](https://github.com/davidhalter/parso) from 0.2.1 to 0.5.0. - [Release notes](https://github.com/davidhalter/parso/releases) - [Changelog](https://github.com/davidhalter/parso/blob/master/CHANGELOG.rst) - [Commits](https://github.com/davidhalter/parso/compare/v0.2.1...v0.5.0) Signed-off-by: dependabot[bot] <support@github.com>	2019-07-09 09:44:38 +00:00
dependabot[bot]	e5e4a45595	Bump django from 2.2.2 to 2.2.3 Bumps [django](https://github.com/django/django) from 2.2.2 to 2.2.3. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/2.2.2...2.2.3) Signed-off-by: dependabot[bot] <support@github.com>	2019-07-09 09:44:38 +00:00