From ad861f7f90203011a78757e9eeb1e70c5481e252 Mon Sep 17 00:00:00 2001
From: weideguo <2515717245@qq.com>
Date: Thu, 27 Jan 2022 19:14:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BAajax=E8=AF=B7=E6=B1=82=E7=9A=84?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E8=BF=9B=E8=A1=8C=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=8A=A5=E9=94=99=20(hhyo#1346)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/static/dist/js/utils.js         |  7 +++++++
 common/templates/base.html             |  1 +
 sql/templates/archive.html             | 10 +++-------
 sql/templates/archivedetail.html       |  4 +---
 sql/templates/audit.html               |  4 +---
 sql/templates/audit_sqlquery.html      |  4 +---
 sql/templates/audit_sqlworkflow.html   |  8 ++------
 sql/templates/binlog2sql.html          |  4 +---
 sql/templates/database.html            |  4 +---
 sql/templates/dbdiagnostic.html        | 16 ++++------------
 sql/templates/detail.html              | 12 +++---------
 sql/templates/group.html               |  4 +---
 sql/templates/groupmgmt.html           |  4 +---
 sql/templates/instance.html            |  4 +---
 sql/templates/instanceaccount.html     |  4 +---
 sql/templates/my2sql.html              |  4 +---
 sql/templates/param.html               |  8 ++------
 sql/templates/queryapplylist.html      |  8 ++------
 sql/templates/queryuserprivileges.html |  4 +---
 sql/templates/rollback.html            |  4 +---
 sql/templates/slowquery.html           |  8 ++------
 sql/templates/sqlanalyze.html          |  8 +++-----
 sql/templates/sqlquery.html            |  4 +---
 sql/templates/sqlworkflow.html         |  8 ++------
 sql/templates/workflow.html            |  4 +---
 25 files changed, 45 insertions(+), 105 deletions(-)
 create mode 100644 common/static/dist/js/utils.js

diff --git a/common/static/dist/js/utils.js b/common/static/dist/js/utils.js
new file mode 100644
index 0000000000..f87af42be1
--- /dev/null
+++ b/common/static/dist/js/utils.js
@@ -0,0 +1,7 @@
+var onLoadErrorCallback = function (status, jqXHR) {
+    if (status === 403) {
+        alert("权限错误，您没有权限查看该数据！");
+    } else {
+        alert("未知错误，数据加载失败！请检查接口返回信息和错误日志！");
+    }
+};
diff --git a/common/templates/base.html b/common/templates/base.html
index b69b91873e..70e677a75a 100644
--- a/common/templates/base.html
+++ b/common/templates/base.html
@@ -301,6 +301,7 @@
 <script src="{% static 'bootstrap-table/js/bootstrap-table-zh-CN.min.js' %}"></script>
 <script src="{% static 'sql-formatter/sql-formatter.min.js' %}"></script>
 <script src="{% static 'dist/js/formatter.js' %}"></script>
+<script src="{% static 'dist/js/utils.js' %}"></script>
 
 </body>
 <script>
diff --git a/sql/templates/archive.html b/sql/templates/archive.html
index 31cbb87f3d..727c9a631c 100644
--- a/sql/templates/archive.html
+++ b/sql/templates/archive.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+a{% extends "base.html" %}
 
 {% block content %}
     <!-- 自定义操作按钮-->
@@ -373,9 +373,7 @@ <h4 class="modal-title text-danger">工单日志</h4>
                 }],
                 onLoadSuccess: function () {
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                },
+                onLoadError: onLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
                     queryParams(e)
@@ -629,9 +627,7 @@ <h4 class="modal-title text-danger">工单日志</h4>
                         }],
                         onLoadSuccess: function () {
                         },
-                        onLoadError: function () {
-                            alert("数据加载失败！请检查接口返回信息和错误日志！");
-                        }
+                        onLoadError: onLoadErrorCallback,
                     });
                 },
                 error: function (XMLHttpRequest, textStatus, errorThrown) {
diff --git a/sql/templates/archivedetail.html b/sql/templates/archivedetail.html
index a52f394f6c..441867ce22 100644
--- a/sql/templates/archivedetail.html
+++ b/sql/templates/archivedetail.html
@@ -446,9 +446,7 @@ <h4><b>归档条件</b></h4>
                 }],
                 onLoadSuccess: function () {
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                }
+                onLoadError: onLoadErrorCallback,
             });
         }
 
