lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rest

Browse Source
This commit is contained in:
redkale
2024-01-23 23:21:47 +08:00
parent 2d80646cc4
commit 07e9ad4a21
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/redkale/net/http/Rest.java
View File

@@ -632,8 +632,11 @@ public final class Rest {
Parameter param = params[j]; Parameter param = params[j];
String paramName = param.getName(); String paramName = param.getName();
RestParam rp = param.getAnnotation(RestParam.class); RestParam rp = param.getAnnotation(RestParam.class);
Param pm = param.getAnnotation(Param.class);
if (rp != null && !rp.name().isEmpty()) { if (rp != null && !rp.name().isEmpty()) {
paramName = rp.name(); paramName = rp.name();
} else if (pm != null && !pm.value().isEmpty()) {
paramName = pm.value();
} else if (names != null && names.size() > j) { } else if (names != null && names.size() > j) {
paramName = names.get(j).getName(); paramName = names.get(j).getName();
} }
@@ -3686,7 +3689,16 @@ public final class Rest {
Parameter[] params = method.getParameters(); Parameter[] params = method.getParameters();
for (Parameter param : params) { for (Parameter param : params) {
RestParam rp = param.getAnnotation(RestParam.class); RestParam rp = param.getAnnotation(RestParam.class);
if (rp != null && !rp.name().isEmpty() && rp.name().charAt(0) == '#') { String pn = null;
if (rp != null && !rp.name().isEmpty()) {
pn = rp.name();
} else {
Param pm = param.getAnnotation(Param.class);
if (pm != null && !pm.value().isEmpty()) {
pn = pm.value();
}
}
if (pn != null && pn.charAt(0) == '#') {
pound = true; pound = true;
break; break;
} }