Merge branch 'master' of gitlab.julyedu.com:baiguangyao/mr-julyedu

package-lock.json

@@ -12441,11 +12441,6 @@
         "deep-diff": "^0.3.5"
       }
     },
-    "redux-persist": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/redux-persist/-/redux-persist-5.10.0.tgz",
-      "integrity": "sha512-sSJAzNq7zka3qVHKce1hbvqf0Vf5DuTVm7dr4GtsqQVOexnrvbV47RWFiPxQ8fscnyiuWyD2O92DOxPl0tGCRg=="
-    },
     "redux-thunk": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.3.0.tgz",

package.json

@@ -68,7 +68,6 @@
     "redux": "^4.0.1",
     "redux-immutable": "^4.0.0",
     "redux-logger": "^3.0.6",
-    "redux-persist": "^5.10.0",
     "redux-thunk": "^2.3.0",
     "resolve": "1.10.0",
     "sass-loader": "^7.1.0",

src/index.js

@@ -7,40 +7,24 @@ import thunk from 'redux-thunk'
 import logger from 'redux-logger'
 import rootReducers from './store'
 import App from './App'
-import {persistStore, persistReducer} from 'redux-persist';
-import storage from 'redux-persist/lib/storage';
-import autoMergeLevel2 from 'redux-persist/lib/stateReconciler/autoMergeLevel2';
-import {PersistGate} from 'redux-persist/lib/integration/react';
 
-const persistConfig = {
-    key: 'root',
-    storage,
-    stateReconciler: autoMergeLevel2 // 查看 'Merge Process' 部分的具体情况
-};
 
-const myPersistReducer = persistReducer(persistConfig, rootReducers)
-
-
-const reduxDevToolOptions = process.env.REACT_APP_BUILD_ENV === 'production' ? {} : { trace: true, traceLimit: 25 }
+const reduxDevToolOptions = process.env.REACT_APP_BUILD_ENV === 'production' ? {} : {trace: true, traceLimit: 25}
 
 const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ &&
     window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__(reduxDevToolOptions) || compose;
 
 const store = createStore(
-    myPersistReducer,
+    rootReducers,
     composeEnhancers(
         applyMiddleware(thunk, logger)
     )
 )
 
-const persistor = persistStore(store)
-
 ReactDOM.render(
     <Provider store={store}>
-        <PersistGate loading={null} persistor={persistor}>
         <Router>
             <App/>
         </Router>
-        </PersistGate>
     </Provider>,
     document.getElementById('root'));
\ No newline at end of file