Merge pull request #12104 from 446541492/master

Fix #12103 

非常感谢 🍇 

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

@@ -44,12 +44,14 @@ import org.json.JSONObject;
  * @version 1.1.1.7, Nov 20, 2015
  * @since 0.3.1
  */
-public final class ArticleCommentReplyNotifier extends AbstractEventListener<JSONObject> {
+public final class ArticleCommentReplyNotifier extends
+		AbstractEventListener<JSONObject> {
 
 	/**
 	 * Logger.
 	 */
-    private static final Logger LOGGER = Logger.getLogger(ArticleCommentReplyNotifier.class.getName());
+	private static final Logger LOGGER = Logger
+			.getLogger(ArticleCommentReplyNotifier.class.getName());
 
 	/**
 	 * Mail service.
@@ -62,73 +64,109 @@ public final class ArticleCommentReplyNotifier extends AbstractEventListener<JSO
 		final JSONObject comment = eventData.optJSONObject(Comment.COMMENT);
 		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()});
-        final String originalCommentId = comment.optString(Comment.COMMENT_ORIGINAL_COMMENT_ID);
+		LOGGER.log(
+				Level.DEBUG,
+				"Processing an event[type={0}, data={1}] in listener[className={2}]",
+				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));
+			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");
+		 LOGGER.log(Level.INFO,
+		 "Solo runs on local server, so should not send mail");
 		
 		 return;
 		 }
 
 		final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
-        final PreferenceQueryService preferenceQueryService = beanManager.getReference(PreferenceQueryService.class);
+		final PreferenceQueryService preferenceQueryService = beanManager
+				.getReference(PreferenceQueryService.class);
 
-        final CommentRepository commentRepository = beanManager.getReference(CommentRepositoryImpl.class);
+		final CommentRepository commentRepository = beanManager
+				.getReference(CommentRepositoryImpl.class);
 
 		try {
-            final String commentEmail = comment.getString(Comment.COMMENT_EMAIL);
-            final JSONObject originalComment = commentRepository.get(originalCommentId);
-            final String originalCommentEmail = originalComment.getString(Comment.COMMENT_EMAIL);
+			final String commentEmail = comment
+					.getString(Comment.COMMENT_EMAIL);
+			final JSONObject originalComment = commentRepository
+					.get(originalCommentId);
+			final String originalCommentEmail = originalComment
+					.getString(Comment.COMMENT_EMAIL);
 
 			if (originalCommentEmail.equalsIgnoreCase(commentEmail)) {
 				return;
 			}
 
-            final JSONObject preference = preferenceQueryService.getPreference();
+			final JSONObject preference = preferenceQueryService
+					.getPreference();
 
 			if (null == preference) {
 				throw new EventException("Not found preference");
 			}
 
-            final String blogTitle = preference.getString(Option.ID_C_BLOG_TITLE);
-            final String adminEmail = preference.getString(Option.ID_C_ADMIN_EMAIL);
+			final String blogTitle = preference
+					.getString(Option.ID_C_BLOG_TITLE);
+			final String adminEmail = preference
+					.getString(Option.ID_C_ADMIN_EMAIL);
 
-            final String commentContent = comment.getString(Comment.COMMENT_CONTENT);
-            final String commentSharpURL = comment.getString(Comment.COMMENT_SHARP_URL);
+			final String commentContent = comment
+					.getString(Comment.COMMENT_CONTENT);
+			final String commentSharpURL = comment
+					.getString(Comment.COMMENT_SHARP_URL);
 			final Message message = new Message();
 
 			message.setFrom(adminEmail);
 			message.addRecipient(originalCommentEmail);
-            final JSONObject replyNotificationTemplate = preferenceQueryService.getReplyNotificationTemplate();
-            final String mailSubject = replyNotificationTemplate.getString("subject").replace("${blogTitle}", blogTitle);
+			final JSONObject replyNotificationTemplate = preferenceQueryService
+					.getReplyNotificationTemplate();
 		
-            message.setSubject(mailSubject);
-            final String articleTitle = article.getString(Article.ARTICLE_TITLE);
-            final String articleLink = Latkes.getServePath() + article.getString(Article.ARTICLE_PERMALINK);
+			final String articleTitle = article
+					.getString(Article.ARTICLE_TITLE);
+			final String articleLink = Latkes.getServePath()
+					+ article.getString(Article.ARTICLE_PERMALINK);
 			final String commentName = comment.getString(Comment.COMMENT_NAME);
 			final String commentURL = comment.getString(Comment.COMMENT_URL);
 			String commenter;
 
 			if (!"http://".equals(commentURL)) {
-                commenter = "<a target=\"_blank\" " + "href=\"" + commentURL + "\">" + commentName + "</a>";
+				commenter = "<a target=\"_blank\" " + "href=\"" + commentURL
+						+ "\">" + commentName + "</a>";
 			} else {
 				commenter = commentName;
 			}
+			final String mailSubject = replyNotificationTemplate.getString(
+					"subject").replace("${postLink}", articleLink)
+					.replace("${postTitle}", articleTitle)
+					.replace("${replier}", commenter)
+					.replace("${blogTitle}", blogTitle)
+					.replace("${replyURL}",
+							Latkes.getServePath() + commentSharpURL)
+					.replace("${replyContent}", commentContent);
 
-            final String mailBody = replyNotificationTemplate.getString("body").replace("${postLink}", articleLink).replace("${postTitle}", articleTitle).replace("${replier}", commenter).replace("${replyURL}", Latkes.getServePath() + commentSharpURL).replace(
-                    "${replyContent}", commentContent);
+			message.setSubject(mailSubject);
+			final String mailBody = replyNotificationTemplate
+					.getString("body")
+					.replace("${postLink}", articleLink)
+					.replace("${postTitle}", articleTitle)
+					.replace("${replier}", commenter)
+					.replace("${blogTitle}", blogTitle)
+					.replace("${replyURL}",
+							Latkes.getServePath() + commentSharpURL)
+					.replace("${replyContent}", commentContent);
 
 			message.setHtmlBody(mailBody);
-            LOGGER.log(Level.DEBUG, "Sending a mail[mailSubject={0}, mailBody=[{1}] to [{2}]",
-                    new Object[]{mailSubject, mailBody, originalCommentEmail});
+			LOGGER.log(
+					Level.DEBUG,
+					"Sending a mail[mailSubject={0}, mailBody=[{1}] to [{2}]",
+					new Object[] { mailSubject, mailBody, originalCommentEmail });
 			mailService.send(message);
 
 		} catch (final Exception e) {

src/main/resources/log4j.properties

@@ -20,18 +20,29 @@
 # Author: Liang Ding
 #
 
-log4j.rootLogger=INFO, stdout
-
+log4j.rootLogger=INFO,stdout,MYFILE
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%-5p]-[%d{yyyy-MM-dd HH:mm:ss}]-[%c:%L]: %m%n
 
-log4j.logger.org.b3log.solo=INFO
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=%d %5p (%c:%L) - %m%n
+
+# Print only messages of level ERROR or above in the package noModule.
+log4j.logger.noModule=FATAL
+
+log4j.logger.org.b3log.solo=INFO,MYFILE
+
+log4j.logger.org.b3log.latke=INFO,MYFILE
+log4j.logger.org.b3log.latke.util.freemarker.Templates=ERROR,MYFILE
+
+log4j.logger.org.eclipse.jetty=WARN,MYFILE
+log4j.logger.freemarker=WARN,MYFILE
+log4j.logger.com.mchange=WARN,MYFILE
 
-log4j.logger.org.b3log.latke=ERROR
-log4j.logger.org.b3log.latke.util.freemarker.Templates=ERROR
 
-log4j.logger.org.eclipse.jetty=WARN
-log4j.logger.freemarker=WARN
-log4j.logger.com.mchange=WARN
+log4j.appender.MYFILE=org.apache.log4j.DailyRollingFileAppender
+#log4j.appender.MYFILE.File=/data/logs/myblog.log
+log4j.appender.MYFILE.File=/logs/myblog.log
+log4j.appender.MYFILE.DatePattern=.yyyy-MM-dd
+log4j.appender.MYFILE.layout=org.apache.log4j.PatternLayout 
+log4j.appender.MYFILE.layout.ConversionPattern=[%d{HH\:mm\:ss}] %p %c - %m%n
\ No newline at end of file