From b5ba1bf1d6e963e82d7e7af41579402bcf28986e Mon Sep 17 00:00:00 2001 From: sgjj <995959152@qq.com> Date: Sun, 29 Sep 2019 20:48:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/mingsoft/cms/action/ArticleAction.java | 1 + src/main/java/net/mingsoft/cms/action/ColumnAction.java | 3 +++ src/main/java/net/mingsoft/config/WebConfig.java | 4 ++-- src/main/resources/application.yml | 6 +----- .../webapp/WEB-INF/manager/cms/article/article_form.ftl | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/mingsoft/cms/action/ArticleAction.java b/src/main/java/net/mingsoft/cms/action/ArticleAction.java index 75845e40..b2f9eddb 100644 --- a/src/main/java/net/mingsoft/cms/action/ArticleAction.java +++ b/src/main/java/net/mingsoft/cms/action/ArticleAction.java @@ -535,6 +535,7 @@ public class ArticleAction extends BaseAction { } model.addAttribute("columnType", columnType); model.addAttribute("categoryId", column.getCategoryId());// 编辑封面 + model.addAttribute("websiteId", BasicUtil.getAppId()); return "/cms/article/article_form"; } else {// 非法 // return "/cms/article/article_form"); diff --git a/src/main/java/net/mingsoft/cms/action/ColumnAction.java b/src/main/java/net/mingsoft/cms/action/ColumnAction.java index ed4ccd08..85c26ac2 100644 --- a/src/main/java/net/mingsoft/cms/action/ColumnAction.java +++ b/src/main/java/net/mingsoft/cms/action/ColumnAction.java @@ -93,6 +93,8 @@ public class ColumnAction extends BaseAction{ model.addAttribute("column",new ColumnEntity()); model.addAttribute("listColumn", JSONArray.toJSONString(list)); model.addAttribute("model", "cms"); + model.addAttribute("websiteId", appId); + return "/basic/column/form"; } @@ -216,6 +218,7 @@ public class ColumnAction extends BaseAction{ model.addAttribute("columnSuper", columnSuper); model.addAttribute("listColumn", JSONArray.toJSONString(list)); model.addAttribute("model", "cms"); + model.addAttribute("websiteId", appId); return "/basic/column/form"; } diff --git a/src/main/java/net/mingsoft/config/WebConfig.java b/src/main/java/net/mingsoft/config/WebConfig.java index 5fd8fbba..b8816a49 100644 --- a/src/main/java/net/mingsoft/config/WebConfig.java +++ b/src/main/java/net/mingsoft/config/WebConfig.java @@ -72,9 +72,9 @@ public class WebConfig implements WebMvcConfigurer { registry.addResourceHandler("/app/**").addResourceLocations("/app/","file:app/", "classpath:/app/"); registry.addResourceHandler("/static/**","/**").addResourceLocations("/static/","file:static/","classpath:/static/"); registry.addResourceHandler("/api/**").addResourceLocations("/api/","file:api/", "classpath:/api/"); - if(uploadFloderPath.startsWith("file:")){ + if(new File(uploadFloderPath).isAbsolute()){ //如果指定了绝对路径，上传的文件都映射到uploadMapping下 - registry.addResourceHandler(uploadMapping).addResourceLocations(uploadFloderPath+ File.separator + registry.addResourceHandler(uploadMapping).addResourceLocations("file:"+uploadFloderPath+ File.separator //映射其他路径文件 //,file:F://images ); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index dc01e260..8fb97ea9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -15,12 +15,8 @@ ms: path: /upload mapping: /upload/** denied: .exe,.jsp - allowed: jpg - max-size: 1 - memory-size: 4096 - + spring: - http.multipart.enabled: false profiles: active: dev mvc: diff --git a/src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl b/src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl index 63f5ebce..ff73b365 100644 --- a/src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl @@ -18,7 +18,7 @@ listKey="id" listValue="value" label="是否显示" help="选择否后前端将不显示，需要重新生成才有效果" /> <@ms.formRow colSm="2" label="文章缩略图" width="400" > - <@ms.uploadImg path="article" uploadFloderPath="${articleImagesUrl?default('')}" inputName="basicThumbnails" size="1" msg="提示:文章缩略图,支持jpg格式" imgs="${article.basicThumbnails?default('')}" /> + <@ms.uploadImg path="${websiteId}/article" inputName="basicThumbnails" size="1" msg="提示:文章缩略图,支持jpg格式" imgs="${article.basicThumbnails?default('')}" /> <@ms.text name="articleSource" colSm="2" width="200" label="文章来源" title="文章来源" size="5" placeholder="请输入文章来源" value="${article.articleSource?default('')}" validation={"maxlength":"300", "data-bv-stringlength-message":"文章来源在300个字符以内!"} /> <@ms.text name="articleAuthor" colSm="2" width="200" label="文章作者" title="文章作者" size="5" placeholder="请输入文章作者" value="${article.articleAuthor?default('')}" validation={"maxlength":"12", "data-bv-stringlength-message":"文章作者在12个字符以内!"} />