Merge branch 'master-沃文档' into uat_code

This commit is contained in:
yss
2023-06-06 11:41:38 +08:00

View File

@ -1,6 +1,7 @@
package com.chinaunicom.mall.ebtp.extend.wps.service.impl;
import cn.hutool.core.exceptions.ExceptionUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@ -306,7 +307,7 @@ public class WpsServiceImpl implements WpsService {
CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("沃文档天擎接口调用失败,错误信息:"+String.valueOf(headMap.get("RESP_DESC")),true);
}
} catch (Exception e) {
log.error("沃文档--天擎接口返回参数!~-----------------",e);
log.error("沃文档--天擎接口返回参数!~-----------------{}",ExceptionUtil.stacktraceToString(e));
operationLogService.addOperationLog("沃文档天擎接口调用信息失败,请求地址{}"+bean.getUrl()+",参数{}"+json+",返回信息{}"+str,false, EbtpLogBusinessModule.PAY_PUSH, EbtpLogType.INSERT);
}
log.info("---沃文档--天擎接口返回参数-----"+str);
@ -389,7 +390,7 @@ public class WpsServiceImpl implements WpsService {
log.warn("沃文档天擎接口调用信息HttpURLConnection2={}"+JSONObject.toJSONString(conn)+",参数{}"+data+",返回信息{}"+str,true, EbtpLogBusinessModule.OTHER, EbtpLogType.INSERT);
operationLogService.addOperationLog("沃文档天擎接口调用信息HttpURLConnection2={}"+JSONObject.toJSONString(conn)+",参数{}"+data+",返回信息{}"+str,true, EbtpLogBusinessModule.OTHER, EbtpLogType.INSERT);
} catch (Exception var9) {
log.warn("沃文档天擎接口调用信息异常,异常信息={}"+JSONObject.toJSONString(var9)+",参数{}"+data+",返回信息{}"+str,true, EbtpLogBusinessModule.OTHER, EbtpLogType.INSERT);
log.warn("沃文档天擎接口调用信息异常,异常信息={}"+ ExceptionUtil.stacktraceToString(var9)+",参数{}"+data+",返回信息{}"+str,true, EbtpLogBusinessModule.OTHER, EbtpLogType.INSERT);
operationLogService.addOperationLog("沃文档天擎接口调用信息异常,异常信息={}"+JSONObject.toJSONString(var9)+",参数{}"+data+",返回信息{}"+str,true, EbtpLogBusinessModule.OTHER, EbtpLogType.INSERT);
}
@ -413,7 +414,7 @@ public class WpsServiceImpl implements WpsService {
// BigInteger函数则将8位的字符串转换成16位hex值用字符串来表示得到字符串形式的hash值
return new BigInteger(1, md.digest()).toString(16);
} catch (NoSuchAlgorithmException e) {
log.warn(ExceptionUtil.stacktraceToString(e));
}
return "";
}
@ -430,7 +431,7 @@ public class WpsServiceImpl implements WpsService {
sb.append(Integer.toString((byteData[i] & 0xff) + 0x100, 16).substring(1));
}
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
log.warn(ExceptionUtil.stacktraceToString(e));
}
return sb.toString();
}