修改参数

dev
bynt 1 year ago
parent 8a8ff4fee0
commit eef0d61e5a

@ -6,6 +6,7 @@
<artifactId>eladmin</artifactId> <artifactId>eladmin</artifactId>
<groupId>me.zhengjie</groupId> <groupId>me.zhengjie</groupId>
<version>2.6</version> <version>2.6</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>

@ -6,6 +6,7 @@
<artifactId>eladmin</artifactId> <artifactId>eladmin</artifactId>
<groupId>me.zhengjie</groupId> <groupId>me.zhengjie</groupId>
<version>2.6</version> <version>2.6</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

@ -6,6 +6,7 @@
<artifactId>eladmin</artifactId> <artifactId>eladmin</artifactId>
<groupId>me.zhengjie</groupId> <groupId>me.zhengjie</groupId>
<version>2.6</version> <version>2.6</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

@ -109,11 +109,12 @@ public class GenderConversionTask {
}); });
if (StringUtils.isNotBlank(byTaskName.getDownPath())) { if (StringUtils.isNotBlank(byTaskName.getDownPath())) {
FileUtil.writeToCsv(joinList, parseFile.getPath(), Boolean.TRUE); String replaceUrl = byTaskName.getDownPath().replace(".zip", ".csv");
FileUtil.writeToCsv(joinList, replaceUrl, Boolean.TRUE);
// 设置压缩文件 // 设置压缩文件
CompressUtil.decryptionCompression(path, parseFile.getPath(), null); CompressUtil.decryptionCompression(byTaskName.getDownPath(), replaceUrl, null);
deliveryGenderService.update(byTaskName); deliveryGenderService.update(byTaskName);
return; continue;
} }
String down = deliveryProperties.getFileUrl().concat(StrUtil.SLASH).concat(IdUtil.fastSimpleUUID()); String down = deliveryProperties.getFileUrl().concat(StrUtil.SLASH).concat(IdUtil.fastSimpleUUID());
// 首次加载 // 首次加载

@ -4,9 +4,9 @@ spring:
druid: druid:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://8.130.96.163:3306/eladmin-plat2?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false url: jdbc:log4jdbc:mysql://127.0.0.1:3306/eladmin-plat2?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username: root username: root
password: y7z7noq2 password: '012099'
# 初始连接数 # 初始连接数
initial-size: 5 initial-size: 5
# 最小连接数 # 最小连接数
@ -145,3 +145,11 @@ rdsFileRecord:
reqUrl: http://116.62.197.152:8000/api/temp/file/link/nofile?filePath= reqUrl: http://116.62.197.152:8000/api/temp/file/link/nofile?filePath=
gender:
emailPassword: baiye2022
fileUrl: F:\mail
zipPassword: DB2022hjk213v1...
emailAddress: ensoze@outlook.com
downPath: https://xx.tuoz.net/file/mail/
genderEmailAddress: ensoze2023@outlook.com
toGenderEmailAddress: ggggod_2022@outlook.com

@ -6,7 +6,7 @@ spring:
freemarker: freemarker:
check-template-location: false check-template-location: false
profiles: profiles:
active: dev active: prod
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
data: data:

@ -188,7 +188,6 @@ public class SimpleTest {
System.out.println(string); System.out.println(string);
} }
} }

@ -6,6 +6,7 @@
<artifactId>eladmin</artifactId> <artifactId>eladmin</artifactId>
<groupId>me.zhengjie</groupId> <groupId>me.zhengjie</groupId>
<version>2.6</version> <version>2.6</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -24,6 +25,7 @@
<groupId>me.zhengjie</groupId> <groupId>me.zhengjie</groupId>
<artifactId>eladmin-logging</artifactId> <artifactId>eladmin-logging</artifactId>
<version>2.6</version> <version>2.6</version>
</dependency> </dependency>
<!--邮件依赖--> <!--邮件依赖-->

Loading…
Cancel
Save