From 08a285b376fe161aa8d4cb4df14edf00f2d183dd Mon Sep 17 00:00:00 2001
From: hhyo <rtttte@qq.com>
Date: Sat, 6 Jul 2019 15:09:14 +0800
Subject: [PATCH] =?UTF-8?q?goInception=E7=9A=84mysql=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=E8=B0=83=E6=95=B4=E4=B8=BAMySQLdb=20=E9=99=8D?=
 =?UTF-8?q?=E4=BD=8Emysqlclient=E7=89=88=E6=9C=AC=EF=BC=8C=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3Inception=E5=AE=A1=E6=A0=B8=E4=BF=A1=E6=81=AF=E4=B9=B1?=
 =?UTF-8?q?=E7=A0=81=E7=9A=84=E9=97=AE=E9=A2=98=20=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=8F=90=E5=8D=87=E4=B8=BAv1.6.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/templates/login.html |  2 +-
 requirements.txt            |  2 +-
 sql/engines/goinception.py  |  6 +++---
 sql/engines/tests.py        | 14 +++++++-------
 src/docker/Dockerfile       |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/common/templates/login.html b/common/templates/login.html
index fb43f3b864..950d3b7fc4 100644
--- a/common/templates/login.html
+++ b/common/templates/login.html
@@ -107,7 +107,7 @@ <h4 class="modal-title" id="myModalLabel">
 
 <!--底部部分 -->
 <div class="row clearfix user-bottom-div">
-    <p><strong>SQL审核平台</strong>&nbsp;(v1.6.4)</p>
+    <p><strong>SQL审核平台</strong>&nbsp;(v1.6.5)</p>
 </div>
 <!-- jQuery (Bootstrap 的 JavaScript 插件需要引入 jQuery，务必先引入jquery js再引入bootstrap js) -->
 <script src="{% static 'jquery/jquery.min.js' %}"></script>
diff --git a/requirements.txt b/requirements.txt
index d7c4bdc081..f329a74b9e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 Django==2.0.13
-mysqlclient==1.4.2.post1
+mysqlclient==1.3.13
 pymysql==0.9.3
 requests==2.21.0
 simplejson==3.16.0
diff --git a/sql/engines/goinception.py b/sql/engines/goinception.py
index 78e1ae1300..95a2ce8269 100644
--- a/sql/engines/goinception.py
+++ b/sql/engines/goinception.py
@@ -2,7 +2,7 @@
 import logging
 import re
 import traceback
-import pymysql
+import MySQLdb
 
 from common.config import SysConfig
 from sql.utils.sql_utils import get_syntax_type
@@ -17,12 +17,12 @@ def get_connection(self, db_name=None):
         if self.conn:
             return self.conn
         if hasattr(self, 'instance'):
-            self.conn = pymysql.connect(host=self.host, port=self.port, charset=self.instance.charset or 'utf8mb4')
+            self.conn = MySQLdb.connect(host=self.host, port=self.port, charset=self.instance.charset or 'utf8mb4')
             return self.conn
         archer_config = SysConfig()
         go_inception_host = archer_config.get('go_inception_host')
         go_inception_port = int(archer_config.get('go_inception_port', 4000))
-        self.conn = pymysql.connect(host=go_inception_host, port=go_inception_port, charset='utf8mb4')
+        self.conn = MySQLdb.connect(host=go_inception_host, port=go_inception_port, charset='utf8mb4')
         return self.conn
 
     def execute_check(self, instance=None, db_name=None, sql=''):
diff --git a/sql/engines/tests.py b/sql/engines/tests.py
index 992cfb7989..d6a49222f5 100644
--- a/sql/engines/tests.py
+++ b/sql/engines/tests.py
@@ -982,7 +982,7 @@ def tearDown(self):
         SqlWorkflow.objects.all().delete()
         SqlWorkflowContent.objects.all().delete()
 
-    @patch('pymysql.connect')
+    @patch('MySQLdb.connect')
     def test_get_connection(self, _connect):
         new_engine = GoInceptionEngine()
         new_engine.get_connection()
@@ -1019,18 +1019,18 @@ def test_execute_finish(self, _query):
         execute_result = new_engine.execute(workflow=self.wf)
         self.assertIsInstance(execute_result, ReviewSet)
 
-    @patch('pymysql.connect.cursor.execute')
-    @patch('pymysql.connect.cursor')
-    @patch('pymysql.connect')
+    @patch('MySQLdb.connect.cursor.execute')
+    @patch('MySQLdb.connect.cursor')
+    @patch('MySQLdb.connect')
     def test_query(self, _conn, _cursor, _execute):
         _conn.return_value.cursor.return_value.fetchall.return_value = [(1,)]
         new_engine = GoInceptionEngine()
         query_result = new_engine.query(db_name=0, sql='select 1', limit_num=100)
         self.assertIsInstance(query_result, ResultSet)
 
-    @patch('pymysql.connect.cursor.execute')
-    @patch('pymysql.connect.cursor')
-    @patch('pymysql.connect')
+    @patch('MySQLdb.connect.cursor.execute')
+    @patch('MySQLdb.connect.cursor')
+    @patch('MySQLdb.connect')
     def test_query_not_limit(self, _conn, _cursor, _execute):
         _conn.return_value.cursor.return_value.fetchall.return_value = [(1,)]
         new_engine = GoInceptionEngine(instance=self.ins)
diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile
index 9c8afab2a3..65c14fc2e6 100644
--- a/src/docker/Dockerfile
+++ b/src/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM docker.io/centos:7
 
-ENV VERSION v1.6.4
+ENV VERSION v1.6.5
 
 WORKDIR /opt/archery
 
@@ -14,7 +14,7 @@ RUN yum -y install wget gcc make zlib-devel openssl openssl-devel ncurses-devel\
     && make && make install \
     && ln -fs /usr/local/python3/bin/python3 /usr/bin/python3 \
     && ln -fs /usr/local/python3/bin/pip3 /usr/bin/pip3 \
-    && pip3 install virtualenv -i https://mirrors.ustc.edu.cn/pypi/web/simple/ \
+    && pip3 install virtualenv \
     && cd /opt \
     && ln -fs /usr/local/python3/bin/virtualenv /usr/bin/virtualenv \
     && virtualenv venv4archery --python=python3 \
@@ -71,7 +71,7 @@ RUN cd /opt \
     && yum -y install openldap-devel gettext nginx \
     && git clone https://github.com/hhyo/archery.git && cd archery && git checkout $VERSION \
     && source /opt/venv4archery/bin/activate \
-    && pip3 install -r /opt/archery/requirements.txt -i https://mirrors.ustc.edu.cn/pypi/web/simple/ \
+    && pip3 install -r /opt/archery/requirements.txt \
     && cp /opt/archery/src/docker/nginx.conf /etc/nginx/ \
     && mv /opt/sqladvisor /opt/archery/src/plugins/ \
     && mv /opt/soar /opt/archery/src/plugins/ \