Merge remote-tracking branch 'origin/main' into main

WeBankFinTech · Mar 2, 2022 · 2293058 · 2293058
2 parents 452ad86 + 3706707
commit 2293058
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -68,6 +68,7 @@
  <aspectj.version>1.9.5</aspectj.version>
  <xstream.version>1.4.19</xstream.version>
  <jobmanager.version>0.1.0</jobmanager.version>
+ <mysql.connector.version>5.1.47</mysql.connector.version>
  </properties>
 
 

diff --git a/streamis-jobmanager/streamis-job-manager/streamis-job-manager-base/pom.xml b/streamis-jobmanager/streamis-job-manager/streamis-job-manager-base/pom.xml
@@ -34,6 +34,11 @@
  </properties>
 
  <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql.connector.version}</version>
+ </dependency>
  <dependency>
  <groupId>org.apache.linkis</groupId>
  <artifactId>linkis-mybatis</artifactId>

diff --git a/streamis-server/src/main/resources/application.yml b/streamis-server/src/main/resources/application.yml
@@ -6,6 +6,11 @@ spring:
  mvc:
  servlet:
  path: /api/rest_j/v1
+ servlet:
+ multipart:
+ enabled: true
+ max-file-size: 500MB
+ max-request-size: 500MB
 
 eureka:
  client: