Skip to content

Commit 87be72b

Browse files
committed
chore(config): add database configuration to application settings
1 parent d38c9f6 commit 87be72b

5 files changed

Lines changed: 41 additions & 3 deletions

File tree

build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ dependencyManagement {
6464
dependency libraries.springBootStarterMail
6565
dependency libraries.springBootConfigurationProcessor
6666
dependency libraries.springSecurityJose
67+
dependency libraries.springBootStarterJdbc
68+
dependency libraries.springBootStarterValidation
6769
dependency libraries.jacksonDatabind
6870
dependency libraries.jacksonKotlin
6971
dependency libraries.nimbusJoseJwt
@@ -74,6 +76,9 @@ dependencyManagement {
7476
dependency libraries.commonsIO
7577

7678
dependency libraries.mybatisPlus
79+
dependency libraries.mysql
80+
dependency libraries.flyway
81+
dependency libraries.flywayMysql
7782

7883
dependency libraries.opensaml
7984

dependencies.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ versions.mybatisPlus = "3.5.3.1"
2020
versions.mysql = "8.0.33"
2121

2222
versions.flyway = "5.2.4"
23+
versions.flywayMysql = "11.16.0"
2324

2425
versions.jackson = "2.17.0"
2526
versions.guava = "32.1.2-jre"
@@ -64,6 +65,7 @@ libraries.springBootStarterAop = "org.springframework.boot:spring-boot-starter-a
6465
libraries.springBootStarterMail = "org.springframework.boot:spring-boot-starter-mail:${versions.springBoot}"
6566
libraries.springBootConfigurationProcessor = "org.springframework.boot:spring-boot-configuration-processor:${versions.springBoot}"
6667
libraries.springSecurityJose = "org.springframework.security:spring-security-oauth2-jose:${versions.springSecurity}"
68+
libraries.springBootStarterValidation = "org.springframework.boot:spring-boot-starter-validation:${versions.springBoot}"
6769
libraries.springBootStarterTest = "org.springframework.boot:spring-boot-starter-test:${versions.springBoot}"
6870

6971
//openAPI
@@ -81,7 +83,7 @@ libraries.mysql = "com.mysql:mysql-connector-j:${versions.mysql}"
8183

8284
// Flyway
8385
libraries.flyway = "org.flywaydb:flyway-core:${versions.flyway}"
84-
libraries.flywayMysql = "org.flywaydb:flyway-mysql:${versions.flyway}"
86+
libraries.flywayMysql = "org.flywaydb:flyway-mysql:${versions.flywayMysql}"
8587

8688
// Jackson / JSON
8789
libraries.jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"

server/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ dependencies {
1111
implementation project(':simpleauth0-audit')
1212
implementation project(':simpleauth0-openapi')
1313
implementation libraries.springBootStarterWeb
14+
implementation libraries.springBootStarterJdbc
15+
implementation libraries.springBootStarterValidation
1416
implementation libraries.mybatisPlus
15-
17+
implementation libraries.mysql
18+
implementation libraries.flyway
19+
implementation libraries.flywayMysql
1620
}

server/src/main/java/io/github/simpleauth0/SimpleAuth0ServerApplication.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import io.github.simpleauth0.audit.configuration.EnableAuditLog;
44
import io.github.simpleauth0.security.configuration.EnableAuthentication;
5+
import org.mybatis.spring.annotation.MapperScan;
56
import org.springframework.boot.SpringApplication;
67
import org.springframework.boot.autoconfigure.SpringBootApplication;
78

@@ -12,6 +13,7 @@
1213
@EnableAuditLog
1314
@EnableAuthentication
1415
@SpringBootApplication
16+
@MapperScan(basePackages = "io.github.simpleauth0.repository.dao")
1517
public class SimpleAuth0ServerApplication {
1618

1719
public static void main(String[] args) {

server/src/main/resources/application.yml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
server:
2-
port: 9095
2+
port: ${SERVER_PORT:9095}
3+
servlet:
4+
context-path: /api/v1
5+
6+
spring:
7+
datasource:
8+
driver-class-name: com.mysql.cj.jdbc.Driver
9+
url: ${DATASOURCE_URL:jdbc:mysql://localhost:3306/simpleauth0?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai}
10+
username: ${DATASOURCE_USERNAME:root}
11+
password: ${DATASOURCE_PASSWORD:123456}
12+
hikari:
13+
minimum-idle: 5 # 最小空闲连接数
14+
maximum-pool-size: 20 # 最大连接池大小
15+
idle-timeout: 30000 # 连接空闲超时时间(毫秒)
16+
max-lifetime: 1800000 # 连接最大存活时间(毫秒)
17+
connection-timeout: 30000 # 获取连接的超时时间(毫秒)
18+
pool-name: SimpleAuth0kariCP # 连接池名称(可选)
19+
flyway:
20+
baseline-on-migrate: true
21+
baseline-description: <<Flyway Baseline>>
22+
enabled: true
23+
locations: classpath:db/migration
24+
validate-on-migrate: true
25+
fail-on-missing-locations: true
26+
27+
328
simpleauth0:
429
token:
530
opaque:

0 commit comments

Comments
 (0)