diff --git a/database_bak/kehui_line_2018-02-04.bak b/database_bak/kehui_line_2018-02-04.bak index 5e0ecdc..4b7364b 100644 --- a/database_bak/kehui_line_2018-02-04.bak +++ b/database_bak/kehui_line_2018-02-04.bak @@ -3361,7 +3361,7 @@ COPY system_log (id_, created_at, created_by, updated_at, updated_by, descriptio -- COPY system_mail163_config (id_, accept_email, email_sender, email_sender_password, application, created_by, created_at, updated_by, updated_at, description, is_deleted, title, email_host) FROM stdin; -891876946042978306 oa@51kehui.com Oa1234 notice 0 2017-12-21 21:10:25+08 0 2017-12-21 21:10:27+08 \N f 科惠网 smtp.exmail.qq.com +891876946042978306 oa@51kehui.com Kehuioa123 notice 0 2017-12-21 21:10:25+08 0 2017-12-21 21:10:27+08 \N f 科惠网 smtp.exmail.qq.com \. diff --git a/src/main/java/com/xqopen/kehui/flows/util/MyExecutionListener.java b/src/main/java/com/xqopen/kehui/flows/util/MyExecutionListener.java index 6be3718..0c7b6fe 100644 --- a/src/main/java/com/xqopen/kehui/flows/util/MyExecutionListener.java +++ b/src/main/java/com/xqopen/kehui/flows/util/MyExecutionListener.java @@ -1,12 +1,6 @@ package com.xqopen.kehui.flows.util; -import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.stream.Collectors; - import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; @@ -22,14 +16,8 @@ import com.xqopen.kehui.exception.XQException; import com.xqopen.kehui.flows.dto.FlowsTaskItem; import com.xqopen.kehui.flows.entity.Flows; import com.xqopen.kehui.flows.service.IFlowsService; -import com.xqopen.kehui.logistics.dto.LogisticsAssetsReq; import com.xqopen.kehui.logistics.entity.*; -import com.xqopen.kehui.logistics.service.ILogisticsAssetsReceiveService; -import com.xqopen.kehui.logistics.service.ILogisticsAssetsService; -import com.xqopen.kehui.logistics.service.ILogisticsInventoryManagementService; -import com.xqopen.kehui.logistics.service.ILogisticsMeetingService; -import com.xqopen.kehui.logistics.service.ILogisticsPurchaseService; -import com.xqopen.kehui.logistics.service.ILogisticsUseCarService; +import com.xqopen.kehui.logistics.service.*; import com.xqopen.kehui.party.entity.PartyMemberInfo; import com.xqopen.kehui.party.entity.PartyMemberInfoTemp; import com.xqopen.kehui.party.service.IPartyMemberInfoService; @@ -47,18 +35,18 @@ import com.xqopen.kehui.project.entity.ProjectInfo; import com.xqopen.kehui.project.service.IProjectAchievementService; import com.xqopen.kehui.project.service.IProjectInfoService; import com.xqopen.kehui.util.*; - import lombok.extern.slf4j.Slf4j; - import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.ExecutionListener; -import org.joda.time.DateTime; - -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import static com.xqopen.kehui.flows.util.activitiEnum.activitiType.achievement; -import static com.xqopen.kehui.flows.util.activitiEnum.activitiType.received; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.stream.Collectors; /** *

com.xqopen.kehui.flows.util

@@ -313,7 +301,7 @@ public class MyExecutionListener implements ExecutionListener { "【人员事件变更提醒】", "人事专员：您好！"+name+"提交了"+aType+"申请，已完成审批，请悉知！", "oa@51kehui.com", - "Oa1234", + "Kehuioa123", mailUtil.EMAIL_SMTP_QQ_HOST); mailUtil.sendEmail( @@ -321,7 +309,7 @@ public class MyExecutionListener implements ExecutionListener { "【人员事件变更提醒】", "人事主管：您好"+name+"提交了"+aType+"申请，已完成审批，请悉知！并做好记录！", "oa@51kehui.com", - "Oa1234", + "Kehuioa123", mailUtil.EMAIL_SMTP_QQ_HOST); } } diff --git a/src/main/java/com/xqopen/kehui/personal/action/PersonalEventsController.java b/src/main/java/com/xqopen/kehui/personal/action/PersonalEventsController.java index 58c1aa2..0ced01f 100644 --- a/src/main/java/com/xqopen/kehui/personal/action/PersonalEventsController.java +++ b/src/main/java/com/xqopen/kehui/personal/action/PersonalEventsController.java @@ -18,7 +18,6 @@ import com.xqopen.kehui.personal.entity.PersonalEvents; import com.xqopen.kehui.personal.entity.PersonalMember; import com.xqopen.kehui.personal.service.IPersonalEventsService; import com.xqopen.kehui.personal.service.IPersonalMemberService; -import com.xqopen.kehui.personal.util.personalEnum; import com.xqopen.kehui.util.ApiResponse; import com.xqopen.kehui.util.JacksonUtil; import com.xqopen.kehui.util.MailUtil; @@ -29,18 +28,15 @@ import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; -import javax.xml.crypto.Data; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; import java.time.ZoneId; -import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.concurrent.TimeUnit; /** *

人员事件管理 前端控制器

@@ -310,7 +306,7 @@ public class PersonalEventsController implements PersonalEventsApi { "【销假通知】", name + "：您好！人事已为您销假！", "oa@51kehui.com", - "Oa1234", + "Kehuioa123", mailUtil.EMAIL_SMTP_QQ_HOST); mailUtil.sendEmail( @@ -318,7 +314,7 @@ public class PersonalEventsController implements PersonalEventsApi { "【销假通知】", "考勤员：您好！人事已为" + name + "销假！", "oa@51kehui.com", - "Oa1234", + "Kehuioa123", mailUtil.EMAIL_SMTP_QQ_HOST); return ApiResponse.fillSuccess("销假成功"); diff --git a/src/main/java/com/xqopen/kehui/util/MailUtil.java b/src/main/java/com/xqopen/kehui/util/MailUtil.java index 36649f9..d3245cd 100644 --- a/src/main/java/com/xqopen/kehui/util/MailUtil.java +++ b/src/main/java/com/xqopen/kehui/util/MailUtil.java @@ -1,20 +1,15 @@ package com.xqopen.kehui.util; -import java.security.GeneralSecurityException; -import java.util.Properties; +import com.sun.mail.util.MailSSLSocketFactory; +import lombok.extern.slf4j.Slf4j; -import javax.mail.BodyPart; -import javax.mail.Message; -import javax.mail.Multipart; -import javax.mail.Session; -import javax.mail.Transport; +import javax.mail.*; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; - -import com.sun.mail.util.MailSSLSocketFactory; -import lombok.extern.slf4j.Slf4j; +import java.security.GeneralSecurityException; +import java.util.Properties; /** *

com.xqopen.kehui.util

@@ -26,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; public class MailUtil { public static final String EMAIL_SENDER = "oa@51kehui.com"; - public static final String EMAIL_SENDER_PASSWORD = "Oa1234"; + public static final String EMAIL_SENDER_PASSWORD = "Kehuioa123"; public static final String EMAIL_SMTP_YM_163_HOST = "smtp.ym.163.com"; @@ -67,8 +62,8 @@ public class MailUtil { } public static void main(String[] args) { - sendEmail("252515862@qq.com", "【晓泉信息】", - "您的验证码是:8562,别告诉别人哦，60秒内输入有效", "oa@51kehui.com", "Oa1234", EMAIL_SMTP_QQ_HOST); + sendEmail("1048209592@qq.com", "【晓泉信息】", + "您的验证码是:8562,别告诉别人哦，60秒内输入有效", "oa@51kehui.com", "Kehuioa123", EMAIL_SMTP_QQ_HOST); } public void setAddress(String from, String to, String subject, String host) {