diff --git a/src/main/java/com/cool/core/eps/CoolEps.java b/src/main/java/com/cool/core/eps/CoolEps.java index d5b04b1..e894587 100644 --- a/src/main/java/com/cool/core/eps/CoolEps.java +++ b/src/main/java/com/cool/core/eps/CoolEps.java @@ -6,26 +6,11 @@ import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.spring.SpringUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.cool.core.config.CustomOpenApiResource; import com.mybatisflex.annotation.Table; import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; - import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -37,6 +22,13 @@ import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.util.*; +import java.util.stream.Collectors; + /** * 实体信息与路径 */ @@ -102,8 +94,9 @@ public class CoolEps { if (StrUtil.isNotEmpty(module)) { String entityName = getEntity(method.getBeanType()); String methodPath = getMethodUrl(method); + String escapedMethodPath = methodPath.replace("{", "\\{").replace("}", "\\}"); String prefix = Objects.requireNonNull(getUrl(info)) - .replaceFirst("(?s)(.*)" + methodPath, "$1"); + .replaceFirst("(?s)(.*)" + escapedMethodPath, "$1"); Dict result = Dict.create(); int type = 0; if (prefix.startsWith("/admin")) { diff --git a/src/main/java/com/cool/core/plugin/config/DynamicJarClassLoader.java b/src/main/java/com/cool/core/plugin/config/DynamicJarClassLoader.java index e5b771e..f2444db 100644 --- a/src/main/java/com/cool/core/plugin/config/DynamicJarClassLoader.java +++ b/src/main/java/com/cool/core/plugin/config/DynamicJarClassLoader.java @@ -3,6 +3,8 @@ package com.cool.core.plugin.config; import com.cool.core.exception.CoolPreconditions; import com.cool.core.util.AnnotationUtils; import com.cool.core.util.CompilerUtils; +import lombok.extern.slf4j.Slf4j; + import java.net.URL; import java.net.URLClassLoader; import java.time.Duration; @@ -11,7 +13,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.jar.JarEntry; -import lombok.extern.slf4j.Slf4j; /** * * 自定义类加载器 @@ -125,4 +126,4 @@ public class DynamicJarClassLoader extends URLClassLoader { } }).start(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/cool/modules/dict/controller/admin/AdminDictTypeController.java b/src/main/java/com/cool/modules/dict/controller/admin/AdminDictTypeController.java index 0c9f791..f94d5bb 100644 --- a/src/main/java/com/cool/modules/dict/controller/admin/AdminDictTypeController.java +++ b/src/main/java/com/cool/modules/dict/controller/admin/AdminDictTypeController.java @@ -1,7 +1,5 @@ package com.cool.modules.dict.controller.admin; -import static com.cool.modules.dict.entity.table.DictTypeEntityTableDef.DICT_TYPE_ENTITY; - import cn.hutool.json.JSONObject; import com.cool.core.annotation.CoolRestController; import com.cool.core.base.BaseController; @@ -10,6 +8,8 @@ import com.cool.modules.dict.service.DictTypeService; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; +import static com.cool.modules.dict.entity.table.DictTypeEntityTableDef.DICT_TYPE_ENTITY; + /** * 字典类型 */ @@ -22,4 +22,4 @@ public class AdminDictTypeController extends BaseController