From 7448adbac142260d9fe98bcb5499eadb1df4f148 Mon Sep 17 00:00:00 2001
From: 邓实川 <544939826@qq.com>
Date: Tue, 26 May 2020 18:29:18 +0800
Subject: [PATCH] 配置优化
---
src/main/java/cn/timer/api/controller/email/EmailController.java | 10 +++++-----
src/main/resources/application-dev.yml | 2 +-
src/main/resources/application-pro.yml | 4 ++--
src/main/resources/application-test.yml | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/cn/timer/api/controller/email/EmailController.java b/src/main/java/cn/timer/api/controller/email/EmailController.java
index eae0af8..4f97a74 100644
--- a/src/main/java/cn/timer/api/controller/email/EmailController.java
+++ b/src/main/java/cn/timer/api/controller/email/EmailController.java
@@ -69,7 +69,7 @@ public class EmailController {
message.setText(content);
message.setFrom(username);
mailSender.send(message);
- return ResultUtil.success();
+ return ResultUtil.success("邮件发送成功");
}
@PostMapping("/sendHtmlMail")
@@ -110,7 +110,7 @@ public class EmailController {
} catch (MessagingException e) {
e.printStackTrace();
}
- return ResultUtil.success();
+ return ResultUtil.success("邮件发送成功");
}
@PostMapping("/sendInlinResourceMail")
@@ -131,7 +131,7 @@ public class EmailController {
} catch (MessagingException e) {
logger.error("发送失败", e);
}
- return ResultUtil.success();
+ return ResultUtil.success("邮件发送成功");
}
@Transactional
@@ -150,9 +150,9 @@ public class EmailController {
qyzxEmpLogin.updateById();
return sendHtmlMail(userBean, to, "8小时账号邮箱验证",
"<html>\r\n" + "<head>\r\n" + "<meta charset=\"UTF-8\">\r\n" + "</head>\r\n" + "<body>\r\n"
- + " <h1>您好，感谢绑定<a href=\"http://8timer.cn\">8小时人事管家</a>，点击下面链接完成验证，感谢支持！<h1>\r\n"
+ + " <h1>您好，感谢绑定<a href=\"http://8timer.cn\">8小时人事管家</a>，请点击下方完成邮箱绑定，感谢支持！<h1>\r\n"
+ " <br />\r\n" + " <a href=\"http://test-8timer-api.youlingrc.com/login/band/" + empNum
- + "\">激活账户</a>\r\n" + "</body>\r\n" + "</html>");
+ + "\">点击这里</a>\r\n" + "</body>\r\n" + "</html>");
}
@PostMapping("/sendVerifyMail")
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 18d2619..880cdc1 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -31,7 +31,7 @@ spring:
# username: tang
# password: Tang123456!
# url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
- url: jdbc:mysql://test-8timer-fk.youlingrc.com/8timer_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
+ url: jdbc:mysql://test-8timer-api.youlingrc.com/8timer_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
# url: jdbc:mysql://192.168.172.200:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
# url: jdbc:mysql://db.hhlsz.com:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 5256513..fe0f27b 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -31,7 +31,7 @@ spring:
# username: tang
# password: Tang123456!
# url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
- url: jdbc:mysql://test-8timer-fk.youlingrc.com/8timer_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
+ url: jdbc:mysql://test-8timer-api.youlingrc.com/8timer_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
# url: jdbc:mysql://192.168.172.200:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
# url: jdbc:mysql://db.hhlsz.com:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -91,7 +91,7 @@ spring:
host: smtp.youlingrc.com
username: postmaster@youlingrc.com
password: YoulingRC2020
- default-encoding: utf-8、
+ default-encoding: utf-8
properties:
mail:
smtp:
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 61bbc90..5c05aca 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -31,7 +31,7 @@ spring:
# username: tang
# password: Tang123456!
# url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
- url: jdbc:mysql://test-8timer-fk.youlingrc.com/8timer_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
+ url: jdbc:mysql://test-8timer-api.youlingrc.com/8timer_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
# url: jdbc:mysql://192.168.172.200:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
# url: jdbc:mysql://db.hhlsz.com:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
driver-class-name: com.mysql.cj.jdbc.Driver
--
libgit2 0.26.0