diff --git a/schoolNewsServ/admin/src/main/resources/application.yml b/schoolNewsServ/admin/src/main/resources/application.yml index 4d0dcf8..7e9b726 100644 --- a/schoolNewsServ/admin/src/main/resources/application.yml +++ b/schoolNewsServ/admin/src/main/resources/application.yml @@ -10,6 +10,13 @@ spring: application: name: school-news-admin + # 文件上传配置 + servlet: + multipart: + enabled: true + max-file-size: 500MB + max-request-size: 500MB + # 数据源配置 datasource: driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/schoolNewsServ/file/src/main/resources/application.yaml b/schoolNewsServ/file/src/main/resources/application.yaml index 42bdaa0..43e9f92 100644 --- a/schoolNewsServ/file/src/main/resources/application.yaml +++ b/schoolNewsServ/file/src/main/resources/application.yaml @@ -5,8 +5,8 @@ spring: servlet: multipart: enabled: true - max-file-size: 100MB - max-request-size: 100MB + max-file-size: 500MB + max-request-size: 500MB datasource: driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/role/service/impl/SysRoleServiceImpl.java b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/role/service/impl/SysRoleServiceImpl.java index a6e9d8d..543e332 100644 --- a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/role/service/impl/SysRoleServiceImpl.java +++ b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/role/service/impl/SysRoleServiceImpl.java @@ -5,7 +5,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import org.xyzh.api.system.permission.ResourcePermissionService; import org.xyzh.common.core.domain.ResultDomain; +import org.xyzh.common.core.enums.ResourceType; +import org.xyzh.common.dto.permission.TbResourcePermission; import org.xyzh.common.dto.permission.TbSysPermission; import org.xyzh.common.dto.role.TbSysRole; import org.xyzh.common.dto.user.TbSysUser; @@ -39,6 +42,9 @@ public class SysRoleServiceImpl implements SysRoleService { @Autowired private RolePermissionMapper rolePermissionMapper; + @Autowired + private ResourcePermissionService resourcePermissionService; + @Autowired private UserDeptRoleMapper userDeptRoleMapper; @@ -127,6 +133,22 @@ public class SysRoleServiceImpl implements SysRoleService { int result = roleMapper.insertRole(role); if (result > 0) { + // 创建资源权限 + try { + List userDeptRoles = LoginUtil.getCurrentDeptRole(); + if (userDeptRoles != null && !userDeptRoles.isEmpty()) { + ResultDomain permissionResult = resourcePermissionService.createResourcePermission( + ResourceType.DEPT.getCode(), + role.getRoleID(), + userDeptRoles.get(0) + ); + if (!permissionResult.isSuccess()) { + logger.warn("创建部门权限失败:{}", permissionResult.getMessage()); + } + } + } catch (Exception e) { + logger.error("创建部门权限异常", e); + } logger.info("创建角色成功:{}", role.getName()); resultDomain.success("创建角色成功", role); return resultDomain; diff --git a/schoolNewsWeb/src/views/admin/manage/content/ColumnManagementView.vue b/schoolNewsWeb/src/views/admin/manage/content/ColumnManagementView.vue index 9594762..cd8e2a5 100644 --- a/schoolNewsWeb/src/views/admin/manage/content/ColumnManagementView.vue +++ b/schoolNewsWeb/src/views/admin/manage/content/ColumnManagementView.vue @@ -690,7 +690,7 @@ async function deleteRecommend(item: ResourceRecommendVO) { } ); - await resourceRecommendApi.deleteRecommend(item.id!); + await resourceRecommendApi.deleteRecommend(item.resourceID!); ElMessage.success('删除成功'); await refreshCurrentTab(); } catch (error: any) { diff --git a/schoolNewsWeb/src/views/user/home/HomeView.vue b/schoolNewsWeb/src/views/user/home/HomeView.vue index 944d59f..d3d9bb8 100644 --- a/schoolNewsWeb/src/views/user/home/HomeView.vue +++ b/schoolNewsWeb/src/views/user/home/HomeView.vue @@ -181,7 +181,7 @@ function handleMoreClick(type: string) { } else if (type === 'ideological') { router.push('/resource-center'); } else if (type === 'learning') { - router.push('/learning-center'); + router.push('/user-center/learning-records'); } }