1

zj

2024-06-20 8b8e8166ae6180bc959861d5301528edfd40a8e3

1

 .idea/git_toolbox_prj.xml

New file
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="GitToolBoxProjectSettings">
    <option name="commitMessageIssueKeyValidationOverride">
      <BoolValueOverride>
        <option name="enabled" value="true" />
      </BoolValueOverride>
    </option>
    <option name="commitMessageValidationEnabledOverride">
      <BoolValueOverride>
        <option name="enabled" value="true" />
      </BoolValueOverride>
    </option>
  </component>
</project>

 .idea/inspectionProfiles/Project_Default.xml

@@ -1,5 +1,17 @@
<component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
    <inspection_tool class="AlibabaAbstractClassShouldStartWithAbstractNaming" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AlibabaAvoidApacheBeanUtilsCopy" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AlibabaAvoidCallStaticSimpleDateFormat" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AlibabaAvoidComplexCondition" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AlibabaAvoidNewDateGetTime" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AlibabaAvoidPatternCompileInMethod" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AlibabaAvoidUseTimer" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AlibabaClassMustHaveAuthor" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AlibabaSneakyThrowsWithoutExceptionType" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AlibabaTestClassShouldEndWithTestNaming" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AlibabaTransactionMustHaveRollback" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AlibabaUseRightCaseForDateFormat" enabled="true" level="WARNING" enabled_by_default="true" />
  </profile>
</component>

 src/main/java/email/internal/InternalEmailSenderServiceImpl.java

@@ -2,15 +2,20 @@

import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.GeneralSecurityException;
import java.util.Date;
import java.util.Map;
import java.util.Properties;

import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeUtility;

import com.sun.mail.util.MailSSLSocketFactory;
import email.EmailPropertiesUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.io.FileSystemResource;
import org.springframework.mail.SimpleMailMessage;
import org.springframework.mail.javamail.JavaMailSenderImpl;
@@ -23,18 +28,48 @@
import freemarker.template.TemplateException;
import kernel.util.StringUtils;

public class InternalEmailSenderServiceImpl implements InternalEmailSenderService {
public class InternalEmailSenderServiceImpl implements InternalEmailSenderService, InitializingBean {
    private JavaMailSenderImpl mailSender;
    private static final Logger logger = LoggerFactory.getLogger(InternalEmailSenderServiceImpl.class);
    private SimpleMailMessage mailMessage;
    private FreeMarkerConfigurer freeMarkerConfigurer;

    @Override
    public void afterPropertiesSet() throws GeneralSecurityException {
        mailSender = new JavaMailSenderImpl();
        mailSender.setUsername(EmailPropertiesUtil.getProperty("email.username"));
        mailSender.setPassword(EmailPropertiesUtil.getProperty("email.password"));
        mailSender.setHost(EmailPropertiesUtil.getProperty("email.host"));
        Properties javaMailProperties = new Properties();
        javaMailProperties.setProperty("mail.smtp.port", "465");
        javaMailProperties.setProperty("mail.smtp.starttls.enable", "true");
        javaMailProperties.setProperty("mail.smtp.auth", "true");
        javaMailProperties.setProperty("mmail.debug", "true");
        javaMailProperties.setProperty("mail.smtp.host", "smtp.gmail.com");
        javaMailProperties.setProperty("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
        javaMailProperties.setProperty("mail.smtp.socketFactory.port", "465");
        MailSSLSocketFactory sf = new MailSSLSocketFactory("TLSv1.2");
        sf.setTrustAllHosts(true);
        javaMailProperties.put("mail.smtp.ssl.socketFactory",sf);
        javaMailProperties.setProperty("mail.smtp.ssl.portocols","TLSv1.2");
        mailSender.setJavaMailProperties(javaMailProperties);
        mailMessage = new SimpleMailMessage();
        mailMessage.setFrom(EmailPropertiesUtil.getProperty("email.from"));
        freeMarkerConfigurer = new FreeMarkerConfigurer();
        freeMarkerConfigurer.setTemplateLoaderPath("classpath:email/ftl");
        Properties settings = new Properties();
        settings.setProperty("template_update_delay", "1800");
        settings.setProperty("default_encoding", "UTF-8");
        settings.setProperty("locale", "zh_CN");
        freeMarkerConfigurer.setFreemarkerSettings(settings);
    }

    @Override
    public void send(EmailMessage emailMessage) {
        try {

            logger.info("-----进到邮件发送-----");
            MimeMessage mailMsg = this.mailSender.createMimeMessage();

            logger.info("----------邮件发送,接收邮箱："+emailMessage.getTomail()+"发送邮箱："+this.mailMessage.getFrom());
            MimeMessageHelper messageHelper = new MimeMessageHelper(mailMsg, true, "UTF-8");
            messageHelper.setTo(emailMessage.getTomail());// 接收邮箱
            messageHelper.setFrom(this.mailMessage.getFrom());// 发送邮箱
@@ -46,7 +81,7 @@
            } else {
                messageHelper.setText(this.getMailText(emailMessage.getFtlname(), emailMessage.getMap()), true);// 邮件内容
            }

            logger.info("-----1111111-----");
            // true 表示启动HTML格式的邮件
            if (emailMessage.getFile() != null) {
                // 添加邮件附件
@@ -57,13 +92,15 @@
                // 使用MimeUtility.encodeWord 解决附件名中文乱码的问题
                messageHelper.addAttachment(MimeUtility.encodeWord(emailMessage.getFilename()), rarfile);
            }

            logger.info("-----邮件开始发送-----开始");
            this.mailSender.send(mailMsg);// 发送

            logger.info("-----邮件开始发送-----成功");
        } catch (MessagingException e) {
            logger.error(e.getMessage(), e);
            logger.error("邮件发送失败【MessagingException】"+e.getMessage(), e);
        } catch (UnsupportedEncodingException e) {
            logger.error(e.getMessage(), e);
            logger.error("邮件发送失败【UnsupportedEncodingException】"+e.getMessage(), e);
        }catch (Exception e){
            logger.error("邮件发送失败【Exception】"+"邮件发送失败"+e.getMessage(), e);
        }

    }

