Skip to content
GitLab
Commit 1c16536f authored by sgjj's avatar sgjj
Browse files

Merge remote-tracking branch 'origin/5.2' into 5.2

parents f28a00e5 37cffefb
Expand all Hide whitespace changes
Inline Side-by-side
src/main/java/net/mingsoft/cms/action/web/ContentAction.java
View file @ 1c16536f
package net.mingsoft.cms.action.web; package net.mingsoft.cms.action.web;
import cn.hutool.core.util.ObjectUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
...@@ -117,7 +118,11 @@ public class ContentAction extends net.mingsoft.cms.action.BaseAction{ ...@@ -117,7 +118,11 @@ public class ContentAction extends net.mingsoft.cms.action.BaseAction{
return "document.write(0)"; return "document.write(0)";
} }
//浏览数+1 //浏览数+1
content.setContentHit(content.getContentHit()+1); if(ObjectUtil.isNotEmpty(content.getContentHit())){
content.setContentHit(content.getContentHit()+1);
}else {
content.setContentHit(1);
}
contentBiz.updateEntity(content); contentBiz.updateEntity(content);
// cms_history 增加相应记录 // cms_history 增加相应记录
......
src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml
View file @ 1c16536f
...@@ -240,7 +240,6 @@ ...@@ -240,7 +240,6 @@
<if test="del != null"> and del=#{del} </if> <if test="del != null"> and del=#{del} </if>
<include refid="net.mingsoft.base.dao.IBaseDao.sqlWhere"></include> <include refid="net.mingsoft.base.dao.IBaseDao.sqlWhere"></include>
</where> </where>
order by id desc
</select> </select>
</mapper> </mapper>
src/main/resources/application.yml
View file @ 1c16536f
...@@ -23,7 +23,7 @@ ms: ...@@ -23,7 +23,7 @@ ms:
upload: upload:
enable-web: true #启用web层的上传 enable-web: true #启用web层的上传
template: templets #模板文件夹支持重命名，不支持路径 template: template #模板文件夹支持重命名，不支持路径
path: upload #文件上传路径，可以根据实际写绝对路径 path: upload #文件上传路径，可以根据实际写绝对路径
mapping: /upload/** #修改需要谨慎，系统第一次部署可以随意修改，如果已经有了上传数据，再次修改会导致之前上传的文件404 mapping: /upload/** #修改需要谨慎，系统第一次部署可以随意修改，如果已经有了上传数据，再次修改会导致之前上传的文件404
denied: .exe,.jsp denied: .exe,.jsp
......
src/main/webapp/template/1/江西省人民政府-web/about.htm 0 → 100644
View file @ 1c16536f
This diff is collapsed.
src/main/webapp/template/1/江西省人民政府-web/css/app.css 0 → 100644
View file @ 1c16536f
@media (max-width: 768px){
}
\ No newline at end of file
src/main/webapp/template/1/江西省人民政府-web/footer.htm 0 → 100644
View file @ 1c16536f
<!--底部导航 - start -->
<div class="footer">
<!--友情链接 - start -->
<div class="links">
<div class="body">
<span >
网站导航
</span>
<div class="link">
<!--下拉框 - start -->
<!--下拉框 -end -->
</div>
<div class="link">
<!--下拉框 - start -->
<!--下拉框 -end -->
</div>
<div class="link">
<!--下拉框 - start -->
<!--下拉框 -end -->
</div>
<div class="link">
<!--下拉框 - start -->
<!--下拉框 -end -->
</div>
<div class="link">
<!--下拉框 - start -->
<!--下拉框 -end -->
</div>
</div>
</div>
<!--友情链接 -end -->
<!--版权信息 - start -->
<div class="copyright">
<div class="body">
<img
title=""
alt=""
src="{ms:global.host/}/{ms:global.style/}/images/1602123532415.png"
/>
<div class="desc">
<div class="text">
<div >
<a href="#"
>
关于我们
</a>
<span >
｜
</span>
<a href="#"
>
网站地图
</a>
</div>
</div>
<div class="text">
<a href="#"
>
主办：江西省人民政府办公厅
</a>
<a href="#"
>
承办：江西省信息中心
</a>
</div>
<div class="text">
<a href="#"
>
赣ICP备05004294号
</a>
<a href="#"
>
政府网站标识码3600000012
</a>
<a href="#"
>
赣公网安备 36010802000128号
</a>
</div>
<div class="ms-designer">
<a href="www.mingsoft.net"
target="_blank"
>
@该网页由MDesigner制作完成
</a>
</div>
</div>
<div class="right">
<div class="img">
<img
title=""
alt=""
src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_1234.png"
/>
<span >
国务院客户端
</span>
</div>
<div class="img">
<img
title=""
alt=""
src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_724.png"
/>
<span >
国务院小程序
</span>
</div>
<div class="wx">
<div >
<img
title=""
alt=""
src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_1434.png"
/>
<img
title=""
alt=""
src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_1534.png"
/>
<span >
中国政府网微博、微信
</span>
</div>
</div>
</div>
</div>
</div>
<!--版权信息 -end -->
<!--左漂浮 - start -->
<div class="left-fixed">
<div class="content">
<img
title=""
alt=""
src="https://iph.href.lu/100x100"
/>
</div>
</div>
<!--左漂浮 -end -->
<!--右漂浮 - start -->
<div class="right-fixed">
<div class="content">
<img
title=""
alt=""
src="https://iph.href.lu/100x100"
/>
</div>
</div>
<!--右漂浮 -end -->
</div>
<!--底部导航 -end -->
src/main/webapp/template/1/江西省人民政府-web/header.htm 0 → 100644
View file @ 1c16536f
<!--导航 - start -->
<div class="header">
<!--中间区域 - start -->
<div class="center">
<!--左侧 - start -->
<div class="left">
<a href="${global.url}"
>
${field.typetitle}
</a>
{ms:channel active='nav-sel' type='nav' flag='n'}
<a href="${global.url}${field.typelink}"
class="${field.active}">
${field.typetitle}
</a>
{/ms:channel}
</div>
<!--左侧 -end -->
<!--手机端 - start -->
<div @click='switchShow(["1601304203000_30278"]);' class="h5-menu">
<i class="iconfont icon-caidan icon" ></i>
<!--手机端菜单 - start -->
<div id="key_1601304203000_30278"
style="background-color:#2D548F;top:60px;left:0px;flex-direction:column;display:none;width:100vw;box-sizing:border-box;padding-top:0px;position:absolute;padding-left:0px;">
{ms:channel type='nav' flag='n'}
<a href="${global.url}${field.typelink}"
class="class-1">
${field.typetitle}
</a>
{/ms:channel}
</div>
<!--手机端菜单 -end -->
</div>
<!--手机端 -end -->
<!--副链接 - start -->
<div class="right">
<a href="http://www.gov.cn/"
target="_blank"
>
中国政府网
</a>
<span >
|
</span>
<a href="http://www.jxrd.gov.cn/"
target="_blank"
>
省人大
</a>
<span >
|
</span>
<a href="http://jxzx.jxnews.com.cn/"
target="_blank"
>
省政协
</a>
</div>
<!--副链接 -end -->
</div>
<!--中间区域 -end -->
</div>
<!--导航 -end -->
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment