|
|
|
@ -47,9 +47,9 @@ public class ParameterUtils {
|
|
|
|
|
|
|
|
|
|
private static final Logger logger = LoggerFactory.getLogger(ParameterUtils.class); |
|
|
|
|
|
|
|
|
|
private static final String DATE_PARSE_PATTERN = "\\$\\[([^\\$\\]]+)]"; |
|
|
|
|
private static final Pattern DATE_PARSE_PATTERN = Pattern.compile("\\$\\[([^\\$\\]]+)]"); |
|
|
|
|
|
|
|
|
|
private static final String DATE_START_PATTERN = "^[0-9]"; |
|
|
|
|
private static final Pattern DATE_START_PATTERN = Pattern.compile("^[0-9]"); |
|
|
|
|
|
|
|
|
|
private static final char PARAM_REPLACE_CHAR = '?'; |
|
|
|
|
|
|
|
|
@ -253,15 +253,14 @@ public class ParameterUtils {
|
|
|
|
|
if (templateStr == null) { |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
Pattern pattern = Pattern.compile(DATE_PARSE_PATTERN); |
|
|
|
|
|
|
|
|
|
StringBuffer newValue = new StringBuffer(templateStr.length()); |
|
|
|
|
|
|
|
|
|
Matcher matcher = pattern.matcher(templateStr); |
|
|
|
|
Matcher matcher = DATE_PARSE_PATTERN.matcher(templateStr); |
|
|
|
|
|
|
|
|
|
while (matcher.find()) { |
|
|
|
|
String key = matcher.group(1); |
|
|
|
|
if (Pattern.matches(DATE_START_PATTERN, key)) { |
|
|
|
|
if (DATE_START_PATTERN.matcher(key).matches()) { |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
String value = TimePlaceholderUtils.getPlaceHolderTime(key, date); |
|
|
|
|