合并分支 'dev' 到 'master'

Publisher 自动合并请求 [S05oBlhKYhIdZKGxgmf9b]

## fix
1. 接入sentry


------

## 合并分支 'test' 到 'dev'

fix

1. 接入sentry

查看合并请求 !163

------

## test


------

## fix
1. 修复因为store经典模式造成的页面404问题


------

## 合并分支 'test' 到 'dev'

Test



查看合并请求 !164

------



查看合并请求 !165

components/view/index.vue

@@ -75,7 +75,7 @@ export default {
     await this.get_userInfo({ refererId: this.$route.query.refererId });
     await this.get_userInfo({ refererId: this.$route.query.refererId });
     this.set_nowDate();
     this.set_nowDate();
     if (!process.env.private) {
     if (!process.env.private) {
-      this.timer = websocketHeartbeat()
+      this.timer = websocketHeartbeat.call(this)
       this.set_uuid(this.timer.uuid)
       this.set_uuid(this.timer.uuid)
       // bus注册ws暂停和开始事件 
       // bus注册ws暂停和开始事件 
       this.$Bus.$on('ws-start', () => {
       this.$Bus.$on('ws-start', () => {

config/global.js

@@ -20,7 +20,7 @@ function getEnv() {
   return environment;
   return environment;
 }
 }
 export const sentryOptions = {
 export const sentryOptions = {
-  dsn: `https://2fdea25b53284316bae9eadd5206164c@sentry.guangdianyun.tv/20`,
+  dsn: `https://61a2691f71014d5fa79d4f9aba78a109@sentry.guangdianyun.tv/8`,
   version: packageEnv.version,
   version: packageEnv.version,
   env: getEnv(),
   env: getEnv(),
   name: packageEnv.name
   name: packageEnv.name

plugins/API/request.js

@@ -10,15 +10,15 @@ import qs from 'qs';
 import axios from 'axios';
 import axios from 'axios';
 import Layer from '@/plugins/Layer/index';
 import Layer from '@/plugins/Layer/index';
 import md5 from 'js-md5';
 import md5 from 'js-md5';
-// import LRU from 'lru-cache'
+import LRU from 'lru-cache'
 const Cookie = process.client ? require('js-cookie') : {};
 const Cookie = process.client ? require('js-cookie') : {};
 const Sentry = process.client ? require('@sentry/browser') : require('@sentry/node');
 const Sentry = process.client ? require('@sentry/browser') : require('@sentry/node');
 
 
 // 给api加200ms缓存
 // 给api加200ms缓存
-// const CACHED = new LRU({
-//   max: 1000,
-//   maxAge: 200
-// })
+const CACHED = new LRU({
+  max: 1000,
+  maxAge: 200
+})
 
 
 const DEF_DOMAIM = process.client
 const DEF_DOMAIM = process.client
   ? process.env.DEF_DOMAIM + (window.location.protocol.split(':')[0] === 'https' ? process.env.HTTPS_PORT : process.env.HTTP_PORT)
   ? process.env.DEF_DOMAIM + (window.location.protocol.split(':')[0] === 'https' ? process.env.HTTPS_PORT : process.env.HTTP_PORT)
@@ -42,12 +42,12 @@ service.interceptors.request.use(
         Cookie.get('token') || Cookie.get('BCC_PROGRAM_USER_LOGIN_TOKEN') || '';
         Cookie.get('token') || Cookie.get('BCC_PROGRAM_USER_LOGIN_TOKEN') || '';
     } else {
     } else {
       // 服务端api缓存
       // 服务端api缓存
-      // const { params = {}, headers = {} } = config
-      // const key = md5(config.url + JSON.stringify(params) + JSON.stringify(headers))
-      // // 缓存命中
-      // if (CACHED.has(key)) {
-      //   return Promise.resolve(CACHED.get(key))
-      // }
+      const { params = {}, headers = {} } = config
+      const key = md5(config.url + JSON.stringify(params) + JSON.stringify(headers))
+      // 缓存命中
+      if (CACHED.has(key)) {
+        return Promise.resolve(CACHED.get(key))
+      }
     }
     }
     const noMsg = config.headers['noMsg'] || '';
     const noMsg = config.headers['noMsg'] || '';
     if (config.headers.hasOwnProperty('noMsg')) {
     if (config.headers.hasOwnProperty('noMsg')) {
@@ -66,11 +66,11 @@ service.interceptors.response.use(
     const { status, data, config } = res;
     const { status, data, config } = res;
     if (status === 200) {
     if (status === 200) {
       const { code, errorCode, errorMessage } = data;
       const { code, errorCode, errorMessage } = data;
-      // if (!process.client) { 
-      //   const { params = {}, headers = {} } = config
-      //   const key = md5(config.url + JSON.stringify(params) + JSON.stringify(headers))
-      //   CACHED.set(key, data)
-      // }
+      if (!process.client) {
+        const { params = {}, headers = {} } = config
+        const key = md5(config.url + JSON.stringify(params) + JSON.stringify(headers))
+        CACHED.set(key, data)
+      }
       if ((code !== 200 || errorCode !== 0) && code !== 0) {
       if ((code !== 200 || errorCode !== 0) && code !== 0) {
         Sentry.captureException(
         Sentry.captureException(
           new Error(`${status};${JSON.stringify(data)};${JSON.stringify(config)}`)
           new Error(`${status};${JSON.stringify(data)};${JSON.stringify(config)}`)

plugins/userActions/login.js

@@ -9,7 +9,7 @@
  import Cookie from 'js-cookie'
  import Cookie from 'js-cookie'
  import { getQueryVariable } from '../Utils/index'
  import { getQueryVariable } from '../Utils/index'
  
  
- export const login = async ({token} = {token: ''}) => {
+ export const login = async function({token} = {token: ''}) {
   Cookie.set('token', token, { expires: 10 });
   Cookie.set('token', token, { expires: 10 });
   const { id, uin, liveNowStatus } = store().getters['channelInfo']
   const { id, uin, liveNowStatus } = store().getters['channelInfo']
   const res = await getWatchLoginInfo({
   const res = await getWatchLoginInfo({

plugins/websocketHeartbeat.js

-import store from '@/store/index'
 import { watchTime } from './API/apiWS';
 import { watchTime } from './API/apiWS';
 
 
-export default () => {
-  const userInfo = store().getters['userInfo']
-  const channelInfo = store().getters['channelInfo']
+export default function() {
+  const store = this.$store
+  const userInfo = store.getters['userInfo']
+  const channelInfo = store.getters['channelInfo']
   const websocketHeartbeat = require('./timer').default;
   const websocketHeartbeat = require('./timer').default;
   const info = {
   const info = {
       "userId": userInfo.id || 0,
       "userId": userInfo.id || 0,

store/index.js

-import Vue from 'vue'
-import Vuex from 'vuex'
-import state from './state'
-import actions from './actions'
-import mutations from './mutations'
-import getters from './getters'
-
-Vue.use(Vuex)
-
-let store
-
-const initStore = () => {
-  return store || (store = new Vuex.Store({
-    // 存放公用数据
-    state,
-    // 异步操作要通过actions，否则通过cimmit直接操作mutations
-    actions,
-    // 同步放数据
-    mutations,
-    getters,
-    modules: {
-      // store 模块....
-    }
-  }))
-}
-
-export default initStore
-