From d7b9eb73f3573a79c89e55a012bd0c28dfad001a Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Sun, 18 Mar 2018 15:01:05 +0800 Subject: [PATCH] merge --- .../xwbing/domain/entity/model/DruidDataSourceModel.java | 7 ++++++- .../com/xwbing/configuration/DruidDataSourceConfig.java | 2 +- .../java/com/xwbing/configuration/ServletFilterConfig.java | 2 +- .../main/java/com/xwbing/configuration/SwaggerConfig.java | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/model/DruidDataSourceModel.java b/boot-service/src/main/java/com/xwbing/domain/entity/model/DruidDataSourceModel.java index fa19d4e..08ace1d 100644 --- a/boot-service/src/main/java/com/xwbing/domain/entity/model/DruidDataSourceModel.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/model/DruidDataSourceModel.java @@ -4,7 +4,12 @@ import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; - +/** + * 说明: 德鲁伊数据源参数模型 + * 项目名称: boot-module-demo + * 创建时间: 2017/5/10 16:36 + * 作者: xiangwb + */ @Data @Component @PropertySource("classpath:druid.properties") diff --git a/boot-web/src/main/java/com/xwbing/configuration/DruidDataSourceConfig.java b/boot-web/src/main/java/com/xwbing/configuration/DruidDataSourceConfig.java index 875de1b..b805608 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/DruidDataSourceConfig.java +++ b/boot-web/src/main/java/com/xwbing/configuration/DruidDataSourceConfig.java @@ -13,7 +13,7 @@ import javax.annotation.Resource; import java.sql.SQLException; /** - * 说明: 德鲁伊数据源。监控地址:druid/index.html + * 说明: 德鲁伊数据源配置。监控地址:druid/index.html * 项目名称: boot-module-demo * 创建时间: 2017/12/10 16:36 * 作者: xiangwb diff --git a/boot-web/src/main/java/com/xwbing/configuration/ServletFilterConfig.java b/boot-web/src/main/java/com/xwbing/configuration/ServletFilterConfig.java index 109ceea..250a677 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/ServletFilterConfig.java +++ b/boot-web/src/main/java/com/xwbing/configuration/ServletFilterConfig.java @@ -38,7 +38,7 @@ public class ServletFilterConfig { // registration.addInitParameter("deny", "192.168.31.234");//IP黑名单(存在共同时,deny优先于allow) registration.addInitParameter("loginUsername", "admin");//用户名 registration.addInitParameter("loginPassword", "123456");//密码 - registration.addInitParameter("resetEnable", "false");//禁用HTML页面上的“Reset All”功能 + registration.addInitParameter("resetEnable", "false");//禁用HTML页面上的"Reset All"功能 return registration; } diff --git a/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java b/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java index cbe8625..41f035a 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java +++ b/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java @@ -12,7 +12,7 @@ import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; /** - * 说明: swagger config + * 说明: swagger配置 * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb