Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev

client/containers/Interface/Interface.js

@@ -16,7 +16,7 @@ import { fetchAuditIcons } from '../../actions/interface.js'
     fetchAuditIcons,
   }
 )
-
+//
 class Interface extends Component {
   static propTypes = {
     fetchAuditIcons: PropTypes.func,

client/containers/Interface/Interface.scss

@@ -5,6 +5,7 @@
   -webkit-box-flex: 1;
   margin: 15px auto 0 auto;
   font-size: 0.14rem;
+  background: #FFF;
 
   .interface-list {
     width: 216px;

client/containers/Interface/InterfaceTable/InterfaceTable.js

@@ -34,8 +34,8 @@ class InterfaceTable extends Component {
       render: () => {
         return (
           <span>
-            <Button type="primary">Primary</Button>
-            <Button type="primary">Primary</Button>
+            <Button type="primary">编辑</Button>
+            <Button type="danger">删除</Button>
           </span>
         )
       }

exampleCode/api/interface/del.json

@@ -0,0 +1,8 @@
+{
+    "errcode": 0,
+    "errmsg": "success",
+    "data": {
+        "n": 1,
+        "ok": 1
+    }
+}

exampleCode/api/interface/up.json

@@ -0,0 +1,9 @@
+{
+    "errcode": 0,
+    "errmsg": "success",
+    "data": {
+        "n": 1,
+        "nModified": 1,
+        "ok": 1
+    }
+}

exampleCode/api/user/del.json

@@ -0,0 +1,8 @@
+{
+    "errcode": 0,
+    "errmsg": "success",
+    "data": {
+        "n": 1,
+        "ok": 1
+    }
+}

exampleCode/api/user/logout.json

@@ -0,0 +1,5 @@
+{
+    "errcode": 0,
+    "errmsg": "success",
+    "data": "ok"
+}

exampleCode/api/user/reg.json

@@ -0,0 +1,11 @@
+{
+    "errcode": 0,
+    "errmsg": "success",
+    "data": {
+        "uid": 139,
+        "email": "18500803805@163.com",
+        "add_time": 1499768413,
+        "up_time": 1499768413,
+        "role": "member"
+    }
+}

exampleCode/api/user/up.json

@@ -0,0 +1,9 @@
+{
+    "errcode": 0,
+    "errmsg": "success",
+    "data": {
+        "n": 1,
+        "nModified": 1,
+        "ok": 1
+    }
+}

server/controllers/user.js

@@ -158,8 +158,8 @@ class userController extends baseController{
     }
 
     /**
-     * 获取用户列表
-     * @interface /user/list
+     * 根据用户个人信息
+     * @interface /user/find
      * @method GET
      * @param id 用户uid
      * @category user
@@ -183,7 +183,7 @@ class userController extends baseController{
     }
 
     /**
-     * 获取用户列表,只有admin用户才有此权限
+     * 删除用户,只有admin用户才有此权限
      * @interface /user/del
      * @method POST
      * @param id 用户uid

server/router.js

@@ -38,7 +38,7 @@ createAction('group', 'del', 'post', 'del')
 createAction('user', 'login', 'post', 'login')
 createAction('user', 'reg', 'post', 'reg')
 createAction('user', 'list', 'get', 'list')
-createAction('user', 'findById', 'post', 'findById')
+createAction('user', 'find', 'post', 'findById')
 createAction('user', 'update', 'post', 'update')
 createAction('user', 'del', 'post', 'del')
 createAction('user', 'status', 'get', 'getLoginStatus')