diry 1 mesiac pred
rodič
commit
c434e53843
5 zmenil súbory, kde vykonal 294 pridanie a 306 odobranie
  1. 1 1
      lib/config.json
  2. 0 0
      lib/js/index.js
  3. 209 209
      lib/js/index2.js
  4. 82 94
      lib/js/sso.js
  5. 2 2
      lib/sso.html

+ 1 - 1
lib/config.json

@@ -1 +1 @@
-{"_hash":1789876898653,"VITE_APP_PROJECT_NAME":"前端项目架构","VITE_APP_VERSION":"v1.0","VITE_APP_JSS_LICENSE":"","VITE_APP_TITLE":"平台","VITE_APP_BASE_URL":"/","VITE_APP_FOOTER_VISIBLE":false,"VITE_APP_LANG_ENABLE":false,"VITE_APP_LANG":"zh","VITE_APP_API_PATH":"/apig","VITE_APP_SYS_SERVER_NAME":"monitor","VITE_APP_MESSAGE_SERVER_NAME":"message","VITE_APP_PORTAL_SERVER_NAME":"portal","VITE_APP_FLOOW_SERVER_NAME":"floow","VITE_APP_CLIENT_ID":"mm1648092016270","VITE_APP_PREVIEW_ONLINE":"/filePreview/onlinePreview?url=","VITE_APP_WEB_SITE":"https://sapit.com.cn/#/home","VITE_APP_LOGIN_CASE_NAME":"辽ICP备14008719号-2","VITE_APP_BASE_CASE_NAME":"辽ICP备14008719号-2","VITE_APP_SOCKET_URL":"/","VITE_CONFIG_MODE":false,"VITE_APP_API_BASE_URL":"http://192.168.200.6:7022","VITE_APP_API_FILE_URL":"/","VITE_APP_MENU_THEME":"dark","VITE_APP_MENU_BAR":"left","VITE_APP_LOGIN_PATH_THEME":"3","VITE_APP_THEME_VALUE":"blue","VITE_APP_THEME":{"blue":{"name":"blue","color":"#1677FF","lightColor":"\t#6495ED","darkColor":"#00008B","borderColor":"#B0C4DE","bgColor":"#f0f2f5"},"green":{"name":"green","color":"#00b96b","lightColor":"#90EE90","darkColor":"#3CB371","borderColor":"#98FB98","bgColor":"#F0FFF0"},"orange":{"name":"orange","color":"#FFA500","lightColor":"\t#FFE4B5","darkColor":"#FF8C00","borderColor":"#FFDEAD","bgColor":"#FFEFD5"}},"VITE_APP_LOGIN_PATH":"/login","VITE_APP_DEFAULT_PATH":"/workplace/index","VITE_USER_NODE_ENV":"production"}
+{"_hash":1789877433525,"VITE_APP_PROJECT_NAME":"前端项目架构","VITE_APP_VERSION":"v1.0","VITE_APP_JSS_LICENSE":"","VITE_APP_TITLE":"平台","VITE_APP_BASE_URL":"/","VITE_APP_FOOTER_VISIBLE":false,"VITE_APP_LANG_ENABLE":false,"VITE_APP_LANG":"zh","VITE_APP_API_PATH":"/apig","VITE_APP_SYS_SERVER_NAME":"monitor","VITE_APP_MESSAGE_SERVER_NAME":"message","VITE_APP_PORTAL_SERVER_NAME":"portal","VITE_APP_FLOOW_SERVER_NAME":"floow","VITE_APP_CLIENT_ID":"mm1648092016270","VITE_APP_PREVIEW_ONLINE":"/filePreview/onlinePreview?url=","VITE_APP_WEB_SITE":"https://sapit.com.cn/#/home","VITE_APP_LOGIN_CASE_NAME":"辽ICP备14008719号-2","VITE_APP_BASE_CASE_NAME":"辽ICP备14008719号-2","VITE_APP_SOCKET_URL":"/","VITE_CONFIG_MODE":false,"VITE_APP_API_BASE_URL":"http://192.168.200.6:7022","VITE_APP_API_FILE_URL":"/","VITE_APP_MENU_THEME":"dark","VITE_APP_MENU_BAR":"left","VITE_APP_LOGIN_PATH_THEME":"3","VITE_APP_THEME_VALUE":"blue","VITE_APP_THEME":{"blue":{"name":"blue","color":"#1677FF","lightColor":"\t#6495ED","darkColor":"#00008B","borderColor":"#B0C4DE","bgColor":"#f0f2f5"},"green":{"name":"green","color":"#00b96b","lightColor":"#90EE90","darkColor":"#3CB371","borderColor":"#98FB98","bgColor":"#F0FFF0"},"orange":{"name":"orange","color":"#FFA500","lightColor":"\t#FFE4B5","darkColor":"#FF8C00","borderColor":"#FFDEAD","bgColor":"#FFEFD5"}},"VITE_APP_LOGIN_PATH":"/login","VITE_APP_DEFAULT_PATH":"/workplace/index","VITE_USER_NODE_ENV":"production"}

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
lib/js/index.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 209 - 209
lib/js/index2.js


