From 788f60b7b8464938698b84e957b8fe899148be82 Mon Sep 17 00:00:00 2001 From: wenyann <64353056+wenyann@users.noreply.github.com> Date: Thu, 3 Sep 2020 11:32:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/APITestService.java | 4 --- .../notice/controller/NoticeController.java | 20 ----------- .../controller/request/NoticeRequest.java | 9 ----- .../io/metersphere/notice/domain/Mail.java | 19 ----------- .../notice/service/MailService.java | 5 --- .../notice/service/MailServiceImpl.java | 33 ------------------- .../notice/service/NoticeService.java | 18 ---------- .../src/main/resources/application.properties | 1 + backend/src/main/resources/application.yml | 21 ------------ 9 files changed, 1 insertion(+), 129 deletions(-) delete mode 100644 backend/src/main/java/io/metersphere/notice/controller/NoticeController.java delete mode 100644 backend/src/main/java/io/metersphere/notice/controller/request/NoticeRequest.java delete mode 100644 backend/src/main/java/io/metersphere/notice/domain/Mail.java delete mode 100644 backend/src/main/java/io/metersphere/notice/service/MailService.java delete mode 100644 backend/src/main/java/io/metersphere/notice/service/MailServiceImpl.java delete mode 100644 backend/src/main/java/io/metersphere/notice/service/NoticeService.java delete mode 100644 backend/src/main/resources/application.yml diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java index 250a161cd6..ea5690ecae 100644 --- a/backend/src/main/java/io/metersphere/api/service/APITestService.java +++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java @@ -23,7 +23,6 @@ import io.metersphere.controller.request.QueryScheduleRequest; import io.metersphere.dto.ScheduleDao; import io.metersphere.i18n.Translator; import io.metersphere.job.sechedule.ApiTestJob; -import io.metersphere.notice.service.MailService; import io.metersphere.service.FileService; import io.metersphere.service.QuotaService; import io.metersphere.service.ScheduleService; @@ -62,8 +61,6 @@ public class APITestService { private ScheduleService scheduleService; @Resource private TestCaseService testCaseService; - @Resource - private MailService mailService; private static final String BODY_FILE_DIR = "/opt/metersphere/data/body"; @@ -228,7 +225,6 @@ public class APITestService { apiTest.setUserId(request.getUserId()); } String reportId = apiReportService.create(apiTest, request.getTriggerMode()); - mailService.sendMail(reportId); changeStatus(request.getId(), APITestStatus.Running); jMeterService.run(request.getId(), null, is); diff --git a/backend/src/main/java/io/metersphere/notice/controller/NoticeController.java b/backend/src/main/java/io/metersphere/notice/controller/NoticeController.java deleted file mode 100644 index 0f786806fd..0000000000 --- a/backend/src/main/java/io/metersphere/notice/controller/NoticeController.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.metersphere.notice.controller; - -import io.metersphere.notice.controller.request.NoticeRequest; -import io.metersphere.notice.service.NoticeService; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -@RestController -@RequestMapping("notice") -public class NoticeController { - @Resource - private NoticeService noticeService; - @PostMapping("/save") - public void saveNotice(NoticeRequest noticeRequest){ - noticeService.saveNotice(noticeRequest); - } -} diff --git a/backend/src/main/java/io/metersphere/notice/controller/request/NoticeRequest.java b/backend/src/main/java/io/metersphere/notice/controller/request/NoticeRequest.java deleted file mode 100644 index 2d70b0fcc3..0000000000 --- a/backend/src/main/java/io/metersphere/notice/controller/request/NoticeRequest.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.metersphere.notice.controller.request; - -import io.metersphere.base.domain.Notice; -import lombok.Data; - -@Data -public class NoticeRequest extends Notice { - private String testId; -} diff --git a/backend/src/main/java/io/metersphere/notice/domain/Mail.java b/backend/src/main/java/io/metersphere/notice/domain/Mail.java deleted file mode 100644 index 04ebab25c8..0000000000 --- a/backend/src/main/java/io/metersphere/notice/domain/Mail.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.metersphere.notice.domain; - -import lombok.Data; - -@Data -public class Mail { - // 发送给谁 - private String to; - - // 发送主题 - private String subject; - - // 发送内容 - private String content; - - // 附件地址 - private String filePath; - -} diff --git a/backend/src/main/java/io/metersphere/notice/service/MailService.java b/backend/src/main/java/io/metersphere/notice/service/MailService.java deleted file mode 100644 index 9de303036e..0000000000 --- a/backend/src/main/java/io/metersphere/notice/service/MailService.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.metersphere.notice.service; - -public interface MailService { - public void sendMail(String reportId); -} diff --git a/backend/src/main/java/io/metersphere/notice/service/MailServiceImpl.java b/backend/src/main/java/io/metersphere/notice/service/MailServiceImpl.java deleted file mode 100644 index 2bc31c348d..0000000000 --- a/backend/src/main/java/io/metersphere/notice/service/MailServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package io.metersphere.notice.service; - -import io.metersphere.notice.service.MailService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.mail.SimpleMailMessage; -import org.springframework.mail.javamail.JavaMailSender; -import org.springframework.stereotype.Service; - -@Service -public class MailServiceImpl implements MailService { - @Autowired - private JavaMailSender mailSender; - @Value("${mail.fromMail.addr}") - private String mailFrom; - - @Override - public void sendMail(String reportId) { - SimpleMailMessage message = new SimpleMailMessage(); - message.setFrom(mailFrom); - message.setTo("15135125273@163.com", "wenyan.yang@fit2cloud.com"); - message.setSubject("automatic"); - message.setText("自动邮件发布"); - try { - mailSender.send(message); - System.out.println("发送简单邮件"); - } catch (Exception e) { - e.printStackTrace(); - System.out.println("发送简单邮件失败"); - } - - } -} diff --git a/backend/src/main/java/io/metersphere/notice/service/NoticeService.java b/backend/src/main/java/io/metersphere/notice/service/NoticeService.java deleted file mode 100644 index 5ee9006931..0000000000 --- a/backend/src/main/java/io/metersphere/notice/service/NoticeService.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.metersphere.notice.service; - -import io.metersphere.base.domain.Notice; -import io.metersphere.base.mapper.NoticeMapper; -import io.metersphere.notice.controller.request.NoticeRequest; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -@Service -public class NoticeService { - @Resource - private NoticeMapper noticeMapper; - public void saveNotice(NoticeRequest noticeRequest){ - Notice notice=new Notice(); - noticeMapper.insert(notice); - } -} diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 319222417c..e94db0ae4d 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -78,3 +78,4 @@ spring.servlet.multipart.max-request-size=500MB management.server.port=8083 management.endpoints.web.exposure.include=* +spring.freemarker.checkTemplateLocation=false diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml deleted file mode 100644 index 3458261c33..0000000000 --- a/backend/src/main/resources/application.yml +++ /dev/null @@ -1,21 +0,0 @@ -server: - port: 9002 - -spring: - mail: - host: smtp.qq.com - username: 2363807763@qq.com - password: rerdbyjyqfbtdifb - resources: - static-locations: classpath:/resources/, classpath:/static/ ,classpath:/templates/ - -mail: - fromMail: - addr: 2363807763@qq.com # 发邮件者 - -#日志级别 -logging: - level: - root: warn - com.scaffold.test.mapper: trace - com.scaffold.test.task: trace \ No newline at end of file