diff --git a/sql/templates/audit.html b/sql/templates/audit.html
index f3f2767c74..0dd37521f6 100644
--- a/sql/templates/audit.html
+++ b/sql/templates/audit.html
@@ -158,9 +158,7 @@
                 }],
                 onLoadSuccess: function () {
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                },
+                onLoadError: onLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
                     queryParams(e)
diff --git a/sql/templates/audit_sqlquery.html b/sql/templates/audit_sqlquery.html
index 69dbb6b7f7..8e9fd9c889 100644
--- a/sql/templates/audit_sqlquery.html
+++ b/sql/templates/audit_sqlquery.html
@@ -189,9 +189,7 @@
                 }],
                 onLoadSuccess: function () {
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                },
+                onLoadError: onLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
                     queryParams(e)
diff --git a/sql/templates/audit_sqlworkflow.html b/sql/templates/audit_sqlworkflow.html
index b4c731aed1..6ab7a23655 100644
--- a/sql/templates/audit_sqlworkflow.html
+++ b/sql/templates/audit_sqlworkflow.html
@@ -248,9 +248,7 @@ <h4 class="modal-title text-danger">工单日志</h4>
                 }],
                 onLoadSuccess: function () {
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                },
+                onLoadError: onLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
                     queryParams(e)
@@ -318,9 +316,7 @@ <h4 class="modal-title text-danger">工单日志</h4>
                         }],
                         onLoadSuccess: function () {
                         },
-                        onLoadError: function () {
-                            alert("数据加载失败！请检查接口返回信息和错误日志！");
-                        }
+                        onLoadError: onLoadErrorCallback,
                     });
                 },
                 error: function (XMLHttpRequest, textStatus, errorThrown) {
diff --git a/sql/templates/binlog2sql.html b/sql/templates/binlog2sql.html
index ef9c1c3a6e..0c0045136b 100644
--- a/sql/templates/binlog2sql.html
+++ b/sql/templates/binlog2sql.html
@@ -369,9 +369,7 @@ <h5 class="control-label text-bold" style="color: red">
                                 }],
                                 onLoadSuccess: function () {
                                 },
-                                onLoadError: function () {
-                                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                                }
+                                onLoadError: onLoadErrorCallback,
                             });
                         } else {
                             alert(data.msg);
diff --git a/sql/templates/database.html b/sql/templates/database.html
index d4e83fa72a..995a694ad6 100755
--- a/sql/templates/database.html
+++ b/sql/templates/database.html
@@ -235,9 +235,7 @@ <h4 class="modal-title">编辑/录入数据库信息</h4>
 
                     }
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                },
+                onLoadError: onLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
                     queryParams(e)
diff --git a/sql/templates/dbdiagnostic.html b/sql/templates/dbdiagnostic.html
index 3b6df72565..0a0c0832cb 100644
--- a/sql/templates/dbdiagnostic.html
+++ b/sql/templates/dbdiagnostic.html
@@ -196,9 +196,7 @@ <h4 class="modal-title text-danger">确定要终止所选会话吗？</h4>
                             alert("数据加载失败！" + data.msg);
                         }
                     },
-                    onLoadError: function () {
-                        alert("数据加载失败！请检查接口返回信息和错误日志！");
-                    },
+                    onLoadError: onLoadErrorCallback,
                     onSearch: function (e) {
                         //传搜索参数给服务器
                         queryParams(e)
@@ -292,9 +290,7 @@ <h4 class="modal-title text-danger">确定要终止所选会话吗？</h4>
                             alert("数据加载失败！" + data.msg);
                         }
                     },
-                    onLoadError: function () {
-                        alert("数据加载失败！请检查接口返回信息和错误日志！");
-                    },
+                    onLoadError: onLoadErrorCallback,
                     onSearch: function (e) {
                         //传搜索参数给服务器
                         queryParams(e)
@@ -430,9 +426,7 @@ <h4 class="modal-title text-danger">确定要终止所选会话吗？</h4>
                             alert("数据加载失败！" + data.msg);
                         }
                     },
