Merge pull request otale#475 from otale/develop

merge
liforgithub · Oct 25, 2018 · 11e717f · 11e717f
2 parents f2d77fc + e432013
commit 11e717f
Show file tree

Hide file tree

Showing 12 changed files with 365 additions and 319 deletions.
diff --git a/src/main/java/com/tale/bootstrap/Bootstrap.java b/src/main/java/com/tale/bootstrap/Bootstrap.java
@@ -2,10 +2,10 @@
 
 import com.blade.Blade;
 import com.blade.Environment;
-import com.blade.event.BeanProcessor;
 import com.blade.ioc.Ioc;
 import com.blade.ioc.annotation.Bean;
 import com.blade.ioc.annotation.Inject;
+import com.blade.kit.JsonKit;
 import com.blade.kit.StringKit;
 import com.blade.loader.BladeLoader;
 import com.blade.mvc.view.template.JetbrickTemplateEngine;
@@ -15,6 +15,7 @@
 import com.tale.extension.Commons;
 import com.tale.extension.JetTag;
 import com.tale.extension.Theme;
+import com.tale.model.dto.RememberMe;
 import com.tale.model.dto.Types;
 import com.tale.service.OptionsService;
 import com.tale.service.SiteService;
@@ -30,6 +31,7 @@
 import java.util.List;
 
 import static com.tale.bootstrap.TaleConst.CLASSPATH;
+import static com.tale.bootstrap.TaleConst.OPTION_SAFE_REMEMBER_ME;
 
 /**
  * Tale初始化进程
@@ -72,7 +74,7 @@ public void load(Blade blade) {
  // 扫描主题下面的所有自定义宏
  String themeDir = CLASSPATH + "templates" + File.separatorChar + "themes";
  File[] dir = new File(themeDir).listFiles();
- if(null != dir){
+ if (null != dir) {
  for (File f : dir) {
  if (f.isDirectory() && Files.exists(Paths.get(f.getPath() + File.separatorChar + "macros.html"))) {
  String macroName = File.separatorChar + "themes" + File.separatorChar + f.getName() + File.separatorChar + "macros.html";
@@ -100,7 +102,6 @@ public void load(Blade blade) {
  TaleConst.ENABLED_CDN = environment.getBoolean("app.enableCdn", false);
  TaleConst.MAX_FILE_SIZE = environment.getInt("app.max-file-size", 20480);
 
- TaleConst.AES_SALT = environment.get("app.salt", "012c456789abcdef");
  TaleConst.OPTIONS.addAll(optionsService.getOptions());
  String ips = TaleConst.OPTIONS.get(Types.BLOCK_IPS, "");
  if (StringKit.isNotBlank(ips)) {
@@ -110,6 +111,12 @@ public void load(Blade blade) {
  TaleConst.INSTALLED = Boolean.TRUE;
  }
 
+ String rememberToken = optionsService.getOption(OPTION_SAFE_REMEMBER_ME);
+ if (StringKit.isNotEmpty(rememberToken)) {
+ RememberMe rememberMe = JsonKit.formJson(rememberToken, RememberMe.class);
+ TaleConst.REMEMBER_TOKEN = rememberMe.getToken();
+ }
+
  BaseController.THEME = "themes/" + Commons.site_option("site_theme");
 
  TaleConst.BCONF = environment;

diff --git a/src/main/java/com/tale/bootstrap/TaleConst.java b/src/main/java/com/tale/bootstrap/TaleConst.java
@@ -17,13 +17,14 @@ public class TaleConst {
 
  public static final String CLASSPATH = new File(AdminApiController.class.getResource("/").getPath()).getPath() + File.separatorChar;
 
- public static final String USER_IN_COOKIE = "S_L_ID";
- public static String AES_SALT = "0123456789abcdef";
- public static String LOGIN_SESSION_KEY = "login_user";
- public static Environment OPTIONS = Environment.of(new HashMap<>());
- public static Boolean INSTALLED = false;
- public static Boolean ENABLED_CDN = true;
- public static Environment BCONF = null;
+ public static final String REMEMBER_IN_COOKIE = "remember_me";
+ public static final String LOGIN_ERROR_COUNT = "login_error_count";
+ public static String LOGIN_SESSION_KEY = "login_user";
+ public static String REMEMBER_TOKEN = "";
+ public static Environment OPTIONS = Environment.of(new HashMap<>());
+ public static Boolean INSTALLED = false;
+ public static Boolean ENABLED_CDN = true;
+ public static Environment BCONF = null;
 
  /**
  * 最大页码
@@ -114,4 +115,6 @@ public class TaleConst {
  public static final String OPTION_ALLOW_INSTALL = "allow_install";
  public static final String OPTION_ALLOW_COMMENT_AUDIT = "allow_comment_audit";
  public static final String OPTION_ALLOW_CLOUD_CDN = "allow_cloud_CDN";
+ public static final String OPTION_SAFE_REMEMBER_ME = "safe_remember_me";
+
 }