diff --git a/README.md b/README.md index 097c7e74..958cd51d 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Configuration is saved in `config/application.properties`, spring loads this fil * The host and port of game title servers can be overritten in `allnet.server.host` and `allnet.server.port`. By default it will send the same host and port the client used the request this information. This will be sent to the game at booting and being used by following request. -* You can switch to MariaDB (or MySQL) database by commenting the Sqlite part. +* You can switch to MariaDB database by commenting the Sqlite part. * For some game, you might need to change some game specific config entries. ### Building diff --git a/build.gradle.kts b/build.gradle.kts index 227e753a..5d754b13 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,7 +39,6 @@ dependencies { testImplementation("org.springframework.security:spring-security-test") // Database - runtimeOnly("com.mysql:mysql-connector-j:8.3.0") runtimeOnly("org.mariadb.jdbc:mariadb-java-client:3.3.2") runtimeOnly("org.xerial:sqlite-jdbc:3.45.1.0") diff --git a/config/application.properties b/config/application.properties index 0c6c7bf6..c8db51f7 100644 --- a/config/application.properties +++ b/config/application.properties @@ -85,14 +85,6 @@ spring.jpa.properties.hibernate.dialect=org.hibernate.community.dialect.SQLiteDi #spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDB10Dialect #spring.datasource.hikari.maximum-pool-size=10 -########## For MySQL ########## -#spring.datasource.driver-class-name=com.mysql.jdbc.Driver -#spring.datasource.username= -#spring.datasource.password= -#spring.datasource.url=jdbc:mysql://localhost:3306/insert_db_name_here?allowPublicKeyRetrieval=true&useSSL=false -#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect -#spring.datasource.hikari.maximum-pool-size=10 - ################################ ## AquaNet Settings ################################ diff --git a/src/test/resources/application-testMysql.properties b/src/test/resources/application-testMysql.properties deleted file mode 100644 index b699c8a1..00000000 --- a/src/test/resources/application-testMysql.properties +++ /dev/null @@ -1,18 +0,0 @@ -# For testing -## AimeDb server setting -aimedb.server.enable=true -aimedb.server.port=22345 -allnet.server.host=localhost -allnet.server.port=80 -aimedb.server.address=127.0.0.1 -billing.server.enable=true -billing.server.port=8443 -## Http Server Port -server.port=80 -spring.flyway.clean-disabled=false -spring.flyway.locations=classpath:db/migration/mysql -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.username=aqua_test -spring.datasource.password=aqua_test -spring.datasource.url=jdbc:mysql://localhost:13306/aqua_test?useSSL=false&allowPublicKeyRetrieval=true -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect