be

getrebuild · May 21, 2024 · 5a93f2f · 5a93f2f
1 parent 62e7659
commit 5a93f2f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/main/java/com/rebuild/core/support/setup/Installer.java b/src/main/java/com/rebuild/core/support/setup/Installer.java
@@ -60,7 +60,9 @@
 import java.util.Properties;
 import java.util.TimeZone;
 
-import static com.rebuild.core.support.ConfigurationItem.*;
+import static com.rebuild.core.support.ConfigurationItem.CacheHost;
+import static com.rebuild.core.support.ConfigurationItem.CachePassword;
+import static com.rebuild.core.support.ConfigurationItem.CachePort;
 
 /**
  * 系统安装
@@ -227,9 +229,10 @@ public Connection getConnection(String dbName) throws SQLException {
         try {
             return DriverManager.getConnection(
                     props.getProperty("db.url"), props.getProperty("db.user"), props.getProperty("db.passwd"));
-
         } catch (SQLException ex) {
-            allowPublicKeyRetrieval = ex.getLocalizedMessage().contains("Public Key Retrieval is not allowed");
+
+            // Plugin 'mysql_native_password' is not loaded
+            allowPublicKeyRetrieval = ex.getMessage().contains("Public Key Retrieval is not allowed");
             if (allowPublicKeyRetrieval) {
                 props = buildConnectionProps(dbName);
                 return DriverManager.getConnection(
@@ -306,7 +309,7 @@ protected boolean installDatabase() {
             try (Connection ignored = getConnection(null)) {
                 // NOOP
             } catch (SQLException e) {
-                if (!e.getLocalizedMessage().contains("Unknown database")) {
+                if (!e.getMessage().contains("Unknown database")) {
                     throw new SetupException(e);
                 }
 
@@ -328,9 +331,9 @@ protected boolean installDatabase() {
         // 初始化数据库
         try (Connection conn = getConnection(null)) {
             int affetced = 0;
-            for (final String sql : getDbInitScript()) {
+            for (final String s : getDbInitScript()) {
                 try (Statement stmt = conn.createStatement()) {
-                    stmt.execute(sql);
+                    stmt.execute(s);
                     affetced++;
                 }
             }

diff --git a/src/main/java/com/rebuild/web/admin/setup/InstallController.java b/src/main/java/com/rebuild/web/admin/setup/InstallController.java
@@ -102,7 +102,7 @@ public RespBody testConnection(HttpServletRequest request) {
             return RespBody.ok(okMsg);
 
         } catch (SQLException ex) {
-            if (ex.getLocalizedMessage().contains("Unknown database")) {
+            if (ex.getMessage().contains("Unknown database")) {
                 String okMsg = Language.L("连接成功 : 数据库 **%s** 不存在，系统将自动创建", dbProps.getString("dbName"));
                 return RespBody.ok(okMsg);
             } else {