From f2b0c101f9ae54c11f680be3e377ecd2796986b9 Mon Sep 17 00:00:00 2001
From: mingsoft <wangtp@mingsoft.net>
Date: Wed, 29 Sep 2021 10:47:51 +0800
Subject: [PATCH] =?UTF-8?q?5.2.4=E4=BB=A3=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 23 ++++++++-----------
 .../WEB-INF/manager/cms/generate/index.ftl    |  3 ---
 .../webapp/static/plugins/ms/1.0.0/ms.http.js |  5 +---
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 00ae8602..527714b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.mingsoft</groupId>
     <artifactId>ms-mcms</artifactId>
-    <version>5.2.3</version>
+    <version>5.2.4</version>
     <name>ms-mcms</name>
     <!-- 打包war包 -->
     <!--    <packaging>war</packaging>-->
@@ -44,48 +44,42 @@
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-base</artifactId>
-            <version>2.1.7</version>
+            <version>2.1.8</version>
         </dependency>
         <!--base源码-->
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-base</artifactId>
-            <version>2.1.7</version>
+            <version>2.1.8</version>
             <classifier>sources</classifier>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-basic</artifactId>
-            <version>2.1.7</version>
+            <version>2.1.8</version>
         </dependency>
         <!--basic源码-->
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-basic</artifactId>
-            <version>2.1.7</version>
+            <version>2.1.8</version>
             <classifier>sources</classifier>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-mdiy</artifactId>
-            <version>2.1.7</version>
+            <version>2.1.8</version>
         </dependency>
         <!--mdiy源码-->
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-mdiy</artifactId>
-            <version>2.1.7</version>
+            <version>2.1.8</version>
             <classifier>sources</classifier>
             <scope>provided</scope>
         </dependency>
-        <!--store入口依赖（源码不开发），如果不需要MStore可以直接去掉依赖-->
-        <dependency>
-            <groupId>net.mingsoft</groupId>
-            <artifactId>store-client</artifactId>
-            <version>2.1.7.1</version>
-        </dependency>
 
     </dependencies>
 
@@ -115,11 +109,13 @@
             </resource>
         </resources>
         <plugins>
+
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                     <executable>true</executable>
+                     <fork>true</fork>
                 </configuration>
             </plugin>
             <plugin>
@@ -145,6 +141,7 @@
                     </dependency>
                 </dependencies>
             </plugin>
+
         </plugins>
         <defaultGoal>compile</defaultGoal>
     </build>
diff --git a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl b/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
index 6d58faee..ba86d68e 100644
--- a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
@@ -317,7 +317,6 @@
         background-color:#FFFFFF;
         flex-direction:column;
         display:flex;
-        justify-content:end;
         margin: 12px 6px 12px 12px;
         animation-duration:1s;
         width:100%;
@@ -465,7 +464,6 @@
         background-color:#FFFFFF;
         flex-direction:column;
         display:flex;
-        justify-content:end;
         margin: 12px 6px;
         animation-duration:1s;
         width:100%;
@@ -610,7 +608,6 @@
         background-color:#FFFFFF;
         flex-direction:column;
         display:flex;
-        justify-content:end;
         margin: 12px 12px 12px 6px;
         animation-duration:1s;
         width:100%;
diff --git a/src/main/webapp/static/plugins/ms/1.0.0/ms.http.js b/src/main/webapp/static/plugins/ms/1.0.0/ms.http.js
index 829f1d94..7ff3c09e 100644
--- a/src/main/webapp/static/plugins/ms/1.0.0/ms.http.js
+++ b/src/main/webapp/static/plugins/ms/1.0.0/ms.http.js
@@ -42,13 +42,10 @@
                     msg = "客户端错误";
                 } else if (error.response.status == 403) {
                     msg = "您的权限不足";
-                } else if (error.response.status == 404) {
-                    msg = "请求不存在";
                 } else if (error.response.status == 423) {
                     msg = "账号被锁定！";
                 } else if (error.response.status == 500) {
                     msg = "服务器异常";
-
                 } else if (error.response.status == 501) {
                     msg = "您的操作被取消或不允许提交";
                 } else if (error.response.status == 423) {
@@ -57,7 +54,7 @@
                 if(error.response.data && error.response.data.msg) {
                     msg = error.response.data.msg;
                 }
-                if (msg) {
+                if (msg && error.response.status != 404) {
                     var tempVue = document.createElement('div');
                     tempVue.id = "tempVue";
                     document.body.appendChild(tempVue)