From 2cc387c271d7701840916d13cada9e0c95e3e241 Mon Sep 17 00:00:00 2001
From: sgjj <995959152@qq.com>
Date: Wed, 24 Jun 2020 08:53:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/mingsoft/cms/util/CmsParserUtil.java | 4 +++-
 src/main/webapp/templets/1/default/about.htm           | 2 +-
 src/main/webapp/templets/1/default/case-list.htm       | 2 +-
 src/main/webapp/templets/1/default/news-list.htm       | 2 +-
 src/main/webapp/templets/1/default/news-show.htm       | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
index 48ade34a..33e09e7a 100644
--- a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
+++ b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
@@ -96,6 +96,8 @@ public class CmsParserUtil extends ParserUtil {
 			// 文章的栏目模型编号
 			String columnContentModelId = column.getMdiyModelId();
 
+			//ParserUtil.read(File.separator + column.getCategoryListUrl(), false, acrList);
+
 			//获取列表页显示的文章数量
 			int pageSize = 10;
 			//获取总数
@@ -178,7 +180,7 @@ public class CmsParserUtil extends ParserUtil {
 					pageNo++;
 				}
 			}
-		}catch (TemplateNotFoundException e){
+		}catch (Exception e){
 			e.printStackTrace();
 		}
 	}
diff --git a/src/main/webapp/templets/1/default/about.htm b/src/main/webapp/templets/1/default/about.htm
index 891e1c5c..94a1b2f7 100644
--- a/src/main/webapp/templets/1/default/about.htm
+++ b/src/main/webapp/templets/1/default/about.htm
@@ -17,7 +17,7 @@
                     <div class="ms-content-right-position">
                         <a href="{ms:global.host/}">首页</a>
                         <span>></span>
-                        <a href="{ms:field.typelink/}">{ms:field.typetitle/}</a>
+                        <a href="{ms:field.typelink/}">${field.typetitle}</a>
                     </div>
                     <div class="ms-content-right-main">
                         <div class="ms-content-right-main-title">{ms:field.title/}</div>
diff --git a/src/main/webapp/templets/1/default/case-list.htm b/src/main/webapp/templets/1/default/case-list.htm
index 09f79eae..8dabd062 100644
--- a/src/main/webapp/templets/1/default/case-list.htm
+++ b/src/main/webapp/templets/1/default/case-list.htm
@@ -28,7 +28,7 @@
                             </p> -->
                         </div>
                         <div class="ms-content-main-case-click">
-                            <a target="_blank" href="${field.source}">点击查看</a>
+                            <a target="_blank" href="${item.source}">点击查看</a>
                         </div>
                     </div>
                 </div>
diff --git a/src/main/webapp/templets/1/default/news-list.htm b/src/main/webapp/templets/1/default/news-list.htm
index 8cc3aef7..cb4f7ef3 100644
--- a/src/main/webapp/templets/1/default/news-list.htm
+++ b/src/main/webapp/templets/1/default/news-list.htm
@@ -15,7 +15,7 @@
                 <div class="ms-content-right-position">
                     <a href="{ms:global.host/}">首页</a>
                     <span>></span>
-                    <a href="{ms:field.typelink/}">{ms:field.typetitle/}</a>
+                    <a href="{ms:field.typelink/}">{column.typetitle}</a>
                 </div>
                 <div class="ms-content-main-list">
 
diff --git a/src/main/webapp/templets/1/default/news-show.htm b/src/main/webapp/templets/1/default/news-show.htm
index 3a6e565a..008d36ae 100644
--- a/src/main/webapp/templets/1/default/news-show.htm
+++ b/src/main/webapp/templets/1/default/news-show.htm
@@ -51,8 +51,8 @@
                             <p>${field.content!''}</p><br/>
                         </div>
                         <div class="metfield">
-					        <p>上一篇：<a href="{ms:global.url/}{ms:pre.link/}">{ms:pre.title/}</a></p>
-					        <p>下一篇：<a href="{ms:global.url/}{ms:next.link/}">{ms:next.title/}</a></p>
+					        <p>上一篇：<a href="${global.url}${pre.link}">${pre.title}</a></p>
+					        <p>下一篇：<a href="${global.url}${next.link}">${next.title}</a></p>
 					    </div>
                     </div>
                     <div class="ms-content-right-main-content-Fabulous">