🐛 Fixing a bug. #22

TogetherOS · Nov 12, 2018 · 783d331 · 783d331
1 parent 936bccb
commit 783d331
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/cicada-core/src/main/java/top/crossoverjie/cicada/server/intercept/InterceptProcess.java b/cicada-core/src/main/java/top/crossoverjie/cicada/server/intercept/InterceptProcess.java
@@ -47,11 +47,11 @@ public void loadInterceptors(AppConfig appConfig) throws Exception {
             return;
         }else {
             interceptors = new ArrayList<>(10) ;
-            Map<Integer, Class<?>> cicadaInterceptor = ClassScanner.getCicadaInterceptor(appConfig.getRootPackageName());
-            for (Map.Entry<Integer, Class<?>> classEntry : cicadaInterceptor.entrySet()) {
-                Class<?> interceptorClass = classEntry.getValue();
+            Map<Class<?>, Integer> cicadaInterceptor = ClassScanner.getCicadaInterceptor(appConfig.getRootPackageName());
+            for (Map.Entry<Class<?>, Integer> classEntry : cicadaInterceptor.entrySet()) {
+                Class<?> interceptorClass = classEntry.getKey();
                 CicadaInterceptor interceptor = (CicadaInterceptor) interceptorClass.newInstance();
-                interceptor.setOrder(classEntry.getKey());
+                interceptor.setOrder(classEntry.getValue());
                 interceptors.add(interceptor);
             }
             Collections.sort(interceptors,new OrderComparator());

diff --git a/cicada-core/src/main/java/top/crossoverjie/cicada/server/util/ClassScanner.java b/cicada-core/src/main/java/top/crossoverjie/cicada/server/util/ClassScanner.java
@@ -29,7 +29,7 @@ public class ClassScanner {
 
 
     private static Map<String, Class<?>> actionMap = null;
-    private static Map<Integer, Class<?>> interceptorMap = null;
+    private static Map<Class<?>, Integer> interceptorMap = null;
 
     private static Set<Class<?>> classes = null;
 
@@ -111,7 +111,7 @@ public static Map<String, Class<?>> getCicadaAction(String packageName) throws E
      * @return
      * @throws Exception
      */
-    public static Map<Integer, Class<?>> getCicadaInterceptor(String packageName) throws Exception {
+    public static Map<Class<?>, Integer> getCicadaInterceptor(String packageName) throws Exception {
 
         if (interceptorMap == null) {
             Set<Class<?>> clsList = getClasses(packageName);
@@ -133,7 +133,7 @@ public static Map<Integer, Class<?>> getCicadaInterceptor(String packageName) th
                         continue;
                     }
                     Interceptor interceptor = (Interceptor) annotation;
-                    interceptorMap.put(interceptor.order(), cls);
+                    interceptorMap.put(cls, interceptor.order());
                 }
 
             }

diff --git a/...ample/src/main/java/top/crossoverjie/cicada/example/intercept/ExecuteTimeInterceptor.java b/...ample/src/main/java/top/crossoverjie/cicada/example/intercept/ExecuteTimeInterceptor.java
@@ -28,7 +28,7 @@ public boolean before(CicadaContext context,Param param) {
         start = System.currentTimeMillis();
         LOGGER.info("拦截请求");
         context.text("拦截请求");
-        return false;
+        return true;
     }
 
     @Override

diff --git a/...le/src/main/java/top/crossoverjie/cicada/example/intercept/LoggerInterceptorAbstract.java b/...le/src/main/java/top/crossoverjie/cicada/example/intercept/LoggerInterceptorAbstract.java
@@ -14,7 +14,7 @@
  *         Date: 2018/9/2 14:39
  * @since JDK 1.8
  */
-@Interceptor
+@Interceptor(order = 1)
 public class LoggerInterceptorAbstract extends CicadaInterceptor {
 
     private static final Logger LOGGER = LoggerBuilder.getLogger(LoggerInterceptorAbstract.class) ;