运行在本地的话不发送评论/回复提醒邮件

src/main/java/org/b3log/solo/event/comment/ArticleCommentReplyNotifier.java

@@ -15,7 +15,6 @@
  */
 package org.b3log.solo.event.comment;
 
-
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
@@ -39,12 +38,11 @@ import org.b3log.solo.repository.impl.CommentRepositoryImpl;
 import org.b3log.solo.service.PreferenceQueryService;
 import org.json.JSONObject;
 
-
 /**
  * This listener is responsible for processing article comment reply.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.1.6, May 17, 2013
+ * @version 1.1.1.6, Oct 1, 2015
  * @since 0.3.1
  */
 public final class ArticleCommentReplyNotifier extends AbstractEventListener<JSONObject> {
@@ -66,11 +64,18 @@ public final class ArticleCommentReplyNotifier extends AbstractEventListener<JSO
         final JSONObject article = eventData.optJSONObject(Article.ARTICLE);
 
         LOGGER.log(Level.DEBUG, "Processing an event[type={0}, data={1}] in listener[className={2}]",
-            new Object[] {event.getType(), eventData, ArticleCommentReplyNotifier.class.getName()});
+                new Object[]{event.getType(), eventData, ArticleCommentReplyNotifier.class.getName()});
         final String originalCommentId = comment.optString(Comment.COMMENT_ORIGINAL_COMMENT_ID);
 
         if (Strings.isEmptyOrNull(originalCommentId)) {
             LOGGER.log(Level.DEBUG, "This comment[id={0}] is not a reply", comment.optString(Keys.OBJECT_ID));
+
+            return;
+        }
+
+        if (Latkes.getServePath().contains("localhost")) {
+            LOGGER.log(Level.INFO, "Solo runs on local server, so should not send mail");
+
             return;
         }
 
