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