From 5e9a139f9d8b796ec8f519f0beefbd25ca51a394 Mon Sep 17 00:00:00 2001
From: msgroup <dev@mingsoft.net>
Date: Sun, 4 Feb 2024 15:46:15 +0800
Subject: [PATCH] =?UTF-8?q?up=EF=BC=9A5.3.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mingsoft <killfen@126.com>
---
 assembly.xml |  7 +++++++
 pom.xml      | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/assembly.xml b/assembly.xml
index e0f354db..f8b37b9b 100644
--- a/assembly.xml
+++ b/assembly.xml
@@ -38,6 +38,13 @@
                 <include>*/**</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>src/main/webapp/upload</directory>
+            <outputDirectory>${file.separator}upload</outputDirectory>
+            <includes>
+                <include>*/**</include>
+            </includes>
+        </fileSet>
         <fileSet>
             <directory>src/main/webapp/WEB-INF</directory>
             <outputDirectory>${file.separator}WEB-INF</outputDirectory>
diff --git a/pom.xml b/pom.xml
index 75421afd..acd60046 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.7</version>
+        <version>2.7.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.mingsoft</groupId>
     <artifactId>ms-mcms</artifactId>
-    <version>5.3.5</version>
+    <version>5.3.6</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <!-- 打包war包，注意不启用(resources》resource》excludes的配置并注释掉maven-assembly-plugin 插件配置 -->
     <!--<packaging>war</packaging>-->
@@ -44,24 +44,24 @@
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-base</artifactId>
-            <version>2.1.25</version>
+            <version>2.1.26</version>
         </dependency>
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-basic</artifactId>
-            <version>2.1.25</version>
+            <version>2.1.26</version>
         </dependency>
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-mdiy</artifactId>
-            <version>2.1.25</version>
+            <version>2.1.26</version>
         </dependency>
 
         <!--store入口依赖（源码不开发），如果不需要MStore可以直接去掉依赖-->
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>store-client</artifactId>
-            <version>2.1.25</version>
+            <version>2.1.26</version>
         </dependency>
         <dependency>
             <groupId>com.github.oshi</groupId>