Skip to content
This repository was archived by the owner on Nov 21, 2020. It is now read-only.

Commit a7bfc61

Browse files
committed
fix: few log format, and optimize code
1 parent 30812b0 commit a7bfc61

File tree

2 files changed

+28
-11
lines changed

2 files changed

+28
-11
lines changed

src/main/java/org/code4everything/boot/module/redis/RedisTemplateUtils.java

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,24 +111,24 @@ public static void initRedisConnectionFactory(String hostName, Integer port, Int
111111
if (Validator.isNotEmpty(hostName)) {
112112
// 设置主机地址
113113
configuration.setHostName(hostName);
114-
message.append(sep).append(" host -> ").append(hostName);
114+
message.append(sep).append("host -> ").append(hostName);
115115
sep = ", ";
116116
}
117117
if (ObjectUtil.isNotNull(port)) {
118118
// 设置端口
119119
configuration.setPort(port);
120-
message.append(sep).append(" port -> ").append(port);
120+
message.append(sep).append("port -> ").append(port);
121121
sep = ", ";
122122
}
123123
if (ObjectUtil.isNotNull(database)) {
124124
// 设置要连接的数据库
125125
configuration.setDatabase(database);
126-
message.append(sep).append(" database -> ").append(database);
126+
message.append(sep).append("database -> ").append(database);
127127
}
128128
// 生成连接工厂
129129
redisConnectionFactory = new JedisConnectionFactory(configuration);
130130
if (BootConfig.isDebug() && message.length() != 0) {
131-
LOGGER.info("connect to redis server by {}", message);
131+
LOGGER.info("connected to redis server by {}", message);
132132
}
133133
}
134134

@@ -163,7 +163,7 @@ public static <K, V> RedisTemplate<K, V> newTemplate(Class<K> keyType, Class<V>
163163
RedisTemplate<K, V> redisTemplate = new RedisTemplate<>();
164164
redisTemplate.setConnectionFactory(getRedisConnectionFactory());
165165
if (ObjectUtil.isNotNull(keyType)) {
166-
// 选择键序列化的方式
166+
// 选择键的序列化方式
167167
if (keyType == String.class || ClassUtil.isBasicType(keyType)) {
168168
// 使用String序列化
169169
redisTemplate.setKeySerializer(new StringRedisSerializer());
@@ -173,8 +173,14 @@ public static <K, V> RedisTemplate<K, V> newTemplate(Class<K> keyType, Class<V>
173173
}
174174
}
175175
if (ObjectUtil.isNotNull(valueType)) {
176-
// 对值进行FastJson序列化
177-
redisTemplate.setValueSerializer(new FastJsonRedisSerializer<>(valueType));
176+
// 选择值的序列化方式
177+
if (valueType == String.class || ClassUtil.isBasicType(valueType)) {
178+
// 使用String序列化
179+
redisTemplate.setValueSerializer(new StringRedisSerializer());
180+
} else {
181+
// 使用FastJson序列化
182+
redisTemplate.setValueSerializer(new FastJsonRedisSerializer<>(valueType));
183+
}
178184
}
179185
return redisTemplate;
180186
}

src/main/java/org/code4everything/boot/web/mvc/BaseController.java

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,10 +269,7 @@ public <T> Response<T> successResult(String okMsg, T data) {
269269
* @since 1.0.4
270270
*/
271271
public <T> Response<T> successResult(String okMsg, T data, boolean sealed) {
272-
if (sealed) {
273-
BootConfig.getFieldEncoder().encodeField(data);
274-
}
275-
return printAndReturn(new Response<>(okMsg, data));
272+
return printAndReturn(new Response<>(okMsg, data), sealed);
276273
}
277274

278275
/**
@@ -638,4 +635,18 @@ public <T extends Collection> Response<T> parseCollection(String okMsg, String e
638635
public <T> Response<T> printAndReturn(Response<T> response) {
639636
return response.debug(request);
640637
}
638+
639+
/**
640+
* 输出日志信息
641+
*
642+
* @param response {@link Response}
643+
* @param <T> 数据类型
644+
*
645+
* @return {@link Response}
646+
*
647+
* @since 1.1.6
648+
*/
649+
public <T> Response<T> printAndReturn(Response<T> response, boolean sealed) {
650+
return sealed ? response.debug(request).encode() : response.debug(request);
651+
}
641652
}

0 commit comments

Comments
 (0)