Skip to content

修正转到客服模式时没有处理数据加密，造成在加密请求无法转到客服模式的问题 #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2015
Merged

修正转到客服模式时没有处理数据加密，造成在加密请求无法转到客服模式的问题 #190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions lib/wechat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,15 +238,14 @@ var respond = function (handler) {
return function (req, res, next) {
var message = req.weixin;
var callback = handler.getHandler(message.MsgType);
res.reply = function (content) {
res.writeHead(200);
// 响应空字符串，用于响应慢的情况，避免微信重试
if (!content) {
return res.end('');
}
var xml = reply(content, message.ToUserName, message.FromUserName, message);

/**
* 根据条件对返回的XML数据加密
* @param xml
*/
function encryptXml(xml) {
if (!req.query.encrypt_type || req.query.encrypt_type === 'raw') {
res.end(xml);
return xml;
} else {
// 判断是否已有前置cryptor
var cryptor = req.cryptor || handler.cryptor;
Expand All @@ -255,14 +254,25 @@ var respond = function (handler) {
wrap.nonce = parseInt((Math.random() * 100000000000), 10);
wrap.timestamp = new Date().getTime();
wrap.signature = cryptor.getSignature(wrap.timestamp, wrap.nonce, wrap.encrypt);
res.end(encryptWrap(wrap));
return encryptWrap(wrap);
}
}

res.reply = function (content) {
res.writeHead(200);
// 响应空字符串，用于响应慢的情况，避免微信重试
if (!content) {
return res.end('');
}

res.end(encryptXml(reply(content, message.ToUserName, message.FromUserName, message)));
};

// 响应消息，转到客服模式
res.transfer2CustomerService = function (kfAccount) {
res.writeHead(200);
res.end(reply2CustomerService(message.ToUserName, message.FromUserName, kfAccount));

res.end(encryptXml(reply2CustomerService(message.ToUserName, message.FromUserName, kfAccount)));
};

var done = function () {
Expand Down