@@ -124,7 +129,7 @@ public final class ArticleCommentReplyNotifier extends AbstractEventListener<JSO
 
             message.setHtmlBody(mailBody);
             LOGGER.log(Level.DEBUG, "Sending a mail[mailSubject={0}, mailBody=[{1}] to [{2}]",
-                new Object[] {mailSubject, mailBody, originalCommentEmail});
+                    new Object[]{mailSubject, mailBody, originalCommentEmail});
             mailService.send(message);
 
         } catch (final Exception e) {

src/main/java/org/b3log/solo/service/CommentMgmtService.java

@@ -15,7 +15,6 @@
  */
 package org.b3log.solo.service;
 
-
 import java.io.IOException;
 import java.net.URL;
 import java.util.Date;
@@ -50,12 +49,11 @@ import org.b3log.solo.util.Thumbnails;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-
 /**
  * Comment management service.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.0.6, Jan 7, 2014
+ * @version 1.1.0.6, Oct 1, 2015
  * @since 0.3.5
  */
 @Service
@@ -156,13 +154,12 @@ public class CommentMgmtService {
             + " received a new comment:</p>" + "{commenter}: <span><a href=\"{commentSharpURL}\">" + "{commentContent}</a></span>";
 
     /**
-     * Sends a notification mail to administrator for notifying the specified
-     * article or page received the specified comment and original comment.
+     * Sends a notification mail to administrator for notifying the specified article or page received the specified
+     * comment and original comment.
      *
      * @param articleOrPage the specified article or page
      * @param comment the specified comment
-     * @param originalComment original comment, if not exists, set it as
-     * {@code null}
+     * @param originalComment original comment, if not exists, set it as {@code null}
      * @param preference the specified preference
      * @throws IOException io exception
      * @throws JSONException json exception
@@ -180,6 +177,13 @@ public class CommentMgmtService {
 
         if (adminEmail.equalsIgnoreCase(commentEmail)) {
             LOGGER.log(Level.DEBUG, "Do not send comment notification mail to admin itself[{0}]", adminEmail);
+
+            return;
+        }
+
+        if (Latkes.getServePath().contains("localhost")) {
+            LOGGER.log(Level.INFO, "Solo runs on local server, so should not send mail");
+
             return;
         }
 
@@ -237,15 +241,15 @@ public class CommentMgmtService {
         message.setHtmlBody(mailBody);
 
         LOGGER.log(Level.DEBUG, "Sending a mail[mailSubject={0}, mailBody=[{1}] to admin[email={2}]",
-            new Object[] {mailSubject, mailBody, adminEmail});
+                new Object[]{mailSubject, mailBody, adminEmail});
+
         mailService.send(message);
     }
 
     /**
      * Checks the specified comment adding request.
      *
-     * @param requestJSONObject the specified comment adding request, for example, 
-     * <pre>
+     * @param requestJSONObject the specified comment adding request, for example,      <pre>
      * {
      *     "type": "", // "article"/"page"
      *     "oId": "",
@@ -255,8 +259,8 @@ public class CommentMgmtService {
      *     "commentContent": "",
      * }
      * </pre>
-     * @return check result, for example, 
-     * <pre>
+     *
+     * @return check result, for example,      <pre>
      * {
      *     "sc": boolean,
      *     "msg": "" // Exists if "sc" equals to false
@@ -350,8 +354,7 @@ public class CommentMgmtService {
     /**
      * Adds page comment with the specified request json object.
      *
-     * @param requestJSONObject the specified request json object, for example,
-     * <pre>
+     * @param requestJSONObject the specified request json object, for example,      <pre>
      * {
      *     "oId": "", // page id
      *     "commentName": "",
@@ -361,8 +364,8 @@ public class CommentMgmtService {
      *     "commentOriginalCommentId": "" // optional
      * }
      * </pre>
-     * @return add result, for example,
-     * <pre>
+     *
+     * @return add result, for example,      <pre>
      * {
      *     "oId": "", // generated comment id
      *     "commentDate": "", // format: yyyy-MM-dd hh:mm:ss
@@ -371,6 +374,7 @@ public class CommentMgmtService {
      *     "commentSharpURL": ""
      * }
      * </pre>
+     *
      * @throws ServiceException service exception
      */
     public JSONObject addPageComment(final JSONObject requestJSONObject) throws ServiceException {
@@ -466,8 +470,7 @@ public class CommentMgmtService {
     /**
      * Adds an article comment with the specified request json object.
      *
-     * @param requestJSONObject the specified request json object, for example, 
-     * <pre>
+     * @param requestJSONObject the specified request json object, for example,      <pre>
      * {
      *     "oId": "", // article id
      *     "commentName": "",
@@ -477,8 +480,8 @@ public class CommentMgmtService {
      *     "commentOriginalCommentId": "" // optional
      * }
      * </pre>
-     * @return add result, for example,
-     * <pre>
+     *
+     * @return add result, for example,      <pre>
      * {
      *     "oId": "", // generated comment id
      *     "commentDate": "", // format: yyyy-MM-dd hh:mm:ss
@@ -487,6 +490,7 @@ public class CommentMgmtService {
      *     "commentSharpURL": ""
      * }
      * </pre>
+     *
      * @throws ServiceException service exception
      */
     public JSONObject addArticleComment(final JSONObject requestJSONObject) throws ServiceException {
@@ -535,7 +539,7 @@ public class CommentMgmtService {
                     ret.put(Comment.COMMENT_ORIGINAL_COMMENT_NAME, originalCommentName);
                 } else {
                     LOGGER.log(Level.WARN, "Not found orginal comment[id={0}] of reply[name={1}, content={2}]",
-                        new String[] {originalCommentId, commentName, commentContent});
+                            new String[]{originalCommentId, commentName, commentContent});
                 }
             }
             setCommentThumbnailURL(comment);
@@ -650,8 +654,7 @@ public class CommentMgmtService {
     }
 
     /**
-     * Page comment count +1 for an page specified by the given page 
-     * id.
+     * Page comment count +1 for an page specified by the given page id.
      *
      * @param pageId the given page id
      * @throws JSONException json exception
@@ -668,8 +671,7 @@ public class CommentMgmtService {
     }
 
     /**
-     * Article comment count -1 for an article specified by the given 
-     * article id.
+     * Article comment count -1 for an article specified by the given article id.
      *
      * @param articleId the given article id
      * @throws JSONException json exception