Merge branch 'dsc' into 'develop'

参数名修改

See merge request 8timerv2/8timerapiv200!117

src/main/java/cn/timer/api/controller/email/EmailController.java

@@ -53,7 +53,7 @@ public class EmailController {
 	private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
 	@Value("${spring.mail.username}")
-	private String from;
+	private String username;
 
 	@Autowired
 	JavaMailSender mailSender;
@@ -65,7 +65,7 @@ public class EmailController {
 		message.setTo(to);
 		message.setSubject(subject);
 		message.setText(content);
-		message.setFrom(from);
+		message.setFrom(username);
 		mailSender.send(message);
 		return ResultUtil.success();
 	}
@@ -76,7 +76,7 @@ public class EmailController {
 		MimeMessage message = mailSender.createMimeMessage();
 		try {
 			MimeMessageHelper helper = new MimeMessageHelper(message, true);
-			helper.setFrom(from);
+			helper.setFrom(username);
 			helper.setTo(to);
 			helper.setSubject(subject);
 			helper.setText(content, true);
@@ -93,7 +93,7 @@ public class EmailController {
 		MimeMessage message = mailSender.createMimeMessage();
 		try {
 			MimeMessageHelper helper = new MimeMessageHelper(message, true);
-			helper.setFrom(from);
+			helper.setFrom(username);
 			helper.setTo(to);
 			helper.setSubject(subject);
 			helper.setText(content, true);
@@ -114,7 +114,7 @@ public class EmailController {
 		MimeMessage message = mailSender.createMimeMessage();
 		try {
 			MimeMessageHelper helper = new MimeMessageHelper(message, true);
-			helper.setFrom(from);
+			helper.setFrom(username);
 			helper.setTo(to);
 			helper.setSubject(subject);
 			helper.setText(content, true);

src/main/resources/application-pro.yml

@@ -85,6 +85,11 @@ spring:
          height: 76 # Height of the banner image in chars (default based on image height).
          margin: 2 # Left hand image margin in chars.
          invert: false # Whether images should be inverted for dark terminal themes.
+  mail: 
+     host: smtp.qq.com
+     username: 
+     password: 
+     default-encoding: utf-8
 
  # mybatis-plus
 mybatis-plus:

src/main/resources/application-test.yml

@@ -85,6 +85,11 @@ spring:
          height: 76 # Height of the banner image in chars (default based on image height).
          margin: 2 # Left hand image margin in chars.
          invert: false # Whether images should be inverted for dark terminal themes.
+  mail: 
+     host: smtp.qq.com
+     username: 
+     password: 
+     default-encoding: utf-8
 
  # mybatis-plus
 mybatis-plus: