diff --git a/boot-service/pom.xml b/boot-service/pom.xml
index a5a4a79..63b9ccc 100644
--- a/boot-service/pom.xml
+++ b/boot-service/pom.xml
@@ -33,17 +33,23 @@
org.springframework.boot
spring-boot-starter-data-jpa
-
-
- mysql
- mysql-connector-java
- runtime
+
+
+ org.apache.tomcat
+ tomcat-jdbc
+
+
com.alibaba
druid
1.0.20
+
+ mysql
+ mysql-connector-java
+ runtime
+
org.projectlombok
diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/model/EmailModel.java b/boot-service/src/main/java/com/xwbing/domain/entity/model/EmailModel.java
index 3eca536..2eb8b3a 100644
--- a/boot-service/src/main/java/com/xwbing/domain/entity/model/EmailModel.java
+++ b/boot-service/src/main/java/com/xwbing/domain/entity/model/EmailModel.java
@@ -1,5 +1,7 @@
package com.xwbing.domain.entity.model;
+import lombok.Data;
+
import java.util.Date;
/**
@@ -8,6 +10,7 @@ import java.util.Date;
* 创建时间: 2017/5/10 16:36
* 作者: xiangwb
*/
+@Data
public class EmailModel {
public EmailModel(){
//默认值
@@ -57,97 +60,4 @@ public class EmailModel {
* 邮件附件的文件名
*/
private String[] attachFileNames;
-
- public String getFromEmail() {
- return fromEmail;
- }
-
- public void setFromEmail(String fromEmail) {
- this.fromEmail = fromEmail;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getToEmail() {
- return toEmail;
- }
-
- public void setToEmail(String toEmail) {
- this.toEmail = toEmail;
- }
-
- public Date getSendTime() {
- if (sendTime == null)
- sendTime = new Date();
- return sendTime;
- }
-
- public void setSendTime(Date sendTime) {
- this.sendTime = sendTime;
- }
-
- public String getServerHost() {
- return serverHost;
- }
-
- public void setServerHost(String serverHost) {
- this.serverHost = serverHost;
- }
-
- public Integer getServerPort() {
- return serverPort;
- }
-
- public void setServerPort(Integer serverPort) {
- this.serverPort = serverPort;
- }
-
- public boolean isAuth() {
- return auth;
- }
-
- public void setAuth(boolean auth) {
- this.auth = auth;
- }
-
- public String getSubject() {
- return subject;
- }
-
- public void setSubject(String subject) {
- this.subject = subject;
- }
-
- public String getCentent() {
- return centent;
- }
-
- public void setCentent(String centent) {
- this.centent = centent;
- }
-
- public String[] getAttachFileNames() {
- return attachFileNames;
- }
-
- public void setAttachFileNames(String[] attachFileNames) {
- this.attachFileNames = attachFileNames;
- }
-
- public String getProtocol() {
- if(protocol==null || "".equals(protocol.trim()))
- this.protocol="smtp";
- return protocol;
- }
-
- public void setProtocol(String protocol) {
- this.protocol = protocol;
- }
-
}
diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/model/EntityModel.java b/boot-service/src/main/java/com/xwbing/domain/entity/model/EntityModel.java
index 008fa9b..f776b06 100644
--- a/boot-service/src/main/java/com/xwbing/domain/entity/model/EntityModel.java
+++ b/boot-service/src/main/java/com/xwbing/domain/entity/model/EntityModel.java
@@ -14,7 +14,7 @@ import java.util.List;
public class EntityModel {
private String character ;
private int number;
- private Integer inte;
+ private Integer integer;
private double decimal;
private boolean b;
private List list;
diff --git a/boot-service/src/main/java/com/xwbing/util/EmailUtil.java b/boot-service/src/main/java/com/xwbing/util/EmailUtil.java
index 7e0b531..b700866 100644
--- a/boot-service/src/main/java/com/xwbing/util/EmailUtil.java
+++ b/boot-service/src/main/java/com/xwbing/util/EmailUtil.java
@@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory;
import javax.mail.*;
import javax.mail.internet.*;
+import java.util.Date;
import java.util.Properties;
/**
@@ -32,7 +33,11 @@ public class EmailUtil {
if (StringUtils.isEmpty(serverHost)) {
throw new UtilException("发送邮件主机不能为空");
}
- props.setProperty("mail.transport.protocol", emailModel.getProtocol());// 使用的协议（JavaMail规范要求）
+ String protocol = emailModel.getProtocol();
+ if(protocol==null || "".equals(protocol.trim())){
+ protocol="smtp";
+ }
+ props.setProperty("mail.transport.protocol", protocol);// 使用的协议（JavaMail规范要求）
props.setProperty("mail.smtp.host", serverHost); // 发件人的邮箱的
// SMTP服务器地址
if (emailModel.getServerPort() != null) {
@@ -77,7 +82,11 @@ public class EmailUtil {
html.setContent(emailModel.getCentent(), "text/html; charset=utf-8");
multipart.addBodyPart(html);
message.setContent(multipart);
- message.setSentDate(emailModel.getSendTime());// 设置显示的发件时间
+ Date sendTime = emailModel.getSendTime();
+ if(sendTime==null){
+ sendTime=new Date();
+ }
+ message.setSentDate(sendTime);// 设置显示的发件时间
message.saveChanges();// 保存邮件
// 4.根据 Session 获取邮件传输对象
Transport transport = session.getTransport("smtp");
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 3278e40..38862ac 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/ServletFilterConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/ServletFilterConfig.java
@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
- * 说明: 统一的servlet/filter配置
+ * 说明: 统一servlet/filter配置
* 项目名称: boot-module-demo
* 创建时间: 2017/5/10 16:36
* 作者: xiangwb
@@ -29,8 +29,8 @@ public class ServletFilterConfig {
}
@Bean
- public ServletRegistrationBean druidServlet() {
- logger.info("注册druidServlet ======================= ");
+ public ServletRegistrationBean statViewServlet() {
+ logger.info("注册druid监控信息显示statViewServlet ======================= ");
ServletRegistrationBean registration = new ServletRegistrationBean(new StatViewServlet());
registration.addUrlMappings("/druid/*");
//添加初始化参数:initParams
@@ -46,9 +46,10 @@ public class ServletFilterConfig {
@Bean
public FilterRegistrationBean webStatFilter() {
+ logger.info("注册druid监控信息采集webStatFilter ======================= ");
FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(new WebStatFilter());
filterRegistrationBean.addUrlPatterns("/*");
- filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*");
+ filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,*.jsp,/druid/*");
return filterRegistrationBean;
}
}
diff --git a/boot-web/src/main/resources/application.yml b/boot-web/src/main/resources/application.yml
index 1fd8da9..6c55fb9 100644
--- a/boot-web/src/main/resources/application.yml
+++ b/boot-web/src/main/resources/application.yml
@@ -8,11 +8,11 @@ server:
#spring
spring:
#datasource
- datasource:
- driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/springboot2?useUnicode=true&characterEncoding=utf8
- username: root
- password:
+# datasource:
+# driver-class-name: com.mysql.jdbc.Driver
+# url: jdbc:mysql://127.0.0.1:3306/springboot2?useUnicode=true&characterEncoding=utf8
+# username: root
+# password: xwbing
#jpa
jpa:
database: mysql