diff --git a/electrmangnetic/pom.xml b/electrmangnetic/pom.xml index bbf3e5f..53dc820 100644 --- a/electrmangnetic/pom.xml +++ b/electrmangnetic/pom.xml @@ -63,10 +63,14 @@ mybatis-plus-spring-boot3-starter 3.5.7 + + + + + - mysql - mysql-connector-java - 8.0.31 + org.mariadb.jdbc + mariadb-java-client com.electromagnetic.data diff --git a/electrmangnetic/src/main/resources/application.properties b/electrmangnetic/src/main/resources/application.properties index cfedcd9..b83f0d8 100644 --- a/electrmangnetic/src/main/resources/application.properties +++ b/electrmangnetic/src/main/resources/application.properties @@ -5,10 +5,12 @@ spring.servlet.multipart.max-file-size=500MB spring.servlet.multipart.max-request-size=500MB spring.mvc.async.request-timeout=3600000 #mysql -spring.datasource.url=jdbc:mysql://139.196.179.195:3306/em_data_dev?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true +spring.datasource.url=jdbc:mariadb://139.196.179.195:3306/em_data_dev?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&sslModel=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true +spring.datasource.driver-class-name=org.mariadb.jdbc.Driver +#spring.datasource.url=jdbc:mysql://139.196.179.195:3306/em_data_dev?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.username=em_user_dev spring.datasource.password=123456 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.type=com.alibaba.druid.pool.DruidDataSource # es spring.elasticsearch.password=123456