From a21147ecafe1664257ee0ab87800184fc8f9da5a Mon Sep 17 00:00:00 2001 From: biezhi Date: Mon, 11 Sep 2017 12:56:45 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=A2=20blade=20is=20compatible=20with?= =?UTF-8?q?=20the=20old=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/tale/init/SqliteJdbc.java | 4 +--- src/main/java/com/tale/init/WebContext.java | 8 +++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/tale/init/SqliteJdbc.java b/src/main/java/com/tale/init/SqliteJdbc.java index e771910e..22b95926 100644 --- a/src/main/java/com/tale/init/SqliteJdbc.java +++ b/src/main/java/com/tale/init/SqliteJdbc.java @@ -47,14 +47,12 @@ public static void importSql(boolean devMode) { DB_PATH = Const.CLASSPATH + File.separatorChar + DB_NAME; DB_SRC = "jdbc:sqlite://" + DB_PATH; - System.out.println("CLASSPATH: " + Const.CLASSPATH); - System.out.println("DB_PATH: " + DB_PATH); - if (devMode) { DB_PATH = System.getProperty("user.dir") + "/" + DB_NAME; DB_SRC = "jdbc:sqlite://" + DB_PATH; } + LOGGER.info("blade dev mode: {}", devMode); LOGGER.info("load sqlite database path [{}]", DB_PATH); LOGGER.info("load sqlite database src [{}]", DB_SRC); diff --git a/src/main/java/com/tale/init/WebContext.java b/src/main/java/com/tale/init/WebContext.java index 85edde26..5cde72e7 100644 --- a/src/main/java/com/tale/init/WebContext.java +++ b/src/main/java/com/tale/init/WebContext.java @@ -52,7 +52,13 @@ public class WebContext implements BeanProcessor { public void preHandle(Blade blade) { Ioc ioc = blade.ioc(); - boolean devMode = blade.environment().getBoolean("app.devMode", blade.environment().getBoolean("app.dev", true)); + boolean devMode = true; + if(blade.environment().hasKey("app.dev")){ + devMode = blade.environment().getBoolean("app.dev", true); + } + if(blade.environment().hasKey("app.devMode")){ + devMode = blade.environment().getBoolean("app.devMode", true); + } SqliteJdbc.importSql(devMode); ExtSql2o sql2o = new ExtSql2o(SqliteJdbc.DB_SRC);