refactor

@@ -95,11 +95,17 @@ public class BaseNoticeFacade {
 
 
         public void send() {
         public void send() {
             executorService.execute(() -> {
             executorService.execute(() -> {
-                final Logger log = getLogger();
                 final String logPrefix = getReplacedContent("{} send uid {}", this.logPrefix, this.uid);
                 final String logPrefix = getReplacedContent("{} send uid {}", this.logPrefix, this.uid);
-                log.warn("{}, inBoxContent {} smsContent {}", logPrefix, inBoxContent, smsContent);
+                log.info("{}, start", logPrefix);
+                sendInbox(logPrefix);
+                sendPush(logPrefix);
+                sendSms(logPrefix);
+                log.info("{}, end", logPrefix);
+            });
+        }
 
 
-                // 发送站内信
+        private void sendInbox(String logPrefix) {
+            final Logger log = getLogger();
             InboxReqVO inBoxContent = getInBoxContentWhenExceptionAnd(e -> {
             InboxReqVO inBoxContent = getInBoxContentWhenExceptionAnd(e -> {
                 log.warn("{}, send in box fail, get content fail", logPrefix, e);
                 log.warn("{}, send in box fail, get content fail", logPrefix, e);
                 return null;
                 return null;
@@ -108,13 +114,27 @@ public class BaseNoticeFacade {
                 try {
                 try {
                     inBoxContent.setUid(uid);
                     inBoxContent.setUid(uid);
                     InBoxResponse resp = inBoxSDK.addInbox(inBoxContent);
                     InBoxResponse resp = inBoxSDK.addInbox(inBoxContent);
-                        log.info("{}, send in box success content {} response {}", logPrefix, inBoxContent, JSON.toJSON(resp));
+                    log.info("{}, send in box success content {} response {}", logPrefix, JSON.toJSON(inBoxContent), JSON.toJSON(resp));
                 } catch (Exception e) {
                 } catch (Exception e) {
-                        log.warn("{}, send in box fail content {}", logPrefix, inBoxContent, e);
+                    log.warn("{}, send in box fail content {}", logPrefix, JSON.toJSON(inBoxContent), e);
+                }
+            }
+        }
+
+        private InboxReqVO getInBoxContentWhenExceptionAnd(Function<Exception, InboxReqVO> exceptionFunction) {
+            if (Objects.nonNull(inBoxContentSupplier)) {
+                try {
+                    return inBoxContentSupplier.get();
+                } catch (Exception e) {
+                    return exceptionFunction.apply(e);
+                }
+            } else {
+                return this.inBoxContent;
             }
             }
         }
         }
 
 
-                // 发送PUSH
+        private void sendPush(String logPrefix) {
+            final Logger log = getLogger();
             if (Objects.nonNull(pushSupplier)) {
             if (Objects.nonNull(pushSupplier)) {
                 try {
                 try {
                     SendMessageRspBo resp = pushSupplier.get();
                     SendMessageRspBo resp = pushSupplier.get();
@@ -123,8 +143,10 @@ public class BaseNoticeFacade {
                     log.warn("{}, send push fail", logPrefix, e);
                     log.warn("{}, send push fail", logPrefix, e);
                 }
                 }
             }
             }
+        }
 
 
-                // 发送短信
+        private void sendSms(String logPrefix) {
+            final Logger log = getLogger();
             String smsContent = getSmsContentWhenExceptionAnd(e -> {
             String smsContent = getSmsContentWhenExceptionAnd(e -> {
                 log.warn("{}, send sms fail, get content fail", logPrefix, e);
                 log.warn("{}, send sms fail, get content fail", logPrefix, e);
                 return null;
                 return null;
@@ -143,21 +165,6 @@ public class BaseNoticeFacade {
                     log.warn("{}, send sms fail content {}", logPrefix, smsContent, e);
                     log.warn("{}, send sms fail content {}", logPrefix, smsContent, e);
                 }
                 }
             }
             }
-
-                // END
-            });
-        }
-
-        private InboxReqVO getInBoxContentWhenExceptionAnd(Function<Exception, InboxReqVO> exceptionFunction) {
-            if (Objects.nonNull(inBoxContentSupplier)) {
-                try {
-                    return inBoxContentSupplier.get();
-                } catch (Exception e) {
-                    return exceptionFunction.apply(e);
-                }
-            } else {
-                return this.inBoxContent;
-            }
         }
         }
 
 
         private String getSmsContentWhenExceptionAnd(Function<Exception, String> exceptionFunction) {
         private String getSmsContentWhenExceptionAnd(Function<Exception, String> exceptionFunction) {