OWL ITS + 탐지시스템(인터넷 진흥원)
- 각종 메일 메일 주소 안썼을 경우 테스트(메일주소 없을 경우 예외처리)
2개 파일 변경됨
72 ■■■■■ 파일 변경됨
src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java 42 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java 30 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
@@ -269,30 +269,34 @@
        MimeMessage message = this.javaMailSender.createMimeMessage();
        try {
            InternetAddress from = new InternetAddress(this.emailUserName, this.emailSender);
            MimeMessageHelper messageHelper = new MimeMessageHelper(message, true, "utf-8");
            messageHelper.setSubject(subject);
            messageHelper.setText(content, true);
            messageHelper.setFrom(from);
            messageHelper.setTo(to);
            if (this.emailSender != null && !this.emailSender.equals("")
                && this.emailUserName != null && !this.emailUserName.equals("")) {
            if (multipartFiles != null && multipartFiles.size() > 0) {
                for (MultipartFile file : multipartFiles) {
                    // 파일 첨부
                    messageHelper.addAttachment(MimeUtility.encodeText(file.getOriginalFilename(), "utf-8", "B"), file);
                }
            }
                InternetAddress from = new InternetAddress(this.emailUserName, this.emailSender);
                MimeMessageHelper messageHelper = new MimeMessageHelper(message, true, "utf-8");
                messageHelper.setSubject(subject);
                messageHelper.setText(content, true);
                messageHelper.setFrom(from);
                messageHelper.setTo(to);
            if (filePaths != null && filePaths.length > 0) {
                for (String filePath : filePaths) {
                    if (!StringUtils.isEmpty(filePath)) {
                        DataSource dataSource = new FileDataSource(filePath);
                        messageHelper.addAttachment(MimeUtility.encodeText(
                                FilenameUtils.getBaseName(filePath), "utf-8", "B"), dataSource);
                if (multipartFiles != null && multipartFiles.size() > 0) {
                    for (MultipartFile file : multipartFiles) {
                        // 파일 첨부
                        messageHelper.addAttachment(MimeUtility.encodeText(file.getOriginalFilename(), "utf-8", "B"), file);
                    }
                }
                if (filePaths != null && filePaths.length > 0) {
                    for (String filePath : filePaths) {
                        if (!StringUtils.isEmpty(filePath)) {
                            DataSource dataSource = new FileDataSource(filePath);
                            messageHelper.addAttachment(MimeUtility.encodeText(
                                    FilenameUtils.getBaseName(filePath), "utf-8", "B"), dataSource);
                        }
                    }
                }
                this.javaMailSender.send(message);
            }
            this.javaMailSender.send(message);
        } catch (MailSendException e) {
            log.error(e.getMessage());
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -1373,15 +1373,17 @@
        userMap.put("newUserCount", joinUsers.size());
        userMap.put("joinUsers", userVos);
        String[] sendEmails = this.userJoinStatisticsEmail.replaceAll("\\p{Z}", "").split(",");
        List<String> encryptSendEmail = Lists.newArrayList();
        if (this.userJoinStatisticsEmail != null && !this.userJoinStatisticsEmail.equals("")) {
            String[] sendEmails = this.userJoinStatisticsEmail.replaceAll("\\p{Z}", "").split(",");
            List<String> encryptSendEmail = Lists.newArrayList();
        for (String sendEmail : sendEmails) {
            encryptSendEmail.add(CommonUtil.encryptAES128(sendEmail));
            for (String sendEmail : sendEmails) {
                encryptSendEmail.add(CommonUtil.encryptAES128(sendEmail));
            }
            //  결제 성공 메일 발송
            this.systemEmailService.directEmail(encryptSendEmail.toArray(new String[encryptSendEmail.size()]), EmailType.USER_JOIN_STATISTICS, userMap, null);
        }
        //  결제 성공 메일 발송
        this.systemEmailService.directEmail(encryptSendEmail.toArray(new String[encryptSendEmail.size()]), EmailType.USER_JOIN_STATISTICS, userMap, null);
    }
    //  전체 사용자, 프로젝트 수, 이슈 수를 이메일로 보낸다.
@@ -1399,15 +1401,17 @@
        userMap.put("projectCount", CommonUtil.getDecimalFormat(projectCount));
        userMap.put("userCount", CommonUtil.getDecimalFormat(activeUsers.size()));
        String[] sendEmails = this.totalStatisticsEmail.replaceAll("\\p{Z}", "").split(",");
        List<String> encryptSendEmail = Lists.newArrayList();
        if (this.totalStatisticsEmail != null && !this.totalStatisticsEmail.equals("")) {
            String[] sendEmails = this.totalStatisticsEmail.replaceAll("\\p{Z}", "").split(",");
            List<String> encryptSendEmail = Lists.newArrayList();
        for (String sendEmail : sendEmails) {
            encryptSendEmail.add(CommonUtil.encryptAES128(sendEmail));
            for (String sendEmail : sendEmails) {
                encryptSendEmail.add(CommonUtil.encryptAES128(sendEmail));
            }
            //  결제 성공 메일 발송
            this.systemEmailService.directEmail(encryptSendEmail.toArray(new String[encryptSendEmail.size()]), EmailType.TOTAL_STATISTICS, userMap, null);
        }
        //  결제 성공 메일 발송
        this.systemEmailService.directEmail(encryptSendEmail.toArray(new String[encryptSendEmail.size()]), EmailType.TOTAL_STATISTICS, userMap, null);
    }