!148 脏数据和请求方式、设置静态化的域名

Merge pull request !148 from 他是超人他会飞/4.7.0

doc/4.6.5-to-4.7.0-sqlserver.sql

@@ -452,13 +452,18 @@ app_copyright as copyright,
 <#--动态解析 -->
 <#if isDo?? && isDo>
 ''${url}'' as url,
+''${url}'' as host,
+<#--使用地址栏的域名 -->
+<#elseif url??>
+''${url}/${html}/''+app_id+''/<#if m??>${m}</#if>'' as url,
+''${url}'' as host,
 <#else>
 REPLACE(<#-- 剔除换行符 -->
-substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''')+''/html/''+convert(varchar(50),app_id)+''/<#if m??>m</#if>'' as url, 
-</#if>
+substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''')+''/${html}/''+convert(varchar(50),app_id)+''/<#if m??>${m}</#if>'' as url, 
 REPLACE(<#-- 剔除换行符 -->
 substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''') as host,
-''templets/''+convert(varchar(50),app_id)+''/''<#if m??>+app_style+''/m''<#else>+app_style</#if> as style <#-- 判断是否为手机端 -->
+</#if>
+''templets/''+convert(varchar(50),app_id)+''/''<#if m??>+app_style+''/${m}''<#else>+app_style</#if> as style <#-- 判断是否为手机端 -->
 from app', N'1')
 GO
 

doc/SQL文件版本说明.md

@@ -3,9 +3,14 @@ db-mcms-mysql-4.7.0 最低版本mysql 5.7
 db-mcms-sqlserver-4.7.0 最低版本 SQLServer2012
 
 如果使用低与要求版本数据库会出现如下错误
-1、导入 mysql文件 datetime时间函数报错，请使用4.6.
+1、导入 mysql文件 datetime时间函数报错，请使用4.6.5版本以下的SQL文件（不包含4.6.5）
 2、SQLServer数据库版本 自定义标签 使用了SQLServer2012最新的分页函数 ，
 	请自行修改mdiy_tag_sql表中的分页函数
 	
 数据库类型切换 ：修改application.yml中	
-	database-id: mysql、sqlServer、oracle
+	database-id: mysql、sqlServer、oracle
+数据库连接切换：修改
+spring:
+  http.multipart.enabled: false
+  profiles:
+    active: dev、prod、test

doc/db-mcms-sqlserver-4.7.0.sql

@@ -2264,13 +2264,18 @@ app_copyright as copyright,
 <#--动态解析 -->
 <#if isDo?? && isDo>
 ''${url}'' as url,
+''${url}'' as host,
+<#--使用地址栏的域名 -->
+<#elseif url??>
+''${url}/${html}/''+app_id+''/<#if m??>${m}</#if>'' as url,
+''${url}'' as host,
 <#else>
 REPLACE(<#-- 剔除换行符 -->
-substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''')+''/html/''+convert(varchar(50),app_id)+''/<#if m??>m</#if>'' as url, 
-</#if>
+substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''')+''/${html}/''+convert(varchar(50),app_id)+''/<#if m??>${m}</#if>'' as url, 
 REPLACE(<#-- 剔除换行符 -->
 substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''') as host,
-''templets/''+convert(varchar(50),app_id)+''/''<#if m??>+app_style+''/m''<#else>+app_style</#if> as style <#-- 判断是否为手机端 -->
+</#if>
+''templets/''+convert(varchar(50),app_id)+''/''<#if m??>+app_style+''/${m}''<#else>+app_style</#if> as style <#-- 判断是否为手机端 -->
 from app', N'1'), (N'8', N'7', N'SELECT 
 basic_id as id,
 left(basic_title,${titlelen?default(40)}) as title,

src/main/java/net/mingsoft/cms/action/web/MCmsAction.java

@@ -35,10 +35,12 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import cn.hutool.core.util.ObjectUtil;
 import net.mingsoft.basic.biz.IColumnBiz;
 import net.mingsoft.basic.entity.ColumnEntity;
 import net.mingsoft.cms.bean.ColumnArticleIdBean;
 import net.mingsoft.cms.biz.IArticleBiz;
