diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/ip/IpUtil.java b/common/service-utils/src/main/java/cn/bunny/common/service/utils/ip/IpUtil.java index c91fcb4..3658a2f 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/ip/IpUtil.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/utils/ip/IpUtil.java @@ -59,8 +59,8 @@ public class IpUtil { String[] splitIpInfo = searchIpInfo.split("\\|"); if (splitIpInfo.length > 0) { if ("中国".equals(splitIpInfo[0])) { - // 国内属地返回省份 - return splitIpInfo[2]; + // 国内属地返回省份和地区 + return splitIpInfo[2] + "," + splitIpInfo[3] + " " + splitIpInfo[4]; } else if ("0".equals(splitIpInfo[0])) { if ("内网IP".equals(splitIpInfo[4])) { // 内网 IP @@ -92,10 +92,7 @@ public class IpUtil { ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); String remoteAddr = requestAttributes != null ? getIpAddr(requestAttributes.getRequest()) : "0:0:0:0:0:0:0:1"; String ipRegion = IpUtil.getIpRegion(remoteAddr); - return IpEntity.builder() - .remoteAddr(remoteAddr) - .ipRegion(ipRegion) - .build(); + return IpEntity.builder().remoteAddr(remoteAddr).ipRegion(ipRegion).build(); } /** diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/mail/MailSenderUtil.java b/common/service-utils/src/main/java/cn/bunny/common/service/utils/mail/MailSenderUtil.java index ecd9615..bdfd753 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/mail/MailSenderUtil.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/utils/mail/MailSenderUtil.java @@ -33,7 +33,7 @@ public class MailSenderUtil { MimeMessage message = javaMailSender.createMimeMessage(); MimeMessageHelper helper = new MimeMessageHelper(message, true); - + // message.setRecipients(Message.RecipientType.TO, InternetAddress.parse("to1@example.com,to2@example.com")); helper.setFrom(username); helper.setTo(emailSend.getSendTo()); helper.setSubject(emailSend.getSubject()); diff --git a/service/Dockerfile b/service/Dockerfile index 5303185..88286fa 100644 --- a/service/Dockerfile +++ b/service/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:17 +FROM openjdk:17-jdk-alpine MAINTAINER server #系统编码 @@ -14,6 +14,11 @@ WORKDIR /home/server # 复制jar包 COPY target/*.jar /home/server/app.jar +# 程序内部挂在目录 +VOLUME /usr/bin/docker +VOLUME ["/var/run/docker.sock"] +VOLUME /etc/docker/daemon.json + # 启动容器时的进程 ENTRYPOINT ["java","-jar","/home/server/app.jar"] diff --git a/service/src/main/java/cn/bunny/services/quartz/MailingJob.java b/service/src/main/java/cn/bunny/services/quartz/MailingJob.java new file mode 100644 index 0000000..f83dbc3 --- /dev/null +++ b/service/src/main/java/cn/bunny/services/quartz/MailingJob.java @@ -0,0 +1,13 @@ +package cn.bunny.services.quartz; + +import cn.bunny.services.factory.EmailFactory; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; + +public class MailingJob implements Job { + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + EmailFactory emailFactory = new EmailFactory(); + } +} diff --git a/service/src/main/resources/mapper/SchedulersGroupMapper.xml b/service/src/main/resources/mapper/SchedulersGroupMapper.xml index 5146389..c5eac4d 100644 --- a/service/src/main/resources/mapper/SchedulersGroupMapper.xml +++ b/service/src/main/resources/mapper/SchedulersGroupMapper.xml @@ -23,7 +23,7 @@