center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' into pr@dev_eslint_auto_fix

Browse Source
This commit is contained in:
dataeaseShu 2022-10-11 16:54:24 +08:00
commit 6f133774e6
7 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>dataease-server</artifactId>
<groupId>io.dataease</groupId>
<version>1.15.0</version>
<version>1.16.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -205,7 +205,7 @@
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-interface</artifactId>
<version>1.15.0</version>
<version>1.16.0</version>
<exclusions>
<exclusion>
<artifactId>guava</artifactId>
@ -216,12 +216,12 @@
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-view</artifactId>
<version>1.15.0</version>
<version>1.16.0</version>
</dependency>
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-datasource</artifactId>
<version>1.15.0</version>
<version>1.16.0</version>
</dependency>
<!-- kettle及数据源依赖 -->
<dependency>

14
backend/src/main/java/io/dataease/dto/datasource/MysqlConfiguration.java
View File

@ -5,20 +5,30 @@ import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import java.util.Arrays;
import java.util.List;
@Getter
@Setter
public class MysqlConfiguration extends JdbcConfiguration {
private String driver = "com.mysql.jdbc.Driver";
private String extraParams = "characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true&zeroDateTimeBehavior=convertToNull";
private List<String> illegalParameters = Arrays.asList("autoDeserialize", "queryInterceptors", "statementInterceptors", "detectCustomCollations");
public String getJdbc() {
if(StringUtils.isEmpty(extraParams.trim())){
if (StringUtils.isEmpty(extraParams.trim())) {
return "jdbc:mysql://HOSTNAME:PORT/DATABASE"
.replace("HOSTNAME", getHost().trim())
.replace("PORT", getPort().toString().trim())
.replace("DATABASE", getDataBase().trim());
}else {
} else {
for (String illegalParameter : illegalParameters) {
if (getExtraParams().contains(illegalParameter)) {
throw new RuntimeException("Illegal parameter: " + illegalParameter);
}
}
return "jdbc:mysql://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS"
.replace("HOSTNAME", getHost().trim())
.replace("PORT", getPort().toString().trim())

2
frontend/package.json
View File

@ -1,6 +1,6 @@
{
"name": "dataease",
"version": "1.15.0",
"version": "1.16.0",
"description": "dataease front",
"private": true,
"scripts": {

2
frontend/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>dataease-server</artifactId>
<groupId>io.dataease</groupId>
<version>1.15.0</version>
<version>1.16.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
mobile/package.json
View File

@ -1,6 +1,6 @@
{
"name": "dataease-mobile",
"version": "1.15.0",
"version": "1.16.0",
"private": true,
"scripts": {
"serve": "npm run dev:h5",

2
mobile/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>dataease-server</artifactId>
<groupId>io.dataease</groupId>
<version>1.15.0</version>
<version>1.16.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.dataease</groupId>
<artifactId>dataease-server</artifactId>
<version>1.15.0</version>
<version>1.16.0</version>
<packaging>pom</packaging>
<parent>