From 12448cb6604875e3b3df367e3b132dd1db45bff8 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 25 Jan 2024 09:58:23 +0800
Subject: [PATCH] fix：补充提交
---
screen-job/src/main/resources/application-dev.yml | 17 ++++++++++++-----
screen-job/src/main/java/com/moral/api/controller/PubController.java | 4 +++-
screen-job/src/main/java/com/moral/api/mapper/DeviceMapper.java | 2 +-
screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 2 +-
4 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/controller/PubController.java b/screen-job/src/main/java/com/moral/api/controller/PubController.java
index c1b1b4e..c29aa7e 100644
--- a/screen-job/src/main/java/com/moral/api/controller/PubController.java
+++ b/screen-job/src/main/java/com/moral/api/controller/PubController.java
@@ -21,6 +21,7 @@
import javax.mail.MessagingException;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.nio.file.Files;
import java.util.*;
/**
@@ -177,7 +178,8 @@
public void excelDevice() throws IOException {
String startTime = DateUtils.dateToDateString(DateUtils.addDays(new Date(),-1),DateUtils.yyyy_MM_dd_EN);
List<DeviceExcelDTO> list = deviceService.ListDeviceExcel(startTime,null,72);
- String path = Objects.requireNonNull(this.getClass().getClassLoader().getResource("")).getPath();
+ // String path = this.getClass().getClassLoader().getResource("/data/file").getPath();
+ String path = System.getProperty("user.dir")+"/";
String fileName = String.format("%s������������������-%s.xlsx",path,startTime);
ByteArrayOutputStream out = null;
try {
diff --git a/screen-job/src/main/java/com/moral/api/mapper/DeviceMapper.java b/screen-job/src/main/java/com/moral/api/mapper/DeviceMapper.java
index 38337bf..3b87ff3 100644
--- a/screen-job/src/main/java/com/moral/api/mapper/DeviceMapper.java
+++ b/screen-job/src/main/java/com/moral/api/mapper/DeviceMapper.java
@@ -17,5 +17,5 @@
*/
public interface DeviceMapper extends BaseMapper<Device> {
- List<DeviceExcelDTO> ListDeviceExcel(@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("id") int id);
+ List<DeviceExcelDTO> ListDeviceExcel(@Param("startTime") String startTime,@Param("id") int id);
}
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 0ecca0e..8f258a8 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -78,6 +78,6 @@
@Override
public List<DeviceExcelDTO> ListDeviceExcel(String startTime, String endTime, int id) {
- return this.baseMapper.ListDeviceExcel(startTime,endTime,id);
+ return this.baseMapper.ListDeviceExcel(startTime,id);
}
}
\ No newline at end of file
diff --git a/screen-job/src/main/resources/application-dev.yml b/screen-job/src/main/resources/application-dev.yml
index a2d70c8..8e026a0 100644
--- a/screen-job/src/main/resources/application-dev.yml
+++ b/screen-job/src/main/resources/application-dev.yml
@@ -18,7 +18,7 @@
application:
name: screen-job
redis:
- host: r-bp1xdlb9wfc6zt0msp18.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com
port: 6379
password: QxPcRedis_moarl_2320
timeout: 30000
@@ -35,7 +35,7 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1xdlb9wfc6zt0msp18.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com
port: 6379
password: QxPcRedis_moarl_2320
timeout: 30000
@@ -55,7 +55,7 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk18.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://rm-bp1pr3rx9m3fnkwskso.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: moral_qx
password: QxPcRedis_moarl_2320
test-on-borrow: false
@@ -74,9 +74,16 @@
mail:
smtp:
auth: true # ���������������������������������������������������������������������������
+ socketFactory:
+ port: 465
+ class: javax.net.ssl.SSLSocketFactory
+ fallback: false
starttls: #SMTP������������:���������������TLS������������
- enable: true
- required: true
+ enable: true
+ required: true
+ protocol: smtp
+ port: 465
+ default-encoding: UTF-8
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
global-config:
--
Gitblit v1.8.0