Skip to content

Commit

Permalink
Merge pull request #17 from apemost/develop
Browse files Browse the repository at this point in the history
Fix invalid npm test script and typo
  • Loading branch information
JacksonTian committed Apr 18, 2017
2 parents 8ce6b66 + 0d30d0c commit c4f4596
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions lib/wechat.js
Expand Up @@ -231,9 +231,9 @@ class Wechat {
ctx.weixin_xml = xml;
// 解析xml
var result = await parseXML(xml);
var formated = formatMessage(result.xml);
var formatted = formatMessage(result.xml);
if (encrypted) {
var encryptMessage = formated.Encrypt;
var encryptMessage = formatted.Encrypt;
if (query.msg_signature !== this.cryptor.getSignature(timestamp, nonce, encryptMessage)) {
ctx.status = 401;
ctx.body = 'Invalid signature';
Expand All @@ -247,11 +247,11 @@ class Wechat {
return;
}
var decodedXML = await parseXML(messageWrapXml);
formated = formatMessage(decodedXML.xml);
formatted = formatMessage(decodedXML.xml);
}

// 业务逻辑处理
const body = await handle(formated);
const body = await handle(formatted);

/*
* 假如服务器无法保证在五秒内处理并回复,可以直接回复空串。
Expand All @@ -262,7 +262,7 @@ class Wechat {
return;
}

var replyMessageXml = reply(body, formated.ToUserName, formated.FromUserName);
var replyMessageXml = reply(body, formatted.ToUserName, formatted.FromUserName);

if (!query.encrypt_type || query.encrypt_type === 'raw') {
ctx.body = replyMessageXml;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -4,7 +4,7 @@
"description": "wechat api for co",
"main": "lib/wechat.js",
"scripts": {
"test": "make test-all"
"test": "make test"
},
"repository": {
"type": "git",
Expand Down

0 comments on commit c4f4596

Please sign in to comment.