Merge branch 'zwj-yapi' into dev

client/containers/ProjectGroups/GroupList/GroupList.js

@@ -6,7 +6,7 @@ import { Card } from 'antd'
 import {
   fetchGroupList,
   fetchCurrGroup
-} from '../../actions/group.js'
+} from '../../../actions/group.js'
 
 import './GroupList.scss'
 

client/containers/ProjectGroups/ProjectGroups.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import GroupList from '../../components/GroupList/GroupList.js';
+import GroupList from './GroupList/GroupList.js';
 import ProjectList from './ProjectList';
 import { Row, Col } from 'antd';
 

client/index.js

@@ -1,13 +1,21 @@
 import React from 'react'
 import 'babel-polyfill'
+import thunkMiddleware from 'redux-thunk'
+import promiseMiddleware from 'redux-promise';
 import ReactDOM from 'react-dom'
 import App from './App'
-import { createStore, combineReducers } from 'redux'
+import { createStore, combineReducers, applyMiddleware } from 'redux'
 import { Provider } from 'react-redux'
 import ReduxContainer from './ReduxContainer.js'
 
+console.log('thunkMiddleware', thunkMiddleware)
+console.log('promiseMiddleware', promiseMiddleware)
+
 // 合并 redux 创建stroe
-const store = createStore(combineReducers( ReduxContainer ))
+const store = createStore(combineReducers( ReduxContainer ), applyMiddleware(
+  thunkMiddleware.default,
+  promiseMiddleware
+))
 
 ReactDOM.render(
   <Provider store={store}>

package.json

@@ -16,6 +16,7 @@
   "license": "ISC",
   "dependencies": {
     "@qnpm/ykit-config-qunar": "^0.8.1",
+    "axios": "^0.16.2",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "fs-extra": "^3.0.1",
     "jsonwebtoken": "^7.4.1",
@@ -34,8 +35,9 @@
     "node-sass-china": "^4.5.0",
     "nodemailer": "^4.0.1",
     "prop-types": "^15.5.10",
-    "sha1": "^1.1.1",
     "redux": "^3.7.1",
+    "redux-promise": "^0.5.3",
+    "redux-thunk": "^2.2.0",
     "sha1": "^1.1.1",
     "ykit-config-antd": "^0.1.3",
     "ykit-config-react": "^0.4.4"