Skip to content

Z
zhichan
Commit 9b14d4bf by 宋毅
Options

tj

parent 7c8b0d56
Showing with 168 additions and 157 deletions
igirl-channel/app/base/api/api.base.js
...@@ -116,6 +116,9 @@ class APIBase { ...@@ -116,6 +116,9 @@ class APIBase {
} }
async doexec(gname, methodname, pobj, query, req) { async doexec(gname, methodname, pobj, query, req) {
var requestid = req.headers["request-id"] || this.getUUID(); var requestid = req.headers["request-id"] || this.getUUID();
if (!req.headers["request-id"]) {
req.headers["request-id"] = requestid;
}
try { try {
//验证accesskey或验签 //验证accesskey或验签
var isPassResult = await this.checkAcck(gname, methodname, pobj, query, req); var isPassResult = await this.checkAcck(gname, methodname, pobj, query, req);
......
igirl-channel/app/base/api/impl/action/tmQuery.js
...@@ -24,10 +24,10 @@ class TmQueryAPI extends APIBase { ...@@ -24,10 +24,10 @@ class TmQueryAPI extends APIBase {
var result = null; var result = null;
switch (pobj.actionProcess) { switch (pobj.actionProcess) {
case "jd"://京东 case "jd"://京东
result = await this.opActionProcess(pobj.actionProcess, pobj.actionType, pobj.actionBody); result = await this.opActionProcess(pobj.actionProcess, pobj.actionType, pobj.actionBody, req);
break; break;
case "1688": case "1688":
result = await this.opActionProcess(pobj.actionProcess, pobj.actionType, pobj.actionBody); result = await this.opActionProcess(pobj.actionProcess, pobj.actionType, pobj.actionBody, req);
break; break;
default: default:
result = system.getResult(null, "actionProcess参数错误"); result = system.getResult(null, "actionProcess参数错误");
...@@ -35,65 +35,65 @@ class TmQueryAPI extends APIBase { ...@@ -35,65 +35,65 @@ class TmQueryAPI extends APIBase {
} }
return result; return result;
} }
async opActionProcess(action_process, action_type, action_body) { async opActionProcess(action_process, action_type, action_body, req) {
var opResult = null; var opResult = null;
switch (action_type) { switch (action_type) {
case "test"://测试 case "test"://测试
opResult = system.getResultSuccess(null, "测试成功"); opResult = system.getResultSuccess(null, "测试成功");
break; break;
case "findTrademarkNameAccurate"://商标精确检索（相同商标检索） case "findTrademarkNameAccurate"://商标精确检索（相同商标检索）
opResult = await this.tmquerySve.findTrademarkNameAccurate(action_body); opResult = await this.tmquerySve.findTrademarkNameAccurate(action_body, req);
break; break;
case "findTrademarkName"://近似商标检索 case "findTrademarkName"://近似商标检索
opResult = await this.tmquerySve.findTrademarkName(action_body); opResult = await this.tmquerySve.findTrademarkName(action_body, req);
break; break;
case "findTrademarkzchAccurate"://商标申请号检索 case "findTrademarkzchAccurate"://商标申请号检索
opResult = await this.tmquerySve.findTrademarkzchAccurate(action_body); opResult = await this.tmquerySve.findTrademarkzchAccurate(action_body, req);
break; break;
case "findTrademarkzcr"://申请人查询 case "findTrademarkzcr"://申请人查询
opResult = await this.tmquerySve.findTrademarkzcr(action_body); opResult = await this.tmquerySve.findTrademarkzcr(action_body, req);
break; break;
case "getCropperPic"://获取检索图片url case "getCropperPic"://获取检索图片url
opResult = await this.toolSve.getCropperPic(action_body); opResult = await this.toolSve.getCropperPic(action_body, req);
break; break;
case "imagequery"://图形检索 case "imagequery"://图形检索
opResult = await this.tmquerySve.imagequery(action_body); opResult = await this.tmquerySve.imagequery(action_body, req);
break; break;
case "findImageSearch"://图形检索查询 case "findImageSearch"://图形检索查询
opResult = await this.tmquerySve.findImageSearch(action_body); opResult = await this.tmquerySve.findImageSearch(action_body, req);
break; break;
case "tradeMarkDetail"://商标详情查询 case "tradeMarkDetail"://商标详情查询
opResult = await this.tmquerySve.tradeMarkDetail(action_body); opResult = await this.tmquerySve.tradeMarkDetail(action_body, req);
break; break;
case "sbzuixinsearch"://最新商标查询 case "sbzuixinsearch"://最新商标查询
opResult = await this.tmquerySve.sbzuixinsearch(action_body); opResult = await this.tmquerySve.sbzuixinsearch(action_body, req);
break; break;
case "noticequeryTMZCSQ"://近12期初审公告查询接口 case "noticequeryTMZCSQ"://近12期初审公告查询接口
opResult = await this.tmquerySve.noticequeryTMZCSQ(action_body); opResult = await this.tmquerySve.noticequeryTMZCSQ(action_body, req);
break; break;
case "noticequery"://公告列表检索接口 case "noticequery"://公告列表检索接口
opResult = await this.tmquerySve.noticequery(action_body); opResult = await this.tmquerySve.noticequery(action_body, req);
break; break;
case "noticezcggsearch"://注册公告详情查询 case "noticezcggsearch"://注册公告详情查询
opResult = await this.tmquerySve.noticezcggsearch(action_body); opResult = await this.tmquerySve.noticezcggsearch(action_body, req);
break; break;
case "noticesearch"://初审公告详情查询 case "noticesearch"://初审公告详情查询
opResult = await this.tmquerySve.noticesearch(action_body); opResult = await this.tmquerySve.noticesearch(action_body, req);
break; break;
case "getCompanyInfoNoUser"://企业查询 case "getCompanyInfoNoUser"://企业查询
opResult = await this.tmquerySve.getCompanyInfoNoUser(action_body); opResult = await this.tmquerySve.getCompanyInfoNoUser(action_body, req);
break; break;
case "getNclDetail"://尼斯详情 case "getNclDetail"://尼斯详情
opResult = await this.tmquerySve.getNclDetail(action_body); opResult = await this.tmquerySve.getNclDetail(action_body, req);
break; break;
case "gettwoNcl"://获取尼斯群组 case "gettwoNcl"://获取尼斯群组
opResult = await this.tmquerySve.gettwoNcl(action_body); opResult = await this.tmquerySve.gettwoNcl(action_body, req);
break; break;
case "nclFuwuSearch"://尼斯分类检索 case "nclFuwuSearch"://尼斯分类检索
opResult = await this.tmquerySve.nclFuwuSearch(action_body); opResult = await this.tmquerySve.nclFuwuSearch(action_body, req);
break; break;
case "bycznfx"://商标智能分析 ----- case "bycznfx"://商标智能分析 -----
opResult = await this.toolSve.bycznfx(action_body); opResult = await this.toolSve.bycznfx(action_body, req);
break; break;
case "tmConfirm"://商标方案确认 case "tmConfirm"://商标方案确认
// opResult = await this.toolApi.bycznfx(action_body); // opResult = await this.toolApi.bycznfx(action_body);
......
igirl-channel/app/base/api/impl/action/tmTools.js
...@@ -49,35 +49,35 @@ class TmToolsAPI extends APIBase { ...@@ -49,35 +49,35 @@ class TmToolsAPI extends APIBase {
opResult = await this.toolSve.getOssConfig(); opResult = await this.toolSve.getOssConfig();
break; break;
case "getNcl"://尼斯查询（一） case "getNcl"://尼斯查询（一）
opResult = await this.toolSve.getNcl(action_body); opResult = await this.toolSve.getNcl(action_body, req);
break; break;
case "getNclByLikeNameAndNcl"://尼斯查询（二） case "getNclByLikeNameAndNcl"://尼斯查询（二）
opResult = await this.toolSve.getNclByLikeNameAndNcl(action_body); opResult = await this.toolSve.getNclByLikeNameAndNcl(action_body, req);
break; break;
case "word2pic"://文字转图片 case "word2pic"://文字转图片
opResult = await this.toolSve.word2pic(action_body); opResult = await this.toolSve.word2pic(action_body, req);
break; break;
case "uploadStandardTm"://商标样式转换 case "uploadStandardTm"://商标样式转换
opResult = await this.toolSve.uploadStandardTm(action_body); opResult = await this.toolSve.uploadStandardTm(action_body, req);
break; break;
case "pic2pdf"://图片转pdf case "pic2pdf"://图片转pdf
opResult = await this.toolSve.pic2pdf(action_body); opResult = await this.toolSve.pic2pdf(action_body, req);
break; break;
case "getCompanyInfoByLikeName"://企业近似查询 case "getCompanyInfoByLikeName"://企业近似查询
opResult = await this.toolSve.getCompanyInfoByLikeName(action_body); opResult = await this.toolSve.getCompanyInfoByLikeName(action_body, req);
break; break;
case "getEntregistryByCompanyName"://企业精确查询 case "getEntregistryByCompanyName"://企业精确查询
opResult = await this.toolSve.getEntregistryByCompanyName(action_body); opResult = await this.toolSve.getEntregistryByCompanyName(action_body, req);
break; break;
case "adjustWTSSize"://调整委托书 case "adjustWTSSize"://调整委托书
opResult = await this.toolSve.adjustWTSSize(action_body); opResult = await this.toolSve.adjustWTSSize(action_body, req);
break; break;
default: default:
opResult = system.getResult(null, "action_type参数错误"); opResult = system.getResult(null, "action_type参数错误");
......
igirl-channel/app/base/api/impl/test/testApi.js
...@@ -5,7 +5,34 @@ class TestAPI extends APIBase { ...@@ -5,7 +5,34 @@ class TestAPI extends APIBase {
super(); super();
} }
async test(pobj, query, req) { async test(pobj, query, req) {
return system.getResultSuccess({req:"ok"}); var rc = system.getObject("util.aliyunClient");
var param = pobj;
try {
var body = {
idempotentId: "fzsbzc",// 是 业务 ID
idempotentSource: param.appSourceCode || "tm_1688",// 是 业务来源（ali、jd）
idempotentSourceName: param.name || "1688应用",// 是 阿里，京东
city: "",// 否 所属城市
phone:"15010929366",// 是 手机号
userId: "channelUserIdtest01",// 否 用户 ID
companyName: "",// 否 公司名称
orderPrice: 899,// 是 订单金额
productId: "5dc936eb296d1572b9bc5b8d",// 是 产品 ID
productQuantity: 1,// 是 产品数量
};
var submitTm = await rc.post("https://yunfuapi.gongsibao.com/crm/order/submit", body);
return { code: 200, message: "ok", data: submitTm };
} catch (e) {
//日志记录
logCtl.error({
optitle: "查询阿里商标状态异常---error",
op: "base/api/impl/tmsub/queryAliTmStatus",
content: e.stack,
clientIp: ""
});
}
return system.getResultSuccess({ req: "ok" });
} }
} }
module.exports = TestAPI; module.exports = TestAPI;
\ No newline at end of file
igirl-channel/app/base/db/impl/dbapp/appDao.js
...@@ -20,7 +20,9 @@ class AppDao extends Dao { ...@@ -20,7 +20,9 @@ class AppDao extends Dao {
"appSecret", // 密钥信息，用于进行签名请求接口 "appSecret", // 密钥信息，用于进行签名请求接口
"status", // 状态 0禁用 1启用 "status", // 状态 0禁用 1启用
"channelAppId", // 渠道appID "channelAppId", // 渠道appID
"channelAppKey", // 渠道appKey "channelAppKey", // 渠道appKey
"pushOrderUrl", //获取渠道推送订单的url
"appSourceCode", //app来源code
"notes"], "notes"],
raw: true raw: true
}); });
......
igirl-channel/app/base/db/metadata/apps/platform.js
module.exports = { module.exports = {
"appid": "40d64e586551405c9bcafab87266bc04", "appid": "201911061250",
"label": "研发开放平台", "label": "知产渠道api应用",
"config": { "config": {
"rstree": { "rstree": {
"code": "paasroot", "code": "paasroot",
......
igirl-channel/app/base/db/models/dbapp/app.js
...@@ -22,6 +22,7 @@ module.exports = (db, DataTypes) => { ...@@ -22,6 +22,7 @@ module.exports = (db, DataTypes) => {
channelAppId : DataTypes.STRING(64), // 渠道appID channelAppId : DataTypes.STRING(64), // 渠道appID
channelAppKey: DataTypes.STRING(64), // 渠道appKey channelAppKey: DataTypes.STRING(64), // 渠道appKey
pushOrderUrl : DataTypes.STRING(500), // 获取渠道推送订单的url pushOrderUrl : DataTypes.STRING(500), // 获取渠道推送订单的url
appSourceCode : DataTypes.STRING(50), // app来源code
notes : DataTypes.STRING, // 备注 notes : DataTypes.STRING, // 备注
}, { }, {
paranoid: false,//假的删除 paranoid: false,//假的删除
......
igirl-channel/app/base/service/impl/trademark/toolSve.js
...@@ -9,148 +9,65 @@ var url = "https://gsb-zc.oss-cn-beijing.aliyuncs.com"; ...@@ -9,148 +9,65 @@ var url = "https://gsb-zc.oss-cn-beijing.aliyuncs.com";
class ToolService { class ToolService {
constructor() { constructor() {
this.zcApiUrl = settings.reqZcApi(); this.zcApiUrl = settings.reqZcApi();
this.execClient = system.getObject("util.execClient");
} }
async getCropperPic(obj) { async getCropperPic(obj, req) {
var url = this.zcApiUrl + "api/tool/toolApi/getCropperPic"; var url = this.zcApiUrl + "api/tool/toolApi/getCropperPic";
console.log(url); return await this.opReqResult(url, queryobj, req);
var rc = system.getObject("util.execClient");
var rtn = null;
try {
rtn = await rc.execPost(obj, url);
var data = JSON.parse(rtn.stdout);
return data;
} catch (e) {
return system.getResult2(null, null);
}
} }
//智能分析 bycquerytm.html //智能分析 bycquerytm.html
async bycznfx(obj) { async bycznfx(obj, req) {
var url = this.zcApiUrl + "api/tool/toolApi/bycznfx"; var url = this.zcApiUrl + "api/tool/toolApi/bycznfx";
console.log(url); return await this.opReqResult(url, queryobj, req);
var rc = system.getObject("util.execClient");
var rtn = null;
try {
rtn = await rc.execPost(obj, url);
var data = JSON.parse(rtn.stdout);
return data;
} catch (e) {
return system.getResult2(null, null);
}
} }
//根据尼斯编号获取尼斯子类，尼斯树节点点击时触发调用 //根据尼斯编号获取尼斯子类，尼斯树节点点击时触发调用
async getNcl(queryobj) { async getNcl(queryobj, req) {
var url = this.zcApiUrl + "api/tool/toolApi/getNcl"; var url = this.zcApiUrl + "api/tool/toolApi/getNcl";
console.log(url); return await this.opReqResult(url, queryobj, req);
var rc = system.getObject("util.execClient");
var rtn = null;
try {
rtn = await rc.execPost(queryobj, url);
var data = JSON.parse(rtn.stdout);
return data;
} catch (e) {
return system.getResult2(null, null);
}
} }
//根据大类、名称查询尼斯信息 //根据大类、名称查询尼斯信息
async getNclByLikeNameAndNcl(queryobj) { async getNclByLikeNameAndNcl(queryobj, req) {
var url = this.zcApiUrl + "api/tool/toolApi/getNclByLikeNameAndNcl"; var url = this.zcApiUrl + "api/tool/toolApi/getNclByLikeNameAndNcl";
console.log(url); return await this.opReqResult(url, queryobj, req);
var rc = system.getObject("util.execClient");
var rtn = null;
try {
rtn = await rc.execPost(queryobj, url);
var data = JSON.parse(rtn.stdout);
return data;
} catch (e) {
return system.getResult2(null, null);
}
} }
//文字转图片 //文字转图片
async word2pic(queryobj) { async word2pic(queryobj, req) {
var url = this.zcApiUrl + "api/tool/toolApi/word2pic"; var url = this.zcApiUrl + "api/tool/toolApi/word2pic";
console.log(url); return await this.opReqResult(url, queryobj, req);
var rc = system.getObject("util.execClient");
var rtn = null;
try {
rtn = await rc.execPost(queryobj, url);
var data = JSON.parse(rtn.stdout);
return data;
} catch (e) {
return system.getResult2(null, null);
}
} }
//商标样式转换 彩色商标图样转黑白，调整图样宽高，生成符合商标局规范的标准商标图样 //商标样式转换 彩色商标图样转黑白，调整图样宽高，生成符合商标局规范的标准商标图样
async uploadStandardTm(queryobj) { async uploadStandardTm(queryobj, req) {
var url = this.zcApiUrl + "api/tool/toolApi/uploadStandardTm"; var url = this.zcApiUrl + "api/tool/toolApi/uploadStandardTm";
console.log(url); return await this.opReqResult(url, queryobj, req);
var rc = system.getObject("util.execClient");
var rtn = null;
try {
rtn = await rc.execPost(queryobj, url);
var data = JSON.parse(rtn.stdout);
return data;
} catch (e) {
return system.getResult2(null, null);
}
} }
//营业执照（身份证明）图片文件转为符合商标局要求的pdf文件 //营业执照（身份证明）图片文件转为符合商标局要求的pdf文件
async pic2pdf(queryobj) { async pic2pdf(queryobj, req) {
var url = this.zcApiUrl + "api/tool/toolApi/pic2pdf"; var url = this.zcApiUrl + "api/tool/toolApi/pic2pdf";
console.log(url); return await this.opReqResult(url, queryobj, req);
var rc = system.getObject("util.execClient");
var rtn = null;
try {
rtn = await rc.execPost(queryobj, url);
var data = JSON.parse(rtn.stdout);
return data;
} catch (e) {
return system.getResult2(null, null);
}
} }
//企业近似查询 //企业近似查询
async getCompanyInfoByLikeName(queryobj) { async getCompanyInfoByLikeName(queryobj, req) {
var url = this.zcApiUrl + "api/tool/toolApi/getCompanyInfoByLikeName"; var url = this.zcApiUrl + "api/tool/toolApi/getCompanyInfoByLikeName";
console.log(url); return await this.opReqResult(url, queryobj, req);
var rc = system.getObject("util.execClient");
var rtn = null;
try {
rtn = await rc.execPost(queryobj, url);
var data = JSON.parse(rtn.stdout);
return data;
} catch (e) {
return system.getResult2(null, null);
}
} }
//企业注册信息查询 //企业注册信息查询
async getEntregistryByCompanyName(queryobj) { async getEntregistryByCompanyName(queryobj, req) {
var url = this.zcApiUrl + "api/tool/toolApi/getEntregistryByCompanyName"; var url = this.zcApiUrl + "api/tool/toolApi/getEntregistryByCompanyName";
console.log(url); return await this.opReqResult(url, queryobj, req);
var rc = system.getObject("util.execClient");
var rtn = null;
try {
rtn = await rc.execPost(queryobj, url);
var data = JSON.parse(rtn.stdout);
return data;
} catch (e) {
return system.getResult2(null, null);
}
} }
//调整委托书 调整委托书大小使其符合商标局规范 //调整委托书 调整委托书大小使其符合商标局规范
async adjustWTSSize(queryobj) { async adjustWTSSize(queryobj, req) {
var url = this.zcApiUrl + "api/tool/toolApi/adjustWTSSize"; var url = this.zcApiUrl + "api/tool/toolApi/adjustWTSSize";
console.log(url); return await this.opReqResult(url, queryobj, req);
var rc = system.getObject("util.execClient");
var rtn = null;
try {
rtn = await rc.execPost(queryobj, url);
var data = JSON.parse(rtn.stdout);
return data;
} catch (e) {
return system.getResult2(null, null);
}
} }
async getOssConfig() { async opReqResult(reqUrl, queryobj, req) {
var rtn = await this.execClient.execPushDataPost(queryobj, reqUrl, req.headers["token"], req.headers["request-id"]);
var data = JSON.parse(rtn.stdout);
return data;
}
async getOssConfig(queryobj, req) {
var policyText = { var policyText = {
"expiration": "2119-12-31T16:00:00.000Z", "expiration": "2119-12-31T16:00:00.000Z",
"conditions": [ "conditions": [
......
igirl-channel/app/base/utils/aliyunClient.js 0 → 100644
const Client = require('aliyun-api-gateway').Client;
// const client = new Client('203727307', 'b6za34qem6k9a3s3jguvh24nc3ridlnh');
const client = new Client('203756805', 'crkyej0xlmqa6bmvqijun6ltxparllyn');
class aliyunClient {
constructor() {
// this.aliReqUrl = "https://aliapi.gongsibao.com/tm/springboard";
}
async post(aliReqUrl, actionBody) {
// var reqParam = {};
// reqParam["ActionProcess"] = "AliTm";
// reqParam["ActionType"] = actionType;
// reqParam["ActionBody"] = actionBody;
// if (!actionBody.reqOnlyCode) {
// actionBody["reqOnlyCode"] = await this.getCreateOrderNum();
// }
var param = {
data: actionBody,
timeout: 20000,
headers: {
accept: 'application/json'
}
};
console.log(JSON.stringify(param), "______________峰擎---阿里云参数_______");
var result = await client.post(aliReqUrl, param);
console.log(JSON.stringify(result), "______________峰擎---阿里云返回结果_______");
return result;
}
// async getCreateOrderNum() {
// var createOrderNum = await this.getUidStr(5, 36);//====================订单号生成
// return createOrderNum + "" + Date.now();
// }
// async getUidStr(len, radix) {
// var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
// var uuid = [], i;
// radix = radix || chars.length;
// if (len) {
// for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
// } else {
// var r;
// uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
// uuid[14] = '4';
// for (i = 0; i < 36; i++) {
// if (!uuid[i]) {
// r = 0 | Math.random() * 16;
// uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
// }
// }
// }
// return uuid.join('');
// }
}
module.exports = aliyunClient;
igirl-channel/app/base/utils/execClient.js
...@@ -6,20 +6,24 @@ class ExecClient { ...@@ -6,20 +6,24 @@ class ExecClient {
constructor() { constructor() {
this.cmdPostPattern = "curl --user admines:adminGSBes. -k -H 'Content-type: application/json' -d '{data}' {url}"; this.cmdPostPattern = "curl --user admines:adminGSBes. -k -H 'Content-type: application/json' -d '{data}' {url}";
this.cmdGetPattern = "curl -G -X GET '{url}'"; this.cmdGetPattern = "curl -G -X GET '{url}'";
this.cmdPushDataPostPattern = "curl --user admines:adminGSBes. -k -H 'Content-type: application/json' -H {header} -d '{data}' {url}"; this.cmdPushDataPostPattern = "curl -k -H 'Content-type: application/json' -H 'token:{tk}' -H 'request-id:{requestId}' -d '{data}' {url}";
}
}
getUUID() {
var uuid = uuidv4();
var u = uuid.replace(/\-/g, "");
return u;
}
async exec(cmd) { async exec(cmd) {
//await后面表达式返回的promise对象，是then的语法糖，await返回then函数的返回值 //await后面表达式返回的promise对象，是then的语法糖，await返回then函数的返回值
//异常需要try/catch自己捕获或外部catch捕获 //异常需要try/catch自己捕获或外部catch捕获
const {stdout, stderr} = await exec(cmd); const { stdout, stderr } = await exec(cmd);
return {stdout, stderr}; return { stdout, stderr };
} }
async exec2(cmd) { async exec2(cmd) {
return exec(cmd, {encoding: "base64"}); return exec(cmd, { encoding: "base64" });
} }
FetchPostCmd(subData, url) { FetchPostCmd(subData, url) {
...@@ -29,10 +33,11 @@ class ExecClient { ...@@ -29,10 +33,11 @@ class ExecClient {
console.log(cmd); console.log(cmd);
return cmd; return cmd;
} }
FetchPushDataPostCmd(header,subData, url) { FetchPushDataPostCmd(subData, url, token, requestId) {
var requestId = requestId || this.getUUID();
var data = JSON.stringify(subData); var data = JSON.stringify(subData);
var cmd = this.cmdPushDataPostPattern.replace(/\{data\}/g, var cmd = this.cmdPushDataPostPattern.replace(/\{data\}/g,
data).replace(/\{url\}/g, url).replace(/\{header\}/g, header); data).replace(/\{url\}/g, url).replace(/\{tk\}/g, token).replace(/\{requestId\}/g, requestId);
console.log(cmd); console.log(cmd);
return cmd; return cmd;
} }
...@@ -41,8 +46,8 @@ class ExecClient { ...@@ -41,8 +46,8 @@ class ExecClient {
var result = await this.exec(cmd); var result = await this.exec(cmd);
return result; return result;
} }
async execPushDataPost(header,subData, url) { async execPushDataPost(subData, url, token, requestId) {
let cmd = this.FetchPushDataPostCmd(header,subData, url); let cmd = this.FetchPushDataPostCmd(subData, url, token, requestId);
var result = await this.exec(cmd); var result = await this.exec(cmd);
return result; return result;
} }
...@@ -78,8 +83,8 @@ class ExecClient { ...@@ -78,8 +83,8 @@ class ExecClient {
var options = { var options = {
timeout: timeOut, timeout: timeOut,
}; };
const {stdout, stderr} = await exec(cmd, options); const { stdout, stderr } = await exec(cmd, options);
return {stdout, stderr}; return { stdout, stderr };
} }
} }
......
igirl-channel/app/config/settings.js
...@@ -13,7 +13,7 @@ var ENVINPUT={ ...@@ -13,7 +13,7 @@ var ENVINPUT={
}; };
var settings = { var settings = {
env:ENVINPUT.APP_ENV, env:ENVINPUT.APP_ENV,
appKey: "40d64e586551405c9bcafab87266bc04", appKey: "201911061250",
secret: "f99d413b767f09b5dff0b3610366cc46", secret: "f99d413b767f09b5dff0b3610366cc46",
salt: "%iatpD1gcxz7iF#B", salt: "%iatpD1gcxz7iF#B",
cacheprefix: "jd", cacheprefix: "jd",
......
igirl-channel/package.json
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
"MD5": "^1.3.0", "MD5": "^1.3.0",
"after": "^0.8.2", "after": "^0.8.2",
"ali-oss": "^4.12.2", "ali-oss": "^4.12.2",
"aliyun-api-gateway": "^1.1.6",
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"base64id": "^1.0.0", "base64id": "^1.0.0",
"bluebird": "^3.5.1", "bluebird": "^3.5.1",
......
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