diff --git a/README.md b/README.md index c31947ad5..7f3ffac22 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

logo

-

RuoYi v3.6.5.0.4

+

RuoYi v3.6.5.0.5

基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构

- +

diff --git a/pom.xml b/pom.xml index bcaa4c8ae..13cc5938f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi - 3.6.5.0.4 + 3.6.5.0.5 ruoyi http://www.ruoyi.vip 若依微服务系统 - 3.6.5.0.4 + 3.6.5.0.5 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index 72d6b010b..9cb05b534 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index 68463a22e..4d9447ca7 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-api - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/RemoteSysNoticeService.kt b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/RemoteSysNoticeService.kt new file mode 100644 index 000000000..8937034ef --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/RemoteSysNoticeService.kt @@ -0,0 +1,19 @@ +package com.ruoyi.system.api + +import com.ruoyi.common.core.constant.ServiceNameConstants +import com.ruoyi.system.api.factory.RemoteUserFallbackFactory +import com.ruoyi.system.api.inner.InnerRemoteSysNoticeService +import org.springframework.cloud.openfeign.FeignClient + + +/** + * 公告服务 + * @author 栾成伟 + */ +@FeignClient( + contextId = "remoteSysNoticeService", + value = ServiceNameConstants.SYSTEM_SERVICE, + fallbackFactory = RemoteUserFallbackFactory::class +) +interface RemoteSysNoticeService : InnerRemoteSysNoticeService { +} \ No newline at end of file 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 new file mode 100644 index 000000000..357d4620f --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/factory/RemoteSysNoticeFallbackFactory.kt @@ -0,0 +1,24 @@ +package com.ruoyi.system.api.factory + +import com.ruoyi.common.core.domain.R +import com.ruoyi.system.api.RemoteSysNoticeService +import org.slf4j.Logger +import org.slf4j.LoggerFactory +import org.springframework.cloud.openfeign.FallbackFactory +import org.springframework.stereotype.Component + +@Component +open class RemoteSysNoticeFallbackFactory : FallbackFactory { + companion object { + var log: Logger = LoggerFactory.getLogger(RemoteSysNoticeFallbackFactory::class.java) + } + + override fun create(throwable: Throwable): RemoteSysNoticeService { + log.error("公告服务调用失败:{}", throwable.message) + return object : RemoteSysNoticeService { + override fun getById_Inner(noticeId: Long?, source: String?): R { + return R.fail("获取公告失败") + } + } + } +} \ No newline at end of file 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 new file mode 100644 index 000000000..f2f970211 --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/inner/InnerRemoteSysNoticeService.kt @@ -0,0 +1,21 @@ +package com.ruoyi.system.api.inner + +import com.ruoyi.common.core.constant.SecurityConstants +import com.ruoyi.common.core.domain.R +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.RequestHeader + +interface InnerRemoteSysNoticeService { + /** + * 根据公告ID查询公告信息 + * @param noticeId 公告ID + * @return 公告信息 + */ + @GetMapping("/inner/notice/detail/{noticeId}") + fun getById_Inner( + @PathVariable("noticeId") noticeId: Long?, @RequestHeader( + SecurityConstants.FROM_SOURCE + ) source: String? + ): R? +} \ No newline at end of file diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index c2aa296da..23a332037 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index a8a51737c..9c0781634 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index cbe1f6f59..958558fc8 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index b023a9ec8..6ab1734dd 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index 10e97265c..534c531a7 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index ca13426f6..eab0c9b81 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index 28c31968d..b950f7bb9 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index bf70f84a9..6cb09aa4e 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index f0339ee07..1d8b0201e 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml index bad15f8c5..64eded7e9 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index 7541d31eb..f0cf4cfab 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index ef945e26c..3773e678d 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 275cbed75..5151f9277 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index a7198c69e..efabfaf29 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index c82ccdf00..6e8b5bfe7 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index a23fb06b4..379312815 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 118a9c9f4..2371c3e80 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 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 new file mode 100644 index 000000000..5f6026f47 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysNoticeController.kt @@ -0,0 +1,31 @@ +package com.ruoyi.system.controller.inner + +import com.ruoyi.common.core.domain.R +import com.ruoyi.common.core.web.controller.BaseController +import com.ruoyi.common.security.annotation.InnerAuth +import com.ruoyi.system.domain.SysNotice +import com.ruoyi.system.service.ISysNoticeService +import org.springframework.beans.factory.annotation.Autowired +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 + +/** + * 内部调用公告信息 + */ +@RestController +@RequestMapping("/inner/notice") +open class InnerSysNoticeController : BaseController() { + @Autowired + open lateinit var noticeService: ISysNoticeService + + /** + * 根据ID获取公告信息 + */ + @InnerAuth + @GetMapping("/detail/{noticeId}") + fun infoById(@PathVariable("noticeId") noticeId: Long): R { + return R.ok(noticeService.selectNoticeById(noticeId)) + } +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 1b689b46b..383178604 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -116,7 +116,7 @@ 更新日志 - +
  1. 使用SpringDoc代替Swagger
  2. 菜单管理新增路由名称
    3. @@ -917,7 +917,7 @@ export default { data() { return { // 版本号 - version: "3.6.5.0.4", + version: "3.6.5.0.5", }; }, methods: { diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index fa67f51b1..8f23059dd 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -36,7 +36,7 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://localhost:8080`, + target: `https://api.zkjiadi.cc`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '' diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index 57bcd63ed..59ce33cf9 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.4 + 3.6.5.0.5 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 1fa7071e5..31fee3911 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-visual - 3.6.5.0.4 + 3.6.5.0.5 4.0.0