diff --git a/pom.xml b/pom.xml index fad6b02..5106b8d 100644 --- a/pom.xml +++ b/pom.xml @@ -251,15 +251,10 @@ - - org.xerial - sqlite-jdbc - 3.28.0 - io.github.willena sqlite-jdbc - 3.35.4 + 3.35.5.1 diff --git a/src/main/java/minsecurity/identity/persist/sqlite/Sqlite.java b/src/main/java/minsecurity/identity/persist/sqlite/Sqlite.java index e87dee2..460c0e5 100644 --- a/src/main/java/minsecurity/identity/persist/sqlite/Sqlite.java +++ b/src/main/java/minsecurity/identity/persist/sqlite/Sqlite.java @@ -1,9 +1,11 @@ package minsecurity.identity.persist.sqlite; +import org.sqlite.mc.SQLiteMCConfig; import org.sqlite.mc.SQLiteMCSqlCipherConfig; import java.io.File; import java.sql.*; +import java.util.Properties; /* * @Author: zhengqi wu @@ -80,8 +82,12 @@ public class Sqlite { new File(db_path).mkdirs(); } String real_db_file = db_path + db_file; + // 兼容sqlcipher - c = DriverManager.getConnection("jdbc:sqlite:" + real_db_file, SQLiteMCSqlCipherConfig.getV4Defaults().withKey(passwd2HexKey()).toProperties()); + SQLiteMCSqlCipherConfig sqlCipherConfig = SQLiteMCSqlCipherConfig.getV4Defaults(); + SQLiteMCConfig config = sqlCipherConfig.withKey(passwd2HexKey()); + Properties properties = config.toProperties(); + c = DriverManager.getConnection("jdbc:sqlite:" + real_db_file, properties); stmt = c.createStatement(); stmt.executeUpdate(table_create); stmt.close();