diff --git a/pom.xml b/pom.xml
index ff640c39..9e83d91a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.mingsoft</groupId>
         <artifactId>ms-pom</artifactId>
-        <version>2.0.1.RELEASE</version>
+        <version>2.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.mingsoft</groupId>
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 42b78104..4f1183c4 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://192.168.0.8:3316/mcms-dev-5.2-8?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=true
+    url: jdbc:mysql://192.168.0.8:3316/mcms-5.2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=true
     username: mcms
     password: mcms
     filters: wall,mergeStat
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 84809b6f..6777d514 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,7 +7,7 @@ server:
 
 logging:
   level:
-    net.mingsoft: trace
+    net.mingsoft: error
   file:
     name: mcms.log #会在项目的根目录下生成对应的mcms.log文件，也可以根据实际情况写绝对路径，例如：d:/mcms.log
     path: log #会在项目的根目录下生成log目录，里面会生成对应的日期目录，日期目录下面生成日志压缩包备份文件,默认按每10M分割一个日志文件，例如：log/2020-01/app-2020-01-03-18.1.log.gz（表示2020年1月3号下午六点的第一个备份），也可以根据实际情况写绝对路径，例如：d:/log
diff --git a/src/main/webapp/upload/1/appLogo/1609397756549.png b/src/main/webapp/upload/1/appLogo/1609397756549.png
new file mode 100644
index 00000000..fca006cd
Binary files /dev/null and b/src/main/webapp/upload/1/appLogo/1609397756549.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609729706771.png b/src/main/webapp/upload/1/cms/content/1609729706771.png
new file mode 100644
index 00000000..6cc23248
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609729706771.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609739360761.png b/src/main/webapp/upload/1/cms/content/1609739360761.png
new file mode 100644
index 00000000..4f30cf83
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609739360761.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609739587867.png b/src/main/webapp/upload/1/cms/content/1609739587867.png
new file mode 100644
index 00000000..b2dabed7
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609739587867.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609739781890.png b/src/main/webapp/upload/1/cms/content/1609739781890.png
new file mode 100644
index 00000000..e0f4456a
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609739781890.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609739792665.png b/src/main/webapp/upload/1/cms/content/1609739792665.png
new file mode 100644
index 00000000..758b9706
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609739792665.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609739824520.png b/src/main/webapp/upload/1/cms/content/1609739824520.png
new file mode 100644
index 00000000..b11823df
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609739824520.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609739871146.png b/src/main/webapp/upload/1/cms/content/1609739871146.png
new file mode 100644
index 00000000..38dff34a
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609739871146.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609739953632.png b/src/main/webapp/upload/1/cms/content/1609739953632.png
new file mode 100644
index 00000000..40efa9a5
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609739953632.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609740022739.png b/src/main/webapp/upload/1/cms/content/1609740022739.png
new file mode 100644
index 00000000..2c2f2f24
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609740022739.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609742916205.png b/src/main/webapp/upload/1/cms/content/1609742916205.png
new file mode 100644
index 00000000..767b648b
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609742916205.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609825459624.png b/src/main/webapp/upload/1/cms/content/1609825459624.png
new file mode 100644
index 00000000..ff3f4a28
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609825459624.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609835614568.jpeg b/src/main/webapp/upload/1/cms/content/1609835614568.jpeg
new file mode 100644
index 00000000..6841b8f0
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609835614568.jpeg differ
diff --git a/src/main/webapp/upload/1/cms/content/1609835629433.jpeg b/src/main/webapp/upload/1/cms/content/1609835629433.jpeg
new file mode 100644
index 00000000..6841b8f0
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609835629433.jpeg differ
diff --git a/src/main/webapp/upload/1/cms/content/1609835640813.jpeg b/src/main/webapp/upload/1/cms/content/1609835640813.jpeg
new file mode 100644
index 00000000..6841b8f0
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609835640813.jpeg differ
diff --git a/src/main/webapp/upload/1/cms/content/1609835836996.png b/src/main/webapp/upload/1/cms/content/1609835836996.png
new file mode 100644
index 00000000..1dc502f4
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609835836996.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609836029087.png b/src/main/webapp/upload/1/cms/content/1609836029087.png
new file mode 100644
index 00000000..908e9769
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609836029087.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609837531913.png b/src/main/webapp/upload/1/cms/content/1609837531913.png
new file mode 100644
index 00000000..a76dda2d
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609837531913.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609837616948.png b/src/main/webapp/upload/1/cms/content/1609837616948.png
new file mode 100644
index 00000000..25686007
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609837616948.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609837720097.png b/src/main/webapp/upload/1/cms/content/1609837720097.png
new file mode 100644
index 00000000..96d4b62b
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609837720097.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609837914855.png b/src/main/webapp/upload/1/cms/content/1609837914855.png
new file mode 100644
index 00000000..53364685
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609837914855.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609838011513.png b/src/main/webapp/upload/1/cms/content/1609838011513.png
new file mode 100644
index 00000000..93dbb6ae
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609838011513.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609838116473.png b/src/main/webapp/upload/1/cms/content/1609838116473.png
new file mode 100644
index 00000000..0f0709a4
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609838116473.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609838210598.png b/src/main/webapp/upload/1/cms/content/1609838210598.png
new file mode 100644
index 00000000..cdbe2e31
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609838210598.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609838258663.png b/src/main/webapp/upload/1/cms/content/1609838258663.png
new file mode 100644
index 00000000..53c82668
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609838258663.png differ
diff --git a/src/main/webapp/upload/1/cms/content/1609838691084.png b/src/main/webapp/upload/1/cms/content/1609838691084.png
new file mode 100644
index 00000000..9200adb4
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/1609838691084.png differ
diff --git a/src/main/webapp/upload/1/cms/content/editor/1609809963757.png b/src/main/webapp/upload/1/cms/content/editor/1609809963757.png
new file mode 100644
index 00000000..b50fe7c5
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/editor/1609809963757.png differ
diff --git a/src/main/webapp/upload/1/cms/content/editor/1610000595127.jpg b/src/main/webapp/upload/1/cms/content/editor/1610000595127.jpg
new file mode 100644
index 00000000..4d49eda7
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/editor/1610000595127.jpg differ
diff --git a/src/main/webapp/upload/1/cms/content/editor/1610000595399.jpg b/src/main/webapp/upload/1/cms/content/editor/1610000595399.jpg
new file mode 100644
index 00000000..45761755
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/editor/1610000595399.jpg differ
diff --git a/src/main/webapp/upload/1/cms/content/editor/1610000831977.jpg b/src/main/webapp/upload/1/cms/content/editor/1610000831977.jpg
new file mode 100644
index 00000000..b001de89
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/editor/1610000831977.jpg differ
diff --git a/src/main/webapp/upload/1/cms/content/editor/1610000832098.jpg b/src/main/webapp/upload/1/cms/content/editor/1610000832098.jpg
new file mode 100644
index 00000000..dbbb536b
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/editor/1610000832098.jpg differ
diff --git a/src/main/webapp/upload/1/cms/content/editor/1610000832267.jpg b/src/main/webapp/upload/1/cms/content/editor/1610000832267.jpg
new file mode 100644
index 00000000..60159f65
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/editor/1610000832267.jpg differ
diff --git a/src/main/webapp/upload/1/cms/content/editor/1610000832393.jpg b/src/main/webapp/upload/1/cms/content/editor/1610000832393.jpg
new file mode 100644
index 00000000..e492d884
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/editor/1610000832393.jpg differ
diff --git a/src/main/webapp/upload/1/cms/content/editor/1610000832647.jpg b/src/main/webapp/upload/1/cms/content/editor/1610000832647.jpg
new file mode 100644
index 00000000..47a8a95e
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/editor/1610000832647.jpg differ
diff --git a/src/main/webapp/upload/1/cms/content/editor/1610000832783.jpg b/src/main/webapp/upload/1/cms/content/editor/1610000832783.jpg
new file mode 100644
index 00000000..1ffdfbae
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/editor/1610000832783.jpg differ
diff --git a/src/main/webapp/upload/1/cms/content/editor/1610000832990.jpg b/src/main/webapp/upload/1/cms/content/editor/1610000832990.jpg
new file mode 100644
index 00000000..eed4a968
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/editor/1610000832990.jpg differ
diff --git a/src/main/webapp/upload/1/cms/content/editor/1610000833108.jpg b/src/main/webapp/upload/1/cms/content/editor/1610000833108.jpg
new file mode 100644
index 00000000..93f301c2
Binary files /dev/null and b/src/main/webapp/upload/1/cms/content/editor/1610000833108.jpg differ