1、修改文件上传接口的请求头中日期格式的处理;

2、修改http配置表单的区域管控加载,以及提交验证。
This commit is contained in:
zhangwei
2018-05-30 11:40:55 +08:00
parent e81a600788
commit 8fb868ecca
10 changed files with 121 additions and 87 deletions

View File

@@ -185,7 +185,7 @@ public class ConfigServiceUtil {
* @return
* @throws Exception
*/
public static ToMaatResult postFileCfg(String params,File file,JSONObject fileDesc) throws MaatConvertException{
public static ToMaatResult postFileCfg(String params,File file,String fileDesc) throws MaatConvertException{
String result = null;
ToMaatResult bean = null;
String url = Constants.SERVICE_URL+Constants.FILE_UPLOAD_CFG;
@@ -293,7 +293,8 @@ public class ConfigServiceUtil {
}
public static void main(String[] args) {
try {
getId(1,1);
// getId(1,1);
System.out.println(IpUtil.convertMask(4));
} catch (Exception e) {
e.printStackTrace();
}

View File

@@ -238,7 +238,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
return timeMap;
}
}
public static Date formateUtcDate(String date) throws ParseException{
String format = "yyyy-MM-dd'T'HH:mm:ss.SSS";
SimpleDateFormat sdf = new SimpleDateFormat(format);
return sdf.parse(date);
}
/**
* @param args
* @throws ParseException

View File

@@ -69,7 +69,7 @@ public class JsonMapper extends ObjectMapper {
* SerializerProvider provider) throws IOException,
* JsonProcessingException { jgen.writeString(""); } });
*/
this.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
this.setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"));
// 进行HTML解码。
this.registerModule(new SimpleModule().addSerializer(String.class, new JsonSerializer<String>() {
@Override