ZQ/laws-sinotruk-mobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[add]钉钉单点登录前端代码的增加

Browse Source
This commit is contained in:
fengchenchen
2024-03-01 15:29:56 +08:00
parent 5904190722
commit 4ac7edad8a
9 changed files with 112 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development
+2 -1
View File
@@ -1,4 +1,5 @@
NODE_ENV=development
VUE_APP_TAG_FLAG=0
VUE_APP_LOGIN_PAGE='/user/login'
VUE_APP_CURRENT_SYSTEM='inner'
VUE_APP_CURRENT_SYSTEM='inner'
VUE_APP_DING_CORP_ID='ding7e68cba137504bb7f2c783f7214b6d69'
.env.production
+1
View File
@@ -2,3 +2,4 @@ NODE_ENV=production
VUE_APP_TAG_FLAG=1
VUE_APP_LOGIN_PAGE='/user/login'
VUE_APP_CURRENT_SYSTEM='inner'
VUE_APP_DING_CORP_ID='ding7e68cba137504bb7f2c783f7214b6d69'
.env.test
+2 -1
View File
@@ -4,4 +4,5 @@ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jero.com/onlinePreview
VUE_APP_TAG_FLAG=1
VUE_APP_LOGIN_PAGE='/user/login'
VUE_APP_CURRENT_SYSTEM='inner'
VUE_APP_CURRENT_SYSTEM='inner'
VUE_APP_DING_CORP_ID='ding9ec7f291faadef5dee0f45d8e4f7c288'
package.json
+1 -1
View File
@@ -11,7 +11,7 @@
"ant-design-vue": "1.7.2",
"axios": "^0.21.1",
"core-js": "^3.8.3",
"dingtalk-jsapi": "^3.0.29",
"dingtalk-jsapi": "^3.0.31",
"js-base64": "^3.6.0",
"jsencrypt": "^3.0.0-rc.1",
"md5": "^2.2.1",
src/api/login.js
+8
View File
@@ -19,6 +19,14 @@ export function login (parameter) {
data: parameter
})
}
// 钉钉单点登录 需要修改路径。
export function dingLogin (parameter) {
return axios({
url: '/hiwork/login',
method: 'post',
data: parameter
})
}
export function phoneLogin (parameter) {
return axios({
src/main.js
+7
View File
@@ -65,6 +65,13 @@ new Vue({
mounted () {
store.commit('SET_TOKEN', Vue.ls.get(ACCESS_TOKEN))
store.commit('SET_INFO', Vue.ls.get(USER_INFO))
// 判断是否有token，没有的话就直接单点登录
if (!Vue.ls.get(ACCESS_TOKEN)) {
console.log('store.dispatch(\'DingLogin\')')
store.dispatch('DingLogin').catch((e) => {
Toast(e.message)
})
}
},
render: h => h(App)
}).$mount('#app')
src/store/modules/user.js
+34 -2
View File
@@ -1,8 +1,8 @@
import Vue from 'vue'
import { login, logout, phoneLogin, thirdLogin } from '@/api/login'
import {login, logout, phoneLogin, thirdLogin, dingLogin} from '@/api/login'
import { ACCESS_TOKEN, USER_NAME, USER_INFO, USER_AUTH, SYS_BUTTON_AUTH, UI_CACHE_DB_DICT_DATA, TENANT_ID, CACHE_INCLUDED_ROUTES } from '@/store/mutation-types'
import store from '@/store'
import { welcome } from '@/utils/util'
import { welcome, getDingCode } from '@/utils/util'
import { queryPermissionsByUser } from '@/api/api'
import { getAction } from '@/api/manage'
@@ -157,6 +157,38 @@ const user = {
})
})
},
// 钉钉单点登录
async DingLogin ({ commit }) {
const code = await getDingCode()
console.log('--getDingCode---', code)
// 先使用钉钉本身的api获取当前登录人的coode码 然后传给后端调用单点登录的接口
return new Promise((resolve, reject) => {
if (code) {
// 使用code调用后端hiwork登录的接口
dingLogin({ code }).then(response => {
if (response.code + '' === '200') {
const result = response.result
const userInfo = result.userInfo
Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000)
commit('SET_TOKEN', result.token)
commit('SET_INFO', userInfo)
commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() })
commit('SET_AVATAR', userInfo.avatar)
resolve(response)
} else {
reject(response)
}
}).catch(error => {
reject(error)
})
} else {
reject()
}
})
},
// 登出
Logout ({ commit, state }) {
src/utils/request.js
+27 -18
View File
@@ -41,24 +41,33 @@ const err = (error) => {
// update-end- --- author:liusq ------ date:20200910 ---- for:处理Blob情况----
if (data.includes('Token失效')) {
// update-begin- --- author:scott ------ date:20190225 ---- for:Token失效采用弹框模式，不直接跳转----
Dialog.alert({
title: '登录已过期',
message: '很抱歉，登录已过期，请重新登录',
confirmButtonText: '重新登录',
theme: 'round-button'
}).then(() => {
store.dispatch('Logout').then(() => {
Vue.ls.remove(ACCESS_TOKEN)
try {
const path = window.document.location.pathname
console.log('location pathname -> ' + path)
if (path !== '/' && path.indexOf('/user/login') === -1) {
window.location.reload()
}
} catch (e) {
window.location.reload()
}
})
// 需要接hiwork 所以如果hiwork 登录失效的话 直接免密登录即可。
store.dispatch('DingLogin').then((res) => {
}).catch((e) => {
// 不是钉钉登录的环境，走原来的方法 退出登录
if (!e) {
Dialog.alert({
title: '登录已过期',
message: '很抱歉，登录已过期，请重新登录',
confirmButtonText: '重新登录',
theme: 'round-button'
}).then(() => {
store.dispatch('Logout').then(() => {
Vue.ls.remove(ACCESS_TOKEN)
try {
const path = window.document.location.pathname
console.log('location pathname -> ' + path)
if (path !== '/' && path.indexOf('/user/login') === -1) {
window.location.reload()
}
} catch (e) {
window.location.reload()
}
})
})
} else {
Toast(e.message)
}
})
// update-end- --- author:scott ------ date:20190225 ---- for:Token失效采用弹框模式，不直接跳转----
}
src/utils/util.js
+30
View File
@@ -1,6 +1,7 @@
import Vue from 'vue'
import * as api from '@/api/api'
import { ACCESS_TOKEN } from '@/store/mutation-types'
import * as dd from 'dingtalk-jsapi'
//
export function timeFix () {
const time = new Date()
@@ -524,3 +525,32 @@ export function urlToParams (url) {
})
return paramsObj
}
// 获取钉钉 免登授权码
export function getDingCode () {
return new Promise((resolve, reject) => {
// 请求的相关信息，直接用dd也可以。
console.log('dd.env.platform', dd.env.platform)
if (dd.env.platform !== 'notInDingTalk') {
dd.ready(function (err) {
console.log(1111111, err)
dd.runtime.permission.requestAuthCode({
// corpId: 'ding7e68cba137504bb7f2c783f7214b6d69', // Zoey测试 这个企业id 是固定的，正式系统和测试系统应该不一样。
corpId: process.env.VUE_APP_DING_CORP_ID, // 使用环境变量做的区分
// corpId: 'ding9ec7f291faadef5dee0f45d8e4f7c288', // 重汽测试环境
onSuccess: function (info) {
const code = info.code // 通过该免登授权码可以获取用户身份
resolve(code)
// 然后把这个code传给后端做相关的验证。
},
onFail: function (e) {
console.log(1111111, e)
resolve('')
}
})
})
} else {
resolve('')
}
})
}