diff --git a/package.json b/package.json index fdfe767ada9d7632c8652ee83101849d8d440ed0..7b67f1c1a4ddb03a093db01ab376576f49255fa3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "ruoyi-vue-plus", - "version": "5.4.0-2.4.0", + "version": "5.4.1-2.4.1", "description": "RuoYi-Vue-Plus多租户管理系统", "author": "LionLi", "license": "MIT", @@ -44,7 +44,9 @@ "vue-json-pretty": "2.4.0", "vue-router": "4.5.0", "vue-types": "6.0.0", - "vxe-table": "4.13.7" + "vxe-table": "4.13.7", + "xgplayer": "^3.0.22", + "xgplayer-flv": "^3.0.22" }, "devDependencies": { "@iconify/json": "^2.2.276", diff --git a/src/components/Process/flowChart.vue b/src/components/Process/flowChart.vue index 3c4dd684c873ac52ed0162063f04b745442e84ab..76033753139938469036b311e7d9d8ca59903691 100644 --- a/src/components/Process/flowChart.vue +++ b/src/components/Process/flowChart.vue @@ -21,7 +21,7 @@ const iframeUrl = ref(''); const baseUrl = import.meta.env.VITE_APP_BASE_API; onMounted(async () => { - const url = baseUrl + `/warm-flow-ui/index.html?id=${props.insId}&type=FlowChart`; + const url = baseUrl + `/warm-flow-ui/index.html?id=${props.insId}&type=FlowChart&t=${Date.now()}`; iframeUrl.value = url + '&Authorization=Bearer ' + getToken() + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID; }); diff --git a/src/permission.ts b/src/permission.ts index fb60b07c6c5572212e00015af2b96a607cd5cd0e..77597d27174b584dab18d81450d4e5d96ce02feb 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -11,7 +11,7 @@ import { usePermissionStore } from '@/store/modules/permission'; import { ElMessage } from 'element-plus/es'; NProgress.configure({ showSpinner: false }); -const whiteList = ['/login', '/register', '/social-callback', '/register*', '/register/*']; +const whiteList = ['/test/*', '/login', '/register', '/social-callback', '/register*', '/register/*']; const isWhiteList = (path: string) => { return whiteList.some((pattern) => isPathMatch(pattern, path)); diff --git a/src/router/index.ts b/src/router/index.ts index a6497dbe1fd24d368e3c2c345ec5376911273a01..0a2505ced01a09d82e96756a4fb61689e048b007 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -42,6 +42,11 @@ export const constantRoutes: RouteRecordRaw[] = [ hidden: true, component: () => import('@/layout/components/SocialCallback/index.vue') }, + { + path: '/test/xgplayer', + component: () => import('@/views/test/xgplayer.vue'), + hidden: true + }, { path: '/login', component: () => import('@/views/login.vue'), diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue index 06da4cf869d580e5221966858a18b674eae659ff..e064f400c1627bc845788b9d3489900dd644559f 100644 --- a/src/views/demo/demo/index.vue +++ b/src/views/demo/demo/index.vue @@ -4,15 +4,6 @@
当前版本: v5.4.0
+当前版本: v5.4.1
当前版本: v2.4.0
+当前版本: v2.4.1