diff --git a/App.vue b/App.vue index de586d5..fc68b96 100644 --- a/App.vue +++ b/App.vue @@ -15,9 +15,9 @@ export default { onLaunch: function(options) { - if (options.query.token) { + if (options.query.ticket) { uni.reLaunch({ - url: '/pages/login/blank?token=' + options.query.token + url: '/pages/login/blank?ticket=' + options.query.ticket }) } else if (this.$store.state.user.token) { this.$store.dispatch('startRefreshTokenTimer') diff --git a/api/user.js b/api/user.js index 0af8204..af98a06 100644 --- a/api/user.js +++ b/api/user.js @@ -1,70 +1,70 @@ -import { - request -} from '@/untils/AxiosUtils.js'; -import { - getStore -} from '@/untils/store.js' -import website from "@/config/website"; - -export const loginByUsername = (tenantId, username, password, type, key, code, token) => request({ - url: '/api/jobslink-auth/oauth/token', - method: 'post', - headers: { - 'Login-Type': 'Type-U', - 'Captcha-Key': key, - 'Captcha-Code': code, - 'Platform-Id': getStore({ - name: 'platformId' - }) || '' - }, - params: { - tenantId, - username, - password, - grant_type: (website.captchaMode ? "captcha" : "password"), - scope: "all", - type, - token - }, -}); - -export const refreshToken = (refresh_token, tenantId) => request({ - url: '/api/jobslink-auth/oauth/token', - method: 'post', - headers: { - 'Tenant-Id': tenantId, - 'Login-Type': 'Type-U', - }, - params: { - tenantId, - refresh_token, - grant_type: "refresh_token", - scope: "all", - } -}); - -export const getCaptcha = () => request({ - url: '/api/jobslink-auth/oauth/captcha', - method: 'get' -}); - -export const logout = () => request({ - url: '/api/jobslink-auth/oauth/logout', - method: 'get' -}); - -export const getUserInfo = () => request({ - url: '/api/jobslink-auth/oauth/user-info', - method: 'get' -}); - -export const sendLogs = (list) => request({ - url: '/api/jobslink-auth/oauth/logout', - method: 'post', - data: list -}); - -export const clearCache = () => request({ - url: '/api/jobslink-auth/oauth/clear-cache', - method: 'get' -}); +import { + request +} from '@/untils/AxiosUtils.js'; +import { + getStore +} from '@/untils/store.js' +import website from "@/config/website"; + +export const loginByUsername = (tenantId, username, password, type, key, code, ticket) => request({ + url: '/api/jobslink-auth/oauth/token', + method: 'post', + headers: { + 'Login-Type': 'Type-U', + 'Captcha-Key': key, + 'Captcha-Code': code, + 'Platform-Id': getStore({ + name: 'platformId' + }) || '' + }, + params: { + tenantId, + username, + password, + grant_type: (website.captchaMode ? "captcha" : "password"), + scope: "all", + type, + ticket + }, +}); + +export const refreshToken = (refresh_token, tenantId) => request({ + url: '/api/jobslink-auth/oauth/token', + method: 'post', + headers: { + 'Tenant-Id': tenantId, + 'Login-Type': 'Type-U', + }, + params: { + tenantId, + refresh_token, + grant_type: "refresh_token", + scope: "all", + } +}); + +export const getCaptcha = () => request({ + url: '/api/jobslink-auth/oauth/captcha', + method: 'get' +}); + +export const logout = () => request({ + url: '/api/jobslink-auth/oauth/logout', + method: 'get' +}); + +export const getUserInfo = () => request({ + url: '/api/jobslink-auth/oauth/user-info', + method: 'get' +}); + +export const sendLogs = (list) => request({ + url: '/api/jobslink-auth/oauth/logout', + method: 'post', + data: list +}); + +export const clearCache = () => request({ + url: '/api/jobslink-auth/oauth/clear-cache', + method: 'get' +}); \ No newline at end of file diff --git a/pages/login/blank.vue b/pages/login/blank.vue index a85c44e..039be01 100644 --- a/pages/login/blank.vue +++ b/pages/login/blank.vue @@ -1,70 +1,68 @@ - - - - - \ No newline at end of file diff --git a/store/models/user.js b/store/models/user.js index 245af73..af07898 100644 --- a/store/models/user.js +++ b/store/models/user.js @@ -80,7 +80,7 @@ const user = { return new Promise((resolve, reject) => { loginByUsername(userInfo.tenantId, userInfo.username, md5(userInfo.password), userInfo.type, userInfo.key, - userInfo.code, userInfo.token).then(res => { + userInfo.code, userInfo.ticket).then(res => { const data = res.data; if (data.error_description) {