From 99a1d5787285d338e447f79ec36f56ed34bd447a Mon Sep 17 00:00:00 2001
From: hhyo <rtttte@qq.com>
Date: Sun, 28 Oct 2018 20:56:37 +0800
Subject: [PATCH] v1.3.5

---
 README.md                   | 5 ++---
 common/auth.py              | 6 ++++--
 common/templates/login.html | 2 +-
 sql/sql_workflow.py         | 1 -
 src/docker/Dockerfile       | 6 +++++-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 70e447d564..11f798837d 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,6 @@
 archery镜像：https://dev.aliyun.com/detail.html?spm=5176.1972343.2.2.58c75aaa3iK1Sb&repoId=244140    
 inception镜像: https://dev.aliyun.com/detail.html?spm=5176.1972343.2.12.7b475aaaLiCfMf&repoId=142093
 
-准备配置文件以及docker-compose.yml，mysql和mongo可按需选择
 #### docker-compose.yml
 
 ```yaml
@@ -62,7 +61,7 @@ services:
       - "./inception/inc.cnf:/etc/inc.cnf"
 
   archery:
-    image: registry.cn-hangzhou.aliyuncs.com/lihuanhuan/archery:1.3.3
+    image: registry.cn-hangzhou.aliyuncs.com/lihuanhuan/archery:1.3.5
     container_name: archery
     restart: always
     ports:
@@ -102,7 +101,7 @@ docker logs archery
 
 依赖或引用项目
 ===============
-- [inception](https://github.com/mysql-inception/inception)
+- [inception](https://github.com/hhyo/inception)
 - [Themis](https://github.com/CreditEaseDBA/Themis)
 - [binlog2sql](https://github.com/danfengcao/binlog2sql)
 - [aquila_v2](https://github.com/thinkdb/aquila_v2)
diff --git a/common/auth.py b/common/auth.py
index a868fff58a..77ab0613b7 100644
--- a/common/auth.py
+++ b/common/auth.py
@@ -1,4 +1,5 @@
 import datetime
+import logging
 
 import simplejson as json
 from django.conf import settings
@@ -12,8 +13,9 @@
 
 from common.config import SysConfig
 from sql.models import Users
-from sql.views import logger
-from sql.sql_workflow import login_failure_counter, logger
+
+logger = logging.getLogger('default')
+login_failure_counter = {}  # 登录失败锁定计数器，给loginAuthenticate用的
 
 
 def loginAuthenticate(username, password):
diff --git a/common/templates/login.html b/common/templates/login.html
index 472ef80267..b1365257d9 100644
--- a/common/templates/login.html
+++ b/common/templates/login.html
@@ -101,7 +101,7 @@ <h4 class="modal-title" id="myModalLabel">
 
 <!--底部部分 -->
 <div class="row clearfix user-bottom-div">
-    <p><strong>SQL审核平台</strong>&nbsp;(v1.3.4)</p>
+    <p><strong>SQL审核平台</strong>&nbsp;(v1.3.5)</p>
 </div>
 <!-- jQuery (Bootstrap 的 JavaScript 插件需要引入 jQuery，务必先引入jquery js再引入bootstrap js) -->
 <script src="{% static 'jquery/jquery.min.js' %}"></script>
diff --git a/sql/sql_workflow.py b/sql/sql_workflow.py
index 4fa863ad8f..7fd489b43f 100644
--- a/sql/sql_workflow.py
+++ b/sql/sql_workflow.py
@@ -28,7 +28,6 @@
 from .models import SqlWorkflow
 
 logger = logging.getLogger('default')
-login_failure_counter = {}  # 登录失败锁定计数器，给loginAuthenticate用的
 sqlSHA1_cache = {}  # 存储SQL文本与SHA1值的对应关系，尽量减少与数据库的交互次数,提高效率。格式: {工单ID1:{SQL内容1:sqlSHA1值1, SQL内容2:sqlSHA1值2},}
 workflowOb = Workflow()
 
diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile
index c58e8df38b..bdcef5fffd 100644
--- a/src/docker/Dockerfile
+++ b/src/docker/Dockerfile
@@ -46,10 +46,14 @@ RUN cd /opt \
     && cd /opt && rm -rf /opt/SchemaObject/ && rm -rf /opt/SchemaSync/ \
     && yum install -y python-devel \
     && pip install mysql-python
+#soar
+RUN cd /opt \
+    && wget https://github.com/XiaoMi/soar/releases/download/v0.8.1/soar.linux-amd64 -O soar \
+    && chmod a+x soar
 #archery
 RUN cd /opt \
     && yum -y install openldap-devel nginx \
-    && git clone https://github.com/hhyo/archery.git && cd archery && git checkout v1.3.4 \
+    && git clone https://github.com/hhyo/archery.git && cd archery && git checkout v1.3.5 \
     && source /opt/venv4archery/bin/activate \
     && pip3 install -r /opt/archery/src/docker/requirements.txt -i https://mirrors.ustc.edu.cn/pypi/web/simple/ \
     && cp /opt/archery/src/docker/connections.py /opt/venv4archery/lib/python3.6/site-packages/MySQLdb/connections.py \