diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..55c4780 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,17 @@ + + + + + mariadb + true + org.mariadb.jdbc.Driver + jdbc:mariadb://localhost:3306 + + + + + + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/src/beckend/build.gradle.kts b/src/beckend/build.gradle.kts index 6f713ae..4181c38 100644 --- a/src/beckend/build.gradle.kts +++ b/src/beckend/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1") implementation("io.projectreactor.kotlin:reactor-kotlin-extensions") implementation("tools.jackson.module:jackson-module-kotlin") - runtimeOnly("com.mysql:mysql-connector-j") + runtimeOnly("org.mariadb.jdbc:mariadb-java-client") testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.springframework.boot:spring-boot-starter-security-test") testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") diff --git a/src/beckend/src/main/resources/application.yaml b/src/beckend/src/main/resources/application.yaml index 13f2349..d1c8bd8 100644 --- a/src/beckend/src/main/resources/application.yaml +++ b/src/beckend/src/main/resources/application.yaml @@ -27,12 +27,12 @@ spring: jwt: key: 6846513216 expire-hours: 168 - + datasource: - url: jdbc:mysql://localhost:3306/kotlin_springboot + url: jdbc:mariadb://localhost:3306/kotlin_springboot + driver-class-name: org.mariadb.jdbc.Driver username: root - #password: 123456 - driver-class-name: com.mysql.cj.jdbc.Driver + password: 123456 mybatis-plus: type-handlers-package: com.github.sor2171.backend.config