Skip to content

Commit 5abc90d

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents 523c36f + cb1a995 commit 5abc90d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2594
-241
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
- [Spring 之事务](docs/01.Java/13.框架/01.Spring/02.Spring数据/03.Spring之事务.md)
6262
- [Spring 之 JPA](docs/01.Java/13.框架/01.Spring/02.Spring数据/04.Spring之JPA.md)
6363
- [Spring 集成 Mybatis](docs/01.Java/13.框架/01.Spring/02.Spring数据/10.Spring集成Mybatis.md)
64+
- [Spring 访问 Redis](docs/01.Java/13.框架/01.Spring/02.Spring数据/21.Spring访问Redis.md)
6465
- [Spring 访问 MongoDB](docs/01.Java/13.框架/01.Spring/02.Spring数据/22.Spring访问MongoDB.md)
6566
- [SpringBoot 之 Elasticsearch](docs/01.Java/13.框架/01.Spring/02.Spring数据/24.SpringBoot之Elasticsearch.md)
6667

codes/data/nosql/redis/pom.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
<dependencies>
1919
<dependency>
2020
<groupId>org.springframework.boot</groupId>
21-
<artifactId>spring-boot-starter-data-redis</artifactId>
21+
<artifactId>spring-boot-starter-data-redis-reactive</artifactId>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.springframework.boot</groupId>
25+
<artifactId>spring-boot-starter-webflux</artifactId>
2226
</dependency>
2327
<dependency>
2428
<groupId>org.springframework.boot</groupId>
@@ -37,6 +41,11 @@
3741
<groupId>io.github.dunwu.tool</groupId>
3842
<artifactId>dunwu-tool-data</artifactId>
3943
</dependency>
44+
<dependency>
45+
<groupId>io.projectreactor</groupId>
46+
<artifactId>reactor-test</artifactId>
47+
<scope>test</scope>
48+
</dependency>
4049
</dependencies>
4150

4251
<dependencyManagement>

codes/data/nosql/redis/src/main/java/example/spring/data/nosql/redis/DataRedisApplication.java

Lines changed: 0 additions & 63 deletions
This file was deleted.

codes/data/nosql/redis/src/main/java/example/spring/data/nosql/redis/User.java

Lines changed: 0 additions & 42 deletions
This file was deleted.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package example.spring.data.nosql.redis.quickstart;
2+
3+
public enum Location {
4+
Nanjing,
5+
Beijing,
6+
Shanghai,
7+
Hangzhou,
8+
Guangzhou,
9+
Shenzhen
10+
}

codes/data/nosql/redis/src/main/java/example/spring/data/nosql/redis/RedisAutoConfiguration.java renamed to codes/data/nosql/redis/src/main/java/example/spring/data/nosql/redis/quickstart/RedisQuickstartApplication.java

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,26 @@
1-
package example.spring.data.nosql.redis;
1+
package example.spring.data.nosql.redis.quickstart;
22

33
import com.fasterxml.jackson.annotation.JsonAutoDetect;
44
import com.fasterxml.jackson.annotation.PropertyAccessor;
55
import com.fasterxml.jackson.databind.ObjectMapper;
6+
import lombok.extern.slf4j.Slf4j;
67
import org.springframework.beans.factory.annotation.Autowired;
8+
import org.springframework.boot.SpringApplication;
9+
import org.springframework.boot.autoconfigure.SpringBootApplication;
710
import org.springframework.context.annotation.Bean;
8-
import org.springframework.context.annotation.Configuration;
911
import org.springframework.context.annotation.Primary;
1012
import org.springframework.data.redis.connection.RedisConnectionFactory;
11-
import org.springframework.data.redis.core.HashOperations;
12-
import org.springframework.data.redis.core.ListOperations;
1313
import org.springframework.data.redis.core.RedisTemplate;
14-
import org.springframework.data.redis.core.SetOperations;
15-
import org.springframework.data.redis.core.ValueOperations;
16-
import org.springframework.data.redis.core.ZSetOperations;
1714
import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
1815
import org.springframework.data.redis.serializer.StringRedisSerializer;
1916

20-
/**
21-
* @author <a href="mailto:[email protected]">Zhang Peng</a>
22-
* @since 2019-10-14
23-
*/
24-
@Configuration
25-
public class RedisAutoConfiguration {
17+
@Slf4j
18+
@SpringBootApplication
19+
public class RedisQuickstartApplication {
2620

2721
@Autowired
2822
private ObjectMapper objectMapper;
2923

30-
@Bean
31-
public HashOperations<String, String, Object> hashOperations(RedisTemplate<String, Object> redisTemplate) {
32-
return redisTemplate.opsForHash();
33-
}
34-
35-
@Bean
36-
public ListOperations<String, Object> listOperations(RedisTemplate<String, Object> redisTemplate) {
37-
return redisTemplate.opsForList();
38-
}
39-
4024
@Bean
4125
@Primary
4226
public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
@@ -66,19 +50,8 @@ public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factor
6650
return template;
6751
}
6852

69-
@Bean
70-
public SetOperations<String, Object> setOperations(RedisTemplate<String, Object> redisTemplate) {
71-
return redisTemplate.opsForSet();
72-
}
73-
74-
@Bean
75-
public ValueOperations<String, Object> valueOperations(RedisTemplate<String, Object> redisTemplate) {
76-
return redisTemplate.opsForValue();
77-
}
78-
79-
@Bean
80-
public ZSetOperations<String, Object> zsetOperations(RedisTemplate<String, Object> redisTemplate) {
81-
return redisTemplate.opsForZSet();
53+
public static void main(String[] args) {
54+
SpringApplication.run(RedisQuickstartApplication.class, args);
8255
}
8356

8457
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package example.spring.data.nosql.redis.quickstart;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Data;
5+
import lombok.NoArgsConstructor;
6+
import lombok.ToString;
7+
8+
import java.io.Serializable;
9+
10+
@Data
11+
@ToString
12+
@NoArgsConstructor
13+
@AllArgsConstructor
14+
public class User implements Serializable {
15+
16+
private static final long serialVersionUID = 4142994984277644695L;
17+
18+
private Long id;
19+
private String name;
20+
private Integer age;
21+
private String address;
22+
private String email;
23+
24+
}

codes/data/nosql/redis/src/main/java/example/spring/data/nosql/redis/UserService.java renamed to codes/data/nosql/redis/src/main/java/example/spring/data/nosql/redis/quickstart/UserService.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
package example.spring.data.nosql.redis;
1+
package example.spring.data.nosql.redis.quickstart;
22

33
import java.util.Map;
44

55
/**
6+
* 用户服务
7+
*
68
* @author <a href="mailto:[email protected]">Zhang Peng</a>
79
* @since 2019-10-14
810
*/
911
public interface UserService {
1012

13+
void batchSetUsers(Map<String, User> users);
14+
15+
long count();
16+
1117
User getUser(Long id);
1218

1319
void setUser(User user);
1420

15-
void batchSetUsers(Map<String, User> users);
16-
1721
}

codes/data/nosql/redis/src/main/java/example/spring/data/nosql/redis/UserServiceImpl.java renamed to codes/data/nosql/redis/src/main/java/example/spring/data/nosql/redis/quickstart/UserServiceImpl.java

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package example.spring.data.nosql.redis;
1+
package example.spring.data.nosql.redis.quickstart;
22

33
import cn.hutool.core.bean.BeanUtil;
44
import org.springframework.data.redis.core.RedisTemplate;
@@ -7,20 +7,32 @@
77
import java.util.Map;
88

99
/**
10+
* 用户服务实现
11+
*
1012
* @author <a href="mailto:[email protected]">Zhang Peng</a>
1113
* @since 2019-10-14
1214
*/
1315
@Service
1416
public class UserServiceImpl implements UserService {
1517

16-
public static final String DEFAULT_KEY = "spring-boot:user";
18+
public static final String DEFAULT_KEY = "spring:tutorial:user";
1719

1820
private final RedisTemplate<String, Object> redisTemplate;
1921

2022
public UserServiceImpl(RedisTemplate<String, Object> redisTemplate) {
2123
this.redisTemplate = redisTemplate;
2224
}
2325

26+
@Override
27+
public void batchSetUsers(Map<String, User> users) {
28+
redisTemplate.opsForHash().putAll(DEFAULT_KEY, users);
29+
}
30+
31+
@Override
32+
public long count() {
33+
return redisTemplate.opsForHash().size(DEFAULT_KEY);
34+
}
35+
2436
@Override
2537
public User getUser(Long id) {
2638
Object obj = redisTemplate.opsForHash().get(DEFAULT_KEY, id.toString());
@@ -32,9 +44,4 @@ public void setUser(User user) {
3244
redisTemplate.opsForHash().put(DEFAULT_KEY, user.getId().toString(), user);
3345
}
3446

35-
@Override
36-
public void batchSetUsers(Map<String, User> users) {
37-
redisTemplate.opsForHash().putAll(DEFAULT_KEY, users);
38-
}
39-
4047
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package example.spring.data.nosql.redis.reactive;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Data;
5+
import lombok.NoArgsConstructor;
6+
7+
@Data
8+
@NoArgsConstructor
9+
@AllArgsConstructor
10+
public class Coffee {
11+
12+
private String id;
13+
private String name;
14+
15+
}

0 commit comments

Comments
 (0)