Skip to content

Z
zhichan
Commit d9be0933 by 宋毅
Options

tj

parent 3678af0c
Showing with 69 additions and 60 deletions
center-channel/app/base/service/app.base.js
...@@ -156,34 +156,34 @@ class AppServiceBase { ...@@ -156,34 +156,34 @@ 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}
* @param {*} params {为阿里的接口参数} // * @param {*} params {为阿里的接口参数}
*/ // */
async opAliyunRpcReqByPost(pobj, params) { // async opAliyunRpcReqByPost(pobj, params) {
try { // try {
// var action = obj.action; // // var action = obj.action;
// var reqbody = obj.reqbody; // // var reqbody = obj.reqbody;
// var rpcParam = obj.rpcParam; // // var rpcParam = obj.rpcParam;
var aliyunClient = system.getObject("util.aliyunClient"); // var aliyunClient = system.getObject("util.aliyunClient");
var rtn = await aliyunClient.reqCustomByPost(params); // var rtn = await aliyunClient.reqCustomByPost(params);
return rtn; // return rtn;
} catch (e) { // } catch (e) {
var errorMsg = "error：" + e.stack; // var errorMsg = "error：" + e.stack;
//日志记录 // //日志记录
this.logCtl.error({ // this.logCtl.error({
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: "service/impl/utilsSve/opAliyunClientPost.js/opAliyunRpcReqByPost", // op: "service/impl/utilsSve/opAliyunClientPost.js/opAliyunRpcReqByPost",
content: errorMsg, // content: errorMsg,
// clientIp: pobj.clientIp, // // clientIp: pobj.clientIp,
optitle: pobj.opType + "推送操作异常->opAliyunRpcReqByPost", // optitle: pobj.opType + "推送操作异常->opAliyunRpcReqByPost",
}); // });
return system.getResult(null, errorMsg); // return system.getResult(null, errorMsg);
} // }
} // }
/** /**
* 处理成功后的信息 * 处理成功后的信息
* @param {*} pobj * @param {*} pobj
......
center-channel/app/base/service/impl/utilsSve/utilsTmAliyunSve.js
...@@ -657,8 +657,13 @@ class UtilsTmAliyunService extends AppServiceBase { ...@@ -657,8 +657,13 @@ class UtilsTmAliyunService extends AppServiceBase {
self.disposePushResultFail(pobj, getDingTmStatusResult, "ali->opAliTmUpdateTask->getDingTmStatusResult", self.pushlogFailType.FAILLOG); self.disposePushResultFail(pobj, getDingTmStatusResult, "ali->opAliTmUpdateTask->getDingTmStatusResult", self.pushlogFailType.FAILLOG);
break; break;
} }
if (getDingTmStatusResult.data.TrademarkApplications.TrademarkApplication[0].Note) { var noteStr = getDingTmStatusResult.data.TrademarkApplications.TrademarkApplication[0].Note;
var opNoteInfo = JSON.parse(getDingTmStatusResult.data.TrademarkApplications.TrademarkApplication[0].Note); if (noteStr) {
if (noteStr.lastIndexOf('}') < 0) {
element.deliveryContent.tm[i].Note = noteStr;
}
else {
var opNoteInfo = JSON.parse(noteStr);
if (opNoteInfo.txt) { if (opNoteInfo.txt) {
var txtList = opNoteInfo.txt.split('\n'); var txtList = opNoteInfo.txt.split('\n');
var txtStr = ""; var txtStr = "";
...@@ -671,6 +676,7 @@ class UtilsTmAliyunService extends AppServiceBase { ...@@ -671,6 +676,7 @@ class UtilsTmAliyunService extends AppServiceBase {
element.deliveryContent.tm[i].Note = txtStr; element.deliveryContent.tm[i].Note = txtStr;
} }
} }
}
element.deliveryContent.tm[i].BizId = getDingTmStatusResult.data.TrademarkApplications.TrademarkApplication[0].BizId; element.deliveryContent.tm[i].BizId = getDingTmStatusResult.data.TrademarkApplications.TrademarkApplication[0].BizId;
element.deliveryContent.tm[i].ApplicationStatus = getDingTmStatusResult.data.TrademarkApplications.TrademarkApplication[0].ApplicationStatus; element.deliveryContent.tm[i].ApplicationStatus = getDingTmStatusResult.data.TrademarkApplications.TrademarkApplication[0].ApplicationStatus;
element.deliveryContent.tm[i].TotalPrice = getDingTmStatusResult.data.TrademarkApplications.TrademarkApplication[0].TotalPrice; element.deliveryContent.tm[i].TotalPrice = getDingTmStatusResult.data.TrademarkApplications.TrademarkApplication[0].TotalPrice;
......
center-channel/app/base/utils/aliyunClient.js
...@@ -3,13 +3,16 @@ var RPCClient = require('@alicloud/pop-core').RPCClient; ...@@ -3,13 +3,16 @@ var RPCClient = require('@alicloud/pop-core').RPCClient;
const system = require("../system"); const system = require("../system");
class aliyunClient { class aliyunClient {
constructor() { constructor() {
this.aliclient = new RPCClient({
this.pushlogSve = system.getObject("service.common.pushlogSve");
}
getAliClient() {
return new RPCClient({
accessKeyId: "LTAI1pJs7KQizBe2",//对应的aliuid 是 30039057 accessKeyId: "LTAI1pJs7KQizBe2",//对应的aliuid 是 30039057
accessKeySecret: "MMNibebAPqR9AnX5YWHnSL2tHMSIoL", accessKeySecret: "MMNibebAPqR9AnX5YWHnSL2tHMSIoL",
endpoint: "https://companyreg.aliyuncs.com", endpoint: "https://companyreg.aliyuncs.com",
apiVersion: "2020-03-06" apiVersion: "2020-03-06"
}); });
this.pushlogSve = system.getObject("service.common.pushlogSve");
} }
async post(aliReqUrl, key, secret, actionBody) { async post(aliReqUrl, key, secret, actionBody) {
const client = new Client(key, secret); const client = new Client(key, secret);
...@@ -30,7 +33,7 @@ class aliyunClient { ...@@ -30,7 +33,7 @@ class aliyunClient {
var action = obj.action; var action = obj.action;
var reqbody = obj.reqbody; var reqbody = obj.reqbody;
try { try {
var reqAliclient = { ... this.aliclient }; var reqAliclient = this.getAliClient();// { ... this.aliclient };
if (obj.apiVersion) { if (obj.apiVersion) {
reqAliclient.apiVersion = obj.apiVersion; reqAliclient.apiVersion = obj.apiVersion;
} }
...@@ -70,7 +73,7 @@ class aliyunClient { ...@@ -70,7 +73,7 @@ class aliyunClient {
var action = obj.action; var action = obj.action;
var reqbody = obj.reqbody; var reqbody = obj.reqbody;
var rpcParam = obj.rpcParam; var rpcParam = obj.rpcParam;
var reqAliclient = { ... this.aliclient }; var reqAliclient = this.getAliClient();// { ...self.aliclient };
if (rpcParam.accessKeyId) { if (rpcParam.accessKeyId) {
reqAliclient.accessKeyId = rpcParam.accessKeyId; reqAliclient.accessKeyId = rpcParam.accessKeyId;
} }
...@@ -94,31 +97,31 @@ class aliyunClient { ...@@ -94,31 +97,31 @@ class aliyunClient {
console.log(reqbody, "reqbody..........."); console.log(reqbody, "reqbody...........");
return system.getResultSuccess(res); return system.getResultSuccess(res);
} }
async reqCustomByPost(obj, cbk) { // async reqCustomByPost(obj, cbk) {
var action = obj.action; // var action = obj.action;
var reqbody = obj.reqbody; // var reqbody = obj.reqbody;
var rpcParam = obj.rpcParam; // var rpcParam = obj.rpcParam;
var reqAliclient = { ... this.aliclient }; // var reqAliclient = { ... this.aliclient };
if (rpcParam.accessKeyId) { // if (rpcParam.accessKeyId) {
reqAliclient.accessKeyId = rpcParam.accessKeyId; // reqAliclient.accessKeyId = rpcParam.accessKeyId;
} // }
if (rpcParam.accessKeySecret) { // if (rpcParam.accessKeySecret) {
reqAliclient.accessKeySecret = rpcParam.accessKeySecret; // reqAliclient.accessKeySecret = rpcParam.accessKeySecret;
} // }
if (rpcParam.endpoint) { // if (rpcParam.endpoint) {
reqAliclient.endpoint = rpcParam.endpoint; // reqAliclient.endpoint = rpcParam.endpoint;
} // }
if (rpcParam.apiVersion) { // if (rpcParam.apiVersion) {
reqAliclient.apiVersion = rpcParam.apiVersion; // reqAliclient.apiVersion = rpcParam.apiVersion;
} // }
var res = await reqAliclient.request(action, reqbody, { // var res = await reqAliclient.request(action, reqbody, {
timeout: 3000, // default 3000 ms // timeout: 3000, // default 3000 ms
formatAction: true, // default true, format the action to Action // formatAction: true, // default true, format the action to Action
formatParams: true, // default true, format the parameter name to first letter upper case // formatParams: true, // default true, format the parameter name to first letter upper case
method: 'POST', // set the http method, default is GET // method: 'POST', // set the http method, default is GET
headers: {}, // set the http request headers // headers: {}, // set the http request headers
}); // });
return system.getResultSuccess(res); // return system.getResultSuccess(res);
} // }
} }
module.exports = aliyunClient; module.exports = aliyunClient;
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