Merge pull request #469 from nobodyiam/portal-bugfix

apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/CatConfig.java

@@ -5,6 +5,7 @@ import javax.servlet.DispatcherType;
 import org.springframework.boot.context.embedded.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
 
 import com.dianping.cat.servlet.CatFilter;
 
@@ -18,6 +19,7 @@ public class CatConfig {
     bean.setName("cat-filter");
     bean.addUrlPatterns("/*");
     bean.setDispatcherTypes(DispatcherType.REQUEST, DispatcherType.FORWARD);
+    bean.setOrder(Ordered.HIGHEST_PRECEDENCE);
     return bean;
   }
 

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java

@@ -65,6 +65,7 @@ public class AuthConfiguration {
       FilterRegistrationBean singleSignOutFilter = new FilterRegistrationBean();
       singleSignOutFilter.setFilter(filter("org.jasig.cas.client.session.SingleSignOutFilter"));
       singleSignOutFilter.addUrlPatterns("/*");
+      singleSignOutFilter.setOrder(1);
       return singleSignOutFilter;
     }
 
@@ -83,6 +84,7 @@ public class AuthConfiguration {
       casFilter.setInitParameters(filterInitParam);
       casFilter.setFilter(filter("com.ctrip.framework.apollo.sso.filter.ApolloAuthenticationFilter"));
       casFilter.addUrlPatterns("/*");
+      casFilter.setOrder(2);
 
       return casFilter;
     }
@@ -102,6 +104,7 @@ public class AuthConfiguration {
       casValidationFilter.setFilter(filter("org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter"));
       casValidationFilter.setInitParameters(filterInitParam);
       casValidationFilter.addUrlPatterns("/*");
+      casValidationFilter.setOrder(3);
 
       return casValidationFilter;
 
@@ -119,6 +122,7 @@ public class AuthConfiguration {
 
       assertionHolderFilter.setFilter(filter("com.ctrip.framework.apollo.sso.filter.ApolloAssertionThreadLocalFilter"));
       assertionHolderFilter.addUrlPatterns("/*");
+      assertionHolderFilter.setOrder(4);
 
       return assertionHolderFilter;
     }

apollo-portal/src/main/resources/static/scripts/controller/IndexController.js

@@ -79,6 +79,9 @@ function IndexController($scope, $window, toastr, AppUtil, AppService, UserServi
                         });
                         result.forEach(function (favorite) {
                             var app = appIdMapApp[favorite.appId];
+                            if (!app){
+                                return;
+                            }
                             app.favoriteId = favorite.id;
                             $scope.favorites.push(app);
                         });