diff --git a/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/factory/RemoteSysNoticeFallbackFactory.kt b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/factory/RemoteSysNoticeFallbackFactory.kt index 357d4620f..d3604c1a2 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/factory/RemoteSysNoticeFallbackFactory.kt +++ b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/factory/RemoteSysNoticeFallbackFactory.kt @@ -16,7 +16,7 @@ open class RemoteSysNoticeFallbackFactory : FallbackFactory { + override fun getById_Inner(noticeId: Long, source: String): R { return R.fail("获取公告失败") } } diff --git a/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/inner/InnerRemoteSysNoticeService.kt b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/inner/InnerRemoteSysNoticeService.kt index f2f970211..c1949fa6c 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/inner/InnerRemoteSysNoticeService.kt +++ b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/inner/InnerRemoteSysNoticeService.kt @@ -12,10 +12,9 @@ interface InnerRemoteSysNoticeService { * @param noticeId 公告ID * @return 公告信息 */ - @GetMapping("/inner/notice/detail/{noticeId}") + @GetMapping("/inner/notice/detail/{noticeId:\\d+}") fun getById_Inner( - @PathVariable("noticeId") noticeId: Long?, @RequestHeader( - SecurityConstants.FROM_SOURCE - ) source: String? - ): R? + @PathVariable("noticeId") noticeId: Long, + @RequestHeader(SecurityConstants.FROM_SOURCE) source: String + ): R } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysNoticeController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysNoticeController.kt index 5f6026f47..e4a4e16ef 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysNoticeController.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysNoticeController.kt @@ -24,8 +24,8 @@ open class InnerSysNoticeController : BaseController() { * 根据ID获取公告信息 */ @InnerAuth - @GetMapping("/detail/{noticeId}") - fun infoById(@PathVariable("noticeId") noticeId: Long): R { + @GetMapping("/detail/{noticeId:\\d+}") + fun infoById(@PathVariable("noticeId") noticeId: Long): R { return R.ok(noticeService.selectNoticeById(noticeId)) } } \ No newline at end of file