Commit 62d62375 by chentianzhong

短信账号修改

parent 2a7c8d8f
......@@ -149,11 +149,11 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
if (CollectionUtil.isNotEmpty(receiverList)){
this.saveEmailReceiver(receiverList, content, EmailFolderEnum.FOLDER_INBOX.getKey().longValue(), WhetherEnum.YES.getKey(), vo.getIsSend());
//发送短信
if (content.getSmsRemind() != null && content.getSmsRemind() == 1) {
if (vo.getIsSend().equals(WhetherEnum.YES.getKey()) && content.getSmsRemind().equals(WhetherEnum.YES.getKey())) {
smsUtil.sendBatchSms(receiverList, "您有一封新的邮件,标题为《" + content.getTitle() + "》。请及时查收。", content.getId());
}
//代办
if (content.getMessageRemind() != null && content.getMessageRemind() == 1) {
if (vo.getIsSend().equals(WhetherEnum.YES.getKey()) && (content.getMessageRemind() != null && content.getSmsRemind().equals(WhetherEnum.YES.getKey()))) {
msgUtil.sendMsg(adminContext.getNickName(), content, receiverList, systemInfo);
}
}
......@@ -172,11 +172,11 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
//增加收件人
this.saveEmailReceiver(deptUserList, content, EmailFolderEnum.FOLDER_DEPT_INBOX.getKey().longValue(), WhetherEnum.NO.getKey(), vo.getIsSend());
//短信
if (content.getSmsRemind() != null && content.getSmsRemind() == 1){
if (vo.getIsSend().equals(WhetherEnum.YES.getKey()) && content.getSmsRemind().equals(WhetherEnum.YES.getKey())){
smsUtil.sendBatchSms(deptUserList, "您有一封新的邮件,标题为《" + content.getTitle() + "》。请及时查收。", content.getId());
}
//代办
if (content.getMessageRemind() != null && content.getMessageRemind() == 1) {
if (vo.getIsSend().equals(WhetherEnum.YES.getKey()) && content.getSmsRemind().equals(WhetherEnum.YES.getKey())) {
msgUtil.sendMsg(adminContext.getNickName(), content, deptUserList, systemInfo);
}
}
......
......@@ -61,6 +61,6 @@ swagger:
sms:
app-id: oa-mobile
app-key: GY@mobile$2022
app-id: oa_new
app-key: OA@2022!
url: http://171.106.48.55:19891/ums/inside_new/sendBatch
......@@ -60,6 +60,6 @@ swagger:
enabled: true
sms:
app-id: oa-mobile
app-key: GY@mobile$2022
app-id: oa_new
app-key: OA@2022!
url: http://171.106.48.55:19891/ums/inside_new/sendBatch
......@@ -60,6 +60,6 @@ swagger:
sms:
app-id: oa-mobile
app-key: GY@mobile$2022
app-id: oa_new
app-key: OA@2022!
url: http://147.2.3.18:9888/ums/inside_new/sendBatch
\ No newline at end of file
......@@ -59,6 +59,6 @@ swagger:
enabled: false
sms:
app-id: oa-mobile
app-key: GY@mobile$2022
app-id: oa_new
app-key: OA@2022!
url: http://147.2.3.18:9888/ums/inside_new/sendBatch
\ No newline at end of file
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