From 965454a1c77165cac52d4eab2229e36121486380 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Thu, 4 Jul 2024 15:20:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?externalCallInterfaceToESB=20=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=80=BC=E6=94=B9=E6=88=90base64=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E5=AD=97=E7=AC=A6=E4=B8=B2=EF=BC=8C=E5=8E=9F?=
 =?UTF-8?q?=E5=85=88=E8=BF=94=E5=9B=9E=E7=9A=84=E6=98=AFbyte[]=202024?=
 =?UTF-8?q?=E5=B9=B47=E6=9C=884=E6=97=A5=2015:20:05?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/service/impl/SysApplicationServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
index 7d4e4a27..cd89f675 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
@@ -2747,7 +2747,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
 
             }
             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) {
                 for (Method m : methods) {
                     if (null != m) {

From 290243f8be22404609427d4427eb1432eab735f9 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Thu, 4 Jul 2024 15:44:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B3=A8=E8=A7=86=E6=B2=A1=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/cbs8/plugin/PayApplyAgentPluginInitializer.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyAgentPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyAgentPluginInitializer.java
index 9c90a865..cfe685b3 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyAgentPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyAgentPluginInitializer.java
@@ -109,7 +109,7 @@ public class PayApplyAgentPluginInitializer extends PluginBaseEntity {
     public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
         //1、查询代支付的
         AgentPaymentEntity agentPaymentEntity = new AgentPaymentEntity();
-        agentPaymentEntity.setOaId("4442823497745714629");
+        //agentPaymentEntity.setOaId("4442823497745714629");
         cbsPluginService.applyAgentPay(agentPaymentEntity);
         return null;
     }

From c034abc1d54e579231c5d04b00a9b0208832eb01 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Thu, 4 Jul 2024 16:13:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0oa=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildpackage/src/main/resources/application-yuecheng.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/buildpackage/src/main/resources/application-yuecheng.yml b/buildpackage/src/main/resources/application-yuecheng.yml
index c0c6c6d4..ec161bc5 100644
--- a/buildpackage/src/main/resources/application-yuecheng.yml
+++ b/buildpackage/src/main/resources/application-yuecheng.yml
@@ -28,4 +28,6 @@ cbs8:
   # 这个私钥到时候上传到cbs，和下面到是同一对
   #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
   ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
-  cbs_public_key: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185
\ No newline at end of file
+  cbs_public_key: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185
+OA:
+  data_source_code: OA
\ No newline at end of file