+ 82 - 94
lib/js/sso.js

@@ -8,7 +8,10 @@ function lsGet(name) {
   var key = name
   for (var i = 0; i < localStorage.length; i++) {
     var k = localStorage.key(i)
-    if (k && k.slice(-(name.length + 1)) === '-' + name) { key = k; break }
+    if (k && k.slice(-(name.length + 1)) === '-' + name) {
+      key = k
+      break
+    }
   }
   var raw = localStorage.getItem(key)
   if (raw === null || typeof raw === 'undefined') return null
@@ -24,106 +27,91 @@ var urlParams
 var loginResult
 $(function () {
     urlParams = qs.parse(location.search.replace('?', ''))
+    alert('sso urlParams=\n' + JSON.stringify(urlParams) + '\nURL=' + URL)
     // 获取授权验证
     getAuthorizationCodeValidate(urlParams)
-    const client = res.data || {}
-    let KEY = TOKEN
-    if (location.port) KEY += `_${location.port}`
-    // 从本地存储读取($utils.ls 写入)
-    loginResult = lsGet(TOKEN)
-    if (client && loginResult) {
-        loginSuccess()
-    } else {
-        console.error('登录失败,自动跳转到回调地址中')
-        document.location.href = urlParams.redirect_uri
-    }
+  const client = res.data || {}
+  let KEY = TOKEN
+  if (location.port) KEY += `_${location.port}`
+  // 从本地存储读取($utils.ls 写入)
+  loginResult = lsGet(TOKEN)
+  if (client && loginResult) {
+    loginSuccess()
+  } else {
+    console.error('登录失败,自动跳转到回调地址中')
+    document.location.href = urlParams.redirect_uri
+  }
 })
 
-function getAuthorizationCodeValidate (data = {}) {
-    $.ajax({
-        type: 'POST',
-        url: `${URL}/oauth2/authorizationCodeValidate?${qs.stringify(urlParams)}`,
-        data: {},
-        dataType: 'json',
-        async: false, // 同步模式
-        beforeSend: function (request) {
-            // window.sessionStorage.clear()
-            // request.setRequestHeader("Authorization", "Basic V2ViQXBwOnNhcGlAMTIzNA==")
-        },
-        success: function (result) {
-            res = result
-        },
-        error: function (result) {
-            console.error('error', result)
-            document.location.href = urlParams.redirect_uri
-        }
-    })
+function getAuthorizationCodeValidate(data = {}) {
+  $.ajax({
+    type: 'POST',
+    url: `${URL}/oauth2/authorizationCodeValidate?${qs.stringify(urlParams)}`,
+    data: {},
+    dataType: 'json',
+    async: false, // 同步模式
+    beforeSend: function (request) {
+      // window.sessionStorage.clear()
+      // request.setRequestHeader("Authorization", "Basic V2ViQXBwOnNhcGlAMTIzNA==")
+    },
+    success: function (result) {
+      res = result
+    },
+    error: function (result) {
+      console.error('error', result)
+      document.location.href = urlParams.redirect_uri
+    }
+  })
 }
 
-function loginSuccess () {
-    if (urlParams.scope === 'snsapi_base') { // 静默授权
-        auth()
-    } else {
-        console.log('回调地址非静默授权')
-        document.location.href = urlParams.redirect_uri
-    }
+function loginSuccess() {
+  if (urlParams.scope === 'snsapi_base') {
+    // 静默授权
+    auth()
+  } else {
+    console.log('回调地址非静默授权')
+    document.location.href = urlParams.redirect_uri
+  }
 }
-function auth () {
-    $.ajax({
-        type: 'POST',
-        url: `${URL}/oauth2/code?${qs.stringify(urlParams)}`,
-        data: {},
-        dataType: 'json',
-        async: false, // 同步模式
-        beforeSend: function (request) {
-            // window.sessionStorage.clear()
-            request.setRequestHeader('user-token', loginResult)
-        },
-        success: function (result) {
-            const flag = result.status === 1
-            if (flag) {
-                const code = result.data
-                const state = urlParams.state ? `&state=${urlParams.state}` : ''
-                if (urlParams && urlParams.redirect_uri && urlParams.redirect_uri.includes('?')) {
-                    document.location.href = `${urlParams.redirect_uri}&code=${code}${state}`
-                } else {
-                    document.location.href = `${urlParams.redirect_uri}?code=${code}${state}`
-                }
-                // console.log('返回地址', `${urlParams.redirect_uri}?code=${code}${state}`)
-            } else {
-               console.error('登录超时')
-               document.location.href = window.location.protocol + '//' + window.location.host + '/pages/index/login'
-            }
-        },
-        error: function (result) {
-            console.error('error', result)
-            document.location.href = urlParams.redirect_uri
+function auth() {
+  alert(
+    '准备调用 oauth2/code\nURL=' +
+      URL +
+      '\nloginResult=' +
+      loginResult +
+      '\nurlParams=' +
+      JSON.stringify(urlParams)
+  )
+  $.ajax({
+    type: 'POST',
+    url: `${URL}/oauth2/code?${qs.stringify(urlParams)}`,
+    data: {},
+    dataType: 'json',
+    async: false, // 同步模式
+    beforeSend: function (request) {
+      // window.sessionStorage.clear()
+      request.setRequestHeader('user-token', loginResult)
+    },
+    success: function (result) {
+      const flag = result.status === 1
+      if (flag) {
+        const code = result.data
+        const state = urlParams.state ? `&state=${urlParams.state}` : ''
+        if (urlParams && urlParams.redirect_uri && urlParams.redirect_uri.includes('?')) {
+          document.location.href = `${urlParams.redirect_uri}&code=${code}${state}`
+        } else {
+          document.location.href = `${urlParams.redirect_uri}?code=${code}${state}`
         }
-    })
-}
-
-// var cookie_value = getCookie(cookie_name);
-function getCookie (cookieName) {
-    // var allcookies = document.cookie;
-    // 索引长度,开始索引的位置
-    var arr = document.cookie.match(new RegExp('(^| )' + (cookieName) + '=([^;]*)(;|$)'))
-    if (!!arr && arr.length > 0) {
-        return unescape(arr[2])
+        // console.log('返回地址', `${urlParams.redirect_uri}?code=${code}${state}`)
+      } else {
+        console.error('登录超时')
+        document.location.href =
+          window.location.protocol + '//' + window.location.host + '/pages/index/login'
+      }
+    },
+    error: function (result) {
+      console.error('error', result)
+      document.location.href = urlParams.redirect_uri
     }
-
-    // var cookiePos = allcookies.indexOf(cookieName)
-    // // 如果找到了索引,就代表cookie存在,否则不存在
-    // if (cookiePos !== -1) {
-    //     // 把cookiePos放在值的开始,只要给值加1即可
-    //     // 计算取cookie值得开始索引,加的1为“=”
-    //     cookiePos = cookiePos + cookieName.length + 1
-    //     // 计算取cookie值得结束索引
-    //     var cookieEnd = allcookies.indexOf(';', cookiePos)
-    //     if (cookieEnd === -1) {
-    //         cookieEnd = allcookies.length
-    //     }
-    //     // 得到想要的cookie的值
-    //     var value = unescape(allcookies.substring(cookiePos, cookieEnd))
-    // }
-    // return value
+  })
 }

+ 2 - 2
lib/sso.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="zh-cmn-Hans">
   <head>
     <meta charset="utf-8" />
@@ -10,7 +10,7 @@
     <title>跳转中</title>
     <script src="./js/jquery-3.6.0.min.js" type="text/javascript" charset="utf-8"></script>
     <script src="./js/qs.js" type="text/javascript" charset="utf-8"></script>
-    <script src="./js/sso.js" type="module" charset="utf-8" ></script>
+    <script src="./js/sso.js" type="module" charset="utf-8"></script>
     <title>portal</title>
   </head>
   <body>

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov