Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
7448adba
Commit
7448adba
authored
4 years ago
by
邓实川
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
配置优化
parent
949457b0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
src/main/java/cn/timer/api/controller/email/EmailController.java
+5
-5
src/main/resources/application-dev.yml
+1
-1
src/main/resources/application-pro.yml
+2
-2
src/main/resources/application-test.yml
+1
-1
No files found.
src/main/java/cn/timer/api/controller/email/EmailController.java
View file @
7448adba
...
...
@@ -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"
)
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application-dev.yml
View file @
7448adba
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application-pro.yml
View file @
7448adba
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application-test.yml
View file @
7448adba
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment