Skip to content

J
jz-dmp-service
Commit 4841f70c authored by sml's avatar sml
Browse files
Options

冲突解决

parent 07d3b95b
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 2 deletions
pom.xml
View file @ 4841f70c
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
<version>6.4</version> <version>6.4</version>
</dependency> </dependency>
<dependency> <!--<dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId> <artifactId>jul-to-slf4j</artifactId>
<scope>compile</scope> <scope>compile</scope>
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId> <artifactId>log4j-slf4j-impl</artifactId>
</dependency> </dependency>-->
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
...@@ -272,6 +272,15 @@ ...@@ -272,6 +272,15 @@
<artifactId>spring-security-test</artifactId> <artifactId>spring-security-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </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> </dependencies>
<build> <build>
<finalName>jz-dmp-service</finalName> <finalName>jz-dmp-service</finalName>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment