Merge branch 'develop'

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");

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);

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>