diff --git a/maku-boot-module/maku-module-generator/pom.xml b/maku-boot-module/maku-module-generator/pom.xml index 121772c..8c0bcc7 100644 --- a/maku-boot-module/maku-module-generator/pom.xml +++ b/maku-boot-module/maku-module-generator/pom.xml @@ -13,7 +13,7 @@ net.maku maku-generator-boot-starter - 2.1.0 + 3.0.1 diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/java/Controller.java.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Controller.java.ftl index b0e3170..2f3ed57 100644 --- a/maku-boot-module/maku-module-generator/src/main/resources/template/java/Controller.java.ftl +++ b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Controller.java.ftl @@ -13,7 +13,7 @@ import ${package}.${moduleName}.vo.${ClassName}VO; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; +import jakarta.validation.Valid; import java.util.List; /** diff --git a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsLogController.java b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsLogController.java index 3b643c6..251509a 100644 --- a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsLogController.java +++ b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsLogController.java @@ -2,6 +2,7 @@ package net.maku.message.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.page.PageResult; import net.maku.framework.common.utils.Result; @@ -10,15 +11,13 @@ import net.maku.message.entity.SmsLogEntity; import net.maku.message.query.SmsLogQuery; import net.maku.message.service.SmsLogService; import net.maku.message.vo.SmsLogVO; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; - /** * 短信日志 * diff --git a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsPlatformController.java b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsPlatformController.java index 8264eb9..ef4d87f 100644 --- a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsPlatformController.java +++ b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsPlatformController.java @@ -2,6 +2,7 @@ package net.maku.message.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.page.PageResult; import net.maku.framework.common.utils.ExceptionUtils; @@ -16,11 +17,10 @@ import net.maku.message.sms.service.SmsService; import net.maku.message.vo.SmsPlatformVO; import net.maku.message.vo.SmsSendVO; import org.apache.commons.lang3.StringUtils; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; diff --git a/maku-boot-module/maku-module-monitor/pom.xml b/maku-boot-module/maku-module-monitor/pom.xml index e0648cd..1bb4c94 100644 --- a/maku-boot-module/maku-module-monitor/pom.xml +++ b/maku-boot-module/maku-module-monitor/pom.xml @@ -16,19 +16,9 @@ ${revision} - de.codecentric - spring-boot-admin-starter-server - 2.7.7 - - - de.codecentric - spring-boot-admin-starter-client - 2.7.7 - - com.github.oshi oshi-core - 6.3.2 + 6.4.0 diff --git a/maku-boot-module/maku-module-monitor/src/main/java/net/maku/monitor/config/AdminServerConfiguration.java b/maku-boot-module/maku-module-monitor/src/main/java/net/maku/monitor/config/AdminServerConfiguration.java deleted file mode 100644 index 0656051..0000000 --- a/maku-boot-module/maku-module-monitor/src/main/java/net/maku/monitor/config/AdminServerConfiguration.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.maku.monitor.config; - -import de.codecentric.boot.admin.server.config.EnableAdminServer; -import org.springframework.context.annotation.Configuration; - -@Configuration(proxyBeanMethods = false) -@EnableAdminServer -public class AdminServerConfiguration { - -} diff --git a/maku-boot-module/maku-module-monitor/src/main/java/net/maku/monitor/controller/CacheController.java b/maku-boot-module/maku-module-monitor/src/main/java/net/maku/monitor/controller/CacheController.java index 2450dfd..7e0e57a 100644 --- a/maku-boot-module/maku-module-monitor/src/main/java/net/maku/monitor/controller/CacheController.java +++ b/maku-boot-module/maku-module-monitor/src/main/java/net/maku/monitor/controller/CacheController.java @@ -1,5 +1,6 @@ package net.maku.monitor.controller; +import jakarta.annotation.Resource; import net.maku.framework.common.utils.Result; import net.maku.monitor.vo.Cache; import org.apache.commons.lang3.StringUtils; @@ -9,7 +10,6 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import java.util.*; /** diff --git a/maku-boot-module/maku-module-monitor/src/main/java/net/maku/monitor/vo/Server.java b/maku-boot-module/maku-module-monitor/src/main/java/net/maku/monitor/vo/Server.java index 43847a2..10223c0 100644 --- a/maku-boot-module/maku-module-monitor/src/main/java/net/maku/monitor/vo/Server.java +++ b/maku-boot-module/maku-module-monitor/src/main/java/net/maku/monitor/vo/Server.java @@ -59,12 +59,12 @@ public class Server { this.jvm = new Jvm(); this.sys = new Sys(); this.setDiskList(); - log.info("Server Info => {}", this); + log.debug("Server Info => {}", this); } public Server(Disk disk) { this.setDiskList(); - log.info("Server Info => {}", this); + log.debug("Server Info => {}", this); } /** diff --git a/maku-boot-module/maku-module-monitor/src/main/resources/auth.yml b/maku-boot-module/maku-module-monitor/src/main/resources/auth.yml deleted file mode 100644 index ef5984c..0000000 --- a/maku-boot-module/maku-module-monitor/src/main/resources/auth.yml +++ /dev/null @@ -1,3 +0,0 @@ -auth: - ignore_urls: - - /monitor/admin/** \ No newline at end of file diff --git a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java index f99c2f5..e0c8e20 100644 --- a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java +++ b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.extra.spring.SpringUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.exception.ServerException; import net.maku.framework.common.page.PageResult; @@ -14,12 +15,11 @@ import net.maku.quartz.query.ScheduleJobQuery; import net.maku.quartz.service.ScheduleJobService; import net.maku.quartz.utils.CronUtils; import net.maku.quartz.vo.ScheduleJobVO; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.util.List; /** diff --git a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobLogController.java b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobLogController.java index 52d75d7..5f0f9a3 100644 --- a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobLogController.java +++ b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobLogController.java @@ -2,6 +2,7 @@ package net.maku.quartz.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.page.PageResult; import net.maku.framework.common.utils.Result; @@ -10,15 +11,13 @@ import net.maku.quartz.entity.ScheduleJobLogEntity; import net.maku.quartz.query.ScheduleJobLogQuery; import net.maku.quartz.service.ScheduleJobLogService; import net.maku.quartz.vo.ScheduleJobLogVO; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; - /** * 定时任务日志 * diff --git a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobServiceImpl.java b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobServiceImpl.java index df39824..989662b 100644 --- a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobServiceImpl.java +++ b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import jakarta.annotation.PostConstruct; import lombok.AllArgsConstructor; import net.maku.framework.common.page.PageResult; import net.maku.framework.common.service.impl.BaseServiceImpl; @@ -20,7 +21,6 @@ import org.quartz.SchedulerException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.PostConstruct; import java.util.List; /** @@ -52,7 +52,7 @@ public class ScheduleJobServiceImpl extends BaseServiceImpl(ScheduleJobConvert.INSTANCE.convertList(page.getRecords()), page.getTotal()); } - private LambdaQueryWrapper getWrapper(ScheduleJobQuery query){ + private LambdaQueryWrapper getWrapper(ScheduleJobQuery query) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotBlank(query.getJobName()), ScheduleJobEntity::getJobName, query.getJobName()); wrapper.like(StrUtil.isNotBlank(query.getJobGroup()), ScheduleJobEntity::getJobGroup, query.getJobGroup()); @@ -66,7 +66,7 @@ public class ScheduleJobServiceImpl extends BaseServiceImpl 0) { + if (baseMapper.insert(entity) > 0) { ScheduleUtils.createScheduleJob(scheduler, entity); } } @@ -76,7 +76,7 @@ public class ScheduleJobServiceImpl extends BaseServiceImpl idList) { - for(Long id: idList){ + for (Long id : idList) { ScheduleJobEntity scheduleJob = getById(id); // 删除定时任务 @@ -98,7 +98,7 @@ public class ScheduleJobServiceImpl extends BaseServiceImpl> nav(){ - UserDetail user = SecurityUser.getUser(); - List list = sysMenuService.getUserMenuList(user, MenuTypeEnum.MENU.getValue()); + @GetMapping("nav") + @Operation(summary = "菜单导航") + public Result> nav() { + UserDetail user = SecurityUser.getUser(); + List list = sysMenuService.getUserMenuList(user, MenuTypeEnum.MENU.getValue()); - return Result.ok(list); - } + return Result.ok(list); + } - @GetMapping("authority") - @Operation(summary = "用户权限标识") - public Result> authority(){ - UserDetail user = SecurityUser.getUser(); - Set set = sysMenuService.getUserAuthority(user); + @GetMapping("authority") + @Operation(summary = "用户权限标识") + public Result> authority() { + UserDetail user = SecurityUser.getUser(); + Set set = sysMenuService.getUserAuthority(user); - return Result.ok(set); - } + return Result.ok(set); + } - @GetMapping("list") - @Operation(summary = "菜单列表") - @Parameter(name = "type", description = "菜单类型 0：菜单 1：按钮 2：接口 null：全部") - @PreAuthorize("hasAuthority('sys:menu:list')") - public Result> list(Integer type){ - List list = sysMenuService.getMenuList(type); + @GetMapping("list") + @Operation(summary = "菜单列表") + @Parameter(name = "type", description = "菜单类型 0：菜单 1：按钮 2：接口 null：全部") + @PreAuthorize("hasAuthority('sys:menu:list')") + public Result> list(Integer type) { + List list = sysMenuService.getMenuList(type); - return Result.ok(list); - } + return Result.ok(list); + } - @GetMapping("{id}") - @Operation(summary = "信息") - @PreAuthorize("hasAuthority('sys:menu:info')") - public Result get(@PathVariable("id") Long id){ - SysMenuEntity entity = sysMenuService.getById(id); - SysMenuVO vo = SysMenuConvert.INSTANCE.convert(entity); + @GetMapping("{id}") + @Operation(summary = "信息") + @PreAuthorize("hasAuthority('sys:menu:info')") + public Result get(@PathVariable("id") Long id) { + SysMenuEntity entity = sysMenuService.getById(id); + SysMenuVO vo = SysMenuConvert.INSTANCE.convert(entity); - // 获取上级菜单名称 - if(!Constant.ROOT.equals(entity.getPid())){ - SysMenuEntity parentEntity = sysMenuService.getById(entity.getPid()); - vo.setParentName(parentEntity.getName()); - } + // 获取上级菜单名称 + if (!Constant.ROOT.equals(entity.getPid())) { + SysMenuEntity parentEntity = sysMenuService.getById(entity.getPid()); + vo.setParentName(parentEntity.getName()); + } - return Result.ok(vo); - } + return Result.ok(vo); + } - @PostMapping - @Operation(summary = "保存") - @PreAuthorize("hasAuthority('sys:menu:save')") - public Result save(@RequestBody @Valid SysMenuVO vo){ - sysMenuService.save(vo); + @PostMapping + @Operation(summary = "保存") + @PreAuthorize("hasAuthority('sys:menu:save')") + public Result save(@RequestBody @Valid SysMenuVO vo) { + sysMenuService.save(vo); - return Result.ok(); - } + return Result.ok(); + } - @PutMapping - @Operation(summary = "修改") - @PreAuthorize("hasAuthority('sys:menu:update')") - public Result update(@RequestBody @Valid SysMenuVO vo){ - sysMenuService.update(vo); + @PutMapping + @Operation(summary = "修改") + @PreAuthorize("hasAuthority('sys:menu:update')") + public Result update(@RequestBody @Valid SysMenuVO vo) { + sysMenuService.update(vo); - return Result.ok(); - } + return Result.ok(); + } - @DeleteMapping("{id}") - @Operation(summary = "删除") - @PreAuthorize("hasAuthority('sys:menu:delete')") - public Result delete(@PathVariable("id") Long id){ - // 判断是否有子菜单或按钮 - Long count = sysMenuService.getSubMenuCount(id); - if(count > 0){ - return Result.error("请先删除子菜单"); - } + @DeleteMapping("{id}") + @Operation(summary = "删除") + @PreAuthorize("hasAuthority('sys:menu:delete')") + public Result delete(@PathVariable("id") Long id) { + // 判断是否有子菜单或按钮 + Long count = sysMenuService.getSubMenuCount(id); + if (count > 0) { + return Result.error("请先删除子菜单"); + } - sysMenuService.delete(id); + sysMenuService.delete(id); - return Result.ok(); - } + return Result.ok(); + } } \ No newline at end of file diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysOrgController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysOrgController.java index 47bec84..079f3b8 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysOrgController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysOrgController.java @@ -2,6 +2,7 @@ package net.maku.system.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.constant.Constant; import net.maku.framework.common.utils.Result; @@ -12,71 +13,70 @@ import net.maku.system.vo.SysOrgVO; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.util.List; /** * 机构管理 - * + * * @author 阿沐 babamu@126.com */ @RestController @RequestMapping("sys/org") -@Tag(name="机构管理") +@Tag(name = "机构管理") @AllArgsConstructor public class SysOrgController { - private final SysOrgService sysOrgService; + private final SysOrgService sysOrgService; - @GetMapping("list") - @Operation(summary = "列表") - @PreAuthorize("hasAuthority('sys:org:list')") - public Result> list(){ - List list = sysOrgService.getList(); + @GetMapping("list") + @Operation(summary = "列表") + @PreAuthorize("hasAuthority('sys:org:list')") + public Result> list() { + List list = sysOrgService.getList(); - return Result.ok(list); - } + return Result.ok(list); + } - @GetMapping("{id}") - @Operation(summary = "信息") - @PreAuthorize("hasAuthority('sys:org:info')") - public Result get(@PathVariable("id") Long id){ - SysOrgEntity entity = sysOrgService.getById(id); - SysOrgVO vo =SysOrgConvert.INSTANCE.convert(entity); + @GetMapping("{id}") + @Operation(summary = "信息") + @PreAuthorize("hasAuthority('sys:org:info')") + public Result get(@PathVariable("id") Long id) { + SysOrgEntity entity = sysOrgService.getById(id); + SysOrgVO vo = SysOrgConvert.INSTANCE.convert(entity); - // 获取上级机构名称 - if(!Constant.ROOT.equals(entity.getPid())){ - SysOrgEntity parentEntity = sysOrgService.getById(entity.getPid()); - vo.setParentName(parentEntity.getName()); - } + // 获取上级机构名称 + if (!Constant.ROOT.equals(entity.getPid())) { + SysOrgEntity parentEntity = sysOrgService.getById(entity.getPid()); + vo.setParentName(parentEntity.getName()); + } - return Result.ok(vo); - } + return Result.ok(vo); + } - @PostMapping - @Operation(summary = "保存") - @PreAuthorize("hasAuthority('sys:org:save')") - public Result save(@RequestBody @Valid SysOrgVO vo){ - sysOrgService.save(vo); + @PostMapping + @Operation(summary = "保存") + @PreAuthorize("hasAuthority('sys:org:save')") + public Result save(@RequestBody @Valid SysOrgVO vo) { + sysOrgService.save(vo); - return Result.ok(); - } + return Result.ok(); + } - @PutMapping - @Operation(summary = "修改") - @PreAuthorize("hasAuthority('sys:org:update')") - public Result update(@RequestBody @Valid SysOrgVO vo){ - sysOrgService.update(vo); + @PutMapping + @Operation(summary = "修改") + @PreAuthorize("hasAuthority('sys:org:update')") + public Result update(@RequestBody @Valid SysOrgVO vo) { + sysOrgService.update(vo); - return Result.ok(); - } + return Result.ok(); + } - @DeleteMapping("{id}") - @Operation(summary = "删除") - @PreAuthorize("hasAuthority('sys:org:delete')") - public Result delete(@PathVariable("id") Long id){ - sysOrgService.delete(id); + @DeleteMapping("{id}") + @Operation(summary = "删除") + @PreAuthorize("hasAuthority('sys:org:delete')") + public Result delete(@PathVariable("id") Long id) { + sysOrgService.delete(id); + + return Result.ok(); + } - return Result.ok(); - } - } \ No newline at end of file diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysParamsController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysParamsController.java index 294530c..0ed47fe 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysParamsController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysParamsController.java @@ -2,6 +2,7 @@ package net.maku.system.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.page.PageResult; import net.maku.framework.common.utils.Result; @@ -10,11 +11,10 @@ import net.maku.system.entity.SysParamsEntity; import net.maku.system.query.SysParamsQuery; import net.maku.system.service.SysParamsService; import net.maku.system.vo.SysParamsVO; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.util.List; /** diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java index 01c1aa6..6467b59 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java @@ -2,6 +2,7 @@ package net.maku.system.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.page.PageResult; import net.maku.framework.common.utils.Result; @@ -10,11 +11,10 @@ import net.maku.system.entity.SysPostEntity; import net.maku.system.query.SysPostQuery; import net.maku.system.service.SysPostService; import net.maku.system.vo.SysPostVO; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.util.List; diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java index 134e0a4..536a7b4 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java @@ -2,6 +2,7 @@ package net.maku.system.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.page.PageResult; import net.maku.framework.common.utils.Result; @@ -16,11 +17,10 @@ import net.maku.system.vo.SysMenuVO; import net.maku.system.vo.SysRoleDataScopeVO; import net.maku.system.vo.SysRoleVO; import net.maku.system.vo.SysUserVO; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.util.List; /** diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java index 139edae..c53e908 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java @@ -3,6 +3,7 @@ package net.maku.system.controller; import cn.hutool.core.util.StrUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.page.PageResult; import net.maku.framework.common.utils.Result; @@ -16,13 +17,12 @@ import net.maku.system.service.SysUserRoleService; import net.maku.system.service.SysUserService; import net.maku.system.vo.SysUserPasswordVO; import net.maku.system.vo.SysUserVO; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.validation.Valid; import java.util.List; diff --git a/maku-boot-system/src/main/java/net/maku/system/query/SysDictDataQuery.java b/maku-boot-system/src/main/java/net/maku/system/query/SysDictDataQuery.java index 81701dd..06922d2 100644 --- a/maku-boot-system/src/main/java/net/maku/system/query/SysDictDataQuery.java +++ b/maku-boot-system/src/main/java/net/maku/system/query/SysDictDataQuery.java @@ -1,12 +1,11 @@ package net.maku.system.query; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; import net.maku.framework.common.query.Query; -import javax.validation.constraints.NotNull; - /** * 字典数据 * diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java index 4a7dd49..ed33612 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.fhs.trans.service.impl.TransService; +import jakarta.servlet.http.HttpServletRequest; import lombok.AllArgsConstructor; import lombok.SneakyThrows; import net.maku.framework.common.page.PageResult; @@ -19,7 +20,6 @@ import net.maku.system.vo.SysLogLoginVO; import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; import java.util.Date; import java.util.List; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysParamsServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysParamsServiceImpl.java index 0d5bb4d..83bb4c5 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysParamsServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysParamsServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import jakarta.annotation.PostConstruct; import lombok.AllArgsConstructor; import net.maku.framework.common.exception.ServerException; import net.maku.framework.common.page.PageResult; @@ -19,7 +20,6 @@ import net.maku.system.vo.SysParamsVO; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.PostConstruct; import java.util.List; /** diff --git a/maku-boot-system/src/main/java/net/maku/system/vo/SysDictDataVO.java b/maku-boot-system/src/main/java/net/maku/system/vo/SysDictDataVO.java index 05161de..3495e6e 100644 --- a/maku-boot-system/src/main/java/net/maku/system/vo/SysDictDataVO.java +++ b/maku-boot-system/src/main/java/net/maku/system/vo/SysDictDataVO.java @@ -2,12 +2,12 @@ package net.maku.system.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import net.maku.framework.common.utils.DateUtils; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; diff --git a/maku-boot-system/src/main/java/net/maku/system/vo/SysDictTypeVO.java b/maku-boot-system/src/main/java/net/maku/system/vo/SysDictTypeVO.java index 1cd0905..ec3eb25 100644 --- a/maku-boot-system/src/main/java/net/maku/system/vo/SysDictTypeVO.java +++ b/maku-boot-system/src/main/java/net/maku/system/vo/SysDictTypeVO.java @@ -2,11 +2,11 @@ package net.maku.system.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import net.maku.framework.common.utils.DateUtils; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; diff --git a/maku-boot-system/src/main/java/net/maku/system/vo/SysLogLoginVO.java b/maku-boot-system/src/main/java/net/maku/system/vo/SysLogLoginVO.java index bfc1851..94f169f 100644 --- a/maku-boot-system/src/main/java/net/maku/system/vo/SysLogLoginVO.java +++ b/maku-boot-system/src/main/java/net/maku/system/vo/SysLogLoginVO.java @@ -2,10 +2,6 @@ package net.maku.system.vo; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.data.WriteCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.fasterxml.jackson.annotation.JsonFormat; import com.fhs.core.trans.anno.Trans; import com.fhs.core.trans.constant.TransType; diff --git a/maku-boot-system/src/main/java/net/maku/system/vo/SysMenuVO.java b/maku-boot-system/src/main/java/net/maku/system/vo/SysMenuVO.java index cd624c7..9e1f772 100644 --- a/maku-boot-system/src/main/java/net/maku/system/vo/SysMenuVO.java +++ b/maku-boot-system/src/main/java/net/maku/system/vo/SysMenuVO.java @@ -2,14 +2,14 @@ package net.maku.system.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.TreeNode; import org.hibernate.validator.constraints.Range; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; import java.util.Date; /** @@ -22,35 +22,35 @@ import java.util.Date; @Schema(description = "菜单") public class SysMenuVO extends TreeNode { - @Schema(description = "菜单名称") - @NotBlank(message = "菜单名称不能为空") - private String name; + @Schema(description = "菜单名称") + @NotBlank(message = "菜单名称不能为空") + private String name; - @Schema(description = "菜单URL") - private String url; + @Schema(description = "菜单URL") + private String url; - @Schema(description = "类型 0：菜单 1：按钮 2：接口") - @Range(min = 0, max = 2, message = "类型不正确") - private Integer type; + @Schema(description = "类型 0：菜单 1：按钮 2：接口") + @Range(min = 0, max = 2, message = "类型不正确") + private Integer type; - @Schema(description = "打开方式 0：内部 1：外部") - @Range(min = 0, max = 1, message = "打开方式不正确") - private Integer openStyle; + @Schema(description = "打开方式 0：内部 1：外部") + @Range(min = 0, max = 1, message = "打开方式不正确") + private Integer openStyle; - @Schema(description = "菜单图标") - private String icon; + @Schema(description = "菜单图标") + private String icon; - @Schema(description = "授权标识(多个用逗号分隔，如：sys:menu:list,sys:menu:save)") - private String authority; + @Schema(description = "授权标识(多个用逗号分隔，如：sys:menu:list,sys:menu:save)") + private String authority; - @Schema(description = "排序") - @Min(value = 0, message = "排序值不能小于0") - private Integer sort; + @Schema(description = "排序") + @Min(value = 0, message = "排序值不能小于0") + private Integer sort; - @Schema(description = "创建时间") - @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) - private Date createTime; + @Schema(description = "创建时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date createTime; - @Schema(description = "上级菜单名称") - private String parentName; + @Schema(description = "上级菜单名称") + private String parentName; } \ No newline at end of file diff --git a/maku-boot-system/src/main/java/net/maku/system/vo/SysOrgVO.java b/maku-boot-system/src/main/java/net/maku/system/vo/SysOrgVO.java index ef25272..d03ccd4 100644 --- a/maku-boot-system/src/main/java/net/maku/system/vo/SysOrgVO.java +++ b/maku-boot-system/src/main/java/net/maku/system/vo/SysOrgVO.java @@ -2,13 +2,13 @@ package net.maku.system.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.TreeNode; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; import java.util.Date; /** @@ -21,19 +21,19 @@ import java.util.Date; @Schema(description = "机构") public class SysOrgVO extends TreeNode { - @Schema(description = "机构名称", required = true) - @NotBlank(message = "机构名称不能为空") - private String name; + @Schema(description = "机构名称", required = true) + @NotBlank(message = "机构名称不能为空") + private String name; - @Schema(description = "排序", required = true) - @Min(value = 0, message = "排序值不能小于0") - private Integer sort; + @Schema(description = "排序", required = true) + @Min(value = 0, message = "排序值不能小于0") + private Integer sort; - @Schema(description = "创建时间") - @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) - private Date createTime; + @Schema(description = "创建时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date createTime; - @Schema(description = "上级名称") - private String parentName; + @Schema(description = "上级名称") + private String parentName; } \ No newline at end of file diff --git a/maku-boot-system/src/main/java/net/maku/system/vo/SysPostVO.java b/maku-boot-system/src/main/java/net/maku/system/vo/SysPostVO.java index 2f6f11b..483209c 100644 --- a/maku-boot-system/src/main/java/net/maku/system/vo/SysPostVO.java +++ b/maku-boot-system/src/main/java/net/maku/system/vo/SysPostVO.java @@ -2,20 +2,20 @@ package net.maku.system.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import net.maku.framework.common.utils.DateUtils; import org.hibernate.validator.constraints.Range; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; /** -* 岗位管理 -* -* @author 阿沐 babamu@126.com -*/ + * 岗位管理 + * + * @author 阿沐 babamu@126.com + */ @Data @Schema(description = "岗位管理") public class SysPostVO implements Serializable { diff --git a/maku-boot-system/src/main/java/net/maku/system/vo/SysRoleDataScopeVO.java b/maku-boot-system/src/main/java/net/maku/system/vo/SysRoleDataScopeVO.java index 2939d34..3097114 100644 --- a/maku-boot-system/src/main/java/net/maku/system/vo/SysRoleDataScopeVO.java +++ b/maku-boot-system/src/main/java/net/maku/system/vo/SysRoleDataScopeVO.java @@ -1,9 +1,9 @@ package net.maku.system.vo; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.Data; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; diff --git a/maku-boot-system/src/main/java/net/maku/system/vo/SysRoleVO.java b/maku-boot-system/src/main/java/net/maku/system/vo/SysRoleVO.java index fa8e976..6ea009b 100644 --- a/maku-boot-system/src/main/java/net/maku/system/vo/SysRoleVO.java +++ b/maku-boot-system/src/main/java/net/maku/system/vo/SysRoleVO.java @@ -2,10 +2,10 @@ package net.maku.system.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import net.maku.framework.common.utils.DateUtils; -import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; import java.util.List; diff --git a/maku-boot-system/src/main/java/net/maku/system/vo/SysUserPasswordVO.java b/maku-boot-system/src/main/java/net/maku/system/vo/SysUserPasswordVO.java index 6f21876..40be32c 100644 --- a/maku-boot-system/src/main/java/net/maku/system/vo/SysUserPasswordVO.java +++ b/maku-boot-system/src/main/java/net/maku/system/vo/SysUserPasswordVO.java @@ -1,10 +1,10 @@ package net.maku.system.vo; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; import java.io.Serializable; /** diff --git a/maku-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java b/maku-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java index 58dd899..d1d37d0 100644 --- a/maku-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java +++ b/maku-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java @@ -6,14 +6,14 @@ import com.fhs.core.trans.anno.Trans; import com.fhs.core.trans.constant.TransType; import com.fhs.core.trans.vo.TransPojo; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import net.maku.framework.common.utils.DateUtils; import net.maku.system.entity.SysOrgEntity; import org.hibernate.validator.constraints.Range; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; import java.util.List; diff --git a/maku-framework/pom.xml b/maku-framework/pom.xml index 1554cb0..da7a4df 100644 --- a/maku-framework/pom.xml +++ b/maku-framework/pom.xml @@ -15,6 +15,11 @@ spring-boot-starter-web + jakarta.servlet + jakarta.servlet-api + provided + + org.springframework.boot spring-boot-configuration-processor true @@ -24,6 +29,10 @@ spring-boot-starter-validation + com.github.xiaoymin + knife4j-openapi3-jakarta-spring-boot-starter + + org.springframework.boot spring-boot-starter-test test @@ -53,10 +62,6 @@ mybatis-plus-boot-starter - org.springdoc - springdoc-openapi-ui - - cn.hutool hutool-all diff --git a/maku-framework/src/main/java/net/maku/framework/common/cache/RedisCache.java b/maku-framework/src/main/java/net/maku/framework/common/cache/RedisCache.java index e8ccb89..fd33eea 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/cache/RedisCache.java +++ b/maku-framework/src/main/java/net/maku/framework/common/cache/RedisCache.java @@ -1,10 +1,10 @@ package net.maku.framework.common.cache; +import jakarta.annotation.Resource; import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; -import javax.annotation.Resource; import java.util.Collection; import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/maku-framework/src/main/java/net/maku/framework/common/query/Query.java b/maku-framework/src/main/java/net/maku/framework/common/query/Query.java index b5c3bdb..e262b0c 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/query/Query.java +++ b/maku-framework/src/main/java/net/maku/framework/common/query/Query.java @@ -1,12 +1,11 @@ package net.maku.framework.common.query; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import lombok.Data; import org.hibernate.validator.constraints.Range; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - /** * 查询公共参数 * diff --git a/maku-framework/src/main/java/net/maku/framework/common/utils/ExcelUtils.java b/maku-framework/src/main/java/net/maku/framework/common/utils/ExcelUtils.java index 6f680b5..03cbe6d 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/utils/ExcelUtils.java +++ b/maku-framework/src/main/java/net/maku/framework/common/utils/ExcelUtils.java @@ -12,13 +12,13 @@ import com.fhs.core.trans.constant.TransType; import com.fhs.core.trans.util.ReflectUtils; import com.fhs.core.trans.vo.TransPojo; import com.fhs.trans.service.impl.DictionaryTransService; +import jakarta.servlet.http.HttpServletResponse; import lombok.SneakyThrows; import net.maku.framework.common.excel.ExcelDataListener; import net.maku.framework.common.excel.ExcelFinishCallBack; import org.apache.commons.lang3.StringUtils; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/maku-framework/src/main/java/net/maku/framework/common/utils/HttpContextUtils.java b/maku-framework/src/main/java/net/maku/framework/common/utils/HttpContextUtils.java index bc53e78..3a1ae89 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/utils/HttpContextUtils.java +++ b/maku-framework/src/main/java/net/maku/framework/common/utils/HttpContextUtils.java @@ -1,13 +1,13 @@ package net.maku.framework.common.utils; import cn.hutool.core.util.StrUtil; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.http.HttpHeaders; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; @@ -19,49 +19,49 @@ import java.util.Map; */ public class HttpContextUtils { - public static HttpServletRequest getHttpServletRequest() { - RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); - if(requestAttributes == null){ - return null; - } + public static HttpServletRequest getHttpServletRequest() { + RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); + if (requestAttributes == null) { + return null; + } - return ((ServletRequestAttributes) requestAttributes).getRequest(); - } + return ((ServletRequestAttributes) requestAttributes).getRequest(); + } - public static HttpServletResponse getHttpServletResponse () { - RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); - if(requestAttributes == null){ - return null; - } + public static HttpServletResponse getHttpServletResponse() { + RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); + if (requestAttributes == null) { + return null; + } - return ((ServletRequestAttributes) requestAttributes).getResponse(); - } + return ((ServletRequestAttributes) requestAttributes).getResponse(); + } - public static Map getParameterMap(HttpServletRequest request) { - Enumeration parameters = request.getParameterNames(); + public static Map getParameterMap(HttpServletRequest request) { + Enumeration parameters = request.getParameterNames(); - Map params = new HashMap<>(); - while (parameters.hasMoreElements()) { - String parameter = parameters.nextElement(); - String value = request.getParameter(parameter); - if (StrUtil.isNotBlank(value)) { - params.put(parameter, value); - } - } + Map params = new HashMap<>(); + while (parameters.hasMoreElements()) { + String parameter = parameters.nextElement(); + String value = request.getParameter(parameter); + if (StrUtil.isNotBlank(value)) { + params.put(parameter, value); + } + } - return params; - } + return params; + } - public static String getDomain(){ - HttpServletRequest request = getHttpServletRequest(); - StringBuffer url = request.getRequestURL(); - return url.delete(url.length() - request.getRequestURI().length(), url.length()).toString(); - } + public static String getDomain() { + HttpServletRequest request = getHttpServletRequest(); + StringBuffer url = request.getRequestURL(); + return url.delete(url.length() - request.getRequestURI().length(), url.length()).toString(); + } - public static String getOrigin(){ - HttpServletRequest request = getHttpServletRequest(); - return request.getHeader(HttpHeaders.ORIGIN); - } + public static String getOrigin() { + HttpServletRequest request = getHttpServletRequest(); + return request.getHeader(HttpHeaders.ORIGIN); + } } \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/common/utils/IpUtils.java b/maku-framework/src/main/java/net/maku/framework/common/utils/IpUtils.java index 1652cef..3bc1e49 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/utils/IpUtils.java +++ b/maku-framework/src/main/java/net/maku/framework/common/utils/IpUtils.java @@ -1,6 +1,7 @@ package net.maku.framework.common.utils; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; + import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/maku-framework/src/main/java/net/maku/framework/common/utils/TreeNode.java b/maku-framework/src/main/java/net/maku/framework/common/utils/TreeNode.java index c17b2dd..ddb9422 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/utils/TreeNode.java +++ b/maku-framework/src/main/java/net/maku/framework/common/utils/TreeNode.java @@ -1,9 +1,9 @@ package net.maku.framework.common.utils; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.Data; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/maku-framework/src/main/java/net/maku/framework/common/xss/XssFilter.java b/maku-framework/src/main/java/net/maku/framework/common/xss/XssFilter.java index dfd75dc..de3a2bf 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/xss/XssFilter.java +++ b/maku-framework/src/main/java/net/maku/framework/common/xss/XssFilter.java @@ -1,13 +1,13 @@ package net.maku.framework.common.xss; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.AllArgsConstructor; import org.springframework.util.PathMatcher; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/maku-framework/src/main/java/net/maku/framework/common/xss/XssRequestWrapper.java b/maku-framework/src/main/java/net/maku/framework/common/xss/XssRequestWrapper.java index 8365283..bf7ff09 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/xss/XssRequestWrapper.java +++ b/maku-framework/src/main/java/net/maku/framework/common/xss/XssRequestWrapper.java @@ -2,12 +2,12 @@ package net.maku.framework.common.xss; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import org.springframework.http.MediaType; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.LinkedHashMap; diff --git a/maku-framework/src/main/java/net/maku/framework/config/RedisConfig.java b/maku-framework/src/main/java/net/maku/framework/config/RedisConfig.java index 159cd7c..94a524c 100644 --- a/maku-framework/src/main/java/net/maku/framework/config/RedisConfig.java +++ b/maku-framework/src/main/java/net/maku/framework/config/RedisConfig.java @@ -21,12 +21,11 @@ public class RedisConfig { @Bean public Jackson2JsonRedisSerializer jackson2JsonRedisSerializer(){ - Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(Object.class); ObjectMapper objectMapper = new ObjectMapper(); objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); objectMapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL); - jackson2JsonRedisSerializer.setObjectMapper(objectMapper); + Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(objectMapper, Object.class); return jackson2JsonRedisSerializer; } diff --git a/maku-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java b/maku-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java index d9d451d..d3b98df 100644 --- a/maku-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java +++ b/maku-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Contact; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.info.License; -import org.springdoc.core.GroupedOpenApi; +import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/maku-framework/src/main/java/net/maku/framework/security/config/SecurityConfig.java b/maku-framework/src/main/java/net/maku/framework/security/config/SecurityConfig.java index 1f9fa73..07df016 100644 --- a/maku-framework/src/main/java/net/maku/framework/security/config/SecurityConfig.java +++ b/maku-framework/src/main/java/net/maku/framework/security/config/SecurityConfig.java @@ -14,9 +14,10 @@ import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.DefaultAuthenticationEventPublisher; import org.springframework.security.authentication.ProviderManager; import org.springframework.security.authentication.dao.DaoAuthenticationProvider; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.password.PasswordEncoder; @@ -35,7 +36,7 @@ import java.util.List; @Configuration @AllArgsConstructor @EnableWebSecurity -@EnableGlobalMethodSecurity(prePostEnabled = true) +@EnableMethodSecurity public class SecurityConfig { private final OncePerRequestFilter authenticationTokenFilter; private final PermitResource permitResource; @@ -80,13 +81,14 @@ public class SecurityConfig { http .addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class) .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) - .and().authorizeRequests() - .antMatchers(permits).permitAll() - .antMatchers(HttpMethod.OPTIONS).permitAll() - .anyRequest().authenticated() - .and().exceptionHandling().authenticationEntryPoint(new SecurityAuthenticationEntryPoint()) + .and().authorizeHttpRequests(auth -> auth + .requestMatchers(permits).permitAll() + .requestMatchers(HttpMethod.OPTIONS).permitAll() + .anyRequest().authenticated() + ) + .exceptionHandling().authenticationEntryPoint(new SecurityAuthenticationEntryPoint()) .and().headers().frameOptions().disable() - .and().csrf().disable() + .and().csrf(AbstractHttpConfigurer::disable) ; return http.build(); diff --git a/maku-framework/src/main/java/net/maku/framework/security/exception/SecurityAuthenticationEntryPoint.java b/maku-framework/src/main/java/net/maku/framework/security/exception/SecurityAuthenticationEntryPoint.java index eb9f3fd..24474f3 100644 --- a/maku-framework/src/main/java/net/maku/framework/security/exception/SecurityAuthenticationEntryPoint.java +++ b/maku-framework/src/main/java/net/maku/framework/security/exception/SecurityAuthenticationEntryPoint.java @@ -1,5 +1,7 @@ package net.maku.framework.security.exception; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import net.maku.framework.common.exception.ErrorCode; import net.maku.framework.common.utils.HttpContextUtils; import net.maku.framework.common.utils.JsonUtils; @@ -7,8 +9,6 @@ import net.maku.framework.common.utils.Result; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; /** @@ -20,10 +20,10 @@ public class SecurityAuthenticationEntryPoint implements AuthenticationEntryPoin @Override public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException { - response.setContentType("application/json; charset=utf-8"); - response.setHeader("Access-Control-Allow-Credentials", "true"); - response.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin()); + response.setContentType("application/json; charset=utf-8"); + response.setHeader("Access-Control-Allow-Credentials", "true"); + response.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin()); - response.getWriter().print(JsonUtils.toJsonString(Result.error(ErrorCode.UNAUTHORIZED))); + response.getWriter().print(JsonUtils.toJsonString(Result.error(ErrorCode.UNAUTHORIZED))); } } \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/security/filter/AuthenticationTokenFilter.java b/maku-framework/src/main/java/net/maku/framework/security/filter/AuthenticationTokenFilter.java index 596d3de..cf8c429 100644 --- a/maku-framework/src/main/java/net/maku/framework/security/filter/AuthenticationTokenFilter.java +++ b/maku-framework/src/main/java/net/maku/framework/security/filter/AuthenticationTokenFilter.java @@ -1,5 +1,9 @@ package net.maku.framework.security.filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.AllArgsConstructor; import net.maku.framework.security.cache.TokenStoreCache; import net.maku.framework.security.user.UserDetail; @@ -12,10 +16,6 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/maku-framework/src/main/java/net/maku/framework/security/utils/TokenUtils.java b/maku-framework/src/main/java/net/maku/framework/security/utils/TokenUtils.java index 0a62648..e753e69 100644 --- a/maku-framework/src/main/java/net/maku/framework/security/utils/TokenUtils.java +++ b/maku-framework/src/main/java/net/maku/framework/security/utils/TokenUtils.java @@ -1,9 +1,8 @@ package net.maku.framework.security.utils; import cn.hutool.core.lang.UUID; -import org.apache.commons.lang3.StringUtils; - -import javax.servlet.http.HttpServletRequest; +import cn.hutool.core.util.StrUtil; +import jakarta.servlet.http.HttpServletRequest; /** * Token 工具类 @@ -24,7 +23,7 @@ public class TokenUtils { */ public static String getAccessToken(HttpServletRequest request) { String accessToken = request.getHeader("Authorization"); - if (StringUtils.isBlank(accessToken)) { + if (StrUtil.isBlank(accessToken)) { accessToken = request.getParameter("access_token"); } diff --git a/maku-server/pom.xml b/maku-server/pom.xml index 6b767ef..615b084 100644 --- a/maku-server/pom.xml +++ b/maku-server/pom.xml @@ -41,14 +41,15 @@ ${revision} - com.github.xiaoymin - knife4j-openapi3-spring-boot-starter - - org.springframework.boot spring-boot-starter-test test + + okio + com.squareup.okio + 3.3.0 + diff --git a/maku-server/src/main/resources/application-dev.yml b/maku-server/src/main/resources/application-dev.yml index 34f9ed6..bd53f5c 100644 --- a/maku-server/src/main/resources/application-dev.yml +++ b/maku-server/src/main/resources/application-dev.yml @@ -1,10 +1,11 @@ spring: - redis: - database: 1 - host: localhost - port: 6379 - #password: - #timeout: 6000ms # 连接超时时长（毫秒） + data: + redis: + database: 1 + host: localhost + port: 6379 + #password: + #timeout: 6000ms # 连接超时时长（毫秒） datasource: # MySQL8 driver-class-name: com.mysql.cj.jdbc.Driver @@ -30,26 +31,3 @@ spring: max-lifetime: 1800000 # 连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认： 30 分钟 connection-test-query: SELECT 1 pool-name: MakuHikariCP - - ---- ############ 监控相关配置 - -# Actuator 配置 -management: - endpoints: - web: - base-path: /actuator - exposure: - include: '*' - -# Spring Boot Admin 配置 -spring: - boot: - admin: - # Spring Boot Admin Server 服务端地址 - context-path: /monitor/admin - client: - # 指定 Spring Boot Admin Server 服务端地址 - url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} - instance: - service-host-type: IP \ No newline at end of file diff --git a/maku-server/src/main/resources/application-prod.yml b/maku-server/src/main/resources/application-prod.yml index c00545a..68fdf9f 100644 --- a/maku-server/src/main/resources/application-prod.yml +++ b/maku-server/src/main/resources/application-prod.yml @@ -1,10 +1,11 @@ spring: - redis: - database: 1 - host: localhost - port: 6379 - #password: - #timeout: 6000ms # 连接超时时长（毫秒） + data: + redis: + database: 1 + host: localhost + port: 6379 + #password: + #timeout: 6000ms # 连接超时时长（毫秒） datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver @@ -19,27 +20,4 @@ spring: idle-timeout: 600000 # 连接超时的最大时长（毫秒），超时则被释放（retired），默认：10 分钟 max-lifetime: 1800000 # 连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认： 30 分钟 connection-test-query: SELECT 1 - pool-name: MakuHikariCP - - ---- ############ 监控相关配置 - -# Actuator 配置 -management: - endpoints: - web: - base-path: /actuator - exposure: - include: '*' - -# Spring Boot Admin 配置 -spring: - boot: - admin: - # Spring Boot Admin Server 服务端地址 - context-path: /monitor/admin - client: - # 指定 Spring Boot Admin Server 服务端地址 - url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} - instance: - service-host-type: IP \ No newline at end of file + pool-name: MakuHikariCP \ No newline at end of file diff --git a/maku-server/src/main/resources/application-test.yml b/maku-server/src/main/resources/application-test.yml index c00545a..68fdf9f 100644 --- a/maku-server/src/main/resources/application-test.yml +++ b/maku-server/src/main/resources/application-test.yml @@ -1,10 +1,11 @@ spring: - redis: - database: 1 - host: localhost - port: 6379 - #password: - #timeout: 6000ms # 连接超时时长（毫秒） + data: + redis: + database: 1 + host: localhost + port: 6379 + #password: + #timeout: 6000ms # 连接超时时长（毫秒） datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver @@ -19,27 +20,4 @@ spring: idle-timeout: 600000 # 连接超时的最大时长（毫秒），超时则被释放（retired），默认：10 分钟 max-lifetime: 1800000 # 连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认： 30 分钟 connection-test-query: SELECT 1 - pool-name: MakuHikariCP - - ---- ############ 监控相关配置 - -# Actuator 配置 -management: - endpoints: - web: - base-path: /actuator - exposure: - include: '*' - -# Spring Boot Admin 配置 -spring: - boot: - admin: - # Spring Boot Admin Server 服务端地址 - context-path: /monitor/admin - client: - # 指定 Spring Boot Admin Server 服务端地址 - url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} - instance: - service-host-type: IP \ No newline at end of file + pool-name: MakuHikariCP \ No newline at end of file diff --git a/maku-server/src/main/resources/logback-spring.xml b/maku-server/src/main/resources/logback.xml similarity index 62% rename from maku-server/src/main/resources/logback-spring.xml rename to maku-server/src/main/resources/logback.xml index eda71d2..533483c 100644 --- a/maku-server/src/main/resources/logback-spring.xml +++ b/maku-server/src/main/resources/logback.xml @@ -14,10 +14,6 @@ - - - debug - ${CONSOLE_LOG_PATTERN} UTF-8 @@ -33,15 +29,11 @@ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n UTF-8 - - - + ${logging.path}/debug-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 30 + 100MB + 60 + 20GB @@ -57,12 +49,11 @@ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n UTF-8 - + ${logging.path}/info-%d{yyyy-MM-dd}.%i.log - - 100MB - - 30 + 100MB + 60 + 20GB info @@ -77,12 +68,11 @@ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n UTF-8 - + ${logging.path}/warn-%d{yyyy-MM-dd}.%i.log - - 100MB - - 30 + 100MB + 60 + 20GB warn @@ -97,12 +87,11 @@ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n UTF-8 - + ${logging.path}/error-%d{yyyy-MM-dd}.%i.log - - 100MB - - 30 + 100MB + 60 + 20GB ERROR @@ -111,22 +100,14 @@ - - - - - - - + + + + + + + + + - - - - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 86793e6..91002bf 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.6 + 3.0.1 @@ -30,23 +30,22 @@ true UTF-8 UTF-8 - 1.8 - 3.5.2 + 17 + 3.5.3 8.1.2.79 4.0.0 - 1.6.9 - 5.7.22 + 5.8.11 1.6.2 1.4.2.Final - 3.8.0 - 2.0.18 + 3.15.2 + 2.0.23 3.1.574 - 7.11.0 - 8.4.3 - 5.6.89 + 7.12.1 + 8.5.1 + 5.6.97 3.22.3 3.1.1 - 2.0.12 + 2.1.6 @@ -83,15 +82,10 @@ com.github.xiaoymin - knife4j-openapi3-spring-boot-starter + knife4j-openapi3-jakarta-spring-boot-starter ${knife4j.version} - org.springdoc - springdoc-openapi-ui - ${springdoc.version} - - cn.hutool hutool-all ${hutool.version}