Permalink
Browse files

update

  • Loading branch information...
1 parent 31746a8 commit a0474df06b89d3b164316023f84cf6b92e91bb4b @sanluan committed Dec 24, 2016
Showing 1,374 changed files with 212,751 additions and 1,489 deletions.
View
@@ -73,6 +73,7 @@ BUG
1. 模型由数据库存储改为文件存储
1. 简化站点配置,站点取消资源站点属性
1. 配置文件结构调整
+1. 优化推荐位输出
模板升级所需修改:
@@ -1 +1 @@
-{"aaa":{"code":"aaa","description":"dddd","configItemMap":{"aaa":{"code":"aaa","itemCode":"aaa","description":"测试测试","extendList":[{"id":{"code":"test"},"inputType":"text","required":false,"name":"测试","description":"","defaultValue":""}]}}}}
+{"wechat":{"code":"wechat","description":"微信公共账号","configItemMap":{"setting":{"code":"wechat","itemCode":"setting","description":"微信基础配置","extendList":[{"id":{"code":"AppID"},"required":true,"maxlength":null,"sort":0,"name":"appid","description":"在微信公共号平台申请的AppID","inputType":"text","defaultValue":"","dictionaryType":null,"dictionaryId":null},{"id":{"code":"AppSecret"},"required":true,"maxlength":null,"sort":0,"name":"secret","description":"在微信公共号平台申请的AppSecret","inputType":"text","defaultValue":"","dictionaryType":null,"dictionaryId":null}]}}}}
@@ -1,3 +1,4 @@
+<@compress single_line=true>
<#list page.list>
<style>
#right-images .owl-item img{
@@ -47,4 +48,5 @@
lazyLoad:true
});
</script>
-</#list>
+</#list>
+</@compress>
@@ -58,6 +58,7 @@
$('header').addClass('fixed-position');
}
});
+ $.cookie.raw = true;
var cookie = $.cookie("PUBLICCMS_USER");
if (cookie) {
var userdata = cookie.split(';;');
@@ -1 +1 @@
-<footer> <ul class="container"> <li><@_includePlace path="/index.html/11847f87-7f1b-4891-ace4-818659ce397b.html"/> <#-- 尾部-技术支持 --></li> <li><@_includePlace path="/index.html/895b6167-c2ce-43ad-b936-b1a10cd1ad5d.html"/> <#-- 页尾-源码托管 --></li> <li><@_includePlace path="/index.html/c6ae8ea8-103d-4c93-8ff2-79d67a38b3ae.html"/> <#-- 页尾-下载链接 --></li> <li><@_includePlace path="/index.html/d1bef19f-ec32-4c3b-90f9-b25ca0fe19e3.html"/> <#-- 页尾-商务合作 --></li> </ul> <div class="container"> <@_includePlace path="/index.html/cfdc226d-8abc-48ec-810d-f3941b175b20.html"/> <#-- 页尾-友情链接 --> <div class="copyright">&copy;${.now?string('yyyy')} PublicCMS.com All Rights Reserved. 京ICP备15009690号</div> </div></footer><div class="sidebar"> <ul> <li> <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=8a633f84fb2475068182d3c447319977faca6a14dc3acf8017a160d65962a175"> <img src="${site.sitePath}image/qq.png"> </a> </li> </ul></div><@_metadata path='/index.html'>${object.extendData.code?no_esc!}</@_metadata>
+<footer> <ul class="container"> <li><@_includePlace path="/index.html/11847f87-7f1b-4891-ace4-818659ce397b.html"/> <#-- 尾部-技术支持 --></li> <li><@_includePlace path="/index.html/c6ae8ea8-103d-4c93-8ff2-79d67a38b3ae.html"/> <#-- 页尾-下载链接 --></li> <li><@_includePlace path="/index.html/895b6167-c2ce-43ad-b936-b1a10cd1ad5d.html"/> <#-- 页尾-源码托管 --></li> <li><@_includePlace path="/index.html/d1bef19f-ec32-4c3b-90f9-b25ca0fe19e3.html"/> <#-- 页尾-商务合作 --></li> </ul> <div class="container"> <@_includePlace path="/index.html/cfdc226d-8abc-48ec-810d-f3941b175b20.html"/> <#-- 页尾-友情链接 --> <div class="copyright">&copy;${.now?string('yyyy')} PublicCMS.com All Rights Reserved. 京ICP备15009690号</div> </div></footer><div class="sidebar"> <ul> <li> <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=8a633f84fb2475068182d3c447319977faca6a14dc3acf8017a160d65962a175"> <img src="${site.sitePath}image/qq.png"> </a> </li> </ul></div><@_metadata path='/index.html'>${object.extendData.code?no_esc!}</@_metadata>
@@ -1,3 +1,4 @@
+<@compress single_line=true>
<style>
#index-focus{ margin-top:30px;}
#index-focus .owl-item img{ display:block;width:100%;height:auto;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
@@ -24,4 +25,5 @@
transitionStyle:"fade",
lazyLoad:true
});
-</script>
+</script>
+</@compress>
@@ -1,3 +1,4 @@
+<@compress single_line=true>
<!DOCTYPE html>
<html lang="zh-CN">
<head>
@@ -17,7 +18,7 @@
<div class="data-list left-content">
<@import path="/ftl/tools.ftl" namespace="t"/>
<@_modelList>
- <#list page.list?reverse as model>
+ <#list page.list as model>
<@_contentList modelId=model.id count=3>
<#if page.totalCount gt 0>
<h3>最新${model.name!}</h3>
@@ -42,10 +43,12 @@
</div>
<@_includePlace path="/category/list.html/3435e9a7-565a-4f93-8670-9c272a1d51cc.html"/> <#-- 精彩图集 -->
<@_includePlace path="/index.html/2ac8682d-d844-4d95-921d-8c92b89e515c.html"/> <#-- 开源中国 -->
+ <@_includePlace path="/index.html/30ef2211-1197-4725-b253-e5dc12af1b21.html"/> <#-- github -->
</aside>
</div>
<div class="clearfix-before"></div>
</main>
<@_includePlace path="/index.html/6369e868-50b9-4245-9d39-fd440384a685.html"/> <#-- 尾部Footer -->
</body>
-</html>
+</html>
+</@compress>
@@ -26,7 +26,7 @@
dataType: 'text',
success: function (data) {
$('#rawJson').val(data);
- process($('#rawJson'),$('.canvas'));
+ process(data,$('.code-canvas'));
}
});
}
@@ -113,8 +113,8 @@
<fieldset>
<legend>返回报文</legend>
<textarea id="rawJson"></textarea>
- <p><input type="button" value="格式化" onclick="process($('#rawJson'),$('.canvas'))"/></p>
- <div class="canvas"></div>
+ <p><input type="button" value="格式化" onclick="process($('#rawJson').val(),$('.code-canvas'))"/></p>
+ <div class="code-canvas"></div>
</fieldset>
</body>
</html>
@@ -1 +1 @@
-{"index.html":{"alias":"首页","publishPath":"index.html","useDynamic":true,"needLogin":false,"needBody":false,"bodyCharset":null,"acceptParamters":"","cacheTime":50,"extendList":[{"id":{"code":"keywords"},"required":true,"maxlength":null,"sort":0,"name":"SEO关键词","description":"","inputType":"textarea","defaultValue":"","dictionaryType":null,"dictionaryId":null},{"id":{"code":"description"},"required":true,"maxlength":null,"sort":0,"name":"SEO描述","description":"","inputType":"textarea","defaultValue":"","dictionaryType":null,"dictionaryId":null},{"id":{"code":"code"},"required":false,"maxlength":null,"sort":0,"name":"页面统计代码","description":"","inputType":"textarea","defaultValue":"","dictionaryType":null,"dictionaryId":null},{"id":{"code":"slogan"},"required":false,"maxlength":null,"sort":0,"name":"标语","description":"","inputType":"text","defaultValue":"","dictionaryType":null,"dictionaryId":null},{"id":{"code":"member"},"required":true,"maxlength":null,"sort":0,"name":"用户站点地址","description":"","inputType":"text","defaultValue":"","dictionaryType":null,"dictionaryId":null},{"id":{"code":"search"},"required":true,"maxlength":null,"sort":0,"name":"搜索站点地址","description":"","inputType":"text","defaultValue":"","dictionaryType":null,"dictionaryId":null}],"extendDataList":[{"name":"keywords","value":"开源CMS,CMS,JAVA CMS,SpringMVC CMS,JAVACMS,FreeMarker,Apache FreeMarker,publiccms"},{"name":"description","value":"PublicCMS是采用2016年最新主流技术开发的免费开源JAVACMS系统。商用免费,架构科学。无需任何数据库优化,即可支持上千万数据;支持全站静态化,SSI,0xml配置,扩展指令自动加载,动态页面局部静态化等为您快速建站,建设大规模站点提供强大驱动,也是企业级项目产品原型的良好选择。"},{"name":"code","value":"<script>\r\nvar _hmt = _hmt || [];\r\n(function() {\r\n var hm = document.createElement(\"script\");\r\n hm.src = \"//hm.baidu.com/hm.js?bd81f02e5329554415de9ee15f916a98\";\r\n var s = document.getElementsByTagName(\"script\")[0];\r\n s.parentNode.insertBefore(hm, s);\r\n})();\r\n</script>"},{"name":"slogan","value":"与先进同行"},{"name":"member","value":"//member.publiccms.com/"},{"name":"search","value":"//search.publiccms.com/"}]},"member.html":{"alias":"记录用户","publishPath":"member.html","useDynamic":false,"needLogin":false,"needBody":false,"bodyCharset":null,"acceptParamters":"","cacheTime":0,"extendList":null,"extendDataList":null},"sso.html":{"alias":"单点登录","publishPath":"sso.html","useDynamic":true,"needLogin":false,"needBody":false,"bodyCharset":null,"acceptParamters":"","cacheTime":0,"extendList":null,"extendDataList":null},"download.html":{"alias":"下载链接","publishPath":"download.html","useDynamic":true,"needLogin":false,"needBody":false,"bodyCharset":null,"acceptParamters":"","cacheTime":0,"extendList":null,"extendDataList":null},"interface.html":{"alias":"接口","publishPath":"","useDynamic":true,"needLogin":false,"needBody":false,"bodyCharset":null,"acceptParamters":"","cacheTime":0,"extendList":null,"extendDataList":null},"index.exe":{"alias":"首页.exe","publishPath":"","useDynamic":true,"needLogin":false,"needBody":false,"bodyCharset":null,"acceptParamters":"","cacheTime":0,"extendList":null,"extendDataList":null},"index.php":{"alias":"首页.php","publishPath":"","useDynamic":true,"needLogin":false,"needBody":false,"bodyCharset":null,"acceptParamters":"","cacheTime":0,"extendList":null,"extendDataList":null}}
+{"index.html":{"alias":"首页","publishPath":"index.html","useDynamic":true,"needLogin":false,"acceptParamters":"","cacheTime":0,"allowContribute":false,"extendList":[{"id":{"code":"keywords"},"inputType":"textarea","required":true,"name":"SEO关键词","description":"","defaultValue":""},{"id":{"code":"description"},"inputType":"textarea","required":true,"name":"SEO描述","description":"","defaultValue":""},{"id":{"code":"code"},"inputType":"textarea","required":false,"name":"页面统计代码","description":"","defaultValue":""},{"id":{"code":"slogan"},"inputType":"text","required":false,"name":"标语","description":"","defaultValue":""},{"id":{"code":"member"},"inputType":"text","required":true,"name":"用户站点地址","description":"","defaultValue":""},{"id":{"code":"search"},"inputType":"text","required":true,"name":"搜索站点地址","description":"","defaultValue":""}],"extendDataList":[{"name":"keywords","value":"CMS,开源CMS,JAVA CMS,SpringMVC CMS,JAVACMS,FreeMarker,Apache FreeMarker,publiccms"},{"name":"description","value":"PublicCMS是采用2016年最新主流技术开发的免费开源JAVACMS系统。架构科学。轻松支持上千万数据、千万PV;支持全站静态化,SSI,动态页面局部静态化等为您快速建站,建设大规模站点提供强大驱动,也是企业级项目产品原型的良好选择。"},{"name":"code","value":"<script>\r\nvar _hmt = _hmt || [];\r\n(function() {\r\n var hm = document.createElement(\"script\");\r\n hm.src = \"//hm.baidu.com/hm.js?bd81f02e5329554415de9ee15f916a98\";\r\n var s = document.getElementsByTagName(\"script\")[0];\r\n s.parentNode.insertBefore(hm, s);\r\n})();\r\n</script>"},{"name":"slogan","value":"与先进同行"},{"name":"member","value":"//member.publiccms.com/"},{"name":"search","value":"//search.publiccms.com/"}]},"member.html":{"alias":"记录用户","publishPath":"member.html","useDynamic":false,"needLogin":false,"acceptParamters":"","cacheTime":0,"allowContribute":false,"extendList":null,"extendDataList":null},"sso.html":{"alias":"单点登录","publishPath":"sso.html","useDynamic":true,"needLogin":false,"acceptParamters":"","cacheTime":0,"allowContribute":false,"extendList":null,"extendDataList":null},"download.html":{"alias":"下载链接","publishPath":"download.html","useDynamic":true,"needLogin":false,"acceptParamters":"","cacheTime":0,"allowContribute":false,"extendList":null,"extendDataList":null},"interface.html":{"alias":"接口","publishPath":"","useDynamic":true,"needLogin":false,"acceptParamters":"","cacheTime":0,"allowContribute":false,"extendList":null,"extendDataList":null},"index.php":{"alias":"首页.php","publishPath":"","useDynamic":true,"needLogin":false,"acceptParamters":"","cacheTime":0,"allowContribute":false,"extendList":null,"extendDataList":null}}
@@ -1,3 +1,3 @@
<#assign appid=(metadata.extendData.appid)!/>
<#assign secret=(metadata.extendData.secret)!/>
-${getHtml('https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid='+appid+'&secret='+secret)}
+${(getHtml('https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid='+appid+'&secret='+secret)?no_esc)!'{}'}
@@ -1 +1 @@
-<#if echostr?has_content><#assign str=''/><#list [metadata.extendData.token,timestamp,nonce]?sort as a><#assign str+=a/></#list><#if signature=getSha1Encode(str)>${echostr}<#else>error</#if><#else><#assign xml=getXml(body)/><#if 'event'=xml.xml.MsgType><#include "event."+xml.xml.Event+".html"/><#else><#include "message.html"/></#if></#if>
+<#if echostr?has_content><#assign str=''/><#list [metadata.extendData.token,timestamp,nonce]?sort as a><#assign str+=a/></#list><#if signature?upper_case=getSha1Encode(str)>${echostr}<#else>error</#if><#else><#assign xml=getXml(body)/><#if 'event'=xml.xml.MsgType><#include "event."+xml.xml.Event+".html"/><#else><#include "message.html"/></#if></#if>
@@ -1,8 +1,8 @@
<xml>
- <ToUserName><![CDATA[${xml.FromUserName}]]></ToUserName>
- <FromUserName><![CDATA[${xml.ToUserName}]]></FromUserName>
+ <ToUserName><![CDATA[${xml.xml.FromUserName}]]></ToUserName>
+ <FromUserName><![CDATA[${xml.xml.ToUserName}]]></FromUserName>
<CreateTime>${getDateNumber(.now)}</CreateTime>
<MsgType><![CDATA[text]]></MsgType>
- <Content><![CDATA[${xml.EventKey}]]></Content>
+ <Content><![CDATA[${xml.xml.EventKey}]]></Content>
<FuncFlag>0</FuncFlag>
</xml>
@@ -1,6 +1,6 @@
<xml>
- <ToUserName><![CDATA[${xml.FromUserName}]]></ToUserName>
- <FromUserName><![CDATA[${xml.ToUserName}]]></FromUserName>
+ <ToUserName><![CDATA[${xml.xml.FromUserName}]]></ToUserName>
+ <FromUserName><![CDATA[${xml.xml.ToUserName}]]></FromUserName>
<CreateTime>${getDateNumber(.now)}</CreateTime>
<MsgType><![CDATA[text]]></MsgType>
<Content><![CDATA[welcome!]]></Content>
@@ -1,2 +1,2 @@
-<#assign result=getHtml(base+'weixin/accessToken.html')!{}/>
+<#assign result=(getHtml(base+'weixin/accessToken.html')?eval)!{}/>
${getHtml('https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token='+(result.access_token!)+'&type=jsapi')}
@@ -3,7 +3,7 @@
<FromUserName><![CDATA[${xml.xml.ToUserName}]]></FromUserName>
<CreateTime>${getDateNumber(.now)}</CreateTime>
<MsgType><![CDATA[text]]></MsgType>
- <Content><![CDATA[<@_search word=xml.xml.Content?string count=5><#if page.totalCount =0>没有“${xml.xml.Content}”相关内容</#if><#list page.list as a><a href="${a.url}">${a.title}</a><#if a?has_next>
-</#if></#list></@_search>]]></Content>
+ <Content><![CDATA[<@_search word=xml.xml.Content?string count=5><#if page.totalCount =0>没有“${xml.xml.Content}”相关内容<#else><#list page.list as a><a href="${a.url?starts_with('http')?then(a.url,'http:'+a.url)}">${a.title}</a><#if a?has_next>
+</#if></#list></#if></@_search>]]></Content>
<FuncFlag>0</FuncFlag>
</xml>
@@ -1 +1 @@
-{"accessToken.html":{"alias":"微信接口","publishPath":null,"useDynamic":true,"needLogin":false,"needBody":false,"bodyCharset":null,"acceptParamters":"","cacheTime":7100,"extendList":[{"id":{"code":"appid"},"required":true,"maxlength":null,"sort":0,"name":"AppID","description":"在微信公共号平台申请的AppID","inputType":"text","defaultValue":"","dictionaryType":null,"dictionaryId":null},{"id":{"code":"secret"},"required":true,"maxlength":null,"sort":0,"name":"AppSecret","description":"在微信公共号平台申请的AppSecret","inputType":"text","defaultValue":"","dictionaryType":null,"dictionaryId":null}],"extendDataList":null},"jsApiTicket.html":{"alias":"微信jsapi ticket","publishPath":null,"useDynamic":true,"needLogin":false,"needBody":false,"bodyCharset":null,"acceptParamters":"","cacheTime":7100,"extendList":null,"extendDataList":null},"api.html":{"alias":"微信公共账号","publishPath":"","useDynamic":true,"needLogin":false,"needBody":true,"bodyCharset":null,"acceptParamters":"echostr,timestamp,nonce","cacheTime":0,"extendList":[{"id":{"code":"token"},"required":false,"maxlength":null,"sort":0,"name":"token","description":"此字段值需要与微信公共账号设置相同","inputType":"text","defaultValue":"","dictionaryType":null,"dictionaryId":null}],"extendDataList":null}}
+{"accessToken.html":{"alias":"微信接口","publishPath":null,"useDynamic":true,"needLogin":false,"needBody":false,"bodyCharset":null,"acceptParamters":"","cacheTime":7100,"extendList":[{"id":{"code":"appid"},"required":true,"maxlength":null,"sort":0,"name":"AppID","description":"在微信公共号平台申请的AppID","inputType":"text","defaultValue":"","dictionaryType":null,"dictionaryId":null},{"id":{"code":"secret"},"required":true,"maxlength":null,"sort":0,"name":"AppSecret","description":"在微信公共号平台申请的AppSecret","inputType":"text","defaultValue":"","dictionaryType":null,"dictionaryId":null}],"extendDataList":[{"name":"appid","value":""},{"name":"secret","value":""}]},"jsApiTicket.html":{"alias":"微信jsapi ticket","publishPath":null,"useDynamic":true,"needLogin":false,"needBody":false,"bodyCharset":null,"acceptParamters":"","cacheTime":7100,"extendList":null,"extendDataList":null},"api.html":{"alias":"微信公共账号","publishPath":"","useDynamic":true,"needLogin":false,"needBody":true,"bodyCharset":null,"acceptParamters":"echostr,timestamp,nonce,signature","cacheTime":0,"extendList":[{"id":{"code":"token"},"required":false,"maxlength":null,"sort":0,"name":"token","description":"","inputType":"text","defaultValue":"","dictionaryType":null,"dictionaryId":null}],"extendDataList":[{"name":"token","value":"weixin"}]},"createMenu.html":{"alias":"创建微信菜单","publishPath":"","useDynamic":true,"needLogin":false,"needBody":false,"bodyCharset":null,"acceptParamters":"","cacheTime":72000,"extendList":null,"extendDataList":null}}
@@ -1 +1 @@
-{"9":{"id":"9","parentId":null,"name":"代码","templatePath":null,"hasChild":false,"onlyUrl":false,"hasImages":false,"hasFiles":false,"extendList":[{"id":{"code":"result"},"required":false,"maxlength":null,"sort":0,"name":"效果","description":"","inputType":"textarea","defaultValue":"","dictionaryType":null,"dictionaryId":null}]}}
+{"10":{"id":"10","parentId":null,"name":"文章","templatePath":null,"hasChild":false,"onlyUrl":false,"hasImages":false,"hasFiles":false,"extendList":[]}}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -3,6 +3,9 @@
<head>
<meta charset="utf-8">
<title>Welcome to PublicCMS!</title>
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="expires" content="0">
</head>
<body>
<h1>欢迎使用PublicCMS!</h1>
Oops, something went wrong.

0 comments on commit a0474df

Please sign in to comment.