From 56b06757b4adcc2b4d61af7da0f87c1d9e939e72 Mon Sep 17 00:00:00 2001
From: Administrator <1525436766@qq.com>
Date: 星期二, 14 十二月 2021 10:59:30 +0800
Subject: [PATCH] 升级log4j版本,修复开源包漏洞

---
 Torque_sensor/.classpath                               |   38 +++++++++++++++++++-------------------
 /dev/null                                              |    0 
 Torque_sensor/lib/log4j-api-2.15.0.jar                 |    0 
 Torque_sensor/src/main/main_Torque_sensor_Monitor.java |    4 ++--
 Torque_sensor/src/com/version_inf/version_inf.txt      |    5 ++++-
 Torque_sensor/lib/log4j-core-2.15.0.jar                |    0 
 6 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/Torque_sensor/.classpath b/Torque_sensor/.classpath
index f05e6b5..52d12a4 100644
--- a/Torque_sensor/.classpath
+++ b/Torque_sensor/.classpath
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="lib/commons-lang3-3.11.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/>
-	<classpathentry kind="lib" path="lib/modbus4j-3.0.4-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="lib/c3p0-0.9.5.jar"/>
-	<classpathentry kind="lib" path="lib/c3p0-oracle-thin-extras-0.9.5.jar"/>
-	<classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/>
-	<classpathentry kind="lib" path="lib/commons-net-3.6.jar"/>
-	<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>
-	<classpathentry kind="lib" path="lib/mchange-commons-java-0.2.9.jar"/>
-	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.30-bin.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-api-2.13.3.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-core-2.13.3.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="lib/commons-lang3-3.11.jar"/>
+	<classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/modbus4j-3.0.4-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/c3p0-0.9.5.jar"/>
+	<classpathentry kind="lib" path="lib/c3p0-oracle-thin-extras-0.9.5.jar"/>
+	<classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/>
+	<classpathentry kind="lib" path="lib/commons-net-3.6.jar"/>
+	<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
+	<classpathentry kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>
+	<classpathentry kind="lib" path="lib/mchange-commons-java-0.2.9.jar"/>
+	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.30-bin.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-api-2.15.0.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-core-2.15.0.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Torque_sensor/lib/log4j-api-2.13.3.jar b/Torque_sensor/lib/log4j-api-2.13.3.jar
deleted file mode 100644
index 95e665d..0000000
--- a/Torque_sensor/lib/log4j-api-2.13.3.jar
+++ /dev/null
Binary files differ
diff --git a/Torque_sensor/lib/log4j-api-2.15.0.jar b/Torque_sensor/lib/log4j-api-2.15.0.jar
new file mode 100644
index 0000000..a662571
--- /dev/null
+++ b/Torque_sensor/lib/log4j-api-2.15.0.jar
Binary files differ
diff --git a/Torque_sensor/lib/log4j-core-2.13.3.jar b/Torque_sensor/lib/log4j-core-2.13.3.jar
deleted file mode 100644
index 973fa7b..0000000
--- a/Torque_sensor/lib/log4j-core-2.13.3.jar
+++ /dev/null
Binary files differ
diff --git a/Torque_sensor/lib/log4j-core-2.15.0.jar b/Torque_sensor/lib/log4j-core-2.15.0.jar
new file mode 100644
index 0000000..f7e14b8
--- /dev/null
+++ b/Torque_sensor/lib/log4j-core-2.15.0.jar
Binary files differ
diff --git a/Torque_sensor/src/com/version_inf/version_inf.txt b/Torque_sensor/src/com/version_inf/version_inf.txt
index 791213b..22d4ce7 100644
--- a/Torque_sensor/src/com/version_inf/version_inf.txt
+++ b/Torque_sensor/src/com/version_inf/version_inf.txt
@@ -1,2 +1,5 @@
 V1.101
-	AFE变频器通讯系统
\ No newline at end of file
+	AFE变频器通讯系统
+	
+V1.102	lijun	2021-12-14
+	1.升级log4j版本,修复开源包漏洞
\ No newline at end of file
diff --git a/Torque_sensor/src/main/main_Torque_sensor_Monitor.java b/Torque_sensor/src/main/main_Torque_sensor_Monitor.java
index d0847c8..821abb6 100644
--- a/Torque_sensor/src/main/main_Torque_sensor_Monitor.java
+++ b/Torque_sensor/src/main/main_Torque_sensor_Monitor.java
@@ -1,4 +1,4 @@
-package main;
+				package main;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -22,7 +22,7 @@
 	/**************************************************************************/
 	/**************************************************************************/
 	/**************************************************************************/
-	public final static double m_VersionNum = 1.101;
+	public final static double m_VersionNum = 1.102;
 	public final static String m_Version = "Welcome To Use main_Torque_sensor_Monitor V" 
 											+ m_VersionNum ;
 	/**************************************************************************/

--
Gitblit v1.9.1