Merge branch 'master' into dev/1078-newUI

# Conflicts:
#	src/main/resources/application.yml

pom.xml

@@ -187,7 +187,6 @@
             <version>1.4.6</version>
         </dependency>
 
-        <!--在线文档 -->
         <!--在线文档 -->
         <dependency>
             <groupId>org.springdoc</groupId>
@@ -200,13 +199,6 @@
             <version>1.6.10</version>
         </dependency>
 
-		<!--在线文档 -->
-		<dependency>
-			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-ui</artifactId>
-			<version>1.6.10</version>
-		</dependency>
-
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-springdoc-ui</artifactId>
@@ -402,6 +394,7 @@
                 <version>2.7.2</version>
                 <configuration>
                     <includeSystemScope>true</includeSystemScope>
+                    <executable>true</executable>
                 </configuration>
             </plugin>
 
@@ -452,6 +445,7 @@
                         <exclude>**/application.yml</exclude>
                         <exclude>**/application-*.yml</exclude>
                         <exclude>**/local.jks</exclude>
+                        <exclude>**/install.sh</exclude>
                     </excludes>
                 </configuration>
             </plugin>
@@ -471,6 +465,7 @@
                                     <includes>
                                         <include>application.yml</include>
                                         <include>application-*.yml</include>
+                                        <include>install.sh</include>
                                     </includes>
                                 </resource>
                             </resources>