Skip to content

Z
zhichan
Commit 2d2e7c32 by 兰国旗
Options

laolan

parent 1a433f2a
Showing with 100 additions and 49 deletions
center-channel/app/base/service/impl/common/baseCenterOrderSve.js
......@@ -17,6 +17,42 @@ const uappId = {
'ali':"18", //(阿里icp、edi)
'baidu':"44" //(百度icp、edi)
}
const city = {
"1":"北京",
"2":"上海",
"3":"福建",
"4":"广西",
"5":"广东",
"6":"安徽",
"7":"河南",
"8":"湖北",
"9":"浙江",
"10":"江苏",
"11":"山东",
"12":"陕西",
"13":"宁夏",
"14":"甘肃",
"15":"新疆",
"16":"青海",
"17":"天津",
"18":"重庆",
"19":"河北",
"20":"山西",
"21":"辽宁",
"22":"吉林",
"23":"黑龙江",
"24":"江西",
"25":"湖南",
"26":"四川",
"27":"贵州",
"28":"云南",
"29":"内蒙古",
"30":"西藏",
"31":"含外资",
"32":"全外资",
"33":"香港",
"34":"海南"
}
/**
* 资质信息提报相关接口(ICP\EDI)
*/
......@@ -96,6 +132,7 @@ class BaseCenterOrderService extends AppServiceBase {
if (needsolution.channelSolutionNo) {
pushObj["bizId"] = needsolution.channelSolutionNo;
}
console.log('pushObj++',pushObj)
var pushIcpSolutionRes = await this.pushBaiduIcpSolution(pushObj, needsolution.solutionNo, pobj.appInfo, self);
}
......@@ -176,6 +213,7 @@ class BaseCenterOrderService extends AppServiceBase {
//推送ICP方案baidu 2020-10-26 laolan
async pushBaiduIcpSolution(pushObj, solutionNo, appInfo, self) {
console.log('pushObj++baidu+++',pushObj)
//推送方案信息
var pushRes = await self.baiduclient.baiduReqbyget({ path: "/api/bla/provider/plan", reqbody: pushObj });
console.log("pushRes++++",pushRes)
......@@ -191,7 +229,7 @@ class BaseCenterOrderService extends AppServiceBase {
}
};
var a = await self.reqCenterOrderApi(reqObj2);//保存渠道方案id
return pushRes;
return system.getResultSuccess();
}
}
}
......
center-channel/app/base/service/impl/utilsSve/utilsNeedSve2.js
......@@ -620,8 +620,13 @@ class UtilsNeedService2 extends AppServiceBase {
* @param {*} actionBody
*/
async queryIntentionList(pobj, actionBody) {
var aliResult = await self.aliclient.reqbyget({ action: "QueryIntentionList", reqbody: actionBody, apiVersion: "2019-05-08" });
if (aliResult.code == 200) {
if(pobj.appInfo.uapp_id = uappId.ali){
var result = await self.aliclient.reqbyget({ action: "QueryIntentionList", reqbody: actionBody, apiVersion: "2019-05-08" });
}
if(pobj.appInfo.uapp_id = uappId.baidu){
var result = await self.baiduclient.baiduReqbyget({ path: "api/bla/provider/requirement/list", reqbody: actionBody });
}
if (result.code == 200) {
return system.getResultSuccess();
} else {
return system.getResult(null, "查询失败 10420");
......
center-channel/app/base/utils/baiduClient.js
......@@ -14,54 +14,60 @@ class baiduClient {
async baiduPost( path, actionBody) {
console.log('actionBody++',actionBody)
let domain = "https://gwgp-mwnn9gk4o4e.i.bdcloudapi.com";
let authorization ="bce-auth-v1";
let accessKey = "ff2571490b4c4fb5add57385dc5e8f66";
let secretKey = "9d86f04a85db4cdfa95ba8ad28009188";
let timestamp = new Date().toISOString();
let url = domain+path;
let version ="bce-auth-v1";
let accessKey = "ed0f5c4c7c2d4e87aa335d9b07bf9bd4";
let secretKey = "f600c4e91f6d43998d637401e6e34ef9";
let timestamp = new Date().toISOString()
let site = timestamp.lastIndexOf(".");
timestamp = timestamp.substring(0,site)+"Z"
// let timestamp = "2020-11-05T04:00:00Z"
console.log('timestamp++',timestamp)
let signedHeaders = "host";
let extime = 1800;
var signArr = [];
var keys = Object.keys(actionBody).sort();
if (keys.length == 0) {
return system.getResult(null, "请求参数信息为空");
}
for (let k = 0; k < keys.length; k++) {
const tKey = keys[k];
if (tKey != "sign" && actionBody[tKey] && !(typeof (actionBody[tKey]) === "object")) {
signArr.push(urlencode(tKey) + "=" + urlencode(actionBody[tKey]));
}
// 因为是post，所以CanonicalQueryString为空
// var signArr = [];
// var keys = Object.keys(actionBody).sort();
// if (keys.length == 0) {
// return system.getResult(null, "请求参数信息为空");
// }
// for (let k = 0; k < keys.length; k++) {
// const tKey = keys[k];
// if (tKey != "sign" && actionBody[tKey] && !(typeof (actionBody[tKey]) === "object")) {
// signArr.push(urlencode(tKey) + "=" + urlencode(actionBody[tKey]));
// }
// }
// let resultSignStr = signArr.join("&");
// console.log('resultSignStr+++',resultSignStr)
let canonicalHeaders = "host:gwgp-mwnn9gk4o4e.i.bdcloudapi.com"
//中间结果1：规范化请求和前缀字符串
let canonicalRequest = "POST" + "\n" + path + "\n" + "\n" + canonicalHeaders;
console.log('canonicalRequest+++',canonicalRequest)
//authStringPrefix(前缀字符串，由除sk字段外的签名信息生成)
let authStringPrefix = version+"/"+accessKey+"/"+timestamp+"/"+extime;
console.log('authStringPrefix+++',authStringPrefix)
//中间结果2：派生签名密钥 signingKey
let signingKey = crypto.createHmac('sha256', secretKey)
.update(authStringPrefix)
.digest('hex');
console.log('signingKey+++',signingKey)
//中间结果3：签名摘要 signature
let signature = crypto.createHmac('sha256', signingKey)
.update(canonicalRequest)
.digest('hex');
console.log('signature+++',signature)
//最终结果：认证字符串 authorization
let authorization = authStringPrefix+"/"+signedHeaders+"/"+signature;
console.log('authorization+++',authorization)
var baiduObj={
authorization:authorization,
data:actionBody
}
let resultSignStr = signArr.join("&");
console.log('resultSignStr+++',resultSignStr)
// SigningKey = HMAC-SHA256-HEX(sk, authStringPrefix)
// authStringPrefix代表认证字符串的前缀部分，即：bce-auth-v1/{accessKeyId}/{timestamp}/{expirationPeriodInSeconds}。
// CanonicalRequest = HTTP Method + "\n" + CanonicalURI + "\n" + CanonicalQueryString + "\n" + CanonicalHeaders
// signature = HMAC-SHA256-HEX(SigningKey,CanonicalRequest)
let authStringPrefix = authorization + "/" + accessKey + "/" + timestamp + "/" + extime;
let signingKey = await sha256(secretKey,authStringPrefix);
let newResultSignStr = resultSignStr.replace(/&/g,',')
let canonicalQueryString = path + ','+ newResultSignStr;
console.log('canonicalQueryString+++',canonicalQueryString)
let canonicalHeaders = {
host:urlencode(domain)
var rtn = await this.execClient.execBaiduPost(baiduObj, url);
if (!rtn || !rtn.stdout) {
return system.getResult(null, "execPost data is empty");
}
let canonicalRequest = "POST" + "\n" + path + "\n" + canonicalQueryString + "\n" + canonicalHeaders + "\n" ;
let signature = await sha256(signingKey,canonicalRequest);
path = domain + path;
console.log('path+++',path)
var param = {
data: actionBody,
timeout: 20000,
headers: {
Authorization: authStringPrefix + "/" + "x-bce-date/" + signature,
accept: 'application/json'
}
};
console.log('param+++',param, "______________峰擎---百度云参数_______");
var result = await request.post(path, param);
console.log('result+++',JSON.stringify(result), "______________峰擎---百度云返回结果_______");
console.log('result-------',result);
var result = JSON.parse(rtn.stdout);
return result;
}
......@@ -76,7 +82,9 @@ class baiduClient {
formatAction: true, // default true, format the action to Action
formatParams: true, // default true, format the parameter name to first letter upper case
method: 'POST', // set the http method, default is GET
headers: {}, // set the http request headers
headers: {
host:"gwgp-mwnn9gk4o4e.i.bdcloudapi.com"
}, // set the http request headers
});
console.log('baidu++++res+++',res)
this.pushlogSve.createDb({
......
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