Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
email
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
陈天仲
email
Commits
b8ac03c7
Commit
b8ac03c7
authored
Jun 07, 2023
by
chentianzhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
87273967
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
src/main/java/com/zq/email/service/impl/EmailAttachServiceImpl.java
+2
-2
src/main/java/com/zq/email/service/impl/EmailPersonServiceImpl.java
+2
-2
src/main/java/com/zq/email/utils/MsgUtil.java
+1
-1
No files found.
src/main/java/com/zq/email/service/impl/EmailAttachServiceImpl.java
View file @
b8ac03c7
...
@@ -115,7 +115,7 @@ public class EmailAttachServiceImpl extends ServiceImpl<EmailAttachMapper, Email
...
@@ -115,7 +115,7 @@ public class EmailAttachServiceImpl extends ServiceImpl<EmailAttachMapper, Email
if
(
profile
.
equals
(
"product"
)
||
profile
.
equals
(
"test"
))
{
if
(
profile
.
equals
(
"product"
)
||
profile
.
equals
(
"test"
))
{
download
=
"http://147.1.3.87/attwjsf_email"
+
path
;
download
=
"http://147.1.3.87/attwjsf_email"
+
path
;
}
else
if
(
profile
.
equals
(
"wanpro"
)
||
profile
.
equals
(
"wantest"
)){
}
else
if
(
profile
.
equals
(
"wanpro"
)
||
profile
.
equals
(
"wantest"
)){
download
=
"http://172.28.1.159:8
3
/attwjsf_yj"
+
path
;
download
=
"http://172.28.1.159:8
2
/attwjsf_yj"
+
path
;
}
}
}
else
{
}
else
{
if
(
profile
.
equals
(
"wanpro"
)
||
profile
.
equals
(
"wantest"
))
{
if
(
profile
.
equals
(
"wanpro"
)
||
profile
.
equals
(
"wantest"
))
{
...
@@ -136,7 +136,7 @@ public class EmailAttachServiceImpl extends ServiceImpl<EmailAttachMapper, Email
...
@@ -136,7 +136,7 @@ public class EmailAttachServiceImpl extends ServiceImpl<EmailAttachMapper, Email
if
(
profile
.
equals
(
"product"
)
||
profile
.
equals
(
"test"
))
{
if
(
profile
.
equals
(
"product"
)
||
profile
.
equals
(
"test"
))
{
download
=
"http://147.1.3.87/attwjsf_email"
+
path
;
download
=
"http://147.1.3.87/attwjsf_email"
+
path
;
}
else
if
(
profile
.
equals
(
"wanpro"
)
||
profile
.
equals
(
"wantest"
)){
}
else
if
(
profile
.
equals
(
"wanpro"
)
||
profile
.
equals
(
"wantest"
)){
download
=
"http://172.28.1.159:8
3
/attwjsf_yj"
+
path
;
download
=
"http://172.28.1.159:8
2
/attwjsf_yj"
+
path
;
}
}
}
else
{
}
else
{
if
(
profile
.
equals
(
"wanpro"
)
||
profile
.
equals
(
"wantest"
))
{
if
(
profile
.
equals
(
"wanpro"
)
||
profile
.
equals
(
"wantest"
))
{
...
...
src/main/java/com/zq/email/service/impl/EmailPersonServiceImpl.java
View file @
b8ac03c7
...
@@ -158,7 +158,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
...
@@ -158,7 +158,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
this
.
saveEmailReceiver
(
receiverList
,
content
,
EmailFolderEnum
.
FOLDER_INBOX
.
getKey
().
longValue
(),
WhetherEnum
.
YES
.
getKey
(),
vo
.
getIsSend
());
this
.
saveEmailReceiver
(
receiverList
,
content
,
EmailFolderEnum
.
FOLDER_INBOX
.
getKey
().
longValue
(),
WhetherEnum
.
YES
.
getKey
(),
vo
.
getIsSend
());
//发送短信
//发送短信
if
(
vo
.
getIsSend
().
equals
(
WhetherEnum
.
YES
.
getKey
())
&&
content
.
getSmsRemind
().
equals
(
WhetherEnum
.
YES
.
getKey
()))
{
if
(
vo
.
getIsSend
().
equals
(
WhetherEnum
.
YES
.
getKey
())
&&
content
.
getSmsRemind
().
equals
(
WhetherEnum
.
YES
.
getKey
()))
{
smsUtil
.
sendBatchSms
(
receiverList
,
"您有一
封新的邮件,标题为《"
+
content
.
getTitle
()
+
"》。请及时查收
。"
,
content
.
getId
());
smsUtil
.
sendBatchSms
(
receiverList
,
"您有一
份来自"
+
content
.
getSendUserName
()+
"的邮件: "
+
content
.
getTitle
()+
"
。"
,
content
.
getId
());
}
}
//代办
//代办
if
(
vo
.
getIsSend
().
equals
(
WhetherEnum
.
YES
.
getKey
())
&&
(
content
.
getMessageRemind
()
!=
null
&&
content
.
getMessageRemind
().
equals
(
WhetherEnum
.
YES
.
getKey
())))
{
if
(
vo
.
getIsSend
().
equals
(
WhetherEnum
.
YES
.
getKey
())
&&
(
content
.
getMessageRemind
()
!=
null
&&
content
.
getMessageRemind
().
equals
(
WhetherEnum
.
YES
.
getKey
())))
{
...
@@ -181,7 +181,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
...
@@ -181,7 +181,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
this
.
saveEmailReceiver
(
deptUserList
,
content
,
EmailFolderEnum
.
FOLDER_DEPT_INBOX
.
getKey
().
longValue
(),
WhetherEnum
.
NO
.
getKey
(),
vo
.
getIsSend
());
this
.
saveEmailReceiver
(
deptUserList
,
content
,
EmailFolderEnum
.
FOLDER_DEPT_INBOX
.
getKey
().
longValue
(),
WhetherEnum
.
NO
.
getKey
(),
vo
.
getIsSend
());
//短信
//短信
if
(
vo
.
getIsSend
().
equals
(
WhetherEnum
.
YES
.
getKey
())
&&
content
.
getSmsRemind
().
equals
(
WhetherEnum
.
YES
.
getKey
())){
if
(
vo
.
getIsSend
().
equals
(
WhetherEnum
.
YES
.
getKey
())
&&
content
.
getSmsRemind
().
equals
(
WhetherEnum
.
YES
.
getKey
())){
smsUtil
.
sendBatchSms
(
deptUserList
,
"您有一
封新的邮件,标题为《"
+
content
.
getTitle
()
+
"》。请及时查收
。"
,
content
.
getId
());
smsUtil
.
sendBatchSms
(
deptUserList
,
"您有一
份来自"
+
content
.
getSendUserName
()+
"的邮件: "
+
content
.
getTitle
()+
"
。"
,
content
.
getId
());
}
}
//代办
//代办
if
(
vo
.
getIsSend
().
equals
(
WhetherEnum
.
YES
.
getKey
())
&&
content
.
getMessageRemind
().
equals
(
WhetherEnum
.
YES
.
getKey
()))
{
if
(
vo
.
getIsSend
().
equals
(
WhetherEnum
.
YES
.
getKey
())
&&
content
.
getMessageRemind
().
equals
(
WhetherEnum
.
YES
.
getKey
()))
{
...
...
src/main/java/com/zq/email/utils/MsgUtil.java
View file @
b8ac03c7
...
@@ -43,7 +43,7 @@ public class MsgUtil {
...
@@ -43,7 +43,7 @@ public class MsgUtil {
params
.
put
(
"sender"
,
sender
);
params
.
put
(
"sender"
,
sender
);
params
.
put
(
"nickName"
,
sender
);
params
.
put
(
"nickName"
,
sender
);
params
.
put
(
"title"
,
"您有一封新邮件提醒"
);
params
.
put
(
"title"
,
"您有一封新邮件提醒"
);
params
.
put
(
"content"
,
"
您有一封新的邮件,标题为《"
+
content
.
getTitle
()+
"》。请及时查收
。"
);
params
.
put
(
"content"
,
"
请查收我的邮件!主题:"
+
content
.
getTitle
()+
"
。"
);
params
.
put
(
"userIdList"
,
userVoList
.
stream
().
map
(
e
->
e
.
getUserId
()).
collect
(
Collectors
.
toList
()));
params
.
put
(
"userIdList"
,
userVoList
.
stream
().
map
(
e
->
e
.
getUserId
()).
collect
(
Collectors
.
toList
()));
params
.
put
(
"businessId"
,
content
.
getId
());
params
.
put
(
"businessId"
,
content
.
getId
());
params
.
put
(
"jumpUrl"
,
systemInfo
.
getHomeUrl
()
+
"/#/detail?folderId="
+
folderId
+
"&contentId="
+
content
.
getId
());
params
.
put
(
"jumpUrl"
,
systemInfo
.
getHomeUrl
()
+
"/#/detail?folderId="
+
folderId
+
"&contentId="
+
content
.
getId
());
...
...
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