测试

eladmin-common/pom.xml

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

eladmin-generator/pom.xml

@@ -6,6 +6,7 @@
         <artifactId>eladmin</artifactId>
         <groupId>me.zhengjie</groupId>
         <version>2.6</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -36,4 +37,4 @@
             <version>${configuration.version}</version>
         </dependency>
     </dependencies>
-</project>
+</project>

eladmin-logging/pom.xml

@@ -6,6 +6,7 @@
         <artifactId>eladmin</artifactId>
         <groupId>me.zhengjie</groupId>
         <version>2.6</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,4 +20,4 @@
             <version>2.6</version>
         </dependency>
     </dependencies>
-</project>
+</project>

eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogErrorMapperImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-06-21T17:29:40+0800",
+    date = "2023-07-26T09:47:47+0800",
     comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_251 (Oracle Corporation)"
 )
 @Component

eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogSmallMapperImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-06-21T17:29:40+0800",
+    date = "2023-07-26T09:47:46+0800",
     comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_251 (Oracle Corporation)"
 )
 @Component

eladmin-system/pom.xml

@@ -6,6 +6,7 @@
         <artifactId>eladmin</artifactId>
         <groupId>me.zhengjie</groupId>
         <version>2.6</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -145,6 +146,14 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
+            <!-- 主体启动类 -->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>me.zhengjie.AppRun</mainClass>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

eladmin-system/src/main/java/me/zhengjie/AppRun.java

@@ -16,6 +16,7 @@
 package me.zhengjie;
 
 import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.annotation.rest.AnonymousGetMapping;
 import me.zhengjie.utils.SpringContextHolder;
 import org.springframework.boot.SpringApplication;
@@ -35,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author Zheng Jie
  * @date 2018/11/15 9:20:19
  */
+@Slf4j
 @EnableAsync
 @RestController
 @EnableScheduling

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());
                             // 首次加载

eladmin-system/src/main/resources/config/application-dev.yml

@@ -4,7 +4,7 @@ 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
       # 初始连接数
@@ -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

eladmin-system/src/test/java/me/zhengjie/SimpleTest.java

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

eladmin-tools/pom.xml

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