调整程序兼容ie浏览器

.idea/compiler.xml

@@ -7,7 +7,7 @@
         <processorPath useClasspath="false">
           <entry name="$USER_HOME$/.m2/repository/org/projectlombok/lombok/1.18.20/lombok-1.18.20.jar" />
         </processorPath>
-        <module name="report-import.report-fd.main" />
+        <module name="report-import.report.main" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel target="1.8" />

.idea/gradle.xml

@@ -11,7 +11,7 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/report-fd" />
+            <option value="$PROJECT_DIR$/report" />
           </set>
         </option>
       </GradleProjectSettings>

.idea/modules/report-fd/report-import.report-fd.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../../report">
+      <excludeFolder url="file://$MODULE_DIR$/../../../report/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../report/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/sonarlint/issuestore/1/9/19ea878502cdbecca051e7c1a20cec4b871391ff

@@ -1,8 +0,0 @@
-
-o	java:S115
"ZRename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.(™ƒíÐ
-o	java:S115"ZRename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.(¦�Öé

-[
-java:S1124
"EReorder the modifiers to comply with the Java Language Specification.(™ƒíÐ
-[
-java:S1124"EReorder the modifiers to comply with the Java Language Specification.(¦�Öé

-N	java:S106"9Replace this use of System.out or System.err by a logger.(�¹²Õ

.idea/sonarlint/issuestore/index.pb

@@ -19,8 +19,6 @@ A
 gradlew.bat,2\a\2a45a911a8f1836b0b6c5b758962572012d8f8c3
 =
 
lombok.config,8\2\823fe80d2650ec87c2614800da17ca3a55af96a9
-F
-report-fd/build.gradle,a\e\ae208822b4f47e3025c3c624e74e92be59da6f17
 w
 Greport-fd/src/main/java/com/gyee/wisdom/report/config/MyJsonConfig.java,c\4\c49395c880423d7e596a0dd1266eba1cc580afdc
 }
@@ -37,8 +35,6 @@ y
 Ireport-fd/src/main/java/com/gyee/wisdom/report/utils/ResponseWrapper.java,7\2\72b8cbea5b9a8990d9457bafc97c2f871426b314
 q
 Areport-fd/src/main/java/com/gyee/wisdom/report/common/Common.java,0\f\0f7f23caa1ba0e5faf799053d0e70e3d3f8e49c3
-}
-Mreport-fd/src/main/java/com/gyee/wisdom/report/controller/TestController.java,1\9\19ea878502cdbecca051e7c1a20cec4b871391ff
 r
 Breport-fd/src/main/java/com/gyee/wisdom/report/utils/MD5Utils.java,c\d\cde91cfe0702f14ad2a2d9cd20925b718d98dfee
 z
@@ -57,7 +53,13 @@ o
 Kreport-fd/src/main/java/com/gyee/wisdom/report/entity/WindpowerStation.java,a\c\ac7df921dda2077d74dd8480067b6e053f2bc2bc
 s
 Creport-fd/src/main/java/com/gyee/wisdom/report/utils/ExcelUtil.java,5\5\55fc1a57b170a7294343d8bbf922f6461ea35be3
-?
-settings.gradle,0\5\05efc8b1657769a27696d478ded1e95f38737233
 9
-	README.md,8\e\8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
+	README.md,8\e\8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
+h
+8.idea/modules/report-gf/report-import.report-gf.main.iml,0\4\0446ad0a01e31873dc33390761e97b742c8a6f09
+h
+8.idea/modules/report-gf/report-import.report-gf.test.iml,0\3\039847ec07ecdaf6226505dd8c2f00bd9c43bcba
+>
+logs/error.log,5\a\5a00245462ed6666737fdbfd3ba4de91698d61ae
+C
+report-fd/README.md,c\3\c396dfa43d43494c4862f9fac25bc32b442b74ab

.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

logs/warn.log

