From ccd94f8e8ddc12c50ba1a00485475567a24f70af Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Wed, 4 Apr 2018 11:18:50 +0800
Subject: [PATCH 1/2] logback logger

---
 src/main/resources/logback_cfg.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/logback_cfg.xml b/src/main/resources/logback_cfg.xml
index d4ce032c9..b1755ab54 100644
--- a/src/main/resources/logback_cfg.xml
+++ b/src/main/resources/logback_cfg.xml
@@ -11,7 +11,7 @@
 
             <!-- daily rollover -->
             <maxHistory>30</maxHistory>
-            <fileNamePattern>/var/log/payment/%d{yyyy-MM}/manage.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>/var/log/payment/%d{yyyy-MM,aux}/manage.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <maxFileSize>200MB</maxFileSize>
         </rollingPolicy>
         <encoder>

From c29235de78ee83b3ee896775f019ce7d50e42032 Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Thu, 5 Apr 2018 17:13:36 +0800
Subject: [PATCH 2/2] fix

---
 .../payment/manage/merchants/web/PartnerViewController.java     | 2 +-
 .../manage/system/core/impl/ClientContractServiceImpl.java      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
index 76a97ad44..022986b47 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
@@ -375,7 +375,7 @@ public class PartnerViewController {
         return clientManager.getCheckClientInfo(account.getIntValue("client_id"),account.getString("account_id"),"PC");
     }
 
-    @PartnerMapping(value = "/agree/confirm", method = RequestMethod.POST)
+    @PartnerMapping(value = "/agree/confirm", method = RequestMethod.POST,roles = PartnerRole.ADMIN)
     @ResponseBody
     public void confirmSourceAgreeFile(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account) {
         clientContractService.confirmSourceAgreement(account.getIntValue("client_id"),account.getString("account_id"),"PC");
diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
index a4aedb370..b139eb274 100644
--- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
@@ -83,6 +83,7 @@ public class ClientContractServiceImpl implements ClientContractService {
 
         getOrGenerateSourceAgreement(client_id, channel);
         Date now = new Date();
+        logger.info("confirmSourceAgreement+account_id"+account_id);
         JSONObject account = clientAccountMapper.findById(account_id);
         contract.put("has_sign", 1);
         contract.put("sign_account_id", account_id);