Server: 升级 mysql-connector-java 驱动；兼容 MySQL 8；打包 apijson-orm-3.5.8.jar

TommyLemon · TommyLemon · commit c6e3eea60f81 · 2019-06-07T13:59:24.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONBoot/libs/apijson-orm-3.5.8.jar b/APIJSON-Java-Server/APIJSONBoot/libs/apijson-orm-3.5.8.jar
diff --git a/APIJSON-Java-Server/APIJSONBoot/pom.xml b/APIJSON-Java-Server/APIJSONBoot/pom.xml
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.40</version>
+			<version>8.0.11</version>
 		</dependency>
 
 		<dependency>
diff --git a/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoSQLConfig.java b/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoSQLConfig.java
@@ -40,7 +40,7 @@ public class DemoSQLConfig extends AbstractSQLConfig {
 
 	
 	static {
-		//默认模式名
+		//TODO 默认模式名，改成你自己的
 		DEFAULT_SCHEMA = "sys";
 		
 		//表名映射，隐藏真实表名，对安全要求很高的表可以这么做
@@ -78,6 +78,11 @@ public String getUserIdKey(String schema, String table) {
 	//		return db == null ? DATABASE_POSTGRESQL : db;
 	//	}
 
+	@Override
+	public String getDBVersion() {
+		return "5.7.22"; //"8.0.11"; //MYSQL 8 和 7 使用的 JDBC 配置不一样
+	}
+	
 	@Override
 	public String getDBUri() {
 		//TODO 改成你自己的，TiDB 默认端口为 4000
diff --git a/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoSQLExecutor.java b/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoSQLExecutor.java
@@ -49,17 +49,30 @@ public class DemoSQLExecutor extends AbstractSQLExecutor {
 
 	static {
 		try { //加载驱动程序
-			Class.forName("com.mysql.jdbc.Driver");
-			Log.d(TAG, "成功加载 MySQL 驱动！");
+			Log.d(TAG, "尝试加载 MySQL 8 驱动 <<<<<<<<<<<<<<<<<<<<< ");
+			Class.forName("com.mysql.cj.jdbc.Driver");
+			Log.d(TAG, "成功加载 MySQL 8 驱动！>>>>>>>>>>>>>>>>>>>>>");
 		} catch (ClassNotFoundException e) {
+			Log.e(TAG, "加载 MySQL 8 驱动失败，请检查 pom.xml 中 mysql-connector-java 版本是否存在以及可用 ！！！");
 			e.printStackTrace();
+
+			try { //加载驱动程序
+				Log.d(TAG, "尝试加载 MySQL 7 及以下版本的 驱动 <<<<<<<<<<<<<<<<<<<<< ");
+				Class.forName("com.mysql.jdbc.Driver");
+				Log.d(TAG, "成功加载 MySQL 7 及以下版本的 驱动！>>>>>>>>>>>>>>>>>>>>> ");
+			} catch (ClassNotFoundException e2) {
+				Log.e(TAG, "加载 MySQL 7 及以下版本的 驱动失败，请检查 pom.xml 中 mysql-connector-java 版本是否存在以及可用 ！！！");
+				e2.printStackTrace();
+			}
 		}
 
 		try { //加载驱动程序
+			Log.d(TAG, "尝试加载 PostgresSQL 驱动 <<<<<<<<<<<<<<<<<<<<< ");
 			Class.forName("org.postgresql.Driver");
-			Log.d(TAG, "成功加载 PostgresSQL 驱动！");
+			Log.d(TAG, "成功加载 PostgresSQL 驱动！>>>>>>>>>>>>>>>>>>>>> ");
 		} catch (ClassNotFoundException e) {
 			e.printStackTrace();
+			Log.e(TAG, "加载 PostgresSQL 驱动失败，请检查 libs 目录中 postgresql.jar 版本是否存在以及可用 ！！！");
 		}
 	}
 
@@ -95,8 +108,23 @@ public PreparedStatement getStatement(@NotNull SQLConfig config) throws Exceptio
 				connection = DriverManager.getConnection(config.getDBUri(), config.getDBAccount(), config.getDBPassword());
 			}
 			else {
-				connection = DriverManager.getConnection(config.getDBUri() + "?useUnicode=true&characterEncoding=UTF-8&user="
-						+ config.getDBAccount() + "&password=" + config.getDBPassword());
+				int v;
+				try {
+					String[] vs = config.getDBVersion().split("[.]");
+					v = Integer.parseInt(vs[0]);
+				} catch (Exception e) {
+					v = 1;
+					Log.e(TAG, "getStatement  try { String[] vs = config.getDBVersion().split([.]); ... >> } catch (Exception e) {\n" + e.getMessage());
+				}
+				
+				if (v >= 8) {
+					connection = DriverManager.getConnection(config.getDBUri() + "?userSSL=false&serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&user="
+							+ config.getDBAccount() + "&password=" + config.getDBPassword());
+				}
+				else {
+					connection = DriverManager.getConnection(config.getDBUri() + "?useUnicode=true&characterEncoding=UTF-8&user="
+							+ config.getDBAccount() + "&password=" + config.getDBPassword());
+				}
 			}
 			connectionMap.put(config.getDatabase(), connection);
 		}
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/SQLConfig.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/SQLConfig.java
@@ -44,6 +44,12 @@ public interface SQLConfig {
 	String getUserIdKey();
 	
 	
+	/**获取数据库版本号，可通过判断版本号解决一些 JDBC 驱动连接数据库的兼容问题
+	 * MYSQL: 8.0, 5.7, 5.6 等； PostgreSQL: 11, 10, 9.6 等
+	 * @return
+	 */
+	String getDBVersion();
+	
 	/**获取数据库地址
 	 * @return
 	 */
