Skip to content

Commit

Permalink
移除Themis模块,提升版本为v1.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
hhyo committed Aug 31, 2019
1 parent ee2c800 commit 5bd9ddc
Show file tree
Hide file tree
Showing 953 changed files with 6 additions and 161,506 deletions.
1 change: 0 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ omit =
src*
downloads*
sql/migrations/*
themis*
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
install:
- pip install codecov coverage flake8 mycli==1.19.0 -r requirements.txt
before_script:
- flake8 . --count --exclude=./.*,./themis --select=E9,F63,F7,F82 --show-source --statistics
- flake8 . --count --exclude=./.* --select=E9,F63,F7,F82 --show-source --statistics
- mysql -e "CREATE DATABASE archery CHARSET UTF8;"
- python manage.py makemigrations
- python manage.py makemigrations sql
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ python manage.py test -v 3
### 功能依赖
- 可视化 [pyecharts](https://github.com/pyecharts/pyecharts)
- MySQL审核/执行/备份 [goInception](https://github.com/hanchuanchuan/goInception)|[inception](https://github.com/hhyo/inception)
- 数据库审核 [Themis](https://github.com/CreditEaseDBA/Themis)
- MySQL索引优化 [SQLAdvisor](https://github.com/Meituan-Dianping/SQLAdvisor)
- SQL优化/压缩 [SOAR](https://github.com/XiaoMi/soar)
- Binlog2SQL [binlog2sql](https://github.com/danfengcao/binlog2sql)
Expand Down
2 changes: 1 addition & 1 deletion archery/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = (1, 6, 7)
version = (1, 7, 0)
display_version = '.'.join(str(i) for i in version)
12 changes: 0 additions & 12 deletions archery/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
'django_q',
'sql',
'sql_api',
'themis',
'common',
)

Expand Down Expand Up @@ -137,17 +136,6 @@
}
}

# themis审核所需mongodb数据库,账号角色必须有"anyAction" to "anyResource"权限
MONGODB_DATABASES = {
"default": {
"NAME": 'themis',
"USER": '',
"PASSWORD": '',
"HOST": '127.0.0.1',
"PORT": 27017,
},
}

# Django-Q
Q_CLUSTER = {
'name': 'archery',
Expand Down
1 change: 0 additions & 1 deletion archery/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@
path('admin/', admin.site.urls),
path('api/', include(('sql_api.urls', 'sql_api'), namespace="sql_api")),
path('', include(('sql.urls', 'sql'), namespace="sql")),
path('themis/', include(('themis.urls', 'themis'), namespace="themis")),
]
1 change: 0 additions & 1 deletion sql/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,6 @@ class Meta:
('menu_schemasync', '菜单 SchemaSync'),
('menu_system', '菜单 系统管理'),
('menu_document', '菜单 相关文档'),
('menu_themis', '菜单 数据库审核'),
('sql_submit', '提交SQL上线工单'),
('sql_review', '审核SQL上线工单'),
('sql_execute_for_resource_group', '执行SQL上线工单(资源组粒度)'),
Expand Down
12 changes: 0 additions & 12 deletions src/docker-compose/archery/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
'django_q',
'sql',
'sql_api',
'themis',
'common',
)

Expand Down Expand Up @@ -136,17 +135,6 @@
}
}

# themis审核所需mongodb数据库,账号角色必须有"anyAction" to "anyResource"权限
MONGODB_DATABASES = {
"default": {
"NAME": 'themis',
"USER": 'root',
"PASSWORD": '123456',
"HOST": 'mongo',
"PORT": 27017,
},
}

# Django-Q
Q_CLUSTER = {
'name': 'archery',
Expand Down
4 changes: 4 additions & 0 deletions src/init_sql/v1.6.7_v1.7.0.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-- 删除Themis权限
delete from auth_group_permissions where permission_id=(select permission_id from auth_permission where codename='menu_themis');
delete from sql_users_user_permissions where permission_id=(select permission_id from auth_permission where codename='menu_themis');
delete from auth_permission where codename='menu_themis';
Empty file removed themis/__init__.py
Empty file.
Empty file.
61 changes: 0 additions & 61 deletions themis/rule_analysis/db/db_operat.py

This file was deleted.

75 changes: 0 additions & 75 deletions themis/rule_analysis/db/mongo_operat.py

This file was deleted.

Empty file.
Empty file.
Loading

0 comments on commit 5bd9ddc

Please sign in to comment.