Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project

This commit is contained in:
yuqh 2024-07-04 16:15:00 +08:00
commit 650a7f3dae
3 changed files with 5 additions and 3 deletions

View File

@ -109,7 +109,7 @@ public class PayApplyAgentPluginInitializer extends PluginBaseEntity {
public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
//1查询代支付的 //1查询代支付的
AgentPaymentEntity agentPaymentEntity = new AgentPaymentEntity(); AgentPaymentEntity agentPaymentEntity = new AgentPaymentEntity();
agentPaymentEntity.setOaId("4442823497745714629"); //agentPaymentEntity.setOaId("4442823497745714629");
cbsPluginService.applyAgentPay(agentPaymentEntity); cbsPluginService.applyAgentPay(agentPaymentEntity);
return null; return null;
} }

View File

@ -28,4 +28,6 @@ cbs8:
# 这个私钥到时候上传到cbs和下面到是同一对 # 这个私钥到时候上传到cbs和下面到是同一对
#ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46 #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
cbs_public_key: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185 cbs_public_key: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185
OA:
data_source_code: OA

View File

@ -2747,7 +2747,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
} }
logger.info("保存日志开始"); logger.info("保存日志开始");
SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,Base64.getEncoder().encodeToString(byteBodys) , oldheaderMap,headers, headers, oldquerys,querys, body.toString(),true,null); SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,Base64.getEncoder().encodeToString(byteBodys) , oldheaderMap,headers, headers, oldquerys,querys, Base64.getEncoder().encodeToString(body),true,null);
if (methods != null && methods.length > 0) { if (methods != null && methods.length > 0) {
for (Method m : methods) { for (Method m : methods) {
if (null != m) { if (null != m) {