 src/main/java/project/futures/internal/FuturesOrderServiceImpl.java

@@ -582,7 +582,7 @@
        map.put("symbol", order.getSymbol());
        map.put("open_time", DateUtils.format(order.getCreate_time(), DateUtils.DF_yyyyMMddHHmmss));
        if (order.getClose_time() != null) {
            map.put("close_time", DateUtils.format(order.getClose_time(), DateUtils.DF_yyyyMMddHHmmss));
            map.put("close_time", DateUtils.format(order.getClose_time(), "yyyy-MM-dd  hh:mm:ss"));
        } else {
            map.put("close_time", "--");
        }
@@ -604,7 +604,7 @@

        map.put("volume", order.getVolume());

        map.put("settlement_time", DateUtils.format(order.getSettlement_time(), DateUtils.DF_yyyyMMddHHmmss));// 交割时间
        map.put("settlement_time", DateUtils.format(order.getSettlement_time(),  "yyyy-MM-dd  hh:mm:ss"));// 交割时间
        map.put("close_price", df_symbol.format(order.getClose_avg_price()));
        map.put("remain_time", StringUtils.isEmptyString(order.getRemain_time()) ? "0:0:0" : order.getRemain_time());
        map.put("time_num", order.getTimeNum());

 src/main/java/project/web/admin/kyc/AdminKycController.java

@@ -54,7 +54,7 @@
            page = this.adminKycService.pagedQuery(pageNo, pageSize, name_para, state_para,
                    rolename_para, getLoginPartyId(), idnumber_para, email_para);

            String preImg = Constants.WEB_URL + "/public/showimg!showImg.action?imagePath=";
            String preImg = "https://www.coinzne.com/wap/public/showimg!showImg.action?imagePath=";

            for (Map<String, Object> map : (List<Map<String, Object>>) page.getElements()) {
                map.put("name_encode", map.get("name").toString().replace("\'", "\\\'").replace("\"", "\\\""));

 src/main/java/project/web/admin/security/LoginController.java

@@ -113,7 +113,7 @@
        
        //密码校验错误返回登录页面
        String md5 = passwordEncoder.encodePassword(password, user.getUsername());
		
        logger.info("----------密码："+md5);
        if (!user.getPassword().equals(md5)) {
            modelAndView.addObject("error", "登录密码错误!");
            modelAndView.setViewName("login");

 src/main/java/project/web/api/RealtimeController.java

@@ -2,11 +2,8 @@

import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

import javax.servlet.http.HttpServletRequest;

@@ -69,8 +66,7 @@
                    realtime.setOrder(order);
                    list_clone.add(realtime);
                }
                Collections.sort(list_clone);
                data = list_clone;
                data = list_clone.stream().sorted(Comparator.comparing(Realtime::getClose).reversed()).collect(Collectors.toList());
            }
            resultObject.setData(this.revise(data));
            return JSONObject.toJSONString(resultObject);

 src/main/resources/spring/applicationContext-email.xml

@@ -45,6 +45,7 @@
                <prop key="mail.smtp.auth">true</prop>
                <prop key="mail.smtp.port">465</prop>
                <prop key="mail.smtp.ssl.enable">true</prop>
                <prop key="mail.smtp.starttls.enable">true</prop>
                <prop key="mail.debug">true</prop>
                <prop key="mail.smtp.host">smtp.gmail.com</prop>
                <prop key="mail.smtp.socketFactory.class">javax.net.ssl.SSLSocketFactory</prop>