@@ -1,108 +1,2 @@
-2022-12-29 09:23:27.050  WARN main handleDeployment(Bootstrap.java:68) UT026010: Buffer pool was not set on WebSocketDeploymentInfo, the default pool will be used
-2022-12-29 09:25:33.998 ERROR XNIO-1 task-1 handleThrowable(LoggingExceptionHandler.java:80) UT005023: Exception handling request to /report/importPv
-org.springframework.web.util.NestedServletException: Request processing failed; nested exception is org.springframework.web.multipart.MultipartException: Failed to parse multipart servlet request; nested exception is java.lang.RuntimeException: java.io.IOException: UT000128: Remote peer closed connection before all data could be read
-	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1014) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:909) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	at javax.servlet.http.HttpServlet.service(HttpServlet.java:665) ~[javax.servlet-api-4.0.1.jar:4.0.1]
-	at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	at javax.servlet.http.HttpServlet.service(HttpServlet.java:750) ~[javax.servlet-api-4.0.1.jar:4.0.1]
-	at io.undertow.servlet.handlers.ServletHandler.handleRequest(ServletHandler.java:74) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:129) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at org.springframework.web.filter.CorsFilter.doFilterInternal(CorsFilter.java:91) ~[spring-web-5.3.20.jar:5.3.20]
-	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) ~[spring-web-5.3.20.jar:5.3.20]
-	at io.undertow.servlet.core.ManagedFilter.doFilter(ManagedFilter.java:61) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:131) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at org.springframework.web.servlet.resource.ResourceUrlEncodingFilter.doFilter(ResourceUrlEncodingFilter.java:67) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	at io.undertow.servlet.core.ManagedFilter.doFilter(ManagedFilter.java:61) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:131) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100) ~[spring-web-5.3.20.jar:5.3.20]
-	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) ~[spring-web-5.3.20.jar:5.3.20]
-	at io.undertow.servlet.core.ManagedFilter.doFilter(ManagedFilter.java:61) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:131) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93) ~[spring-web-5.3.20.jar:5.3.20]
-	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) ~[spring-web-5.3.20.jar:5.3.20]
-	at io.undertow.servlet.core.ManagedFilter.doFilter(ManagedFilter.java:61) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:131) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201) ~[spring-web-5.3.20.jar:5.3.20]
-	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) ~[spring-web-5.3.20.jar:5.3.20]
-	at io.undertow.servlet.core.ManagedFilter.doFilter(ManagedFilter.java:61) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:131) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.FilterHandler.handleRequest(FilterHandler.java:84) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.security.ServletSecurityRoleHandler.handleRequest(ServletSecurityRoleHandler.java:62) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.ServletChain$1.handleRequest(ServletChain.java:68) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.ServletDispatchingHandler.handleRequest(ServletDispatchingHandler.java:36) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.RedirectDirHandler.handleRequest(RedirectDirHandler.java:68) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.security.SSLInformationAssociationHandler.handleRequest(SSLInformationAssociationHandler.java:117) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.security.ServletAuthenticationCallHandler.handleRequest(ServletAuthenticationCallHandler.java:57) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43) ~[undertow-core-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.security.handlers.AbstractConfidentialityHandler.handleRequest(AbstractConfidentialityHandler.java:46) ~[undertow-core-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.security.ServletConfidentialityConstraintHandler.handleRequest(ServletConfidentialityConstraintHandler.java:64) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.security.handlers.AuthenticationMechanismsHandler.handleRequest(AuthenticationMechanismsHandler.java:60) ~[undertow-core-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.security.CachedAuthenticatedSessionHandler.handleRequest(CachedAuthenticatedSessionHandler.java:77) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.security.handlers.AbstractSecurityContextAssociationHandler.handleRequest(AbstractSecurityContextAssociationHandler.java:43) ~[undertow-core-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43) ~[undertow-core-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.SendErrorPageHandler.handleRequest(SendErrorPageHandler.java:52) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43) ~[undertow-core-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.ServletInitialHandler.handleFirstRequest(ServletInitialHandler.java:275) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.ServletInitialHandler.access$100(ServletInitialHandler.java:79) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:134) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:131) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.core.ServletRequestContextThreadSetupAction$1.call(ServletRequestContextThreadSetupAction.java:48) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.core.ContextClassLoaderSetupAction$1.call(ContextClassLoaderSetupAction.java:43) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.ServletInitialHandler.dispatchRequest(ServletInitialHandler.java:255) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.ServletInitialHandler.access$000(ServletInitialHandler.java:79) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.handlers.ServletInitialHandler$1.handleRequest(ServletInitialHandler.java:100) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.server.Connectors.executeRootHandler(Connectors.java:387) ~[undertow-core-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.server.HttpServerExchange$1.run(HttpServerExchange.java:852) ~[undertow-core-2.2.17.Final.jar:2.2.17.Final]
-	at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) ~[jboss-threads-3.1.0.Final.jar:3.1.0.Final]
-	at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2019) ~[jboss-threads-3.1.0.Final.jar:3.1.0.Final]
-	at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1558) ~[jboss-threads-3.1.0.Final.jar:3.1.0.Final]
-	at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1449) ~[jboss-threads-3.1.0.Final.jar:3.1.0.Final]
-	at org.xnio.XnioWorker$WorkerThreadFactory$1$1.run(XnioWorker.java:1280) ~[xnio-api-3.8.6.Final.jar:3.8.6.Final]
-	at java.lang.Thread.run(Thread.java:748) ~[?:1.8.0_241]
-Caused by: org.springframework.web.multipart.MultipartException: Failed to parse multipart servlet request; nested exception is java.lang.RuntimeException: java.io.IOException: UT000128: Remote peer closed connection before all data could be read
-	at org.springframework.web.multipart.support.StandardMultipartHttpServletRequest.handleParseFailure(StandardMultipartHttpServletRequest.java:124) ~[spring-web-5.3.20.jar:5.3.20]
-	at org.springframework.web.multipart.support.StandardMultipartHttpServletRequest.parseRequest(StandardMultipartHttpServletRequest.java:115) ~[spring-web-5.3.20.jar:5.3.20]
-	at org.springframework.web.multipart.support.StandardMultipartHttpServletRequest.<init>(StandardMultipartHttpServletRequest.java:88) ~[spring-web-5.3.20.jar:5.3.20]
-	at org.springframework.web.multipart.support.StandardServletMultipartResolver.resolveMultipart(StandardServletMultipartResolver.java:122) ~[spring-web-5.3.20.jar:5.3.20]
-	at org.springframework.web.servlet.DispatcherServlet.checkMultipart(DispatcherServlet.java:1205) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1039) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:963) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	... 58 more
-Caused by: java.lang.RuntimeException: java.io.IOException: UT000128: Remote peer closed connection before all data could be read
-	at io.undertow.servlet.spec.HttpServletRequestImpl.parseFormData(HttpServletRequestImpl.java:863) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.spec.HttpServletRequestImpl.loadParts(HttpServletRequestImpl.java:583) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.spec.HttpServletRequestImpl.getParts(HttpServletRequestImpl.java:534) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at javax.servlet.http.HttpServletRequestWrapper.getParts(HttpServletRequestWrapper.java:349) ~[javax.servlet-api-4.0.1.jar:4.0.1]
-	at org.springframework.web.multipart.support.StandardMultipartHttpServletRequest.parseRequest(StandardMultipartHttpServletRequest.java:95) ~[spring-web-5.3.20.jar:5.3.20]
-	at org.springframework.web.multipart.support.StandardMultipartHttpServletRequest.<init>(StandardMultipartHttpServletRequest.java:88) ~[spring-web-5.3.20.jar:5.3.20]
-	at org.springframework.web.multipart.support.StandardServletMultipartResolver.resolveMultipart(StandardServletMultipartResolver.java:122) ~[spring-web-5.3.20.jar:5.3.20]
-	at org.springframework.web.servlet.DispatcherServlet.checkMultipart(DispatcherServlet.java:1205) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1039) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:963) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	... 58 more
-Caused by: java.io.IOException: UT000128: Remote peer closed connection before all data could be read
-	at io.undertow.conduits.FixedLengthStreamSourceConduit.exitRead(FixedLengthStreamSourceConduit.java:364) ~[undertow-core-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.conduits.FixedLengthStreamSourceConduit.read(FixedLengthStreamSourceConduit.java:264) ~[undertow-core-2.2.17.Final.jar:2.2.17.Final]
-	at org.xnio.conduits.ConduitStreamSourceChannel.read(ConduitStreamSourceChannel.java:127) ~[xnio-api-3.8.6.Final.jar:3.8.6.Final]
-	at io.undertow.channels.DetachableStreamSourceChannel.read(DetachableStreamSourceChannel.java:209) ~[undertow-core-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.server.HttpServerExchange$ReadDispatchChannel.read(HttpServerExchange.java:2430) ~[undertow-core-2.2.17.Final.jar:2.2.17.Final]
-	at org.xnio.channels.Channels.readBlocking(Channels.java:344) ~[xnio-api-3.8.6.Final.jar:3.8.6.Final]
-	at io.undertow.servlet.spec.ServletInputStreamImpl.readIntoBuffer(ServletInputStreamImpl.java:201) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.spec.ServletInputStreamImpl.read(ServletInputStreamImpl.java:176) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.server.handlers.form.MultiPartParserDefinition$MultiPartUploadHandler.parseBlocking(MultiPartParserDefinition.java:226) ~[undertow-core-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.spec.HttpServletRequestImpl.parseFormData(HttpServletRequestImpl.java:857) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.spec.HttpServletRequestImpl.loadParts(HttpServletRequestImpl.java:583) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at io.undertow.servlet.spec.HttpServletRequestImpl.getParts(HttpServletRequestImpl.java:534) ~[undertow-servlet-2.2.17.Final.jar:2.2.17.Final]
-	at javax.servlet.http.HttpServletRequestWrapper.getParts(HttpServletRequestWrapper.java:349) ~[javax.servlet-api-4.0.1.jar:4.0.1]
-	at org.springframework.web.multipart.support.StandardMultipartHttpServletRequest.parseRequest(StandardMultipartHttpServletRequest.java:95) ~[spring-web-5.3.20.jar:5.3.20]
-	at org.springframework.web.multipart.support.StandardMultipartHttpServletRequest.<init>(StandardMultipartHttpServletRequest.java:88) ~[spring-web-5.3.20.jar:5.3.20]
-	at org.springframework.web.multipart.support.StandardServletMultipartResolver.resolveMultipart(StandardServletMultipartResolver.java:122) ~[spring-web-5.3.20.jar:5.3.20]
-	at org.springframework.web.servlet.DispatcherServlet.checkMultipart(DispatcherServlet.java:1205) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1039) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:963) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006) ~[spring-webmvc-5.3.20.jar:5.3.20]
-	... 58 more
-2022-12-29 10:24:38.055  WARN main handleDeployment(Bootstrap.java:68) UT026010: Buffer pool was not set on WebSocketDeploymentInfo, the default pool will be used
+2023-01-12 10:33:33.082  WARN main handleDeployment(Bootstrap.java:68) UT026010: Buffer pool was not set on WebSocketDeploymentInfo, the default pool will be used
+2023-01-12 10:45:46.317  WARN main handleDeployment(Bootstrap.java:68) UT026010: Buffer pool was not set on WebSocketDeploymentInfo, the default pool will be used

