Merge branch 'master' of http://git.quantgroup.cn/ui/merchant-manage-ui into fix/sentryoffsetTop

package.json

@@ -54,6 +54,8 @@
 		"@ant-design/pro-layout": "^4.11.4",
 		"@ant-design/pro-table": "^1.0.31",
 		"@antv/data-set": "^0.10.2",
+		"@sentry/react": "^7.41.0",
+		"@sentry/tracing": "^7.41.0",
 		"antd": "^4.19.3",
 		"antd-virtual-select": "^1.1.2",
 		"babel-eslint": "^10.1.0",

src/app.js

 /* eslint-disable no-console */
+import * as Sentry from '@sentry/react';
+import localStorage from '@/utils/localStorage';
+// process.env.SENTRY_ENV !== 'test'  加上测试环境不会报错
+
+if (process.env.NODE_ENV === 'production' && process.env.SENTRY_ENV !== 'test') {
+  try {
+    Sentry.init({
+      dsn: 'https://b3f60c62e1234e26a5b851b9f26fba07@sentry.q-gp.com/34',
+      release: 'merchant-manage-ui@1.0.0',
+      maxBreadcrumbs: 50,
+      tracesSampleRate: 1,
+      beforeSend: e => {
+        const err = e.exception?.values || [];
+        // XXX  不上报[object Object]此类基础库异常
+        if (err.some(item => item.value.indexOf('ResizeObserver') > -1)) {
+          return null;
+        }
+        return e;
+      },
+    });
+    Sentry.configureScope(scope => {
+      scope.setUser({
+        token: localStorage.get('token') || null,
+      });
+    });
+  } catch (e) {
+    console.log('Sentry无法加载', e);
+  }
+}
 
 export const dva = {
   config: {

src/utils/websocket.js

@@ -100,9 +100,12 @@ class Socket extends EventEmitter {
   };
 
   onerror = e => {
-    console.log('ws: error', e);
-    this.socket = null;
-    this.event.emit('error', e);
+    try {
+      this.socket = null;
+      this.event.emit('error', e);
+    } catch {
+      console.log('ws: error', e);
+    }
   };
 
   sendMessage = value => {