From 1de57f2089187f09edb8c773d3d563aadd62853b Mon Sep 17 00:00:00 2001
From: gaoxq <376340421@qq.com>
Date: Mon, 2 Mar 2026 13:57:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A1=B5=E9=9D=A2=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 screen-vue/src/components/Layout/index.vue    |   2 +-
 screen-vue/src/router/index.js                |  30 ++--
 screen-vue/src/utils/request.js               |  77 +++++-----
 screen-vue/src/views/screen/Home/index.vue    |  10 --
 .../mybigscreen/Auth/routeController.java     |   6 -
 .../mybigscreen/Config/LoginInterceptor.java  |  27 +++-
 .../com/mini/mybigscreen/Model/Result.java    | 142 +++++++++++++++---
 .../biz/mapper/ErpAccountMapper.java          |   4 +-
 .../biz/mapper/ErpCategoryMapper.java         |   4 +-
 .../biz/mapper/ErpTransactionFlowMapper.java  |   4 +-
 .../biz/mapper/HomeMenuMapper.java            |   5 +-
 .../biz/mapper/HomeModuleMapper.java          |   4 +-
 .../biz/mapper/HomeModuleUserMapper.java      |   4 +-
 .../biz/mapper/HomeUserMapper.java            |   4 +-
 14 files changed, 227 insertions(+), 96 deletions(-)

diff --git a/screen-vue/src/components/Layout/index.vue b/screen-vue/src/components/Layout/index.vue
index a5ff42a..a1c3d40 100644
--- a/screen-vue/src/components/Layout/index.vue
+++ b/screen-vue/src/components/Layout/index.vue
@@ -200,7 +200,7 @@ const getMenuList = async () => {
     }
     setMenuNameMap(menuList.value);
   } catch (error) {
-    ElMessage.error(error);
+	  console.log(error);
   }
 }
 
diff --git a/screen-vue/src/router/index.js b/screen-vue/src/router/index.js
index 56d585c..b73619d 100644
--- a/screen-vue/src/router/index.js
+++ b/screen-vue/src/router/index.js
@@ -5,7 +5,6 @@ import Layout from '@/components/Layout/index.vue'
 import Dashboard from '@/views/desktop/index.vue'
 import bigScreen from '@/views/screen/index.vue'
 
