From 6235eaf1ec66255731d32b57ae06d81b37593030 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Thu, 2 Jan 2025 22:17:00 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=EF=BC=8C=E5=A4=84=E7=90=86=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yanzhu-auth/src/main/resources/bootstrap.yml  | 27 ------------
 .../src/main/resources/bootstrap.yml          | 42 -------------------
 .../src/main/resources/bootstrap.yml          | 27 ------------
 .../src/main/resources/bootstrap.yml          | 31 --------------
 .../src/main/resources/bootstrap.yml          | 27 ------------
 5 files changed, 154 deletions(-)
 delete mode 100644 yanzhu-auth/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-gateway/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml

diff --git a/yanzhu-auth/src/main/resources/bootstrap.yml b/yanzhu-auth/src/main/resources/bootstrap.yml
deleted file mode 100644
index d54c82d2..00000000
--- a/yanzhu-auth/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server: 
-  port: 9200
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-auth
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-gateway/src/main/resources/bootstrap.yml b/yanzhu-gateway/src/main/resources/bootstrap.yml
deleted file mode 100644
index 884c5efc..00000000
--- a/yanzhu-gateway/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Tomcat
-server:
-  port: 8080
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-gateway
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-    sentinel:
-      # 取消控制台懒加载
-      eager: true
-      transport:
-        # 控制台地址
-        dashboard: 62.234.3.186:8718
-      # nacos配置持久化
-      datasource:
-        ds1:
-          nacos:
-            server-addr: @discovery.server-addr@
-            dataId: sentinel-ruoyi-gateway
-            groupId: DEFAULT_GROUP
-            data-type: json
-            rule-type: gw-flow
diff --git a/yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml
deleted file mode 100644
index 284fda00..00000000
--- a/yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9300
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-file
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml
deleted file mode 100644
index 629215d5..00000000
--- a/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Tomcat
-server:
-  port: 9208
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-manage
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
-logging:
-  level:
-    com.ycx.manage.mapper: DEBUG
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml
deleted file mode 100644
index efe975fc..00000000
--- a/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9201
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-system
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

From 044fd616b18bb6601e31d10522998f8f08b4c7e8 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Thu, 2 Jan 2025 22:23:31 +0800
Subject: [PATCH 2/7] Revert "Auxiliary commit to revert individual files from
 6235eaf1ec66255731d32b57ae06d81b37593030"

This reverts commit 5c9cc4c94d570cce4146f82df5f847458d3b7ca6.
---
 yanzhu-auth/src/main/resources/bootstrap.yml  | 27 ++++++++++++
 .../src/main/resources/bootstrap.yml          | 42 +++++++++++++++++++
 .../src/main/resources/bootstrap.yml          | 27 ++++++++++++
 .../src/main/resources/bootstrap.yml          | 31 ++++++++++++++
 .../src/main/resources/bootstrap.yml          | 27 ++++++++++++
 5 files changed, 154 insertions(+)
 create mode 100644 yanzhu-auth/src/main/resources/bootstrap.yml
 create mode 100644 yanzhu-gateway/src/main/resources/bootstrap.yml
 create mode 100644 yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml
 create mode 100644 yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml
 create mode 100644 yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml

diff --git a/yanzhu-auth/src/main/resources/bootstrap.yml b/yanzhu-auth/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000..d54c82d2
--- /dev/null
+++ b/yanzhu-auth/src/main/resources/bootstrap.yml
@@ -0,0 +1,27 @@
+# Tomcat
+server: 
+  port: 9200
+
+# Spring
+spring: 
+  application:
+    # 应用名称
+    name: yanzhu-auth
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @discovery.server-addr@
+        # 服务分组
+        group: lijun
+      config:
+        # 配置中心地址
+        server-addr: @discovery.server-addr@
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-gateway/src/main/resources/bootstrap.yml b/yanzhu-gateway/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000..884c5efc
--- /dev/null
+++ b/yanzhu-gateway/src/main/resources/bootstrap.yml
@@ -0,0 +1,42 @@
+# Tomcat
+server:
+  port: 8080
+
+# Spring
+spring: 
+  application:
+    # 应用名称
+    name: yanzhu-gateway
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @discovery.server-addr@
+        # 服务分组
+        group: lijun
+      config:
+        # 配置中心地址
+        server-addr: @discovery.server-addr@
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
+      transport:
+        # 控制台地址
+        dashboard: 62.234.3.186:8718
+      # nacos配置持久化
+      datasource:
+        ds1:
+          nacos:
+            server-addr: @discovery.server-addr@
+            dataId: sentinel-ruoyi-gateway
+            groupId: DEFAULT_GROUP
+            data-type: json
+            rule-type: gw-flow
diff --git a/yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000..284fda00
--- /dev/null
+++ b/yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml
@@ -0,0 +1,27 @@
+# Tomcat
+server:
+  port: 9300
+
+# Spring
+spring: 
+  application:
+    # 应用名称
+    name: yanzhu-file
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @discovery.server-addr@
+        # 服务分组
+        group: lijun
+      config:
+        # 配置中心地址
+        server-addr: @discovery.server-addr@
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000..629215d5
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml
@@ -0,0 +1,31 @@
+# Tomcat
+server:
+  port: 9208
+
+# Spring
+spring: 
+  application:
+    # 应用名称
+    name: yanzhu-manage
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @discovery.server-addr@
+        # 服务分组
+        group: lijun
+      config:
+        # 配置中心地址
+        server-addr: @discovery.server-addr@
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+logging:
+  level:
+    com.ycx.manage.mapper: DEBUG
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000..efe975fc
--- /dev/null
+++ b/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml
@@ -0,0 +1,27 @@
+# Tomcat
+server:
+  port: 9201
+
+# Spring
+spring: 
+  application:
+    # 应用名称
+    name: yanzhu-system
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @discovery.server-addr@
+        # 服务分组
+        group: lijun
+      config:
+        # 配置中心地址
+        server-addr: @discovery.server-addr@
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

From 4a39d7507b96bd04f8a6b43ce30bf9082171ddaf Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Thu, 2 Jan 2025 22:30:19 +0800
Subject: [PATCH 3/7] update .gitignore

---
 pom.xml                                       | 412 ------------------
 yanzhu-api/pom.xml                            |  22 -
 yanzhu-api/yanzhu-api-system/pom.xml          |  28 --
 yanzhu-auth/pom.xml                           | 154 -------
 yanzhu-auth/src/main/resources/bootstrap.yml  |  27 --
 yanzhu-common/pom.xml                         |  29 --
 yanzhu-common/yanzhu-common-core/pom.xml      | 147 -------
 yanzhu-common/yanzhu-common-datascope/pom.xml |  27 --
 .../yanzhu-common-datasource/pom.xml          |  35 --
 yanzhu-common/yanzhu-common-log/pom.xml       |  27 --
 yanzhu-common/yanzhu-common-mapper/pom.xml    |  33 --
 .../mapper/manage/ProMilestoneMapper.xml      |   8 +-
 yanzhu-common/yanzhu-common-redis/pom.xml     |  33 --
 yanzhu-common/yanzhu-common-security/pom.xml  |  39 --
 yanzhu-common/yanzhu-common-swagger/pom.xml   |  34 --
 yanzhu-gateway/pom.xml                        | 190 --------
 .../src/main/resources/bootstrap.yml          |  42 --
 yanzhu-modules/pom.xml                        |  28 --
 yanzhu-modules/yanzhu-file/pom.xml            | 168 -------
 .../yanzhu/file/utils/FileUploadUtils.java    |   5 +-
 .../src/main/resources/bootstrap.yml          |  27 --
 yanzhu-modules/yanzhu-flowable/pom.xml        | 213 ---------
 .../src/main/resources/bootstrap.yml          |  27 --
 yanzhu-modules/yanzhu-gen/pom.xml             | 137 ------
 .../src/main/resources/bootstrap.yml          |  27 --
 yanzhu-modules/yanzhu-job/pom.xml             | 143 ------
 .../src/main/resources/bootstrap.yml          |  27 --
 yanzhu-modules/yanzhu-manage/pom.xml          | 279 ------------
 .../src/main/resources/bootstrap.yml          |  31 --
 yanzhu-modules/yanzhu-system/pom.xml          | 193 --------
 .../src/main/resources/bootstrap.yml          |  27 --
 yanzhu-modules/yanzhu-wechat/pom.xml          | 154 -------
 .../src/main/resources/bootstrap.yml          |  27 --
 yanzhu-monitor/pom.xml                        | 119 -----
 .../src/main/resources/bootstrap.yml          |  27 --
 yanzhu-rocketmq/pom.xml                       | 144 ------
 .../src/main/resources/bootstrap.yml          |  38 --
 .../src/views/manage/proProjectInfo/index.vue |   2 +
 38 files changed, 10 insertions(+), 3120 deletions(-)
 delete mode 100644 pom.xml
 delete mode 100644 yanzhu-api/pom.xml
 delete mode 100644 yanzhu-api/yanzhu-api-system/pom.xml
 delete mode 100644 yanzhu-auth/pom.xml
 delete mode 100644 yanzhu-auth/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-common/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-core/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-datascope/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-datasource/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-log/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-mapper/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-redis/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-security/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-swagger/pom.xml
 delete mode 100644 yanzhu-gateway/pom.xml
 delete mode 100644 yanzhu-gateway/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-file/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/yanzhu-flowable/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-flowable/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/yanzhu-gen/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-gen/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/yanzhu-job/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-job/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/yanzhu-manage/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/yanzhu-system/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/yanzhu-wechat/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-wechat/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-monitor/pom.xml
 delete mode 100644 yanzhu-monitor/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-rocketmq/pom.xml
 delete mode 100644 yanzhu-rocketmq/src/main/resources/bootstrap.yml

diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 0ea61c65..00000000
--- a/pom.xml
+++ /dev/null
@@ -1,412 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.yanzhu</groupId>
-    <artifactId>yanzhu</artifactId>
-    <version>3.6.2</version>
-
-    <name>yanzhu</name>
-    <url>http://www.sxyanzhu.com</url>
-    <description>研筑微服务系统</description>
-
-    <properties>
-        <yanzhu.version>3.6.2</yanzhu.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <spring-boot.version>2.7.7</spring-boot.version>
-        <spring-cloud.version>2021.0.5</spring-cloud.version>
-        <spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
-        <spring-boot-admin.version>2.7.10</spring-boot-admin.version>
-        <swagger.fox.version>3.0.0</swagger.fox.version>
-        <swagger.core.version>1.6.2</swagger.core.version>
-        <tobato.version>1.27.2</tobato.version>
-        <kaptcha.version>2.3.3</kaptcha.version>
-        <pagehelper.boot.version>1.4.6</pagehelper.boot.version>
-        <druid.version>1.2.16</druid.version>
-        <dynamic-ds.version>3.5.2</dynamic-ds.version>
-        <commons.io.version>2.16.1</commons.io.version>
-        <org.projectlombok>1.18.16</org.projectlombok>
-        <velocity.version>2.3</velocity.version>
-        <fastjson.version>2.0.23</fastjson.version>
-        <jjwt.version>0.9.1</jjwt.version>
-        <minio.version>8.2.2</minio.version>
-        <poi.version>5.3.0</poi.version>
-        <pinyin4j.version>2.5.1</pinyin4j.version>
-        <weixin.mp.version>4.0.6.B</weixin.mp.version>
-        <weixin.miniapp.version>4.0.6.B</weixin.miniapp.version>
-        <transmittable-thread-local.version>2.14.2</transmittable-thread-local.version>
-        <hutool.version>5.8.20</hutool.version>
-        <aspectjweaver.version>1.9.1</aspectjweaver.version>
-        <lowagie.version>2.1.7</lowagie.version>
-        <poi-tl.version>1.12.0</poi-tl.version>
-        <lowagie.iTextAsian.version>1.0</lowagie.iTextAsian.version>
-        <itextpdf.version>5.5.13</itextpdf.version>
-        <aspose.words.version>15.8.0</aspose.words.version>
-    </properties>
-
-    <!-- 依赖声明 -->
-    <dependencyManagement>
-        <dependencies>
-
-            <!-- SpringCloud 微服务 -->
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- SpringCloud Alibaba 微服务 -->
-            <dependency>
-                <groupId>com.alibaba.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>${spring-cloud-alibaba.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- SpringBoot 依赖配置 -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- FastDFS 分布式文件系统 -->
-            <dependency>
-                <groupId>com.github.tobato</groupId>
-                <artifactId>fastdfs-client</artifactId>
-                <version>${tobato.version}</version>
-            </dependency>
-
-            <!-- Swagger 依赖配置 -->
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-models</artifactId>
-                <version>${swagger.core.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>${swagger.core.version}</version>
-            </dependency>
-
-            <!-- 验证码 -->
-            <dependency>
-                <groupId>pro.fessional</groupId>
-                <artifactId>kaptcha</artifactId>
-                <version>${kaptcha.version}</version>
-            </dependency>
-
-            <!-- pagehelper 分页插件 -->
-            <dependency>
-                <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper-spring-boot-starter</artifactId>
-                <version>${pagehelper.boot.version}</version>
-            </dependency>
-
-            <!-- io常用工具类 -->
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>${commons.io.version}</version>
-            </dependency>
-
-            <!-- excel工具 -->
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi-ooxml</artifactId>
-                <version>${poi.version}</version>
-            </dependency>
-
-            <!-- 生成pdf-->
-            <dependency>
-                <groupId>com.lowagie</groupId>
-                <artifactId>itext</artifactId>
-                <version>${lowagie.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.lowagie</groupId>
-                <artifactId>itext-rtf</artifactId>
-                <version>${lowagie.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.lowagie</groupId>
-                <artifactId>iTextAsian</artifactId>
-                <version>${lowagie.iTextAsian.version}</version>
-            </dependency>
-
-            <!--根据word模板生成word文件-->
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi</artifactId>
-                <version>${poi.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi-ooxml-schemas</artifactId>
-                <version>4.1.2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.deepoove</groupId>
-                <artifactId>poi-tl</artifactId>
-                <version>${poi-tl.version}</version>
-            </dependency>
-
-            <!--word文件转化为PDF文件-->
-            <dependency>
-                <groupId>org.aspectj</groupId>
-                <artifactId>aspectjweaver</artifactId>
-                <version>${aspectjweaver.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.aspose</groupId>
-                <artifactId>aspose-words</artifactId>
-                <version>${aspose.words.version}</version>
-            </dependency>
-
-            <!-- 代码生成使用模板 -->
-            <dependency>
-                <groupId>org.apache.velocity</groupId>
-                <artifactId>velocity-engine-core</artifactId>
-                <version>${velocity.version}</version>
-            </dependency>
-
-            <!-- JSON 解析器和生成器 -->
-            <dependency>
-                <groupId>com.alibaba.fastjson2</groupId>
-                <artifactId>fastjson2</artifactId>
-                <version>${fastjson.version}</version>
-            </dependency>
-
-            <!-- JWT -->
-            <dependency>
-                <groupId>io.jsonwebtoken</groupId>
-                <artifactId>jjwt</artifactId>
-                <version>${jjwt.version}</version>
-            </dependency>
-
-            <!-- 线程传递值 -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>transmittable-thread-local</artifactId>
-                <version>${transmittable-thread-local.version}</version>
-            </dependency>
-
-            <!-- Belerweb Pinyin4j -->
-            <dependency>
-                <groupId>com.belerweb</groupId>
-                <artifactId>pinyin4j</artifactId>
-                <version>${pinyin4j.version}</version>
-            </dependency>
-
-            <!-- 微信公众号 -->
-            <dependency>
-                <groupId>com.github.binarywang</groupId>
-                <artifactId>weixin-java-mp</artifactId>
-                <version>${weixin.mp.version}</version>
-            </dependency>
-
-            <!-- 微信小程序 -->
-            <dependency>
-                <groupId>com.github.binarywang</groupId>
-                <artifactId>weixin-java-miniapp</artifactId>
-                <version>${weixin.miniapp.version}</version>
-            </dependency>
-
-            <!-- 核心模块 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-common-core</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <!-- 接口模块 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-common-swagger</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <!-- 安全模块 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-common-security</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <!-- 权限范围 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-common-datascope</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <!-- 多数据源 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-common-datasource</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <!-- 日志记录 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-common-log</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <!-- 缓存服务 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-common-redis</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <!-- 系统接口 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-api-system</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>net.sf.mpxj</groupId>
-                <artifactId>mpxj</artifactId>
-                <version>13.0.2</version>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
-    <modules>
-        <module>yanzhu-api</module>
-        <module>yanzhu-common</module>
-        <module>yanzhu-auth</module>
-        <module>yanzhu-gateway</module>
-        <module>yanzhu-modules</module>
-        <module>yanzhu-monitor</module>
-        <module>yanzhu-rocketmq</module>
-    </modules>
-    <packaging>pom</packaging>
-
-    <dependencies>
-        <!-- bootstrap 启动器 -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-bootstrap</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-maven-plugin</artifactId>
-                    <version>${spring-boot.version}</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>repackage</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>${java.version}</source>
-                        <target>${java.version}</target>
-                        <encoding>${project.build.sourceEncoding}</encoding>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>public</id>
-            <name>aliyun nexus</name>
-            <url>https://maven.aliyun.com/repository/public</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>public</id>
-            <name>aliyun nexus</name>
-            <url>https://maven.aliyun.com/repository/public</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <!-- 多环境配置 -->
-    <profiles>
-        <profile>
-            <id>本地服务器环境</id>
-            <!-- 环境标识，需要与配置文件的名称相对应 -->
-            <properties>
-                <profiles.active>本地服务器环境</profiles.active>
-                <discovery.server-addr>62.234.3.186:8848</discovery.server-addr>
-            </properties>
-
-        </profile>
-        <profile>
-            <id>测试服务器环境</id>
-            <properties>
-                <profiles.active>测试服务器环境</profiles.active>
-                <discovery.server-addr>62.234.3.186:8848</discovery.server-addr>
-            </properties>
-            <!-- 默认环境 -->
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-        <profile>
-            <id>线上服务器环境</id>
-            <properties>
-                <profiles.active>线上服务器环境</profiles.active>
-                <discovery.server-addr>0.0.0.0:8848</discovery.server-addr>
-            </properties>
-        </profile>
-        <!-- docker环境打包 -->
-        <profile>
-            <id>docker测试环境1</id>
-            <properties>
-                <profiles.active>docker测试环境1</profiles.active>
-                <configuration.docker-Host>http://0.0.0.0:5001</configuration.docker-Host>
-            </properties>
-        </profile>
-        <profile>
-            <id>docker测试环境2</id>
-            <properties>
-                <profiles.active>docker测试环境2</profiles.active>
-                <configuration.docker-Host>http://0.0.0.0:5001</configuration.docker-Host>
-            </properties>
-        </profile>
-    </profiles>
-
-</project>
\ No newline at end of file
diff --git a/yanzhu-api/pom.xml b/yanzhu-api/pom.xml
deleted file mode 100644
index 47ec57cf..00000000
--- a/yanzhu-api/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <modules>
-        <module>yanzhu-api-system</module>
-    </modules>
-
-    <artifactId>yanzhu-api</artifactId>
-    <packaging>pom</packaging>
-
-    <description>
-        yanzhu-api系统接口
-    </description>
-
-</project>
diff --git a/yanzhu-api/yanzhu-api-system/pom.xml b/yanzhu-api/yanzhu-api-system/pom.xml
deleted file mode 100644
index be9fb913..00000000
--- a/yanzhu-api/yanzhu-api-system/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-api</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-api-system</artifactId>
-
-    <description>
-        yanzhu-api-system系统接口模块
-    </description>
-
-    <dependencies>
-		
-        <!-- YanZhu Common Core-->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-core</artifactId>
-        </dependency>
-        
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/yanzhu-auth/pom.xml b/yanzhu-auth/pom.xml
deleted file mode 100644
index be53cfe8..00000000
--- a/yanzhu-auth/pom.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-auth</artifactId>
-	
-    <description>
-        yanzhu-auth认证授权中心
-    </description>
-    
-    <dependencies>
-        
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-		
-        <!-- SpringBoot Web -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-		
-        <!-- YanZhu Common Security-->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-security</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-<!--    <build>-->
-<!--        <finalName>${project.artifactId}</finalName>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--            &lt;!&ndash; docker-maven-plugin插件(不带Dockerfile文件) &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>1.2.0</version>-->
-<!--                <configuration>-->
-<!--                    &lt;!&ndash;用于指定镜像名称&ndash;&gt;-->
-<!--                    <imageName>${project.build.finalName}</imageName>-->
-<!--                    <imageTags>latest</imageTags>-->
-<!--                    &lt;!&ndash;用于指定基础镜像，相当于Dockerfile中的FROM指令&ndash;&gt;-->
-<!--                    <baseImage>openjdk:latest</baseImage>-->
-<!--                    &lt;!&ndash;相当于Dockerfile的ENTRYPOINT指令&ndash;&gt;-->
-<!--                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>-->
-<!--                    &lt;!&ndash;是否跳过docker build&ndash;&gt;-->
-<!--                    <skipDockerBuild>true</skipDockerBuild>-->
-<!--                    <dockerHost>${configuration.docker-one-Host}</dockerHost>-->
-<!--                    <resources>-->
-<!--                        <resource>-->
-<!--                            <targetPath>/</targetPath>-->
-<!--                            &lt;!&ndash;用于指定需要复制的根目录，${project.build.directory}表示target目录&ndash;&gt;-->
-<!--                            <directory>${project.build.directory}</directory>-->
-<!--                            &lt;!&ndash;用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。&ndash;&gt;-->
-<!--                            <include>${project.build.finalName}.jar</include>-->
-<!--                        </resource>-->
-<!--                    </resources>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>build-image</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>build</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--        &lt;!&ndash;如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置&ndash;&gt;-->
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <filtering>true</filtering>-->
-<!--            </resource>-->
-<!--        </resources>-->
-<!--    </build>-->
-   
-</project>
diff --git a/yanzhu-auth/src/main/resources/bootstrap.yml b/yanzhu-auth/src/main/resources/bootstrap.yml
deleted file mode 100644
index d54c82d2..00000000
--- a/yanzhu-auth/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server: 
-  port: 9200
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-auth
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-common/pom.xml b/yanzhu-common/pom.xml
deleted file mode 100644
index 882033ed..00000000
--- a/yanzhu-common/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <modules>
-        <module>yanzhu-common-log</module>
-        <module>yanzhu-common-core</module>
-        <module>yanzhu-common-redis</module>
-        <module>yanzhu-common-swagger</module>
-        <module>yanzhu-common-security</module>
-        <module>yanzhu-common-datascope</module>
-        <module>yanzhu-common-datasource</module>
-        <module>yanzhu-common-mapper</module>
-    </modules>
-
-    <artifactId>yanzhu-common</artifactId>
-    <packaging>pom</packaging>
-
-    <description>
-        yanzhu-common通用模块
-    </description>
-
-</project>
diff --git a/yanzhu-common/yanzhu-common-core/pom.xml b/yanzhu-common/yanzhu-common-core/pom.xml
deleted file mode 100644
index 474002f4..00000000
--- a/yanzhu-common/yanzhu-common-core/pom.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-common-core</artifactId>
-    
-    <description>
-        yanzhu-common-core核心模块
-    </description>
-
-    <dependencies>
-
-        <!-- SpringCloud Openfeign -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Loadbalancer -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
-        </dependency>
-
-        <!-- Spring Context Support -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-        </dependency>
-
-        <!-- Spring Web -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-
-        <!-- Transmittable ThreadLocal -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>transmittable-thread-local</artifactId>
-        </dependency>
-
-        <!-- Pagehelper -->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- Hibernate Validator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
-        <!-- Jackson -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
-        <!-- Alibaba Fastjson -->
-        <dependency>
-            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson2</artifactId>
-        </dependency>
-
-        <!-- Jwt -->
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-        </dependency>
-
-        <!-- Jaxb -->
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-
-        <!-- Apache Lang3 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <!-- Commons Io -->
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-
-        <!-- excel工具 -->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-        </dependency>
-
-        <!-- Java Servlet -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
-
-        <!-- Swagger -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
-        <!-- Belerweb Pinyin4j -->
-        <dependency>
-            <groupId>com.belerweb</groupId>
-            <artifactId>pinyin4j</artifactId>
-        </dependency>
-
-        <!-- 微信公众号 -->
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-mp</artifactId>
-        </dependency>
-
-        <!-- 微信小程序 -->
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-miniapp</artifactId>
-        </dependency>
-
-        <!-- hutool核心 -->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-core</artifactId>
-            <version>${hutool.version}</version>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/yanzhu-common/yanzhu-common-datascope/pom.xml b/yanzhu-common/yanzhu-common-datascope/pom.xml
deleted file mode 100644
index a836d788..00000000
--- a/yanzhu-common/yanzhu-common-datascope/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-common-datascope</artifactId>
-	
-    <description>
-        yanzhu-common-datascope权限范围
-    </description>
-
-    <dependencies>
-		
-        <!-- YanZhu Common Security -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-security</artifactId>
-        </dependency>
-        
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-datasource/pom.xml b/yanzhu-common/yanzhu-common-datasource/pom.xml
deleted file mode 100644
index d8933f3d..00000000
--- a/yanzhu-common/yanzhu-common-datasource/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-common-datasource</artifactId>
-
-    <description>
-        yanzhu-common-datasource多数据源
-    </description>
-
-    <dependencies>
-
-        <!-- Druid -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>${druid.version}</version>
-        </dependency>
-
-        <!-- Dynamic DataSource -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>${dynamic-ds.version}</version>
-        </dependency>
-
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-log/pom.xml b/yanzhu-common/yanzhu-common-log/pom.xml
deleted file mode 100644
index ee55dd7c..00000000
--- a/yanzhu-common/yanzhu-common-log/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-common-log</artifactId>
-	
-    <description>
-        yanzhu-common-log日志记录
-    </description>
-
-    <dependencies>
-		
-        <!-- YanZhu Common Security -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-security</artifactId>
-        </dependency>
-        
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-mapper/pom.xml b/yanzhu-common/yanzhu-common-mapper/pom.xml
deleted file mode 100644
index 9ec699b0..00000000
--- a/yanzhu-common/yanzhu-common-mapper/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-common-mapper</artifactId>
-
-    <description>
-        yanzhu-common-mapper
-    </description>
-
-    <dependencies>
-
-        <!-- YanZhu Common Security -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml
index 92b918eb..f4512124 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml
@@ -103,10 +103,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="comid != null">comid = #{comid},</if>
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="nodeName != null">node_name = #{nodeName},</if>
-            <if test="scheduledStart != null">scheduled_start = #{scheduledStart},</if>
-            <if test="scheduledEnd != null">scheduled_end = #{scheduledEnd},</if>
-            <if test="actualStart != null">actual_start = #{actualStart},</if>
-            <if test="actualEnd != null">actual_end = #{actualEnd},</if>
+            <if test="scheduledStart != null or 1==1">scheduled_start = #{scheduledStart},</if>
+            <if test="scheduledEnd != null  or 1==1">scheduled_end = #{scheduledEnd},</if>
+            <if test="actualStart != null  or 1==1">actual_start = #{actualStart},</if>
+            <if test="actualEnd != null  or 1==1">actual_end = #{actualEnd},</if>
             <if test="days != null">days = #{days},</if>
             <if test="explainInfo != null">explain_info = #{explainInfo},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
diff --git a/yanzhu-common/yanzhu-common-redis/pom.xml b/yanzhu-common/yanzhu-common-redis/pom.xml
deleted file mode 100644
index 371bda26..00000000
--- a/yanzhu-common/yanzhu-common-redis/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-common-redis</artifactId>
-	
-    <description>
-        yanzhu-common-redis缓存服务
-    </description>
-
-    <dependencies>
-		
-        <!-- SpringBoot Boot Redis -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Core-->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-core</artifactId>
-        </dependency>
-        
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-security/pom.xml b/yanzhu-common/yanzhu-common-security/pom.xml
deleted file mode 100644
index ee89269e..00000000
--- a/yanzhu-common/yanzhu-common-security/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-common-security</artifactId>
-
-    <description>
-        yanzhu-common-security安全模块
-    </description>
-
-    <dependencies>
-
-        <!-- Spring Web -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-        </dependency>
-
-        <!-- YanZhu Api System -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-api-system</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Redis-->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-redis</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/yanzhu-common/yanzhu-common-swagger/pom.xml b/yanzhu-common/yanzhu-common-swagger/pom.xml
deleted file mode 100644
index b8aa9b90..00000000
--- a/yanzhu-common/yanzhu-common-swagger/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-common-swagger</artifactId>
-	
-    <description>
-        yanzhu-common-swagger系统接口
-    </description>
-
-	<dependencies>
-
-        <!-- SpringBoot Web -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!-- Swagger -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-
-	</dependencies>
-</project>
diff --git a/yanzhu-gateway/pom.xml b/yanzhu-gateway/pom.xml
deleted file mode 100644
index c9e9bbf2..00000000
--- a/yanzhu-gateway/pom.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-gateway</artifactId>
-
-    <description>
-        yanzhu-gateway网关模块
-    </description>
-
-    <dependencies>
-
-        <!-- SpringCloud Gateway -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-gateway</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel Gateway -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>
-        </dependency>
-
-        <!-- Sentinel Datasource Nacos -->
-        <dependency>
-            <groupId>com.alibaba.csp</groupId>
-            <artifactId>sentinel-datasource-nacos</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Loadbalancer -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-loadbalancer</artifactId>
-        </dependency>
-
-        <!--验证码 -->
-        <dependency>
-            <groupId>pro.fessional</groupId>
-            <artifactId>kaptcha</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Redis-->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-redis</artifactId>
-        </dependency>
-
-        <!-- Swagger -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-<!--    <build>-->
-<!--        <finalName>${project.artifactId}</finalName>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--            &lt;!&ndash; docker-maven-plugin插件(不带Dockerfile文件) &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>1.2.0</version>-->
-<!--                <configuration>-->
-<!--                    &lt;!&ndash;用于指定镜像名称&ndash;&gt;-->
-<!--                    <imageName>${project.build.finalName}</imageName>-->
-<!--                    <imageTags>latest</imageTags>-->
-<!--                    &lt;!&ndash;用于指定基础镜像，相当于Dockerfile中的FROM指令&ndash;&gt;-->
-<!--                    <baseImage>openjdk:latest</baseImage>-->
-<!--                    &lt;!&ndash;相当于Dockerfile的ENTRYPOINT指令&ndash;&gt;-->
-<!--                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>-->
-<!--                    &lt;!&ndash;是否跳过docker build&ndash;&gt;-->
-<!--                    <skipDockerBuild>true</skipDockerBuild>-->
-<!--                    <dockerHost>${configuration.docker-two-Host}</dockerHost>-->
-<!--                    <resources>-->
-<!--                        <resource>-->
-<!--                            <targetPath>/</targetPath>-->
-<!--                            &lt;!&ndash;用于指定需要复制的根目录，${project.build.directory}表示target目录&ndash;&gt;-->
-<!--                            <directory>${project.build.directory}</directory>-->
-<!--                            &lt;!&ndash;用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。&ndash;&gt;-->
-<!--                            <include>${project.build.finalName}.jar</include>-->
-<!--                        </resource>-->
-<!--                    </resources>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>build-image</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>build</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--        &lt;!&ndash;如果不设置resource 会导致application.yml中的@@找不到pom文件中的配置&ndash;&gt;-->
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <filtering>true</filtering>-->
-<!--            </resource>-->
-<!--        </resources>-->
-<!--    </build>-->
-
-</project>
diff --git a/yanzhu-gateway/src/main/resources/bootstrap.yml b/yanzhu-gateway/src/main/resources/bootstrap.yml
deleted file mode 100644
index 884c5efc..00000000
--- a/yanzhu-gateway/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Tomcat
-server:
-  port: 8080
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-gateway
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-    sentinel:
-      # 取消控制台懒加载
-      eager: true
-      transport:
-        # 控制台地址
-        dashboard: 62.234.3.186:8718
-      # nacos配置持久化
-      datasource:
-        ds1:
-          nacos:
-            server-addr: @discovery.server-addr@
-            dataId: sentinel-ruoyi-gateway
-            groupId: DEFAULT_GROUP
-            data-type: json
-            rule-type: gw-flow
diff --git a/yanzhu-modules/pom.xml b/yanzhu-modules/pom.xml
deleted file mode 100644
index 800e5a5a..00000000
--- a/yanzhu-modules/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <modules>
-        <module>yanzhu-system</module>
-        <module>yanzhu-gen</module>
-        <module>yanzhu-job</module>
-        <module>yanzhu-file</module>
-        <module>yanzhu-manage</module>
-        <module>yanzhu-wechat</module>
-        <module>yanzhu-flowable</module>
-    </modules>
-
-    <artifactId>yanzhu-modules</artifactId>
-    <packaging>pom</packaging>
-
-    <description>
-        yanzhu-modules分布式模块
-    </description>
-
-</project>
diff --git a/yanzhu-modules/yanzhu-file/pom.xml b/yanzhu-modules/yanzhu-file/pom.xml
deleted file mode 100644
index 5296cfce..00000000
--- a/yanzhu-modules/yanzhu-file/pom.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-modules</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-modules-file</artifactId>
-
-    <description>
-        yanzhu-modules-file文件服务
-    </description>
-
-    <dependencies>
-    	
-    	<!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-        
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-		
-        <!-- FastDFS -->
-        <dependency>
-            <groupId>com.github.tobato</groupId>
-            <artifactId>fastdfs-client</artifactId>
-        </dependency>
-        
-        <!-- Minio -->
-        <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
-            <version>${minio.version}</version>
-        </dependency>
-        
-        <!-- YanZhu Api System -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-api-system</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-        
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-<!--    <build>-->
-<!--        <finalName>${project.artifactId}</finalName>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--            &lt;!&ndash; docker-maven-plugin插件(不带Dockerfile文件) &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>1.2.0</version>-->
-<!--                <configuration>-->
-<!--                    &lt;!&ndash;用于指定镜像名称&ndash;&gt;-->
-<!--                    <imageName>${project.build.finalName}</imageName>-->
-<!--                    <imageTags>latest</imageTags>-->
-<!--                    &lt;!&ndash;用于指定基础镜像，相当于Dockerfile中的FROM指令&ndash;&gt;-->
-<!--                    <baseImage>openjdk:latest</baseImage>-->
-<!--                    &lt;!&ndash;相当于Dockerfile的ENTRYPOINT指令&ndash;&gt;-->
-<!--                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>-->
-<!--                    &lt;!&ndash;是否跳过docker build&ndash;&gt;-->
-<!--                    <skipDockerBuild>true</skipDockerBuild>-->
-<!--                    <dockerHost>${configuration.docker-one-Host}</dockerHost>-->
-<!--                    <resources>-->
-<!--                        <resource>-->
-<!--                            <targetPath>/</targetPath>-->
-<!--                            &lt;!&ndash;用于指定需要复制的根目录，${project.build.directory}表示target目录&ndash;&gt;-->
-<!--                            <directory>${project.build.directory}</directory>-->
-<!--                            &lt;!&ndash;用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。&ndash;&gt;-->
-<!--                            <include>${project.build.finalName}.jar</include>-->
-<!--                        </resource>-->
-<!--                    </resources>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>build-image</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>build</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--        &lt;!&ndash;如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置&ndash;&gt;-->
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <filtering>true</filtering>-->
-<!--            </resource>-->
-<!--        </resources>-->
-<!--    </build>-->
-   
-</project>
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-file/src/main/java/com/yanzhu/file/utils/FileUploadUtils.java b/yanzhu-modules/yanzhu-file/src/main/java/com/yanzhu/file/utils/FileUploadUtils.java
index fd0e78bf..b6593d10 100644
--- a/yanzhu-modules/yanzhu-file/src/main/java/com/yanzhu/file/utils/FileUploadUtils.java
+++ b/yanzhu-modules/yanzhu-file/src/main/java/com/yanzhu/file/utils/FileUploadUtils.java
@@ -10,7 +10,10 @@ import java.util.Objects;
 
 import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.io.FileUtil;
+import com.alibaba.nacos.common.utils.MD5Utils;
+import com.yanzhu.common.core.utils.ServletUtils;
 import com.yanzhu.common.core.utils.file.FileUtils;
+import com.yanzhu.common.core.utils.uuid.UUID;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.web.multipart.MultipartFile;
 import com.yanzhu.common.core.exception.file.FileNameLengthLimitExceededException;
@@ -260,7 +263,7 @@ public class FileUploadUtils
     public static final String extractFilename(MultipartFile file)
     {
         return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
-                FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), FileTypeUtils.getExtension(file));
+               MD5Utils.md5Hex(FilenameUtils.getBaseName(file.getOriginalFilename()),"utf-8"), Seq.getId(Seq.uploadSeqType), FileTypeUtils.getExtension(file));
     }
 
     private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
diff --git a/yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml
deleted file mode 100644
index 284fda00..00000000
--- a/yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9300
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-file
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-modules/yanzhu-flowable/pom.xml b/yanzhu-modules/yanzhu-flowable/pom.xml
deleted file mode 100644
index 7339194c..00000000
--- a/yanzhu-modules/yanzhu-flowable/pom.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>yanzhu</artifactId>
-        <groupId>com.yanzhu</groupId>
-        <version>3.6.2</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-modules-flowable</artifactId>
-
-    <properties>
-        <flowable.version>6.7.2</flowable.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
-    <description>
-        yanzhu-modules-flowable工作流模块
-    </description>
-
-    <dependencies>
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Swagger UI -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-
-        <!-- Apache Velocity -->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Log -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-log</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-mapper</artifactId>
-            <version>3.6.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!--el表达式计算-->
-        <dependency>
-            <groupId>com.googlecode.aviator</groupId>
-            <artifactId>aviator</artifactId>
-            <version>5.3.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.flowable</groupId>
-            <artifactId>flowable-spring-boot-starter</artifactId>
-            <version>${flowable.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.flowable</groupId>
-                    <artifactId>flowable-spring-security</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-<!--    <build>-->
-<!--        <finalName>${project.artifactId}</finalName>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--            &lt;!&ndash; docker-maven-plugin插件(不带Dockerfile文件) &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>1.2.0</version>-->
-<!--                <configuration>-->
-<!--                    &lt;!&ndash;用于指定镜像名称&ndash;&gt;-->
-<!--                    <imageName>${project.build.finalName}</imageName>-->
-<!--                    <imageTags>latest</imageTags>-->
-<!--                    &lt;!&ndash;用于指定基础镜像，相当于Dockerfile中的FROM指令&ndash;&gt;-->
-<!--                    <baseImage>openjdk:latest</baseImage>-->
-<!--                    &lt;!&ndash;相当于Dockerfile的ENTRYPOINT指令&ndash;&gt;-->
-<!--                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>-->
-<!--                    &lt;!&ndash;是否跳过docker build&ndash;&gt;-->
-<!--                    <skipDockerBuild>true</skipDockerBuild>-->
-<!--                    <dockerHost>${configuration.docker-two-Host}</dockerHost>-->
-<!--                    <resources>-->
-<!--                        <resource>-->
-<!--                            <targetPath>/</targetPath>-->
-<!--                            &lt;!&ndash;用于指定需要复制的根目录，${project.build.directory}表示target目录&ndash;&gt;-->
-<!--                            <directory>${project.build.directory}</directory>-->
-<!--                            &lt;!&ndash;用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。&ndash;&gt;-->
-<!--                            <include>${project.build.finalName}.jar</include>-->
-<!--                        </resource>-->
-<!--                    </resources>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>build-image</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>build</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--        &lt;!&ndash;如果不设置resource 会导致application.yml中的@@找不到pom文件中的配置&ndash;&gt;-->
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <filtering>true</filtering>-->
-<!--            </resource>-->
-<!--        </resources>-->
-<!--    </build>-->
-
-</project>
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-flowable/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-flowable/src/main/resources/bootstrap.yml
deleted file mode 100644
index caefefeb..00000000
--- a/yanzhu-modules/yanzhu-flowable/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9205
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-flowable
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: JiangYuQi
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-modules/yanzhu-gen/pom.xml b/yanzhu-modules/yanzhu-gen/pom.xml
deleted file mode 100644
index be477070..00000000
--- a/yanzhu-modules/yanzhu-gen/pom.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-modules</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-modules-gen</artifactId>
-
-    <description>
-        yanzhu-modules-gen代码生成
-    </description>
-
-    <dependencies>
-    	
-    	<!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-        
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-		
-        <!-- Swagger UI -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-        
-        <!-- Apache Velocity -->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-        </dependency>
-        
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Log -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-log</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- docker-maven-plugin插件(不带Dockerfile文件) -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.0</version>
-                <configuration>
-                    <!--用于指定镜像名称-->
-                    <imageName>${project.build.finalName}</imageName>
-                    <imageTags>latest</imageTags>
-                    <!--用于指定基础镜像，相当于Dockerfile中的FROM指令-->
-                    <baseImage>openjdk:latest</baseImage>
-                    <!--相当于Dockerfile的ENTRYPOINT指令-->
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <!--是否跳过docker build-->
-                    <skipDockerBuild>true</skipDockerBuild>
-                    <dockerHost>${configuration.docker-one-Host}</dockerHost>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <!--用于指定需要复制的根目录，${project.build.directory}表示target目录-->
-                            <directory>${project.build.directory}</directory>
-                            <!--用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。-->
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-   
-</project>
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-gen/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-gen/src/main/resources/bootstrap.yml
deleted file mode 100644
index 15150440..00000000
--- a/yanzhu-modules/yanzhu-gen/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9202
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-gen
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-modules/yanzhu-job/pom.xml b/yanzhu-modules/yanzhu-job/pom.xml
deleted file mode 100644
index 3f990b9e..00000000
--- a/yanzhu-modules/yanzhu-job/pom.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-modules</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-modules-job</artifactId>
-
-    <description>
-        yanzhu-modules-job定时任务
-    </description>
-
-    <dependencies>
-    	
-    	<!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-        
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-		
-        <!-- Swagger UI -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-		
-        <!-- Quartz -->
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.mchange</groupId>
-                    <artifactId>c3p0</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Log -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-log</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-        
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- docker-maven-plugin插件(不带Dockerfile文件) -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.0</version>
-                <configuration>
-                    <!--用于指定镜像名称-->
-                    <imageName>${project.build.finalName}</imageName>
-                    <imageTags>latest</imageTags>
-                    <!--用于指定基础镜像，相当于Dockerfile中的FROM指令-->
-                    <baseImage>openjdk:latest</baseImage>
-                    <!--相当于Dockerfile的ENTRYPOINT指令-->
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <!--是否跳过docker build-->
-                    <skipDockerBuild>true</skipDockerBuild>
-                    <dockerHost>${configuration.docker-two-Host}</dockerHost>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <!--用于指定需要复制的根目录，${project.build.directory}表示target目录-->
-                            <directory>${project.build.directory}</directory>
-                            <!--用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。-->
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-   
-</project>
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-job/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-job/src/main/resources/bootstrap.yml
deleted file mode 100644
index 9ac3298f..00000000
--- a/yanzhu-modules/yanzhu-job/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9203
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-job
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: JiangYuQi
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-modules/yanzhu-manage/pom.xml b/yanzhu-modules/yanzhu-manage/pom.xml
deleted file mode 100644
index efb0abec..00000000
--- a/yanzhu-modules/yanzhu-manage/pom.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>yanzhu</artifactId>
-        <groupId>com.yanzhu</groupId>
-        <version>3.6.2</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-modules-manage</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
-    <description>
-        yanzhu-modules-manage业务模块
-    </description>
-
-    <dependencies>
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Swagger UI -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-
-        <!-- Apache Velocity -->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Log -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-log</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
-        </dependency>
-
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-mapper</artifactId>
-            <version>3.6.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!--根据word模板生成word文件 开始-->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-        </dependency>
-
-        <!-- excel工具 -->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml-schemas</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.lowagie</groupId>
-            <artifactId>itext</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.lowagie</groupId>
-            <artifactId>itext-rtf</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.lowagie</groupId>
-            <artifactId>iTextAsian</artifactId>
-            <version>1.0.0</version>
-            <scope>system</scope>
-            <systemPath>${pom.basedir}/libs/iTextAsian-1.0.0.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.deepoove</groupId>
-            <artifactId>poi-tl</artifactId>
-        </dependency>
-        <!--根据word模板生成word文件 结束-->
-
-        <!--word文件转化为PDF文件 开始-->
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.aspose</groupId>
-            <artifactId>aspose-words</artifactId>
-            <version>15.8.0</version>
-            <scope>system</scope>
-            <systemPath>${pom.basedir}/libs/aspose-words-15.8.0-jdk16.jar</systemPath>
-        </dependency>
-        <!--word文件转化为PDF文件 结束-->
-
-        <!--pdf签名使用工具类-->
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>${itextpdf.version}</version>
-        </dependency>
-        <!--pdf签名使用工具类-->
-
-        <dependency>
-            <groupId>org.jsoup</groupId>
-            <artifactId>jsoup</artifactId>
-            <version>1.17.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.aspose</groupId>
-            <artifactId>aspose-tasks</artifactId>
-            <version>24.10</version>
-            <scope>system</scope>
-            <systemPath>${pom.basedir}/libs/aspose-tasks-24.10-jdk17.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.mpxj</groupId>
-            <artifactId>mpxj</artifactId>
-            <version>13.5.1</version> <!-- 请检查最新版本 -->
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                    <includeSystemScope>true</includeSystemScope>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-<!--    <build>-->
-<!--        <finalName>${project.artifactId}</finalName>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <configuration>-->
-<!--                    <includeSystemScope>true</includeSystemScope>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--            &lt;!&ndash; docker-maven-plugin插件(不带Dockerfile文件) &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>1.2.0</version>-->
-<!--                <configuration>-->
-<!--                    &lt;!&ndash;用于指定镜像名称&ndash;&gt;-->
-<!--                    <imageName>${project.build.finalName}</imageName>-->
-<!--                    <imageTags>latest</imageTags>-->
-<!--                    &lt;!&ndash;用于指定基础镜像，相当于Dockerfile中的FROM指令&ndash;&gt;-->
-<!--                    <baseImage>openjdk:latest</baseImage>-->
-<!--                    &lt;!&ndash;相当于Dockerfile的ENTRYPOINT指令&ndash;&gt;-->
-<!--                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>-->
-<!--                    &lt;!&ndash;是否跳过docker build&ndash;&gt;-->
-<!--                    <skipDockerBuild>true</skipDockerBuild>-->
-<!--                    <dockerHost>${configuration.docker-two-Host}</dockerHost>-->
-<!--                    <resources>-->
-<!--                        <resource>-->
-<!--                            <targetPath>/</targetPath>-->
-<!--                            &lt;!&ndash;用于指定需要复制的根目录，${project.build.directory}表示target目录&ndash;&gt;-->
-<!--                            <directory>${project.build.directory}</directory>-->
-<!--                            &lt;!&ndash;用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。&ndash;&gt;-->
-<!--                            <include>${project.build.finalName}.jar</include>-->
-<!--                        </resource>-->
-<!--                    </resources>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>build-image</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>build</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--        &lt;!&ndash;如果不设置resource 会导致application.yml中的@@找不到pom文件中的配置&ndash;&gt;-->
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <filtering>true</filtering>-->
-<!--            </resource>-->
-<!--        </resources>-->
-<!--    </build>-->
-
-</project>
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml
deleted file mode 100644
index 629215d5..00000000
--- a/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Tomcat
-server:
-  port: 9208
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-manage
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
-logging:
-  level:
-    com.ycx.manage.mapper: DEBUG
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-system/pom.xml b/yanzhu-modules/yanzhu-system/pom.xml
deleted file mode 100644
index ad21b65d..00000000
--- a/yanzhu-modules/yanzhu-system/pom.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-modules</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-	
-    <artifactId>yanzhu-modules-system</artifactId>
-
-    <description>
-        yanzhu-modules-system系统模块
-    </description>
-	
-    <dependencies>
-
-        <!-- ShardingSphere 读写分离/分库分表 -->
-        <dependency>
-            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-jdbc-core-spring-boot-starter</artifactId>
-            <version>5.1.2</version>
-        </dependency>
-    	
-    	<!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        
-    	<!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-        
-    	<!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-		
-        <!-- Swagger UI -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-		
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common DataSource-->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-datasource</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Log -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-log</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Datascope -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-datascope</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-mapper</artifactId>
-            <version>3.6.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-<!--    <build>-->
-<!--        <finalName>${project.artifactId}</finalName>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--            &lt;!&ndash; docker-maven-plugin插件(不带Dockerfile文件) &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>1.2.0</version>-->
-<!--                <configuration>-->
-<!--                    &lt;!&ndash;用于指定镜像名称&ndash;&gt;-->
-<!--                    <imageName>${project.build.finalName}</imageName>-->
-<!--                    <imageTags>latest</imageTags>-->
-<!--                    &lt;!&ndash;用于指定基础镜像，相当于Dockerfile中的FROM指令&ndash;&gt;-->
-<!--                    <baseImage>openjdk:latest</baseImage>-->
-<!--                    &lt;!&ndash;相当于Dockerfile的ENTRYPOINT指令&ndash;&gt;-->
-<!--                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>-->
-<!--                    &lt;!&ndash;是否跳过docker build&ndash;&gt;-->
-<!--                    <skipDockerBuild>true</skipDockerBuild>-->
-<!--                    <dockerHost>${configuration.docker-two-Host}</dockerHost>-->
-<!--                    <resources>-->
-<!--                        <resource>-->
-<!--                            <targetPath>/</targetPath>-->
-<!--                            &lt;!&ndash;用于指定需要复制的根目录，${project.build.directory}表示target目录&ndash;&gt;-->
-<!--                            <directory>${project.build.directory}</directory>-->
-<!--                            &lt;!&ndash;用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。&ndash;&gt;-->
-<!--                            <include>${project.build.finalName}.jar</include>-->
-<!--                        </resource>-->
-<!--                    </resources>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>build-image</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>build</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--        &lt;!&ndash;如果不设置resource 会导致application.yml中的@@找不到pom文件中的配置&ndash;&gt;-->
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <filtering>true</filtering>-->
-<!--            </resource>-->
-<!--        </resources>-->
-<!--    </build>-->
-   
-</project>
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml
deleted file mode 100644
index efe975fc..00000000
--- a/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9201
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-system
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-modules/yanzhu-wechat/pom.xml b/yanzhu-modules/yanzhu-wechat/pom.xml
deleted file mode 100644
index 39d06841..00000000
--- a/yanzhu-modules/yanzhu-wechat/pom.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>yanzhu</artifactId>
-        <groupId>com.yanzhu</groupId>
-        <version>3.6.2</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-modules-wechat</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
-    <description>
-        yanzhu-modules-wechat微信模块
-    </description>
-
-    <dependencies>
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Swagger UI -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-
-        <!-- Apache Velocity -->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Log -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-log</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-mapper</artifactId>
-            <version>3.6.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- docker-maven-plugin插件(不带Dockerfile文件) -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.0</version>
-                <configuration>
-                    <!--用于指定镜像名称-->
-                    <imageName>${project.build.finalName}</imageName>
-                    <imageTags>latest</imageTags>
-                    <!--用于指定基础镜像，相当于Dockerfile中的FROM指令-->
-                    <baseImage>openjdk:latest</baseImage>
-                    <!--相当于Dockerfile的ENTRYPOINT指令-->
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <!--是否跳过docker build-->
-                    <skipDockerBuild>true</skipDockerBuild>
-                    <dockerHost>${configuration.docker-one-Host}</dockerHost>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <!--用于指定需要复制的根目录，${project.build.directory}表示target目录-->
-                            <directory>${project.build.directory}</directory>
-                            <!--用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。-->
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-</project>
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-wechat/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-wechat/src/main/resources/bootstrap.yml
deleted file mode 100644
index c9ae24ee..00000000
--- a/yanzhu-modules/yanzhu-wechat/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9206
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-wechat
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: JiangYuQi
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-monitor/pom.xml b/yanzhu-monitor/pom.xml
deleted file mode 100644
index 103688b4..00000000
--- a/yanzhu-monitor/pom.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>yanzhu</artifactId>
-        <groupId>com.yanzhu</groupId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-monitor</artifactId>
-
-    <description>
-        yanzhu-monitor监控中心
-    </description>
-
-    <dependencies>
-        
-        <!-- SpringBoot Admin -->
-        <dependency>
-            <groupId>de.codecentric</groupId>
-            <artifactId>spring-boot-admin-starter-server</artifactId>
-            <version>${spring-boot-admin.version}</version>
-        </dependency>
-		
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-		
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-		
-        <!-- SpringBoot Web -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-		
-        <!-- Spring Security -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-		
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- docker-maven-plugin插件(不带Dockerfile文件) -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.0</version>
-                <configuration>
-                    <!--用于指定镜像名称-->
-                    <imageName>${project.build.finalName}</imageName>
-                    <imageTags>latest</imageTags>
-                    <!--用于指定基础镜像，相当于Dockerfile中的FROM指令-->
-                    <baseImage>openjdk:latest</baseImage>
-                    <!--相当于Dockerfile的ENTRYPOINT指令-->
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <!--是否跳过docker build-->
-                    <skipDockerBuild>true</skipDockerBuild>
-                    <!--suppress UnresolvedMavenProperty -->
-                    <dockerHost>${configuration.docker-one-Host}</dockerHost>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <!--用于指定需要复制的根目录，${project.build.directory}表示target目录-->
-                            <directory>${project.build.directory}</directory>
-                            <!--用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。-->
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-   
-</project>
\ No newline at end of file
diff --git a/yanzhu-monitor/src/main/resources/bootstrap.yml b/yanzhu-monitor/src/main/resources/bootstrap.yml
deleted file mode 100644
index 2c9a1c66..00000000
--- a/yanzhu-monitor/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9100
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-monitor
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: JiangYuQi
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-rocketmq/pom.xml b/yanzhu-rocketmq/pom.xml
deleted file mode 100644
index 52ca2869..00000000
--- a/yanzhu-rocketmq/pom.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>yanzhu</artifactId>
-        <groupId>com.yanzhu</groupId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-rocketmq</artifactId>
-
-    <dependencies>
-        <!--rocketmq消息队列-->
-        <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-client</artifactId>
-            <version> 4.9.0</version>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-client</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Log -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-log</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
-        <!-- yml调用pom变量 -->
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.28</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- docker-maven-plugin插件(不带Dockerfile文件) -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.0</version>
-                <configuration>
-                    <!--用于指定镜像名称-->
-                    <imageName>${project.build.finalName}</imageName>
-                    <imageTags>latest</imageTags>
-                    <!--用于指定基础镜像，相当于Dockerfile中的FROM指令-->
-                    <baseImage>openjdk:latest</baseImage>
-                    <!--相当于Dockerfile的ENTRYPOINT指令-->
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <!--是否跳过docker build-->
-                    <skipDockerBuild>true</skipDockerBuild>
-                    <dockerHost>${configuration.docker-one-Host}</dockerHost>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <!--用于指定需要复制的根目录，${project.build.directory}表示target目录-->
-                            <directory>${project.build.directory}</directory>
-                            <!--用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。-->
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <!--如果不设置resource 会导致application.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/yanzhu-rocketmq/src/main/resources/bootstrap.yml b/yanzhu-rocketmq/src/main/resources/bootstrap.yml
deleted file mode 100644
index 368854c9..00000000
--- a/yanzhu-rocketmq/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-# Tomcat
-server:
-  port: 9207
-
-# Spring
-spring:
-  application:
-    # 应用名称
-    name: yanzhu-rocketmq
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: JiangYuQi
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
-  redisson:
-    singleServerConfig:
-      address: redis://localhost:6379
-
-logging:
-  level:
-    com.yanzhu.app.mapper: DEBUG
-
-
-
diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue
index 5da913ae..3cbf6b6d 100644
--- a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue
+++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue
@@ -716,6 +716,8 @@ function submitForm() {
           getList();
         });
       }
+    }else{
+      proxy.$modal.msgError("请检查必填数据(项目基本信息)");
     }
   });
 }

