Merge branch 'master' of http://39.98.153.250:9080/bowintek/GHSCPartyBuild

src/main/java/com/ghsc/partybuild/shiro/ShiroConfiguration.java

@@ -69,6 +69,7 @@ public class ShiroConfiguration {
         //<!-- 过滤链定义，从上向下顺序执行，一般将 /**放在最为下边 -->:这是一个坑呢，一不小心代码就不好使了;
         //<!-- authc:所有url都必须认证通过才可以访问; anon:所有url都都可以匿名访问-->
         filterChainDefinitionMap.put("/", "anon");
+        filterChainDefinitionMap.put("/web", "anon");
         filterChainDefinitionMap.put("/KongLogin", "anon");
         filterChainDefinitionMap.put("/jxCasLogin","anon");
         filterChainDefinitionMap.put("/*.txt", "anon");

src/main/resources/static/app/main/login-e.js

@@ -278,44 +278,5 @@
         };
 
         $loading.hide();
-
-        // 单点登录设置
-        $scope.toLogin = function () {
-            $http.get("../../api/oauth/getOAuthUrl", {}).then(function (res) {
-                if (res.data.success && res.data.item) {
-                    window.location.href = res.data.item;
-                } else {
-                    if (res.data.msg)
-                        $scope.showMsg('提示', res.data.msg);
-                    $state.go('login');
-                }
-            }, () => {
-                $state.go('login');
-            });
-        };
-        $scope.showMsg = function (title, content) {
-            $alert({
-                title: title + '：',
-                content: content,
-                placement: 'top',
-                type: 'info',
-                show: true,
-                duration: 5
-            });
-        };
-        //判断登录情况
-        if (AuthUser && AuthUser.getUser().Id && AuthUser.getUser().Id != 'null') {
-            $http.get("../../api/user/curloginuser", {params: {appkey: "appId"}}).then(function (res) {
-                if (res.data.success && res.data.item) {
-                    $state.go('homeTabs');
-                } else {
-                    $scope.toLogin();
-                }
-            }, () => {
-                $scope.toLogin();
-            });
-        } else {
-            $scope.toLogin();
-        }
     }]);
 })(angular, this);