Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GETS/HEADS/PUT/DELETE 不允许前端传 @combine #494

Merged
merged 2 commits into from
Jan 9, 2023
Merged

GETS/HEADS/PUT/DELETE 不允许前端传 @combine #494

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e94c44f
GETS/HEADS/PUT/DELETE 不允许前端传 @combine
cloudAndMonkey Jan 9, 2023
8bf7195
更正，开放请求 GET、HEAD 才允许传 @combine:value
cloudAndMonkey Jan 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import apijson.orm.exception.CommonException;
import apijson.orm.exception.UnsupportedDataTypeException;

import static apijson.JSONObject.KEY_COMBINE;
import static apijson.JSONObject.KEY_EXPLAIN;
import static apijson.RequestMethod.CRUD;
import static apijson.RequestMethod.GET;
Expand Down Expand Up @@ -2192,6 +2193,10 @@ private JSONObject batchVerify(RequestMethod method, String tag, int version, St
RequestMethod _method = null;
if (request.get(key) instanceof JSONObject) {
_method = RequestMethod.valueOf(request.getJSONObject(key).getString(apijson.JSONObject.KEY_METHOD).toUpperCase());
String combine = request.getJSONObject(key).getString(KEY_COMBINE);
if (combine != null && RequestMethod.isPublicMethod(_method) == false) {
throw new IllegalArgumentException(key + ":{} 里的 @combine:value 不合法！开放请求 GET、HEAD 才允许传 @combine:value !");
}
} else {
if (keyObjectAttributesMap.get(key) == null) {
if (method == RequestMethod.CRUD) {
Expand Down