Merge branch 'master' of http://git.qmth.com.cn/themis/frontend-admin

src/api/login.js

@@ -29,7 +29,9 @@ export function loginByUsername({ loginName, password, code }) {
     password: AES(password),
     code,
   };
-  return httpApp.post("/api/admin/user/login/account", data);
+  return httpApp.post("/api/admin/user/login/account", data, {
+    noErrorMessage: true,
+  });
 }
 
 export function logout() {

src/global.d.ts

@@ -62,7 +62,7 @@
 // }
 
 import Vue from "vue";
-import { AxiosInstance } from "axios";
+import { AxiosInstance, AxiosRequestConfig } from "axios";
 
 // 可惜内部代码不能通过此类型推导
 //import * as api from "./api";
@@ -73,6 +73,12 @@ declare module "vue/types/vue" {
     // $api: api;
   }
 }
+
+declare module "axios/index" {
+  interface AxiosRequestConfig {
+    noErrorMessage?: boolean | false;
+  }
+}
 // declare module "*.vue" {
 //   import Vue from "vue";
 //   export default Vue;

src/main.js

@@ -15,6 +15,8 @@ import "./plugins/element.js";
 import "./plugins/vueAwesome";
 import "./plugins/helpers";
 
+import "./utils/monitors";
+
 // styles begin
 // bootstrap 133KB non-zip
 import "./styles/bootstrap.scss";

src/plugins/axiosApp.js

@@ -71,9 +71,9 @@ _axiosApp.interceptors.response.use(
     return response;
   },
   (error) => {
-    const noErrorMessage = error.config.noErrorMessage;
+    const showErrorMessage = !error.config.noErrorMessage;
     if (!error.response) {
-      if (noErrorMessage) {
+      if (showErrorMessage) {
         // "Network Error" 网络不通，直接返回
         Notification({
           showClose: true,
@@ -92,7 +92,7 @@ _axiosApp.interceptors.response.use(
       removeToken();
       return Promise.reject(error);
     } else if (status == 405) {
-      if (noErrorMessage) {
+      if (showErrorMessage) {
         Notification({
           showClose: true,
           message: "没有权限！",
@@ -101,7 +101,7 @@ _axiosApp.interceptors.response.use(
       }
       return Promise.reject(error);
     } else if (status == 502) {
-      if (noErrorMessage) {
+      if (showErrorMessage) {
         Notification({
           showClose: true,
           message: "服务器异常(502)！",
@@ -114,7 +114,7 @@ _axiosApp.interceptors.response.use(
     if (status != 200) {
       const data = error.response.data;
       if (data && data.message) {
-        if (noErrorMessage) {
+        if (showErrorMessage) {
           Notification({
             showClose: true,
             message: data.message,
@@ -122,7 +122,7 @@ _axiosApp.interceptors.response.use(
           });
         }
       } else {
-        if (noErrorMessage) {
+        if (showErrorMessage) {
           Notification({
             showClose: true,
             message: "未定义异常: " + JSON.stringify(data, 2),

src/utils/monitors.js

@@ -0,0 +1,24 @@
+import Vue from "vue";
+import { errorLog } from "@/utils/utils";
+
+Vue.config.errorHandler = (error) => {
+  errorLog(error.message, {
+    stack: error.stack,
+    code: "Vue组件错误",
+  });
+  throw error;
+};
+
+window.addEventListener("error", function (event) {
+  errorLog(event.message, {
+    stack: event.error.stack.replace(/\n/g, "||||"),
+    code: "全局JS错误",
+  });
+});
+
+window.addEventListener("unhandledrejection", function (event) {
+  errorLog(event?.reason?.message, {
+    stack: event.error.stack.replace(/\n/g, "||||"),
+    code: "全局JS错误",
+  });
+});

src/utils/utils.js

@@ -1,4 +1,4 @@
-import { YYYYMMDDHHmmss } from "@/constants/constants";
+import { YYYYMMDDHHmmss } from "@/constant/constants";
 import moment from "moment";
 
 export function dateFormatForAPI(date) {
@@ -11,3 +11,14 @@ export function formatEmptyToNull(obj) {
   });
   return obj;
 }
+
+// 错误上报：本地打印，百度统计，阿里云日志
+export function errorLog(message, { stack = "", code = "" }) {
+  console.error({ message, stack, code });
+  window._hmt.push([
+    "_trackEvent",
+    "message: " + message,
+    stack && "stack: " + stack,
+    code && "code: " + code,
+  ]);
+}