-                    onLoadError: function () {
-                        alert("数据加载失败！请检查接口返回信息和错误日志！");
-                    },
+                    onLoadError: onLoadErrorCallback,
                     onSearch: function (e) {
                         //传搜索参数给服务器
                         queryParams(e)
@@ -538,9 +532,7 @@ <h4 class="modal-title text-danger">确定要终止所选会话吗？</h4>
                             alert("数据加载失败！" + data.msg);
                         }
                     },
-                    onLoadError: function () {
-                        alert("数据加载失败！请检查接口返回信息和错误日志！");
-                    },
+                    onLoadError: onLoadErrorCallback,
                     onSearch: function (e) {
                         //传搜索参数给服务器
                         queryParams(e)
diff --git a/sql/templates/detail.html b/sql/templates/detail.html
index e7f62114c3..9aeed098d6 100644
--- a/sql/templates/detail.html
+++ b/sql/templates/detail.html
@@ -676,9 +676,7 @@ <h4 class="modal-title text-danger">修改可执行时间</h4>
                 },
                 onLoadSuccess: function () {
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                }
+                onLoadError: onLoadErrorCallback,
             });
         }
 
@@ -734,9 +732,7 @@ <h4 class="modal-title text-danger">修改可执行时间</h4>
                         }],
                         onLoadSuccess: function () {
                         },
-                        onLoadError: function () {
-                            alert("数据加载失败！请检查接口返回信息和错误日志！");
-                        }
+                        onLoadError: onLoadErrorCallback,
                     });
                 },
                 error: function (XMLHttpRequest, textStatus, errorThrown) {
@@ -839,9 +835,7 @@ <h4 class="modal-title text-danger">修改可执行时间</h4>
                     $("#osc-toolbar").show();
                     $('#osc_percent').modal('show');
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                }
+                onLoadError: onLoadErrorCallback,
             });
 
         }
diff --git a/sql/templates/group.html b/sql/templates/group.html
index 812d047b03..9593d48f03 100644
--- a/sql/templates/group.html
+++ b/sql/templates/group.html
@@ -85,9 +85,7 @@
                 }],
                 onLoadSuccess: function () {
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                },
+                onLoadError: fonLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
                     queryParams(e)
diff --git a/sql/templates/groupmgmt.html b/sql/templates/groupmgmt.html
index 7ab30b9c3c..92b9ac03fb 100644
--- a/sql/templates/groupmgmt.html
+++ b/sql/templates/groupmgmt.html
@@ -153,9 +153,7 @@ <h4 class="modal-title" id="myModalLabel">新增关联对象</h4>
                 ],
                 onLoadSuccess: function () {
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                },
+                onLoadError: onLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
                     queryParams(e)
diff --git a/sql/templates/instance.html b/sql/templates/instance.html
index 03c43adbf9..05a832cba1 100644
--- a/sql/templates/instance.html
+++ b/sql/templates/instance.html
@@ -171,9 +171,7 @@ <h4 class="modal-title" id="myModalLabel">清理Binlog日志</h4>
                     }],
                 onLoadSuccess: function () {
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                },
+                onLoadError: onLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
                     queryParams(e)
diff --git a/sql/templates/instanceaccount.html b/sql/templates/instanceaccount.html
index aaee2484ed..76cfce8bd9 100644
--- a/sql/templates/instanceaccount.html
+++ b/sql/templates/instanceaccount.html
@@ -1152,9 +1152,7 @@ <h4 class="modal-title">删除账号
 
                     }
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                },
+                onLoadError: onLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
                     queryParams(e)
diff --git a/sql/templates/my2sql.html b/sql/templates/my2sql.html
index 64ee2d047e..94be86c3dd 100644
--- a/sql/templates/my2sql.html
+++ b/sql/templates/my2sql.html
@@ -395,9 +395,7 @@ <h5 class="control-label text-bold" style="color: red">
                                 onLoadSuccess: function () {
                                     
                                 },