From 011b93719126b4636517bb6a03f254f7969c7000 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Thu, 2 Jan 2025 22:30:19 +0800
Subject: [PATCH 4/7] update .gitignore

---
 pom.xml                                       | 412 ------------------
 yanzhu-api/pom.xml                            |  22 -
 yanzhu-api/yanzhu-api-system/pom.xml          |  28 --
 yanzhu-auth/pom.xml                           | 154 -------
 yanzhu-auth/src/main/resources/bootstrap.yml  |  27 --
 yanzhu-common/pom.xml                         |  29 --
 yanzhu-common/yanzhu-common-core/pom.xml      | 147 -------
 yanzhu-common/yanzhu-common-datascope/pom.xml |  27 --
 .../yanzhu-common-datasource/pom.xml          |  35 --
 yanzhu-common/yanzhu-common-log/pom.xml       |  27 --
 yanzhu-common/yanzhu-common-mapper/pom.xml    |  33 --
 .../mapper/manage/ProMilestoneMapper.xml      |   8 +-
 yanzhu-common/yanzhu-common-redis/pom.xml     |  33 --
 yanzhu-common/yanzhu-common-security/pom.xml  |  39 --
 yanzhu-common/yanzhu-common-swagger/pom.xml   |  34 --
 yanzhu-gateway/pom.xml                        | 190 --------
 .../src/main/resources/bootstrap.yml          |  42 --
 yanzhu-modules/pom.xml                        |  28 --
 yanzhu-modules/yanzhu-file/pom.xml            | 168 -------
 .../yanzhu/file/utils/FileUploadUtils.java    |   5 +-
 .../src/main/resources/bootstrap.yml          |  27 --
 yanzhu-modules/yanzhu-flowable/pom.xml        | 213 ---------
 .../src/main/resources/bootstrap.yml          |  27 --
 yanzhu-modules/yanzhu-gen/pom.xml             | 137 ------
 .../src/main/resources/bootstrap.yml          |  27 --
 yanzhu-modules/yanzhu-job/pom.xml             | 143 ------
 .../src/main/resources/bootstrap.yml          |  27 --
 yanzhu-modules/yanzhu-manage/pom.xml          | 279 ------------
 .../src/main/resources/bootstrap.yml          |  31 --
 yanzhu-modules/yanzhu-system/pom.xml          | 193 --------
 .../src/main/resources/bootstrap.yml          |  27 --
 yanzhu-modules/yanzhu-wechat/pom.xml          | 154 -------
 .../src/main/resources/bootstrap.yml          |  27 --
 yanzhu-monitor/pom.xml                        | 119 -----
 .../src/main/resources/bootstrap.yml          |  27 --
 yanzhu-rocketmq/pom.xml                       | 144 ------
 .../src/main/resources/bootstrap.yml          |  38 --
 .../src/views/manage/proProjectInfo/index.vue |   2 +
 38 files changed, 10 insertions(+), 3120 deletions(-)
 delete mode 100644 pom.xml
 delete mode 100644 yanzhu-api/pom.xml
 delete mode 100644 yanzhu-api/yanzhu-api-system/pom.xml
 delete mode 100644 yanzhu-auth/pom.xml
 delete mode 100644 yanzhu-auth/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-common/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-core/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-datascope/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-datasource/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-log/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-mapper/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-redis/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-security/pom.xml
 delete mode 100644 yanzhu-common/yanzhu-common-swagger/pom.xml
 delete mode 100644 yanzhu-gateway/pom.xml
 delete mode 100644 yanzhu-gateway/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-file/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/yanzhu-flowable/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-flowable/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/yanzhu-gen/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-gen/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/yanzhu-job/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-job/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/yanzhu-manage/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/yanzhu-system/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-modules/yanzhu-wechat/pom.xml
 delete mode 100644 yanzhu-modules/yanzhu-wechat/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-monitor/pom.xml
 delete mode 100644 yanzhu-monitor/src/main/resources/bootstrap.yml
 delete mode 100644 yanzhu-rocketmq/pom.xml
 delete mode 100644 yanzhu-rocketmq/src/main/resources/bootstrap.yml

diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 0ea61c65..00000000
--- a/pom.xml
+++ /dev/null
@@ -1,412 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.yanzhu</groupId>
-    <artifactId>yanzhu</artifactId>
-    <version>3.6.2</version>
-
-    <name>yanzhu</name>
-    <url>http://www.sxyanzhu.com</url>
-    <description>研筑微服务系统</description>
-
-    <properties>
-        <yanzhu.version>3.6.2</yanzhu.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <spring-boot.version>2.7.7</spring-boot.version>
-        <spring-cloud.version>2021.0.5</spring-cloud.version>
-        <spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
-        <spring-boot-admin.version>2.7.10</spring-boot-admin.version>
-        <swagger.fox.version>3.0.0</swagger.fox.version>
-        <swagger.core.version>1.6.2</swagger.core.version>
-        <tobato.version>1.27.2</tobato.version>
-        <kaptcha.version>2.3.3</kaptcha.version>
-        <pagehelper.boot.version>1.4.6</pagehelper.boot.version>
-        <druid.version>1.2.16</druid.version>
-        <dynamic-ds.version>3.5.2</dynamic-ds.version>
-        <commons.io.version>2.16.1</commons.io.version>
-        <org.projectlombok>1.18.16</org.projectlombok>
-        <velocity.version>2.3</velocity.version>
-        <fastjson.version>2.0.23</fastjson.version>
-        <jjwt.version>0.9.1</jjwt.version>
-        <minio.version>8.2.2</minio.version>
-        <poi.version>5.3.0</poi.version>
-        <pinyin4j.version>2.5.1</pinyin4j.version>
-        <weixin.mp.version>4.0.6.B</weixin.mp.version>
-        <weixin.miniapp.version>4.0.6.B</weixin.miniapp.version>
-        <transmittable-thread-local.version>2.14.2</transmittable-thread-local.version>
-        <hutool.version>5.8.20</hutool.version>
-        <aspectjweaver.version>1.9.1</aspectjweaver.version>
-        <lowagie.version>2.1.7</lowagie.version>
-        <poi-tl.version>1.12.0</poi-tl.version>
-        <lowagie.iTextAsian.version>1.0</lowagie.iTextAsian.version>
-        <itextpdf.version>5.5.13</itextpdf.version>
-        <aspose.words.version>15.8.0</aspose.words.version>
-    </properties>
-
-    <!-- 依赖声明 -->
-    <dependencyManagement>
-        <dependencies>
-
-            <!-- SpringCloud 微服务 -->
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- SpringCloud Alibaba 微服务 -->
-            <dependency>
-                <groupId>com.alibaba.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>${spring-cloud-alibaba.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- SpringBoot 依赖配置 -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- FastDFS 分布式文件系统 -->
-            <dependency>
-                <groupId>com.github.tobato</groupId>
-                <artifactId>fastdfs-client</artifactId>
-                <version>${tobato.version}</version>
-            </dependency>
-
-            <!-- Swagger 依赖配置 -->
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-models</artifactId>
-                <version>${swagger.core.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>${swagger.core.version}</version>
-            </dependency>
-
-            <!-- 验证码 -->
-            <dependency>
-                <groupId>pro.fessional</groupId>
-                <artifactId>kaptcha</artifactId>
-                <version>${kaptcha.version}</version>
-            </dependency>
-
-            <!-- pagehelper 分页插件 -->
-            <dependency>
-                <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper-spring-boot-starter</artifactId>
-                <version>${pagehelper.boot.version}</version>
-            </dependency>
-
-            <!-- io常用工具类 -->
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>${commons.io.version}</version>
-            </dependency>
-
-            <!-- excel工具 -->
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi-ooxml</artifactId>
-                <version>${poi.version}</version>
-            </dependency>
-
-            <!-- 生成pdf-->
-            <dependency>
-                <groupId>com.lowagie</groupId>
-                <artifactId>itext</artifactId>
-                <version>${lowagie.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.lowagie</groupId>
-                <artifactId>itext-rtf</artifactId>
-                <version>${lowagie.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.lowagie</groupId>
-                <artifactId>iTextAsian</artifactId>
-                <version>${lowagie.iTextAsian.version}</version>
-            </dependency>
-
-            <!--根据word模板生成word文件-->
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi</artifactId>
-                <version>${poi.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi-ooxml-schemas</artifactId>
-                <version>4.1.2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.deepoove</groupId>
-                <artifactId>poi-tl</artifactId>
-                <version>${poi-tl.version}</version>
-            </dependency>
-
-            <!--word文件转化为PDF文件-->
-            <dependency>
-                <groupId>org.aspectj</groupId>
-                <artifactId>aspectjweaver</artifactId>
-                <version>${aspectjweaver.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.aspose</groupId>
-                <artifactId>aspose-words</artifactId>
-                <version>${aspose.words.version}</version>
-            </dependency>
-
-            <!-- 代码生成使用模板 -->
-            <dependency>
-                <groupId>org.apache.velocity</groupId>
-                <artifactId>velocity-engine-core</artifactId>
-                <version>${velocity.version}</version>
-            </dependency>
-
-            <!-- JSON 解析器和生成器 -->
-            <dependency>
-                <groupId>com.alibaba.fastjson2</groupId>
-                <artifactId>fastjson2</artifactId>
-                <version>${fastjson.version}</version>
-            </dependency>
-
-            <!-- JWT -->
-            <dependency>
-                <groupId>io.jsonwebtoken</groupId>
-                <artifactId>jjwt</artifactId>
-                <version>${jjwt.version}</version>
-            </dependency>
-
-            <!-- 线程传递值 -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>transmittable-thread-local</artifactId>
-                <version>${transmittable-thread-local.version}</version>
-            </dependency>
-
-            <!-- Belerweb Pinyin4j -->
-            <dependency>
-                <groupId>com.belerweb</groupId>
-                <artifactId>pinyin4j</artifactId>
-                <version>${pinyin4j.version}</version>
-            </dependency>
-
-            <!-- 微信公众号 -->
-            <dependency>
-                <groupId>com.github.binarywang</groupId>
-                <artifactId>weixin-java-mp</artifactId>
-                <version>${weixin.mp.version}</version>
-            </dependency>
-
-            <!-- 微信小程序 -->
-            <dependency>
-                <groupId>com.github.binarywang</groupId>
-                <artifactId>weixin-java-miniapp</artifactId>
-                <version>${weixin.miniapp.version}</version>
-            </dependency>
-
-            <!-- 核心模块 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-common-core</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <!-- 接口模块 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-common-swagger</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <!-- 安全模块 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-common-security</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <!-- 权限范围 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-common-datascope</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <!-- 多数据源 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-common-datasource</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <!-- 日志记录 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-common-log</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <!-- 缓存服务 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-common-redis</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <!-- 系统接口 -->
-            <dependency>
-                <groupId>com.yanzhu</groupId>
-                <artifactId>yanzhu-api-system</artifactId>
-                <version>${yanzhu.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>net.sf.mpxj</groupId>
-                <artifactId>mpxj</artifactId>
-                <version>13.0.2</version>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
-    <modules>
-        <module>yanzhu-api</module>
-        <module>yanzhu-common</module>
-        <module>yanzhu-auth</module>
-        <module>yanzhu-gateway</module>
-        <module>yanzhu-modules</module>
-        <module>yanzhu-monitor</module>
-        <module>yanzhu-rocketmq</module>
-    </modules>
-    <packaging>pom</packaging>
-
-    <dependencies>
-        <!-- bootstrap 启动器 -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-bootstrap</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-maven-plugin</artifactId>
-                    <version>${spring-boot.version}</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>repackage</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>${java.version}</source>
-                        <target>${java.version}</target>
-                        <encoding>${project.build.sourceEncoding}</encoding>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>public</id>
-            <name>aliyun nexus</name>
-            <url>https://maven.aliyun.com/repository/public</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>public</id>
-            <name>aliyun nexus</name>
-            <url>https://maven.aliyun.com/repository/public</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <!-- 多环境配置 -->
-    <profiles>
-        <profile>
-            <id>本地服务器环境</id>
-            <!-- 环境标识，需要与配置文件的名称相对应 -->
-            <properties>
-                <profiles.active>本地服务器环境</profiles.active>
-                <discovery.server-addr>62.234.3.186:8848</discovery.server-addr>
-            </properties>
-
-        </profile>
-        <profile>
-            <id>测试服务器环境</id>
-            <properties>
-                <profiles.active>测试服务器环境</profiles.active>
-                <discovery.server-addr>62.234.3.186:8848</discovery.server-addr>
-            </properties>
-            <!-- 默认环境 -->
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-        <profile>
-            <id>线上服务器环境</id>
-            <properties>
-                <profiles.active>线上服务器环境</profiles.active>
-                <discovery.server-addr>0.0.0.0:8848</discovery.server-addr>
-            </properties>
-        </profile>
-        <!-- docker环境打包 -->
-        <profile>
-            <id>docker测试环境1</id>
-            <properties>
-                <profiles.active>docker测试环境1</profiles.active>
-                <configuration.docker-Host>http://0.0.0.0:5001</configuration.docker-Host>
-            </properties>
-        </profile>
-        <profile>
-            <id>docker测试环境2</id>
-            <properties>
-                <profiles.active>docker测试环境2</profiles.active>
-                <configuration.docker-Host>http://0.0.0.0:5001</configuration.docker-Host>
-            </properties>
-        </profile>
-    </profiles>
-
-</project>
\ No newline at end of file
diff --git a/yanzhu-api/pom.xml b/yanzhu-api/pom.xml
deleted file mode 100644
index 47ec57cf..00000000
--- a/yanzhu-api/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <modules>
-        <module>yanzhu-api-system</module>
-    </modules>
-
-    <artifactId>yanzhu-api</artifactId>
-    <packaging>pom</packaging>
-
-    <description>
-        yanzhu-api系统接口
-    </description>
-
-</project>
diff --git a/yanzhu-api/yanzhu-api-system/pom.xml b/yanzhu-api/yanzhu-api-system/pom.xml
deleted file mode 100644
index be9fb913..00000000
--- a/yanzhu-api/yanzhu-api-system/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-api</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-api-system</artifactId>
-
-    <description>
-        yanzhu-api-system系统接口模块
-    </description>
-
-    <dependencies>
-		
-        <!-- YanZhu Common Core-->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-core</artifactId>
-        </dependency>
-        
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/yanzhu-auth/pom.xml b/yanzhu-auth/pom.xml
deleted file mode 100644
index be53cfe8..00000000
--- a/yanzhu-auth/pom.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-auth</artifactId>
-	
-    <description>
-        yanzhu-auth认证授权中心
-    </description>
-    
-    <dependencies>
-        
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-		
-        <!-- SpringBoot Web -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-		
-        <!-- YanZhu Common Security-->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-security</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-<!--    <build>-->
-<!--        <finalName>${project.artifactId}</finalName>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--            &lt;!&ndash; docker-maven-plugin插件(不带Dockerfile文件) &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>1.2.0</version>-->
-<!--                <configuration>-->
-<!--                    &lt;!&ndash;用于指定镜像名称&ndash;&gt;-->
-<!--                    <imageName>${project.build.finalName}</imageName>-->
-<!--                    <imageTags>latest</imageTags>-->
-<!--                    &lt;!&ndash;用于指定基础镜像，相当于Dockerfile中的FROM指令&ndash;&gt;-->
-<!--                    <baseImage>openjdk:latest</baseImage>-->
-<!--                    &lt;!&ndash;相当于Dockerfile的ENTRYPOINT指令&ndash;&gt;-->
-<!--                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>-->
-<!--                    &lt;!&ndash;是否跳过docker build&ndash;&gt;-->
-<!--                    <skipDockerBuild>true</skipDockerBuild>-->
-<!--                    <dockerHost>${configuration.docker-one-Host}</dockerHost>-->
-<!--                    <resources>-->
-<!--                        <resource>-->
-<!--                            <targetPath>/</targetPath>-->
-<!--                            &lt;!&ndash;用于指定需要复制的根目录，${project.build.directory}表示target目录&ndash;&gt;-->
-<!--                            <directory>${project.build.directory}</directory>-->
-<!--                            &lt;!&ndash;用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。&ndash;&gt;-->
-<!--                            <include>${project.build.finalName}.jar</include>-->
-<!--                        </resource>-->
-<!--                    </resources>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>build-image</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>build</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--        &lt;!&ndash;如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置&ndash;&gt;-->
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <filtering>true</filtering>-->
-<!--            </resource>-->
-<!--        </resources>-->
-<!--    </build>-->
-   
-</project>
diff --git a/yanzhu-auth/src/main/resources/bootstrap.yml b/yanzhu-auth/src/main/resources/bootstrap.yml
deleted file mode 100644
index d54c82d2..00000000
--- a/yanzhu-auth/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server: 
-  port: 9200
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-auth
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-common/pom.xml b/yanzhu-common/pom.xml
deleted file mode 100644
index 882033ed..00000000
--- a/yanzhu-common/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <modules>
-        <module>yanzhu-common-log</module>
-        <module>yanzhu-common-core</module>
-        <module>yanzhu-common-redis</module>
-        <module>yanzhu-common-swagger</module>
-        <module>yanzhu-common-security</module>
-        <module>yanzhu-common-datascope</module>
-        <module>yanzhu-common-datasource</module>
-        <module>yanzhu-common-mapper</module>
-    </modules>
-
-    <artifactId>yanzhu-common</artifactId>
-    <packaging>pom</packaging>
-
-    <description>
-        yanzhu-common通用模块
-    </description>
-
-</project>
diff --git a/yanzhu-common/yanzhu-common-core/pom.xml b/yanzhu-common/yanzhu-common-core/pom.xml
deleted file mode 100644
index 474002f4..00000000
--- a/yanzhu-common/yanzhu-common-core/pom.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-common-core</artifactId>
-    
-    <description>
-        yanzhu-common-core核心模块
-    </description>
-
-    <dependencies>
-
-        <!-- SpringCloud Openfeign -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Loadbalancer -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
-        </dependency>
-
-        <!-- Spring Context Support -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-        </dependency>
-
-        <!-- Spring Web -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-
-        <!-- Transmittable ThreadLocal -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>transmittable-thread-local</artifactId>
-        </dependency>
-
-        <!-- Pagehelper -->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- Hibernate Validator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
-        <!-- Jackson -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
-        <!-- Alibaba Fastjson -->
-        <dependency>
-            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson2</artifactId>
-        </dependency>
-
-        <!-- Jwt -->
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-        </dependency>
-
-        <!-- Jaxb -->
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-
-        <!-- Apache Lang3 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <!-- Commons Io -->
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-
-        <!-- excel工具 -->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-        </dependency>
-
-        <!-- Java Servlet -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
-
-        <!-- Swagger -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
-        <!-- Belerweb Pinyin4j -->
-        <dependency>
-            <groupId>com.belerweb</groupId>
-            <artifactId>pinyin4j</artifactId>
-        </dependency>
-
-        <!-- 微信公众号 -->
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-mp</artifactId>
-        </dependency>
-
-        <!-- 微信小程序 -->
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-miniapp</artifactId>
-        </dependency>
-
-        <!-- hutool核心 -->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-core</artifactId>
-            <version>${hutool.version}</version>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/yanzhu-common/yanzhu-common-datascope/pom.xml b/yanzhu-common/yanzhu-common-datascope/pom.xml
deleted file mode 100644
index a836d788..00000000
--- a/yanzhu-common/yanzhu-common-datascope/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-common-datascope</artifactId>
-	
-    <description>
-        yanzhu-common-datascope权限范围
-    </description>
-
-    <dependencies>
-		
-        <!-- YanZhu Common Security -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-security</artifactId>
-        </dependency>
-        
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-datasource/pom.xml b/yanzhu-common/yanzhu-common-datasource/pom.xml
deleted file mode 100644
index d8933f3d..00000000
--- a/yanzhu-common/yanzhu-common-datasource/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-common-datasource</artifactId>
-
-    <description>
-        yanzhu-common-datasource多数据源
-    </description>
-
-    <dependencies>
-
-        <!-- Druid -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>${druid.version}</version>
-        </dependency>
-
-        <!-- Dynamic DataSource -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>${dynamic-ds.version}</version>
-        </dependency>
-
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-log/pom.xml b/yanzhu-common/yanzhu-common-log/pom.xml
deleted file mode 100644
index ee55dd7c..00000000
--- a/yanzhu-common/yanzhu-common-log/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-common-log</artifactId>
-	
-    <description>
-        yanzhu-common-log日志记录
-    </description>
-
-    <dependencies>
-		
-        <!-- YanZhu Common Security -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-security</artifactId>
-        </dependency>
-        
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-mapper/pom.xml b/yanzhu-common/yanzhu-common-mapper/pom.xml
deleted file mode 100644
index 9ec699b0..00000000
--- a/yanzhu-common/yanzhu-common-mapper/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-common-mapper</artifactId>
-
-    <description>
-        yanzhu-common-mapper
-    </description>
-
-    <dependencies>
-
-        <!-- YanZhu Common Security -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml
index 92b918eb..f4512124 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml
@@ -103,10 +103,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="comid != null">comid = #{comid},</if>
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="nodeName != null">node_name = #{nodeName},</if>
-            <if test="scheduledStart != null">scheduled_start = #{scheduledStart},</if>
-            <if test="scheduledEnd != null">scheduled_end = #{scheduledEnd},</if>
-            <if test="actualStart != null">actual_start = #{actualStart},</if>
-            <if test="actualEnd != null">actual_end = #{actualEnd},</if>
+            <if test="scheduledStart != null or 1==1">scheduled_start = #{scheduledStart},</if>
+            <if test="scheduledEnd != null  or 1==1">scheduled_end = #{scheduledEnd},</if>
+            <if test="actualStart != null  or 1==1">actual_start = #{actualStart},</if>
+            <if test="actualEnd != null  or 1==1">actual_end = #{actualEnd},</if>
             <if test="days != null">days = #{days},</if>
             <if test="explainInfo != null">explain_info = #{explainInfo},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
diff --git a/yanzhu-common/yanzhu-common-redis/pom.xml b/yanzhu-common/yanzhu-common-redis/pom.xml
deleted file mode 100644
index 371bda26..00000000
--- a/yanzhu-common/yanzhu-common-redis/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-common-redis</artifactId>
-	
-    <description>
-        yanzhu-common-redis缓存服务
-    </description>
-
-    <dependencies>
-		
-        <!-- SpringBoot Boot Redis -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Core-->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-core</artifactId>
-        </dependency>
-        
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-security/pom.xml b/yanzhu-common/yanzhu-common-security/pom.xml
deleted file mode 100644
index ee89269e..00000000
--- a/yanzhu-common/yanzhu-common-security/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-common-security</artifactId>
-
-    <description>
-        yanzhu-common-security安全模块
-    </description>
-
-    <dependencies>
-
-        <!-- Spring Web -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-        </dependency>
-
-        <!-- YanZhu Api System -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-api-system</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Redis-->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-redis</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/yanzhu-common/yanzhu-common-swagger/pom.xml b/yanzhu-common/yanzhu-common-swagger/pom.xml
deleted file mode 100644
index b8aa9b90..00000000
--- a/yanzhu-common/yanzhu-common-swagger/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-common</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>yanzhu-common-swagger</artifactId>
-	
-    <description>
-        yanzhu-common-swagger系统接口
-    </description>
-
-	<dependencies>
-
-        <!-- SpringBoot Web -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!-- Swagger -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-
-	</dependencies>
-</project>
diff --git a/yanzhu-gateway/pom.xml b/yanzhu-gateway/pom.xml
deleted file mode 100644
index c9e9bbf2..00000000
--- a/yanzhu-gateway/pom.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-gateway</artifactId>
-
-    <description>
-        yanzhu-gateway网关模块
-    </description>
-
-    <dependencies>
-
-        <!-- SpringCloud Gateway -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-gateway</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel Gateway -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>
-        </dependency>
-
-        <!-- Sentinel Datasource Nacos -->
-        <dependency>
-            <groupId>com.alibaba.csp</groupId>
-            <artifactId>sentinel-datasource-nacos</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Loadbalancer -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-loadbalancer</artifactId>
-        </dependency>
-
-        <!--验证码 -->
-        <dependency>
-            <groupId>pro.fessional</groupId>
-            <artifactId>kaptcha</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Redis-->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-redis</artifactId>
-        </dependency>
-
-        <!-- Swagger -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-<!--    <build>-->
-<!--        <finalName>${project.artifactId}</finalName>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--            &lt;!&ndash; docker-maven-plugin插件(不带Dockerfile文件) &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>1.2.0</version>-->
-<!--                <configuration>-->
-<!--                    &lt;!&ndash;用于指定镜像名称&ndash;&gt;-->
-<!--                    <imageName>${project.build.finalName}</imageName>-->
-<!--                    <imageTags>latest</imageTags>-->
-<!--                    &lt;!&ndash;用于指定基础镜像，相当于Dockerfile中的FROM指令&ndash;&gt;-->
-<!--                    <baseImage>openjdk:latest</baseImage>-->
-<!--                    &lt;!&ndash;相当于Dockerfile的ENTRYPOINT指令&ndash;&gt;-->
-<!--                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>-->
-<!--                    &lt;!&ndash;是否跳过docker build&ndash;&gt;-->
-<!--                    <skipDockerBuild>true</skipDockerBuild>-->
-<!--                    <dockerHost>${configuration.docker-two-Host}</dockerHost>-->
-<!--                    <resources>-->
-<!--                        <resource>-->
-<!--                            <targetPath>/</targetPath>-->
-<!--                            &lt;!&ndash;用于指定需要复制的根目录，${project.build.directory}表示target目录&ndash;&gt;-->
-<!--                            <directory>${project.build.directory}</directory>-->
-<!--                            &lt;!&ndash;用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。&ndash;&gt;-->
-<!--                            <include>${project.build.finalName}.jar</include>-->
-<!--                        </resource>-->
-<!--                    </resources>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>build-image</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>build</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--        &lt;!&ndash;如果不设置resource 会导致application.yml中的@@找不到pom文件中的配置&ndash;&gt;-->
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <filtering>true</filtering>-->
-<!--            </resource>-->
-<!--        </resources>-->
-<!--    </build>-->
-
-</project>
diff --git a/yanzhu-gateway/src/main/resources/bootstrap.yml b/yanzhu-gateway/src/main/resources/bootstrap.yml
deleted file mode 100644
index 884c5efc..00000000
--- a/yanzhu-gateway/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Tomcat
-server:
-  port: 8080
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-gateway
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-    sentinel:
-      # 取消控制台懒加载
-      eager: true
-      transport:
-        # 控制台地址
-        dashboard: 62.234.3.186:8718
-      # nacos配置持久化
-      datasource:
-        ds1:
-          nacos:
-            server-addr: @discovery.server-addr@
-            dataId: sentinel-ruoyi-gateway
-            groupId: DEFAULT_GROUP
-            data-type: json
-            rule-type: gw-flow
diff --git a/yanzhu-modules/pom.xml b/yanzhu-modules/pom.xml
deleted file mode 100644
index 800e5a5a..00000000
--- a/yanzhu-modules/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <modules>
-        <module>yanzhu-system</module>
-        <module>yanzhu-gen</module>
-        <module>yanzhu-job</module>
-        <module>yanzhu-file</module>
-        <module>yanzhu-manage</module>
-        <module>yanzhu-wechat</module>
-        <module>yanzhu-flowable</module>
-    </modules>
-
-    <artifactId>yanzhu-modules</artifactId>
-    <packaging>pom</packaging>
-
-    <description>
-        yanzhu-modules分布式模块
-    </description>
-
-</project>
diff --git a/yanzhu-modules/yanzhu-file/pom.xml b/yanzhu-modules/yanzhu-file/pom.xml
deleted file mode 100644
index 5296cfce..00000000
--- a/yanzhu-modules/yanzhu-file/pom.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-modules</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-modules-file</artifactId>
-
-    <description>
-        yanzhu-modules-file文件服务
-    </description>
-
-    <dependencies>
-    	
-    	<!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-        
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-		
-        <!-- FastDFS -->
-        <dependency>
-            <groupId>com.github.tobato</groupId>
-            <artifactId>fastdfs-client</artifactId>
-        </dependency>
-        
-        <!-- Minio -->
-        <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
-            <version>${minio.version}</version>
-        </dependency>
-        
-        <!-- YanZhu Api System -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-api-system</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-        
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-<!--    <build>-->
-<!--        <finalName>${project.artifactId}</finalName>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--            &lt;!&ndash; docker-maven-plugin插件(不带Dockerfile文件) &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>1.2.0</version>-->
-<!--                <configuration>-->
-<!--                    &lt;!&ndash;用于指定镜像名称&ndash;&gt;-->
-<!--                    <imageName>${project.build.finalName}</imageName>-->
-<!--                    <imageTags>latest</imageTags>-->
-<!--                    &lt;!&ndash;用于指定基础镜像，相当于Dockerfile中的FROM指令&ndash;&gt;-->
-<!--                    <baseImage>openjdk:latest</baseImage>-->
-<!--                    &lt;!&ndash;相当于Dockerfile的ENTRYPOINT指令&ndash;&gt;-->
-<!--                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>-->
-<!--                    &lt;!&ndash;是否跳过docker build&ndash;&gt;-->
-<!--                    <skipDockerBuild>true</skipDockerBuild>-->
-<!--                    <dockerHost>${configuration.docker-one-Host}</dockerHost>-->
-<!--                    <resources>-->
-<!--                        <resource>-->
-<!--                            <targetPath>/</targetPath>-->
-<!--                            &lt;!&ndash;用于指定需要复制的根目录，${project.build.directory}表示target目录&ndash;&gt;-->
-<!--                            <directory>${project.build.directory}</directory>-->
-<!--                            &lt;!&ndash;用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。&ndash;&gt;-->
-<!--                            <include>${project.build.finalName}.jar</include>-->
-<!--                        </resource>-->
-<!--                    </resources>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>build-image</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>build</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--        &lt;!&ndash;如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置&ndash;&gt;-->
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <filtering>true</filtering>-->
-<!--            </resource>-->
-<!--        </resources>-->
-<!--    </build>-->
-   
-</project>
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-file/src/main/java/com/yanzhu/file/utils/FileUploadUtils.java b/yanzhu-modules/yanzhu-file/src/main/java/com/yanzhu/file/utils/FileUploadUtils.java
index fd0e78bf..b6593d10 100644
--- a/yanzhu-modules/yanzhu-file/src/main/java/com/yanzhu/file/utils/FileUploadUtils.java
+++ b/yanzhu-modules/yanzhu-file/src/main/java/com/yanzhu/file/utils/FileUploadUtils.java
@@ -10,7 +10,10 @@ import java.util.Objects;
 
 import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.io.FileUtil;
+import com.alibaba.nacos.common.utils.MD5Utils;
+import com.yanzhu.common.core.utils.ServletUtils;
 import com.yanzhu.common.core.utils.file.FileUtils;
+import com.yanzhu.common.core.utils.uuid.UUID;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.web.multipart.MultipartFile;
 import com.yanzhu.common.core.exception.file.FileNameLengthLimitExceededException;
@@ -260,7 +263,7 @@ public class FileUploadUtils
     public static final String extractFilename(MultipartFile file)
     {
         return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
-                FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), FileTypeUtils.getExtension(file));
+               MD5Utils.md5Hex(FilenameUtils.getBaseName(file.getOriginalFilename()),"utf-8"), Seq.getId(Seq.uploadSeqType), FileTypeUtils.getExtension(file));
     }
 
     private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
diff --git a/yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml
deleted file mode 100644
index 284fda00..00000000
--- a/yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9300
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-file
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-modules/yanzhu-flowable/pom.xml b/yanzhu-modules/yanzhu-flowable/pom.xml
deleted file mode 100644
index 7339194c..00000000
--- a/yanzhu-modules/yanzhu-flowable/pom.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>yanzhu</artifactId>
-        <groupId>com.yanzhu</groupId>
-        <version>3.6.2</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-modules-flowable</artifactId>
-
-    <properties>
-        <flowable.version>6.7.2</flowable.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
-    <description>
-        yanzhu-modules-flowable工作流模块
-    </description>
-
-    <dependencies>
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Swagger UI -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-
-        <!-- Apache Velocity -->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Log -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-log</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-mapper</artifactId>
-            <version>3.6.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!--el表达式计算-->
-        <dependency>
-            <groupId>com.googlecode.aviator</groupId>
-            <artifactId>aviator</artifactId>
-            <version>5.3.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.flowable</groupId>
-            <artifactId>flowable-spring-boot-starter</artifactId>
-            <version>${flowable.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.flowable</groupId>
-                    <artifactId>flowable-spring-security</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-<!--    <build>-->
-<!--        <finalName>${project.artifactId}</finalName>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--            &lt;!&ndash; docker-maven-plugin插件(不带Dockerfile文件) &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>1.2.0</version>-->
-<!--                <configuration>-->
-<!--                    &lt;!&ndash;用于指定镜像名称&ndash;&gt;-->
-<!--                    <imageName>${project.build.finalName}</imageName>-->
-<!--                    <imageTags>latest</imageTags>-->
-<!--                    &lt;!&ndash;用于指定基础镜像，相当于Dockerfile中的FROM指令&ndash;&gt;-->
-<!--                    <baseImage>openjdk:latest</baseImage>-->
-<!--                    &lt;!&ndash;相当于Dockerfile的ENTRYPOINT指令&ndash;&gt;-->
-<!--                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>-->
-<!--                    &lt;!&ndash;是否跳过docker build&ndash;&gt;-->
-<!--                    <skipDockerBuild>true</skipDockerBuild>-->
-<!--                    <dockerHost>${configuration.docker-two-Host}</dockerHost>-->
-<!--                    <resources>-->
-<!--                        <resource>-->
-<!--                            <targetPath>/</targetPath>-->
-<!--                            &lt;!&ndash;用于指定需要复制的根目录，${project.build.directory}表示target目录&ndash;&gt;-->
-<!--                            <directory>${project.build.directory}</directory>-->
-<!--                            &lt;!&ndash;用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。&ndash;&gt;-->
-<!--                            <include>${project.build.finalName}.jar</include>-->
-<!--                        </resource>-->
-<!--                    </resources>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>build-image</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>build</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--        &lt;!&ndash;如果不设置resource 会导致application.yml中的@@找不到pom文件中的配置&ndash;&gt;-->
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <filtering>true</filtering>-->
-<!--            </resource>-->
-<!--        </resources>-->
-<!--    </build>-->
-
-</project>
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-flowable/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-flowable/src/main/resources/bootstrap.yml
deleted file mode 100644
index caefefeb..00000000
--- a/yanzhu-modules/yanzhu-flowable/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9205
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-flowable
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: JiangYuQi
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-modules/yanzhu-gen/pom.xml b/yanzhu-modules/yanzhu-gen/pom.xml
deleted file mode 100644
index be477070..00000000
--- a/yanzhu-modules/yanzhu-gen/pom.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-modules</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-modules-gen</artifactId>
-
-    <description>
-        yanzhu-modules-gen代码生成
-    </description>
-
-    <dependencies>
-    	
-    	<!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-        
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-		
-        <!-- Swagger UI -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-        
-        <!-- Apache Velocity -->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-        </dependency>
-        
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Log -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-log</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- docker-maven-plugin插件(不带Dockerfile文件) -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.0</version>
-                <configuration>
-                    <!--用于指定镜像名称-->
-                    <imageName>${project.build.finalName}</imageName>
-                    <imageTags>latest</imageTags>
-                    <!--用于指定基础镜像，相当于Dockerfile中的FROM指令-->
-                    <baseImage>openjdk:latest</baseImage>
-                    <!--相当于Dockerfile的ENTRYPOINT指令-->
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <!--是否跳过docker build-->
-                    <skipDockerBuild>true</skipDockerBuild>
-                    <dockerHost>${configuration.docker-one-Host}</dockerHost>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <!--用于指定需要复制的根目录，${project.build.directory}表示target目录-->
-                            <directory>${project.build.directory}</directory>
-                            <!--用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。-->
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-   
-</project>
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-gen/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-gen/src/main/resources/bootstrap.yml
deleted file mode 100644
index 15150440..00000000
--- a/yanzhu-modules/yanzhu-gen/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9202
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-gen
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-modules/yanzhu-job/pom.xml b/yanzhu-modules/yanzhu-job/pom.xml
deleted file mode 100644
index 3f990b9e..00000000
--- a/yanzhu-modules/yanzhu-job/pom.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-modules</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-modules-job</artifactId>
-
-    <description>
-        yanzhu-modules-job定时任务
-    </description>
-
-    <dependencies>
-    	
-    	<!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-        
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-		
-        <!-- Swagger UI -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-		
-        <!-- Quartz -->
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.mchange</groupId>
-                    <artifactId>c3p0</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Log -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-log</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-        
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- docker-maven-plugin插件(不带Dockerfile文件) -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.0</version>
-                <configuration>
-                    <!--用于指定镜像名称-->
-                    <imageName>${project.build.finalName}</imageName>
-                    <imageTags>latest</imageTags>
-                    <!--用于指定基础镜像，相当于Dockerfile中的FROM指令-->
-                    <baseImage>openjdk:latest</baseImage>
-                    <!--相当于Dockerfile的ENTRYPOINT指令-->
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <!--是否跳过docker build-->
-                    <skipDockerBuild>true</skipDockerBuild>
-                    <dockerHost>${configuration.docker-two-Host}</dockerHost>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <!--用于指定需要复制的根目录，${project.build.directory}表示target目录-->
-                            <directory>${project.build.directory}</directory>
-                            <!--用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。-->
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-   
-</project>
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-job/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-job/src/main/resources/bootstrap.yml
deleted file mode 100644
index 9ac3298f..00000000
--- a/yanzhu-modules/yanzhu-job/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9203
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-job
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: JiangYuQi
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-modules/yanzhu-manage/pom.xml b/yanzhu-modules/yanzhu-manage/pom.xml
deleted file mode 100644
index efb0abec..00000000
--- a/yanzhu-modules/yanzhu-manage/pom.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>yanzhu</artifactId>
-        <groupId>com.yanzhu</groupId>
-        <version>3.6.2</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-modules-manage</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
-    <description>
-        yanzhu-modules-manage业务模块
-    </description>
-
-    <dependencies>
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Swagger UI -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-
-        <!-- Apache Velocity -->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Log -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-log</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
-        </dependency>
-
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-mapper</artifactId>
-            <version>3.6.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!--根据word模板生成word文件 开始-->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-        </dependency>
-
-        <!-- excel工具 -->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml-schemas</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.lowagie</groupId>
-            <artifactId>itext</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.lowagie</groupId>
-            <artifactId>itext-rtf</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.lowagie</groupId>
-            <artifactId>iTextAsian</artifactId>
-            <version>1.0.0</version>
-            <scope>system</scope>
-            <systemPath>${pom.basedir}/libs/iTextAsian-1.0.0.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.deepoove</groupId>
-            <artifactId>poi-tl</artifactId>
-        </dependency>
-        <!--根据word模板生成word文件 结束-->
-
-        <!--word文件转化为PDF文件 开始-->
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.aspose</groupId>
-            <artifactId>aspose-words</artifactId>
-            <version>15.8.0</version>
-            <scope>system</scope>
-            <systemPath>${pom.basedir}/libs/aspose-words-15.8.0-jdk16.jar</systemPath>
-        </dependency>
-        <!--word文件转化为PDF文件 结束-->
-
-        <!--pdf签名使用工具类-->
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>${itextpdf.version}</version>
-        </dependency>
-        <!--pdf签名使用工具类-->
-
-        <dependency>
-            <groupId>org.jsoup</groupId>
-            <artifactId>jsoup</artifactId>
-            <version>1.17.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.aspose</groupId>
-            <artifactId>aspose-tasks</artifactId>
-            <version>24.10</version>
-            <scope>system</scope>
-            <systemPath>${pom.basedir}/libs/aspose-tasks-24.10-jdk17.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.mpxj</groupId>
-            <artifactId>mpxj</artifactId>
-            <version>13.5.1</version> <!-- 请检查最新版本 -->
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                    <includeSystemScope>true</includeSystemScope>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-<!--    <build>-->
-<!--        <finalName>${project.artifactId}</finalName>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <configuration>-->
-<!--                    <includeSystemScope>true</includeSystemScope>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--            &lt;!&ndash; docker-maven-plugin插件(不带Dockerfile文件) &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>1.2.0</version>-->
-<!--                <configuration>-->
-<!--                    &lt;!&ndash;用于指定镜像名称&ndash;&gt;-->
-<!--                    <imageName>${project.build.finalName}</imageName>-->
-<!--                    <imageTags>latest</imageTags>-->
-<!--                    &lt;!&ndash;用于指定基础镜像，相当于Dockerfile中的FROM指令&ndash;&gt;-->
-<!--                    <baseImage>openjdk:latest</baseImage>-->
-<!--                    &lt;!&ndash;相当于Dockerfile的ENTRYPOINT指令&ndash;&gt;-->
-<!--                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>-->
-<!--                    &lt;!&ndash;是否跳过docker build&ndash;&gt;-->
-<!--                    <skipDockerBuild>true</skipDockerBuild>-->
-<!--                    <dockerHost>${configuration.docker-two-Host}</dockerHost>-->
-<!--                    <resources>-->
-<!--                        <resource>-->
-<!--                            <targetPath>/</targetPath>-->
-<!--                            &lt;!&ndash;用于指定需要复制的根目录，${project.build.directory}表示target目录&ndash;&gt;-->
-<!--                            <directory>${project.build.directory}</directory>-->
-<!--                            &lt;!&ndash;用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。&ndash;&gt;-->
-<!--                            <include>${project.build.finalName}.jar</include>-->
-<!--                        </resource>-->
-<!--                    </resources>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>build-image</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>build</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--        &lt;!&ndash;如果不设置resource 会导致application.yml中的@@找不到pom文件中的配置&ndash;&gt;-->
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <filtering>true</filtering>-->
-<!--            </resource>-->
-<!--        </resources>-->
-<!--    </build>-->
-
-</project>
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml
deleted file mode 100644
index 629215d5..00000000
--- a/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Tomcat
-server:
-  port: 9208
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-manage
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
-logging:
-  level:
-    com.ycx.manage.mapper: DEBUG
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-system/pom.xml b/yanzhu-modules/yanzhu-system/pom.xml
deleted file mode 100644
index ad21b65d..00000000
--- a/yanzhu-modules/yanzhu-system/pom.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.yanzhu</groupId>
-        <artifactId>yanzhu-modules</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-	
-    <artifactId>yanzhu-modules-system</artifactId>
-
-    <description>
-        yanzhu-modules-system系统模块
-    </description>
-	
-    <dependencies>
-
-        <!-- ShardingSphere 读写分离/分库分表 -->
-        <dependency>
-            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-jdbc-core-spring-boot-starter</artifactId>
-            <version>5.1.2</version>
-        </dependency>
-    	
-    	<!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        
-    	<!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-        
-    	<!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-		
-        <!-- Swagger UI -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-		
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common DataSource-->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-datasource</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Log -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-log</artifactId>
-        </dependency>
-        
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Datascope -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-datascope</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-mapper</artifactId>
-            <version>3.6.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-<!--    <build>-->
-<!--        <finalName>${project.artifactId}</finalName>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--            &lt;!&ndash; docker-maven-plugin插件(不带Dockerfile文件) &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>1.2.0</version>-->
-<!--                <configuration>-->
-<!--                    &lt;!&ndash;用于指定镜像名称&ndash;&gt;-->
-<!--                    <imageName>${project.build.finalName}</imageName>-->
-<!--                    <imageTags>latest</imageTags>-->
-<!--                    &lt;!&ndash;用于指定基础镜像，相当于Dockerfile中的FROM指令&ndash;&gt;-->
-<!--                    <baseImage>openjdk:latest</baseImage>-->
-<!--                    &lt;!&ndash;相当于Dockerfile的ENTRYPOINT指令&ndash;&gt;-->
-<!--                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>-->
-<!--                    &lt;!&ndash;是否跳过docker build&ndash;&gt;-->
-<!--                    <skipDockerBuild>true</skipDockerBuild>-->
-<!--                    <dockerHost>${configuration.docker-two-Host}</dockerHost>-->
-<!--                    <resources>-->
-<!--                        <resource>-->
-<!--                            <targetPath>/</targetPath>-->
-<!--                            &lt;!&ndash;用于指定需要复制的根目录，${project.build.directory}表示target目录&ndash;&gt;-->
-<!--                            <directory>${project.build.directory}</directory>-->
-<!--                            &lt;!&ndash;用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。&ndash;&gt;-->
-<!--                            <include>${project.build.finalName}.jar</include>-->
-<!--                        </resource>-->
-<!--                    </resources>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>build-image</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>build</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--        &lt;!&ndash;如果不设置resource 会导致application.yml中的@@找不到pom文件中的配置&ndash;&gt;-->
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <filtering>true</filtering>-->
-<!--            </resource>-->
-<!--        </resources>-->
-<!--    </build>-->
-   
-</project>
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml
deleted file mode 100644
index efe975fc..00000000
--- a/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9201
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-system
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: lijun
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-modules/yanzhu-wechat/pom.xml b/yanzhu-modules/yanzhu-wechat/pom.xml
deleted file mode 100644
index 39d06841..00000000
--- a/yanzhu-modules/yanzhu-wechat/pom.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>yanzhu</artifactId>
-        <groupId>com.yanzhu</groupId>
-        <version>3.6.2</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-modules-wechat</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
-    <description>
-        yanzhu-modules-wechat微信模块
-    </description>
-
-    <dependencies>
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Swagger UI -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-
-        <!-- Apache Velocity -->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Log -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-log</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-mapper</artifactId>
-            <version>3.6.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- docker-maven-plugin插件(不带Dockerfile文件) -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.0</version>
-                <configuration>
-                    <!--用于指定镜像名称-->
-                    <imageName>${project.build.finalName}</imageName>
-                    <imageTags>latest</imageTags>
-                    <!--用于指定基础镜像，相当于Dockerfile中的FROM指令-->
-                    <baseImage>openjdk:latest</baseImage>
-                    <!--相当于Dockerfile的ENTRYPOINT指令-->
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <!--是否跳过docker build-->
-                    <skipDockerBuild>true</skipDockerBuild>
-                    <dockerHost>${configuration.docker-one-Host}</dockerHost>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <!--用于指定需要复制的根目录，${project.build.directory}表示target目录-->
-                            <directory>${project.build.directory}</directory>
-                            <!--用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。-->
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-</project>
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-wechat/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-wechat/src/main/resources/bootstrap.yml
deleted file mode 100644
index c9ae24ee..00000000
--- a/yanzhu-modules/yanzhu-wechat/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9206
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-wechat
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: JiangYuQi
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-monitor/pom.xml b/yanzhu-monitor/pom.xml
deleted file mode 100644
index 103688b4..00000000
--- a/yanzhu-monitor/pom.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>yanzhu</artifactId>
-        <groupId>com.yanzhu</groupId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-monitor</artifactId>
-
-    <description>
-        yanzhu-monitor监控中心
-    </description>
-
-    <dependencies>
-        
-        <!-- SpringBoot Admin -->
-        <dependency>
-            <groupId>de.codecentric</groupId>
-            <artifactId>spring-boot-admin-starter-server</artifactId>
-            <version>${spring-boot-admin.version}</version>
-        </dependency>
-		
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-		
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-		
-        <!-- SpringBoot Web -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-		
-        <!-- Spring Security -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-		
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- docker-maven-plugin插件(不带Dockerfile文件) -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.0</version>
-                <configuration>
-                    <!--用于指定镜像名称-->
-                    <imageName>${project.build.finalName}</imageName>
-                    <imageTags>latest</imageTags>
-                    <!--用于指定基础镜像，相当于Dockerfile中的FROM指令-->
-                    <baseImage>openjdk:latest</baseImage>
-                    <!--相当于Dockerfile的ENTRYPOINT指令-->
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <!--是否跳过docker build-->
-                    <skipDockerBuild>true</skipDockerBuild>
-                    <!--suppress UnresolvedMavenProperty -->
-                    <dockerHost>${configuration.docker-one-Host}</dockerHost>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <!--用于指定需要复制的根目录，${project.build.directory}表示target目录-->
-                            <directory>${project.build.directory}</directory>
-                            <!--用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。-->
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <!--如果不设置resource 会导致bootstrap.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-   
-</project>
\ No newline at end of file
diff --git a/yanzhu-monitor/src/main/resources/bootstrap.yml b/yanzhu-monitor/src/main/resources/bootstrap.yml
deleted file mode 100644
index 2c9a1c66..00000000
--- a/yanzhu-monitor/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  port: 9100
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: yanzhu-monitor
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: JiangYuQi
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/yanzhu-rocketmq/pom.xml b/yanzhu-rocketmq/pom.xml
deleted file mode 100644
index 52ca2869..00000000
--- a/yanzhu-rocketmq/pom.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>yanzhu</artifactId>
-        <groupId>com.yanzhu</groupId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yanzhu-rocketmq</artifactId>
-
-    <dependencies>
-        <!--rocketmq消息队列-->
-        <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-client</artifactId>
-            <version> 4.9.0</version>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-client</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Log -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-log</artifactId>
-        </dependency>
-
-        <!-- YanZhu Common Swagger -->
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-swagger</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.yanzhu</groupId>
-            <artifactId>yanzhu-common-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
-        <!-- yml调用pom变量 -->
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.28</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- docker-maven-plugin插件(不带Dockerfile文件) -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.0</version>
-                <configuration>
-                    <!--用于指定镜像名称-->
-                    <imageName>${project.build.finalName}</imageName>
-                    <imageTags>latest</imageTags>
-                    <!--用于指定基础镜像，相当于Dockerfile中的FROM指令-->
-                    <baseImage>openjdk:latest</baseImage>
-                    <!--相当于Dockerfile的ENTRYPOINT指令-->
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <!--是否跳过docker build-->
-                    <skipDockerBuild>true</skipDockerBuild>
-                    <dockerHost>${configuration.docker-one-Host}</dockerHost>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <!--用于指定需要复制的根目录，${project.build.directory}表示target目录-->
-                            <directory>${project.build.directory}</directory>
-                            <!--用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。-->
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <!--如果不设置resource 会导致application.yml中的@@找不到pom文件中的配置-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/yanzhu-rocketmq/src/main/resources/bootstrap.yml b/yanzhu-rocketmq/src/main/resources/bootstrap.yml
deleted file mode 100644
index 368854c9..00000000
--- a/yanzhu-rocketmq/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-# Tomcat
-server:
-  port: 9207
-
-# Spring
-spring:
-  application:
-    # 应用名称
-    name: yanzhu-rocketmq
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: @discovery.server-addr@
-        # 服务分组
-        group: JiangYuQi
-      config:
-        # 配置中心地址
-        server-addr: @discovery.server-addr@
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
-  redisson:
-    singleServerConfig:
-      address: redis://localhost:6379
-
-logging:
-  level:
-    com.yanzhu.app.mapper: DEBUG
-
-
-
diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue
index 5da913ae..3cbf6b6d 100644
--- a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue
+++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue
@@ -716,6 +716,8 @@ function submitForm() {
           getList();
         });
       }
+    }else{
+      proxy.$modal.msgError("请检查必填数据(项目基本信息)");
     }
   });
 }

