docs: modify and fix 3 points #264
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1）默认脚手架生成的工程「egg-init egg-init egg-example --type=simple」中路由写到的/home了
2）this.ctx.curl(url, { dataType: 'json' })的返回值非promise对象，使用.then()会报错
3）需config中增加serverUrl、pageSize的值
popomore
reviewed
Jan 16, 2017
| ```js | ||
| // config/config.default.js | ||
| config.news = { | ||
| pageSize: 5, |
| @@ -217,6 +217,15 @@ exports.list = function* newsList() { | |||
| yield this.render('news/list.tpl', { list: newsList }); | |||
| }; | |||
| ``` | |||
| 还需增加app/service/news.js中读取到的配置： | |||
Current coverage is 97.89% (diff: 100%)@@ master #264 diff @@
==========================================
Files 34 34
Lines 904 904
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
Hits 885 885
Misses 19 19
Partials 0 0
|
|
@missjing 麻烦改改重新提交下 |
fengmk2
reviewed
Jan 16, 2017
| @@ -196,9 +196,9 @@ module.exports = app => { | |||
| // parallel GET detail, see `yield {}` from co | |||
| const newsList = yield Object.keys(idList).map(key => { | |||
| const url = `${serverUrl}/item/${idList[key]}.json`; | |||
| return this.ctx.curl(url, { dataType: 'json' }).then(res => res.data); | |||
There was a problem hiding this comment.
-.-!!
return this.app.urllib.request(url, { dataType: 'json' }).then(res => res.data);
内网版之前这么写的, 我就随手简化了下... examples 那边没问题的.
atian25
reviewed
Jan 16, 2017
| @@ -23,7 +23,7 @@ $ npm i | |||
|
|
|||
| ```bash | |||
| $ npm run dev | |||
| $ open localhost:7001 | |||
| $ open localhost:7001/home | |||
There was a problem hiding this comment.
这个地方不用改 home 了, boilerplate 那边我发 PR 修改了.
https://github.com/eggjs/egg-boilerplate-simple/pull/19/files
|
先合并了, 我在另一个 PR 改这个 home |
4 tasks
|
merge 的时候记得也要调整下 message |
|
呃。。。这个需要 revert 掉。。 @atian25 commit log 不对。。 |
|
没问题吧? 不是 squash 了? |
|
@atian25 你看看。。。
|
|
嗯, 下次注意下. 那还是 revert 吧, 几个修改点的. |
|
revert 不了了，很多人都 pull 了。只能硬接受了。以后谁搞错了罚款500 |
mattma
added a commit
that referenced
this pull request
Jan 17, 2017
* master: (37 commits) docs: fix quickstart typo (#266) docs: add http client debug docs (#265) docs: modify and fix 3 points (#264) docs(intro): improve decription (#263) docs: fix docs site version (#262) docs: Fix typo. (#261) docs: review 1st version docs (#257) fix: typo conext -> context (#259) docs: contributing && readme && deps (#253) docs: fix quickstart link in index.html (#256) docs: set the default locale zh-cn (#255) refactor: ctx.realStatus delegate ctx.response.realStatus (#252) docs: Add intro/index.md (#246) feat: adjust default plugins (#251) docs: add RESTful documents (#247) feat: delegate ctx.jsonp to ctx.response.jsonp (#248) chore: remove examples (#245) docs: improve mysql doc docs: add mysql doc docs: view (#228) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
1）默认脚手架生成的工程「egg-init egg-init egg-example --type=simple」中路由写到的/home了
2）this.ctx.curl(url, { dataType: 'json' })的返回值非promise对象，使用.then()会报错
3）需config中增加serverUrl、pageSize的值
Checklist
npm testpassesAffected core subsystem(s)
Description of change