-                                onLoadError: function () {
-                                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                                }
+                                onLoadError: onLoadErrorCallback,
                             });
                         } else {
                             alert(data.msg);
diff --git a/sql/templates/param.html b/sql/templates/param.html
index 011fce5608..55fead2dae 100755
--- a/sql/templates/param.html
+++ b/sql/templates/param.html
@@ -159,9 +159,7 @@
                     }],
                     onLoadSuccess: function () {
                     },
-                    onLoadError: function () {
-                        alert("数据加载失败！请检查接口返回信息和错误日志！");
-                    },
+                    onLoadError: onLoadErrorCallback,
                     onSearch: function (e) {
                         //传搜索参数给服务器
                         return {
@@ -236,9 +234,7 @@
                     }],
                     onLoadSuccess: function () {
                     },
-                    onLoadError: function () {
-                        alert("数据加载失败！请检查接口返回信息和错误日志！");
-                    },
+                    onLoadError: onLoadErrorCallback,
                     onSearch: function (e) {
                         //传搜索参数给服务器
                         return {
diff --git a/sql/templates/queryapplylist.html b/sql/templates/queryapplylist.html
index d8270a0cb8..6081cf00d7 100644
--- a/sql/templates/queryapplylist.html
+++ b/sql/templates/queryapplylist.html
@@ -364,9 +364,7 @@ <h4 class="modal-title text-danger">工单日志</h4>
                 }],
                 onLoadSuccess: function () {
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                },
+                onLoadError: onLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
                     queryParams(e)
@@ -648,9 +646,7 @@ <h4 class="modal-title text-danger">工单日志</h4>
                         }],
                         onLoadSuccess: function () {
                         },
-                        onLoadError: function () {
-                            alert("数据加载失败！请检查接口返回信息和错误日志！");
-                        }
+                        onLoadError: onLoadErrorCallback,
                     });
                 },
                 error: function (XMLHttpRequest, textStatus, errorThrown) {
diff --git a/sql/templates/queryuserprivileges.html b/sql/templates/queryuserprivileges.html
index 46b87cc245..60326a5e20 100644
--- a/sql/templates/queryuserprivileges.html
+++ b/sql/templates/queryuserprivileges.html
@@ -175,9 +175,7 @@ <h4 class="modal-title text-danger">提示信息</h4>
                 }],
                 onLoadSuccess: function () {
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                },
+                onLoadError: onLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
                     queryParams(e)
diff --git a/sql/templates/rollback.html b/sql/templates/rollback.html
index dd69f525ef..2187b54968 100644
--- a/sql/templates/rollback.html
+++ b/sql/templates/rollback.html
@@ -116,9 +116,7 @@
                     sessionStorage.setItem('editSqlContent', backup_sql);
                 }
             },
-            onLoadError: function () {
-                alert("数据加载失败！请检查接口返回信息和错误日志！");
-            }
+            onLoadError: onLoadErrorCallback,
         });
         $(document).ready(function () {
             var isRollback = window.location.pathname.indexOf("rollback");
diff --git a/sql/templates/slowquery.html b/sql/templates/slowquery.html
index dc40c6122a..f4d9292dd5 100644
--- a/sql/templates/slowquery.html
+++ b/sql/templates/slowquery.html
@@ -421,9 +421,7 @@
                         sortable:true
                     }],
                     locale: 'zh-CN',