+import net.mingsoft.cms.constant.ModelCode;
 import net.mingsoft.cms.entity.ArticleEntity;
 import net.mingsoft.cms.util.CmsParserUtil;
 import net.mingsoft.mdiy.biz.IPageBiz;
@@ -89,6 +91,7 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction {
 	@ExceptionHandler(java.lang.NullPointerException.class)
 	public void diy(@PathVariable(value = "diy") String diy, HttpServletRequest req, HttpServletResponse resp) {
 		Map map = BasicUtil.assemblyRequestMap();
+		map.put(ParserUtil.URL, BasicUtil.getUrl());
 		//动态解析
 		map.put(ParserUtil.IS_DO,true);
 		//设置动态请求的模块路径
@@ -158,7 +161,8 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction {
 		List<ColumnArticleIdBean> columnArticles = articleBiz.queryIdsByCategoryIdForParser(typeId, null, null);
 		//判断栏目下是否有文章
 		if(columnArticles.size()==0){
-			this.outJson(resp, false);
+			this.outJson(resp, null,false,getResString("err.empty", this.getResString("typeid")));
+			return;	
 		}
 		map.put(ParserUtil.COLUMN, columnArticles.get(0));
 		//获取总数
@@ -200,6 +204,10 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction {
 	public void view(HttpServletRequest req, HttpServletResponse resp) {
 		//参数文章编号
 		ArticleEntity article = (ArticleEntity) articleBiz.getEntity(BasicUtil.getInt(ParserUtil.ID));
+		if(ObjectUtil.isNull(article)){
+			this.outJson(resp, null,false,getResString("err.empty", this.getResString("id")));
+			return;	
+		}
 		//根据文章编号查询栏目详情模版
 		ColumnEntity column = (ColumnEntity) columnBiz.getEntity(article.getBasicCategoryId());
 		//解析后的内容

src/main/java/net/mingsoft/cms/dao/IArticleDao.xml

@@ -47,7 +47,8 @@
 	<!-- 获取表字段 结束 -->
 	<!-- 通过视图查询返回结果集 开始 -->
 	<resultMap type="net.mingsoft.cms.bean.ColumnArticleIdBean" id="resultMapBean">
-		<result column="ARTICLE_BASICID" property="articleId" />	
+		<result column="ARTICLE_BASICID" property="articleId" />
+		<result column="column_listurl" property="columnListUrl"/><!-- 最终栏目列表地址 -->	
 		<result column="column_path" property="columnPath"/>			
 		<result column="column_url" property="columnUrl" />
 		<result column="category_title" property="categoryTitle" />

src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties

@@ -1,3 +1,5 @@
 #mcms\u7248\u672c
 version=d3a98fefcb242db78da5fc31608ff247
-templet.file=\u6a21\u677f\u6587\u4ef6\u4e0d\u5b58\u5728
+templet.file=\u6a21\u677f\u6587\u4ef6\u4e0d\u5b58\u5728
+id=\u6587\u7ae0\u7f16\u53f7
+typeid=\u680f\u76ee\u7f16\u53f7

src/main/java/net/mingsoft/cms/util/CmsParserUtil.java

@@ -46,13 +46,13 @@ public class CmsParserUtil extends ParserUtil {
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put(IS_DO, false);
 		boolean mobileStyle = false;
-		//判断是否有移动端
-		if (!StringUtil.isBlank(BasicUtil.getApp().getAppMobileStyle())) {
-			mobileStyle = true;
-		}
 		String content = CmsParserUtil.generate(templatePath, map, mobileStyle);
 		
 		FileUtil.writeString(content, ParserUtil.buildHtmlPath(targetPath), Const.UTF8);
+		//判断是否有移动端 不能将这个判断放在上面，会出现PC端一直是移动端的内容
+		if (!StringUtil.isBlank(BasicUtil.getApp().getAppMobileStyle())) {
+			mobileStyle = true;
+		}
 		// 生成移动页面
 		if (mobileStyle) {
 			// 手机端m

src/main/java/net/mingsoft/config/WebConfig.java

@@ -50,7 +50,7 @@ public class WebConfig implements WebMvcConfigurer {
 
 	@Override
 	public void addResourceHandlers(ResourceHandlerRegistry registry) {
-		registry.addResourceHandler("/html/**").addResourceLocations("classpath:/html/");
+		registry.addResourceHandler("/html/**").addResourceLocations("/html/");
 		registry.addResourceHandler("/app/**").addResourceLocations("classpath:/app/");
 		registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
 		registry.addResourceHandler("/api/**").addResourceLocations("classpath:/api/");

src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl

@@ -223,7 +223,7 @@ function clickZtreeId(event,treeId,treeNode){
 	}
 	var url="${managerPath}/mdiy/contentModel/contentModelField/"+treeNode.categoryId+"/queryField.do";
 	var basicId="basicId=${article.basicId?c?default(0)}";
-	$(this).request({url:url,data:basicId,method:"post",func:function(data) {
+	$(this).request({url:url,data:basicId,method:"get",func:function(data) {
 		$("#addFieldForm").html("");
 		$("#addFieldForm").html(data);
 	}});

src/main/webapp/templets/1/default/head.htm

@@ -1,7 +1,7 @@
 <div class="ms-head">
     <div class="head-menu">
         <div class="head-men-left head-menu-flex-center">
-            <a href="{ms:global.host/}">
+            <a href="{ms:global.host/}/html/1/index.html">
                 <img src="http://cdn.mingsoft.net/images/logo.png" />
             </a>
             <ul class="head-menu-list">
@@ -63,8 +63,8 @@
             <div class="head-menu-right-content" id="ms-login-vue">
                 <span v-show="!isLogin" style="display: none;">
                     <span>
-                        <a href='{ms:global.host/}/login.html'>登录</a>
-                    </span>|<span><a href='{ms:global.host/}/register.html'>注册</a></span>
+                        <a href='{ms:global.host/}/mcms/login.do'>登录</a>
+                    </span>|<span><a href='{ms:global.host/}/mcms/register.do'>注册</a></span>
                 </span>
                 <div class="topbar-info J_userInfo loginSuccess hide-default" v-show="isLogin" style="display: none;">
                     <a class="user-name" href="{ms:global.host/}/people/center.do">

src/main/webapp/templets/1/default/m/indexa.htm

@@ -1,282 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <#include "head-file.htm">
-        <link rel="stylesheet" type="text/css" href="http://cdn.mingsoft.net/plugins/bootstrap/3.3.5/css/bootstrap.min.css">
-        <script type="text/javascript" src="http://cdn.mingsoft.net/plugins/bootstrap/3.3.5/js/bootstrap.min.js"></script>
-    </head>
-
-    <body>
-        <#include "head.htm">
-        <!-- <div class="ms-banner"> 
-            <img src="./images/banner.jpg">
-        </div> -->
-        <div id="indexVue">
-            <div id="banner_tabs" class="flexslider">
-                <ul class="slides">
-                    <template v-for="banner in bannerList">
-                        <li style="background:url({ms:global.host/}/{ms:global.style/}/images/03.jpg) no-repeat center;">
-                            <p class="banner_tit animated fadeInLeft">铭飞MS平台</p>
-                            <p class="banner_des animated fadeInRight">MCms系统永久完整开源</p>
-                        </li>
-                        <li style="background:url({ms:global.host/}/{ms:global.style/}/images/03.jpg) no-repeat center;">
-                            <p class="banner_tit animated fadeInLeft">MStore</p>
-                            <p class="banner_des animated fadeInRight">丰富强大的功能插件、海量精美的行业模板</p>
-                        </li>
-                        <li style="background:url({ms:global.host/}/{ms:global.style/}/images/03.jpg) no-repeat center;">
-                            <p class="banner_tit animated fadeInLeft">优质的服务体验</p>
-                            <p class="banner_des animated fadeInRight">人工远程协助服务、永久享受更新升级</p>
-                        </li>
-                    </template>
-                </ul>
-                <ul class="flex-direction-nav">
-                    <li>
-                        <a class="flex-prev" href="javascript:;">Previous</a>
-                    </li>
-                    <li>
-                        <a class="flex-next" href="javascript:;">Next</a>
-                    </li>
-                </ul>
-            </div>
-            <div class="ms-content-index">
-                <div class="ms-content-template">
-                    <div>
-                        <ul class="nav nav-tabs ms-index-tabs" role="tablist">
-                            <li role="presentation" class="active">
-                                <a href="#model" aria-controls="model" role="tab" data-toggle="tab">模板</a>
-                            </li>
-                            <li role="presentation">
-                                <a href="#plug" aria-controls="plug" role="tab" data-toggle="tab">插件</a>
-                            </li>
-                        </ul>
-                        <div class="ms-content-all">
-                            <div class="tab-content">
-                                <div role="tabpanel" class="tab-pane active" id="model">
-                                    <div style="display: none;" class="ms-loading" v-show="!loading">
-                                        <img src="{ms:global.host/}/{ms:global.style/}/images/loading.gif" />
-                                    </div>
-                                    <div class="ms-model-content" style="display: none;" v-show="loading">
-                                        <template v-for="model in modelList">
-                                            <div class="ms-model-list">
-                                                <a class="ms-model-img" :href="model.upgraderVersionUrl" target="_blank">
-                                                    <img @mouseout="imgMout()" @mouseover="imgMover()" :src="'http://mstore.mingsoft.net/'+model.upgraderVersionImg" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
-                                                </a>
-                                                <div class="ms-model-mobile-img" v-if="model.upgraderVersionMobileImg != '' && model.upgraderVersionMobileImg != undefined" style="background: url({ms:global.host/}/{ms:global.style/}/images/mobile.png)">
-                                                    <div>
-                                                        <img @mouseout="imgMout()" @mouseover="imgMover()" :src="'http://mstore.mingsoft.net/'+model.upgraderVersionMobileImg" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
-                                                    </div>
-                                                </div>
-                                                <div class="ms-model-info">
-                                                    <span v-text="model.upgraderVersionName"></span>
-                                                    <img class="ms-model-info-img" :src="model.upgraderVersionPeopleIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'" />
-                                                    <img :src="'{ms:global.host/}/{ms:global.style/}/images/level-'+model.upgraderVersionStart+'.png'" />
-                                                    <div class="ms-model-type">模板</div>
-                                                </div>
-                                            </div>
-                                        </template>
-                                        <div class="ms-model-list" style="display: none;" v-show="loading">
-                                            <div class="ms-model-more">
-                                                <div onclick="window.open('http://mstore.mingsoft.net/mstoreShow.do')">查看更多</div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div role="tabpanel" class="tab-pane" id="plug">
-                                    <div class="ms-model-content" style="display: none;" v-show="loading">
-                                        <template v-for="pulg in pulgList">
-                                            <div class="ms-model-list">
-                                                <a class="ms-model-img" :href="pulg.upgraderVersionUrl" target="_blank">
-                                                    <img :src="'http://mstore.mingsoft.net/'+pulg.upgraderVersionImg" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
-                                                </a>
-                                                <div class="ms-model-info">
-                                                    <span v-text="pulg.upgraderVersionName"></span>
-                                                    <img class="ms-model-info-img" :src="pulg.upgraderVersionPeopleIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'" />
-                                                    <img :src="'{ms:global.host/}/{ms:global.style/}/images/level-'+pulg.upgraderVersionStart+'.png'" />
-                                                    <div class="ms-model-type">插件</div>
-                                                </div>
-                                            </div>
-                                        </template>
-                                        <div class="ms-model-list" style="display: none;" v-show="loading">
-                                            <div class="ms-model-more">
-                                                <div onclick="window.open('http://mstore.mingsoft.net/mstoreShow.do')">查看更多</div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="ms-content-case">
-                    <div class="ms-content-case-mian">
-                        <div class="ms-content-case-title">
-                            <div class="ms-content-case-title-words">网站案例</div>
-                            <div class="ms-content-case-more">
-                                <a href='{ms:global.url/}/149/index.html'>MORE>></a>
-                            </div>
-                        </div>
-                        <div class="ms-content-case-list">
-                            {ms:arclist typeid=149 size=6}
-                            <div class="ms-content-main-case">
-                                <div class="ms-content-main-case-img">
-                                    <img src="{ms:global.host/}[field.litpic/]">
-                                </div>
-                                <div class="ms-content-main-case-explain">
-                                    <div class="ms-content-main-case-title">[field.title/]</div>
-                                    <div class="ms-content-main-case-content">
-
-                                        <p class="ms-content-main-case-written">
-                                            [field.content/]
-                                        </p>
-                                    </div>
-                                    <div class="ms-content-main-case-click">
-                                        <a target="_blank" href="[field.source/]">点击查看</a>
-                                    </div>
-                                </div>
-                            </div>
-                            {/ms:arclist}
-                        </div>
-                    </div>
-                </div>
-                <div class="ms-content-product">
-                    <div class="ms-content-product-main">
-                        <div class="ms-content-product-title">
-                            <div class="ms-content-product-title-words">产品方向</div>
-                        </div>
-                        <div class="ms-content-product-list">
-                            <ul class="ms-content-product-list-ul">
-							    <li>
-							        <div class="ms-content-product-list-img">
-							            <a target="_blank" href="http://www.mingsoft.net/html/1/5523/index.html">
-							                <img src="http://www.mingsoft.net/templets/1/ming-soft//images/hu1.png"></a>
-							        </div>
-							        <div class="ms-content-product-list-content">
-							            <div class="ms-content-product-list-content-title">
-							                <a target="_blank" href="http://www.mingsoft.net/html/1/5523/index.html">铭飞建站系统MCMS</a></div>
-							            <div class="ms-content-product-list-content-describe">纯Java开发，MCMS支持PC与MOBILE皮肤定制,同时使用MS团队移动JS插件，支持站群。</div></div>
-							    </li>
-							    <li>
-							        <div class="ms-content-product-list-img">
-							            <a target="_blank" href="http://www.mingsoft.net/html/1/5524/index.html">
-							                <img src="http://www.mingsoft.net/templets/1/ming-soft//images/hu2.jpg"></a>
-							        </div>
-							        <div class="ms-content-product-list-content">
-							            <div class="ms-content-product-list-content-title">
-							                <a target="_blank" href="http://www.mingsoft.net/html/1/5524/index.html">移动互联网</a></div>
-							            <div class="ms-content-product-list-content-describe">重新定义移动开发，快速、开放、高性能，数据无缝对接，超过500个模块api 接口，方便实现各种应用。</div></div>
-							    </li>
-							    <li>
-							        <div class="ms-content-product-list-img">
-							            <a target="_blank" href="http://www.mingsoft.net/html/1/5526/index.html">
-							                <img src="http://www.mingsoft.net/templets/1/ming-soft//images/hu3.jpg"></a>
-							        </div>
-							        <div class="ms-content-product-list-content">
-							            <div class="ms-content-product-list-content-title">
-							                <a target="_blank" href="http://www.mingsoft.net/html/1/5526/index.html">铭飞物联网</a></div>
-							            <div class="ms-content-product-list-content-describe">MS+物联网，让生产企业真正掌握企业命脉，实现互联网+生产，给企业插上信息化翅膀，共享、共荣大数据时代</div></div>
-							    </li>
-							</ul>
-                        </div>
-                    </div>
-                </div>
-                <div class="ms-content-news">
-                    <div class="ms-content-news-main">
-                        <div class="ms-content-news-main-title">
-                            <div class="ms-content-news-main-title-words">公司动态</div>
-                            <div class="ms-content-news-main-title-more">
-                                <a href='{ms:global.url/}/59/index.html'>MORE>></a>
-                            </div>
-                        </div>
-                        <div class="ms-content-news-main-img-text">
-	                        {ms:arclist typeid=59 size=1}
-	                            <img src="{ms:global.host/}[field.litpic/]">
-                            {/ms:arclist}
-                            <ul class="ms-content-news-main-ul">
-                                {ms:arclist typeid=59 size=6}
-                                <li>
-                                    <a href="{ms:global.url/}[field.link/]">
-                                        <div class="ms-content-news-main-li-title">
-                                            <!-- <span class="ms-content-news-main-li-span">·</span> -->
-                                            <span class="">[field.title/]</span>
-                                        </div>
-                                        <div class="ms-content-news-main-li-time">[field.date?string("yyyy-mm-dd")/]</div>
-                                    </a>
-                                </li>
-                                {/ms:arclist}
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <#include "footer.htm">
-    </body>
-</html>
-<script type="text/javascript">
-    ms.load(["ms", "{ms:global.host/}/{ms:global.style/}/js/demo.js"], function(ms, mmstore) { //../templets/86/cms/js/ms.mstore.js
-        var index = new Vue({
-            el: "#indexVue",
-            data: {
-                bannerList: ['01', '02', '03', '04', '05'], //幻灯片列表
-                modelList: [], //模板列表
-                pulgList: [], //插件列表
-                loading: false, //加载状态
-            },
-            methods: {
-                query: function(data, type) {
-                    var target = this;
-                    mmstore.mstore.list(data, function(json) {
-                        if(type == 'model') {
-                            target.modelList = json.list;
-                        } else {
-                            target.pulgList = json.list;
-                            target.loading = true;
-                        }
-                    });
-                },
-                imgMover: function() {
-                    var _this = event.target;
-                    var ms_top = ($(_this).height()) - 275;
-                    if(ms_top < 0) {
-                        ms_top = 0;
-                    }
-                    $(_this).stop(true);
-                    $(_this).animate({
-                        "top": -(ms_top)
-                    }, 2500);
-                },
-                imgMout: function() {
-                    var _this = event.target;
-                    $(_this).stop(true);
-                    $(_this).animate({
-                        "top": 0
-                    }, 2500);
-                },
-            },
-            mounted: function() {
-                var data = "upgraderVersionType=2&upgraderVersionIndustry=0&orderBy=uv_id&pageSize=5&pageNo=1";
-                this.query(data, 'model');
-                var data = "upgraderVersionType=1&upgraderVersionIndustry=0&orderBy=uv_id&pageSize=5&pageNo=1";
-                this.query(data, 'pulg');
-                /*幻灯*/
-                setTimeout(function() {
-                    var bannerSlider = new Slider($('#banner_tabs'), {
-                        time: 5000,
-                        delay: 400,
-                        event: 'hover',
-                        auto: true,
-                        mode: 'fade',
-                        controller: $('#bannerCtrl'),
-                        activeControllerCls: 'active'
-                    });
-                    $('#banner_tabs .flex-prev').click(function() {
-                        bannerSlider.prev()
-                    });
-                    $('#banner_tabs .flex-next').click(function() {
-                        bannerSlider.next()
-                    });
-                }, 300)
-            },
-        })
-    })
-</script>

src/main/webapp/templets/1/default/search.htm

@@ -45,17 +45,19 @@ new Vue({
        list: [],
     },
     methods: {
+   	//上下页
   	search:function(flag){
   		var pageNo = {ms:search.pageNo/};
   		var total = {ms:page.total/};
   		if(flag){
-  			pageNo = pageNo==total ? total : pageNo +1;
+  			pageNo = pageNo==total ? total : pageNo +1;//下一页
   		}else{
-  			pageNo = pageNo -1==0 ? 1 : pageNo-1;
+  			pageNo = pageNo -1==0 ? 1 : pageNo-1;//上一页
   		}
   		window.location.href="{ms:global.host/}/cms/1/search.do?basic_title={ms:search.basic_title/}&pageNo="+pageNo;
   		window.event.returnValue=false; 
   	},
+  	//首页和尾页
   	indexAndLast:function(pageNo){
   		window.location.href="{ms:global.host/}/cms/1/search.do?basic_title={ms:search.basic_title/}&pageNo="+pageNo;
   		window.event.returnValue=false;