report-fd/src/main/java/com/gyee/wisdom/report/controller/ReportController.java

@@ -1,8 +1,9 @@
 package com.gyee.wisdom.report.controller;
 
 
-import com.gyee.wisdom.report.service.SeleniumService;
+import com.gyee.wisdom.report.service.SeleniumChromeService;
 import com.gyee.wisdom.report.service.ReportService;
+import com.gyee.wisdom.report.service.SeleniumIeService;
 import com.gyee.wisdom.report.utils.ResponseWrapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -39,7 +40,10 @@ public class ReportController {
 
 
     @Autowired
-    private SeleniumService seleniumService;
+    private SeleniumChromeService seleniumChromeService;
+
+    @Autowired
+    private SeleniumIeService seleniumIeService;
 
 
 
@@ -54,7 +58,7 @@ public class ReportController {
         if (!file.isEmpty()) {
             //得到三个sheet页数据
             Map<Integer, List<String[]>> map = reportService.commonReport(file);
-            seleniumService.loginAndWrite(map,departId);
+            seleniumIeService.loginAndWrite(map,departId);
             wrapper.setMsg("填报成功");
         }
         return wrapper;
@@ -72,7 +76,7 @@ public class ReportController {
         if (!file.isEmpty()) {
             //得到sheet页数据
             Map<Integer, List<String[]>> map = reportService.commonReport(file);
-            seleniumService.faultLoginAndWrite(map,departId);
+            seleniumIeService.faultLoginAndWrite(map,departId);
             wrapper.setMsg("填报成功");
         }
         return wrapper;
@@ -91,7 +95,7 @@ public class ReportController {
         if (!file.isEmpty()) {
             //得到sheet页数据
             Map<Integer, List<String[]>> map = reportService.commonReport(file);
-            seleniumService.pvLoginAndWrite(map,departId);
+            seleniumIeService.pvLoginAndWrite(map,departId);
             wrapper.setMsg("填报成功");
         }
         return wrapper;

report/src/main/java/com/gyee/wisdom/report/controller/Test2Controller.java

@@ -0,0 +1,30 @@
+package com.gyee.wisdom.report.controller;
+
+import org.openqa.selenium.ie.InternetExplorerDriver;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author ：mmzs
+ * @date ：Created in 2023/1/12 9:50
+ * @description：
+ * @modified By：
+ * @version: $
+ */
+public class Test2Controller {
+
+    public static void main(String[] args) {
+        // TODO Auto-generated method stub
+        //引用IE浏览器驱动
+        System.setProperty("webdriver.ie.driver", "D:\\gyee\\IEDriverServer.exe");
+        //创建IE浏览器对象
+        InternetExplorerDriver driver = new InternetExplorerDriver();
+        //浏览器最大化
+        driver.manage().window().maximize();
+        driver.manage().deleteAllCookies();
+        //等待浏览器加载完毕
+        driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
+        //打开网址
+        driver.get("https://www.baidu.com/");
+    }
+}

report-fd/src/main/java/com/gyee/wisdom/report/controller/TestController.java

@@ -11,6 +11,7 @@ import java.time.Duration;
 public class TestController {
 
     private final static String driver = "webdriver.chrome.driver";
+    //定义本地谷歌浏览器驱动包地址
     private final static String chromeDriver = "C:\\Program Files\\Google\\Chrome\\Application\\chromedriver.exe";
 
     public static void main(String[] args) {
@@ -28,7 +29,7 @@ public class TestController {
             //操作浏览器 获取到输入框
             WebElement kk = driver.findElement(By.id("kw"));
             //然后向百度输入框输入selenium java
-            kk.sendKeys("如也");
+            kk.sendKeys("selenium");
             //通过元素属性id=su找到百度一下搜索按钮
             WebElement btn = driver.findElement(By.id("su"));
             //对按钮进行点击操作

report-fd/src/main/java/com/gyee/wisdom/report/service/SeleniumService.java

@@ -17,16 +17,24 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+/**
+ * @author ：xugp
+ * @date ：Created in 2023/1/12 9:50
+ * @description：兼容谷歌浏览器service处理
+ * @modified By：
+ * @version: $
+ */
 @Service
-public class SeleniumService {
+public class SeleniumChromeService {
 
     @Value("${chromeDriver}")
     String chromeDriver;
 
+
     @Autowired
     private CacheService cacheService;
 
-    private final static String driver1 = "webdriver.chrome.driver";
+    private final static String driverchrome = "webdriver.chrome.driver";
 
     public void loginAndWrite(Map<Integer, List<String[]>> map, String departId) {
         WebDriver webDriver = null;
@@ -36,7 +44,7 @@ public class SeleniumService {
             List<String[]> list3 = map.get(2);
             List<String[]> listExcel = list3.subList(5,sum+5);
             System.out.println("打开浏览器进行操作");
-            System.setProperty(driver1,chromeDriver);
+            System.setProperty(driverchrome,chromeDriver);
             WebDriver driver = new ChromeDriver();
             driver.manage().window().maximize();//浏览器最大化
             //超时等待30秒
@@ -512,7 +520,7 @@ public class SeleniumService {
             //拿到excel数据
             List<String[]> listFault = map.get(3);
             System.out.println("打开浏览器进行操作");
-            System.setProperty(driver1, chromeDriver);
+            System.setProperty(driverchrome, chromeDriver);
             WebDriver driver = new ChromeDriver();
             driver.manage().window().maximize();//浏览器最大化
             //超时等待30秒
@@ -709,7 +717,7 @@ public class SeleniumService {
             List<String[]> list3 = map.get(2);
             List<String[]> listExcel = list3.subList(6,sum+6);
             System.out.println("打开浏览器进行操作");
-            System.setProperty(driver1,chromeDriver);
+            System.setProperty(driverchrome,chromeDriver);
             WebDriver driver = new ChromeDriver();
             driver.manage().window().maximize();//浏览器最大化
             //超时等待30秒

report-fd/src/main/resources/application.yaml

@@ -37,3 +37,4 @@ logging:
 chromeDriver: C:\Users\戴尔\AppData\Local\Google\Chrome\Application\chromedriver.exe
 #   宁夏新能源miss系统登录密码   AHbl***2022
 #   山西新能源miss系统登录密码   AHbl***2020
+ieDriver: D:\gyee\IEDriverServer.exe

settings.gradle

@@ -1,2 +1,2 @@
 rootProject.name = "report-import"
-include 'report-fd'
+include 'report'