From f8a4aff2768cc800089997dcb63a7d69722c2025 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@HOMEMIC-D0MBOL5>
Date: Wed, 27 Feb 2019 09:20:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=9B=BE=E4=B8=8A=E4=BC=A0|=E9=9A=94?=
 =?UTF-8?q?=E5=BC=80=EF=BC=8C=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/mingsoft/cms/action/ArticleAction.java   |  10 ----------
 src/main/resources/application.yml               |   2 ++
 .../jquery.swfupload/1.0.0/upload_file.png       | Bin 0 -> 1897 bytes
 .../jquery.swfupload/1.0.0/upload_pic.png        | Bin 0 -> 1164 bytes
 4 files changed, 2 insertions(+), 10 deletions(-)
 create mode 100644 src/main/webapp/static/plugins/jquery.swfupload/1.0.0/upload_file.png
 create mode 100644 src/main/webapp/static/plugins/jquery.swfupload/1.0.0/upload_pic.png

diff --git a/src/main/java/net/mingsoft/cms/action/ArticleAction.java b/src/main/java/net/mingsoft/cms/action/ArticleAction.java
index fa24f67b..8f77274e 100644
--- a/src/main/java/net/mingsoft/cms/action/ArticleAction.java
+++ b/src/main/java/net/mingsoft/cms/action/ArticleAction.java
@@ -267,11 +267,6 @@ public class ArticleAction extends BaseAction {
 		}else{
 			article.setArticleType(checkboxType);
 		}
-		// 问题:由于上传的图片路径后面可能带有｜符合。所以要进行将“｜”替换空
-		// 空值判断
-		if (!StringUtils.isBlank(article.getBasicThumbnails())) {
-			article.setBasicThumbnails(article.getBasicThumbnails().replace("|", ""));
-		}
 		ColumnEntity column = (ColumnEntity) columnBiz.getEntity(article.getBasicCategoryId());
 		article.setColumn(column);
 		
@@ -397,11 +392,6 @@ public class ArticleAction extends BaseAction {
 		}else{
 			article.setArticleType(checkboxType);
 		}
-		// 问题:由于上传的图片路径后面可能带有｜符合。所以要进行将“｜”替换空
-		// 空值判断
-		if (!StringUtils.isBlank(article.getBasicThumbnails())) {
-			article.setBasicThumbnails(article.getBasicThumbnails().replace("|", ""));
-		}
 		// 获取更改前的文章实体
 		ArticleEntity oldArticle = (ArticleEntity) articleBiz.getEntity(basicId);
 		// 获取栏目实体
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3ff3d837..e219c8ad 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -21,6 +21,7 @@ ms:
    memory-size: 4096
       
 spring:
+  http.multipart.enabled: false
   profiles:
     active: dev
   mvc:
@@ -34,6 +35,7 @@ spring:
   servlet:
     multipart:
       max-request-size: 100MB
+      enabled: false
   freemarker:
     suffix: .ftl
     charset: UTF-8
diff --git a/src/main/webapp/static/plugins/jquery.swfupload/1.0.0/upload_file.png b/src/main/webapp/static/plugins/jquery.swfupload/1.0.0/upload_file.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb110836515d9d8e022ab91f2b47cdc9a13b9440
GIT binary patch
literal 1897
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
QT4Z4GboFyt=akR{01F--XaE2J

literal 0
HcmV?d00001

diff --git a/src/main/webapp/static/plugins/jquery.swfupload/1.0.0/upload_pic.png b/src/main/webapp/static/plugins/jquery.swfupload/1.0.0/upload_pic.png
new file mode 100644
index 0000000000000000000000000000000000000000..89b75c52620f7f6c8e38880b7299bc776703cfb8
GIT binary patch
literal 1164
zcmeAS@N?(olHy`uVBq!ia0vp^VL+_J!3-onS>F=^Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?_nZLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&saCvz|c^^%uLVF
z#MI2pP)EVYz|ctF0Eo<V4Na^}&8&>f6`()~Xj@TAnpKdC8`Lf!&sHg;q@=(~U%$M(
zT(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}<f6=ilFa-(1(1n}N%^HE
zwn{*kLcEY$05>+T7#d8#0MoBXEYLU9GXQxBrqI_HztY@Xxa#7Ppj3o=u^L<)Qdy9y
zACy|0Us{w5jJPyqkW~d%&PAz-CHX}m`T04pPz=b(FUc>?$S+WE4mMNJ2+zz*$uBR~
z1grP;werj>E=kNwPW5!LRRWrzmzkMjWoYSUVPxuLYHaCZW@zYYY3XX=XyNMO=<Mv~
zWNvQc3e)S7pIn-onpXnTn}X15hEp#nDdZLaZFWg5$}CGwaVyHtRRDY0DigO`jB%O=
z)tiFbEhaei>H{644~kf%h=vIPQxAv<Pqsh~JmIJ20aJSsFj<#RKbHf{5(WW2A+9&P
zEdKxh|IEwc^Z#o%ycRt3TJZn>wa-A2>;LZ`c>VwSg8y&!-tek=^9IP>d*93AXHAG7
zQ11~>7srr_TW_YE<U6du<03h$x8&si|GAUJR^-Y&xDcn+KZQg4gVCp^VztRH`C0e%
zD0XaF8@b*3ZrAIu<DXP3IeEp`yInbRTz=AHzBf%<`%=Y>_cqF=`>?-xC~3BoUxxem
zhSX)Pw+jw<Z(opF^vT^~bp=!F-z!f-b-M3)I`Eg(A3A;3<kilzjBBNRo7!Zbefi3A
z+FCKqF(gPklKFJCS=Dbgu{Daj?rb~m7@@=FxBAYZwsO(Q=ViOB8Mj6sOfmZF<<H2*
YV10>c)4Eqd<)HGx)78&qol`;+0OpLF0RR91

literal 0
HcmV?d00001