大屏页面初始化

This commit is contained in:
2026-03-02 13:57:22 +08:00
parent d609cc45f0
commit 1de57f2089
14 changed files with 227 additions and 96 deletions

View File

@@ -200,7 +200,7 @@ const getMenuList = async () => {
} }
setMenuNameMap(menuList.value); setMenuNameMap(menuList.value);
} catch (error) { } catch (error) {
ElMessage.error(error); console.log(error);
} }
} }

View File

@@ -5,7 +5,6 @@ import Layout from '@/components/Layout/index.vue'
import Dashboard from '@/views/desktop/index.vue' import Dashboard from '@/views/desktop/index.vue'
import bigScreen from '@/views/screen/index.vue' import bigScreen from '@/views/screen/index.vue'
// 扫描规则保持不变
const modules = import.meta.glob('../views/**/index.vue', { const modules = import.meta.glob('../views/**/index.vue', {
eager: false, eager: false,
import: 'default' import: 'default'
@@ -47,16 +46,16 @@ const generateRoutes = () => {
} }
const routes = [ const routes = [
{
path: '/',
redirect: '/login'
},
{ {
path: '/login', path: '/login',
name: 'Login', name: 'Login',
component: Login, component: Login,
meta: { isPublic: true } meta: { isPublic: true }
}, },
{
path: '/',
redirect: '/login'
},
{ {
path: '/bigScreen', path: '/bigScreen',
name: 'bigScreen', name: 'bigScreen',
@@ -64,12 +63,12 @@ const routes = [
meta: { requiresAuth: true } meta: { requiresAuth: true }
}, },
{ {
path: '/', path: '/layout',
component: Layout, component: Layout,
meta: { requiresAuth: true }, meta: { requiresAuth: true },
children: [ children: [
{ {
path: 'dashboard', path: '/dashboard',
name: 'Dashboard', name: 'Dashboard',
component: Dashboard component: Dashboard
}, },
@@ -91,21 +90,30 @@ const router = createRouter({
} }
}) })
// 优化路由守卫逻辑:更健壮的登录校验
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
// 公开页面直接放行
if (to.meta.isPublic) { if (to.meta.isPublic) {
next() next()
return return
} }
// 非公开页面校验token
try { try {
const token = localStorage.getItem('token') const token = localStorage.getItem('token')
if (token && token.trim() !== '') { // 严格校验token有效性
next(); if (token && typeof token === 'string' && token.trim() !== '') {
next()
} else { } else {
next({ path: '/login', query: { redirect: to.fullPath } }); next({
path: '/login',
query: { redirect: to.fullPath },
replace: true // 替换历史记录,避免回退问题
})
} }
} catch (error) { } catch (error) {
next('/login'); console.error('路由守卫校验token失败', error)
next({ path: '/login', replace: true })
} }
}) })

View File

@@ -10,71 +10,80 @@ const service = axios.create({
} }
}) })
const WHITE_LIST = ['/userLogin', '/register'] const WHITE_LIST = ['userLogin', 'register']
service.interceptors.request.use( service.interceptors.request.use(
(config) => { (config) => {
const isWhite = WHITE_LIST.some(item => config.url?.includes(item)) const requestUrl = config.url || '';
const isWhite = WHITE_LIST.some(item => requestUrl.includes(item));
if (isWhite) { if (isWhite) {
return config return config;
} }
const token = localStorage.getItem('token') const token = localStorage.getItem('token');
if (!token) { if (!token) {
handleLoginExpired() handleLoginExpired();
return Promise.reject() return Promise.reject({ config, message: '未获取到token' });
} }
config.headers.Authorization = `Bearer ${token}` config.headers.Authorization = `Bearer ${token}`;
return config return config;
}, },
(error) => { (error) => {
return Promise.reject(error) return Promise.reject(error);
} }
) )
service.interceptors.response.use( service.interceptors.response.use(
(response) => { (response) => {
const res = response.data const res = response.data;
if (typeof res === 'string' && res.includes('<html>')) { // 1. 处理登录失效
handleLoginExpired()
return Promise.reject()
}
if (res.code === 401) { if (res.code === 401) {
handleLoginExpired() handleLoginExpired();
return Promise.reject() return Promise.reject(res);
} }
if (res.code !== 200) { // 2. 处理业务成功
ElMessage.error(res.msg || '请求失败') if (res.code === 200) {
return Promise.reject(res) return res.data;
} }
return res.data // 3. 处理其他业务错误如500
ElMessage.error(res.msg || '请求失败');
return Promise.reject(res);
}, },
(error) => { (error) => {
const isWhite = error.config && WHITE_LIST.some(item => error.config.url?.includes(item)) const requestUrl = error?.config?.url || '';
const isWhite = WHITE_LIST.some(item => requestUrl.includes(item));
if (isWhite) { if (isWhite) {
ElMessage.error('服务异常') const errMsg = error?.response?.data?.msg || '登录请求失败,请检查网络或账号信息';
return Promise.reject(error) ElMessage.error(errMsg);
return Promise.reject(error);
} }
if (error.response?.status === 401) {
handleLoginExpired() if (error?.response?.status === 401) {
return Promise.reject(error) handleLoginExpired();
return Promise.reject(error);
} }
ElMessage.error('请求异常,请稍后重试')
return Promise.reject(error) if (!error.response) {
ElMessage.error('网络异常,请检查网络连接后重试');
return Promise.reject(error);
}
return Promise.reject(error);
} }
) )
function handleLoginExpired() { function handleLoginExpired() {
localStorage.removeItem('token') localStorage.removeItem('token');
if (router.currentRoute.path !== '/login') { if (router.currentRoute.path !== '/login') {
router.push('/login').catch(() => {}) router.push('/login').catch(() => {});
ElMessage.error('登录已失效,请重新登录') ElMessage.error('登录已失效,请重新登录');
} }
} }
export default service export default service;

View File

@@ -78,16 +78,6 @@ const switchMenu = (id) => {
console.log(`切换到菜单:${menuList.value.find(item => item.id === id)?.name}`); console.log(`切换到菜单:${menuList.value.find(item => item.id === id)?.name}`);
}; };
watch(
() => props.formParams,
(newVal) => {
console.log('表单参数更新:', newVal);
},
{
deep: true,
immediate: true
}
);
</script> </script>
<style scoped> <style scoped>

View File

@@ -12,12 +12,6 @@ public class routeController {
/** /**
* 路由跳转 * 路由跳转
*/ */
@GetMapping({"/", "/login", "/bigScreen", "/dashboard"})
public String forwardToIndex() {
return "forward:/index.html";
}
@RequestMapping(value = "/**/{path:[^.]*}") @RequestMapping(value = "/**/{path:[^.]*}")
public String redirect(@PathVariable String path) { public String redirect(@PathVariable String path) {
return "forward:/index.html"; return "forward:/index.html";

View File

@@ -1,22 +1,45 @@
package com.mini.mybigscreen.Config; package com.mini.mybigscreen.Config;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.mini.mybigscreen.Model.Result;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.HttpSession;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;
import java.io.PrintWriter;
@Component @Component
public class LoginInterceptor implements HandlerInterceptor { public class LoginInterceptor implements HandlerInterceptor {
@Override @Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
ObjectMapper objectMapper = new ObjectMapper();
HttpSession session = request.getSession(false); HttpSession session = request.getSession(false);
if (session == null) { if (ObjectUtils.isEmpty(session)) {
response.sendRedirect("/login"); String json = objectMapper.writeValueAsString(Result.unauthorized());
try (PrintWriter writer = response.getWriter()) {
writer.write(json);
writer.flush();
}
return false; return false;
} }
String token = (String) session.getAttribute("token");
if (StringUtils.isEmpty(token)){
String json = objectMapper.writeValueAsString(Result.unauthorized());
try (PrintWriter writer = response.getWriter()) {
writer.write(json);
writer.flush();
}
return false;
}
return true; return true;
} }
} }

View File

@@ -2,37 +2,143 @@ package com.mini.mybigscreen.Model;
import lombok.Data; import lombok.Data;
import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
/**
* 通用响应结果类
*/
@Data @Data
public class Result<T> implements Serializable { public class Result<T> implements Serializable {
// 序列化版本号,避免序列化/反序列化异常
@Serial
private static final long serialVersionUID = 1L;
private Integer code; private Integer code;
// 提示信息 // 提示信息
private String msg; private String msg;
// 数据体 // 业务数据体
private T data; private T data;
// 成功返回(带数据) private Result() {}
public static <T> Result<T> success(T data) {
Result<T> result = new Result<>(); private Result(Integer code, String msg, T data) {
result.setCode(200); this.code = code;
result.setMsg("操作成功"); this.msg = msg;
result.setData(data); this.data = data;
return result;
} }
// 成功返回(无数据) /**
* 成功返回无数据默认code=200msg=操作成功)
*/
public static <T> Result<T> success() { public static <T> Result<T> success() {
return success(null); return new Result<>(200, "操作成功", null);
} }
// 失败返回 /**
public static <T> Result<T> error(String msg) { * 成功返回带数据默认code=200msg=操作成功)
Result<T> result = new Result<>(); */
result.setCode(500); public static <T> Result<T> success(T data) {
result.setMsg(msg); return new Result<>(200, "操作成功", data);
result.setData(null);
return result;
} }
}
/**
* 成功返回自定义msg默认code=200无数据
*/
public static <T> Result<T> successMsg(String msg) {
return new Result<>(200, msg, null);
}
/**
* 成功返回自定义msg+数据默认code=200
*/
public static <T> Result<T> successMsg(String msg, T data) {
return new Result<>(200, msg, data);
}
/**
* 失败返回默认code=500自定义msg无数据
*/
public static <T> Result<T> error(String msg) {
return new Result<>(500, msg, null);
}
/**
* 失败返回自定义code+msg无数据
*/
public static <T> Result<T> error(Integer code, String msg) {
return new Result<>(code, msg, null);
}
/**
* 失败返回自定义code+msg+数据,按需使用)
*/
public static <T> Result<T> error(Integer code, String msg, T data) {
return new Result<>(code, msg, data);
}
/**
* 自定义响应结果(全参数)
*/
public static <T> Result<T> custom(Integer code, String msg, T data) {
return new Result<>(code, msg, data);
}
/**
* 仅通过状态码返回默认msg为空无数据
* @param code 状态码
* @return 响应结果
*/
public static <T> Result<T> byCode(Integer code) {
return new Result<>(code, "", null);
}
/**
* 仅通过状态码+提示信息返回(无数据)
* @param code 状态码
* @param msg 提示信息
* @return 响应结果
*/
public static <T> Result<T> byCode(Integer code, String msg) {
return new Result<>(code, msg, null);
}
/**
* 仅通过状态码+数据返回默认msg为空
* @param code 状态码
* @param data 业务数据
* @return 响应结果
*/
public static <T> Result<T> byCode(Integer code, T data) {
return new Result<>(code, "", data);
}
/**
* 快捷返回400参数错误无数据
*/
public static <T> Result<T> badRequest() {
return new Result<>(400, "参数错误", null);
}
/**
* 快捷返回401未授权无数据
*/
public static <T> Result<T> unauthorized() {
return new Result<>(401, "未授权", null);
}
/**
* 快捷返回403禁止访问无数据
*/
public static <T> Result<T> forbidden() {
return new Result<>(403, "禁止访问", null);
}
/**
* 快捷返回404资源不存在无数据
*/
public static <T> Result<T> notFound() {
return new Result<>(404, "资源不存在", null);
}
}

View File

@@ -1,7 +1,7 @@
package com.mini.mybigscreen.biz.mapper; package com.mini.mybigscreen.biz.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.mini.mybigscreen.biz.domain.ErpAccount; import com.mini.mybigscreen.biz.domain.ErpAccount;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* <p> * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author gaoxq * @author gaoxq
* @since 2026-02-27 * @since 2026-02-27
*/ */
public interface ErpAccountMapper extends BaseMapper<ErpAccount> { public interface ErpAccountMapper extends MPJBaseMapper<ErpAccount> {
} }

View File

@@ -1,7 +1,7 @@
package com.mini.mybigscreen.biz.mapper; package com.mini.mybigscreen.biz.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.mini.mybigscreen.biz.domain.ErpCategory; import com.mini.mybigscreen.biz.domain.ErpCategory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* <p> * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author gaoxq * @author gaoxq
* @since 2026-02-27 * @since 2026-02-27
*/ */
public interface ErpCategoryMapper extends BaseMapper<ErpCategory> { public interface ErpCategoryMapper extends MPJBaseMapper<ErpCategory> {
} }

View File

@@ -1,7 +1,7 @@
package com.mini.mybigscreen.biz.mapper; package com.mini.mybigscreen.biz.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.mini.mybigscreen.biz.domain.ErpTransactionFlow; import com.mini.mybigscreen.biz.domain.ErpTransactionFlow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* <p> * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author gaoxq * @author gaoxq
* @since 2026-02-27 * @since 2026-02-27
*/ */
public interface ErpTransactionFlowMapper extends BaseMapper<ErpTransactionFlow> { public interface ErpTransactionFlowMapper extends MPJBaseMapper<ErpTransactionFlow> {
} }