From 0ab4165788565979ca320b5a670db96acd3c785b Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Thu, 2 Jan 2025 22:40:43 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E5=83=8F?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=B8=8A=E4=BC=A0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yanzhu-ui-vue3/src/api/system/user.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/yanzhu-ui-vue3/src/api/system/user.js b/yanzhu-ui-vue3/src/api/system/user.js
index dc75a6d2..d0d83d00 100644
--- a/yanzhu-ui-vue3/src/api/system/user.js
+++ b/yanzhu-ui-vue3/src/api/system/user.js
@@ -114,6 +114,9 @@ export function uploadAvatar(data) {
   return request({
     url: '/system/user/profile/avatar',
     method: 'post',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+   },
     data: data
   })
 }

From 964a904cc1e426aad51e1d386056bf1f6795a6c9 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Thu, 2 Jan 2025 23:34:45 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91=E7=AE=A1=E7=90=86=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=A6=82=E6=9E=9C=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=A5=E6=9C=9F=E6=B2=A1=E6=9C=89=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=BF=9D=E5=AD=98=E7=9A=84=E6=97=B6=E5=80=99=E4=BC=9A?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=94=B9=E6=88=90=E4=B8=8D=E5=A1=AB=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/manage/ProMilestoneMapper.xml   | 2 +-
 yanzhu-ui-vue3/src/views/manage/milestone/index.vue           | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml
