From 81363454847209f353692504989343ae4fc217f3 Mon Sep 17 00:00:00 2001 From: redkale Date: Sat, 29 Jun 2024 16:32:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3regx=E4=B8=BAregex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/META-INF/logging-template.properties | 60 +++++++++--------- .../java/org/redkale/boot/ClassFilter.java | 34 +++++----- .../org/redkale/boot/LoggingFileHandler.java | 27 ++++---- .../redkale/boot/LoggingSearchHandler.java | 15 +++-- .../boot/watch/FilterWatchService.java | 2 +- .../boot/watch/ServiceWatchService.java | 2 +- .../org/redkale/inject/ResourceEvent.java | 4 +- .../org/redkale/inject/ResourceFactory.java | 6 +- .../net/http/HttpDispatcherServlet.java | 62 +++++++++---------- .../org/redkale/net/http/HttpRequest.java | 13 ++-- .../java/org/redkale/net/http/HttpServer.java | 9 ++- .../org/redkale/net/http/MultiContext.java | 60 +++++++++--------- src/main/java/org/redkale/net/http/Rest.java | 12 ++-- .../org/redkale/net/http/RestAddress.java | 5 +- .../org/redkale/net/http/RestUploadFile.java | 7 +-- .../org/redkale/source/CacheMemorySource.java | 8 +-- .../java/org/redkale/util/SelectColumn.java | 20 +++--- src/main/java/org/redkale/util/Utility.java | 20 ++++++ .../redkale/test/util/ClassFilterTest.java | 6 +- 19 files changed, 196 insertions(+), 176 deletions(-) diff --git a/src/main/java/META-INF/logging-template.properties b/src/main/java/META-INF/logging-template.properties index 46523a098..07e1929de 100644 --- a/src/main/java/META-INF/logging-template.properties +++ b/src/main/java/META-INF/logging-template.properties @@ -1,30 +1,30 @@ - -handlers = java.util.logging.ConsoleHandler,java.util.logging.FileHandler -.handlers = java.util.logging.ConsoleHandler,java.util.logging.FileHandler - -############################################################ -.level = FINE - -sun.level = INFO -java.level = INFO -javax.level = INFO -com.sun.level = INFO - -#java.util.logging.FileHandler.level = FINE - -java.util.logging.FileHandler.limit = 20M -java.util.logging.FileHandler.count = 100 -java.util.logging.FileHandler.encoding = UTF-8 -java.util.logging.FileHandler.pattern = ${APP_HOME}/logs-%tY%tm/log-%tY%tm%td.log -#java.util.logging.FileHandler.unusual \u5c5e\u6027\u8868\u793a\u5c06 WARNING\u3001SEVERE \u7ea7\u522b\u7684\u65e5\u5fd7\u590d\u5236\u5199\u5165\u5355\u72ec\u7684\u6587\u4ef6\u4e2d -java.util.logging.FileHandler.unusual = ${APP_HOME}/logs-%tY%tm/log-warnerr-%tY%tm%td.log -#\u9700\u8981\u5c4f\u853d\u6d88\u606f\u5185\u5bb9\u7684\u6b63\u5219\u8868\u8fbe\u5f0f -java.util.logging.FileHandler.denyregx = -java.util.logging.FileHandler.append = true - -#java.util.logging.ConsoleHandler.level = FINE - -#\u5c06\u65e5\u5fd7\u5199\u8fdbSearchSource, \u5fc5\u987b\u6307\u5b9asource\u8d44\u6e90\u540d\uff0c\u5728source.properties\u4e2d\u5b9a\u4e49 -#java.util.logging.SearchHandler.source = platfsearch -#\u6307\u5b9a\u5199\u8fdbSearchSource\u7684\u8868\u540d\uff0c\u9ed8\u8ba4\u503c\u4e3alog-record -#java.util.logging.SearchHandler.tag = log-${APP_NAME}-%tY%tm%td + +handlers = java.util.logging.ConsoleHandler,java.util.logging.FileHandler +.handlers = java.util.logging.ConsoleHandler,java.util.logging.FileHandler + +############################################################ +.level = FINE + +sun.level = INFO +java.level = INFO +javax.level = INFO +com.sun.level = INFO + +#java.util.logging.FileHandler.level = FINE + +java.util.logging.FileHandler.limit = 20M +java.util.logging.FileHandler.count = 100 +java.util.logging.FileHandler.encoding = UTF-8 +java.util.logging.FileHandler.pattern = ${APP_HOME}/logs-%tY%tm/log-%tY%tm%td.log +#java.util.logging.FileHandler.unusual \u5c5e\u6027\u8868\u793a\u5c06 WARNING\u3001SEVERE \u7ea7\u522b\u7684\u65e5\u5fd7\u590d\u5236\u5199\u5165\u5355\u72ec\u7684\u6587\u4ef6\u4e2d +java.util.logging.FileHandler.unusual = ${APP_HOME}/logs-%tY%tm/log-warnerr-%tY%tm%td.log +#\u9700\u8981\u5c4f\u853d\u6d88\u606f\u5185\u5bb9\u7684\u6b63\u5219\u8868\u8fbe\u5f0f +java.util.logging.FileHandler.denyregex = +java.util.logging.FileHandler.append = true + +#java.util.logging.ConsoleHandler.level = FINE + +#\u5c06\u65e5\u5fd7\u5199\u8fdbSearchSource, \u5fc5\u987b\u6307\u5b9asource\u8d44\u6e90\u540d\uff0c\u5728source.properties\u4e2d\u5b9a\u4e49 +#java.util.logging.SearchHandler.source = platfsearch +#\u6307\u5b9a\u5199\u8fdbSearchSource\u7684\u8868\u540d\uff0c\u9ed8\u8ba4\u503c\u4e3alog-record +#java.util.logging.SearchHandler.tag = log-${APP_NAME}-%tY%tm%td diff --git a/src/main/java/org/redkale/boot/ClassFilter.java b/src/main/java/org/redkale/boot/ClassFilter.java index 1661d76e1..a12722169 100644 --- a/src/main/java/org/redkale/boot/ClassFilter.java +++ b/src/main/java/org/redkale/boot/ClassFilter.java @@ -96,22 +96,22 @@ public final class ClassFilter { this.classLoader = classLoader == null ? Thread.currentThread().getContextClassLoader() : classLoader; } - public static ClassFilter create(String includeRegxs, String excludeRegxs) { - return create(null, null, includeRegxs, excludeRegxs, null, null); + public static ClassFilter create(String includeRegexs, String excludeRegexs) { + return create(null, null, includeRegexs, excludeRegexs, null, null); } public static ClassFilter create( RedkaleClassLoader classLoader, Class[] excludeSuperClasses, - String includeRegxs, - String excludeRegxs, + String includeRegexs, + String excludeRegexs, Set includeValues, Set excludeValues) { ClassFilter filter = new ClassFilter(classLoader, null, null, excludeSuperClasses); filter.setIncludePatterns( - includeRegxs == null ? null : includeRegxs.replace(',', ';').split(";")); + includeRegexs == null ? null : includeRegexs.replace(',', ';').split(";")); filter.setExcludePatterns( - excludeRegxs == null ? null : excludeRegxs.replace(',', ';').split(";")); + excludeRegexs == null ? null : excludeRegexs.replace(',', ';').split(";")); filter.setPrivilegeIncludes(includeValues); filter.setPrivilegeExcludes(excludeValues); return filter; @@ -385,17 +385,17 @@ public final class ClassFilter { return rs; } - public static Pattern[] toPattern(String[] regxs) { - if (regxs == null || regxs.length == 0) { + public static Pattern[] toPattern(String[] regexs) { + if (regexs == null || regexs.length == 0) { return null; } int i = 0; - Pattern[] rs = new Pattern[regxs.length]; - for (String regx : regxs) { - if (regx == null || regx.trim().isEmpty()) { + Pattern[] rs = new Pattern[regexs.length]; + for (String regex : regexs) { + if (regex == null || regex.trim().isEmpty()) { continue; } - rs[i++] = Pattern.compile(formatPackageRegx(regx.trim())); + rs[i++] = Pattern.compile(formatPackageRegex(regex.trim())); } if (i == 0) { return null; @@ -415,14 +415,14 @@ public final class ClassFilter { * 例如： * *.platf.** 转成 ^(\w+)\.platf\.(.*)$ * - * @param regx 正则表达式 + * @param regex 正则表达式 * @return Pattern */ - public static String formatPackageRegx(String regx) { - if (regx.indexOf('^') >= 0 || regx.indexOf('$') >= 0 || regx.indexOf('\\') >= 0) { // 已经是标准正则表达式 - return regx; + public static String formatPackageRegex(String regex) { + if (regex.indexOf('^') >= 0 || regex.indexOf('$') >= 0 || regex.indexOf('\\') >= 0) { // 已经是标准正则表达式 + return regex; } - String str = regx.replace("**", sxing).replace("*", dxing); + String str = regex.replace("**", sxing).replace("*", dxing); str = str.replace("\\.", dian).replace(".", dian); return "^" + str.replace(dian, "\\.").replace(dxing, "(\\w+)").replace(sxing, "(.*)") + "$"; } diff --git a/src/main/java/org/redkale/boot/LoggingFileHandler.java b/src/main/java/org/redkale/boot/LoggingFileHandler.java index 749a458e4..55f550635 100644 --- a/src/main/java/org/redkale/boot/LoggingFileHandler.java +++ b/src/main/java/org/redkale/boot/LoggingFileHandler.java @@ -5,10 +5,9 @@ */ package org.redkale.boot; -import static java.nio.file.StandardCopyOption.*; - import java.io.*; import java.nio.file.Files; +import static java.nio.file.StandardCopyOption.*; import java.util.Calendar; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.*; @@ -37,7 +36,7 @@ public class LoggingFileHandler extends LoggingBaseHandler { public static class LoggingConsoleHandler extends ConsoleHandler { - private Pattern denyRegx; + private Pattern denyRegex; public LoggingConsoleHandler() { super(); @@ -47,13 +46,13 @@ public class LoggingFileHandler extends LoggingBaseHandler { private void configure() { LogManager manager = LogManager.getLogManager(); - String denyregxstr = manager.getProperty(LoggingConsoleHandler.class.getName() + ".denyregx"); - if (denyregxstr == null) { - denyregxstr = manager.getProperty("java.util.logging.ConsoleHandler.denyregx"); + String denyregexstr = manager.getProperty(LoggingConsoleHandler.class.getName() + ".denyregex"); + if (denyregexstr == null) { + denyregexstr = manager.getProperty("java.util.logging.ConsoleHandler.denyregex"); } try { - if (denyregxstr != null && !denyregxstr.trim().isEmpty()) { - this.denyRegx = Pattern.compile(denyregxstr); + if (denyregexstr != null && !denyregexstr.trim().isEmpty()) { + this.denyRegex = Pattern.compile(denyregexstr); } } catch (Exception e) { // do nothing @@ -62,7 +61,7 @@ public class LoggingFileHandler extends LoggingBaseHandler { @Override public void publish(LogRecord log) { - if (denyRegx != null && denyRegx.matcher(log.getMessage()).find()) { + if (denyRegex != null && denyRegex.matcher(log.getMessage()).find()) { return; } fillLogRecord(log); @@ -92,7 +91,7 @@ public class LoggingFileHandler extends LoggingBaseHandler { protected boolean append; - protected Pattern denyRegx; + protected Pattern denyRegex; private final AtomicLong logLength = new AtomicLong(); @@ -351,10 +350,10 @@ public class LoggingFileHandler extends LoggingBaseHandler { // do nothing } - String denyregxstr = manager.getProperty(cname + ".denyregx"); + String denyregexstr = manager.getProperty(cname + ".denyregex"); try { - if (denyregxstr != null && !denyregxstr.trim().isEmpty()) { - denyRegx = Pattern.compile(denyregxstr); + if (denyregexstr != null && !denyregexstr.trim().isEmpty()) { + denyRegex = Pattern.compile(denyregexstr); } } catch (Exception e) { // do nothing @@ -366,7 +365,7 @@ public class LoggingFileHandler extends LoggingBaseHandler { if (!isLoggable(log)) { return; } - if (denyRegx != null && denyRegx.matcher(log.getMessage()).find()) { + if (denyRegex != null && denyRegex.matcher(log.getMessage()).find()) { return; } fillLogRecord(log); diff --git a/src/main/java/org/redkale/boot/LoggingSearchHandler.java b/src/main/java/org/redkale/boot/LoggingSearchHandler.java index 8dcc80ed1..ca02aa3e5 100644 --- a/src/main/java/org/redkale/boot/LoggingSearchHandler.java +++ b/src/main/java/org/redkale/boot/LoggingSearchHandler.java @@ -2,9 +2,6 @@ */ package org.redkale.boot; -import static org.redkale.boot.Application.RESNAME_APP_NAME; -import static org.redkale.boot.Application.SYSNAME_APP_NAME; - import java.io.*; import java.util.*; import java.util.concurrent.LinkedBlockingQueue; @@ -12,6 +9,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.*; import java.util.logging.Formatter; import java.util.regex.Pattern; +import static org.redkale.boot.Application.RESNAME_APP_NAME; +import static org.redkale.boot.Application.SYSNAME_APP_NAME; import org.redkale.convert.*; import org.redkale.convert.json.JsonConvert; import org.redkale.persistence.*; @@ -41,7 +40,7 @@ public class LoggingSearchHandler extends LoggingBaseHandler { protected String pattern; - protected Pattern denyRegx; + protected Pattern denyRegex; protected String sourceResourceName; @@ -210,10 +209,10 @@ public class LoggingSearchHandler extends LoggingBaseHandler { // do nothing } - String denyRegxStr = manager.getProperty(cname + ".denyregx"); + String denyRegexStr = manager.getProperty(cname + ".denyregex"); try { - if (denyRegxStr != null && !denyRegxStr.trim().isEmpty()) { - denyRegx = Pattern.compile(denyRegxStr); + if (denyRegexStr != null && !denyRegexStr.trim().isEmpty()) { + denyRegex = Pattern.compile(denyRegexStr); } } catch (Exception e) { // do nothing @@ -225,7 +224,7 @@ public class LoggingSearchHandler extends LoggingBaseHandler { if (!isLoggable(log)) { return; } - if (denyRegx != null && denyRegx.matcher(log.getMessage()).find()) { + if (denyRegex != null && denyRegex.matcher(log.getMessage()).find()) { return; } if (log.getSourceClassName() != null) { diff --git a/src/main/java/org/redkale/boot/watch/FilterWatchService.java b/src/main/java/org/redkale/boot/watch/FilterWatchService.java index ffda14d93..99b33d5fe 100644 --- a/src/main/java/org/redkale/boot/watch/FilterWatchService.java +++ b/src/main/java/org/redkale/boot/watch/FilterWatchService.java @@ -33,7 +33,7 @@ public class FilterWatchService extends AbstractWatchService { @RestMapping(name = "addFilter", auth = false, comment = "动态增加Filter") public RetResult addFilter( - @RestUploadFile(maxLength = 10 * 1024 * 1024, fileNameRegx = "\\.jar$") byte[] jar, + @RestUploadFile(maxLength = 10 * 1024 * 1024, fileNameRegex = "\\.jar$") byte[] jar, @RestParam(name = "server", comment = "Server节点名") final String serverName, @RestParam(name = "type", comment = "Filter类名") final String filterType) throws IOException { diff --git a/src/main/java/org/redkale/boot/watch/ServiceWatchService.java b/src/main/java/org/redkale/boot/watch/ServiceWatchService.java index f7b1baed8..5bb0b7262 100644 --- a/src/main/java/org/redkale/boot/watch/ServiceWatchService.java +++ b/src/main/java/org/redkale/boot/watch/ServiceWatchService.java @@ -231,7 +231,7 @@ public class ServiceWatchService extends AbstractWatchService { @RestMapping(name = "loadService", auth = false, comment = "动态增加Service") public RetResult loadService( @RestParam(name = "type", comment = "Service的类名") String type, - @RestUploadFile(maxLength = 10 * 1024 * 1024, fileNameRegx = "\\.jar$") byte[] jar) { + @RestUploadFile(maxLength = 10 * 1024 * 1024, fileNameRegex = "\\.jar$") byte[] jar) { // 待开发 return RetResult.success(); } diff --git a/src/main/java/org/redkale/inject/ResourceEvent.java b/src/main/java/org/redkale/inject/ResourceEvent.java index 1792e541b..61aef0e8f 100644 --- a/src/main/java/org/redkale/inject/ResourceEvent.java +++ b/src/main/java/org/redkale/inject/ResourceEvent.java @@ -70,7 +70,7 @@ public interface ResourceEvent { public static class ResourceChangeEvent implements ResourceEvent { - private static final Predicate numRegx = + private static final Predicate numRegex = Pattern.compile("^(\\-\\+)?\\d+(\\.\\d+)?$").asPredicate(); protected String name; @@ -84,7 +84,7 @@ public interface ResourceEvent { String str = val.toString(); if ("false".equalsIgnoreCase(str)) return str; if (str.length() <= 4) return str; - if (numRegx.test(str)) return str; + if (numRegex.test(str)) return str; return str.substring(0, 2) + "***" + str.substring(str.length() - 2); } diff --git a/src/main/java/org/redkale/inject/ResourceFactory.java b/src/main/java/org/redkale/inject/ResourceFactory.java index 568b82e1b..11e41e29c 100644 --- a/src/main/java/org/redkale/inject/ResourceFactory.java +++ b/src/main/java/org/redkale/inject/ResourceFactory.java @@ -1125,7 +1125,7 @@ public final class ResourceFactory { public ResourceTypeLoader findTypeLoader(Type ft, @Nullable Field field) { ResourceTypeLoader it = this.findMatchTypeLoader(ft, field); - return it == null ? findRegxTypeLoader(ft, field) : it; + return it == null ? findRegexTypeLoader(ft, field) : it; } private ResourceFactory parentRoot() { @@ -1146,7 +1146,7 @@ public final class ResourceFactory { return parent == null ? null : parent.findMatchTypeLoader(ft, field); } - private ResourceTypeLoader findRegxTypeLoader(Type ft, @Nullable Field field) { + private ResourceTypeLoader findRegexTypeLoader(Type ft, @Nullable Field field) { if (field == null) { return null; } @@ -1160,7 +1160,7 @@ public final class ResourceFactory { return en.getValue(); } } - return parent == null ? null : parent.findRegxTypeLoader(ft, field); + return parent == null ? null : parent.findRegexTypeLoader(ft, field); } private void onResourceInjected(Object src, Field field, Object res) { diff --git a/src/main/java/org/redkale/net/http/HttpDispatcherServlet.java b/src/main/java/org/redkale/net/http/HttpDispatcherServlet.java index 934068c98..04cb916bf 100644 --- a/src/main/java/org/redkale/net/http/HttpDispatcherServlet.java +++ b/src/main/java/org/redkale/net/http/HttpDispatcherServlet.java @@ -34,9 +34,9 @@ public class HttpDispatcherServlet protected HttpServlet resourceHttpServlet = new HttpResourceServlet(); - protected MappingEntry[] regxArray = null; // regxArray 包含 regxWsArray + protected MappingEntry[] regexArray = null; // regexArray 包含 regexWsArray - protected MappingEntry[] regxWsArray = null; + protected MappingEntry[] regexWsArray = null; protected Map wsMappings = new HashMap<>(); // super.mappings 包含 wsMappings @@ -68,16 +68,16 @@ public class HttpDispatcherServlet allMapLock.lock(); try { List keys = new ArrayList<>(); - if (regxArray != null) { - for (MappingEntry me : regxArray) { + if (regexArray != null) { + for (MappingEntry me : regexArray) { if (predicateEntry.test(me)) { servlets.add(me.servlet); keys.add(me.mapping); } } } - if (regxWsArray != null) { - for (MappingEntry me : regxWsArray) { + if (regexWsArray != null) { + for (MappingEntry me : regexWsArray) { if (predicateEntry.test(me)) { servlets.add(me.servlet); keys.add(me.mapping); @@ -97,8 +97,8 @@ public class HttpDispatcherServlet this.wsMappings = newWsMappings; } if (!keys.isEmpty()) { - this.regxArray = Utility.remove(this.regxArray, predicateEntry); - this.regxWsArray = Utility.remove(this.regxWsArray, predicateEntry); + this.regexArray = Utility.remove(this.regexArray, predicateEntry); + this.regexWsArray = Utility.remove(this.regexWsArray, predicateEntry); for (HttpServlet rs : servlets) { super.removeServlet(rs); } @@ -184,19 +184,19 @@ public class HttpDispatcherServlet } @SuppressWarnings("unchecked") - public boolean addForbidURIRegx(final String urlRegx) { - if (urlRegx == null || urlRegx.isEmpty()) { + public boolean addForbidURIRegex(final String urlRegex) { + if (urlRegex == null || urlRegex.isEmpty()) { return false; } excludeLock.lock(); try { - if (forbidURIMaps != null && forbidURIMaps.containsKey(urlRegx)) { + if (forbidURIMaps != null && forbidURIMaps.containsKey(urlRegex)) { return false; } if (forbidURIMaps == null) { forbidURIMaps = new HashMap<>(); } - String mapping = urlRegx; + String mapping = urlRegex; if (Utility.contains(mapping, '*', '{', '[', '(', '|', '^', '$', '+', '?', '\\')) { // 是否是正则表达式)) if (mapping.endsWith("/*")) { mapping = mapping.substring(0, mapping.length() - 1) + ".*"; @@ -210,7 +210,7 @@ public class HttpDispatcherServlet BiPredicate predicate = (prefix, uri) -> { return begin || prefix.isEmpty() ? regPredicate.test(uri) : uri.matches(prefix + reg); }; - forbidURIMaps.put(urlRegx, predicate); + forbidURIMaps.put(urlRegex, predicate); forbidURIPredicates = Utility.append(forbidURIPredicates, predicate); return true; } finally { @@ -328,8 +328,8 @@ public class HttpDispatcherServlet } if (request.isWebSocket()) { servlet = wsMappings.get(uri); - if (servlet == null && this.regxWsArray != null) { - for (MappingEntry en : regxWsArray) { + if (servlet == null && this.regexWsArray != null) { + for (MappingEntry en : regexWsArray) { if (en.predicate.test(uri)) { servlet = en.servlet; break; @@ -342,8 +342,8 @@ public class HttpDispatcherServlet } } else { servlet = mappingServlet(uri); - if (servlet == null && this.regxArray != null) { - for (MappingEntry en : regxArray) { + if (servlet == null && this.regexArray != null) { + for (MappingEntry en : regexArray) { if (en.predicate.test(uri)) { servlet = en.servlet; break; @@ -434,28 +434,28 @@ public class HttpDispatcherServlet } else { mappingPath = mappingPath + "$"; } - if (regxArray == null) { - regxArray = new MappingEntry[1]; - regxArray[0] = new MappingEntry( + if (regexArray == null) { + regexArray = new MappingEntry[1]; + regexArray[0] = new MappingEntry( mappingPath, Pattern.compile(mappingPath).asPredicate(), servlet); } else { - regxArray = Arrays.copyOf(regxArray, regxArray.length + 1); - regxArray[regxArray.length - 1] = new MappingEntry( + regexArray = Arrays.copyOf(regexArray, regexArray.length + 1); + regexArray[regexArray.length - 1] = new MappingEntry( mappingPath, Pattern.compile(mappingPath).asPredicate(), servlet); - Arrays.sort(regxArray); + Arrays.sort(regexArray); } if (servlet instanceof WebSocketServlet) { - if (regxWsArray == null) { - regxWsArray = new MappingEntry[1]; - regxWsArray[0] = new MappingEntry( + if (regexWsArray == null) { + regexWsArray = new MappingEntry[1]; + regexWsArray[0] = new MappingEntry( mappingPath, Pattern.compile(mappingPath).asPredicate(), (WebSocketServlet) servlet); } else { - regxWsArray = Arrays.copyOf(regxWsArray, regxWsArray.length + 1); - regxWsArray[regxWsArray.length - 1] = new MappingEntry( + regexWsArray = Arrays.copyOf(regexWsArray, regexWsArray.length + 1); + regexWsArray[regexWsArray.length - 1] = new MappingEntry( mappingPath, Pattern.compile(mappingPath).asPredicate(), (WebSocketServlet) servlet); - Arrays.sort(regxWsArray); + Arrays.sort(regexWsArray); } } } else if (mappingPath != null && !mappingPath.isEmpty()) { @@ -574,8 +574,8 @@ public class HttpDispatcherServlet }); this.allMapStrings.clear(); this.wsMappings.clear(); - this.regxArray = null; - this.regxWsArray = null; + this.regexArray = null; + this.regexWsArray = null; } protected static class MappingEntry implements Comparable { diff --git a/src/main/java/org/redkale/net/http/HttpRequest.java b/src/main/java/org/redkale/net/http/HttpRequest.java index e0d0f0321..2735702fb 100644 --- a/src/main/java/org/redkale/net/http/HttpRequest.java +++ b/src/main/java/org/redkale/net/http/HttpRequest.java @@ -1458,9 +1458,10 @@ public class HttpRequest extends Request { } /** - * 获取客户端地址IP, 与getRemoteAddress() 的区别在于：本方法优先取header中指定为RemoteAddress名的值，没有则返回getRemoteAddress()的getHostAddress()。 + * 获取客户端地址IP, 与getRemoteAddress() 的区别在于：本方法优先取header中指定为RemoteAddress名的值， + * 没有则返回{@link #getRemoteAddress()}的getHostAddress()。 *
- * 本方法适用于服务前端有如nginx的代理服务器进行中转，通过 getRemoteAddress()是获取不到客户端的真实IP。 + * 本方法适用于服务前端有如nginx的代理服务器进行中转，通过 {@link #getRemoteAddress()}是获取不到客户端的真实IP。 * * @return 地址 */ @@ -1472,6 +1473,10 @@ public class HttpRequest extends Request { if (remoteAddrHeader != null) { String val = getHeader(remoteAddrHeader); if (val != null) { + int pos = val.indexOf(','); + if (pos > 6) { + val = val.substring(0, pos); + } this.remoteAddr = val; return val; } @@ -1542,7 +1547,7 @@ public class HttpRequest extends Request { * @return 内容 */ public T getBodyJson(java.lang.reflect.Type type) { - if (array == null || array.isEmpty()) { + if (isEmpty(array)) { return null; } Convert convert = this.reqConvert; @@ -1564,7 +1569,7 @@ public class HttpRequest extends Request { * @return 内容 */ public T getBodyJson(Convert convert, java.lang.reflect.Type type) { - if (array.isEmpty()) { + if (isEmpty(array)) { return null; } if (type == byte[].class) { diff --git a/src/main/java/org/redkale/net/http/HttpServer.java b/src/main/java/org/redkale/net/http/HttpServer.java index a5712d318..1905b3ffc 100644 --- a/src/main/java/org/redkale/net/http/HttpServer.java +++ b/src/main/java/org/redkale/net/http/HttpServer.java @@ -5,13 +5,12 @@ */ package org.redkale.net.http; -import static java.time.format.DateTimeFormatter.RFC_1123_DATE_TIME; - import java.io.IOException; import java.lang.reflect.Field; import java.net.HttpCookie; import java.text.*; import java.time.ZoneId; +import static java.time.format.DateTimeFormatter.RFC_1123_DATE_TIME; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.LongAdder; @@ -153,8 +152,8 @@ public class HttpServer extends Server files = null; for (MultiPart part : parts()) { - if (fileNameRegx != null - && !fileNameRegx.isEmpty() - && !part.getFileName().matches(fileNameRegx)) { + if (fileNameRegex != null + && !fileNameRegex.isEmpty() + && !part.getFileName().matches(fileNameRegex)) { continue; } - if (contentTypeRegx != null - && !contentTypeRegx.isEmpty() - && !part.getContentType().matches(contentTypeRegx)) { + if (contentTypeRegex != null + && !contentTypeRegex.isEmpty() + && !part.getContentType().matches(contentTypeRegex)) { continue; } File file = new File(home, "tmp/redkale-" + System.nanoTime() + "_" + part.getFileName()); @@ -249,7 +249,7 @@ public final class MultiContext { return emptyIterable; } final String boundarystr = "--" + this.boundary; - final Pattern fileNameRegx = this.fileNamePattern; + final Pattern fileNameRegex = this.fileNamePattern; final String endboundary = boundarystr + "--"; final byte[] boundarray = ("\n" + boundarystr).getBytes(); final byte[] buffer = new byte[boundarray.length]; @@ -377,8 +377,8 @@ public final class MultiContext { } }; this.lastentry = new MultiPart(filename, name, contentType, counter, source); - if (fileNameRegx != null - && !fileNameRegx.matcher(filename).matches()) { + if (fileNameRegex != null + && !fileNameRegex.matcher(filename).matches()) { return this.hasNext(); } return true; diff --git a/src/main/java/org/redkale/net/http/Rest.java b/src/main/java/org/redkale/net/http/Rest.java index f046446ff..532e49e3c 100644 --- a/src/main/java/org/redkale/net/http/Rest.java +++ b/src/main/java/org/redkale/net/http/Rest.java @@ -2765,8 +2765,8 @@ public final class Rest { mv.visitMethodInsn( INVOKEVIRTUAL, reqInternalName, "getMultiContext", "()" + multiContextDesc, false); mv.visitLdcInsn(mupload.maxLength()); - mv.visitLdcInsn(mupload.fileNameRegx()); - mv.visitLdcInsn(mupload.contentTypeRegx()); + mv.visitLdcInsn(mupload.fileNameRegex()); + mv.visitLdcInsn(mupload.contentTypeRegex()); mv.visitMethodInsn( INVOKEVIRTUAL, multiContextName, @@ -2782,8 +2782,8 @@ public final class Rest { mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn(GETFIELD, newDynName, "_redkale_home", "Ljava/io/File;"); mv.visitLdcInsn(mupload.maxLength()); - mv.visitLdcInsn(mupload.fileNameRegx()); - mv.visitLdcInsn(mupload.contentTypeRegx()); + mv.visitLdcInsn(mupload.fileNameRegex()); + mv.visitLdcInsn(mupload.contentTypeRegex()); mv.visitMethodInsn( INVOKEVIRTUAL, multiContextName, @@ -2799,8 +2799,8 @@ public final class Rest { mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn(GETFIELD, newDynName, "_redkale_home", "Ljava/io/File;"); mv.visitLdcInsn(mupload.maxLength()); - mv.visitLdcInsn(mupload.fileNameRegx()); - mv.visitLdcInsn(mupload.contentTypeRegx()); + mv.visitLdcInsn(mupload.fileNameRegex()); + mv.visitLdcInsn(mupload.contentTypeRegex()); mv.visitMethodInsn( INVOKEVIRTUAL, multiContextName, diff --git a/src/main/java/org/redkale/net/http/RestAddress.java b/src/main/java/org/redkale/net/http/RestAddress.java index 48146aada..6964c9653 100644 --- a/src/main/java/org/redkale/net/http/RestAddress.java +++ b/src/main/java/org/redkale/net/http/RestAddress.java @@ -5,15 +5,14 @@ */ package org.redkale.net.http; +import java.lang.annotation.*; import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.*; - /** * 只能注解于Service类的方法的String参数或参数内的String字段 * - *

用于获取HTTP请求端的IP地址 HttpRequest.getRemoteAddr + *

用于获取HTTP请求端的IP地址 {@link org.redkale.net.http.HttpRequest#getRemoteAddr() } * *

详情见: https://redkale.org * diff --git a/src/main/java/org/redkale/net/http/RestUploadFile.java b/src/main/java/org/redkale/net/http/RestUploadFile.java index 5765be857..3f33ecdf0 100644 --- a/src/main/java/org/redkale/net/http/RestUploadFile.java +++ b/src/main/java/org/redkale/net/http/RestUploadFile.java @@ -5,11 +5,10 @@ */ package org.redkale.net.http; +import java.lang.annotation.*; import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.*; - /** * 依附在RestService类的方法的参数上, 用于接收上传文件
* 只能标记在byte[]/File/File[] 类型的参数上
@@ -35,14 +34,14 @@ public @interface RestUploadFile { * * @return String */ - String fileNameRegx() default ""; + String fileNameRegex() default ""; /** * 可接收的ContentType正则表达式, 为空表示接收任何文件类型
* * @return String */ - String contentTypeRegx() default ""; + String contentTypeRegex() default ""; /** * 备注描述, 对应@HttpParam.comment diff --git a/src/main/java/org/redkale/source/CacheMemorySource.java b/src/main/java/org/redkale/source/CacheMemorySource.java index b9a842c48..394042e8f 100644 --- a/src/main/java/org/redkale/source/CacheMemorySource.java +++ b/src/main/java/org/redkale/source/CacheMemorySource.java @@ -1291,10 +1291,10 @@ public final class CacheMemorySource extends AbstractCacheSource { .collect(Collectors.toMap( Map.Entry::getKey, en -> CacheEntry.serialToObj(convert, type, en.getValue()))); } else { - Predicate regx = Pattern.compile(pattern.replace("*", ".*")).asPredicate(); + Predicate regex = Pattern.compile(pattern.replace("*", ".*")).asPredicate(); Set> set = entry.mapValue.entrySet(); return set.stream() - .filter(en -> regx.test(en.getKey())) + .filter(en -> regex.test(en.getKey())) .collect(Collectors.toMap( Map.Entry::getKey, en -> CacheEntry.serialToObj(convert, type, en.getValue()))); } @@ -2356,8 +2356,8 @@ public final class CacheMemorySource extends AbstractCacheSource { if (Utility.isEmpty(pattern)) { return sets.stream().collect(Collectors.toList()); } else { - Predicate regx = Pattern.compile(pattern.replace("*", ".*")).asPredicate(); - return sets.stream().filter(en -> regx.test(en.getValue())).collect(Collectors.toList()); + Predicate regex = Pattern.compile(pattern.replace("*", ".*")).asPredicate(); + return sets.stream().filter(en -> regex.test(en.getValue())).collect(Collectors.toList()); } } diff --git a/src/main/java/org/redkale/util/SelectColumn.java b/src/main/java/org/redkale/util/SelectColumn.java index 03e0233bd..ef4786bfc 100644 --- a/src/main/java/org/redkale/util/SelectColumn.java +++ b/src/main/java/org/redkale/util/SelectColumn.java @@ -33,24 +33,24 @@ public class SelectColumn implements Predicate { if (len < 1) { return; } - Pattern[] regxs = null; + Pattern[] regexs = null; String[] cols = null; int regcount = 0; int colcount = 0; for (String col : columns0) { - boolean regx = false; + boolean regex = false; for (int i = 0; i < col.length(); i++) { char ch = col.charAt(i); if (ch == '^' || ch == '$' || ch == '*' || ch == '?' || ch == '+' || ch == '[' || ch == '(') { - regx = true; + regex = true; break; } } - if (regx) { - if (regxs == null) { - regxs = new Pattern[len]; + if (regex) { + if (regexs == null) { + regexs = new Pattern[len]; } - regxs[regcount++] = Pattern.compile(col); + regexs[regcount++] = Pattern.compile(col); } else { if (cols == null) { cols = new String[len]; @@ -58,11 +58,11 @@ public class SelectColumn implements Predicate { cols[colcount++] = col; } } - if (regxs != null) { + if (regexs != null) { if (regcount == len) { - this.patterns = regxs; + this.patterns = regexs; } else { - this.patterns = Arrays.copyOf(regxs, regcount); + this.patterns = Arrays.copyOf(regexs, regcount); } } if (cols != null) { diff --git a/src/main/java/org/redkale/util/Utility.java b/src/main/java/org/redkale/util/Utility.java index adcba19a9..3381aaa35 100644 --- a/src/main/java/org/redkale/util/Utility.java +++ b/src/main/java/org/redkale/util/Utility.java @@ -1161,6 +1161,26 @@ public final class Utility { return array != null && array.length > 0; } + /** + * 是否为空 + * + * @param array ByteArray + * @return 是否为空 + */ + public static boolean isEmpty(ByteArray array) { + return array == null || array.isEmpty(); + } + + /** + * 是否不为空 + * + * @param array ByteArray + * @return 是否不为空 + */ + public static boolean isNotEmpty(ByteArray array) { + return array != null && !array.isEmpty(); + } + /** * 将字符串首字母大写 * diff --git a/src/test/java/org/redkale/test/util/ClassFilterTest.java b/src/test/java/org/redkale/test/util/ClassFilterTest.java index f9ca98e49..a6453cc09 100644 --- a/src/test/java/org/redkale/test/util/ClassFilterTest.java +++ b/src/test/java/org/redkale/test/util/ClassFilterTest.java @@ -22,19 +22,19 @@ public class ClassFilterTest { @Test public void run1() { - String regx = ClassFilter.formatPackageRegx("*.platf.**"); + String regx = ClassFilter.formatPackageRegex("*.platf.**"); Assertions.assertEquals("^(\\w+)\\.platf\\.(.*)$", regx); } @Test public void run2() { - String regx = ClassFilter.formatPackageRegx("com.platf.**.api"); + String regx = ClassFilter.formatPackageRegex("com.platf.**.api"); Assertions.assertEquals("^com\\.platf\\.(.*)\\.api$", regx); } @Test public void run3() { - String regx = ClassFilter.formatPackageRegx("**.platf.api"); + String regx = ClassFilter.formatPackageRegex("**.platf.api"); Assertions.assertEquals("^(.*)\\.platf\\.api$", regx); } }