登录调整

src/login/js/login.js

@@ -5,13 +5,22 @@
 var HOST_NAME = "36.134.100.99:1111";
 
 // var HOST_NAME = "192.168.2.80:11011";
-SYS_ADDR = location.href.trim().toLowerCase().replace(/login\/+$/, ""),
+const SYS_ADDR = location.href.trim().toLowerCase().split('login')[0],
+
+
     COOKIE_EXPIRES = 1,
     COOKIE_PATH = location.pathname.trim().toLowerCase().replace(/login\/+$/, "");
 /* CONFIGURE END */
 
 window.onload = function () {
-    tokenLogin()
+    // window.setTimeout(e=>{
+    //     if( ! tokenLogin()){
+    //         return
+    //     }
+    // },5000)
+        if( ! tokenLogin()){
+            return
+        }
     var userInput = $(".username");
     var passwordInput = $('.password');
     var btnLogin = $('.login');
@@ -52,9 +61,26 @@ window.onload = function () {
                     }
                 })
             }
-            debugger
+            $.ajax({
+                // url: "http://" + HOST_NAME + "/auth/oauth/token?project=8000",
+               //url: "http://" + HOST_NAME + "/auth/oauth/token?project=8040",
+                url: "http://" + HOST_NAME + "/auth/oauth/token",
+                // url: "http://" + '192.168.2.126:11011' + "/auth/oauth/token",
+                data: {
+                    "token": tempObj.token,
+                    "appName": tempObj.appName,
+                    "loginType":"token"
+                },
+                type: "post",
+                dataType: "json",
+                success: ajaxCallBack.bind(this),
+                error: errorCallBack.bind(this)
+            });
+            return false;
+            // debugger
         }else{
             document.getElementById("mainContainer").setAttribute("style","");
+            return true
         }
     }
 
@@ -67,7 +93,6 @@ window.onload = function () {
     function loginCallBack(result) {
         var username = userInput.val().trim();
         var password = passwordInput.val().trim();
-    // window.location.href = SYS_ADDR;
         if (username == '' && password != '') {
             $(".error").show();
             $(".errorInfoUsername").text("用户名不能为空！");
@@ -96,15 +121,19 @@ window.onload = function () {
     }
 
     function ajaxCallBack(result) {
-        if ($(".remember_check").hasClass("check")) {
+        if(result.code==-1){
+            alert(result.message);
+            return
+        }
+        if ($(".remember_check").hasClass("check")||window.location.href.indexOf("token")>-1) {
             var remember = hex_sha1("remember");
             Cookies.set(remember, "true", {
                 path: SYS_ADDR
             });
-            Cookies.set(hex_sha1("username"), Secret_Key(userInput.val(), 'encryption'), {
+            Cookies.set(hex_sha1("username"), Secret_Key(userInput.val()||result.result.username, 'encryption'), {
                 path: SYS_ADDR
             });
-            Cookies.set(hex_sha1("psw"), Secret_Key(passwordInput.val(), 'encryption'), {
+            Cookies.set(hex_sha1("psw"), Secret_Key(passwordInput.val()||'', 'encryption'), {
                 path: SYS_ADDR
             });
         } else {
@@ -114,7 +143,7 @@ window.onload = function () {
             Cookies.remove(hex_sha1("userid"));
         }
         if (result.code == 1) {
-            Cookies.set(hex_sha1("username"), Secret_Key(userInput.val(), 'encryption'), {
+            Cookies.set(hex_sha1("username"), Secret_Key(userInput.val()||result.result.username, 'encryption'), {
                 path: COOKIE_PATH
             });
             Cookies.set(hex_sha1("token"), Secret_Key(result.result.accessToken, 'encryption'), {