forked from github/dataease
Merge pull request #5470 from dataease/pr@dev@fixdatasource
fix: 初始化引擎失败,数组越界 #5452
This commit is contained in:
commit
db3939095d
@ -225,8 +225,11 @@ public class EngineService {
|
|||||||
;
|
;
|
||||||
mysqlConfiguration.setHost(matcher.group(1));
|
mysqlConfiguration.setHost(matcher.group(1));
|
||||||
mysqlConfiguration.setPort(Integer.valueOf(matcher.group(2)));
|
mysqlConfiguration.setPort(Integer.valueOf(matcher.group(2)));
|
||||||
mysqlConfiguration.setDataBase(matcher.group(3).split("\\?")[0]);
|
String[] databasePrams = matcher.group(3).split("\\?");
|
||||||
mysqlConfiguration.setExtraParams(matcher.group(3).split("\\?")[1]);
|
mysqlConfiguration.setDataBase(databasePrams[0]);
|
||||||
|
if(databasePrams.length == 2){
|
||||||
|
mysqlConfiguration.setExtraParams(databasePrams[1]);
|
||||||
|
}
|
||||||
if(StringUtils.isNotEmpty(mysqlConfiguration.getExtraParams()) && !mysqlConfiguration.getExtraParams().contains("connectionCollation")){
|
if(StringUtils.isNotEmpty(mysqlConfiguration.getExtraParams()) && !mysqlConfiguration.getExtraParams().contains("connectionCollation")){
|
||||||
mysqlConfiguration.setExtraParams(mysqlConfiguration.getExtraParams() + "&connectionCollation=utf8mb4_general_ci");
|
mysqlConfiguration.setExtraParams(mysqlConfiguration.getExtraParams() + "&connectionCollation=utf8mb4_general_ci");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user