Merge branch 'dev'

.babelrc

@@ -2,10 +2,10 @@
   "presets": ["react", "es2015", "stage-2"],
   "env": {
     "server": {
-      "plugins": ["syntax-dynamic-import", "dynamic-import-node"]
+      "plugins": ["transform-decorators-legacy","syntax-dynamic-import", "dynamic-import-node"]
     },
     "client": {
-      "plugins": ["dynamic-import-webpack"]
+      "plugins": ["transform-decorators-legacy","dynamic-import-webpack"]
     }
   }
 }

.gitignore

@@ -29,3 +29,4 @@ dist
 *.DS_Store
 package-lock.json
 config/index.js
+config/index_*.js

client/index.js

@@ -33,8 +33,6 @@ if (__DEV__) {
 
 const me = getProfile(store.getState())
 
-// console.log(me);
-
 const _Router = Router({ userinfo: me })
 
 ReactDOM.hydrate((

config/index.js

@@ -3,7 +3,7 @@
 let config = {
   debug: false,
   host: 'localhost',
-  port: 4000,
+  port: 9001,
 
   auth_cookie_name: 'admin.xiaoduyu.com',
 
@@ -14,15 +14,20 @@ let config = {
   public_path: '//admin.xiaoduyu.com',
 
   // api
-  api_url: 'http://admin.xiaoduyu.com'
+  api_url: 'http://admin.xiaoduyu.com',
+
+  graphql_url: 'http://admin.xiaoduyu.com/graphql'
 }
 
 // 开发环境配置
 if (process.env.NODE_ENV == 'development') {
   config.debug = true
+  config.port = 5000
   config.class_scoped_name = '[name]_[local]__[hash:base64:5]'
-  config.public_path = '//localhost:4000'
+  config.public_path = '//localhost:5000'
   config.api_url = 'http://localhost:3000'
+  // config.api_url = 'http://admin.xiaoduyu.com'
+  config.graphql_url = 'http://localhost:3000/graphql'
 }
 
 module.exports = config

package.json

@@ -52,6 +52,7 @@
     "babel-loader": "^7.1.2",
     "babel-plugin-dynamic-import-node": "^1.2.0",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
+    "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",

server/index.js

@@ -1,4 +1,4 @@
-require('babel-register')
-require('babel-polyfill')
-require('css-modules-require-hook/preset')
-require('./server')
+require('babel-register');
+require('babel-polyfill');
+require('css-modules-require-hook/preset');
+require('./server');

server/server.js

@@ -15,7 +15,7 @@ import { Provider } from 'react-redux'
 
 import configureStore from '../src/store'
 
-import { loadUserInfo } from '../src/actions/user'
+import { loadUserInfo, removeUserInfo } from '../src/actions/user'
 import { addAccessToken } from '../src/actions/sign'
 
 // 路由组件
@@ -121,9 +121,17 @@ app.get('*', async (req, res)=>{
   // 验证 token 是否有效
   if (accessToken) {
 
-    [ err, userinfo ] = await loadUserInfo({ accessToken })(store.dispatch, store.getState)
+    [ err, userinfo ] = await loadUserInfo({ accessToken })(store.dispatch, store.getState);
+
+    if (userinfo && userinfo.role != 100) {
+      userinfo = null;
+      store.dispatch(removeUserInfo());
+    }
+
+    if (userinfo) {
+      store.dispatch(addAccessToken({ access_token: accessToken }))
+    }
 
-    if (userinfo) store.dispatch(addAccessToken({ access_token: accessToken }))
   }
 
   let _route = null,

src/actions/analysis.js

@@ -36,13 +36,22 @@ export function loadSummary({ name, filters = {} }) {
 
     let sql = `
       {
-      	analysis${variables}{
-          user_count
-          posts_count
-          comment_count
-          notification_count
-          userNotification_count
+        countPosts${variables}{
+          count
         }
+        countUsers${variables}{
+          count
+        }
+        countComments${variables}{
+          count
+        }
+        countUserNotifications${variables}{
+          count
+        }
+        countNotifications${variables}{
+          count
+        }
+
       }
     `
 
@@ -51,12 +60,12 @@ export function loadSummary({ name, filters = {} }) {
       headers: accessToken ? { 'AccessToken': accessToken } : null
     })
 
-    if (err) return alert('提交失败')
+    if (err) return
 
     dispatch({
       type: 'SET_ANALYSIS_LIST_BY_NAME',
       name,
-      data: res.data.analysis
+      data: res.data
     })
 
     /*

src/actions/captcha.js

@@ -1,3 +1,40 @@
+
+import graphql from './common/graphql'
+
+/**
+ * [添加] 验证码
+ * @param  {String} id
+ * @param  {Object} [args={}]  参数
+ * @param  {String} [fields=``] 返回字段
+ * @return {Object} promise
+ */
+export const addCaptcha = ({ id = new Date().getTime(), args, fields = `success`  }) => {
+  return (dispatch, getState) => {
+    return new Promise(async (resolve)=> {
+
+      let accessToken = accessToken || getState().user.accessToken;
+
+      let [ err, res ] = await graphql({
+        type: 'mutation',
+        api: 'addCaptcha',
+        args,
+        fields,
+        headers: accessToken ? { 'AccessToken': accessToken } : null
+      });
+
+      if (res && res._id && res.url) {
+        dispatch({ type: 'ADD_CAPRCHA_ID', id, data: res });
+      }
+
+      resolve([ err, res ])
+
+    })
+
+  }
+}
+
+
+/*
 import grapgQLClient from '../common/grapgql-client'
 
 import Ajax from '../common/ajax'
@@ -23,8 +60,8 @@ export const getCaptchaId = () => {
       // let accessToken = getState().user.accessToken
 
       let sql = `
-      {
-        captcha{
+      mutation {
+        addCaptcha(type:"sign-in"){
           _id
           url
         }
@@ -39,6 +76,9 @@ export const getCaptchaId = () => {
         fetchPolicy: 'network-only'
       })
 
+      console.log(err);
+      console.log(res);
+
       if (err) {
         reject([err])
       } else {
@@ -49,7 +89,7 @@ export const getCaptchaId = () => {
 
   }
 }
-
+*/
 /*
 export function addCaptchaByIP(callback) {
   return (dispatch, getState) => {