Merge branch 'develop' of http://112.74.196.215:3000/Tech2/data-daq into develop

service-daq/src/main/java/com/simuwang/daq/service/EmailParseService.java

@@ -27,6 +27,7 @@ import com.simuwang.base.pojo.valuation.CmValuationTableAttribute;
 import com.simuwang.daq.components.PythonReportConverter;
 import com.simuwang.daq.components.writer.ReportWriterFactory;
 import jakarta.mail.*;
+import jakarta.mail.internet.MimeMessage;
 import jakarta.mail.internet.MimeMultipart;
 import jakarta.mail.search.ComparisonTerm;
 import jakarta.mail.search.ReceivedDateTerm;
@@ -766,7 +767,8 @@ public class EmailParseService {
             return MapUtil.newHashMap();
         }
         Map<String, List<EmailContentInfoDTO>> emailMessageMap = MapUtil.newHashMap();
-        for (Message message : messages) {
+        for (Message message1 : messages) {
+            MimeMessage message = (MimeMessage) message1;
             List<EmailContentInfoDTO> emailContentInfoDTOList = CollUtil.newArrayList();
             String uuidKey = UUID.randomUUID().toString().replaceAll("-", "");
             Integer emailType;

service-deploy/src/main/java/com/simuwang/deploy/components/LoggingAspect.java

@@ -1,5 +1,6 @@
 package com.simuwang.deploy.components;
 
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
@@ -20,6 +21,8 @@ import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpMethod;
 import org.springframework.util.StopWatch;
 
+import java.util.Iterator;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -81,7 +84,14 @@ public class LoggingAspect {
         boolean uploadRequest = isUploadRequest(request);
         StringBuilder params;
         if (request.getMethod().equalsIgnoreCase(HttpMethod.GET.name()) && !uploadRequest) {
-            params = new StringBuilder(Objects.toString(request.getParameterMap()));
+            List<String> tempList = ListUtil.list(false);
+            Iterator<String> paramNames = request.getParameterNames().asIterator();
+            while (paramNames.hasNext()) {
+                String param = paramNames.next();
+                String value = request.getParameter(param);
+                tempList.add(param + "=" + value);
+            }
+            params = new StringBuilder(String.join(",", tempList));
         } else {
             params = new StringBuilder();
             for (Object arg : args) {