Commit 0585cf4b authored by Liang Ding's avatar Liang Ding

🎨 #12690

parent d232a94a
...@@ -24,8 +24,6 @@ import org.b3log.latke.servlet.RequestContext; ...@@ -24,8 +24,6 @@ import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.annotation.Before; import org.b3log.latke.servlet.annotation.Before;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.TextHtmlRenderer; import org.b3log.latke.servlet.renderer.TextHtmlRenderer;
import org.b3log.solo.mail.MailService;
import org.b3log.solo.mail.MailServiceFactory;
import org.b3log.solo.model.Option; import org.b3log.solo.model.Option;
import org.b3log.solo.repository.ArticleRepository; import org.b3log.solo.repository.ArticleRepository;
import org.b3log.solo.repository.TagArticleRepository; import org.b3log.solo.repository.TagArticleRepository;
...@@ -40,7 +38,7 @@ import org.json.JSONObject; ...@@ -40,7 +38,7 @@ import org.json.JSONObject;
* Provides patches on some special issues. * Provides patches on some special issues.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.2.0.20, Jan 28, 2019 * @version 1.2.0.21, Mar 3, 2019
* @since 0.3.1 * @since 0.3.1
*/ */
@RequestProcessor @RequestProcessor
...@@ -52,11 +50,6 @@ public class RepairConsole { ...@@ -52,11 +50,6 @@ public class RepairConsole {
*/ */
private static final Logger LOGGER = Logger.getLogger(RepairConsole.class); private static final Logger LOGGER = Logger.getLogger(RepairConsole.class);
/**
* Mail service.
*/
private static final MailService MAIL_SVC = MailServiceFactory.getMailService();
/** /**
* Preference query service. * Preference query service.
*/ */
......
...@@ -54,7 +54,7 @@ import java.util.ResourceBundle; ...@@ -54,7 +54,7 @@ import java.util.ResourceBundle;
* Solo utilities. * Solo utilities.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.7.0.0, Feb 7, 2019 * @version 1.7.0.1, Mar 3, 2019
* @since 2.8.0 * @since 2.8.0
*/ */
public final class Solos { public final class Solos {
...@@ -64,11 +64,6 @@ public final class Solos { ...@@ -64,11 +64,6 @@ public final class Solos {
*/ */
private static final Logger LOGGER = Logger.getLogger(Solos.class); private static final Logger LOGGER = Logger.getLogger(Solos.class);
/**
* Mail configuration (mail.properties).
*/
private static final ResourceBundle mailConf = ResourceBundle.getBundle("mail");
/** /**
* Favicon API. * Favicon API.
*/ */
...@@ -426,22 +421,6 @@ public final class Solos { ...@@ -426,22 +421,6 @@ public final class Solos {
return !(null != currentUser && !Role.VISITOR_ROLE.equals(currentUser.optString(User.USER_ROLE))); return !(null != currentUser && !Role.VISITOR_ROLE.equals(currentUser.optString(User.USER_ROLE)));
} }
/**
* Whether user configures the mail.properties.
*
* @return {@code true} if user configured, returns {@code false} otherwise
*/
public static boolean isMailConfigured() {
try {
return StringUtils.isNotBlank(mailConf.getString("mail.user")) &&
StringUtils.isNotBlank(mailConf.getString("mail.password")) &&
StringUtils.isNotBlank(mailConf.getString("mail.smtp.host")) &&
StringUtils.isNotBlank(mailConf.getString("mail.smtp.port"));
} catch (final Exception e) {
return false;
}
}
/** /**
* Checks the specified request is made from a mobile device. * Checks the specified request is made from a mobile device.
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment