Merge branch 'master' of https://github.com/lvgithub/ctrip-apollo-client

Author: lvgithub

src/index.js

@@ -159,11 +159,16 @@ class Client {
         try {
             const res = await axios.get(url)
             const data = res.data
-            for (const item of data) {
-                await this.fetchConfigFromDbByNamespace(item.namespaceName)
-                this.notifications[item.namespaceName] = item.notificationId
+            if (data) {
+                for (const item of data) {
+                    await this.fetchConfigFromDbByNamespace(item.namespaceName)
+                    this.notifications[item.namespaceName] = item.notificationId
+                }
             }
         } catch (error) {
+            if (+get(error, 'response.status') === 304) {
+                return
+            }
             this.error('pollingNotification error: ', error.message)
         }
     }

src/utils.js

@@ -1,3 +1,13 @@
-const axios = require('axios');
+const axios = require('axios')
 
-exports.axios = axios.default;
+// axios.interceptors.response.use(function (response) {
+//     return response
+// }, function (error) {
+//     // console.log('error1111111111111111111111111', error)
+//     // if (error.response && +error.response.status === 304) {
+//     //     return Promise.reject(new Error('304'))
+//     // }
+//     return Promise.reject(error)
+// })
+
+exports.axios = axios.default