Skip to content

8
8timerapiv200
Commit ff5e540c by dengshichuan
Options

Merge branch 'dsc' into 'develop' 

拉取冲突解决

See merge request 8timerv2/8timerapiv200!138
parents 7f7bf226 d4e16df3
Showing with 9 additions and 9 deletions
src/main/java/cn/timer/api/controller/email/EmailController.java
...@@ -69,7 +69,7 @@ public class EmailController { ...@@ -69,7 +69,7 @@ public class EmailController {
message.setText(content); message.setText(content);
message.setFrom(username); message.setFrom(username);
mailSender.send(message); mailSender.send(message);
return ResultUtil.success(); return ResultUtil.success("邮件发送成功");
} }
@PostMapping("/sendHtmlMail") @PostMapping("/sendHtmlMail")
...@@ -110,7 +110,7 @@ public class EmailController { ...@@ -110,7 +110,7 @@ public class EmailController {
} catch (MessagingException e) { } catch (MessagingException e) {
e.printStackTrace(); e.printStackTrace();
} }
return ResultUtil.success(); return ResultUtil.success("邮件发送成功");
} }
@PostMapping("/sendInlinResourceMail") @PostMapping("/sendInlinResourceMail")
...@@ -131,7 +131,7 @@ public class EmailController { ...@@ -131,7 +131,7 @@ public class EmailController {
} catch (MessagingException e) { } catch (MessagingException e) {
logger.error("发送失败", e); logger.error("发送失败", e);
} }
return ResultUtil.success(); return ResultUtil.success("邮件发送成功");
} }
@Transactional @Transactional
...@@ -150,9 +150,9 @@ public class EmailController { ...@@ -150,9 +150,9 @@ public class EmailController {
qyzxEmpLogin.updateById(); qyzxEmpLogin.updateById();
return sendHtmlMail(userBean, to, "8小时账号邮箱验证", return sendHtmlMail(userBean, to, "8小时账号邮箱验证",
"<html>\r\n" + "<head>\r\n" + "<meta charset=\"UTF-8\">\r\n" + "</head>\r\n" + "<body>\r\n" "<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 + " <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") @PostMapping("/sendVerifyMail")
......
src/main/resources/application-dev.yml
...@@ -31,7 +31,7 @@ spring: ...@@ -31,7 +31,7 @@ spring:
# username: tang # username: tang
# password: Tang123456! # 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://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://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 # 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 driver-class-name: com.mysql.cj.jdbc.Driver
......
src/main/resources/application-pro.yml
...@@ -31,7 +31,7 @@ spring: ...@@ -31,7 +31,7 @@ spring:
# username: tang # username: tang
# password: Tang123456! # 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://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://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 # 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 driver-class-name: com.mysql.cj.jdbc.Driver
...@@ -92,7 +92,7 @@ spring: ...@@ -92,7 +92,7 @@ spring:
host: smtp.youlingrc.com host: smtp.youlingrc.com
username: postmaster@youlingrc.com username: postmaster@youlingrc.com
password: YoulingRC2020 password: YoulingRC2020
default-encoding: utf-8、 default-encoding: utf-8
properties: properties:
mail: mail:
smtp: smtp:
......
src/main/resources/application-test.yml
...@@ -31,7 +31,7 @@ spring: ...@@ -31,7 +31,7 @@ spring:
# username: tang # username: tang
# password: Tang123456! # 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://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://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 # 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 driver-class-name: com.mysql.cj.jdbc.Driver
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment