冲突解决

pom.xml

@@ -200,7 +200,7 @@
 			<version>6.4</version>
 		</dependency>
 
-		<dependency>
+		<!--<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jul-to-slf4j</artifactId>
 			<scope>compile</scope>
@@ -208,7 +208,7 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
-		</dependency>
+		</dependency>-->
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
@@ -272,6 +272,15 @@
 	        <artifactId>spring-security-test</artifactId>
 	        <scope>test</scope>
 	    </dependency>
+	    <!-- spring security redis管理session -->
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session-data-redis</artifactId>
+		</dependency>
+		<dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+        </dependency>
 	</dependencies>
 	<build>
 		<finalName>jz-dmp-service</finalName>