uas官网服务中心升级公告获取数据

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/content_version.html

@@ -0,0 +1,230 @@
+<#include "_layout.html"/>
+<#macro css>
+    #banner {
+    background: #1c863c;
+    padding: 88px 0;
+    height: 440px;
+    color: #fff;
+    background-size:100% 100%;
+    }
+    .banner .container{
+    text-align: center;
+    width: 1190px;
+    }
+    .banner .text-info{
+    margin-top: 75px;
+    float: left;
+    text-align: left;
+    }
+    .banner .text-info h3 {
+    font-size: 48px;
+    color: #fff;
+    font-weight: bold;
+    }
+    .banner .text-info h4 {
+    margin-top: 34px;
+    font-size: 24px;
+    color: #fff;
+    font-weight: bold;
+    line-height: 30px;
+    }
+    .banner img{
+    float: right;
+    margin-top: -280px;
+    }
+    /*section-main*/
+    #main {
+    width: 100%;
+    text-align: center;
+    margin: 0 auto;
+    text-align: center;
+    }
+    .section-item .content {
+    display: inline-block;
+    width: 1190px;
+    text-align: center;
+    overflow: hidden;
+    }
+    .breadcrumbs .content{
+    text-align: left;
+    }
+    .breadcrumbs ul{
+    overflow: hidden;
+    display: inline-block;
+    text-align: left;
+    }
+    .breadcrumbs ul li{
+    float: left;
+    margin-right: 5px;
+    height: 68px;
+    line-height: 68px;
+    }
+    .breadcrumbs ul li a{
+    color: #1b1b1b;
+    }
+    .section-item h3{
+    font-size: 24px;
+    color: #1b1b1b;
+    padding-top: 50px;
+    }
+    .version h3{
+    font-size: 18px;
+    font-weight: bold;
+    color: #3c54ca;
+    padding-top: 0;
+    }
+    .version .content p{
+    font-size: 14px;
+    color: #787878;
+    margin: 15px 0;
+    }
+    .section1 h3{
+    padding-top: 0;
+    }
+    .section-item .content .left-txt{
+    width: 550px;
+    text-align: left;
+    }
+    .section-item .content .left-txt li{
+    font-size: 14px;
+    margin-bottom: 34px;
+    text-align: left;
+    }
+    .section-item .content .left-txt li a{
+    color: #1e1e1e;
+    }
+    .section-item .content .right-img{
+    float: right;
+    width: 500px;
+    }
+    .section2 {
+    background: #f8f8f8;
+    }
+    .section2 .content .detail{
+    border-bottom: 1px solid #dcdcdc;
+    padding-bottom: 100px;
+    }
+    .section2 .content .detail:last-child{
+    border-bottom: none;
+    }
+    .section2 .content .left-txt h4{
+    margin: 40px 0;
+    font-size: 18px;
+    color: #1e1e1e;
+    }
+    .section2 .content .left-txt p{
+    margin: 30px 0 50px 0;
+    font-size: 14px;
+    color: #1e1e1e;
+    text-indent: 2em;
+    }
+    .section3 .content{
+    margin-bottom: 85px;
+    }
+    .section3 h3{
+    padding: 10px 0 30px 0;
+    }
+    .section3 .content .version-list{
+    margin-bottom: 20px;
+    padding: 10px;
+    width: 1140px;
+    height: 120px;
+    border:1px solid #dcdcdc;
+    }
+    .section3 .content .version-list:hover{
+    border: 1px solid #226ea2;
+    cursor: pointer ;
+    }
+    .section3 .content .version-list:hover p{
+    color: #464646;
+    }
+    .section3 .content .version-list div{
+    text-align: left;
+    }
+    .section3 .content .version-list div span{
+    font-weight: bold;
+    font-size: 14px;
+    color:#205cca;
+    margin-right: 20px;
+    }
+    .section3 .content .version-list div em{
+    font-style: normal;
+    font-size: 14px;
+    color:#787878;
+    }
+    .section3 .content .version-list p{
+    margin: 20px 0 10px 0;
+    padding: 0 50px;
+    font-size: 14px;
+    color:#787878;
+    text-align: left;
+    }
+</#macro>
+<@layout>
+<section id="banner" class="banner">
+    <div class="container">
+        <div class="text-info">
+            <h3>升级公告</h3>
+            <h4>UPDATE ANNOUNCEMENT</h4>
+        </div>
+        <img src="${CTPATH}/images/question/pic3.png" alt="">
+    </div>
+</section>
+<!-- main 主内容 -->
+<section id="main" class="clearfix">
+    <div class="section-item breadcrumbs">
+        <div class="content">
+            <ul>
+                <li><a href="">当前位置:</a></li>
+                <li><a href="">首页&nbsp;&gt;</a></li>
+                <li><a href="">服务中心&nbsp;&gt;</a></li>
+                <li><a href="">常见问题</a></li>
+            </ul>
+        </div>
+    </div>
+
+            <div class="section-item version">
+                <div class="content">
+                    <h3>系版本 UAS${(content.getMetadataByKey("version_number"))!}</h3>
+                    <p>${(content.getMetadataByKey("upgrade_time"))!}</p>
+                </div>
+            </div>
+            <div class="section-item section1">
+                <h3>升级概要</h3>
+                <div class="content">
+                    <div class="left-txt">
+                        <ul>
+                            <li><a href="">${(content.getMetadataByKey("version_summary"))!}</a></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+            <div class="section-item section2">
+                <h3>升级详情</h3>
+                <div class="content">
+                    <div class="detail">
+                        <div class="left-txt">
+                            ${content.text!}
+                        </div>
+                        <div class="right-img">
+                            <img src="" alt="">
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+    <div class="section-item section3">
+        <h3>历史版本</h3>
+        <div class="content">
+            <@jp.contents module="version">
+                <#list contents as cont>
+                    <div class="version-list">
+                        <div><span><a href="${cont.url!}">UAS管理系统 ${(cont.getMetadataByKey("version_number"))!}版本</a></span><em>${(content.getMetadataByKey("upgrade_time"))!}</em></div>
+                        <p>${(cont.getMetadataByKey("version_summary"))!}</p>
+                    </div>
+                </#list>
+            </@jp.contents>
+        </div>
+    </div>
+</section>
+</@layout>

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/taxonomy_version.html

@@ -0,0 +1,234 @@
+<#include "_layout.html"/>
+<#macro css>
+    #banner {
+    background: #1c863c;
+    padding: 88px 0;
+    height: 440px;
+    color: #fff;
+    background-size:100% 100%;
+    }
+    .banner .container{
+    text-align: center;
+    width: 1190px;
+    }
+    .banner .text-info{
+    margin-top: 75px;
+    float: left;
+    text-align: left;
+    }
+    .banner .text-info h3 {
+    font-size: 48px;
+    color: #fff;
+    font-weight: bold;
+    }
+    .banner .text-info h4 {
+    margin-top: 34px;
+    font-size: 24px;
+    color: #fff;
+    font-weight: bold;
+    line-height: 30px;
+    }
+    .banner img{
+    float: right;
+    margin-top: -280px;
+    }
+    /*section-main*/
+    #main {
+    width: 100%;
+    text-align: center;
+    margin: 0 auto;
+    text-align: center;
+    }
+    .section-item .content {
+    display: inline-block;
+    width: 1190px;
+    text-align: center;
+    overflow: hidden;
+    }
+    .breadcrumbs .content{
+    text-align: left;
+    }
+    .breadcrumbs ul{
+    overflow: hidden;
+    display: inline-block;
+    text-align: left;
+    }
+    .breadcrumbs ul li{
+    float: left;
+    margin-right: 5px;
+    height: 68px;
+    line-height: 68px;
+    }
+    .breadcrumbs ul li a{
+    color: #1b1b1b;
+    }
+    .section-item h3{
+    font-size: 24px;
+    color: #1b1b1b;
+    padding-top: 50px;
+    }
+    .version h3{
+    font-size: 18px;
+    font-weight: bold;
+    color: #3c54ca;
+    padding-top: 0;
+    }
+    .version .content p{
+    font-size: 14px;
+    color: #787878;
+    margin: 15px 0;
+    }
+    .section1 h3{
+    padding-top: 0;
+    }
+    .section-item .content .left-txt{
+    width: 550px;
+    text-align: left;
+    }
+    .section-item .content .left-txt li{
+    font-size: 14px;
+    margin-bottom: 34px;
+    text-align: left;
+    }
+    .section-item .content .left-txt li a{
+    color: #1e1e1e;
+    }
+    .section-item .content .right-img{
+    float: right;
+    width: 500px;
+    }
+    .section2 {
+    background: #f8f8f8;
+    }
+    .section2 .content .detail{
+    border-bottom: 1px solid #dcdcdc;
+    padding-bottom: 100px;
+    }
+    .section2 .content .detail:last-child{
+    border-bottom: none;
+    }
+    .section2 .content .left-txt h4{
+    margin: 40px 0;
+    font-size: 18px;
+    color: #1e1e1e;
+    }
+    .section2 .content .left-txt p{
+    margin: 30px 0 50px 0;
+    font-size: 14px;
+    color: #1e1e1e;
+    text-indent: 2em;
+    }
+    .section3 .content{
+    margin-bottom: 85px;
+    }
+    .section3 h3{
+    padding: 10px 0 30px 0;
+    }
+    .section3 .content .version-list{
+    margin-bottom: 20px;
+    padding: 10px;
+    width: 1140px;
+    height: 120px;
+    border:1px solid #dcdcdc;
+    }
+    .section3 .content .version-list:hover{
+    border: 1px solid #226ea2;
+    cursor: pointer ;
+    }
+    .section3 .content .version-list:hover p{
+    color: #464646;
+    }
+    .section3 .content .version-list div{
+    text-align: left;
+    }
+    .section3 .content .version-list div span{
+    font-weight: bold;
+    font-size: 14px;
+    color:#205cca;
+    margin-right: 20px;
+    }
+    .section3 .content .version-list div em{
+    font-style: normal;
+    font-size: 14px;
+    color:#787878;
+    }
+    .section3 .content .version-list p{
+    margin: 20px 0 10px 0;
+    padding: 0 50px;
+    font-size: 14px;
+    color:#787878;
+    text-align: left;
+    }
+</#macro>
+<@layout>
+<section id="banner" class="banner">
+    <div class="container">
+        <div class="text-info">
+            <h3>升级公告</h3>
+            <h4>UPDATE ANNOUNCEMENT</h4>
+        </div>
+        <img src="${CTPATH}/images/question/pic3.png" alt="">
+    </div>
+</section>
+<!-- main 主内容 -->
+<section id="main" class="clearfix">
+    <div class="section-item breadcrumbs">
+        <div class="content">
+            <ul>
+                <li><a href="">当前位置:</a></li>
+                <li><a href="">首页&nbsp;&gt;</a></li>
+                <li><a href="">服务中心&nbsp;&gt;</a></li>
+                <li><a href="">常见问题</a></li>
+            </ul>
+        </div>
+    </div>
+    <@jp.contents module="version" orderBy="meta:upgrade_time">
+    <#list contents as content>
+        <#if content?is_first>
+            <div class="section-item version">
+                <div class="content">
+                    <h3>系版本 UAS${(content.getMetadataByKey("version_number"))!}</h3>
+                    <p>${(content.getMetadataByKey("upgrade_time"))!}</p>
+                </div>
+            </div>
+            <div class="section-item section1">
+                <h3>升级概要</h3>
+                <div class="content">
+                    <div class="left-txt">
+                        <ul>
+                            <li><a href="">${(content.getMetadataByKey("version_summary"))!}</a></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+            <div class="section-item section2">
+                <h3>升级详情</h3>
+                <div class="content">
+                    <div class="detail">
+                        <div class="left-txt">
+                            ${content.text!}
+                        </div>
+                        <div class="right-img">
+                            <img src="" alt="">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </#if>
+    </#list>
+    </@jp.contents>
+    <div class="section-item section3">
+        <h3>历史版本</h3>
+        <div class="content">
+            <@jp.contents module="version">
+                <#list contents as cont>
+                    <div class="version-list">
+                        <div><span><a href="${cont.url!}">UAS管理系统 ${(cont.getMetadataByKey("version_number"))!}版本</a></span><em>${(content.getMetadataByKey("upgrade_time"))!}</em></div>
+                        <p>${(cont.getMetadataByKey("version_summary"))!}</p>
+                    </div>
+                </#list>
+            </@jp.contents>
+        </div>
+    </div>
+</section>
+</@layout>

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/tpl_config.xml

