diff --git a/boot-service/src/main/java/com/xwbing/demo/demo.java b/boot-service/src/main/java/com/xwbing/demo/demo.java index b8af175..b090664 100644 --- a/boot-service/src/main/java/com/xwbing/demo/demo.java +++ b/boot-service/src/main/java/com/xwbing/demo/demo.java @@ -1,8 +1,9 @@ package com.xwbing.demo; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.serializer.SerializerFeature; -import com.xwbing.domain.entity.model.EntityModel; + +import java.util.HashMap; +import java.util.Map; /** * 项目名称: boot-module-demo @@ -12,8 +13,17 @@ import com.xwbing.domain.entity.model.EntityModel; */ public class demo { public static void main(String[] args) { - EntityModel jsonObject=new EntityModel(); - String s = JSONObject.toJSONString(jsonObject, SerializerFeature.WriteMapNullValue,SerializerFeature.WriteNullNumberAsZero); - System.out.println(s); + Map map = new HashMap<>(); + map.put("a","aa"); + map.put("aaa",""); + map.put("bbb",null); + System.out.println(map); + + JSONObject jsonObject=new JSONObject(); + jsonObject.put("a","aa"); + jsonObject.put("aaa",""); + jsonObject.put("bbb",null); + System.out.println(jsonObject); + } } diff --git a/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java b/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java index 8768a5c..1e7be50 100644 --- a/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java +++ b/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java @@ -29,6 +29,12 @@ public class JSONObjResult { */ private Object data; + /** + * 查询返回值为Object + * @param o + * @param message + * @return + */ public static JSONObject toJSONObj(Object o, String message) { JSONObjResult jsonObjResult = new JSONObjResult(); jsonObjResult.setSuccess(true); @@ -39,6 +45,11 @@ public class JSONObjResult { return JSON.parseObject(JSON.toJSONString(jsonObjResult, SerializerFeature.WriteMapNullValue)); } + /** + * 增删改返回值为RestMessage + * @param rest + * @return + */ public static JSONObject toJSONObj(RestMessage rest) { JSONObjResult jsonObjResult = new JSONObjResult(); jsonObjResult.setSuccess(rest.isSuccess()); @@ -48,6 +59,11 @@ public class JSONObjResult { return JSON.parseObject(JSON.toJSONString(jsonObjResult, SerializerFeature.WriteMapNullValue)); } + /** + * 直接返回错误提示 + * @param error + * @return + */ public static JSONObject toJSONObj(String error) { JSONObjResult jsonObjResult = new JSONObjResult(); jsonObjResult.setSuccess(false); diff --git a/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java b/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java index 72a6740..1ab8b8e 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java +++ b/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java @@ -53,7 +53,8 @@ public class DispatcherServletConfig extends WebMvcConfigurerAdapter { //swagger // registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/"); // registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); - // + //服务器部署的tomcat下html路径 +// registry.addResourceHandler("/js/**").addResourceLocations("html/js/"); super.addResourceHandlers(registry); } @@ -110,7 +111,7 @@ public class DispatcherServletConfig extends WebMvcConfigurerAdapter { mediaTypes.add(MediaType.APPLICATION_JSON_UTF8); mediaTypes.add(MediaType.APPLICATION_FORM_URLENCODED); mediaTypes.add(MediaType.APPLICATION_OCTET_STREAM); - mediaTypes.add(MediaType.TEXT_HTML);//避免IE出现下载JSON文件的情况 + mediaTypes.add(MediaType.TEXT_HTML); messageConverter.setSupportedMediaTypes(mediaTypes); //不忽略对象属性中的null值 FastJsonConfig fastJsonConfig = new FastJsonConfig();