-// 扫描规则保持不变
 const modules = import.meta.glob('../views/**/index.vue', { 
   eager: false,
   import: 'default'
@@ -47,16 +46,16 @@ const generateRoutes = () => {
 }
 
 const routes = [
-  {
-    path: '/',
-    redirect: '/login'
-  },
   {
     path: '/login',
     name: 'Login',
     component: Login,
     meta: { isPublic: true }
   },
+  {
+    path: '/',
+    redirect: '/login'
+  },
   {
     path: '/bigScreen',
     name: 'bigScreen',
@@ -64,12 +63,12 @@ const routes = [
     meta: { requiresAuth: true }
   },
   {
-    path: '/',
+    path: '/layout',
     component: Layout,
     meta: { requiresAuth: true },
     children: [
       {
-        path: 'dashboard',
+        path: '/dashboard',
         name: 'Dashboard',
         component: Dashboard
       },
@@ -91,21 +90,30 @@ const router = createRouter({
   }
 })
 
+// 优化路由守卫逻辑：更健壮的登录校验
 router.beforeEach((to, from, next) => {
+  // 公开页面直接放行
   if (to.meta.isPublic) {
     next()
     return
   }
 
+  // 非公开页面校验token
   try {
     const token = localStorage.getItem('token')
-    if (token && token.trim() !== '') {
-      next();
+    // 严格校验token有效性
+    if (token && typeof token === 'string' && token.trim() !== '') {
+      next()
     } else {
-      next({ path: '/login', query: { redirect: to.fullPath } });
+      next({ 
+        path: '/login', 
+        query: { redirect: to.fullPath },
+        replace: true // 替换历史记录，避免回退问题
+      })
     }
   } catch (error) {
-    next('/login');
+    console.error('路由守卫校验token失败：', error)
+    next({ path: '/login', replace: true })
   }
 })
 
diff --git a/screen-vue/src/utils/request.js b/screen-vue/src/utils/request.js
index 8e7fe03..d4ca119 100644
--- a/screen-vue/src/utils/request.js
+++ b/screen-vue/src/utils/request.js
@@ -10,71 +10,80 @@ const service = axios.create({
   }
 })
 
-const WHITE_LIST = ['/userLogin', '/register']
+const WHITE_LIST = ['userLogin', 'register']
 
 service.interceptors.request.use(
   (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) {
-      return config
+      return config;
     }
 
-    const token = localStorage.getItem('token')
+    const token = localStorage.getItem('token');
     if (!token) {
-      handleLoginExpired()
-      return Promise.reject()
+      handleLoginExpired();
+      return Promise.reject({ config, message: '未获取到token' });
     }
 
-    config.headers.Authorization = `Bearer ${token}`
-    return config
+    config.headers.Authorization = `Bearer ${token}`;
+    return config;
   },
   (error) => {
-    return Promise.reject(error)
+    return Promise.reject(error);
   }
 )
 
 service.interceptors.response.use(
   (response) => {
-    const res = response.data
-
-    if (typeof res === 'string' && res.includes('<html>')) {
-      handleLoginExpired()
-      return Promise.reject()
-    }
-
+    const res = response.data;
+    
+    // 1. 处理登录失效
     if (res.code === 401) {
-      handleLoginExpired()
-      return Promise.reject()
+      handleLoginExpired();
+      return Promise.reject(res);
     }
 
-    if (res.code !== 200) {
-      ElMessage.error(res.msg || '请求失败')
-      return Promise.reject(res)
+    // 2. 处理业务成功
+    if (res.code === 200) {
+      return res.data;
     }
 
-    return res.data
+    // 3. 处理其他业务错误（如500）
+    ElMessage.error(res.msg || '请求失败');
+    return Promise.reject(res);
   },
   (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) {
-      ElMessage.error('服务异常')
-      return Promise.reject(error)
+      const errMsg = error?.response?.data?.msg || '登录请求失败，请检查网络或账号信息';
+      ElMessage.error(errMsg);
+      return Promise.reject(error);
     }
-    if (error.response?.status === 401) {
-      handleLoginExpired()
-      return Promise.reject(error)
+
+    if (error?.response?.status === 401) {
+      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() {
-  localStorage.removeItem('token')
+  localStorage.removeItem('token');
   if (router.currentRoute.path !== '/login') {
-    router.push('/login').catch(() => {})
-    ElMessage.error('登录已失效，请重新登录')
+    router.push('/login').catch(() => {});
+    ElMessage.error('登录已失效，请重新登录');
   }
 }
 
-export default service
\ No newline at end of file
+export default service;
\ No newline at end of file
diff --git a/screen-vue/src/views/screen/Home/index.vue b/screen-vue/src/views/screen/Home/index.vue
index c03e447..e0c2a20 100644
--- a/screen-vue/src/views/screen/Home/index.vue
+++ b/screen-vue/src/views/screen/Home/index.vue
@@ -78,16 +78,6 @@ const switchMenu = (id) => {
   console.log(`切换到菜单：${menuList.value.find(item => item.id === id)?.name}`);
 };
 
-watch(
-  () => props.formParams,
-  (newVal) => {
-    console.log('表单参数更新：', newVal);
-  },
-  { 
-    deep: true,
-    immediate: true
-  }
-);
 </script>
 
 <style scoped>
diff --git a/src/main/java/com/mini/mybigscreen/Auth/routeController.java b/src/main/java/com/mini/mybigscreen/Auth/routeController.java
index 33f84bf..b58de2a 100644
--- a/src/main/java/com/mini/mybigscreen/Auth/routeController.java
+++ b/src/main/java/com/mini/mybigscreen/Auth/routeController.java
@@ -12,12 +12,6 @@ public class routeController {
     /**
      * 路由跳转
      */
-    @GetMapping({"/", "/login", "/bigScreen", "/dashboard"})
-    public String forwardToIndex() {
-        return "forward:/index.html";
-    }
-
-
     @RequestMapping(value = "/**/{path:[^.]*}")
     public String redirect(@PathVariable String path) {
         return "forward:/index.html";
diff --git a/src/main/java/com/mini/mybigscreen/Config/LoginInterceptor.java b/src/main/java/com/mini/mybigscreen/Config/LoginInterceptor.java
index 84dca04..1ee48d7 100644
--- a/src/main/java/com/mini/mybigscreen/Config/LoginInterceptor.java
+++ b/src/main/java/com/mini/mybigscreen/Config/LoginInterceptor.java
@@ -1,22 +1,45 @@
 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.HttpServletResponse;
 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.web.servlet.HandlerInterceptor;
 
+import java.io.PrintWriter;
+
 
 @Component
 public class LoginInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        ObjectMapper objectMapper = new ObjectMapper();
         HttpSession session = request.getSession(false);
-        if (session == null) {
-            response.sendRedirect("/login");
+        if (ObjectUtils.isEmpty(session)) {
+            String json = objectMapper.writeValueAsString(Result.unauthorized());
+            try (PrintWriter writer = response.getWriter()) {
+                writer.write(json);
+                writer.flush();
+            }
             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;
     }
 }
diff --git a/src/main/java/com/mini/mybigscreen/Model/Result.java b/src/main/java/com/mini/mybigscreen/Model/Result.java
index 3b35446..25cc3e4 100644
--- a/src/main/java/com/mini/mybigscreen/Model/Result.java
+++ b/src/main/java/com/mini/mybigscreen/Model/Result.java
@@ -2,37 +2,143 @@ package com.mini.mybigscreen.Model;
 
 import lombok.Data;
 
+import java.io.Serial;
 import java.io.Serializable;
 
+/**
+ * 通用响应结果类
+ */
 @Data
 public class Result<T> implements Serializable {
 
+    // 序列化版本号，避免序列化/反序列化异常
+    @Serial
+    private static final long serialVersionUID = 1L;
+
     private Integer code;
     // 提示信息
     private String msg;
-    // 数据体
+    // 业务数据体
     private T data;
 
-    // 成功返回（带数据）
-    public static <T> Result<T> success(T data) {
-        Result<T> result = new Result<>();
-        result.setCode(200);
-        result.setMsg("操作成功");
-        result.setData(data);
-        return result;
+    private Result() {}
+
+    private Result(Integer code, String msg, T data) {
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
     }
 
-    // 成功返回（无数据）
+    /**
+     * 成功返回（无数据，默认code=200，msg=操作成功）
+     */
     public static <T> Result<T> success() {
-        return success(null);
+        return new Result<>(200, "操作成功", null);
     }
 
-    // 失败返回
-    public static <T> Result<T> error(String msg) {
-        Result<T> result = new Result<>();
-        result.setCode(500);
-        result.setMsg(msg);
-        result.setData(null);
-        return result;
+    /**
+     * 成功返回（带数据，默认code=200，msg=操作成功）
+     */
+    public static <T> Result<T> success(T data) {
+        return new Result<>(200, "操作成功", data);
     }
-}
+
+    /**
+     * 成功返回（自定义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);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/ErpAccountMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/ErpAccountMapper.java
index e8dccac..d19a373 100644
--- a/src/main/java/com/mini/mybigscreen/biz/mapper/ErpAccountMapper.java
+++ b/src/main/java/com/mini/mybigscreen/biz/mapper/ErpAccountMapper.java
@@ -1,7 +1,7 @@
 package com.mini.mybigscreen.biz.mapper;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mini.mybigscreen.biz.domain.ErpAccount;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gaoxq
  * @since 2026-02-27
  */
-public interface ErpAccountMapper extends BaseMapper<ErpAccount> {
+public interface ErpAccountMapper extends MPJBaseMapper<ErpAccount> {
 
 }
diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/ErpCategoryMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/ErpCategoryMapper.java
index bbb7a58..fe7f0d9 100644
--- a/src/main/java/com/mini/mybigscreen/biz/mapper/ErpCategoryMapper.java
+++ b/src/main/java/com/mini/mybigscreen/biz/mapper/ErpCategoryMapper.java
@@ -1,7 +1,7 @@
 package com.mini.mybigscreen.biz.mapper;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mini.mybigscreen.biz.domain.ErpCategory;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gaoxq
  * @since 2026-02-27
  */
-public interface ErpCategoryMapper extends BaseMapper<ErpCategory> {
+public interface ErpCategoryMapper extends MPJBaseMapper<ErpCategory> {
 
 }
diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/ErpTransactionFlowMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/ErpTransactionFlowMapper.java
index 111daaa..b816145 100644
--- a/src/main/java/com/mini/mybigscreen/biz/mapper/ErpTransactionFlowMapper.java
+++ b/src/main/java/com/mini/mybigscreen/biz/mapper/ErpTransactionFlowMapper.java
@@ -1,7 +1,7 @@
 package com.mini.mybigscreen.biz.mapper;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mini.mybigscreen.biz.domain.ErpTransactionFlow;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gaoxq
  * @since 2026-02-27
  */
-public interface ErpTransactionFlowMapper extends BaseMapper<ErpTransactionFlow> {
+public interface ErpTransactionFlowMapper extends MPJBaseMapper<ErpTransactionFlow> {
 
 }
diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeMenuMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/HomeMenuMapper.java
index 2a3c234..06befff 100644
--- a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeMenuMapper.java
+++ b/src/main/java/com/mini/mybigscreen/biz/mapper/HomeMenuMapper.java
@@ -1,7 +1,8 @@
 package com.mini.mybigscreen.biz.mapper;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mini.mybigscreen.biz.domain.HomeMenu;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gaoxq
  * @since 2026-03-01
  */
-public interface HomeMenuMapper extends BaseMapper<HomeMenu> {
+public interface HomeMenuMapper extends MPJBaseMapper<HomeMenu> {
 
 }
diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeModuleMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/HomeModuleMapper.java
index be7885d..b6bdb59 100644
--- a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeModuleMapper.java
+++ b/src/main/java/com/mini/mybigscreen/biz/mapper/HomeModuleMapper.java
@@ -1,7 +1,7 @@
 package com.mini.mybigscreen.biz.mapper;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mini.mybigscreen.biz.domain.HomeModule;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gaoxq
  * @since 2026-02-27
  */
-public interface HomeModuleMapper extends BaseMapper<HomeModule> {
+public interface HomeModuleMapper extends MPJBaseMapper<HomeModule> {
 
 }
diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeModuleUserMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/HomeModuleUserMapper.java
index 469888f..ceff79c 100644
--- a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeModuleUserMapper.java
+++ b/src/main/java/com/mini/mybigscreen/biz/mapper/HomeModuleUserMapper.java
@@ -1,7 +1,7 @@
 package com.mini.mybigscreen.biz.mapper;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mini.mybigscreen.biz.domain.HomeModuleUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gaoxq
  * @since 2026-02-27
  */
-public interface HomeModuleUserMapper extends BaseMapper<HomeModuleUser> {
+public interface HomeModuleUserMapper extends MPJBaseMapper<HomeModuleUser> {
 
 }
diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeUserMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/HomeUserMapper.java
index e4c743a..4ca3e0e 100644
--- a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeUserMapper.java
+++ b/src/main/java/com/mini/mybigscreen/biz/mapper/HomeUserMapper.java
@@ -1,7 +1,7 @@
 package com.mini.mybigscreen.biz.mapper;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mini.mybigscreen.biz.domain.HomeUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gaoxq
  * @since 2026-02-28
  */
-public interface HomeUserMapper extends BaseMapper<HomeUser> {
+public interface HomeUserMapper extends MPJBaseMapper<HomeUser> {
 
 }