index f4512124..906f084f 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml
@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scheduledEnd != null  or 1==1">scheduled_end = #{scheduledEnd},</if>
             <if test="actualStart != null  or 1==1">actual_start = #{actualStart},</if>
             <if test="actualEnd != null  or 1==1">actual_end = #{actualEnd},</if>
-            <if test="days != null">days = #{days},</if>
+            <if test="days != null or 1==1">days = #{days},</if>
             <if test="explainInfo != null">explain_info = #{explainInfo},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="remark != null">remark = #{remark},</if>
diff --git a/yanzhu-ui-vue3/src/views/manage/milestone/index.vue b/yanzhu-ui-vue3/src/views/manage/milestone/index.vue
index 8cbc1bf0..c553b080 100644
--- a/yanzhu-ui-vue3/src/views/manage/milestone/index.vue
+++ b/yanzhu-ui-vue3/src/views/manage/milestone/index.vue
@@ -136,6 +136,10 @@ function handleUpdate(row) {
   objs.forEach(it => {
     it.comId = userStore.currentComId;
     it.projectId = userStore.currentPrjId;
+    it.actualEnd=it.actualEnd?proxy.$dt(it.actualEnd).format("YYYY-MM-DD"):'';
+    it.actualStart=it.actualStart?proxy.$dt(it.actualStart).format("YYYY-MM-DD"):'';
+    it.scheduledEnd=it.scheduledEnd?proxy.$dt(it.scheduledEnd).format("YYYY-MM-DD"):'';
+    it.scheduledStart=it.scheduledStart?proxy.$dt(it.scheduledStart).format("YYYY-MM-DD"):'';
   })
   if (objs.length == 0) {
     proxy.$modal.msgError("请输入节点名称!");

From 552f768190a90a1406e975ebef20f03647a7eee0 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Sat, 4 Jan 2025 00:53:16 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yanzhu-bigscreen/src/api/detail.js            |  12 +-
 yanzhu-bigscreen/src/components/header.vue    | 263 ++++++++++++++++--
 .../src/pages-old/projectDetail.vue           |  49 ++--
 yanzhu-bigscreen/src/views/projectDetail.vue  |   2 +-
 yanzhu-bigscreen/src/views/videoMonitor.vue   |   2 +-
 .../manage/mapper/ProProjectInfoMapper.java   |   2 +
 .../mapper/manage/ProProjectInfoMapper.xml    |  38 ++-
 .../ProProjectInfoSubdeptsUsersMapper.xml     |   2 +-
 .../controller/ProProjectInfoController.java  |   2 +-
 .../service/IProProjectInfoService.java       |   2 +
 .../impl/ProProjectInfoServiceImpl.java       |   5 +
 11 files changed, 316 insertions(+), 63 deletions(-)

diff --git a/yanzhu-bigscreen/src/api/detail.js b/yanzhu-bigscreen/src/api/detail.js
index 9d1ef10a..9c5a2c4b 100644
--- a/yanzhu-bigscreen/src/api/detail.js
+++ b/yanzhu-bigscreen/src/api/detail.js
@@ -133,16 +133,16 @@ const costOutputSelectYearAndMonth=(data)=> {
             return it;
         });
         let y=data.year;
-        let m=data.month-1;
-        if(m==0){
-            m=12;
-            y--;
-        }
+        let m=data.month;
+        //if(m==0){
+        //    m=12;
+        //    y--;
+        //}
         let tmps2=(res[1].data||[]).map(it=>{
             it.money=it.money?it.money/10000.0:0;
             return it;
         });
-        let curM=tmps2.filter(it=>it.costType==9 && it.year==y && it.month==m);
+        let curM=tmps.filter(it=>it.costType==9 && it.year==y && it.month==m);
         curM=curM.length>0?curM[0]:{};
 
         let totalObjs=tmps.filter(it=>it.costType==9);
diff --git a/yanzhu-bigscreen/src/components/header.vue b/yanzhu-bigscreen/src/components/header.vue
index 0159b1ca..bb6c20db 100644
--- a/yanzhu-bigscreen/src/components/header.vue
+++ b/yanzhu-bigscreen/src/components/header.vue
@@ -5,21 +5,101 @@
                 <div class="head-title-tab">
                     <div :class="nav == 1 ? 'head-nav active' : 'head-nav'" @click="doNav(1)">项目概况</div>
                     <div :class="nav == 2 ? 'head-nav active' : 'head-nav'" @click="doNav(2)">项目详情</div>
-                    <div :class="nav == 3 ? 'head-nav active' : 'head-nav'" @click="doNav(3)">安全管理</div>
-                    <div :class="nav == 4 ? 'head-nav active' : 'head-nav'" @click="doNav(4)">质量管理</div>
-                    <div :class="nav == 5 ? 'head-nav active' : 'head-nav'" @click="doNav(5)">进度管理</div>
-                    <div :class="nav == 7 ? 'head-nav active' : 'head-nav'" @click="doNav(7)">视频监控</div>
+                    <div :class="(nav >= 300 && nav < 400) || nav == 3 ? 'head-nav active' : 'head-nav'"
+                        style="position: relative;" class="has-submenu">
+                        <div @click="doNav(3)">安全管理</div>
+                        <div class="header-btn-list">
+                            <div class="header-btn-list-arrow"></div>
+                            <div class="header-btn-list-item" style="">
+                                <div class="header-btn-list-padding menu-row1" style="text-align: left;">
+                                    <button type="button" :class="nav == 301 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(301)">安全隐患排查</button>
+                                    <button type="button" :class="nav == 302 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(302)">教育培训</button>
+                                    <button type="button" :class="nav == 303 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(303)">基坑监测</button>
+                                    <button type="button" :class="nav == 304 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(304)">塔基监测</button>
+                                </div>
+                                <div class="header-btn-list-padding menu-row1" style="text-align: left;">
+                                    <button type="button" :class="nav == 305 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(305)">高支模监测</button>
+                                    <button type="button" :class="nav == 306 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(306)">配电箱监测</button>
+                                    <button type="button" :class="nav == 307 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(307)">爬架监测</button>
+                                    <button type="button" :class="nav == 308 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(308)">施工电梯监测</button>
+                                </div>
+                                <div class="header-btn-list-padding menu-row1" style="text-align: left;">
+                                    <button type="button" :class="nav == 309 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(309)">视频监控</button>
+                                    <button type="button" :class="nav == 310 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(310)">AI测控</button>
+                                    <button type="button" :class="nav == 311 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(311)">标准化管理</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div :class="(nav >= 400 && nav < 500) || nav == 4 ? 'head-nav active' : 'head-nav'"
+                        style="position: relative;" class="has-submenu">
+                        <div @click="doNav(4)">质量管理</div>
+                        <div class="header-btn-list">
+                            <div class="header-btn-list-arrow"></div>
+                            <div class="header-btn-list-item" style="">
+                                <div class="header-btn-list-padding menu-row1" style="text-align: left;">
+                                    <button type="button" :class="nav == 401 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(401)">质量隐患排查</button>
+                                    <button type="button" :class="nav == 402 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(402)">材料取样复试</button>
+                                    <button type="button" :class="nav == 403 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(403)">举牌验收</button>
+                                    <button type="button" :class="nav == 404 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(404)">标养室监测</button>
+                                </div>
+                                <div class="header-btn-list-padding menu-row1" style="text-align: left;">
+                                    <button type="button" :class="nav == 405 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(405)">标准化管理</button>
+                                    <button type="button" :class="nav == 406 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(406)">混泥土监测</button>
+                                    <button type="button" :class="nav == 407 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(407)">爬架监测</button>
+                                    <button type="button" :class="nav == 408 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(408)">施工电梯监测</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div :class="(nav >= 500 && nav < 600) || nav == 5 ? 'head-nav active' : 'head-nav'"
+                        style="position: relative;" class="has-submenu">
+                        <div @click="doNav(5)">进度管理</div>
+                        <div class="header-btn-list">
+                            <div class="header-btn-list-arrow"></div>
+                            <div class="header-btn-list-item" style="">
+                                <div class="header-btn-list-padding menu-row1" style="text-align: left;">
+                                    <button type="button" :class="nav == 5 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(5)">进度管理</button>
+                                    <button type="button" :class="nav == 501 ? 'active' : ''" class="sub-btn"
+                                        @click="doNav(501)">延时摄影</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
                 </div>
             </el-col>
             <el-col :span="8" class="header-center">
+                <img class="prj-logo" :src="selProject.setting.orgLogo"
+                    v-if="selProject && selProject.setting && selProject.setting.orgLogo" />
                 数字建安施工管理平台
             </el-col>
             <el-col :span="8">
                 <div class="head-title-tab" style="display: inline-block">
-                <div :class="nav == 6 ? 'head-nav active' : 'head-nav'" @click="doNav(6)">绿碳中心</div>
+                    <div :class="nav == 6 ? 'head-nav active' : 'head-nav'" @click="doNav(6)">绿碳中心</div>
                 </div>
                 <div class="header-title-user-info" style="display:inline-block;float:right;">
-                    <el-select v-model="selProject" popper-class="header-sel-project-pop"
+                    <el-select v-model="selProjectId" popper-class="header-sel-project-pop"
                         style="width: 150px;margin-right: 20px;height:30px;line-height: 30px;"
                         @change="doProjectSelect">
                         <el-option v-for="it in projects" :key="it.id" :label="it.projectName"
@@ -29,22 +109,23 @@
                         <i class="el-icon-switch-button"></i>
                     </span>
                 </div>
-                <i class="set-fullscreen set-font-size" style="margin-left: 16px;position: absolute;top: 0px;right: 24px;"
-            @click="toggleFullScreen">
-            <svg class="icon" v-if="!isFullScreen"
-                style="width: 20px; vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024"
-                version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3304">
-                <path
-                    d="M145.066667 85.333333h153.6c25.6 0 42.666667-17.066667 42.666666-42.666666S324.266667 0 298.666667 0H34.133333C25.6 0 17.066667 8.533333 8.533333 17.066667 0 25.6 0 34.133333 0 42.666667v256c0 25.6 17.066667 42.666667 42.666667 42.666666s42.666667-17.066667 42.666666-42.666666V145.066667l230.4 230.4c17.066667 17.066667 42.666667 17.066667 59.733334 0 17.066667-17.066667 17.066667-42.666667 0-59.733334L145.066667 85.333333z m170.666666 563.2L162.133333 802.133333l-76.8 76.8V725.333333C85.333333 699.733333 68.266667 682.666667 42.666667 682.666667s-42.666667 17.066667-42.666667 42.666666v256c0 25.6 17.066667 42.666667 42.666667 42.666667h256c25.6 0 42.666667-17.066667 42.666666-42.666667s-17.066667-42.666667-42.666666-42.666666H145.066667l76.8-76.8 153.6-153.6c17.066667-17.066667 17.066667-42.666667 0-59.733334-17.066667-17.066667-42.666667-17.066667-59.733334 0z m665.6 34.133334c-25.6 0-42.666667 17.066667-42.666666 42.666666v153.6l-76.8-76.8-153.6-153.6c-17.066667-17.066667-42.666667-17.066667-59.733334 0-17.066667 17.066667-17.066667 42.666667 0 59.733334l153.6 153.6 76.8 76.8H725.333333c-25.6 0-42.666667 17.066667-42.666666 42.666666s17.066667 42.666667 42.666666 42.666667h256c25.6 0 42.666667-17.066667 42.666667-42.666667v-256c0-25.6-17.066667-42.666667-42.666667-42.666666z m0-682.666667h-256c-25.6 0-42.666667 17.066667-42.666666 42.666667s17.066667 42.666667 42.666666 42.666666h153.6l-76.8 76.8-153.6 153.6c-17.066667 17.066667-17.066667 42.666667 0 59.733334 17.066667 17.066667 42.666667 17.066667 59.733334 0l153.6-153.6 76.8-76.8v153.6c0 25.6 17.066667 42.666667 42.666666 42.666666s42.666667-17.066667 42.666667-42.666666v-256c0-25.6-17.066667-42.666667-42.666667-42.666667z"
-                    fill="" p-id="3305"></path>
-            </svg>
-            <svg class="icon" v-else style="width: 24px; vertical-align: middle;fill: currentColor;overflow: hidden;"
-                viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3952">
-                <path
-                    d="M384 597.333333h-256c-25.6 0-42.666667 17.066667-42.666667 42.666667s17.066667 42.666667 42.666667 42.666667h153.6L17.066667 947.2c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733333 0L341.333333 742.4v153.6c0 25.6 17.066667 42.666667 42.666667 42.666667s42.666667-17.066667 42.666667-42.666667v-256c0-25.6-17.066667-42.666667-42.666667-42.666667z m358.4 85.333334h153.6c25.6 0 42.666667-17.066667 42.666667-42.666667s-17.066667-42.666667-42.666667-42.666667h-256c-25.6 0-42.666667 17.066667-42.666667 42.666667v256c0 25.6 17.066667 42.666667 42.666667 42.666667s42.666667-17.066667 42.666667-42.666667V742.4l264.533333 264.533333c17.066667 17.066667 42.666667 17.066667 59.733333 0 17.066667-17.066667 17.066667-42.666667 0-59.733333L742.4 682.666667zM640 426.666667h256c25.6 0 42.666667-17.066667 42.666667-42.666667s-17.066667-42.666667-42.666667-42.666667H742.4L1006.933333 76.8c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733333 0L682.666667 281.6V128c0-25.6-17.066667-42.666667-42.666667-42.666667s-42.666667 17.066667-42.666667 42.666667v256c0 25.6 17.066667 42.666667 42.666667 42.666667z m-256-341.333334c-25.6 0-42.666667 17.066667-42.666667 42.666667v153.6L76.8 8.533333C59.733333 0 25.6 0 8.533333 8.533333 0 25.6 0 59.733333 8.533333 76.8L281.6 341.333333H128c-25.6 0-42.666667 17.066667-42.666667 42.666667s17.066667 42.666667 42.666667 42.666667h256c25.6 0 42.666667-17.066667 42.666667-42.666667v-256c0-25.6-17.066667-42.666667-42.666667-42.666667z"
-                    p-id="3953"></path>
-            </svg>
-        </i>
+                <i class="set-fullscreen set-font-size"
+                    style="margin-left: 16px;position: absolute;top: 0px;right: 24px;" @click="toggleFullScreen">
+                    <svg class="icon" v-if="!isFullScreen"
+                        style="width: 20px; vertical-align: middle;fill: currentColor;overflow: hidden;"
+                        viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3304">
+                        <path
+                            d="M145.066667 85.333333h153.6c25.6 0 42.666667-17.066667 42.666666-42.666666S324.266667 0 298.666667 0H34.133333C25.6 0 17.066667 8.533333 8.533333 17.066667 0 25.6 0 34.133333 0 42.666667v256c0 25.6 17.066667 42.666667 42.666667 42.666666s42.666667-17.066667 42.666666-42.666666V145.066667l230.4 230.4c17.066667 17.066667 42.666667 17.066667 59.733334 0 17.066667-17.066667 17.066667-42.666667 0-59.733334L145.066667 85.333333z m170.666666 563.2L162.133333 802.133333l-76.8 76.8V725.333333C85.333333 699.733333 68.266667 682.666667 42.666667 682.666667s-42.666667 17.066667-42.666667 42.666666v256c0 25.6 17.066667 42.666667 42.666667 42.666667h256c25.6 0 42.666667-17.066667 42.666666-42.666667s-17.066667-42.666667-42.666666-42.666666H145.066667l76.8-76.8 153.6-153.6c17.066667-17.066667 17.066667-42.666667 0-59.733334-17.066667-17.066667-42.666667-17.066667-59.733334 0z m665.6 34.133334c-25.6 0-42.666667 17.066667-42.666666 42.666666v153.6l-76.8-76.8-153.6-153.6c-17.066667-17.066667-42.666667-17.066667-59.733334 0-17.066667 17.066667-17.066667 42.666667 0 59.733334l153.6 153.6 76.8 76.8H725.333333c-25.6 0-42.666667 17.066667-42.666666 42.666666s17.066667 42.666667 42.666666 42.666667h256c25.6 0 42.666667-17.066667 42.666667-42.666667v-256c0-25.6-17.066667-42.666667-42.666667-42.666666z m0-682.666667h-256c-25.6 0-42.666667 17.066667-42.666666 42.666667s17.066667 42.666667 42.666666 42.666666h153.6l-76.8 76.8-153.6 153.6c-17.066667 17.066667-17.066667 42.666667 0 59.733334 17.066667 17.066667 42.666667 17.066667 59.733334 0l153.6-153.6 76.8-76.8v153.6c0 25.6 17.066667 42.666667 42.666666 42.666666s42.666667-17.066667 42.666667-42.666666v-256c0-25.6-17.066667-42.666667-42.666667-42.666667z"
+                            fill="" p-id="3305"></path>
+                    </svg>
+                    <svg class="icon" v-else
+                        style="width: 24px; vertical-align: middle;fill: currentColor;overflow: hidden;"
+                        viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3952">
+                        <path
+                            d="M384 597.333333h-256c-25.6 0-42.666667 17.066667-42.666667 42.666667s17.066667 42.666667 42.666667 42.666667h153.6L17.066667 947.2c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733333 0L341.333333 742.4v153.6c0 25.6 17.066667 42.666667 42.666667 42.666667s42.666667-17.066667 42.666667-42.666667v-256c0-25.6-17.066667-42.666667-42.666667-42.666667z m358.4 85.333334h153.6c25.6 0 42.666667-17.066667 42.666667-42.666667s-17.066667-42.666667-42.666667-42.666667h-256c-25.6 0-42.666667 17.066667-42.666667 42.666667v256c0 25.6 17.066667 42.666667 42.666667 42.666667s42.666667-17.066667 42.666667-42.666667V742.4l264.533333 264.533333c17.066667 17.066667 42.666667 17.066667 59.733333 0 17.066667-17.066667 17.066667-42.666667 0-59.733333L742.4 682.666667zM640 426.666667h256c25.6 0 42.666667-17.066667 42.666667-42.666667s-17.066667-42.666667-42.666667-42.666667H742.4L1006.933333 76.8c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733333 0L682.666667 281.6V128c0-25.6-17.066667-42.666667-42.666667-42.666667s-42.666667 17.066667-42.666667 42.666667v256c0 25.6 17.066667 42.666667 42.666667 42.666667z m-256-341.333334c-25.6 0-42.666667 17.066667-42.666667 42.666667v153.6L76.8 8.533333C59.733333 0 25.6 0 8.533333 8.533333 0 25.6 0 59.733333 8.533333 76.8L281.6 341.333333H128c-25.6 0-42.666667 17.066667-42.666667 42.666667s17.066667 42.666667 42.666667 42.666667h256c25.6 0 42.666667-17.066667 42.666667-42.666667v-256c0-25.6-17.066667-42.666667-42.666667-42.666667z"
+                            p-id="3953"></path>
+                    </svg>
+                </i>
             </el-col>
         </el-row>
     </div>
@@ -55,7 +136,8 @@ export default {
     data() {
         return {
             nav: 1,
-            selProject: '',
+            selProject: null,
+            selProjectId: '',
             projects: [],
             isFullScreen: false,
         }
@@ -79,7 +161,7 @@ export default {
             this.projects = d.rows || [];
             if (this.projects.length > 0) {
                 let id = localStorage.getItem("selProj") || this.projects[0].id
-                this.selProject = +id;
+                this.selProjectId = +id;
                 this.doProjectSelect();
             }
         });
@@ -93,21 +175,44 @@ export default {
             }, 400);
         },
         doProjectSelect() {
-            let tmps = this.projects.filter(d => d.id == this.selProject);
+            let tmps = this.projects.filter(d => d.id == this.selProjectId);
             if (tmps.length > 0) {
                 this.$store.dispatch('SetSelProject', tmps[0]);
+                this.selProject = tmps[0];
             } else {
                 this.$store.dispatch('SetSelProject', null);
+                this.selProject = null;
             }
-            localStorage.setItem("selProj", this.selProject);
+            localStorage.setItem("selProj", this.selProjectId);
         },
         doNav(n) {
             if (this.nav == n) {
                 return;
             }
             this.nav = n;
-            let path = ["/index", "/detail", "/prjSafety", "/prjQuality", "/prjProgress","/greenCarbon","/videoMonitor"][n - 1];
-            this.$router.push(path);
+            switch (n) {
+                case 1:
+                    this.$router.push("/index");
+                    break;
+                case 2:
+                    this.$router.push("/detail");
+                    break;
+                case 3:
+                    this.$router.push("/prjSafety");
+                    break;
+                case 309:
+                    this.$router.push("/videoMonitor");
+                    break;
+                case 4:
+                    this.$router.push("/prjQuality");
+                    break;
+                case 5:
+                    this.$router.push("/prjProgress");
+                    break;
+                case 6:
+                    this.$router.push("/greenCarbon");
+                    break;
+            }
         },
         doLogout() {
             this.$confirm('确定注销并退出系统吗？', '提示', {
@@ -133,6 +238,65 @@ export default {
         color: #3da2ff;
         font-size: 32px;
         font-weight: bold;
+
+        .prj-logo {
+            width: 40px;
+            height: 40px;
+            vertical-align: middle;
+            border-radius: 20px;
+        }
+    }
+
+    .head-title-tab {
+        .has-submenu {
+            &:hover {
+                .header-btn-list {
+                    display: block;
+                }
+            }
+
+            .header-btn-list {
+                display: none;
+
+                .header-btn-list-item {
+                    .header-btn-list-padding {
+                        padding: 0px;
+
+                        button {
+                            width: 120px;
+                        }
+
+                        &.menu-row2 {
+                            .sub-btn {
+                                color: #fff;
+
+                                &:hover {
+                                    color: #ccc;
+                                }
+                            }
+                        }
+
+                        &.menu-row1 {
+                            .sub-btn {
+                                color: rgb(1, 169, 255);
+
+                                &:hover {
+                                    color: #fff;
+                                }
+                            }
+                        }
+
+                        .sub-btn {
+                            &.active {
+                                color: #ffffffaa;
+                            }
+                        }
+                    }
+
+                }
+            }
+
+        }
     }
 }
 
@@ -145,6 +309,12 @@ export default {
             padding: 5px 40px;
             position: relative;
             top: -8px;
+            .prj-logo {
+                width: 40px;
+                height: 40px;
+                vertical-align: middle;
+                border-radius: 20px;
+            }
         }
     }
 
@@ -163,20 +333,41 @@ export default {
             top: -5px;
         }
     }