-                    onLoadError: function() {
-                        alert("数据加载失败！请检查接口返回信息和错误日志！");
-                    },
+                    onLoadError: onLoadErrorCallback,
                     onSearch: function(e) {
                         //传搜索参数给服务器
                         //console.info('search='+e);
@@ -576,9 +574,7 @@
                     singleSelect: true,
                     toolbar: "#sqladvisor-toolbar", //指明自定义的toolbar
                     locale: 'zh-CN',
-                    onLoadError: function () {
-                        alert("数据加载失败！请检查接口返回信息和错误日志！");
-                    },
+                    onLoadError: onLoadErrorCallback,
                     onSearch: function (e) {
                         //传搜索参数给服务器
                         queryParams(e)
diff --git a/sql/templates/sqlanalyze.html b/sql/templates/sqlanalyze.html
index eb02326677..9343292c18 100644
--- a/sql/templates/sqlanalyze.html
+++ b/sql/templates/sqlanalyze.html
@@ -198,9 +198,7 @@ <h4 class="modal-title text-danger">分析报告</h4>
                     $('#sql-upload').fileinput('enable');
                     sessionStorage.setItem('analyze_text', text);
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                },
+                onLoadError: onLoadErrorCallback,
                 responseHandler: function (res) {
                     //在ajax获取到数据，渲染表格之前，修改数据源
                     return res;
@@ -345,10 +343,10 @@ <h4 class="modal-title text-danger">分析报告</h4>
                         $('#btn-analyze').removeClass('disabled');
                         $('#btn-analyze').prop('disabled', false);
                     },
-                    onLoadError: function () {
+                    onLoadError: function (status, jqXHR) {
                         $('#btn-analyze').removeClass('disabled');
                         $('#btn-analyze').prop('disabled', false);
-                        alert("数据加载失败！请检查接口返回信息和错误日志！");
+                        onLoadErrorCallback(status, jqXHR);
                     },
                     responseHandler: function (res) {
                         //在ajax获取到数据，渲染表格之前，修改数据源
diff --git a/sql/templates/sqlquery.html b/sql/templates/sqlquery.html
index 332703b61d..6c252d0eab 100644
--- a/sql/templates/sqlquery.html
+++ b/sql/templates/sqlquery.html
@@ -383,9 +383,7 @@ <h4 class="modal-title text-danger">收藏语句</h4>
                         re_query(query_log_id)
                     }
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                },
+                onLoadError: onLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
                     queryParams(e)
diff --git a/sql/templates/sqlworkflow.html b/sql/templates/sqlworkflow.html
index cb259acb2d..c3c55eca86 100644
--- a/sql/templates/sqlworkflow.html
+++ b/sql/templates/sqlworkflow.html
@@ -255,9 +255,7 @@ <h4 class="modal-title text-danger">工单日志</h4>
                 }],
                 onLoadSuccess: function () {
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                },
+                onLoadError: onLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
                     queryParams(e)
@@ -325,9 +323,7 @@ <h4 class="modal-title text-danger">工单日志</h4>
                         }],
                         onLoadSuccess: function () {
                         },
-                        onLoadError: function () {
-                            alert("数据加载失败！请检查接口返回信息和错误日志！");
-                        }
+                        onLoadError: onLoadErrorCallback
                     });
                 },
                 error: function (XMLHttpRequest, textStatus, errorThrown) {
diff --git a/sql/templates/workflow.html b/sql/templates/workflow.html
index b8085d7694..305052ee0e 100644
--- a/sql/templates/workflow.html
+++ b/sql/templates/workflow.html
@@ -127,9 +127,7 @@ <h4 class="modal-title text-danger">审核确认</h4>
                 }],
                 onLoadSuccess: function () {
                 },
-                onLoadError: function () {
-                    alert("数据加载失败！请检查接口返回信息和错误日志！");
-                },
+                onLoadError: onLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
                     queryParams(e)

From 448e3675e23186a6c3f84222a80119cf4adb4044 Mon Sep 17 00:00:00 2001
From: weideguo <2515717245@qq.com>
Date: Fri, 28 Jan 2022 09:32:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/static/dist/js/utils.js | 2 +-
 sql/templates/archive.html     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/static/dist/js/utils.js b/common/static/dist/js/utils.js
index f87af42be1..b706c69cc9 100644
--- a/common/static/dist/js/utils.js
+++ b/common/static/dist/js/utils.js
@@ -2,6 +2,6 @@ var onLoadErrorCallback = function (status, jqXHR) {
     if (status === 403) {
         alert("权限错误，您没有权限查看该数据！");
     } else {
-        alert("未知错误，数据加载失败！请检查接口返回信息和错误日志！");
+        alert("未知错误，请联系管理员处理！");
     }
 };
diff --git a/sql/templates/archive.html b/sql/templates/archive.html
index 727c9a631c..8d0ccf2936 100644
--- a/sql/templates/archive.html
+++ b/sql/templates/archive.html
@@ -1,4 +1,4 @@
-a{% extends "base.html" %}
+{% extends "base.html" %}
 
 {% block content %}
     <!-- 自定义操作按钮-->