diff --git a/scripts/package/createI18n.mjs b/scripts/package/createI18n.mjs index f11b0b4..ae920ed 100644 --- a/scripts/package/createI18n.mjs +++ b/scripts/package/createI18n.mjs @@ -46,6 +46,7 @@ try { home: 'Home', personal: 'Personal Center', invite: 'Invite Record', + tokenLogin: 'Token Login', }, ${ScopeFuncs}: { ${i18nAppEn.join('\n ')} @@ -72,6 +73,7 @@ try { home: '首页', personal: '个人中心', invite: '邀请记录', + tokenLogin: 'Token登录', }, ${ScopeFuncs}: { ${i18nFuncZhCn.join('\n ')} diff --git a/src/main.ts b/src/main.ts index af56f23..3e7ea00 100644 --- a/src/main.ts +++ b/src/main.ts @@ -19,7 +19,7 @@ import 'form-designer-plus/dist/designer.style.css'; //引入VForm3样式 import vue3TreeOrg from 'vue3-tree-org'; import 'vue3-tree-org/lib/vue3-tree-org.css'; -import '/@/spdm/index.scss'; +import '/@/spdm/index.scss'; // SPDM CODE // 日历组件 import { setupCalendar } from 'v-calendar'; diff --git a/src/router/index.ts b/src/router/index.ts index 51e7cd3..f2154c2 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -10,7 +10,8 @@ import {NextLoading} from '/@/utils/loading'; const storesTagsViewRoutes = useTagsViewRoutes(); const errorList = ['/401', '/404']; -const whiteList = ['/login', '/authRedirect', ...errorList]; +// SPDM CODE +const whiteList = ['/login', '/authRedirect', '/tokenLogin', ...errorList]; /** * 1、前端控制路由时：isRequestRoutes 为 false，需要写 roles，需要走 setFilterRoute 方法。 diff --git a/src/router/route.ts b/src/router/route.ts index 973063d..93270aa 100644 --- a/src/router/route.ts +++ b/src/router/route.ts @@ -88,6 +88,14 @@ export const staticRoutes: Array = [ isAuth: false, }, }, + { // SPDM CODE + path: '/tokenLogin', + name: 'staticRoutes.tokenLogin', + component: () => import('/@/spdm/views/tokenLogin.vue'), + meta: { + isAuth: false, + }, + }, ]; /** diff --git a/src/spdm/api/request.ts b/src/spdm/api/request.ts new file mode 100644 index 0000000..346293d --- /dev/null +++ b/src/spdm/api/request.ts @@ -0,0 +1,43 @@ +import axios from 'axios'; +import { ElMessage } from 'element-plus'; +import { BASE_URL } from '../config'; + +const service = axios.create({ + baseURL: BASE_URL, + timeout: 60000, + headers: { + 'Content-Type': 'application/json;application/xml;charset=utf-8;', + }, +}); + +service.interceptors.request.use( + (config) => { + return config; + }, + (error) => { + return Promise.reject(error); + } +); + +service.interceptors.response.use( + (res) => { + if (res.data.code !== 200) { + ElMessage.error(res.data.message); + } + return res.data; + }, + (error) => { + ElMessage.error('系统繁忙，请稍后再试'); + return Promise.reject(error); + } +); + +const get = (url: string, params = {}) => { + return service.get(url, { params }); +}; + +const post = (url: string, data = {}) => { + return service.post(url, data); +}; + +export { get, post }; diff --git a/src/spdm/api/system/user.ts b/src/spdm/api/system/user.ts new file mode 100644 index 0000000..b20dcb8 --- /dev/null +++ b/src/spdm/api/system/user.ts @@ -0,0 +1,9 @@ +import { get } from '../request'; +import { PREFIX_SYSTEM } from '../../config'; + +const PREFIX = PREFIX_SYSTEM; + +// 获取用户token +export const getUserTokenApi = (params: any) => { + return get(`${PREFIX}user/getUserToken`, params); +}; diff --git a/src/spdm/config.ts b/src/spdm/config.ts index 296ac7d..1269ad0 100644 --- a/src/spdm/config.ts +++ b/src/spdm/config.ts @@ -1,2 +1,9 @@ -// export const SPDM_URL = 'http://192.168.65.64:3001'; // 本地 -export const SPDM_URL = 'http://192.168.65.161:3000'; // 测试环境 \ No newline at end of file +// 测试环境 +export const SPDM_URL = 'http://192.168.65.161:3000'; // SPDM项目地址 +export const PREFIX_SYSTEM = '/system/'; // system模块前缀 +export const BASE_URL = '/spdmApi/simulation'; // baseUrl + +// // 本地环境 +// export const SPDM_URL = 'http://192.168.65.64:3001'; // SPDM项目地址 +// export const PREFIX_SYSTEM = '/system/'; // system模块前缀 +// export const BASE_URL = '/spdmApi/simulation'; // baseUrl \ No newline at end of file diff --git a/src/spdm/views/tokenLogin.vue b/src/spdm/views/tokenLogin.vue new file mode 100644 index 0000000..ab92d5f --- /dev/null +++ b/src/spdm/views/tokenLogin.vue @@ -0,0 +1,43 @@ + + + diff --git a/src/stores/themeConfig.ts b/src/stores/themeConfig.ts index 8295582..1b5521e 100644 --- a/src/stores/themeConfig.ts +++ b/src/stores/themeConfig.ts @@ -1,5 +1,5 @@ // import logo from '/@/assets/logo.png'; -import logo from '/@/spdm/assets/spdm_logo.png'; +import logo from '/@/spdm/assets/spdm_logo.png'; // SPDM CODE import logoMini from '/@/assets/logo-mini.svg'; import {Local} from '/@/utils/storage'; import {mergeWith} from 'lodash'; diff --git a/src/stores/userInfo.ts b/src/stores/userInfo.ts index 9869562..e1e4616 100644 --- a/src/stores/userInfo.ts +++ b/src/stores/userInfo.ts @@ -56,7 +56,7 @@ export const useUserInfo = defineStore('userInfo', { return new Promise((resolve, reject) => { login(data) .then(({data: res}) => { - // SPDM子应用使用 + // SPDM CODE Cookies.set('cid_user_id', res.user_id) Session.setTenant(res.tenant_id); // 存储token 信息 @@ -189,7 +189,7 @@ export const useUserInfo = defineStore('userInfo', { async setUserInfos() { await getUserInfo() .then((res) => { - // SPDM子应用使用 + // SPDM CODE Cookies.set('cid_user_info', JSON.stringify(res.data.sysUser)); this.userInfos = { user: res.data.sysUser, diff --git a/src/views/flow/task/pendingFlowTask.vue b/src/views/flow/task/pendingFlowTask.vue index 7ba64b7..a6434e4 100644 --- a/src/views/flow/task/pendingFlowTask.vue +++ b/src/views/flow/task/pendingFlowTask.vue @@ -65,6 +65,7 @@

{{ currentData?.processName }}