View File

@@ -1,7 +1,8 @@
package com.mini.mybigscreen.biz.mapper; package com.mini.mybigscreen.biz.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.mini.mybigscreen.biz.domain.HomeMenu; import com.mini.mybigscreen.biz.domain.HomeMenu;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* <p> * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author gaoxq * @author gaoxq
* @since 2026-03-01 * @since 2026-03-01
*/ */
public interface HomeMenuMapper extends BaseMapper<HomeMenu> { public interface HomeMenuMapper extends MPJBaseMapper<HomeMenu> {
} }

View File

@@ -1,7 +1,7 @@
package com.mini.mybigscreen.biz.mapper; package com.mini.mybigscreen.biz.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.mini.mybigscreen.biz.domain.HomeModule; import com.mini.mybigscreen.biz.domain.HomeModule;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* <p> * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author gaoxq * @author gaoxq
* @since 2026-02-27 * @since 2026-02-27
*/ */
public interface HomeModuleMapper extends BaseMapper<HomeModule> { public interface HomeModuleMapper extends MPJBaseMapper<HomeModule> {
} }

View File

@@ -1,7 +1,7 @@
package com.mini.mybigscreen.biz.mapper; package com.mini.mybigscreen.biz.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.mini.mybigscreen.biz.domain.HomeModuleUser; import com.mini.mybigscreen.biz.domain.HomeModuleUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* <p> * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author gaoxq * @author gaoxq
* @since 2026-02-27 * @since 2026-02-27
*/ */
public interface HomeModuleUserMapper extends BaseMapper<HomeModuleUser> { public interface HomeModuleUserMapper extends MPJBaseMapper<HomeModuleUser> {
} }

View File

@@ -1,7 +1,7 @@
package com.mini.mybigscreen.biz.mapper; package com.mini.mybigscreen.biz.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.mini.mybigscreen.biz.domain.HomeUser; import com.mini.mybigscreen.biz.domain.HomeUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* <p> * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author gaoxq * @author gaoxq
* @since 2026-02-28 * @since 2026-02-28
*/ */
public interface HomeUserMapper extends BaseMapper<HomeUser> { public interface HomeUserMapper extends MPJBaseMapper<HomeUser> {
} }