Skip to content

Z
zhichan
Commit f738b05e by 宋毅
Options

Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

parents 635f5f65 18dac646
Showing with 570 additions and 35 deletions
center-channel/app/base/api/impl/opreceive/need.js
...@@ -130,6 +130,16 @@ class Need extends APIBase { ...@@ -130,6 +130,16 @@ class Need extends APIBase {
case "getymicpProduce"://获取易名的icp产品信息 case "getymicpProduce"://获取易名的icp产品信息
opResult = await this.centerorderSve.getymicpProduce(pobj); opResult = await this.centerorderSve.getymicpProduce(pobj);
break; break;
//百度商标接入
case "submitTmNeed"://提交需求
opResult = await this.utilsNeedSve.submitTmNeed(pobj, pobj.actionBody);
break;
case "tmFeedbackSubmit"://商标用户反馈
opResult = await this.utilsNeedSve.tmFeedbackSubmit(pobj);
break;
case "tmStatusNotify"://商标状态通知
opResult = await this.utilsNeedSve.tmStatusNotify(pobj);
break;
default: default:
opResult = system.getResult(null, "action_type参数错误"); opResult = system.getResult(null, "action_type参数错误");
break; break;
......
center-channel/app/base/api/impl/tm/consultation.js 0 → 100644
var APIBase = require("../../api.base");
var system = require("../../../system");
var settings = require("../../../../config/settings");
const uuidv4 = require('uuid/v4');
/**
* 商标需求
* 庄冰 2021.03.17
*/
class Consultation extends APIBase {
constructor() {
super();
this.gatewaypushlogSve = system.getObject("service.common.gatewaypushlogSve");
}
getUUID() {
var uuid = uuidv4();
var u = uuid.replace(/\-/g, "");
return u;
}
getResultSuccess(requestId) {
return {
"status": 0,
"msg": "success",
"data":null,
"requestId": requestId
};
}
getResultFail(errmsg) {
var self = this;
return {
"status":-1,
"msg": errmsg,
"requestId": self.getUUID(),
"data":null,
"bizmsg":"empty"
};
}
//需求提交
async submit(pobj,obj,req) {
var self = this;
if(!pobj.appInfo || !pobj.appInfo.uapp_key || !pobj.appInfo.uapp_secret){
return self.getResultFail("未知应用或应用未启用");
}
if (!pobj.intentionBizId) {
return self.getResultFail("intentionBizId不能为空");
}
if (!pobj.phone) {
return self.getResultFail("phone不能为空");
}
if (!pobj.consultType) {
return self.getResultFail("consultType不能为空");
}
pobj.type = pobj.consultType;
pobj.mobile = pobj.phone;
pobj.action_type = "submitTmNeed";
var param = {
requestId: req.requestId || self.getUUID(),
requestUrl: pobj.appInfo.app_code+"/tm/consultation/submit",
requestjson: JSON.stringify(pobj),//请求地址
pushUrl: "/action/intentionapi/springBoard",//调用地址
pushActionType: "submitTmNeed",//调用参数
pushtimes: 0,//推送次数
pushStatus: "wts",//推送状态
}
await self.gatewaypushlogSve.create(param);
return self.getResultSuccess(param.requestId);
}
/**
* 需求关闭CloseTradeMarkProduct
* @param {*} pobj
* @param {*} obj
* @param {*} req
*/
async close(pobj,obj,req){
if (!pobj.IntentionBizId) {
return self.getResultFail("IntentionBizId不能为空");
}
var reqUrl = settings.centerOrderUrl() + "action/opNeed/springBoard";
var reqObj={
actionType:"opNeedClose",
actionBody:{needNo:pobj.IntentionBizId},
appInfo:pobj.appInfo
}
var result = await this.utilsNeedSve.restPostUrl(reqObj,reqUrl);
return result;
}
}
module.exports = Consultation;
\ No newline at end of file
center-channel/app/base/api/impl/tm/feedback.js 0 → 100644
var APIBase = require("../../api.base");
var system = require("../../../system");
var settings = require("../../../../config/settings");
const uuidv4 = require('uuid/v4');
/**
* 商标通知接口
* 庄冰 2021.03.17
*/
class Feedback extends APIBase {
constructor() {
super();
this.gatewaypushlogSve = system.getObject("service.common.gatewaypushlogSve");
}
getUUID() {
var uuid = uuidv4();
var u = uuid.replace(/\-/g, "");
return u;
}
getResultSuccess(requestId) {
return {
"status": 0,
"msg": "success",
"data":null,
"requestId": requestId
};
}
getResultFail(errmsg) {
var self = this;
return {
"status":-1,
"msg": errmsg,
"requestId": self.getUUID(),
"data":null,
"bizmsg":"empty"
};
}
//需求反馈
async submit(pobj,obj,req) {
var self = this;
if(!pobj.appInfo || !pobj.appInfo.uapp_key || !pobj.appInfo.uapp_secret){
return self.getResultFail("未知应用或应用未启用");
}
if (!pobj.intentionBizId) {
return self.getResultFail("intentionBizId不能为空");
}
if (!pobj.description) {
return self.getResultFail("description不能为空");
}
pobj.action_type = "tmFeedbackSubmit";
var param = {
requestId: req.requestId || self.getUUID(),
requestUrl: pobj.appInfo.app_code+"/tm/feedback/submit",
requestjson: JSON.stringify(pobj),//请求地址
pushUrl: "/action/intentionapi/springBoard",//调用地址
pushActionType: "tmFeedbackSubmit",//调用参数
pushtimes: 0,//推送次数
pushStatus: "wts",//推送状态
}
await self.gatewaypushlogSve.create(param);
return self.getResultSuccess(param.requestId);
}
}
module.exports = Feedback;
\ No newline at end of file
center-channel/app/base/api/impl/tm/status.js 0 → 100644
var APIBase = require("../../api.base");
var system = require("../../../system");
var settings = require("../../../../config/settings");
const uuidv4 = require('uuid/v4');
/**
* tm通知接口
* 庄冰 2021.03.18
*/
class Order extends APIBase {
constructor() {
super();
this.gatewaypushlogSve = system.getObject("service.common.gatewaypushlogSve");
}
getUUID() {
var uuid = uuidv4();
var u = uuid.replace(/\-/g, "");
return u;
}
getResultSuccess(requestId) {
return {
"status": 0,
"msg": "success",
"data":null,
"requestId": requestId
};
}
getResultFail(errmsg) {
var self = this;
return {
"status":-1,
"msg": errmsg,
"requestId": self.getUUID(),
"data":null,
"bizmsg":"empty"
};
}
//状态变更
async notify(pobj,obj,req) {
var self = this;
if(!pobj.appInfo || !pobj.appInfo.uapp_key || !pobj.appInfo.uapp_secret){
return self.getResultFail("未知应用或应用未启用");
}
if (!pobj.bizId) {
return self.getResultFail("bizId不能为空");
}
if (!pobj.status) {
return self.getResultFail("status不能为空");
}
pobj.action_type = "tmStatusNotify";
var param = {
requestId: req.requestId || self.getUUID(),
requestUrl: pobj.appInfo.app_code+"/tm/status/notify",
requestjson: JSON.stringify(pobj),//请求地址
pushUrl: "/action/intentionapi/springBoard",//调用地址
pushActionType: "tmStatusNotify",//调用参数
pushtimes: 0,//推送次数
pushStatus: "wts",//推送状态
}
await self.gatewaypushlogSve.create(param);
return self.getResultSuccess(param.requestId);
}
}
module.exports = Order;
\ No newline at end of file
center-channel/app/base/api/impl/tm/tmcase.js 0 → 100644
var APIBase = require("../../api.base");
var system = require("../../../system");
var settings = require("../../../../config/settings");
const uuidv4 = require('uuid/v4');
/**
* 商标方案信息（接收fqboss推送的商标方案信息，并推送至渠道）
* 庄冰 2021.03.18
*/
class Tmcase extends APIBase {
constructor() {
super();
this.utilsNeedSve = system.getObject("service.utilsSve.utilsNeedSve");
this.baseUrl = settings.centerOrderUrl()+"notifyaction/opNeedSolution/"
}
async updateTmStatus(pobj, qobj, req) {
var reqUrl = this.baseUrl + "updateTmStatus";
var result = await this.utilsNeedSve.restPostUrl(pobj,reqUrl);
return result;
}
//接收辅助、担保商标注册信息
async nbtzreceiveAssistTmData(pobj, qobj, req) {
var reqUrl = this.baseUrl + "nbtzreceiveAssistTmData";
var result = await this.utilsNeedSve.restPostUrl(pobj,reqUrl);
if(result && result.status==0){
await this.pushData2Platform()
}
return result;
}
//接收辅助、担保商标注册修改信息
async nbtzreceiveEditAssistTmData(pobj, qobj, req) {
var reqUrl = this.baseUrl + "nbtzreceiveEditAssistTmData";
var result = await this.utilsNeedSve.restPostUrl(pobj,reqUrl);
return result;
}
//提交方案确认
async submitTmConfirm(pobj, qobj, req) {
if (!pobj.IntentionBizId) {
return self.getResultFail("IntentionBizId不能为空");
}
var reqUrl = this.baseUrl + "nbtzreceiveEditAssistTmData";
var result = await this.utilsNeedSve.restPostUrl(pobj,reqUrl);
return result;
}
/**
* 关闭注册⽅案
* @param {*} pobj
* @param {*} obj
* @param {*} req
*/
async closeSolution(pobj,obj,req){
if (!pobj.BizId) {
return self.getResultFail("BizId不能为空");
}
if (!pobj.IntentionBizId) {
return self.getResultFail("IntentionBizId不能为空");
}
var reqUrl = this.baseUrl + "closeSolution";
var result = await this.utilsNeedSve.restPostUrl(pobj,reqUrl);
return result;
}
/**
* 推送数据至平台方（百度、阿里）
* needSolution 需求方案
* appInfo app
* opflag 操作标志：QueryTradeIntentionUserList：查询需求列表，SaveTradeMarkProductSolution：提交注册⽅案-商标信息
* SaveTradeMarkMaterialDetail：补全注册⽅案-申请⼈信息 ConfirmTradeIntention：确认注册⽅案
*
*/
async pushData2Platform(needSolution,appInfo,opflag){
if(appInfo.uapp_id==18){//阿里云商机
}
if(appInfo.uapp_id==44){//百度云商机
}
}
}
module.exports = Tmcase;
\ No newline at end of file
center-channel/app/base/service/app.base.js
...@@ -7,14 +7,16 @@ const cryptoJS = require('crypto-js'); ...@@ -7,14 +7,16 @@ const cryptoJS = require('crypto-js');
class AppServiceBase { class AppServiceBase {
constructor() { constructor() {
this.dingClient = system.getObject("util.dingClient");
this.restClient = system.getObject("util.restClient"); this.restClient = system.getObject("util.restClient");
this.execClientNew = system.getObject("util.execClientNew"); this.execClientNew = system.getObject("util.execClientNew");
this.execClient = system.getObject('util.execClient'); this.execClient = system.getObject('util.execClient');
this.cacheManager = system.getObject("db.common.cacheManager"); this.cacheManager = system.getObject("db.common.cacheManager");
this.pushlogSve = system.getObject("service.common.pushlogSve"); this.pushlogSve = system.getObject("service.common.pushlogSve");
this.pushlogFailType = { OLDRPC: 1, NEWRPC: 2, FAILLOG: 3, FQ: 4 }; this.pushlogFailType = {OLDRPC: 1, NEWRPC: 2, FAILLOG: 3, FQ: 4};
this.logCtl = system.getObject("service.common.oplogSve"); this.logCtl = system.getObject("service.common.oplogSve");
} }
/** /**
* 验证签名 * 验证签名
* @param {*} params 要验证的参数 * @param {*} params 要验证的参数
...@@ -48,6 +50,7 @@ class AppServiceBase { ...@@ -48,6 +50,7 @@ class AppServiceBase {
} }
return system.getResultSuccess(); return system.getResultSuccess();
} }
async restPostUrl(pobj, url) { async restPostUrl(pobj, url) {
try { try {
var rtn = await this.restClient.execPost(pobj, url); var rtn = await this.restClient.execPost(pobj, url);
...@@ -71,6 +74,7 @@ class AppServiceBase { ...@@ -71,6 +74,7 @@ class AppServiceBase {
return system.getResult(null, errorMsg); return system.getResult(null, errorMsg);
} }
} }
async restPostWithHValueUrl(pobj, url, hValue) {//curl请求带请求头信息 async restPostWithHValueUrl(pobj, url, hValue) {//curl请求带请求头信息
try { try {
if (!hValue) { if (!hValue) {
...@@ -97,6 +101,7 @@ class AppServiceBase { ...@@ -97,6 +101,7 @@ class AppServiceBase {
return system.getResult(null, errorMsg); return system.getResult(null, errorMsg);
} }
} }
async restPostWithHAuthorizationUrl(pobj, userToken, url) {//curl请求带请求头信息 async restPostWithHAuthorizationUrl(pobj, userToken, url) {//curl请求带请求头信息
try { try {
var rtn = await this.restClient.restPostWithHAuthorizationUrl(userToken, url); var rtn = await this.restClient.restPostWithHAuthorizationUrl(userToken, url);
...@@ -120,6 +125,7 @@ class AppServiceBase { ...@@ -120,6 +125,7 @@ class AppServiceBase {
return system.getResult(null, errorMsg); return system.getResult(null, errorMsg);
} }
} }
async execPostUrl(pobj, url) { async execPostUrl(pobj, url) {
try { try {
var rtn = await this.execClient.execPost(pobj, url); var rtn = await this.execClient.execPost(pobj, url);
...@@ -143,6 +149,7 @@ class AppServiceBase { ...@@ -143,6 +149,7 @@ class AppServiceBase {
return system.getResult(null, errorMsg); return system.getResult(null, errorMsg);
} }
} }
async opAliyunRpcVerifyParam(pobj) {//参数信息验证 async opAliyunRpcVerifyParam(pobj) {//参数信息验证
var verify = system.getResultSuccess(); var verify = system.getResultSuccess();
if (!pobj.interface_params) { if (!pobj.interface_params) {
...@@ -155,6 +162,7 @@ class AppServiceBase { ...@@ -155,6 +162,7 @@ class AppServiceBase {
verify.data = interface_params_info; verify.data = interface_params_info;
return verify; return verify;
} }
/** /**
* 阿里RPC调用 * 阿里RPC调用
* @param {*} pobj {action: rpcParam.action,reqbody: pobj.actionBody,rpcParam: rpcParam} * @param {*} pobj {action: rpcParam.action,reqbody: pobj.actionBody,rpcParam: rpcParam}
...@@ -183,6 +191,7 @@ class AppServiceBase { ...@@ -183,6 +191,7 @@ class AppServiceBase {
return system.getResult(null, errorMsg); return system.getResult(null, errorMsg);
} }
} }
// /** // /**
// * 阿里RPC调用-post请求 // * 阿里RPC调用-post请求
// * @param {*} pobj {action: rpcParam.action,reqbody: pobj.actionBody,rpcParam: rpcParam} // * @param {*} pobj {action: rpcParam.action,reqbody: pobj.actionBody,rpcParam: rpcParam}
...@@ -219,41 +228,35 @@ class AppServiceBase { ...@@ -219,41 +228,35 @@ class AppServiceBase {
* @param {*} failType this.pushlogFailType * @param {*} failType this.pushlogFailType
*/ */
async disposePushResult(pobj, result, opTitleDesc, failType) {//处理结果信息--内部使用 async disposePushResult(pobj, result, opTitleDesc, failType) {//处理结果信息--内部使用
var opType = pobj.opType || ""; let opType = pobj.opType || "";
let content = JSON.stringify(pobj);
if (result.status != 0) { if (result.status != 0) {
this.pushlogSve.createFailLogDb({ return this.disposePushResultFail(pobj, result, opTitleDesc, failType);
appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
requestId: pobj.requestId || "",
content: JSON.stringify(pobj),//推送的参数信息
resultInfo: JSON.stringify(result),
clientIp: pobj.clientIp || "",
failType: failType || 3,
opTitle: opType + "推送操作失败->" + opTitleDesc,
pushNumber: pobj.pushNumber || 1
});
result.data = null;
return result;
} }
this.pushlogSve.createDb({ this.pushlogSve.createDb({
appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "", appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "", appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
requestId: pobj.requestId || "", requestId: pobj.requestId || "",
op: "推送业务类型：" + opType, op: "推送业务类型：" + opType,
content: JSON.stringify(pobj),//推送的参数信息 content: content,//推送的参数信息
resultInfo: JSON.stringify(result), resultInfo: JSON.stringify(result),
returnType: '1', returnType: '1',
opTitle: opType + "数据推送成功->" + opTitleDesc opTitle: opType + "数据推送成功->" + opTitleDesc
}); });
// TODO 更改需求推送状态 // 更改需求推送状态
if (opType.indexOf('Need') >=0 && opType.indexOf('Business')>=0){ if (opType.indexOf('Need') >= 0 && opType.indexOf('Business') >= 0) {
pobj.actionType = 'updateNeedPushStatus'; pobj.actionType = 'updateNeedPushStatus';
let url = settings.centerOrderUrl() + 'action/opNeed/springBoard'; let url = settings.centerOrderUrl() + 'action/opNeed/springBoard';
let result = await this.execPostByTimeOut(null,pobj,url,null,null,60); this.execPostByTimeOut(null, pobj, url, null, null, 60);
}
if (["pushOrder", "pushOrderBusiness", "pushOrderICPBusiness"].includes(opType) && pobj.actionBody && pobj.actionBody.orderNo) {
pobj.actionBody.pushNumber = pobj.pushNumber || 1;
pobj.actionBody.pushStatus = 3;//推送状态0待推送2推送失败3已成功推送
this.disposeOrderPush(pobj);
} }
// result.data = null;
return result; return result;
} }
/** /**
* 处理失败的结果信息--内部使用 * 处理失败的结果信息--内部使用
* @param {*} pobj * @param {*} pobj
...@@ -263,20 +266,48 @@ class AppServiceBase { ...@@ -263,20 +266,48 @@ class AppServiceBase {
*/ */
async disposePushResultFail(pobj, result, opTitleDesc, failType) {//处理失败的结果信息--内部使用 async disposePushResultFail(pobj, result, opTitleDesc, failType) {//处理失败的结果信息--内部使用
var opType = pobj.opType || ""; var opType = pobj.opType || "";
let pushNumber = pobj.pushNumber || 1;
let resultInfo = JSON.stringify(result);
this.pushlogSve.createFailLogDb({ this.pushlogSve.createFailLogDb({
appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "", appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "", appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
requestId: pobj.requestId || "", requestId: pobj.requestId || "",
content: JSON.stringify(pobj),//推送的参数信息 content: JSON.stringify(pobj),//推送的参数信息
resultInfo: JSON.stringify(result), resultInfo: resultInfo,
clientIp: pobj.clientIp || "", clientIp: pobj.clientIp || "",
failType: failType || 3, failType: failType || 3,
opTitle: opType + "推送操作失败->" + opTitleDesc, opTitle: opType + "推送操作失败->" + opTitleDesc,
pushNumber: pobj.pushNumber || 1 pushNumber: pushNumber
}); });
result.data = null; result.data = null;
if (pushNumber == 10 && resultInfo.indexOf("订单产品查询出来产品与传递得产品数量不一致，请重新选择") >= 0) {
pobj.actionBody.pushNumber = pushNumber;
pobj.actionBody.pushStatus = 2;//推送状态0待推送2推送失败3已成功推送
this.disposeOrderPushFailSendDing(pobj);
this.disposeOrderPush(pobj);
}
return result; return result;
} }
async disposeOrderPushFailSendDing(pobj) {
let params = {
orderNo: pobj.actionBody.orderNo,
city: pobj.actionBody.city,
area: pobj.actionBody.area,
companyCategory: pobj.actionBody.companyCategory,
appName: pobj.actionBody.appName,
sku: pobj.actionBody.sku,
error: "订单产品查询出来产品与传递得产品数量不一致，请重新选择!"
}
this.dingClient.businessPushFqByChannel(params);
}
async disposeOrderPush(pobj) {
pobj.actionType = 'updateOrderPushStatus';
let url = settings.centerOrderUrl() + 'action/order/springBoard';
this.execPostByTimeOut(null, pobj, url, null, null, 60);
}
async getAliossjavaFileUrl(pobj, params) {//上传ali oss 文件调用 async getAliossjavaFileUrl(pobj, params) {//上传ali oss 文件调用
var opType = pobj.opType || ""; var opType = pobj.opType || "";
try { try {
...@@ -329,7 +360,8 @@ class AppServiceBase { ...@@ -329,7 +360,8 @@ class AppServiceBase {
var rtn = await this.ossClient.upfile(upFileName, saveFilePath); var rtn = await this.ossClient.upfile(upFileName, saveFilePath);
result.data = rtn; result.data = rtn;
//删除本地文件 //删除本地文件
fs.unlink(saveFilePath, function (err) { }); fs.unlink(saveFilePath, function (err) {
});
} catch (e) { } catch (e) {
result.code = -200; result.code = -200;
result.message = "通过flowId获取到的文件url下载操作异常异常error"; result.message = "通过flowId获取到的文件url下载操作异常异常error";
...@@ -350,7 +382,7 @@ class AppServiceBase { ...@@ -350,7 +382,7 @@ class AppServiceBase {
var getProductInterfaceObj = { var getProductInterfaceObj = {
"actionType": "getProductInterface", "actionType": "getProductInterface",
"appInfo": appInfo, "appInfo": appInfo,
"actionBody": { "product_id": product_id } "actionBody": {"product_id": product_id}
}; };
var productItemInterfaceResult = await this.restPostUrl(getProductInterfaceObj, getProductInterfaceUrl); var productItemInterfaceResult = await this.restPostUrl(getProductInterfaceObj, getProductInterfaceUrl);
return productItemInterfaceResult; return productItemInterfaceResult;
...@@ -370,6 +402,7 @@ class AppServiceBase { ...@@ -370,6 +402,7 @@ class AppServiceBase {
} }
return result; return result;
} }
/* /*
返回20位业务订单号 返回20位业务订单号
prefix：业务前缀 prefix：业务前缀
...@@ -388,6 +421,7 @@ class AppServiceBase { ...@@ -388,6 +421,7 @@ class AppServiceBase {
var timStr = moment().format("YYYYMMDDHHmm"); var timStr = moment().format("YYYYMMDDHHmm");
return prefix + timStr + uidStr; return prefix + timStr + uidStr;
} }
/* /*
len：返回长度 len：返回长度
radix：参与计算的长度，最大为62 radix：参与计算的长度，最大为62
...@@ -411,11 +445,13 @@ class AppServiceBase { ...@@ -411,11 +445,13 @@ class AppServiceBase {
} }
return uuid.join(''); return uuid.join('');
} }
getUUID() { getUUID() {
var uuid = uuidv4(); var uuid = uuidv4();
var u = uuid.replace(/\-/g, ""); var u = uuid.replace(/\-/g, "");
return u; return u;
} }
/** /**
* 加密信息 * 加密信息
* @param {*} encrypt_key * @param {*} encrypt_key
...@@ -428,9 +464,10 @@ class AppServiceBase { ...@@ -428,9 +464,10 @@ class AppServiceBase {
} }
let keyHex = cryptoJS.enc.Utf8.parse(encrypt_key); let keyHex = cryptoJS.enc.Utf8.parse(encrypt_key);
let ivHex = cryptoJS.enc.Utf8.parse(encrypt_secret.substring(0, 8)); let ivHex = cryptoJS.enc.Utf8.parse(encrypt_secret.substring(0, 8));
var cipherStr = cryptoJS.TripleDES.encrypt(opStr, keyHex, { iv: ivHex }).toString(); var cipherStr = cryptoJS.TripleDES.encrypt(opStr, keyHex, {iv: ivHex}).toString();
return cipherStr; return cipherStr;
} }
/** /**
* 解密信息 * 解密信息
* @param {*} encrypt_key * @param {*} encrypt_key
...@@ -456,6 +493,7 @@ class AppServiceBase { ...@@ -456,6 +493,7 @@ class AppServiceBase {
return system.getResultFail(-200, "解密异常：" + opStr); return system.getResultFail(-200, "解密异常：" + opStr);
} }
} }
/** /**
* 带超时时间的post请求 * 带超时时间的post请求
* @param {*} req 请求信息 * @param {*} req 请求信息
...@@ -469,11 +507,12 @@ class AppServiceBase { ...@@ -469,11 +507,12 @@ class AppServiceBase {
const result = await this.execClientNew.execPostTimeOutByBusiness('sve.base', params, url, ContentType, headData, timeOut, req); const result = await this.execClientNew.execPostTimeOutByBusiness('sve.base', params, url, ContentType, headData, timeOut, req);
return result; return result;
} }
/** /**
* 验证签名 * 验证签名
* @param {*} params 要验证的参数 * @param {*} params 要验证的参数
* @param {*} app_secret 应用的校验key * @param {*} app_secret 应用的校验key
*/ */
async verifySign(params, app_secret) { async verifySign(params, app_secret) {
if (!params) { if (!params) {
return system.getResult(null, "请求参数为空"); return system.getResult(null, "请求参数为空");
...@@ -506,7 +545,8 @@ class AppServiceBase { ...@@ -506,7 +545,8 @@ class AppServiceBase {
} }
return system.getResultSuccess(); return system.getResultSuccess();
} }
async getFQbossSign(pobj){
async getFQbossSign(pobj) {
var signArr = []; var signArr = [];
var keys = Object.keys(pobj).sort(); var keys = Object.keys(pobj).sort();
for (let k = 0; k < keys.length; k++) { for (let k = 0; k < keys.length; k++) {
...@@ -519,4 +559,5 @@ class AppServiceBase { ...@@ -519,4 +559,5 @@ class AppServiceBase {
return md5(resultSignStr).toUpperCase(); return md5(resultSignStr).toUpperCase();
} }
} }
module.exports = AppServiceBase; module.exports = AppServiceBase;
center-channel/app/base/service/impl/common/baseCenterOrderSve.js
...@@ -801,7 +801,11 @@ class BaseCenterOrderService extends AppServiceBase { ...@@ -801,7 +801,11 @@ class BaseCenterOrderService extends AppServiceBase {
var pushObj = { var pushObj = {
BizId: res.data.BizId, BizId: res.data.BizId,
OfficialFileURL: res.data.OfficialFileURL, OfficialFileURL: res.data.OfficialFileURL,
ApplicationStatus: res.data.ApplicationStatus ApplicationStatus: res.data.ApplicationStatus,
//2021-3-18 addNew
CertificateNumber:res.data.CertificateNumber || "",//证书编号
CertificateStartTime:res.data.CertificateStartTime || "",//证书有效期 开始时间
CertificateEndTime:res.data.CertificateEndTime || ""//证书有效期 结束时间
}; };
//推送状态变更 //推送状态变更
var ali = await this.aliclient.reqbyget({ action: "AcceptPartnerNotification", reqbody: pushObj, apiVersion: "2019-05-08" }); var ali = await this.aliclient.reqbyget({ action: "AcceptPartnerNotification", reqbody: pushObj, apiVersion: "2019-05-08" });
......
center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
...@@ -123,6 +123,85 @@ class UtilsNeedService extends AppServiceBase { ...@@ -123,6 +123,85 @@ class UtilsNeedService extends AppServiceBase {
return result; return result;
} }
/**
* 提交商标需求,对接百度云商标
* @param {*} pobj
* @param {*} actionBody
*/
async submitTmNeed(pobj, actionBody) {
if(!actionBody.type && actionBody.consultType)
actionBody.type = actionBody.consultType
if (!actionBody.intentionBizId) {
return system.getResult(null, "actionBody.intentionBizId can not be empty，100380");
}
var sobj = pobj;
sobj.actionType = "getProductTypeInfo";
var url = settings.centerAppUrl() + "action/opProduct/springBoard";
var rtn = await this.execClient.execPost(sobj, url);
if (!rtn || !rtn.stdout) {
return system.getResultFail(-5015, "需求类型查询失败");
}
var data = JSON.parse(rtn.stdout);
if (data.status != 0) {
return system.getResultFail(-5015, "需求类型查询失败");
}
pobj.actionBody.type_code = data.data.type_code;
pobj.actionBody.type_name = data.data.type_name;
pobj.actionBody.channel_type_code = data.data.channel_type_code;
pobj.actionBody.channel_type_name = data.data.channel_type_name;
pobj.actionBody.type = pobj.actionBody.channel_type_code;
pobj.actionBody.phone = pobj.actionBody.phone || pobj.actionBody.mobile;
pobj.actionBody.appName = pobj.appInfo.app_name;
pobj.actionBody.idempotentId = pobj.actionBody.intentionBizId;
pobj.actionBody.idempotentSourceName = pobj.appInfo.app_name;
if (pobj.actionBody.channel_type_code == 5) {
pobj.actionBody.type = "ali.icp";
pobj.actionBody.idempotentSource = "icp_ali";
} else if (pobj.actionBody.channel_type_code == 7) {
pobj.actionBody.type = "ali.edi";
pobj.actionBody.idempotentSource = "edi_ali";
} else if (pobj.actionBody.channel_type_code == "tmjy") {
pobj.actionBody.type = "ali.tmd";
pobj.actionBody.idempotentSource = "tmd_ali";
}else if (pobj.actionBody.channel_type_code == 1) {
pobj.actionBody.type = "ali.tmd";
pobj.actionBody.idempotentSource = "tmd_ali";
}else if (pobj.actionBody.channel_type_code == 2) {
pobj.actionBody.type = "ali.tm";
pobj.actionBody.idempotentSource = "tm_ali";
}else if (pobj.actionBody.channel_type_code == 'esp.companyreg'){
pobj.actionBody.type = "ali.ic";
pobj.actionBody.idempotentSource = "ic_ali";
}else if (pobj.actionBody.channel_type_code == 'esp.companyreg_cloud'){
pobj.actionBody.type = "ali.ic";
pobj.actionBody.idempotentSource = "ic_ali";
}
if(pobj.appInfo.uapp_id=='44'){//百度云
if (pobj.actionBody.channel_type_code == 1) {
pobj.actionBody.type = "baidu.tmd";
pobj.actionBody.idempotentSource = "tmd_baidu";
}else if (pobj.actionBody.channel_type_code == 2) {
pobj.actionBody.type = "baidu.tm";
pobj.actionBody.idempotentSource = "tm_baidu";
}
}
if (pobj.actionBody.description && pobj.actionBody.description.indexOf("备#") < 0) {
pobj.actionBody.level = "A";
} else {
pobj.actionBody.level = "C"
}
if (pobj.actionBody.phone == "17319425791") {
pobj.actionBody.level = "F";
}
pobj.actionType = "submitNeed";
var reqUrl = this.centerOrderUrl + "action/need/springBoard";
var result = await this.restPostUrl(pobj, reqUrl);
if (result.status == 0) {
this.utilsPushSve.business2Fq(pobj, "pushNeedTMBusiness");
}
return result;
}
//调用center-order icp需求反馈 //调用center-order icp需求反馈
async reqCenterOrderQcApi(pobj, reqUrl) { async reqCenterOrderQcApi(pobj, reqUrl) {
...@@ -157,6 +236,47 @@ class UtilsNeedService extends AppServiceBase { ...@@ -157,6 +236,47 @@ class UtilsNeedService extends AppServiceBase {
return data; return data;
} }
//商标需求反馈
async tmFeedbackSubmit(pobj) {
var url = this.centerOrderUrl + "action/qcapi/springBoard";
var self = this;
pobj.actionType = "receiveIcpFeedback";
if (pobj.actionBody && pobj.actionBody.intentionStatus) {
pobj.intentionStatus = pobj.actionBody.intentionStatus;
}
var rtn = await this.execClient.execPost(pobj, url);
var data = JSON.parse(rtn.stdout);
if (data.data && (data.data.channelTypeCode == 1||data.data.channelTypeCode == 2)) {//商标
pobj.actionBody.status = "888"
this.execPostUrl({
"actionProcess": "AliTm",
"appCode": "100099",
"sign": await this.getFQbossSign(pobj.actionBody),
actionBody: pobj.actionBody
}, settings.fqbossTmUrl())
self.utilsPushSve.business2Fq(pobj, "pushTMFeedback");
}
return data;
}
//商标状态通知
async tmStatusNotify(pobj) {
var self = this;
// 引用属性，channel依赖bizId order依赖intentionBizId
pobj.intentionBizId = pobj.bizId
var sobj = {
"actionType": "getItemByChannelSolutionNo",
"actionBody": pobj
}
var result = this.getItemByChannelSolutionNo(sobj,sobj.actionBody);
if (result.status == 0) {
let pushres = await this.execPostUrl({ "actionProcess": "AliTm", "appCode": "100099", "sign": await this.getFQbossSign(pobj), actionBody: pobj },settings.fqbossTmUrl())
console.log("推送fqboos----->",pushres)
return this.getResult(result.requestId, pushres.message);
}
return this.getResult(result.requestId)
}
/** /**
* 提交需求-----del * 提交需求-----del
* @param {*} pobj * @param {*} pobj
......
center-channel/app/base/service/impl/utilsSve/utilsPushSve.js
...@@ -76,6 +76,28 @@ class UtilsPushService extends AppServiceBase { ...@@ -76,6 +76,28 @@ class UtilsPushService extends AppServiceBase {
return system.getResult(null, "push Fail，interface_info　data is empty"); return system.getResult(null, "push Fail，interface_info　data is empty");
} }
async business2Fq(pobj, opType) {//供业务调用，在代码中调用，不在db中做配置进行调用
pobj.actionType = "getAppInterface";
var reqUrl = settings.centerAppUrl() + "action/opProduct/springBoard";
var productItemInterfaceResult = await this.restPostUrl(pobj, reqUrl);
pobj.interface_info = productItemInterfaceResult.data;
//日志记录
this.logCtl.info({
appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
requestId: pobj.requestId || "",
op: "service/impl/utilsSve/utilsPushSve.js/service/app.base.js/business2Fq",
content: JSON.stringify(pobj),
resultInfo: productItemInterfaceResult.data ? JSON.stringify(productItemInterfaceResult.data) : "接口数据为空",
optitle: pobj.opType + "推送蜂擎获取的接口信息->business2Fq",
});
if (pobj.interface_info) {
await this.pushBusInfo(pobj, opType, 1);
return system.getResultSuccess();
}
return system.getResult(null, "push Fail，interface_info　data is empty");
}
async pushBusInfo(pobj, opType, isDelProductInfo) {//推送业务总入口，不在db中做配置进行调用 async pushBusInfo(pobj, opType, isDelProductInfo) {//推送业务总入口，不在db中做配置进行调用
console.log(JSON.stringify(pobj), ".......pushBusInfo........................."+opType); console.log(JSON.stringify(pobj), ".......pushBusInfo........................."+opType);
var interface_list = pobj.interface_info ? pobj.interface_info : pobj.actionBody.product_info.interface_info; var interface_list = pobj.interface_info ? pobj.interface_info : pobj.actionBody.product_info.interface_info;
......
center-channel/app/base/service/impl/utilsSve/utilsTmOrderCallSve.js
...@@ -140,8 +140,8 @@ class UtilsTmOrderCallService extends AppServiceBase { ...@@ -140,8 +140,8 @@ class UtilsTmOrderCallService extends AppServiceBase {
} }
var getjsonurl=settings.tmtransactionUrl()+"/tmtransaction/action/trademarktransaction/springBoard" var getjsonurl=settings.tmtransactionUrl()+"/tmtransaction/action/trademarktransaction/springBoard"
var jsonurl=await this.restPostUrl(obj,getjsonurl); var jsonurl=await this.restPostUrl(obj,getjsonurl);
if(!jsonurl){ if(!jsonurl || !jsonurl.data){
console.log(jsonurl); console.log(`createjsonfile返回错误，返回值：${jsonurl}`);
return system.getResultSuccess(); return system.getResultSuccess();
} }
var upobj={ var upobj={
......
center-channel/app/base/utils/dingClient.js
const system = require("../system"); const system = require("../system");
class dingClient { class dingClient {
constructor() { constructor() {
this.execClient = system.getObject('util.execClient'); this.execClient = system.getObject('util.execClient');
this.gatewayurl = "https://oapi.dingtalk.com/robot/send?access_token=2f1ada261ea84f6c621db487ac18d11eba8984202bd82adda8810770a8240572" this.gatewayurl = "https://oapi.dingtalk.com/robot/send?access_token=2f1ada261ea84f6c621db487ac18d11eba8984202bd82adda8810770a8240572"
this.businessToFqUrl = "https://oapi.dingtalk.com/robot/send?access_token=9e215f0f1d77980ee6b39e88a82a7c6e5d290775f76d9a8346e97697f8df9788"
} }
//推送峰擎异常提醒 //推送峰擎异常提醒
async gatewayPushError(err) { async gatewayPushError(err) {
if (process.env.APP_ENV === "prod") { if (process.env.APP_ENV === "prod") {
...@@ -19,7 +22,7 @@ class dingClient { ...@@ -19,7 +22,7 @@ class dingClient {
} }
//渠道钉钉提醒 //渠道钉钉提醒
async gatewayPushByChannel(orderNo,appInfo){ async gatewayPushByChannel(orderNo, appInfo) {
let gatewayUrl = setttings.dingRobotUrl(appInfo.uapp_id); let gatewayUrl = setttings.dingRobotUrl(appInfo.uapp_id);
if (settings.env != "dev" && gatewayUrl) { if (settings.env != "dev" && gatewayUrl) {
let c = `注意提醒：${appInfo.app_name}->有订单待处理，订单号${orderNo}，老板们加油，加油，加油 ！！！` let c = `注意提醒：${appInfo.app_name}->有订单待处理，订单号${orderNo}，老板们加油，加油，加油 ！！！`
...@@ -32,5 +35,23 @@ class dingClient { ...@@ -32,5 +35,23 @@ class dingClient {
}); });
} }
} }
//渠道订单到峰擎--sku没有查询到
async businessPushFqByChannel(params) {
if (process.env.APP_ENV != "dev") {
let c = `注意提醒：${appInfo.app_name}->有订单待处理，渠道下sku查询不到，参数：${JSON.stringify(params)}，老板们加油，加油，加油 ！！！`
let t = new Date().toLocaleString()
this.execClient.execPost({
"msgtype": "text",
"text": {"content": t + c},
at: {
atMobiles: ["13051727697", "13453222948", "18201231253"]//孟令强、王斌、郭峰
},
}, this.businessToFqUrl).catch(err => {
console.log(err)
});
}
}
} }
module.exports = dingClient; module.exports = dingClient;
center-channel/app/config/businessConfig.js
...@@ -48,7 +48,12 @@ module.exports = { ...@@ -48,7 +48,12 @@ module.exports = {
"/api/ic/feedback/submit", "/api/ic/feedback/submit",
"/api/ic/order/notify", "/api/ic/order/notify",
"/api/ic/order/close", "/api/ic/order/close",
"/api/ic/tool/icname" "/api/ic/tool/icname",
"/api/tm/consultation/submit",
"/api/tm/feedback/submit",
"/api/tm/status/notify",
"/api/tm/tmcase/nbtzreceiveAssistTmData",
"/api/tm/tmcase/nbtzreceiveEditAssistTmData"
] ]
} }
} }
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