From 53a07d23298d163dd6d8c4757e7d5e6ad01613d3 Mon Sep 17 00:00:00 2001
From: dataprince <dataprince@163.com>
Date: Wed, 16 Aug 2023 22:29:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=91=E5=B8=83=E6=96=B0=E7=89=88=EF=BC=9AV4.1.14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 11 +++++-----
 pom.xml                                       | 15 ++++++++++++-
 .../src/main/resources/application.yml        | 22 ++++++++++++++++++-
 ruoyi-common/ruoyi-common-bom/pom.xml         |  2 +-
 ruoyi-ui/package.json                         |  2 +-
 5 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 9aa5eb0..939db98 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Ruoyi-Flex V4.1.3</h1>
-<h4 align="center">Ruoyi-Flex是基于RuoYi-Vue V3.8.6 前后端分离的Java快速开发框架</h4>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Ruoyi-Flex V4.1.4</h1>
+<h4 align="center">Ruoyi-Flex是基于Spring Boot V3平台 前后端分离的Java快速开发框架</h4>
 
 
 ## 平台简介
 
-Ruoyi-Flex是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。基于RuoYi-Vue V3.8.6，集成MyBatis-Flex、JDK17、SpringBootV3、lombok、Sa-Token、PowerJob、Hutool、OSS、ureport-keep、Flowable、vue3、TypeScript等优秀开源软件，
+Ruoyi-Flex是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。基于RuoYi-Vue、RuoYi-Vue-Plus，集成MyBatis-Flex、JDK17、SpringBootV3、Lombok、Sa-Token、Hutool等优秀开源软件，
 
 * 前端采用Vue、Element UI。
-* 后端采用Spring Boot V3、Spring Security、Redis & Jwt、MyBatis-Flex。
+* 后端采用Spring Boot V3、Sa-Token、Redis & Jwt、MyBatis-Flex。
 * 权限认证使用Jwt，支持多终端认证系统。
 * 支持加载动态权限菜单，多方式轻松权限控制。
 * 高效率开发，使用代码生成器可以一键生成前后端代码。
@@ -75,4 +75,5 @@ QQ群： 100956531。
 
 ## 特别鸣谢
 - [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue)
-- [MyBatis-Flex](https://gitee.com/mybatis-flex/mybatis-flex) 
\ No newline at end of file
+- [MyBatis-Flex](https://gitee.com/mybatis-flex/mybatis-flex) 
+- [RuoYi-Vue-Plus](https://gitee.com/dromara/RuoYi-Vue-Plus)
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7594b36..ee0d724 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <description>Ruoyi-Flex管理系统</description>
 
     <properties>
-        <revision>4.1.4-SNAPSHOT</revision>
+        <revision>4.1.4</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
@@ -48,6 +48,7 @@
         <redisson.version>3.23.2</redisson.version>
         <lock4j.version>2.2.4</lock4j.version>
         <alibaba-ttl.version>2.14.3</alibaba-ttl.version>
+        <spring-boot-admin.version>3.1.4</spring-boot-admin.version>
 
         <!-- 插件版本 -->
         <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
@@ -330,6 +331,18 @@
                 <version>${alibaba-ttl.version}</version>
             </dependency>
 
+            <!-- spring-boot-admin监控-->
+            <dependency>
+                <groupId>de.codecentric</groupId>
+                <artifactId>spring-boot-admin-starter-server</artifactId>
+                <version>${spring-boot-admin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>de.codecentric</groupId>
+                <artifactId>spring-boot-admin-starter-client</artifactId>
+                <version>${spring-boot-admin.version}</version>
+            </dependency>
+
             <!-- 定时任务-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index cf0206c..cf1904b 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,7 +3,7 @@ ruoyi:
   # 名称
   name: RuoYi-Flex
   # 版本
-  version: 4.1.4-SNAPSHOT
+  version: 4.1.4
   # 版权年份
   copyrightYear: 2023
   # 实例演示开关
@@ -246,3 +246,23 @@ tenant:
     - sys_user_post
     - sys_user_role
     - sys_client
+
+--- # Actuator 监控端点的配置项
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: ALWAYS
+    logfile:
+      external-file: ./logs/sys-console.log
+
+--- # websocket
+websocket:
+  enabled: true
+  # 路径
+  path: /resource/websocket
+  # 设置访问源地址
+  allowedOrigins: '*'
diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml
index a8caf98..16586e6 100644
--- a/ruoyi-common/ruoyi-common-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-bom/pom.xml
@@ -14,7 +14,7 @@
     </description>
 
     <properties>
-        <revision>4.1.4-SNAPSHOT</revision>
+        <revision>4.1.4</revision>
     </properties>
 
     <dependencyManagement>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 0926cae..e2c9fc4 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "RuoYi-Flex",
-  "version": "4.1.3",
+  "version": "4.1.4",
   "description": "RuoYi-Flex管理系统",
   "author": "数据小王子",
   "license": "MIT",