From 7f85d00bfa3ff679df14abbc3397b7b5ecf2af3b Mon Sep 17 00:00:00 2001 From: devezhao Date: Mon, 30 Mar 2020 12:57:55 +0800 Subject: [PATCH] fix: test mysql8.0 --- .../com/rebuild/server/helper/AesPreferencesConfigurer.java | 6 +++--- .../java/com/rebuild/server/metadata/entity/EasyMeta.java | 2 +- src/main/resources/scripts/db-init.sql | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/rebuild/server/helper/AesPreferencesConfigurer.java b/src/main/java/com/rebuild/server/helper/AesPreferencesConfigurer.java index 9132ce203..b5ebca9ed 100644 --- a/src/main/java/com/rebuild/server/helper/AesPreferencesConfigurer.java +++ b/src/main/java/com/rebuild/server/helper/AesPreferencesConfigurer.java @@ -74,17 +74,17 @@ public class AesPreferencesConfigurer extends PreferencesPlaceholderConfigurer i } } - // PRIVATE + // SPEC MYSQL PORT String mysqlPort = System.getProperty("mysql.port"); if (StringUtils.isNotBlank(mysqlPort)) { String dbUrl = props.getProperty("db.url"); - dbUrl = dbUrl.replace("3306", "4653"); + dbUrl = dbUrl.replace("3306", mysqlPort); props.put("db.url", dbUrl); } // MUST NOT BE NULL setIfEmpty(props, ConfigurableItem.CacheHost, "127.0.0.1"); - setIfEmpty(props, ConfigurableItem.CachePort, "16379"); + setIfEmpty(props, ConfigurableItem.CachePort, "6379"); propsHold = (Properties) props.clone(); diff --git a/src/main/java/com/rebuild/server/metadata/entity/EasyMeta.java b/src/main/java/com/rebuild/server/metadata/entity/EasyMeta.java index c339ed3ca..d094eae9c 100644 --- a/src/main/java/com/rebuild/server/metadata/entity/EasyMeta.java +++ b/src/main/java/com/rebuild/server/metadata/entity/EasyMeta.java @@ -351,7 +351,7 @@ public class EasyMeta implements BaseMeta { * @return */ public static String getLabel(BaseMeta meta) { - return meta.getDescription(); + return StringUtils.defaultIfBlank(meta.getDescription(), meta.getName().toUpperCase()); } /** diff --git a/src/main/resources/scripts/db-init.sql b/src/main/resources/scripts/db-init.sql index f333d412a..6d67d481b 100644 --- a/src/main/resources/scripts/db-init.sql +++ b/src/main/resources/scripts/db-init.sql @@ -1,6 +1,8 @@ --- !!! NOTICE !!! --- IF YOU USING MYSQL 5.7 OR ABOVE, YOU SHOULD REMOVED THESE SQL_MODES IN my.cnf/my.ini FIRST. +-- !!! MYSQL VERSION NOTICE !!! +-- IN 5.7 OR ABOVE, YOU SHOULD REMOVED THESE SQL_MODES IN my.cnf/my.ini FIRST. -- ONLY_FULL_GROUP_BY +-- IN 8.0 OR ABOVE, ONLY SUPPORTS mysql_native_password AUTHENTICATION MODE +-- default_authentication_plugin=mysql_native_password -- #1 database/user -- 首次使用请移除以下注释以创建数据库和用户