From eef0d61e5ad2aa7b4f6ca3db99d8ebcdb976168a Mon Sep 17 00:00:00 2001 From: bynt Date: Tue, 25 Jul 2023 18:31:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eladmin-common/pom.xml | 1 + eladmin-generator/pom.xml | 3 ++- eladmin-system/pom.xml | 1 + .../modules/gender/task/GenderConversionTask.java | 7 ++++--- .../src/main/resources/config/application-dev.yml | 12 ++++++++++-- .../src/main/resources/config/application.yml | 2 +- .../src/test/java/me/zhengjie/SimpleTest.java | 1 - eladmin-tools/pom.xml | 2 ++ 8 files changed, 21 insertions(+), 8 deletions(-) diff --git a/eladmin-common/pom.xml b/eladmin-common/pom.xml index 0534df4..f97fbeb 100644 --- a/eladmin-common/pom.xml +++ b/eladmin-common/pom.xml @@ -6,6 +6,7 @@ eladmin me.zhengjie 2.6 + ../pom.xml 4.0.0 diff --git a/eladmin-generator/pom.xml b/eladmin-generator/pom.xml index 52cdcfb..9f45ae4 100644 --- a/eladmin-generator/pom.xml +++ b/eladmin-generator/pom.xml @@ -6,6 +6,7 @@ eladmin me.zhengjie 2.6 + ../pom.xml 4.0.0 @@ -36,4 +37,4 @@ ${configuration.version} - \ No newline at end of file + diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml index 0bbb6be..66adde1 100644 --- a/eladmin-system/pom.xml +++ b/eladmin-system/pom.xml @@ -6,6 +6,7 @@ eladmin me.zhengjie 2.6 + ../pom.xml 4.0.0 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/gender/task/GenderConversionTask.java b/eladmin-system/src/main/java/me/zhengjie/modules/gender/task/GenderConversionTask.java index d293a89..c0be8ba 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/gender/task/GenderConversionTask.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/gender/task/GenderConversionTask.java @@ -109,11 +109,12 @@ public class GenderConversionTask { }); 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); - return; + continue; } String down = deliveryProperties.getFileUrl().concat(StrUtil.SLASH).concat(IdUtil.fastSimpleUUID()); // 首次加载 diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml index b6868ba..11da42b 100644 --- a/eladmin-system/src/main/resources/config/application-dev.yml +++ b/eladmin-system/src/main/resources/config/application-dev.yml @@ -4,9 +4,9 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource 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 - password: y7z7noq2 + password: '012099' # 初始连接数 initial-size: 5 # 最小连接数 @@ -145,3 +145,11 @@ rdsFileRecord: 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 diff --git a/eladmin-system/src/main/resources/config/application.yml b/eladmin-system/src/main/resources/config/application.yml index 42177c8..0213696 100644 --- a/eladmin-system/src/main/resources/config/application.yml +++ b/eladmin-system/src/main/resources/config/application.yml @@ -6,7 +6,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: diff --git a/eladmin-system/src/test/java/me/zhengjie/SimpleTest.java b/eladmin-system/src/test/java/me/zhengjie/SimpleTest.java index f6f62da..f6b5bae 100644 --- a/eladmin-system/src/test/java/me/zhengjie/SimpleTest.java +++ b/eladmin-system/src/test/java/me/zhengjie/SimpleTest.java @@ -188,7 +188,6 @@ public class SimpleTest { System.out.println(string); } - } diff --git a/eladmin-tools/pom.xml b/eladmin-tools/pom.xml index 4282d42..1ae795d 100644 --- a/eladmin-tools/pom.xml +++ b/eladmin-tools/pom.xml @@ -6,6 +6,7 @@ eladmin me.zhengjie 2.6 + ../pom.xml 4.0.0 @@ -24,6 +25,7 @@ me.zhengjie eladmin-logging 2.6 +