From ee0f56bf13db8a6008a8a1bb26673490fc956e84 Mon Sep 17 00:00:00 2001 From: Paidax Date: Mon, 15 Dec 2025 14:21:07 +0800 Subject: [PATCH] =?UTF-8?q?pref#ncu=5F=E6=97=A5=E5=BF=97=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=81=E6=8C=89=E7=85=A7=E8=A6=81=E6=B1=82?= =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=A8=A1=E5=9D=97=EF=BC=88=E9=99=A4=E8=B6=85?= =?UTF-8?q?=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98=E5=85=B6=E4=BB=96=E4=BA=BA?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E7=9C=8B=E5=88=B0=E6=B0=91=E4=B8=BB=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../controller/v4/SysV4AppsController.java | 18 +++- .../controller/v4/SysV4ServController.java | 13 ++- src/main/resources/logback.xml | 94 +++++++++++++++++-- 4 files changed, 117 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index f3797edd..18f4bae7 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 jar com.budwk - v4 + mini 5.6.0-plus 2.6.0-SNAPSHOT diff --git a/src/main/java/com/budwk/app/sys/controller/v4/SysV4AppsController.java b/src/main/java/com/budwk/app/sys/controller/v4/SysV4AppsController.java index f801c03e..bba025eb 100644 --- a/src/main/java/com/budwk/app/sys/controller/v4/SysV4AppsController.java +++ b/src/main/java/com/budwk/app/sys/controller/v4/SysV4AppsController.java @@ -2,12 +2,14 @@ package com.budwk.app.sys.controller.v4; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.result.Result; import com.budwk.app.sys.models.Sys_menu; import com.budwk.app.sys.models.Sys_module; import com.budwk.app.sys.models.Sys_user_favorite_app; import com.budwk.app.sys.services.SysMenuService; import com.budwk.app.sys.services.SysUserService; +import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -26,6 +28,7 @@ import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -47,7 +50,17 @@ public class SysV4AppsController { @SaCheckLogin @ApiOperation("获取应用分类") public Result categories(@Param(value = "platform", df = "PC") String platform) { - List list = dao.query(Sys_module.class, Cnd.where(Sys_module::getPlatform, "=", platform).asc(Sys_module::getSortNum)); + List list; + if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + list = dao.query(Sys_module.class, Cnd.where(Sys_module::getPlatform, "=", platform).asc(Sys_module::getSortNum)); + } else { + list = dao.query( + Sys_module.class, + Cnd.where(Sys_module::getPlatform, "=", platform) + .and(Sys_module::getId, "=", "2") + .asc(Sys_module::getSortNum) + ); + } List> categories = list.stream().map(module -> { Map category = new HashMap<>(); category.put("id", module.getId()); @@ -84,6 +97,9 @@ public class SysV4AppsController { LEFT JOIN sys_module sm ON sm.id = m.moduleId $condition """); + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + categoryId = "2"; + } Cnd cnd = Cnd.NEW(); cnd.and("m.platform", "=", platform); cnd.and("m.disabled", "=", false); diff --git a/src/main/java/com/budwk/app/sys/controller/v4/SysV4ServController.java b/src/main/java/com/budwk/app/sys/controller/v4/SysV4ServController.java index 5dade29e..796a1890 100644 --- a/src/main/java/com/budwk/app/sys/controller/v4/SysV4ServController.java +++ b/src/main/java/com/budwk/app/sys/controller/v4/SysV4ServController.java @@ -2,9 +2,11 @@ package com.budwk.app.sys.controller.v4; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.result.Result; import com.budwk.app.flow.entity.ProcessCategory; import com.budwk.app.sys.services.SysMenuService; +import com.budwk.app.web.commons.auth.utils.AuthUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.nutz.dao.Cnd; @@ -19,6 +21,7 @@ import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.List; @IocBean @@ -36,7 +39,12 @@ public class SysV4ServController { @SaCheckLogin @ApiOperation("获取分类") public Result categories() { - List list = dao.query(ProcessCategory.class, Cnd.NEW()); + List list; + if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + list = dao.query(ProcessCategory.class, Cnd.NEW()); + } else { + list = dao.query(ProcessCategory.class, Cnd.where(ProcessCategory::getId, "=", "1")); + } return Result.success(list); } @@ -59,6 +67,9 @@ public class SysV4ServController { if (StrUtil.isNotBlank(keyword)) { cnd.where().andLike("t.disPlayName", keyword); } + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + categoryId = "1"; + } cnd.andEX("t.category", "=", categoryId); sql.setCondition(cnd); List list = sysMenuService.listMap(sql); diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 5cd753ea..87e2ef24 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,17 +1,85 @@ - + - + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + + + + + + ${LOG_HOME}/app.log + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + ${LOG_HOME}/app-%d{yyyy-MM-dd}.log + 300 + + + + + + + + + + + + + + + + + + + + + + + + <!– ERROR级别日志文件配置 –> ${LOG_HOME}/error.log @@ -45,15 +113,27 @@ - + <!– 框架日志级别 –> + <!– –> - + <!– 日志级别和appender的关联 –> + - + --> + + + +