lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-07-01 02:34:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

重构数据字典

Browse Source
This commit is contained in:
zhou-hao
2018-06-28 23:10:09 +08:00
parent 4f9ee89b78
commit f7a2003188
23 changed files with 342 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/convert/FastJsonGenericHttpMessageConverter.java
View File

@@ -39,8 +39,9 @@ import java.util.Set;
public class FastJsonGenericHttpMessageConverter extends AbstractGenericHttpMessageConverter<Object> implements Ordered {
public final static Charset UTF8 = Charset.forName("UTF-8");
@Autowired(required = false)
private DictSupportApi dictSupportApi;
// @Autowired(required = false)
// private DictSupportApi dictSupportApi;
private Charset charset = UTF8;
@@ -116,9 +117,9 @@ public class FastJsonGenericHttpMessageConverter extends AbstractGenericHttpMess
}
}
Object object = JSON.parseObject(bytes, 0, bytes.length, charset.newDecoder(), type);
if (dictSupportApi != null) {
object = dictSupportApi.unwrap(object);
}
// if (dictSupportApi != null) {
// object = dictSupportApi.unwrap(object);
// }
return object;
}
@@ -149,14 +150,14 @@ public class FastJsonGenericHttpMessageConverter extends AbstractGenericHttpMess
String callback = ThreadLocalUtils.getAndRemove("jsonp-callback");
if (obj instanceof ResponseMessage) {
ResponseMessage message = (ResponseMessage) obj;
if (dictSupportApi != null) {
message.setResult(dictSupportApi.wrap(message.getResult()));
}
// if (dictSupportApi != null) {
// message.setResult(dictSupportApi.wrap(message.getResult()));
// }
text = JSON.toJSONString(obj, FastJsonHttpMessageConverter.parseFilter(message), features);
} else {
if (dictSupportApi != null) {
obj = dictSupportApi.wrap(obj);
}
// if (dictSupportApi != null) {
// obj = dictSupportApi.wrap(obj);
// }
text = JSON.toJSONString(obj, features);
}
if (!StringUtils.isNullOrEmpty(callback)) {