getrebuild/rebuild
1
1
Fork 0
mirror of https://github.com/getrebuild/rebuild.git synced 2024-09-21 07:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: test mysql8.0

Browse source
This commit is contained in:
devezhao 2020-03-30 12:57:55 +08:00
parent 3ccf303433
commit 7f85d00bfa
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/rebuild/server/helper/AesPreferencesConfigurer.java
View file

@ -74,17 +74,17 @@ public class AesPreferencesConfigurer extends PreferencesPlaceholderConfigurer i
} }
} }
// PRIVATE // SPEC MYSQL PORT
String mysqlPort = System.getProperty("mysql.port"); String mysqlPort = System.getProperty("mysql.port");
if (StringUtils.isNotBlank(mysqlPort)) { if (StringUtils.isNotBlank(mysqlPort)) {
String dbUrl = props.getProperty("db.url"); String dbUrl = props.getProperty("db.url");
dbUrl = dbUrl.replace("3306", "4653"); dbUrl = dbUrl.replace("3306", mysqlPort);
props.put("db.url", dbUrl); props.put("db.url", dbUrl);
} }
// MUST NOT BE NULL // MUST NOT BE NULL
setIfEmpty(props, ConfigurableItem.CacheHost, "127.0.0.1"); setIfEmpty(props, ConfigurableItem.CacheHost, "127.0.0.1");
setIfEmpty(props, ConfigurableItem.CachePort, "16379"); setIfEmpty(props, ConfigurableItem.CachePort, "6379");
propsHold = (Properties) props.clone(); propsHold = (Properties) props.clone();

2
src/main/java/com/rebuild/server/metadata/entity/EasyMeta.java
View file

@ -351,7 +351,7 @@ public class EasyMeta implements BaseMeta {
* @return * @return
*/ */
public static String getLabel(BaseMeta meta) { public static String getLabel(BaseMeta meta) {
return meta.getDescription(); return StringUtils.defaultIfBlank(meta.getDescription(), meta.getName().toUpperCase());
} }
/** /**

6
src/main/resources/scripts/db-init.sql
View file

@ -1,6 +1,8 @@
-- !!! NOTICE !!! -- !!! MYSQL VERSION NOTICE !!!
-- IF YOU USING MYSQL 5.7 OR ABOVE, YOU SHOULD REMOVED THESE SQL_MODES IN my.cnf/my.ini FIRST. -- IN 5.7 OR ABOVE, YOU SHOULD REMOVED THESE SQL_MODES IN my.cnf/my.ini FIRST.
-- ONLY_FULL_GROUP_BY -- 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 -- #1 database/user
-- 首次使用请移除以下注释以创建数据库和用户 -- 首次使用请移除以下注释以创建数据库和用户