Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!552

pom.xml

@@ -216,14 +216,25 @@
 			<version>${shiro.version}</version>
 		</dependency> -->
 
-		<!-- redis starter -->
-		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis</artifactId> 
-			</dependency> -->
-
+		<!-- redis starter   spring boot 与redis应用基本环境配置 -->
+		<dependency> 
+			<groupId>org.springframework.boot</groupId> 
+			<artifactId>spring-boot-starter-data-redis</artifactId> 
+		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.springframework.session/spring-session-data-redis -->
-		<!-- <dependency> <groupId>org.springframework.session</groupId> <artifactId>spring-session-data-redis</artifactId> 
-			</dependency> <dependency> <groupId>redis.clients</groupId> <artifactId>jedis</artifactId> 
-			<version>2.9.0</version> </dependency> -->
+		<!--spring session 与redis应用基本环境配置,需要开启redis后才可以使用，不然启动Spring boot会报错 -->
+		<dependency> 
+			<groupId>org.springframework.session</groupId> 
+			<artifactId>spring-session-data-redis</artifactId> 
+		</dependency>
+		<!--jedis --> 
+		<dependency> 
+			<groupId>redis.clients</groupId> 
+			<artifactId>jedis</artifactId> 
+			<version>2.9.0</version> 
+		</dependency>
+
+
 
 		<dependency>
 		    <groupId>com.alibaba</groupId>