mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2024-12-15 05:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,599 Commits 44 Branches 81 Tags 310 MiB
f30c1abe69
Commit Graph

421 Commits

Author SHA1 Message Date
喻希里
d5ed70a217 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-09-05 15:14:28 +08:00
喻希里
4441dc4a8f fix: 修复接口全部删除后添加按钮也消失了 2017-09-05 15:14:13 +08:00
zwjamnsss
39a9c8af2a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-09-05 15:11:13 +08:00
zwjamnsss
2b542a8ce8 fix: interf name long 2017-09-05 14:51:47 +08:00
喻希里
f8cdbebca6 fix: 添加footer版本信息、mockEditor高度自适应 2017-09-05 13:17:16 +08:00
sean
65468a622b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-09-04 13:44:43 +08:00
sean
79d4110387 opti: opti 接口列表 2017-09-04 13:44:38 +08:00
zwjamnsss
aeba7894e9 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-09-04 11:52:56 +08:00
zwjamnsss
c57fb521a9 feat: col filter 2017-09-04 11:52:49 +08:00
喻希里
88f33ff56a fix: 限定文件导入的格式 2017-09-04 11:05:27 +08:00
喻希里
8e1c11b8e6 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-09-02 21:21:56 +08:00
喻希里
7d465b2914 fix: postman 数据导入解析移到前端 2017-09-02 21:21:41 +08:00
sean
b97c20834b opti: 优化接口名太长导致左侧列表显示问题 2017-09-01 16:36:07 +08:00
sean
b73dc2f862 fix: fix import postman 2017-09-01 14:59:53 +08:00
sean
0f1852f880 opti: interface menu 2017-08-31 20:43:38 +08:00
sean
6471a4a04c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-31 18:04:49 +08:00
sean
9bdaacb671 feat: 增强mock 2017-08-31 18:04:45 +08:00
喻希里
4eba45c12c fix: 解决interface文件冲突 2017-08-31 17:36:02 +08:00
喻希里
0195ad6457 feat: 添加postman数据导入功能 2017-08-31 17:26:09 +08:00
zwjamnsss
fffea8c6f8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-31 16:00:46 +08:00
sean
6d449fe81a opti: 优化接口变更邮件通知机制 2017-08-31 15:47:46 +08:00
zwjamnsss
589ca5a9dd feat: 增加返回结果验证功能 2017-08-31 15:18:37 +08:00
sean
8c33a27369 opti: interface add 2017-08-31 14:37:43 +08:00
sean
bfb0fdfd3e feat: add interface change notice and opti interfaceEdit 2017-08-31 12:07:47 +08:00
sean
063b063dfe fix: interface path form bug 2017-08-30 18:04:28 +08:00
sean
91158fe16e fix: 请求path参数和form不同步问题 2017-08-30 15:56:39 +08:00
wenbo.dong
8fa9b93ffd feat: request headers添加自动提示 2017-08-30 14:43:10 +08:00
喻希里
2280f6bf10 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-30 10:44:14 +08:00
喻希里
354ca8d3df fix: 修改view页面的样式 2017-08-30 10:43:57 +08:00
wenbo.dong
b41be9b81e fix: 修改项目的双重提示 2017-08-29 16:17:58 +08:00
sean
991dfa95b9 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-29 13:38:48 +08:00
sean
bbeff6bde5 fix: restful api bug 2017-08-29 13:38:42 +08:00
喻希里
5e24f22a89 fix: 修复接口编辑而左侧列表未更新问题 2017-08-29 11:58:04 +08:00
喻希里
b5c93b41a5 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-29 11:31:10 +08:00
喻希里
d9f6fc3461 fix: 修改列表method的样式 2017-08-29 11:30:57 +08:00
zwjamnsss
45b4ede655 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-29 10:21:02 +08:00
zwjamnsss
f8a7fd62d5 opti: 更新 currCase 2017-08-29 10:20:57 +08:00
喻希里
9d16f46af0 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-29 10:12:26 +08:00
zwjamnsss
26abd9384c opti: case_env 2017-08-29 10:08:55 +08:00
喻希里
18f3dd614a fix: dist文件冲突 2017-08-29 10:04:24 +08:00
喻希里
8bff746cf8 fix: 修改basepath更新以及interface编辑bug 2017-08-28 20:29:51 +08:00
zwjamnsss
9597957d03 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-28 19:31:27 +08:00
zwjamnsss
db971d5734 fix: projectId 2017-08-28 19:31:22 +08:00
wenbo.dong
726f225b86 feat: 项目接口页面的面包屑 2017-08-28 18:12:13 +08:00
zwjamnsss
cb09653734 opti: col list 2017-08-28 16:57:46 +08:00
zwjamnsss
576c6c25bc opti: col list 2017-08-28 16:42:24 +08:00
zwjamnsss
305e5a72c2 opti: 禁掉运行编辑 2017-08-28 16:12:57 +08:00
sean
5e636e9301 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 19:04:16 +08:00
sean
442baed010 fix: websocket interface edit bug 2017-08-25 19:04:12 +08:00
wenbo.dong
d592cc98fb fix: 删除project接口的groupname字段 修复分组名称显示错误的bug 2017-08-25 18:19:10 +08:00
sean
98e0c715c9 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 17:19:37 +08:00
sean
f2354be9ca feat: add websocket 2017-08-25 17:19:34 +08:00
wenbo.dong
cc016562e6 Merg branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 17:16:51 +08:00
wenbo.dong
212a3a9fcc fix: 项目设置里分组名称显示错误的bug 2017-08-25 17:16:48 +08:00
sean
f3d82255dc fix: interface edit catid bug 2017-08-25 16:31:53 +08:00
sean
bdc1f41f0d fix: group/up bug 2017-08-25 16:25:34 +08:00
sean
53f0f65619 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 15:55:23 +08:00
sean
f9d66ee2fc fix: websocket bug 2017-08-25 15:55:19 +08:00
wenbo.dong
d21c38c0de Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 14:39:05 +08:00
sean
6333dde87d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 14:19:38 +08:00
sean
4939481cd6 fix: 修改websocket domain bug 2017-08-25 14:18:22 +08:00
wenbo.dong
0cf936f03b fix: 登录错误提示重复弹出的bug 2017-08-25 12:20:41 +08:00
qitmac000249
d53603bd35 fix: modify 2017-08-25 11:57:01 +08:00
wenbo.dong
3ebf37ec82 fix: 修改环境域名的正则条件 2017-08-25 11:33:12 +08:00
wenbo.dong
1eba042d17 fix: 项目环境修改后发送project/get请求 2017-08-25 11:26:31 +08:00
wenbo.dong
abcb1a2ebc Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 11:22:28 +08:00
qitmac000249
91ef871c59 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-25 11:20:20 +08:00
qitmac000249
c8d44e076f fix: modify 2017-08-25 11:20:05 +08:00
sean
5a9241b497 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 11:18:33 +08:00
sean
2803bb2321 feat: fix interface bug 2017-08-25 11:18:29 +08:00
wenbo.dong
d36aa90066 docs: 删除项目的文案修改 2017-08-25 11:12:37 +08:00
qitmac000249
93e9bfc7a3 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-25 11:11:12 +08:00
qitmac000249
ca567c2387 fix: modify 2017-08-25 11:11:00 +08:00
wenbo.dong
db5e38e59c fix: 修复项目陈孤雁设置里，分组成员显示'我'定位错误 2017-08-24 21:57:53 +08:00
sean
139b087e19 fix: interface path icon 2017-08-24 21:18:12 +08:00
sean
c21fab09c1 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 20:58:35 +08:00
sean
2b8d4b6e2a feat: add chrome ctx 2017-08-24 20:58:30 +08:00
qitmac000249
d993d6992f Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-24 19:28:03 +08:00
qitmac000249
1a09cbf79f fix: modify 2017-08-24 19:27:48 +08:00
wenbo.dong
a81012cce1 opti: 编辑项目页布局调整 2017-08-24 18:31:16 +08:00
wenbo.dong
7c86d2e0cb opti: 布局调整 2017-08-24 18:06:38 +08:00
sean
d9269efe64 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 16:37:49 +08:00
sean
3048ec09f2 docs: opti docs 2017-08-24 16:37:45 +08:00
wenbo.dong
ce91b182cf Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 15:41:03 +08:00
wenbo.dong
57143a14ed feat: 新建项目成员时选择成员权限 2017-08-24 15:41:01 +08:00
qitmac000249
102a2c799e Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-24 15:39:35 +08:00
qitmac000249
27fd5e3d01 fix: 修改user样式 2017-08-24 15:39:22 +08:00
wenbo.dong
9ffef3c41b fix: merge 2017-08-24 15:21:54 +08:00
wenbo.dong
d422ddfeda feat: 首页引导注册 2017-08-24 15:20:40 +08:00
zwjamnsss
3083273f8b opti: 样式 2017-08-24 14:38:31 +08:00
sean
be621f3e26 feat: add auth check 2017-08-24 14:17:19 +08:00
sean
df1f73a347 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 12:16:46 +08:00
sean
0e4dc60ad8 fix: interface filter bug 2017-08-24 12:16:43 +08:00
zwjamnsss
9a3f1ab239 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 11:11:42 +08:00
zwjamnsss
f7b945ba08 feat: 更新用例 2017-08-24 11:11:38 +08:00
qitmac000249
b3b5fe3976 fix: modify 2017-08-24 11:04:53 +08:00
qitmac000249
15c78db2e0 fix: modify 2017-08-24 11:00:10 +08:00
zwjamnsss
cd68abf810 fix: 解决冲突 2017-08-24 10:47:23 +08:00
zwjamnsss
4ad00a5928 feat: 返回header 2017-08-24 10:44:02 +08:00
sean
c5c6dfee27 feat: add up_case interface 2017-08-24 10:33:17 +08:00
wenbo.dong
06606c306e opti: 设置页布局调整 2017-08-23 21:01:50 +08:00
wenbo.dong
85adf4e284 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 17:23:58 +08:00
wenbo.dong
3442e0aee6 opti: 项目卡片布局调整 2017-08-23 17:23:54 +08:00
wenbo.dong
1fd9b81a2b opti: 样式微调 2017-08-23 16:08:26 +08:00
zwjamnsss
eeaa42fb47 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 15:52:15 +08:00
zwjamnsss
d4cb38ced8 feat: 用例运行 2017-08-23 15:50:07 +08:00
wenbo.dong
34058b612f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 15:25:37 +08:00
wenbo.dong
2d42c8b334 feat: 完成项目头像设置 2017-08-23 15:25:35 +08:00
zwjamnsss
04e0a7b101 feat: 保存用例 2017-08-23 15:20:09 +08:00
qitmac000249
44688dfff4 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-23 12:23:33 +08:00
qitmac000249
00b9efc3a5 fix: 修改动态页的样式 2017-08-23 12:23:20 +08:00
zwjamnsss
12ca51bece Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 11:41:51 +08:00
zwjamnsss
1be9f282fb feat: domain设置 2017-08-23 11:41:46 +08:00
wenbo.dong
e162fecb86 feat: 新建与删除项目的跳转 2017-08-23 10:52:12 +08:00
wenbo.dong
fec132b423 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 10:38:19 +08:00
wenbo.dong
8ea87172d9 feat: 修改项目头像布局 2017-08-23 10:36:24 +08:00
sean
4e7211c945 fix: add cat bug 2017-08-22 20:44:33 +08:00
zwjamnsss
b70bb57384 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-22 19:59:01 +08:00
zwjamnsss
e710921f20 feat: 删除用例 2017-08-22 19:57:39 +08:00
sean
9d501aaf8c fix: add cat bug 2017-08-22 19:46:00 +08:00
zwjamnsss
52eeb29dcb feat: 删除集合 2017-08-22 18:21:05 +08:00
zwjamnsss
4e14ef147b feat: 删除集合 2017-08-22 18:05:20 +08:00
zwjamnsss
b85f9437de Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-22 16:50:24 +08:00
zwjamnsss
dd0a0c1698 feat: 修改集合名 2017-08-22 16:50:15 +08:00
qitmac000249
be04f17cdc Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-22 16:37:37 +08:00
qitmac000249
af559c31f9 fix: modify 2017-08-22 16:37:24 +08:00
sean
25cc70f655 docs: opti docs 2017-08-22 16:06:56 +08:00
wenbo.dong
47ea68206e feat: 主题定制 2017-08-22 13:56:12 +08:00
wenbo.dong
a014e010b2 feat: 主题定制 2017-08-22 12:20:33 +08:00
qitmac000249
89bfe7abae Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-22 11:23:15 +08:00
qitmac000249
741844a504 fix: 预览页修改 2017-08-22 11:23:00 +08:00
zwjamnsss
d7583ebfd6 feat: postman 2017-08-22 10:51:39 +08:00
zwjamnsss
db494d324b fix: env 2017-08-22 10:02:50 +08:00
zwjamnsss
b5b53001ec Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-22 09:43:38 +08:00
zwjamnsss
687339ea8d feat: postman 2017-08-22 09:43:33 +08:00
zwjamnsss
6a4d1a34aa feat: postman 2017-08-22 09:41:20 +08:00
sean
26f3b8cf84 docs: opti docs 2017-08-21 21:18:29 +08:00
zwjamnsss
7ec9f122b7 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-21 15:57:08 +08:00
zwjamnsss
74ebf29a4c feat: col-content 2017-08-21 15:57:04 +08:00
sean
0540f49b21 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-21 12:05:21 +08:00
sean
9e419165ed opti: optimize interface edit 2017-08-21 12:05:18 +08:00
zwjamnsss
4f095094c5 fix: 接口 集合tab切换 2017-08-21 10:38:16 +08:00
sean
4984e5eb0a feat: optimize project router 2017-08-21 10:18:56 +08:00
sean
1922ef3859 feat: 完善接口列表 2017-08-20 22:13:46 +08:00
sean
44930f3161 fix: interfaceMenu defaultkeys bug 2017-08-19 19:43:04 +08:00
sean
587e592d82 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-19 19:06:12 +08:00
sean
b04c988def feat: add interface cat component 2017-08-19 19:06:09 +08:00
zwjamnsss
96f0515e72 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 21:11:12 +08:00
zwjamnsss
c8502d871f feat: col menu 2017-08-18 21:11:09 +08:00
sean
d9594744c8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 20:35:34 +08:00
sean
91965fd468 feat: add interface cat 2017-08-18 20:35:31 +08:00
wenbo.dong
cb6fede8f4 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 19:47:06 +08:00
wenbo.dong
a07551d159 feat: 删除项目的二次确认 2017-08-18 19:47:02 +08:00
zwjamnsss
5dc40d7ede feat: col menu 2017-08-18 18:13:33 +08:00
zwjamnsss
92e41b626b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 17:56:32 +08:00
zwjamnsss
a9160f570b feat: col-menu 2017-08-18 17:56:26 +08:00
qitmac000249
2ce7cf3690 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-18 17:49:47 +08:00
qitmac000249
68af11e6f2 fix: 修改预览页加载不显示 2017-08-18 17:49:37 +08:00
zwjamnsss
f3778da554 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 17:31:53 +08:00
zwjamnsss
584640a7f2 feat: case menu 2017-08-18 17:31:48 +08:00
wenbo.dong
3c8b75a9d4 feat: 项目setting成员设置 2017-08-18 17:08:37 +08:00
wenbo.dong
98d8a41e83 feat: 项目设置中的分组成员展示 2017-08-18 15:58:40 +08:00
wenbo.dong
e5eb0f6ec4 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 15:25:30 +08:00
wenbo.dong
7e06189313 feat: addproject接口添加groupname字段 2017-08-18 15:25:27 +08:00
sean
2805ea0b82 fix: fix empty edit interface info 2017-08-18 12:37:32 +08:00
sean
4158855022 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 12:07:18 +08:00
sean
9bec5d6bb4 fix: interfaceContent bug 2017-08-18 12:07:14 +08:00
zwjamnsss
97ad5a5b0f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 12:00:36 +08:00
zwjamnsss
8021b055d8 feat: col menu 2017-08-18 12:00:21 +08:00
wenbo.dong
74a2c20099 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 11:39:46 +08:00
wenbo.dong
2572cf37d1 feat: setting页面布局 2017-08-18 11:39:08 +08:00
qitmac000249
a78a83c3e5 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-18 11:34:18 +08:00
qitmac000249
1be17b9144 fix: 添加ErrMsg到log 2017-08-18 11:34:06 +08:00
zwjamnsss
05b13df731 feat: col menu 2017-08-18 11:33:37 +08:00
sean
2c9a57b357 fix: mockEditor bug 2017-08-18 11:23:04 +08:00
sean
a4147e8e86 fix: route bug 2017-08-18 11:05:33 +08:00
wenbo.dong
e337210b3b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 22:20:01 +08:00
wenbo.dong
e7366e3de1 feat: 编辑项目 2017-08-17 22:19:58 +08:00
zwjamnsss
47a78e8c30 feat: menu 2017-08-17 20:58:43 +08:00
zwjamnsss
ac0947aa88 feat: 解决冲突 2017-08-17 20:25:44 +08:00
zwjamnsss
8e4422a327 feat: col-menu 2017-08-17 20:24:07 +08:00
sean
fb4ebde34d fix: fix route some bug 2017-08-17 18:00:02 +08:00
zwjamnsss
c111bafc9c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 16:10:49 +08:00
zwjamnsss
5135a27d7b feat: componetWillMount 2017-08-17 16:10:43 +08:00
zwjamnsss
ba57b53a5f feat: componetWillMount 2017-08-17 16:10:34 +08:00
wenbo.dong
c109cc8557 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 15:35:05 +08:00
wenbo.dong
d05561f778 docs: 文档文案修改 2017-08-17 15:34:43 +08:00
sean
8fc4da40aa Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 15:19:50 +08:00
sean
99ef07342c feat: perfect websocket 2017-08-17 15:19:47 +08:00
wenbo.dong
d3849735ba feat: project setting layout 2017-08-17 14:35:00 +08:00
zwjamnsss
8d2a3e4c47 feat: col-menu 2017-08-17 12:19:56 +08:00
qitmac000249
1570af0fef fix: 为log添加头像 2017-08-17 12:16:53 +08:00
qitmac000249
f6c94d698f fix: 为log添加头像 2017-08-17 12:14:58 +08:00
wenbo.dong
05fc8bc000 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 12:09:11 +08:00
wenbo.dong
300ab79ee3 feat: 空项目组提示 2017-08-17 12:09:08 +08:00
sean
adbe2f7c6b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 12:03:58 +08:00
sean
c129e68abb fix: add koa-route 2017-08-17 12:03:55 +08:00
zwjamnsss
14311f1637 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 11:41:04 +08:00
zwjamnsss
c2427937da feat: 添加用例 2017-08-17 11:40:59 +08:00
sean
f71b210839 feat: merge dev to local 2017-08-17 11:26:20 +08:00