|
@@ -77,8 +77,7 @@ router.post('/getTest', function(req, res, next) {
|
|
|
req1.on('error', (error) => {
|
|
|
console.error(error);
|
|
|
});
|
|
|
- const remoteUser = req.user;
|
|
|
- const bodyData = qs.stringify({ appId: "36dd21cde3b2f30a", taskInfo: req.body[0].taskInfo, remoteUser: remoteUser });
|
|
|
+ const bodyData = qs.stringify({ appId: "36dd21cde3b2f30a", taskInfo: req.body[0].taskInfo });
|
|
|
req1.write(bodyData);
|
|
|
req1.end();
|
|
|
// request({
|
|
@@ -620,6 +619,7 @@ router.post('/userLogin', (req, res) => {
|
|
|
let data = GetData(req);
|
|
|
//查询用户的数据
|
|
|
mysql.usselect([_mysqlLabor[0], _mysqlLabor[1], 'select_UserByUserId', data['id']], function(ret) {
|
|
|
+ const remoteUser = req.user;
|
|
|
if (ret[0].length == 0) { //数据库没有这个人的数据,查询学生表或者老师表获取数据
|
|
|
mysql.usselect([_mysqlLabor[0], _mysqlLabor[1], 'select_UserMessageById', data['id']], (ret2) => {
|
|
|
let userData = {};
|
|
@@ -652,7 +652,7 @@ router.post('/userLogin', (req, res) => {
|
|
|
})
|
|
|
} else {
|
|
|
//数据库有数据
|
|
|
- res.end(JSON.stringify(ret[0][0]));
|
|
|
+ res.end(JsoN.stringify({...ret[0][0], remoteUser }));
|
|
|
}
|
|
|
|
|
|
});
|