[feat] 新增公告的对外开放接口

README.md

@@ -1,11 +1,11 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-b99b286755aef70355a7084753f89cdb7c9.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.5.0.4</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.5.0.5</h1>
 <h4 align="center">基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构</h4>
 <p align="center">
 	<a href="https://gitee.com/y_project/RuoYi-Cloud/stargazers"><img src="https://gitee.com/y_project/RuoYi-Cloud/badge/star.svg?theme=dark"></a>
-	<a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.5.0.4-brightgreen.svg"></a>
+	<a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.5.0.5-brightgreen.svg"></a>
 	<a href="https://gitee.com/y_project/RuoYi-Cloud/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
 </p>
 

pom.xml

@@ -6,14 +6,14 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>3.6.5.0.4</version>
+    <version>3.6.5.0.5</version>
 
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依微服务系统</description>
 
     <properties>
-        <ruoyi.version>3.6.5.0.4</ruoyi.version>
+        <ruoyi.version>3.6.5.0.5</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>

ruoyi-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-api/ruoyi-api-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-api</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

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 {
+}

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<RemoteSysNoticeService> {
+    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<Any> {
+                return R.fail("获取公告失败")
+            }
+        }
+    }
+}

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<Any>?
+}

ruoyi-auth/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-datascope/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-datasource/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-redis/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-seata/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-security/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-sensitive/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-swagger/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-gateway/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-file/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-gen/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-job/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	

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<SysNotice> {
+        return R.ok(noticeService.selectNoticeById(noticeId))
+    }
+}

ruoyi-ui/src/views/index.vue

@@ -116,7 +116,7 @@
             <span>更新日志</span>
           </div>
           <el-collapse accordion>
-            <el-collapse-item title="v3.6.5.0.4 - 2024-11-13">
+            <el-collapse-item title="v3.6.5.0.5 - 2024-11-13">
               <ol>
                 <li>使用SpringDoc代替Swagger</li>
                 <li>菜单管理新增路由名称</li>
@@ -917,7 +917,7 @@ export default {
   data() {
     return {
       // 版本号
-      version: "3.6.5.0.4",
+      version: "3.6.5.0.5",
     };
   },
   methods: {

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]: ''

ruoyi-visual/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-visual/ruoyi-monitor/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-visual</artifactId>
-        <version>3.6.5.0.4</version>
+        <version>3.6.5.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>