diff --git a/sql/static/dist/js/bootstrap-select.js b/sql/static/dist/js/bootstrap-select.js
index 26aa9e4f..4c07e7b3 100755
--- a/sql/static/dist/js/bootstrap-select.js
+++ b/sql/static/dist/js/bootstrap-select.js
@@ -803,7 +803,7 @@
if (!$menu.data('height')) $menu.data('height', $menu.height());
getHeight = $menu.data('height');
} else {
- getHeight = $menu.height();
+ //getHeight = $menu.height();
}
if (that.options.dropupAuto) {
diff --git a/sql/static/user/js/formatter.js b/sql/static/user/js/formatter.js
index a226a149..b3a021c5 100644
--- a/sql/static/user/js/formatter.js
+++ b/sql/static/user/js/formatter.js
@@ -22,7 +22,7 @@ sqlworkflowStatus = {
'autoreviewing': '自动审核中',
'manreviewing': '等待审核人审核',
'pass': '审核通过',
- 'tasktiming': '定时执行',
+ 'timingtask': '定时执行',
'executing': '执行中',
'autoreviewwrong': '自动审核不通过',
'exception': '执行有异常'
@@ -44,8 +44,8 @@ function sqlworkflowStatus_formatter(value) {
else if (value === sqlworkflowStatus.pass) {
return "" + sqlworkflowStatus.pass + ""
}
- else if (value === sqlworkflowStatus.tasktiming) {
- return "" + sqlworkflowStatus.tasktiming + ""
+ else if (value === sqlworkflowStatus.timingtask) {
+ return "" + sqlworkflowStatus.timingtask + ""
}
else if (value === sqlworkflowStatus.executing) {
return "" + sqlworkflowStatus.executing + ""
diff --git a/sql/urls.py b/sql/urls.py
index c8339604..91ca989f 100644
--- a/sql/urls.py
+++ b/sql/urls.py
@@ -1,7 +1,8 @@
# -*- coding: UTF-8 -*-
from django.conf.urls import url, include
-from . import views, views_ajax, query, aliyun_function, jobs
+from . import views, views_ajax, query, jobs
+from django.conf import settings
urlpatterns = [
url(r'^$', views.allworkflow, name='allworkflow'),
@@ -14,8 +15,9 @@
url(r'^autoreview/$', views.autoreview, name='autoreview'),
url(r'^detail/(?P[0-9]+)/$', views.detail, name='detail'),
- url(r'^passonly/$', views.passonly, name='passonly'),
+ url(r'^passed/$', views.passed, name='passed'),
url(r'^execute/$', views.execute, name='execute'),
+ url(r'^timingtask/$', views.timingtask, name='timingtask'),
url(r'^cancel/$', views.cancel, name='cancel'),
url(r'^rollback/$', views.rollback, name='rollback'),
url(r'^ldapsync/$', views.ldapsync, name='ldapsync'),
@@ -59,13 +61,18 @@
url(r'^slowquery_review/$', query.slowquery_review, name='slowquery_review'),
url(r'^slowquery_review_history/$', query.slowquery_review_history, name='slowquery_review_history'),
-
- url(r'^process_status/$', aliyun_function.process_status, name='process_status'),
- url(r'^sapce_status/$', aliyun_function.sapce_status, name='sapce_status'),
- url(r'^create_kill_session/$', aliyun_function.create_kill_session, name='create_kill_session'),
- url(r'^kill_session/$', aliyun_function.kill_session, name='kill_session'),
-
- url(r'^add_sqlcronjob/$', jobs.add_sqlcronjob, name='add_sqlcronjob'),
url(r'^del_sqlcronjob/$', jobs.del_sqlcronjob, name='del_sqlcronjob'),
]
+
+if settings.ALIYUN_RDS_MANAGE:
+ from . import aliyun_function
+
+ aliyun_function_url = [
+ url(r'^process_status/$', aliyun_function.process_status, name='process_status'),
+ url(r'^sapce_status/$', aliyun_function.sapce_status, name='sapce_status'),
+ url(r'^create_kill_session/$', aliyun_function.create_kill_session,
+ name='create_kill_session'),
+ url(r'^kill_session/$', aliyun_function.kill_session, name='kill_session'),
+ ]
+ urlpatterns.append(aliyun_function_url)
diff --git a/sql/views.py b/sql/views.py
index f6dd0802..ca582db8 100644
--- a/sql/views.py
+++ b/sql/views.py
@@ -1,18 +1,18 @@
-# -*- coding: UTF-8 -*-
-
+# -*- coding: UTF-8 -*-
+import datetime
import re
import json
from threading import Thread
from collections import OrderedDict
-from django.db import connection
+from django.db import connection, transaction
from django.utils import timezone
from django.conf import settings
from django.shortcuts import render, get_object_or_404
from django.http import HttpResponse, HttpResponseRedirect
from django.core.urlresolvers import reverse
-from sql.jobs import job_info, del_sqlcronjob
+from sql.jobs import job_info, add_sqlcronjob, del_sqlcronjob
from sql.sqlreview import getDetailUrl, execute_call_back
from .dao import Dao
from .const import Const, WorkflowDict
@@ -76,9 +76,9 @@ def submitSql(request):
context = {'errMsg': str(msg)}
return render(request, 'error.html', context)
- # 获取所有审核人
+ # 获取所有审核人，当前登录用户不可以审核
loginUser = request.session.get('login_username', False)
- reviewMen = users.objects.filter(role='审核人')
+ reviewMen = users.objects.filter(role='审核人').exclude(username=loginUser)
listAllReviewMen = [user.username for user in reviewMen]
context = {'currentMenu': 'submitsql', 'dictAllClusterDb': dictAllClusterDb, 'reviewMen': reviewMen}
@@ -190,7 +190,7 @@ def detail(request, workflowId):
loginUserOb = users.objects.get(username=loginUser)
# 获取定时执行任务信息
- if workflowDetail.status == Const.workflowStatus['tasktiming']:
+ if workflowDetail.status == Const.workflowStatus['timingtask']:
job_id = Const.workflowJobprefix['sqlreview'] + '-' + str(workflowId)
job = job_info(job_id)
if job:
@@ -245,7 +245,7 @@ def detail(request, workflowId):
# 审核通过，不执行
-def passonly(request):
+def passed(request):
workflowId = request.POST['workflowid']
if workflowId == '' or workflowId is None:
context = {'errMsg': 'workflowId参数为空.'}
@@ -350,6 +350,50 @@ def execute(request):
return HttpResponseRedirect(reverse('sql:detail', args=(workflowId,)))
+# 定时执行SQL
+def timingtask(request):
+ workflowId = request.POST.get('workflowid')
+ run_date = request.POST.get('run_date')
+ if run_date is None or workflowId is None:
+ context = {'errMsg': '时间不能为空'}
+ return render(request, 'error.html', context)
+ elif run_date < datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'):
+ context = {'errMsg': '时间不能小于当前时间'}
+ return render(request, 'error.html', context)
+ workflowDetail = workflow.objects.get(id=workflowId)
+ if workflowDetail.status not in [Const.workflowStatus['pass'], Const.workflowStatus['timingtask']]:
+ context = {'errMsg': '必须为审核通过或者定时执行状态'}
+ return render(request, 'error.html', context)
+
+ run_date = datetime.datetime.strptime(run_date, "%Y-%m-%d %H:%M:%S")
+ url = getDetailUrl(request) + str(workflowId) + '/'
+ job_id = Const.workflowJobprefix['sqlreview'] + '-' + str(workflowId)
+
+ try:
+ listAllReviewMen = json.loads(workflowDetail.review_man)
+ except ValueError:
+ listAllReviewMen = (workflowDetail.review_man,)
+
+ # 服务器端二次验证，正在执行定时执行SQL动作的当前登录用户必须为审核人或者提交人. 避免攻击或被接口测试工具强行绕过
+ loginUser = request.session.get('login_username', False)
+ if loginUser is None or (loginUser not in listAllReviewMen and loginUser != workflowDetail.engineer):
+ context = {'errMsg': '当前登录用户不是审核人或者提交人，请重新登录.'}
+ return render(request, 'error.html', context)
+
+ # 使用事务保持数据一致性
+ try:
+ with transaction.atomic():
+ # 将流程状态修改为定时执行
+ workflowDetail.status = Const.workflowStatus['timingtask']
+ workflowDetail.save()
+ # 调用添加定时任务
+ add_sqlcronjob(job_id, run_date, workflowId, url)
+ except Exception as msg:
+ context = {'errMsg': msg}
+ return render(request, 'error.html', context)
+ return HttpResponseRedirect(reverse('sql:detail', args=(workflowId,)))
+
+
# 终止流程
def cancel(request):
workflowId = request.POST['workflowid']
@@ -383,7 +427,7 @@ def cancel(request):
return HttpResponseRedirect(reverse('sql:detail', args=(workflowId,)))
# 删除定时执行job
- if workflowDetail.status == Const.workflowStatus['tasktiming']:
+ if workflowDetail.status == Const.workflowStatus['timingtask']:
job_id = Const.workflowJobprefix['sqlreview'] + '-' + str(workflowId)
del_sqlcronjob(job_id)
# 将流程状态修改为人工终止流程
diff --git a/sql/views_ajax.py b/sql/views_ajax.py
index 6a6c3f57..5a43c9e4 100644
--- a/sql/views_ajax.py
+++ b/sql/views_ajax.py
@@ -16,6 +16,7 @@
from django.http import HttpResponse, HttpResponseRedirect
from django.contrib.auth.decorators import login_required
from django.contrib.auth.hashers import check_password
+
if settings.ENABLE_LDAP:
from django_auth_ldap.backend import LDAPBackend
@@ -35,56 +36,64 @@
dao = Dao()
inceptionDao = InceptionDao()
prpCryptor = Prpcrypt()
-login_failure_counter = {} #登录失败锁定计数器，给loginAuthenticate用的
-sqlSHA1_cache = {} #存储SQL文本与SHA1值的对应关系，尽量减少与数据库的交互次数,提高效率。格式: {工单ID1:{SQL内容1:sqlSHA1值1, SQL内容2:sqlSHA1值2},}
+login_failure_counter = {} # 登录失败锁定计数器，给loginAuthenticate用的
+sqlSHA1_cache = {} # 存储SQL文本与SHA1值的对应关系，尽量减少与数据库的交互次数,提高效率。格式: {工单ID1:{SQL内容1:sqlSHA1值1, SQL内容2:sqlSHA1值2},}
workflowOb = Workflow()
+
def log_mail_record(login_failed_message):
mail_title = 'login inception'
logger.warning(login_failed_message)
if getattr(settings, 'MAIL_ON_OFF') == "on":
mailSender.sendEmail(mail_title, login_failed_message, getattr(settings, 'MAIL_REVIEW_SECURE_ADDR'))
-#ajax接口，登录页面调用，用来验证用户名密码
+
+# ajax接口，登录页面调用，用来验证用户名密码
@csrf_exempt
def loginAuthenticate(username, password):
"""登录认证，包含一个登录失败计数器，5分钟内连续失败5次的账号，会被锁定5分钟"""
lockCntThreshold = settings.LOCK_CNT_THRESHOLD
lockTimeThreshold = settings.LOCK_TIME_THRESHOLD
- #服务端二次验证参数
+ # 服务端二次验证参数
strUsername = username
strPassword = password
if strUsername == "" or strPassword == "" or strUsername is None or strPassword is None:
- result = {'status':2, 'msg':'登录用户名或密码为空，请重新输入!', 'data':''}
- elif strUsername in login_failure_counter and login_failure_counter[strUsername]["cnt"] >= lockCntThreshold and (datetime.datetime.now() - login_failure_counter[strUsername]["last_failure_time"]).seconds <= lockTimeThreshold:
+ result = {'status': 2, 'msg': '登录用户名或密码为空，请重新输入!', 'data': ''}
+ elif strUsername in login_failure_counter and login_failure_counter[strUsername]["cnt"] >= lockCntThreshold and (
+ datetime.datetime.now() - login_failure_counter[strUsername][
+ "last_failure_time"]).seconds <= lockTimeThreshold:
log_mail_record('user:{},login failed, account locking...'.format(strUsername))
- result = {'status':3, 'msg':'登录失败超过5次，该账号已被锁定5分钟!', 'data':''}
+ result = {'status': 3, 'msg': '登录失败超过5次，该账号已被锁定5分钟!', 'data': ''}
else:
correct_users = users.objects.filter(username=strUsername)
- if len(correct_users) == 1 and correct_users[0].is_active and check_password(strPassword, correct_users[0].password) == True:
- #调用了django内置函数check_password函数检测输入的密码是否与django默认的PBKDF2算法相匹配
+ if len(correct_users) == 1 and correct_users[0].is_active and check_password(strPassword,
+ correct_users[0].password) == True:
+ # 调用了django内置函数check_password函数检测输入的密码是否与django默认的PBKDF2算法相匹配
if strUsername in login_failure_counter:
- #如果登录失败计数器中存在该用户名，则清除之
+ # 如果登录失败计数器中存在该用户名，则清除之
login_failure_counter.pop(strUsername)
- result = {'status':0, 'msg':'ok', 'data':''}
+ result = {'status': 0, 'msg': 'ok', 'data': ''}
else:
if strUsername not in login_failure_counter:
- #第一次登录失败，登录失败计数器中不存在该用户，则创建一个该用户的计数器
- login_failure_counter[strUsername] = {"cnt":1, "last_failure_time":datetime.datetime.now()}
+ # 第一次登录失败，登录失败计数器中不存在该用户，则创建一个该用户的计数器
+ login_failure_counter[strUsername] = {"cnt": 1, "last_failure_time": datetime.datetime.now()}
else:
- if (datetime.datetime.now() - login_failure_counter[strUsername]["last_failure_time"]).seconds <= lockTimeThreshold:
+ if (datetime.datetime.now() - login_failure_counter[strUsername][
+ "last_failure_time"]).seconds <= lockTimeThreshold:
login_failure_counter[strUsername]["cnt"] += 1
else:
- #上一次登录失败时间早于5分钟前，则重新计数。以达到超过5分钟自动解锁的目的。
+ # 上一次登录失败时间早于5分钟前，则重新计数。以达到超过5分钟自动解锁的目的。
login_failure_counter[strUsername]["cnt"] = 1
login_failure_counter[strUsername]["last_failure_time"] = datetime.datetime.now()
- log_mail_record('user:{},login failed, fail count:{}'.format(strUsername,login_failure_counter[strUsername]["cnt"]))
- result = {'status':1, 'msg':'用户名或密码错误，请重新输入！', 'data':''}
+ log_mail_record(
+ 'user:{},login failed, fail count:{}'.format(strUsername, login_failure_counter[strUsername]["cnt"]))
+ result = {'status': 1, 'msg': '用户名或密码错误，请重新输入！', 'data': ''}
return result
-#ajax接口，登录页面调用，用来验证用户名密码
+
+# ajax接口，登录页面调用，用来验证用户名密码
@csrf_exempt
def authenticateEntry(request):
"""接收http请求，然后把请求中的用户名密码传给loginAuthenticate去验证"""
@@ -198,7 +207,7 @@ def sqlworkflow(request):
return HttpResponse(json.dumps(result, cls=DateEncoder), content_type='application/json')
-#提交SQL给inception进行自动审核
+# 提交SQL给inception进行自动审核
@csrf_exempt
def simplecheck(request):
if request.is_ajax():
@@ -208,8 +217,8 @@ def simplecheck(request):
sqlContent = request.POST['sql_content']
clusterName = request.POST['cluster_name']
- finalResult = {'status':0, 'msg':'ok', 'data':{}}
- #服务器端参数验证
+ finalResult = {'status': 0, 'msg': 'ok', 'data': {}}
+ # 服务器端参数验证
if sqlContent is None or clusterName is None:
finalResult['status'] = 1
finalResult['msg'] = '页面提交参数可能为空'
@@ -220,19 +229,19 @@ def simplecheck(request):
finalResult['status'] = 1
finalResult['msg'] = 'SQL语句结尾没有以;结尾，请重新修改并提交！'
return HttpResponse(json.dumps(finalResult), content_type='application/json')
- #交给inception进行自动审核
+ # 交给inception进行自动审核
try:
result = inceptionDao.sqlautoReview(sqlContent, clusterName)
except Exception as e:
finalResult['status'] = 1
- finalResult['msg'] = str(e) + '\n请参照安装文档配置pymysql'
+ finalResult['msg'] = str(e)
return HttpResponse(json.dumps(finalResult), content_type='application/json')
if result is None or len(result) == 0:
finalResult['status'] = 1
finalResult['msg'] = 'inception返回的结果集为空！可能是SQL语句有语法错误'
return HttpResponse(json.dumps(finalResult), content_type='application/json')
- #要把result转成JSON存进数据库里，方便SQL单子详细信息展示
+ # 要把result转成JSON存进数据库里，方便SQL单子详细信息展示
column_list = ['ID', 'stage', 'errlevel', 'stagestatus', 'errormessage', 'SQL', 'Affected_rows', 'sequence',
'backup_dbname', 'execute_time', 'sqlsha1']
rows = []
@@ -263,7 +272,8 @@ def simplecheck(request):
return HttpResponse(json.dumps(finalResult), content_type='application/json')
-#同步ldap用户到数据库
+
+# 同步ldap用户到数据库
@csrf_exempt
def syncldapuser(request):
ldapback = LDAPBackend()
@@ -276,7 +286,8 @@ def syncldapuser(request):
bind_password = settings.AUTH_LDAP_BIND_PASSWORD
basedn = settings.AUTH_LDAP_BASEDN
ldapconn.simple_bind_s(binddn, bind_password)
- ldapusers = ldapconn.search_s(basedn, ldap.SCOPE_SUBTREE, 'objectclass=*', attrlist=settings.AUTH_LDAP_USER_ATTRLIST)
+ ldapusers = ldapconn.search_s(basedn, ldap.SCOPE_SUBTREE, 'objectclass=*',
+ attrlist=settings.AUTH_LDAP_USER_ATTRLIST)
username_field = settings.AUTH_LDAP_USER_ATTR_MAP['username']
display_field = settings.AUTH_LDAP_USER_ATTR_MAP['display']
email_field = settings.AUTH_LDAP_USER_ATTR_MAP['email']
@@ -295,17 +306,20 @@ def syncldapuser(request):
result = {'msg': '同步{}个用户。'.format(count)}
return HttpResponse(json.dumps(result), content_type='application/json')
-#请求图表数据
+
+# 请求图表数据
@csrf_exempt
def getMonthCharts(request):
result = dao.getWorkChartsByMonth()
return HttpResponse(json.dumps(result), content_type='application/json')
+
@csrf_exempt
def getPersonCharts(request):
result = dao.getWorkChartsByPerson()
return HttpResponse(json.dumps(result), content_type='application/json')
+
def getSqlSHA1(workflowId):
"""调用django ORM从数据库里查出review_content，从其中获取sqlSHA1值"""
workflowDetail = get_object_or_404(workflow, pk=workflowId)
@@ -325,13 +339,14 @@ def getSqlSHA1(workflowId):
sqlSHA1_cache[workflowId] = dictSHA1
return dictSHA1
+
@csrf_exempt
def getOscPercent(request):
"""获取该SQL的pt-OSC执行进度和剩余时间"""
workflowId = request.POST['workflowid']
sqlID = request.POST['sqlID']
if workflowId == '' or workflowId is None or sqlID == '' or sqlID is None:
- context = {"status":-1 ,'msg': 'workflowId或sqlID参数为空.', "data":""}
+ context = {"status": -1, 'msg': 'workflowId或sqlID参数为空.', "data": ""}
return HttpResponse(json.dumps(context), content_type='application/json')
workflowId = int(workflowId)
@@ -346,7 +361,7 @@ def getOscPercent(request):
if dictSHA1 != {} and sqlID in dictSHA1:
sqlSHA1 = dictSHA1[sqlID]
try:
- result = inceptionDao.getOscPercent(sqlSHA1) #成功获取到SHA1值，去inception里面查询进度
+ result = inceptionDao.getOscPercent(sqlSHA1) # 成功获取到SHA1值，去inception里面查询进度
except Exception as msg:
result = {'status': 1, 'msg': msg, 'data': ''}
return HttpResponse(json.dumps(result), content_type='application/json')
@@ -360,40 +375,42 @@ def getOscPercent(request):
listExecResult = json.loads(execute_result)
except ValueError:
listExecResult = execute_result
- if type(listExecResult) == list and len(listExecResult) >= sqlID-1:
- if dictSHA1[sqlID] in listExecResult[sqlID-1][10]:
+ if type(listExecResult) == list and len(listExecResult) >= sqlID - 1:
+ if dictSHA1[sqlID] in listExecResult[sqlID - 1][10]:
# 已经执行完毕，进度值置为100
- pctResult = {"status":0, "msg":"ok", "data":{"percent":100, "timeRemained":""}}
+ pctResult = {"status": 0, "msg": "ok", "data": {"percent": 100, "timeRemained": ""}}
else:
# 可能因为前一条SQL是DML，正在执行中；或者还没执行到这一行。但是status返回的是4，而当前SQL实际上还未开始执行。这里建议前端进行重试
- pctResult = {"status":-3, "msg":"进度未知", "data":{"percent":-100, "timeRemained":""}}
+ pctResult = {"status": -3, "msg": "进度未知", "data": {"percent": -100, "timeRemained": ""}}
elif dictSHA1 != {} and sqlID not in dictSHA1:
- pctResult = {"status":4, "msg":"该行SQL不是由pt-OSC执行的", "data":""}
+ pctResult = {"status": 4, "msg": "该行SQL不是由pt-OSC执行的", "data": ""}
else:
- pctResult = {"status":-2, "msg":"整个工单不由pt-OSC执行", "data":""}
+ pctResult = {"status": -2, "msg": "整个工单不由pt-OSC执行", "data": ""}
return HttpResponse(json.dumps(pctResult), content_type='application/json')
+
@csrf_exempt
def getWorkflowStatus(request):
"""获取某个工单的当前状态"""
workflowId = request.POST['workflowid']
- if workflowId == '' or workflowId is None :
- context = {"status":-1 ,'msg': 'workflowId参数为空.', "data":""}
+ if workflowId == '' or workflowId is None:
+ context = {"status": -1, 'msg': 'workflowId参数为空.', "data": ""}
return HttpResponse(json.dumps(context), content_type='application/json')
workflowId = int(workflowId)
workflowDetail = get_object_or_404(workflow, pk=workflowId)
workflowStatus = workflowDetail.status
- result = {"status":workflowStatus, "msg":"", "data":""}
+ result = {"status": workflowStatus, "msg": "", "data": ""}
return HttpResponse(json.dumps(result), content_type='application/json')
+
@csrf_exempt
def stopOscProgress(request):
"""中止该SQL的pt-OSC进程"""
workflowId = request.POST['workflowid']
sqlID = request.POST['sqlID']
if workflowId == '' or workflowId is None or sqlID == '' or sqlID is None:
- context = {"status":-1 ,'msg': 'workflowId或sqlID参数为空.', "data":""}
+ context = {"status": -1, 'msg': 'workflowId或sqlID参数为空.', "data": ""}
return HttpResponse(json.dumps(context), content_type='application/json')
loginUser = request.session.get('login_username', False)
@@ -401,13 +418,13 @@ def stopOscProgress(request):
try:
listAllReviewMen = json.loads(workflowDetail.review_man)
except ValueError:
- listAllReviewMen = (workflowDetail.review_man, )
- #服务器端二次验证，当前工单状态必须为等待人工审核,正在执行人工审核动作的当前登录用户必须为审核人. 避免攻击或被接口测试工具强行绕过
+ listAllReviewMen = (workflowDetail.review_man,)
+ # 服务器端二次验证，当前工单状态必须为等待人工审核,正在执行人工审核动作的当前登录用户必须为审核人. 避免攻击或被接口测试工具强行绕过
if workflowDetail.status != Const.workflowStatus['executing']:
- context = {"status":-1, "msg":'当前工单状态不是"执行中"，请刷新当前页面！', "data":""}
+ context = {"status": -1, "msg": '当前工单状态不是"执行中"，请刷新当前页面！', "data": ""}
return HttpResponse(json.dumps(context), content_type='application/json')
if loginUser is None or loginUser not in listAllReviewMen:
- context = {"status":-1 ,'msg': '当前登录用户不是审核人，请重新登录.', "data":""}
+ context = {"status": -1, 'msg': '当前登录用户不是审核人，请重新登录.', "data": ""}
return HttpResponse(json.dumps(context), content_type='application/json')
workflowId = int(workflowId)
@@ -424,9 +441,10 @@ def stopOscProgress(request):
result = {'status': 1, 'msg': msg, 'data': ''}
return HttpResponse(json.dumps(result), content_type='application/json')
else:
- optResult = {"status":4, "msg":"不是由pt-OSC执行的", "data":""}
+ optResult = {"status": 4, "msg": "不是由pt-OSC执行的", "data": ""}
return HttpResponse(json.dumps(optResult), content_type='application/json')
+
# 获取SQLAdvisor的优化结果
@csrf_exempt
def sqladvisorcheck(request):
@@ -466,7 +484,8 @@ def sqladvisorcheck(request):
try:
p = subprocess.Popen(sqladvisor_path + ' -h "%s" -P "%s" -u "%s" -p "%s\" -d "%s" -v %s -q "%s"' % (
str(cluster_info.master_host), str(cluster_info.master_port), str(cluster_info.master_user),
- str(prpCryptor.decrypt(cluster_info.master_password),), str(dbName), verbose, sqlContent), stdin=subprocess.PIPE,
+ str(prpCryptor.decrypt(cluster_info.master_password), ), str(dbName), verbose, sqlContent),
+ stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, universal_newlines=True)
stdout, stderr = p.communicate()
finalResult['data'] = stdout
@@ -474,6 +493,7 @@ def sqladvisorcheck(request):
finalResult['data'] = 'sqladvisor运行报错，请联系管理员'
return HttpResponse(json.dumps(finalResult), content_type='application/json')
+
# 获取审核列表
@csrf_exempt
def workflowlist(request):
diff --git a/src/screenshots/admin.png b/src/screenshots/admin.png
index 89d3a296..a8943d51 100644
Binary files a/src/screenshots/admin.png and b/src/screenshots/admin.png differ
diff --git a/src/screenshots/applyforprivileges.png b/src/screenshots/applyforprivileges.png
index 0a8e5e22..08286752 100644
Binary files a/src/screenshots/applyforprivileges.png and b/src/screenshots/applyforprivileges.png differ
diff --git a/src/screenshots/datamasking.png b/src/screenshots/datamasking.png
index c0b8c0ce..d15a204c 100644
Binary files a/src/screenshots/datamasking.png and b/src/screenshots/datamasking.png differ
diff --git a/src/screenshots/datamaskingcolumns.png b/src/screenshots/datamaskingcolumns.png
index 81387fa3..39293739 100644
Binary files a/src/screenshots/datamaskingcolumns.png and b/src/screenshots/datamaskingcolumns.png differ
diff --git a/src/screenshots/datamaskingrules.png b/src/screenshots/datamaskingrules.png
index b30529e6..40e97c30 100644
Binary files a/src/screenshots/datamaskingrules.png and b/src/screenshots/datamaskingrules.png differ
diff --git a/src/screenshots/manageprivileges.png b/src/screenshots/manageprivileges.png
index 7bf07f85..080c2e36 100644
Binary files a/src/screenshots/manageprivileges.png and b/src/screenshots/manageprivileges.png differ
diff --git a/src/screenshots/osc_progress.png b/src/screenshots/osc_progress.png
index 991a30d0..f7049e85 100644
Binary files a/src/screenshots/osc_progress.png and b/src/screenshots/osc_progress.png differ
diff --git a/src/screenshots/process.png b/src/screenshots/process.png
index 4efeddcc..b946813f 100644
Binary files a/src/screenshots/process.png and b/src/screenshots/process.png differ
diff --git a/src/screenshots/query.png b/src/screenshots/query.png
index 6125fd4f..f7f51260 100644
Binary files a/src/screenshots/query.png and b/src/screenshots/query.png differ
diff --git a/src/screenshots/querylog.png b/src/screenshots/querylog.png
index f924f1f5..fd61a275 100644
Binary files a/src/screenshots/querylog.png and b/src/screenshots/querylog.png differ
diff --git a/src/screenshots/slowquery.png b/src/screenshots/slowquery.png
index 0d1a9247..1f1f937f 100644
Binary files a/src/screenshots/slowquery.png and b/src/screenshots/slowquery.png differ
diff --git a/src/screenshots/slowquerylog.png b/src/screenshots/slowquerylog.png
index f51fc6ea..5cae1f9a 100644
Binary files a/src/screenshots/slowquerylog.png and b/src/screenshots/slowquerylog.png differ
diff --git a/src/screenshots/sqladvisor.png b/src/screenshots/sqladvisor.png
index 0acb71b4..e05c267f 100644
Binary files a/src/screenshots/sqladvisor.png and b/src/screenshots/sqladvisor.png differ
diff --git a/src/screenshots/workflowconfig.png b/src/screenshots/workflowconfig.png
index 196f849e..297b5cf4 100644
Binary files a/src/screenshots/workflowconfig.png and b/src/screenshots/workflowconfig.png differ
diff --git a/src/script/centos7_install.sh b/src/script/centos7_install.sh
index f46d06a3..b8ceb156 100644
--- a/src/script/centos7_install.sh
+++ b/src/script/centos7_install.sh
@@ -2,7 +2,7 @@
DIR="$( cd "$( dirname "$0" )" && pwd )"
cd $DIR
git clone -b github https://github.com/hhyo/archer.git \
-&& yum -y install unzip git gcc gcc-c++ make cmake bison openssl-devel mysql-devel openldap-devel \
+&& yum -y install gcc gcc-c++ make cmake bison openssl-devel mysql-devel \
&& yum -y install epel-release \
&& yum -y install python34 python34-pip python34-devel.x86_64 \
&& pip3 install virtualenv -i https://mirrors.ustc.edu.cn/pypi/web/simple/ \