update

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -736,6 +736,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     private void initAdminUserAndSendEmail(JSONObject manager, String clientMoniker, JSONObject client) {
+        if(StringUtils.isEmpty(client.getString("sub_merchant_id"))){
+            throw new BadRequestException("Sub Merchant ID Can't be null ");
+        }
         String username = clientMoniker + client.getString("sub_merchant_id");
         boolean duplicated = true;
         String pwd = RandomStringUtils.random(8, true, true);

src/main/java/au/com/royalpay/payment/manage/system/web/MailCallBackController.java

@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 @RestController
 @RequestMapping(value = "/mailgun")
@@ -26,9 +28,10 @@ public class MailCallBackController {
 
 
     @RequestMapping(value = "/callback/dropped", method = RequestMethod.POST)
-    public void contractList(@RequestBody String content) throws Exception {
-        logger.info("kira"+content);
-        mailService.dealDroppedNotify(content);
+    public void contractList(HttpServletRequest req, HttpServletResponse res) throws Exception {
+        logger.info("kira"+req.getRequestURL().toString());
+//        logger.info("kira"+content);
+//        mailService.dealDroppedNotify(content);
     }
 
 }

src/main/ui/static/risk/templates/risk_history.html

@@ -31,7 +31,7 @@
                     <tr>
                         <th>Client Moniker</th>
                         <th>Create Time</th>
-                        <th>Waring Time</th>
+                        <th>Expire Time</th>
                         <th>Risk Types</th>
                         <th>Status</th>
                         <th>Risk Counts</th>