From 17010f4deb75215700bf44620fc7a60503665bdb Mon Sep 17 00:00:00 2001
From: dataprince <dataprince@163.com>
Date: Sat, 26 Aug 2023 10:43:29 +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.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                      | 6 +++---
 pom.xml                                        | 2 +-
 ruoyi-admin/src/main/resources/application.yml | 2 +-
 ruoyi-common/ruoyi-common-bom/pom.xml          | 2 +-
 ruoyi-ui/package.json                          | 2 +-
 ruoyi-ui/src/views/index.vue                   | 7 +++++++
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index c453e0a..0baa507 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.5</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Ruoyi-Flex V4.1.6</h1>
 <h4 align="center">Ruoyi-Flex是基于Spring Boot V3平台 前后端分离的Java快速开发框架</h4>
 
 
 ## 平台简介
 
-Ruoyi-Flex是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。基于RuoYi-Vue、RuoYi-Vue-Plus，集成MyBatis-Flex、JDK17、SpringBootV3、Lombok、Sa-Token、Hutool、SpringBoot Admin等优秀开源软件，
+Ruoyi-Flex是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。基于RuoYi-Vue、RuoYi-Vue-Plus，集成MyBatis-Flex、JDK17、SpringBootV3、Lombok、Sa-Token、Hutool、SpringBoot Admin、PowerJob等优秀开源软件，
 
 * 前端采用Vue、Element UI。
-* 后端采用Spring Boot V3、Sa-Token、Redis & Jwt、MyBatis-Flex。
+* 后端采用Spring Boot V3、Sa-Token、Redis & Jwt、MyBatis-Flex、PowerJob。
 * 权限认证使用Jwt，支持多终端认证系统。
 * 支持加载动态权限菜单，多方式轻松权限控制。
 * 高效率开发，使用代码生成器可以一键生成前后端代码。
diff --git a/pom.xml b/pom.xml
index 7327a3b..274851d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <description>Ruoyi-Flex管理系统</description>
 
     <properties>
-        <revision>4.1.6-SNAPSHOT</revision>
+        <revision>4.1.6</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b72f805..94f84d1 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.5
+  version: 4.1.6
   # 版权年份
   copyrightYear: 2023
   # 实例演示开关
diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml
index 62d24b3..43c6670 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.6-SNAPSHOT</revision>
+        <revision>4.1.6</revision>
     </properties>
 
     <dependencyManagement>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 6f6d099..90b7772 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "RuoYi-Flex",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "RuoYi-Flex管理系统",
   "author": "数据小王子",
   "license": "MIT",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 1250d12..c4873f1 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -136,6 +136,13 @@
           </div>
           <el-collapse accordion>
 
+            <el-collapse-item title="v4.1.6 - 2023-08-26">
+              <ol>
+                <li>移除ruoyi-quartz模块</li>
+                <li>整合PowerJob分布式任务调度与计算框架</li>
+                <li>PowerJob接入SpringBoot Admin监控</li>
+              </ol>
+            </el-collapse-item>
             <el-collapse-item title="v4.1.5 - 2023-08-17">
               <ol>
                 <li>删除原服务监控代码文件</li>