+
     .header-sel-project-pop {
         transform: scale(1.5);
         width: 200px;
         min-width: unset !important;
         margin-left: 50px;
     }
+
+    .head-title-tab {
+        .header-btn-list {
+            top: 40px;
+            left: 40px;
+
+            .sub-btn {
+                font-size: 18px;
+                width: 140px !important;
+                line-height: 40px;
+                height: 40px;
+            }
+        }
+    }
 }
 
 @media (min-width: 2561px) {
-    
+
 
     .header-center {
         font-size: 52px !important;
         margin-top: 10px;
+        .prj-logo {
+                width: 50px;
+                height: 50px;
+                vertical-align: middle;
+                border-radius: 25px;
+            }
     }
 
     .header-title-user-info {
@@ -196,5 +387,19 @@ export default {
         min-width: unset !important;
         margin-left: 100px;
     }
+
+    .head-title-tab {
+        .header-btn-list {
+            top: 50px;
+            left: 50px;
+
+            .sub-btn {
+                font-size: 24px;
+                width: 160px !important;
+                line-height: 50px;
+                height: 50px;
+            }
+        }
+    }
 }
 </style>
\ No newline at end of file
diff --git a/yanzhu-bigscreen/src/pages-old/projectDetail.vue b/yanzhu-bigscreen/src/pages-old/projectDetail.vue
index 94907f35..93044633 100644
--- a/yanzhu-bigscreen/src/pages-old/projectDetail.vue
+++ b/yanzhu-bigscreen/src/pages-old/projectDetail.vue
@@ -95,7 +95,7 @@
                   今日出勤
                 </div>
               </div>
-              <img src="images/icon2001.png" v-show="laborPersonnelTotal > 0 "
+              <img src="images/icon2001.png" v-show="laborPersonnelTotal > 0"
                 style="position: absolute; cursor: pointer; right: 20px; top: 12px" @click="doShowAttendanceDetail" />
               <el-row :key="elDeptWorks">
                 <el-col :span="8">
@@ -123,7 +123,7 @@
                 <el-carousel height="100%" :autoplay="false">
                   <el-carousel-item v-for="(item, idx) in photographyList" :key="idx">
                     <video controls class="photography-video">
-                      <source :src="item.videoUrl" type="video/mp4" :key="item.videoUrl"/>
+                      <source :src="item.videoUrl" type="video/mp4" :key="item.videoUrl" />
                       您的浏览器不支持Video标签。
                     </video>
                     <div class="photography-list-title">
@@ -304,9 +304,10 @@
                         计划开工日期
                       </p>
                       <div>
-                        <span>{{
-          fmtDate(getCurProject().scheduledStartTime || "")
-        }}</span>
+                        <span>
+                          {{getCurProject()}}{{
+                          fmtDate(getCurProject().scheduledStartTime || "")
+                          }}</span>
                       </div>
                     </div>
                   </div>
@@ -355,8 +356,8 @@
                       </p>
                       <div>
                         <span>{{
-            fmtDate(getCurProject().plannedCompletionTime || "")
-          }}</span>
+                          fmtDate(getCurProject().plannedCompletionTime || "")
+                          }}</span>
                       </div>
                     </div>
                   </div>
