Commit e0e1ceb3 by 宋毅

tj

parent 1437f1df
...@@ -91,7 +91,7 @@ class AppServiceBase { ...@@ -91,7 +91,7 @@ class AppServiceBase {
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: "center-channel/app/base/service/impl/utilsSve/opAliyunClientPost.js/opAliyunRpcReq", op: "service/impl/utilsSve/opAliyunClientPost.js/opAliyunRpcReq",
content: errorMsg, content: errorMsg,
// clientIp: pobj.clientIp, // clientIp: pobj.clientIp,
optitle: pobj.opType + "推送操作异常->opAliyunRpcReq", optitle: pobj.opType + "推送操作异常->opAliyunRpcReq",
...@@ -119,7 +119,7 @@ class AppServiceBase { ...@@ -119,7 +119,7 @@ class AppServiceBase {
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: "center-channel/app/base/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",
...@@ -171,6 +171,27 @@ class AppServiceBase { ...@@ -171,6 +171,27 @@ class AppServiceBase {
result.data = null; result.data = null;
return result; return result;
} }
async getAliossjavaFileUrl(pobj, params) {//上传ali oss 文件调用
try {
var aliOssFileInfo = await this.execPostUrl(params, settings.aliossjavaUrl());
if (aliOssFileInfo) {
var fileUrl = params.filedir + "/" + params.objectName;
return system.getResultSuccess(fileUrl);
}
return system.getResult(null, "java ali oss upload fail");
} catch (e) {
this.logCtl.error({
appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
requestId: pobj.requestId || "",
op: "service/app.base.js/getAliossjavaFileUrl",
content: "error:" + e.stack,
// clientIp: pobj.clientIp,
optitle: pobj.opType || "" + "aliossjava-upload阿里上传文件操作异常->getAliossjavaFileUrl",
});
return system.getResult(-200, "java ali oss upload error");
}
}
/* /*
返回20位业务订单号 返回20位业务订单号
prefix:业务前缀 prefix:业务前缀
......
...@@ -78,7 +78,7 @@ class UtilsFqAliyunService extends AppServiceBase { ...@@ -78,7 +78,7 @@ class UtilsFqAliyunService extends AppServiceBase {
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: "center-channel/app/base/service/impl/utilsSve/opAliyunClientPost.js/opAliyunClientPost", op: "service/impl/utilsSve/opAliyunClientPost.js/opAliyunClientPost",
content: "error:" + e.stack, content: "error:" + e.stack,
// clientIp: pobj.clientIp, // clientIp: pobj.clientIp,
optitle: pobj.opType + "推送操作异常->opAliyunClientPost", optitle: pobj.opType + "推送操作异常->opAliyunClientPost",
......
...@@ -356,7 +356,7 @@ class UtilsOrderService extends AppServiceBase { ...@@ -356,7 +356,7 @@ class UtilsOrderService extends AppServiceBase {
//日志记录 //日志记录
this.logCtl.info({ this.logCtl.info({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "记录回调参数:,method=" + parmas.trxcode, optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "记录回调参数:,method=" + parmas.trxcode,
op: "center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js/receiveCallBackNotify", op: "service/impl/utilsSve/utilsOrderSve.js/receiveCallBackNotify",
content: JSON.stringify(parmas), content: JSON.stringify(parmas),
clientIp: client_ip || "" clientIp: client_ip || ""
}); });
...@@ -389,7 +389,7 @@ class UtilsOrderService extends AppServiceBase { ...@@ -389,7 +389,7 @@ class UtilsOrderService extends AppServiceBase {
//日志记录 //日志记录
this.logCtl.info({ this.logCtl.info({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "回调处理订单参数:,method=" + parmas.trxcode, optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "回调处理订单参数:,method=" + parmas.trxcode,
op: "center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js/opBackNotify", op: "service/impl/utilsSve/utilsOrderSve.js/opBackNotify",
content: JSON.stringify(parmas), content: JSON.stringify(parmas),
clientIp: client_ip || "" clientIp: client_ip || ""
}); });
...@@ -412,7 +412,7 @@ class UtilsOrderService extends AppServiceBase { ...@@ -412,7 +412,7 @@ class UtilsOrderService extends AppServiceBase {
this.logCtl.info({ this.logCtl.info({
appid: appInfo.uapp_id, appid: appInfo.uapp_id,
appkey: appInfo.uapp_key, appkey: appInfo.uapp_key,
op: "center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js/opBackNotify", op: "service/impl/utilsSve/utilsOrderSve.js/opBackNotify",
content: "参数=" + JSON.stringify(parmas), content: "参数=" + JSON.stringify(parmas),
clientIp: parmas.client_ip || "", clientIp: parmas.client_ip || "",
optitle: "通联回调操作频繁---太频繁了,太频繁了" optitle: "通联回调操作频繁---太频繁了,太频繁了"
...@@ -467,7 +467,7 @@ class UtilsOrderService extends AppServiceBase { ...@@ -467,7 +467,7 @@ class UtilsOrderService extends AppServiceBase {
//日志记录 //日志记录
this.logCtl.info({ this.logCtl.info({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "阿里钉钉支付回调参数信息", optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "阿里钉钉支付回调参数信息",
op: "center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js/opH5AliDingPayBackNotify", op: "service/impl/utilsSve/utilsOrderSve.js/opH5AliDingPayBackNotify",
content: JSON.stringify(parmas), content: JSON.stringify(parmas),
clientIp: client_ip || "" clientIp: client_ip || ""
}); });
...@@ -500,7 +500,7 @@ class UtilsOrderService extends AppServiceBase { ...@@ -500,7 +500,7 @@ class UtilsOrderService extends AppServiceBase {
this.logCtl.info({ this.logCtl.info({
appid: opResult.data.uappId, appid: opResult.data.uappId,
appkey: "", appkey: "",
op: "center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js/opH5AliDingPayBackNotify", op: "service/impl/utilsSve/utilsOrderSve.js/opH5AliDingPayBackNotify",
content: "参数=" + JSON.stringify(parmas), content: "参数=" + JSON.stringify(parmas),
clientIp: parmas.client_ip || "", clientIp: parmas.client_ip || "",
optitle: "阿里回调操作频繁---太频繁了,太频繁了" optitle: "阿里回调操作频繁---太频繁了,太频繁了"
......
...@@ -267,21 +267,9 @@ class UtilsTmAliyunService extends AppServiceBase { ...@@ -267,21 +267,9 @@ class UtilsTmAliyunService extends AppServiceBase {
"encodePolicy": resultInfo.data.EncodedPolicy, "encodePolicy": resultInfo.data.EncodedPolicy,
"signature": resultInfo.data.Signature "signature": resultInfo.data.Signature
} }
try { var ossFileResult = await this.getAliossjavaFileUrl(pobj, params);
var aliOssFileInfo = await this.execPostUrl(params, settings.aliossjavaUrl()); if (ossFileResult.status == 0) {
if (aliOssFileInfo) { fileUrl = ossFileResult.data;
fileUrl = params.filedir + "/" + params.objectName;
}
} catch (e) {
this.logCtl.error({
appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
requestId: pobj.requestId || "",
op: "center-channel/app/base/service/impl/utilsSve/utilsTmAliyunSve.js/aliossjavaUrl",
content: "error:" + e.stack,
// clientIp: pobj.clientIp,
optitle: pobj.opType + "aliossjava-upload阿里上传文件操作异常->getAliOssFileUrl->aliossjavaUrl",
});
} }
return fileUrl; return fileUrl;
} }
......
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