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

Browse Source
This commit is contained in:
wentch
2015-12-16 10:46:23 +08:00
parent 08bdc9ec13
commit ad12a05b93
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/org/redkale/net/http/BasedHttpServlet.java
View File

@@ -32,7 +32,7 @@ public abstract class BasedHttpServlet extends HttpServlet {
* 当标记为 @AuthIgnore 的方法不会再调用之前调用authenticate 方法。 * 当标记为 @AuthIgnore 的方法不会再调用之前调用authenticate 方法。
* *
* @see http://www.redkale.org * @see http://www.redkale.org
* @author zhangjx * @author zhangjx
*/ */
@Inherited @Inherited
@Documented @Documented
@@ -43,11 +43,11 @@ public abstract class BasedHttpServlet extends HttpServlet {
} }
/** /**
* 配合 BasedHttpServlet 使用。 * 配合 BasedHttpServlet 使用。
* 用于对@WebServlet对应的url进行细分。 其 url * 用于对@WebServlet对应的url进行细分。 其 url
* *
* @see http://www.redkale.org * @see http://www.redkale.org
* @author zhangjx * @author zhangjx
*/ */
@Target({ElementType.METHOD}) @Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@@ -65,7 +65,7 @@ public abstract class BasedHttpServlet extends HttpServlet {
* 通常情况下 @HttpCacheable 需要与 @AuthIgnore 一起使用，因为没有标记@AuthIgnore的方法一般输出的结果与当前用户信息有关。 * 通常情况下 @HttpCacheable 需要与 @AuthIgnore 一起使用，因为没有标记@AuthIgnore的方法一般输出的结果与当前用户信息有关。
* *
* @see http://www.redkale.org * @see http://www.redkale.org
* @author zhangjx * @author zhangjx
*/ */
@Target({ElementType.METHOD}) @Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@@ -144,13 +144,12 @@ public abstract class BasedHttpServlet extends HttpServlet {
Class[] exps = method.getExceptionTypes(); Class[] exps = method.getExceptionTypes();
if (exps.length > 0 && (exps.length != 1 || exps[0] != IOException.class)) continue; if (exps.length > 0 && (exps.length != 1 || exps[0] != IOException.class)) continue;
//----------------------------------------------- //-----------------------------------------------
String name = methodname;
int actionid = 0; final WebAction action = method.getAnnotation(WebAction.class);
WebAction action = method.getAnnotation(WebAction.class); if (action == null) continue;
if (action != null) { final int actionid = action.actionid();
actionid = action.actionid(); final String name = action.url().trim();
name = action.url().trim();
}
if (nameset.contains(name)) throw new RuntimeException(this.getClass().getSimpleName() + " has two same " + WebAction.class.getSimpleName() + "(" + name + ")"); if (nameset.contains(name)) throw new RuntimeException(this.getClass().getSimpleName() + " has two same " + WebAction.class.getSimpleName() + "(" + name + ")");
for (String n : nameset) { for (String n : nameset) {
if (n.contains(name) || name.contains(n)) { if (n.contains(name) || name.contains(n)) {