Merge pull request #65 from hhyo/github

bug修复
jly8866 · Apr 17, 2018 · 5d92d34 · 5d92d34
2 parents f087f63 + 966eb87
commit 5d92d34
Show file tree

Hide file tree

Showing 33 changed files with 338 additions and 505 deletions.
diff --git a/archer/settings.py b/archer/settings.py
@@ -31,6 +31,8 @@
 
 ALLOWED_HOSTS = ['*']
 
+# 解决nginx部署跳转404
+USE_X_FORWARDED_HOST = True
 
 # Application definition
 

diff --git a/docs/mysql_db_design_guide.docx b/docs/mysql_db_design_guide.docx
diff --git a/screenshots/adminsql.png b/screenshots/adminsql.png
diff --git a/screenshots/adminsqlusers.png b/screenshots/adminsqlusers.png
diff --git a/screenshots/allworkflow.png b/screenshots/allworkflow.png
diff --git a/screenshots/autoreview.png b/screenshots/autoreview.png
diff --git a/screenshots/bugs/bug1.png b/screenshots/bugs/bug1.png
diff --git a/screenshots/bugs/bug2.png b/screenshots/bugs/bug2.png
diff --git a/screenshots/bugs/bug3.png b/screenshots/bugs/bug3.png
diff --git a/screenshots/charts.png b/screenshots/charts.png
diff --git a/screenshots/finish.png b/screenshots/finish.png
diff --git a/screenshots/login.png b/screenshots/login.png
diff --git a/screenshots/nginx.png b/screenshots/nginx.png
diff --git a/screenshots/osc_progress.png b/screenshots/osc_progress.png
diff --git a/screenshots/pymysql.png b/screenshots/pymysql.png
diff --git a/screenshots/rollback.png b/screenshots/rollback.png
diff --git a/screenshots/startup.png b/screenshots/startup.png
diff --git a/screenshots/submitsql.png b/screenshots/submitsql.png
diff --git a/screenshots/waitingforme.png b/screenshots/waitingforme.png
diff --git a/sql/query.py b/sql/query.py
@@ -198,7 +198,7 @@ def getdbNameList(request):
     if is_master:
         try:
             master_info = master_config.objects.get(cluster_name=clusterName)
-            # 取出该集群的连接方式，为了后面连进去获取所有databases
+            # 取出该集群主库的连接方式，为了后面连进去获取所有databases
             listDb = dao.getAlldbByCluster(master_info.master_host, master_info.master_port, master_info.master_user,
                                            prpCryptor.decrypt(master_info.master_password))
             # 要把result转成JSON存进数据库里，方便SQL单子详细信息展示
@@ -226,14 +226,31 @@ def getdbNameList(request):
 def getTableNameList(request):
     clusterName = request.POST.get('cluster_name')
     db_name = request.POST.get('db_name')
+    is_master = request.POST.get('is_master')
     result = {'status': 0, 'msg': 'ok', 'data': []}
 
-    slave_info = slave_config.objects.get(cluster_name=clusterName)
-    # 取出该集群的连接方式，为了后面连进去获取所有的表
-    listTb = dao.getAllTableByDb(slave_info.slave_host, slave_info.slave_port, slave_info.slave_user,
-                                 prpCryptor.decrypt(slave_info.slave_password), db_name)
-    # 要把result转成JSON存进数据库里，方便SQL单子详细信息展示
-    result['data'] = listTb
+    if is_master:
+        try:
+            master_info = master_config.objects.get(cluster_name=clusterName)
+            # 取出该集群主库的连接方式，为了后面连进去获取所有的表
+            listTb = dao.getAllTableByDb(master_info.master_host, master_info.master_port, master_info.master_user,
+                                           prpCryptor.decrypt(master_info.master_password), db_name)
+            # 要把result转成JSON存进数据库里，方便SQL单子详细信息展示
+            result['data'] = listTb
+        except Exception:
+            result['status'] = 1
+            result['msg'] = '找不到对应的主库配置信息，请配置'
+    else:
+        try:
+            slave_info = slave_config.objects.get(cluster_name=clusterName)
+            # 取出该集群从库的连接方式，为了后面连进去获取所有的表
+            listTb = dao.getAllTableByDb(slave_info.slave_host, slave_info.slave_port, slave_info.slave_user,
+                                         prpCryptor.decrypt(slave_info.slave_password), db_name)
+            # 要把result转成JSON存进数据库里，方便SQL单子详细信息展示
+            result['data'] = listTb
+        except Exception:
+            result['status'] = 1
+            result['msg'] = '找不到对应的从库配置信息，请配置'
     return HttpResponse(json.dumps(result), content_type='application/json')
 
 
@@ -243,14 +260,31 @@ def getColumnNameList(request):
     clusterName = request.POST.get('cluster_name')
     db_name = request.POST.get('db_name')
     tb_name = request.POST.get('tb_name')
+    is_master = request.POST.get('is_master')
     result = {'status': 0, 'msg': 'ok', 'data': []}
 
-    slave_info = slave_config.objects.get(cluster_name=clusterName)
-    # 取出该集群的连接方式，为了后面连进去获取表的所有字段
-    listCol = dao.getAllColumnsByTb(slave_info.slave_host, slave_info.slave_port, slave_info.slave_user,
-                                    prpCryptor.decrypt(slave_info.slave_password), db_name, tb_name)
-    # 要把result转成JSON存进数据库里，方便SQL单子详细信息展示
-    result['data'] = listCol
+    if is_master:
+        try:
+            master_info = master_config.objects.get(cluster_name=clusterName)
+            # 取出该集群主库的连接方式，为了后面连进去获取所有字段
+            listCol = dao.getAllColumnsByTb(master_info.master_host, master_info.master_port, master_info.master_user,
+                                           prpCryptor.decrypt(master_info.master_password),  db_name, tb_name)
+            # 要把result转成JSON存进数据库里，方便SQL单子详细信息展示
+            result['data'] = listCol
+        except Exception:
+            result['status'] = 1
+            result['msg'] = '找不到对应的主库配置信息，请配置'
+    else:
+        try:
+            slave_info = slave_config.objects.get(cluster_name=clusterName)
+            # 取出该集群的连接方式，为了后面连进去获取表的所有字段
+            listCol = dao.getAllColumnsByTb(slave_info.slave_host, slave_info.slave_port, slave_info.slave_user,
+                                            prpCryptor.decrypt(slave_info.slave_password), db_name, tb_name)
+            # 要把result转成JSON存进数据库里，方便SQL单子详细信息展示
+            result['data'] = listCol
+        except Exception:
+            result['status'] = 1
+            result['msg'] = '找不到对应的从库配置信息，请配置'
     return HttpResponse(json.dumps(result), content_type='application/json')