@@ -513,9 +514,9 @@
                           实际：{{ item.endDate || "--" }}
                         </div>
                         <div v-if="item.finishState > 0" class="project-expect-state dangerous-time-nav" :class="(item.finishState == 1 ? 'active' : '') +
-          ' state-' +
-          item.finishState
-          ">
+                          ' state-' +
+                          item.finishState
+                          ">
                           {{ item.finish }}
                         </div>
                       </div>
@@ -914,13 +915,13 @@ export default {
       this.projectLvlDict = d || [];
     });
   },
-  mounted() {    
+  mounted() {
     this.$bus.$on(
       "projectChange",
       debounce((res) => {
-        this.project = res||this.$root.project;
-        this.dept=this.$root.dept||this.dept;
-        this.prjs= this.$root.projects||this.prjs;
+        this.project = res || this.$root.project;
+        this.dept = this.$root.dept || this.dept;
+        this.prjs = this.$root.projects || this.prjs;
         this.mapName = "";
         if (res.id == 0) {
           if (this.prjs.length > 1) {
@@ -932,7 +933,7 @@ export default {
         this.loadData();
         this.loadFilshNode();
       })
-    );    
+    );
     if (this.$root.hasInitHeader) {
       this.initMe();
     }
@@ -942,14 +943,14 @@ export default {
      * 劳资预警详情弹窗
      */
     doFlowLabourDlg() {
-      if(this.project.id==0){
-        if(this.prjs.length>1){
+      if (this.project.id == 0) {
+        if (this.prjs.length > 1) {
           this.$refs.flowLabourDlg.showDialog(this.prjs[1]);
         }
-      }else{
+      } else {
         this.$refs.flowLabourDlg.showDialog(this.project);
       }
-      
+
     },
     getFloorArea() {
       this.getProjectId((id) => {
@@ -982,7 +983,7 @@ export default {
         } else {
           this.$refs.jobWorkerdlg.showDialog({
             ...data,
-            type:this.infoNav,
+            type: this.infoNav,
             total: this.laborPersonnelTotal,
             datas: this.laborPersonnelData.map((it) => {
               return {
@@ -1068,11 +1069,11 @@ export default {
       }
       if (this.project.id == 0) {
         if (this.prjs.length > 1) {
-          return this.prjs[1];
+          return this.prjs[1]||{};
         }
         return {};
       }
-      return this.project;
+      return this.project||{};
     },
     getProjectId(cb) {
       let func = () => {
@@ -1680,9 +1681,11 @@ export default {
     width: calc(100% - 4px);
     height: calc(100% - 26px);
     padding-left: 1px;
-    .el-carousel{
+
+    .el-carousel {
       height: 100%;
     }
+
     .photography-video {
       width: 100%;
       height: calc(100% - 30px);
diff --git a/yanzhu-bigscreen/src/views/projectDetail.vue b/yanzhu-bigscreen/src/views/projectDetail.vue
index 11b4a595..bc5cb0d7 100644
--- a/yanzhu-bigscreen/src/views/projectDetail.vue
+++ b/yanzhu-bigscreen/src/views/projectDetail.vue
@@ -214,7 +214,7 @@
                         <div class="modify-btn">
                             <img src="images/foot_left.png" @click="modifyLeftBtn" />
                         </div>
-                        <div class="modify-content" id="modifyContent">
+                        <div class="modify-content" id="modifyContent" v-if="selProject">
                             <div class="modify-content-overflow">
                                 <div class="project-amount">
                                     <div class="project-amount-bgd">
diff --git a/yanzhu-bigscreen/src/views/videoMonitor.vue b/yanzhu-bigscreen/src/views/videoMonitor.vue
index 8a5ef6b9..e842bbab 100644
--- a/yanzhu-bigscreen/src/views/videoMonitor.vue
+++ b/yanzhu-bigscreen/src/views/videoMonitor.vue
@@ -76,7 +76,7 @@ export default {
         }
     },
     mounted() {
-        this.$store.dispatch('ChangeNav', 7);
+        this.$store.dispatch('ChangeNav', 309);
         this.dpi = this.$dpi();
         window.addEventListener("resize", () => {
             if (this.dpi != this.$dpi()) {
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java
index 73bbc81c..cf586b6e 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java
@@ -74,4 +74,6 @@ public interface ProProjectInfoMapper
      * @return
      */
     public int updateDept(ProDept proDept);
+
+    List<ProProjectInfo> selectMyProjectList(ProProjectInfo proProjectInfo);
 }
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml
index 7a0b2937..73b634e8 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml
@@ -345,5 +345,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </set>
         where dept_id = #{deptId}
     </update>
-
+    <select id="selectMyProjectList" parameterType="ProProjectInfo" resultMap="ProProjectInfoResult">
+        select pi.id, pi.com_id,  pi.dis_dept_id, pi.project_name,
+        pi.project_code, pi.simple_name, pi.project_type, sdd1.dict_label as project_type_name, pi.project_level, pi.project_regional, pi.project_package, pi.project_address, pi.project_nature,
+        pi.tech_leader,pi.tech_leader_phone,pi.province,pi.city,pi.district,
+        pi.licence_number, pi.project_person, pi.project_person_phone, pi.longitude, pi.latitude, pi.project_time_limit, pi.total_investment,
+        pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time,
+        pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status,
+        pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark,
+        ps.id ps_id,ps.org_name ps_org_name,ps.org_logo ps_org_logo,ps.org_image ps_org_image,ps.org_video ps_org_video,ps.org_plane ps_org_plane
+        from pro_project_info pi
+        left join pro_project_info_setting ps on pi.id=ps.project_id
+        left join sys_dict_data sdd1 on sdd1.dict_value = pi.project_type and sdd1.dict_type='pro_project_type'
+        <if test="currentUserId != null "> left join pro_project_info_users pu on pu.project_id = pi.id </if>
+        <if test="currentUserId != null "> left join pro_project_info_subdepts_users psu on psu.project_id = pi.id </if>
+        <where>
+            <if test="comId != null "> and pi.com_id = #{comId}</if>
+            <if test="disDeptId != null "> and pi.dis_dept_id = #{disDeptId}</if>
+            <if test="activeComId != null "> and pi.com_id = #{activeComId}</if>
+            <if test="currentUserId != null"> and ((pu.user_id = #{currentUserId} and pu.use_status='1' and pu.is_del=0) or (psu.user_id = #{currentUserId} and approve_status <![CDATA[ >= ]]> 100 and psu.user_id = #{currentUserId} and psu.use_status='1' and psu.is_del=0))</if>
+            <if test="projectName != null and projectName != ''"> and pi.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="projectCode != null and projectCode != ''"> and pi.project_code = #{projectCode}</if>
+            <if test="simpleName != null and simpleName != ''"> and pi.simple_name like concat('%', #{simpleName}, '%')</if>
+            <if test="techLeader != null and techLeader != ''"> and pi.tech_leader like concat('%', #{techLeader}, '%')</if>
+            <if test="techLeaderPhone != null and techLeaderPhone != ''"> and pi.tech_leader_phone like concat('%', #{techLeaderPhone}, '%')</if>
+            <if test="province != null and province != ''"> and pi.province like concat('%', #{province}, '%')</if>
+            <if test="city != null and city != ''"> and pi.city like concat('%', #{city}, '%')</if>
+            <if test="district != null and district != ''"> and pi.district like concat('%', #{district}, '%')</if>
+            <if test="projectType != null and projectType != ''"> and pi.project_type = #{projectType}</if>
+            <if test="projectLevel != null and projectLevel != ''"> and pi.project_level = #{projectLevel}</if>
+            <if test="projectPerson != null and projectPerson != ''"> and pi.project_person = #{projectPerson}</if>
+            <if test="projectPersonPhone != null and projectPersonPhone != ''"> and pi.project_person_phone = #{projectPersonPhone}</if>
+            <if test="projectStatus != null and projectStatus != ''"> and pi.project_status = #{projectStatus}</if>
+            <if test="isDel != null "> and pi.is_del = #{isDel}</if>
+        </where>
+        <if test="currentUserId == null "> order by pi.project_sort, pi.id desc</if>
+        <if test="currentUserId != null "> order by pu.sort_by, pi.id desc</if>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml
index 39a6d94d..a95c0ac3 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml
@@ -274,7 +274,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) u
         ON u.craft_type = dic.dict_value
         WHERE
-        dic.dict_type = 'pro_craft_type';
+        dic.dict_type = 'pro_craft_type'
 
     </select>
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java
index a5056338..54533d96 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java
@@ -149,7 +149,7 @@ public class ProProjectInfoController extends BaseController
         if(StringUtils.isNotEmpty(list)){
             return getDataTable(list);
         }
-        list = proProjectInfoService.selectProProjectInfoList(proProjectInfo);
+        list = proProjectInfoService.selectMyProjectList(proProjectInfo);
         redisService.setCacheObject(key, list, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
         return getDataTable(list);
     }
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoService.java
index b61289cb..5f35a6e8 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoService.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoService.java
@@ -70,4 +70,6 @@ public interface IProProjectInfoService
      * 加载地址信息到缓存
      */
     public void loadingProjectsCache();
+
+    public List<ProProjectInfo> selectMyProjectList(com.yanzhu.manage.domain.ProProjectInfo proProjectInfo);
 }
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java
index 17fffccc..6a81dc30 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java
@@ -88,6 +88,11 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService
         }
     }
 
+    @Override
+    public List<ProProjectInfo> selectMyProjectList(ProProjectInfo proProjectInfo) {
+        return proProjectInfoMapper.selectMyProjectList(proProjectInfo);
+    }
+
     /**
      * 查询项目信息
      *