Skip to content

Z
zhichan
Commit 82ef9e02 by 庄冰
Options

baidu

parent c7b40412
Showing with 113 additions and 85 deletions
center-channel/app/base/api/api.base.js
......@@ -49,7 +49,7 @@ class APIBase {
//保存缓存
await this.redisClient.setWithEx(shaStr, JSON.stringify(result), 3600);
}
result.requestId = pobj.RequestId ? pobj.RequestId : pobj.requestId || this.getUUID();
result.requestId = pobj.RequestId ? pobj.RequestId : pobj.requestId || req.requestId;
var tmpResult = pobj.actionType && pobj.actionType.indexOf("List") < 0 ? result : { status: result.status, message: result.message, requestId: result.requestId };
this.execClientNew.execLogs("reqPath:" + req.path, pobj, "center-channel-doexecMethod", tmpResult, null);
return result;
......
center-channel/app/base/api/impl/action/icpnotify.js
......@@ -56,110 +56,110 @@ class IcpNotify extends APIBase {
if (pobj.area) {
switch (pobj.area) {
case "1":
pobj.area = "北京";
break;
pobj.area = "北京";
break;
case "2":
pobj.area = "上海";
break;
pobj.area = "上海";
break;
case "3":
pobj.area = "福建";
break;
pobj.area = "福建";
break;
case "4":
pobj.area = "广西";
break;
pobj.area = "广西";
break;
case "5":
pobj.area = "广东";
break;
pobj.area = "广东";
break;
case "6":
pobj.area = "安徽";
break;
pobj.area = "安徽";
break;
case "7":
pobj.area = "河南";
break;
pobj.area = "河南";
break;
case "8":
pobj.area = "湖北";
break;
pobj.area = "湖北";
break;
case "9":
pobj.area = "浙江";
break;
pobj.area = "浙江";
break;
case "10":
pobj.area = "江苏";
break;
pobj.area = "江苏";
break;
case "11":
pobj.area = "山东";
break;
pobj.area = "山东";
break;
case "12":
pobj.area = "陕西";
break;
pobj.area = "陕西";
break;
case "13":
pobj.area = "宁夏";
break;
pobj.area = "宁夏";
break;
case "14":
pobj.area = "甘肃";
break;
pobj.area = "甘肃";
break;
case "15":
pobj.area = "新疆";
break;
pobj.area = "新疆";
break;
case "16":
pobj.area = "青海";
break;
pobj.area = "青海";
break;
case "17":
pobj.area = "天津";
break;
pobj.area = "天津";
break;
case "18":
pobj.area = "重庆";
break;
pobj.area = "重庆";
break;
case "19":
pobj.area = "河北";
break;
pobj.area = "河北";
break;
case "20":
pobj.area = "山西";
break;
pobj.area = "山西";
break;
case "21":
pobj.area = "辽宁";
break;
pobj.area = "辽宁";
break;
case "22":
pobj.area = "吉林";
break;
pobj.area = "吉林";
break;
case "23":
pobj.area = "黑龙江";
break;
pobj.area = "黑龙江";
break;
case "24":
pobj.area = "江西";
break;
pobj.area = "江西";
break;
case "25":
pobj.area = "湖南";
break;
pobj.area = "湖南";
break;
case "26":
pobj.area = "四川";
break;
pobj.area = "四川";
break;
case "27":
pobj.area = "贵州";
break;
pobj.area = "贵州";
break;
case "28":
pobj.area = "云南";
break;
pobj.area = "云南";
break;
case "29":
pobj.area = "内蒙古";
break;
pobj.area = "内蒙古";
break;
case "30":
pobj.area = "西藏";
break;
pobj.area = "西藏";
break;
case "31":
pobj.area = "含外资";
break;
pobj.area = "含外资";
break;
case "32":
pobj.area = "全外资";
break;
pobj.area = "全外资";
break;
case "33":
pobj.area = "香港";
break;
pobj.area = "香港";
break;
case "34":
pobj.area = "海南";
break;
pobj.area = "海南";
break;
default:
pobj.area = "";
break;
pobj.area = "";
break;
}
}
if (!pobj.area) {
......
center-channel/app/config/routes/api.js
......@@ -552,6 +552,31 @@ module.exports = function (app) {
res.end(JSON.stringify(result));
return;
}
// var token = req.headers["token"] || "";
// if (!token) {
// var resfail = {
// "success": false,
// "errorMsg": "req headers token can not be empty",
// "errorCode": "ok"
// };
// res.end(JSON.stringify(resfail));
// return;
// }
// var cacheManager = system.getObject("db.common.cacheManager");
// var result = await cacheManager["AppTokenByHostsCache"].getCache(token, system.exTime);
// if (result.status != 0) {
// var resfail = {
// "success": false,
// "errorMsg": result.msg || "token error",
// "errorCode": "ok"
// };
// res.end(JSON.stringify(resfail));
// // res.end(JSON.stringify(result));
// return;
// }
// req.appInfo = result.data;
// req.body.appInfo = result.data;
// req.actionProcess = result.data.app_code;
var token = req.headers["token"] || "";
if (!token) {
var resfail = {
......@@ -562,21 +587,24 @@ module.exports = function (app) {
res.end(JSON.stringify(resfail));
return;
}
var cacheManager = system.getObject("db.common.cacheManager");
var result = await cacheManager["AppTokenByHostsCache"].getCache(token, system.exTime);
if (result.status != 0) {
var resfail = {
"success": false,
"errorMsg": result.msg || "token error",
"errorCode": "ok"
};
res.end(JSON.stringify(resfail));
// res.end(JSON.stringify(result));
return;
//校验jwt产生的token
const tokenSecret = settings.env == "localhost" || settings.env == "dev" ? PDICT.token_secret_dev : PDICT.token_secret_prod;
let token_secret_str = null;
jwt.verify(token, tokenSecret, function (err, decoded) { // decoded:指的是token解码后用户信息
if (err) { //如果token过期则会执行err的代码块
return res.send(system.getResultFail(-88, "Failed to authenticate token，error:" + err));
} else {
token_secret_str = decoded.token_secret;
}
});
let decryptResult = await utilsAuthSve.decryptInfo(token_secret_str);
if (decryptResult.status != 0) {
return res.send(system.getResultFail(-88, "Failed to authenticate token，fail:" + decryptResult.msg));
}
req.appInfo = result.data;
req.body.appInfo = result.data;
req.actionProcess = result.data.app_code;
let tmpAppInfo = JSON.parse(decryptResult.data);
req.body.appInfo = tmpAppInfo;
req.appInfo = tmpAppInfo;
req.actionProcess = tmpAppInfo.app_code;
next();
});
//icp需求推送
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment