Commit 793f0151 authored by liqin's avatar liqin 💬

bug fixed

parent 634e3459
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<artifactId>chnmuseum-party</artifactId> <artifactId>chnmuseum-party</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>中国国家博物馆建党百年展点播院线服务平台</description>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -40,6 +41,10 @@ ...@@ -40,6 +41,10 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId> <artifactId>spring-boot-starter-data-redis</artifactId>
<exclusions> <exclusions>
<exclusion>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>io.lettuce</groupId> <groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId> <artifactId>lettuce-core</artifactId>
...@@ -54,13 +59,6 @@ ...@@ -54,13 +59,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId> <artifactId>spring-boot-starter-validation</artifactId>
</dependency> </dependency>
<!-- 配置项直接生成对象依赖 -->
<!--<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>-->
<!-- MyBatis Starter --> <!-- MyBatis Starter -->
<dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId> <groupId>org.mybatis.spring.boot</groupId>
...@@ -179,8 +177,13 @@ ...@@ -179,8 +177,13 @@
<dependency> <dependency>
<groupId>org.crazycake</groupId> <groupId>org.crazycake</groupId>
<artifactId>shiro-redis</artifactId> <artifactId>shiro-redis</artifactId>
<version>2.4.2.1-RELEASE</version> <version>3.3.1</version>
</dependency> </dependency>
<!--<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>2.9.1</version>
</dependency>-->
<!-- Chinese ideograph To PinYin --> <!-- Chinese ideograph To PinYin -->
<dependency> <dependency>
<groupId>com.github.stuxuhai</groupId> <groupId>com.github.stuxuhai</groupId>
......
...@@ -167,8 +167,6 @@ public class ShiroConfig { ...@@ -167,8 +167,6 @@ public class ShiroConfig {
public RedisManager redisManager() { public RedisManager redisManager() {
RedisManager redisManager = new RedisManager(); RedisManager redisManager = new RedisManager();
redisManager.setHost(host); redisManager.setHost(host);
redisManager.setPort(port);
redisManager.setExpire(14400);// 配置缓存过期时间
redisManager.setTimeout(timeout); redisManager.setTimeout(timeout);
redisManager.setPassword(password); redisManager.setPassword(password);
return redisManager; return redisManager;
......
...@@ -99,7 +99,7 @@ public class LoginController { ...@@ -99,7 +99,7 @@ public class LoginController {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
} }
} else { } else {
stringRedisTemplate.delete(captchaId); //stringRedisTemplate.delete(captchaId);
resultMap.put("status", 400); resultMap.put("status", 400);
resultMap.put("message", "验证码获取失败!"); resultMap.put("message", "验证码获取失败!");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
......
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