diff --git a/pom.xml b/pom.xml
index 00ae8602..527714b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
4.0.0
net.mingsoft
ms-mcms
- 5.2.3
+ 5.2.4
ms-mcms
@@ -44,48 +44,42 @@
net.mingsoft
ms-base
- 2.1.7
+ 2.1.8
net.mingsoft
ms-base
- 2.1.7
+ 2.1.8
sources
provided
net.mingsoft
ms-basic
- 2.1.7
+ 2.1.8
net.mingsoft
ms-basic
- 2.1.7
+ 2.1.8
sources
provided
net.mingsoft
ms-mdiy
- 2.1.7
+ 2.1.8
net.mingsoft
ms-mdiy
- 2.1.7
+ 2.1.8
sources
provided
-
-
- net.mingsoft
- store-client
- 2.1.7.1
-
@@ -115,11 +109,13 @@
+
org.springframework.boot
spring-boot-maven-plugin
true
+ true
@@ -145,6 +141,7 @@
+
compile
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)