diff --git a/src/org/redkale/boot/NodeHttpServer.java b/src/org/redkale/boot/NodeHttpServer.java index a5b4274e6..8b8d20a98 100644 --- a/src/org/redkale/boot/NodeHttpServer.java +++ b/src/org/redkale/boot/NodeHttpServer.java @@ -155,7 +155,7 @@ public class NodeHttpServer extends NodeServer { if (ws1 == ws2) { Priority p1 = o1.getType().getAnnotation(Priority.class); Priority p2 = o2.getType().getAnnotation(Priority.class); - int v = (p1 == null ? 0 : p1.value()) - (p2 == null ? 0 : p2.value()); + int v = (p2 == null ? 0 : p2.value()) - (p1 == null ? 0 : p1.value()); return v == 0 ? o1.getType().getName().compareTo(o2.getType().getName()) : 0; } return ws1 ? -1 : 1; diff --git a/src/org/redkale/boot/NodeServer.java b/src/org/redkale/boot/NodeServer.java index 69027dc75..ebf0707d5 100644 --- a/src/org/redkale/boot/NodeServer.java +++ b/src/org/redkale/boot/NodeServer.java @@ -400,9 +400,8 @@ public abstract class NodeServer { Collections.sort(swlist, (o1, o2) -> { Priority p1 = o1.getClass().getAnnotation(Priority.class); Priority p2 = o2.getClass().getAnnotation(Priority.class); - int v1 = p1 == null ? 0 : p1.value(); - int v2 = p2 == null ? 0 : p2.value(); - if (v1 != v2) return v1 - v2; + int v = (p2 == null ? 0 : p2.value()) - (p1 == null ? 0 : p1.value()); + if (v != 0) return v; int rs = Sncp.getResourceType(o1).getName().compareTo(Sncp.getResourceType(o2).getName()); if (rs == 0) rs = Sncp.getResourceName(o1).compareTo(Sncp.getResourceName(o2)); return rs; diff --git a/src/org/redkale/net/Filter.java b/src/org/redkale/net/Filter.java index 956e5d4ed..5f31e363c 100644 --- a/src/org/redkale/net/Filter.java +++ b/src/org/redkale/net/Filter.java @@ -38,6 +38,6 @@ public abstract class Filter, P extends if (!(o instanceof Filter)) return 1; Priority p1 = this.getClass().getAnnotation(Priority.class); Priority p2 = o.getClass().getAnnotation(Priority.class); - return (p1 == null ? 0 : p1.value()) - (p2 == null ? 0 : p2.value()); + return (p2 == null ? 0 : p2.value()) - (p1 == null ? 0 : p1.value()); } } diff --git a/src/org/redkale/util/Priority.java b/src/org/redkale/util/Priority.java index bf7d6271c..e02258497 100644 --- a/src/org/redkale/util/Priority.java +++ b/src/org/redkale/util/Priority.java @@ -10,7 +10,7 @@ import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** - * 优先级, 值越小越靠前执行 + * 优先级, 值越大优先级最高,越靠前执行 * *

* 详情见: https://redkale.org