Browse Source

登录修改

seimin 2 years ago
parent
commit
7cedcd86ed
2 changed files with 16 additions and 10 deletions
  1. 13 10
      assets/js/controllers/loginCtrl.js
  2. 3 0
      assets/js/main.js

+ 13 - 10
assets/js/controllers/loginCtrl.js

@@ -18,7 +18,7 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
18 18
         }
19 19
         //判断项目归属 end
20 20
         // 是否单点登录
21
-        $scope.isSSo = location.search.length > 0;
21
+        $scope.isSSo = true;
22 22
         //初始化,获取版本类别,处理人/处理科室-seimin
23 23
         $scope.isCategoryHandle = function () {
24 24
             api_is_category.isCategory({ "idx": 0, "sum": 1000 })
@@ -142,15 +142,16 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
142 142
             // api_login.getLicense({}).then(function(res){
143 143
             // $auth.submitLogin($scope.loginForm)
144 144
             // var ssoStr = location.search.replace('?', '').split('&')[0].split('=')[1];
145
-            var ssoStr = '';
146
-            var ssoJson;
147
-            if ($scope.isSSo) {
148
-                ssoStr = location.search.replace('?', '').split('&')[0].split('=')[1];
149
-                ssoStr = Base64.decode(decodeURIComponent(ssoStr));
150
-                ssoJson = JSON.parse(ssoStr);
151
-            }
152
-            var postData = $scope.isSSo ? { username: ssoJson.a, password: ssoJson.u, t: false } : $scope.loginForm;
153
-            api_login.login(postData)
145
+            // 注释
146
+            // var ssoStr = '';
147
+            // var ssoJson;
148
+            // if ($scope.isSSo) {
149
+            //     ssoStr = location.search.replace('?', '').split('&')[0].split('=')[1];
150
+            //     ssoStr = Base64.decode(decodeURIComponent(ssoStr));
151
+            //     ssoJson = JSON.parse(ssoStr);
152
+            // }
153
+            // var postData = $scope.isSSo ? { username: ssoJson.a, password: ssoJson.u, t: false } : $scope.loginForm;
154
+            api_login.sslLogin()
154 155
                 .then(function (resp) {
155 156
                     console.log(resp);
156 157
                     if ($scope.isSSo) {
@@ -425,6 +426,8 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
425 426
                                 } else {
426 427
                                     if (resp.state == "500") {
427 428
                                         SweetAlert.swal("用户名或者密码验证失败,请重试!", "error");
429
+                                    }else if (resp.state == "501") {
430
+                                        $state.go('app.dashboard');
428 431
                                     } else {
429 432
                                         // if (resp.error != 501 && resp.error != 400) {
430 433
                                         //     $state.go('app.knowledge.forum');

+ 3 - 0
assets/js/main.js

@@ -541,6 +541,9 @@ app.factory('api_login', ['UserRestangular', function (UserRestangular) {
541 541
         login: function (username, password) {
542 542
             return loginService.customPOST(username, 'loginEncrypt', {});
543 543
         },
544
+        sslLogin: function (data = {}) {
545
+            return loginService.customPOST(data, 'sslLogin', {});
546
+        },
544 547
         // logout: function(sessionid,userid){
545 548
         //   return loginService.customPOST(sessionid + '/' + userid);
546 549
         // },