@@ -38,13 +38,10 @@
 		<taxonomy title="分类" name="category" formType="select" />
 	</module>
 
-	<module title="升级公告概要" name="versionSummary" list="升级公告概要" add="发布公告概要">
-		<metadata dataType="input" name="version_number " title="版本号"  placeholder="输入版本号，同时作为匹配该公告详情参数，确保一致" required="true"></metadata>
-		<metadata dataType="input" name=" upgrade_time " title="升级时间"  placeholder="输入此版本的升级时间，格式（YYYY-MM-DD）"></metadata>
-	</module>
-
-	<module title="升级公告详情" name="versionDetail" list="升级公告详情" add="发布公告详情" comment="评论">
-		<metadata dataType="input" name="version_number " title="版本号"  placeholder="输入版本号，同时作为匹配该公告概要参数，确保一致" required="true"></metadata>
+	<module title="升级公告" name="version" list="升级公告" add="发布公告">
+		<metadata dataType="input" name="version_summary" title="升级公告概要"  placeholder="输入公告概要,如需换行，请手动添加换行标签br" required="true"></metadata>
+		<metadata dataType="input" name="version_number" title="版本号"  placeholder="输入版本号" required="true"></metadata>
+		<metadata dataType="input" name="upgrade_time" title="升级时间"  placeholder="输入此版本的升级时间，格式（YYYY-MM-DD）"></metadata>
 	</module>
 
 	<module title="演示文档" name="demoDocument" list="演示文档" add="发布演示文档" comment="评论">