diff --git a/Changelog.md b/Changelog.md index 6581c36..31c7184 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,8 @@ # Changelog -## 1.0.0 +### 1.0.1 +1. 增加一部分 application.yml 的代码提示,如 `enabled`、`db-type` 等 +2. 统一配置文件位置 + +### 1.0.0 +1. 提供基于 Druid 的 Spring Boot Starter \ No newline at end of file diff --git a/druid-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/druid-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index ed3f116..bebb59d 100644 --- a/druid-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/druid-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -64,139 +64,130 @@ "defaultValue": false } ], - "hints": [{ - "name": "spring.datasource.druid.stat.db-type", - "values": [{ - "value": "db2", - "description": "db2." - },{ - "value": "postgresql", - "description": "postgresql." - },{ - "value": "sqlserver", - "description": "sqlserver." - },{ - "value": "oracle", - "description": "oracle." - },{ - "value": "AliOracle", - "description": "AliOracle." - },{ - "value": "mysql", - "description": "mysql." - },{ - "value": "mariadb", - "description": "mariadb." - },{ - "value": "hive", - "description": "hive." - },{ - "value": "h2", - "description": "h2." - },{ - "value": "dm", - "description": "dm." - },{ - "value": "kingbase", - "description": "kingbase." - },{ - "value": "oceanbase", - "description": "oceanbase." - },{ - "value": "odps", - "description": "odps." - },{ - "value": "teradata", - "description": "teradata." - },{ - "value": "log4jdbc", - "description": "log4jdbc." - },{ - "value": "phoenix", - "description": "phoenix." - },{ - "value": "edb", - "description": "edb." - },{ - "value": "kylin", - "description": "kylin." - },{ - "value": "sqlite", - "description": "sqlite." - }] - },{ - "name": "spring.datasource.druid.wall.db-type", - "values": [{ - "value": "db2", - "description": "db2." - },{ - "value": "postgresql", - "description": "postgresql." - },{ - "value": "sqlserver", - "description": "sqlserver." - },{ - "value": "oracle", - "description": "oracle." - },{ - "value": "AliOracle", - "description": "AliOracle." - },{ - "value": "mysql", - "description": "mysql." - },{ - "value": "mariadb", - "description": "mariadb." - },{ - "value": "hive", - "description": "hive." - },{ - "value": "h2", - "description": "h2." - },{ - "value": "dm", - "description": "dm." - },{ - "value": "kingbase", - "description": "kingbase." - },{ - "value": "oceanbase", - "description": "oceanbase." - },{ - "value": "odps", - "description": "odps." - },{ - "value": "teradata", - "description": "teradata." - },{ - "value": "log4jdbc", - "description": "log4jdbc." - },{ - "value": "phoenix", - "description": "phoenix." - },{ - "value": "edb", - "description": "edb." - },{ - "value": "kylin", - "description": "kylin." - },{ - "value": "sqlite", - "description": "sqlite." - }] - }] -} - - - - - - - - - - - - - - + "hints": [ + { + "name": "spring.datasource.druid.stat.db-type", + "values": [ + { + "value": "db2" + }, + { + "value": "postgresql" + }, + { + "value": "sqlserver" + }, + { + "value": "oracle" + }, + { + "value": "AliOracle" + }, + { + "value": "mysql" + }, + { + "value": "mariadb" + }, + { + "value": "hive" + }, + { + "value": "h2" + }, + { + "value": "dm" + }, + { + "value": "kingbase" + }, + { + "value": "oceanbase" + }, + { + "value": "odps" + }, + { + "value": "teradata" + }, + { + "value": "log4jdbc" + }, + { + "value": "phoenix" + }, + { + "value": "edb" + }, + { + "value": "kylin" + }, + { + "value": "sqlite" + } + ] + }, + { + "name": "spring.datasource.druid.wall.db-type", + "values": [ + { + "value": "db2" + }, + { + "value": "postgresql" + }, + { + "value": "sqlserver" + }, + { + "value": "oracle" + }, + { + "value": "AliOracle" + }, + { + "value": "mysql" + }, + { + "value": "mariadb" + }, + { + "value": "hive" + }, + { + "value": "h2" + }, + { + "value": "dm" + }, + { + "value": "kingbase" + }, + { + "value": "oceanbase" + }, + { + "value": "odps" + }, + { + "value": "teradata" + }, + { + "value": "log4jdbc" + }, + { + "value": "phoenix" + }, + { + "value": "edb" + }, + { + "value": "kylin" + }, + { + "value": "sqlite" + } + ] + } + ] +} \ No newline at end of file diff --git a/druid-spring-boot-samples/src/main/java/com/github/trang/druid/DruidSpringBootStarterApplication.java b/druid-spring-boot-samples/src/main/java/com/github/trang/druid/DruidSpringBootStarterApplication.java index 330029f..8438fdf 100644 --- a/druid-spring-boot-samples/src/main/java/com/github/trang/druid/DruidSpringBootStarterApplication.java +++ b/druid-spring-boot-samples/src/main/java/com/github/trang/druid/DruidSpringBootStarterApplication.java @@ -20,8 +20,6 @@ public class DruidSpringBootStarterApplication implements CommandLineRunner { SpringApplication.run(DruidSpringBootStarterApplication.class, args); } - @Autowired - private DruidDataSource dataSource; @Autowired private CityMapper cityMapper; diff --git a/druid-spring-boot-samples/src/main/resources/application.yml b/druid-spring-boot-samples/src/main/resources/application.yml index ab8c602..e747c68 100644 --- a/druid-spring-boot-samples/src/main/resources/application.yml +++ b/druid-spring-boot-samples/src/main/resources/application.yml @@ -48,10 +48,10 @@ spring: log-violation: true throw-exception: false aop-stat: - enabled: false + enabled: true patterns: com.github.trang.* web-stat-filter: - enabled: false + enabled: true stat-view-servlet: enabled: true schema: classpath:import.sql