bb

anban9616 · Nov 18, 2018 · 2917fb6 · 2917fb6
1 parent e32bfcb
commit 2917fb6
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 36 deletions.
diff --git a/pom.xml b/pom.xml
@@ -165,21 +165,13 @@
 		</dependency>
 
 		<!-- spring mvc json支持 -->
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>2.8.11</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>2.8.11</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.8.11.1</version>
+		    <groupId>com.fasterxml.jackson.core</groupId>
+		    <artifactId>jackson-core</artifactId>
+		    <version>2.9.7</version>
 		</dependency>
+
 
 		<!-- servlet-api -->
 		<dependency>

diff --git a/src/main/java/zhku/zhou/asset/controller/device/DeviceRepairServlet.java b/src/main/java/zhku/zhou/asset/controller/device/DeviceRepairServlet.java
@@ -11,8 +11,6 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
-
 import zhku.zhou.asset.entity.Device;
 import zhku.zhou.asset.entity.DeviceRepair;
 import zhku.zhou.asset.entity.DeviceRepairPage;

diff --git a/src/main/java/zhku/zhou/asset/filter/DeviceManagerFilter.java b/src/main/java/zhku/zhou/asset/filter/DeviceManagerFilter.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 
-import javax.annotation.PostConstruct;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -13,12 +12,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import zhku.zhou.asset.entity.Role;
 import zhku.zhou.asset.entity.User;
-import zhku.zhou.asset.service.system.RoleService;
 @Component
 @WebFilter("/*")
 public class DeviceManagerFilter implements Filter {

diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties
@@ -1,7 +1,7 @@
 #基本属性driverClassName、 url、user、password
-datasource.url = jdbc:mysql://192.168.116.128:3306/zhku_asset?useUnicode=true&characterEncoding=utf-8
+datasource.url = jdbc:mysql://192.168.116.129:3306/zhku_asset?useUnicode=true&characterEncoding=utf-8
 datasource.username = root
-datasource.password = $ANzhou9616
+datasource.password = ANzhou9616
 datasource.driver-class-name=com.mysql.jdbc.Driver
 #配置初始化大小、最小、最大 -->
 #通常来说，只需要修改initialSize、minIdle、maxActive 

diff --git a/target/classes/jdbc.properties b/target/classes/jdbc.properties
@@ -1,7 +1,7 @@
 #基本属性driverClassName、 url、user、password
-datasource.url = jdbc:mysql://192.168.116.128:3306/zhku_asset?useUnicode=true&characterEncoding=utf-8
+datasource.url = jdbc:mysql://192.168.116.129:3306/zhku_asset?useUnicode=true&characterEncoding=utf-8
 datasource.username = root
-datasource.password = $ANzhou9616
+datasource.password = ANzhou9616
 datasource.driver-class-name=com.mysql.jdbc.Driver
 #配置初始化大小、最小、最大 -->
 #通常来说，只需要修改initialSize、minIdle、maxActive 

diff --git a/target/classes/zhku/zhou/asset/controller/device/DeviceRepairServlet.class b/target/classes/zhku/zhou/asset/controller/device/DeviceRepairServlet.class
diff --git a/target/classes/zhku/zhou/asset/filter/DeviceManagerFilter.class b/target/classes/zhku/zhou/asset/filter/DeviceManagerFilter.class
diff --git a/target/m2e-wtp/web-resources/META-INF/maven/com.zhku/assets/pom.properties b/target/m2e-wtp/web-resources/META-INF/maven/com.zhku/assets/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Sun Nov 18 12:22:42 CST 2018
+#Sun Nov 18 12:26:12 CST 2018
 version=1.0
 groupId=com.zhku
 m2e.projectName=assets

diff --git a/target/m2e-wtp/web-resources/META-INF/maven/com.zhku/assets/pom.xml b/target/m2e-wtp/web-resources/META-INF/maven/com.zhku/assets/pom.xml
@@ -165,21 +165,13 @@
 		</dependency>
 
 		<!-- spring mvc json支持 -->
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>2.8.11</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>2.8.11</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.8.11.1</version>
+		    <groupId>com.fasterxml.jackson.core</groupId>
+		    <artifactId>jackson-core</artifactId>
+		    <version>2.9.7</version>
 		</dependency>
+
 
 		<!-- servlet-api -->
 		<dependency>