feat(登录): 添加路由守卫和异步导航处理
fix(表单验证): 为用户、角色和菜单管理添加表单验证规则 test(e2e): 增加页面导航超时时间和网络空闲等待 refactor(数据库): 移除Flyway配置并更新数据源配置
This commit is contained in:
@@ -14,6 +14,13 @@ spring:
|
||||
max-idle-time: 30m
|
||||
max-life-time: 1h
|
||||
acquire-timeout: 5s
|
||||
datasource:
|
||||
url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:55432}/${DB_NAME:manage_system}
|
||||
username: ${DB_USERNAME:postgres}
|
||||
password: ${DB_PASSWORD:postgres}
|
||||
driver-class-name: org.postgresql.Driver
|
||||
flyway:
|
||||
enabled: false
|
||||
security:
|
||||
user:
|
||||
name: disabled
|
||||
|
||||
-30
@@ -1,30 +0,0 @@
|
||||
package cn.novalon.manage.db.config;
|
||||
|
||||
import org.flywaydb.core.Flyway;
|
||||
import org.springframework.boot.autoconfigure.flyway.FlywayProperties;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Profile;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
|
||||
@Configuration
|
||||
public class FlywayConfig {
|
||||
|
||||
@Bean
|
||||
@Profile("!test")
|
||||
public Flyway flyway(DataSource dataSource, FlywayProperties flywayProperties) {
|
||||
Flyway flyway = Flyway.configure()
|
||||
.dataSource(dataSource)
|
||||
.locations(flywayProperties.getLocations().toArray(new String[0]))
|
||||
.baselineOnMigrate(true)
|
||||
.baselineVersion("0")
|
||||
.table("flyway_schema_history")
|
||||
.validateOnMigrate(true)
|
||||
.outOfOrder(false)
|
||||
.load();
|
||||
|
||||
flyway.migrate();
|
||||
return flyway;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user