From dfad56af46c7c97258ecd7bb922cbfe86f67090a Mon Sep 17 00:00:00 2001 From: sgjj Date: Fri, 9 Aug 2019 21:44:33 +0800 Subject: [PATCH 01/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/mingsoft/cms/action/BaseAction.java | 22 +++ .../mingsoft/cms/action/web/MCmsAction.java | 85 +++++++++-- .../net/mingsoft/cms/biz/IArticleBiz.java | 133 +++++++++-------- .../mingsoft/cms/biz/impl/ArticleBizImpl.java | 41 ++--- .../java/net/mingsoft/cms/constant/Const.java | 14 ++ .../net/mingsoft/cms/dao/IArticleDao.java | 140 +++++++++--------- .../java/net/mingsoft/cms/dao/IArticleDao.xml | 124 ++++++++-------- .../cms/resources/resources_zh_CN.properties | 9 +- 8 files changed, 346 insertions(+), 222 deletions(-) create mode 100644 src/main/java/net/mingsoft/cms/action/BaseAction.java create mode 100644 src/main/java/net/mingsoft/cms/constant/Const.java diff --git a/src/main/java/net/mingsoft/cms/action/BaseAction.java b/src/main/java/net/mingsoft/cms/action/BaseAction.java new file mode 100644 index 00000000..78856924 --- /dev/null +++ b/src/main/java/net/mingsoft/cms/action/BaseAction.java @@ -0,0 +1,22 @@ +package net.mingsoft.cms.action; + +import java.util.MissingResourceException; + +/** + * @Author: 铭飞开源团队--huise + * @Date: 2019/8/9 20:47 + */ +public class BaseAction extends net.mingsoft.mdiy.action.BaseAction{ + @Override + protected String getResString(String key) { + // TODO Auto-generated method stub + String str = ""; + try { + str = super.getResString(key); + } catch (MissingResourceException e) { + str = net.mingsoft.cms.constant.Const.RESOURCES.getString(key); + } + + return str; + } +} diff --git a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java index 8090b565..9424bb51 100644 --- a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java @@ -1,5 +1,5 @@ /** -The MIT License (MIT) * Copyright (c) 2016 铭飞科技(mingsoft.net) + The MIT License (MIT) * Copyright (c) 2016 铭飞科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -21,13 +21,23 @@ The MIT License (MIT) * Copyright (c) 2016 铭飞科技(mingsoft.net) package net.mingsoft.cms.action.web; +import java.io.File; import java.io.IOException; +import java.util.HashMap; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.io.FileUtil; +import com.github.pagehelper.PageHelper; +import net.mingsoft.base.constant.Const; +import net.mingsoft.basic.util.SpringUtil; +import net.mingsoft.cms.constant.e.ColumnTypeEnum; +import net.mingsoft.mdiy.biz.IContentModelBiz; +import net.mingsoft.mdiy.entity.ContentModelEntity; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ExceptionHandler; @@ -54,13 +64,13 @@ import net.mingsoft.mdiy.util.ParserUtil; /** * 动态生成页面，需要后台配置自定义页数据 - * + * * @author 铭飞开源团队 * @date 2018年12月17日 */ @Controller("dynamicPageAction") @RequestMapping("/mcms") -public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction { +public class MCmsAction extends net.mingsoft.cms.action.BaseAction { /** * 自定义页面业务层 @@ -84,7 +94,7 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction { // 如商城就为:/mall/{key}.do /** * 前段会员中心所有页面都可以使用该方法 请求地址例如： ／{diy}.do,例如登陆界面，与注册界面都可以使用 - * + * * @param key */ @RequestMapping("/{diy}.do") @@ -158,7 +168,7 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction { //获取栏目编号 int typeId = BasicUtil.getInt(ParserUtil.TYPE_ID,0); int size = BasicUtil.getInt(ParserUtil.SIZE,10); - + //获取文章总数 List columnArticles = articleBiz.queryIdsByCategoryIdForParser(typeId, null, null); //判断栏目下是否有文章 @@ -175,7 +185,7 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction { map.put(ParserUtil.TYPE_ID, typeId); //设置列表当前页 map.put(ParserUtil.PAGE_NO, BasicUtil.getInt(ParserUtil.PAGE_NO,1)); - + map.put(ParserUtil.URL, BasicUtil.getUrl()); map.put(ParserUtil.PAGE, page); //动态解析 @@ -198,19 +208,27 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction { } this.outString(resp, content); } - + /** * 动态详情页 * @param id 文章编号 */ @GetMapping("/view.do") - public void view(HttpServletRequest req, HttpServletResponse resp) { + public void view(String orderby,String order,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; + return; + } + if(StringUtils.isNotBlank(order)){ + //防注入 + if(!order.toLowerCase().equals("asc")&&!order.toLowerCase().equals("desc")){ + this.outJson(resp, null,false,getResString("err.error", this.getResString("order"))); + return; + } } + PageBean page = new PageBean(); //根据文章编号查询栏目详情模版 ColumnEntity column = (ColumnEntity) columnBiz.getEntity(article.getBasicCategoryId()); //解析后的内容 @@ -221,6 +239,55 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction { //设置动态请求的模块路径 map.put(ParserUtil.MODEL_NAME, "mcms"); map.put(ParserUtil.URL, BasicUtil.getUrl()); + map.put(ParserUtil.PAGE, page); + map.put(ParserUtil.ID, article.getArticleID()); + List articleIdList = articleBiz.queryIdsByCategoryIdForParser(column.getCategoryCategoryId(), null, null,orderby,order); + Map contentModelMap = new HashMap(); + ContentModelEntity contentModel = null; + for (int artId = 0; artId < articleIdList.size();) { + //如果不是当前文章则跳过 + if(articleIdList.get(artId).getArticleId() != article.getArticleID()){ + artId++; + continue; + } + // 文章的栏目路径 + String articleColumnPath = articleIdList.get(artId).getColumnPath(); + // 文章的栏目模型编号 + int columnContentModelId = articleIdList.get(artId).getColumnContentModelId(); + Map parserParams = new HashMap(); + parserParams.put(ParserUtil.COLUMN, articleIdList.get(artId)); + // 判断当前栏目是否有自定义模型 + if (columnContentModelId > 0) { + // 通过当前栏目的模型编号获取，自定义模型表名 + if (contentModelMap.containsKey(columnContentModelId)) { + parserParams.put(ParserUtil.TABLE_NAME, contentModel.getCmTableName()); + } else { + // 通过栏目模型编号获取自定义模型实体 + contentModel = (ContentModelEntity) SpringUtil.getBean(IContentModelBiz.class) + .getEntity(columnContentModelId); + // 将自定义模型编号设置为key值 + contentModelMap.put(columnContentModelId, contentModel.getCmTableName()); + parserParams.put(ParserUtil.TABLE_NAME, contentModel.getCmTableName()); + } + } + // 第一篇文章没有上一篇 + if (artId > 0) { + ColumnArticleIdBean preCaBean = articleIdList.get(artId - 1); + //判断当前文档是否与上一页文章在同一栏目下，并且不能使用父栏目字符串，因为父栏目中没有所属栏目编号 + if(articleColumnPath.contains(preCaBean.getCategoryId()+"")){ + page.setPreId(preCaBean.getArticleId()); + } + } + // 最后一篇文章没有下一篇 + if (artId + 1 < articleIdList.size()) { + ColumnArticleIdBean nextCaBean = articleIdList.get(artId + 1); + //判断当前文档是否与下一页文章在同一栏目下并且不能使用父栏目字符串，因为父栏目中没有所属栏目编号 + if(articleColumnPath.contains(nextCaBean.getCategoryId()+"")){ + page.setNextId(nextCaBean.getArticleId()); + } + } + break; + } try { //根据模板路径，参数生成 content = CmsParserUtil.generate(column.getColumnUrl(), map, isMobileDevice(req)); diff --git a/src/main/java/net/mingsoft/cms/biz/IArticleBiz.java b/src/main/java/net/mingsoft/cms/biz/IArticleBiz.java index 091a3188..d6e8eb0d 100644 --- a/src/main/java/net/mingsoft/cms/biz/IArticleBiz.java +++ b/src/main/java/net/mingsoft/cms/biz/IArticleBiz.java @@ -1,43 +1,43 @@ -/** -The MIT License (MIT) * Copyright (c) 2016 铭飞科技(mingsoft.net) - - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - +/** + The MIT License (MIT) * Copyright (c) 2016 铭飞科技(mingsoft.net) + + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package net.mingsoft.cms.biz; -import java.util.List; -import java.util.Map; - -import net.mingsoft.basic.biz.IBasicBiz; -import net.mingsoft.cms.bean.ColumnArticleIdBean; -import net.mingsoft.cms.entity.ArticleEntity; -import net.mingsoft.mdiy.entity.ContentModelEntity; - - -/** - * - * @ClassName: IArticleBiz - * @Description:TODO(文章管理业务处理层 || 继承IBasicBiz业务处理层) - * @author: 铭飞开发团队 - * @date: 2018年1月31日 下午2:53:32 - * - * @Copyright: 2018 www.mingsoft.net Inc. All rights reserved. +import java.util.List; +import java.util.Map; + +import net.mingsoft.basic.biz.IBasicBiz; +import net.mingsoft.cms.bean.ColumnArticleIdBean; +import net.mingsoft.cms.entity.ArticleEntity; +import net.mingsoft.mdiy.entity.ContentModelEntity; + + +/** + * + * @ClassName: IArticleBiz + * @Description:TODO(文章管理业务处理层 || 继承IBasicBiz业务处理层) + * @author: 铭飞开发团队 + * @date: 2018年1月31日 下午2:53:32 + * + * @Copyright: 2018 www.mingsoft.net Inc. All rights reserved. */ public interface IArticleBiz extends IBasicBiz { @@ -52,14 +52,14 @@ public interface IArticleBiz extends IBasicBiz { * @param article * 文件实体 * @return - */ + */ @Deprecated int count(int webId, int[] basicCategoryId, String flag, String noFlag, ArticleEntity article); /** * 通过分类id获取文章内容 - * + * * @param categoryId * 分类编号 * @return @@ -69,7 +69,7 @@ public interface IArticleBiz extends IBasicBiz { /** * 通过视图表来查询文章总数 - * + * * @param basicId * 文章编号 */ @@ -78,31 +78,31 @@ public interface IArticleBiz extends IBasicBiz { /** * 查找basicId下一篇文章 - * + * * @param appId * 应用编号 * @param basicId * 文章编号 * @return - */ + */ @Deprecated public ArticleEntity getNext(int appId, int basicId, Integer categoryId); /** * 查找basicId上一篇文章 - * + * * @param appId * 应用编号 * @param basicId * 文章编号 * @return - */ + */ @Deprecated public ArticleEntity getPrevious(int appId, int basicId, Integer categoryId); /** * 高级查询接口，主要提供给有自定义模型的栏目，返回總數 - * + * * @param contentModel * 自定义模型 * @param whereMap @@ -118,7 +118,7 @@ public interface IArticleBiz extends IBasicBiz { /** * 文章查询 - * + * * @para webId 网站编号 * @param basicCategoryIds * 栏目编号集合 @@ -129,28 +129,37 @@ public interface IArticleBiz extends IBasicBiz { * @param orderBy * 排序字段 * @param order - * true 升序 false 降序 排序方式 - * @param beginTime 开始时间 + * true 升序 false 降序 排序方式 + * @param beginTime 开始时间 * @param endTime 结束时间 * @param article - * 文章实体，便于扩展查询 + * 文章实体，便于扩展查询 * @return 文章集合 */ List query(int webId, int[] basicCategoryIds, String flag, String noFlag, String orderBy, - boolean order, String beginTime,String endTime, ArticleEntity article); - - /** - * 查询文章编号集合 - * @param categoryId 栏目编号 - * @param beginTime 开始时间 - * @param endTime 结束时间 - * @return + boolean order, String beginTime,String endTime, ArticleEntity article); + + /** + * 查询文章编号集合 + * @param categoryId 栏目编号 + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @return */ public List queryIdsByCategoryIdForParser(int categoryId, String beginTime,String endTime); - + /** + * 查询文章编号集合 + * @param categoryId 栏目编号 + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @param orderBy 排序字段 + * @param order 排序方式 + * @return + */ + public List queryIdsByCategoryIdForParser(int categoryId, String beginTime,String endTime,String orderBy,String order); /** * 根据页面栏目的id获取与其绑定的文章实体 - * + * * @param basicCategoryId * @return 文章实体 */ @@ -162,7 +171,7 @@ public interface IArticleBiz extends IBasicBiz { /** * 高级查询接口，主要提供给有自定义模型的栏目， - * + * * @param conntentModel * 自定义模型 * @param whereMap @@ -177,6 +186,6 @@ public interface IArticleBiz extends IBasicBiz { */ @Deprecated public List queryListForSearch(ContentModelEntity conntentModel, Map whereMap, - int appId, List ids, Map orders); + int appId, List ids, Map orders); } \ No newline at end of file diff --git a/src/main/java/net/mingsoft/cms/biz/impl/ArticleBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/ArticleBizImpl.java index 5c8fdf1d..7f89bd37 100644 --- a/src/main/java/net/mingsoft/cms/biz/impl/ArticleBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/ArticleBizImpl.java @@ -1,5 +1,5 @@ /** -The MIT License (MIT) * Copyright (c) 2016 铭飞科技(mingsoft.net) + The MIT License (MIT) * Copyright (c) 2016 铭飞科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,43 +43,43 @@ import net.mingsoft.mdiy.biz.IContentModelBiz; import net.mingsoft.mdiy.entity.ContentModelEntity; /** - * - * @ClassName: ArticleBizImpl - * @Description:TODO(文章管理业务层实现类 || 继承BasicBizImpl || 实现IArticleBiz) + * + * @ClassName: ArticleBizImpl + * @Description:TODO(文章管理业务层实现类 || 继承BasicBizImpl || 实现IArticleBiz) * @author: 铭飞开发团队 - * @date: 2018年1月31日 下午2:53:53 - * + * @date: 2018年1月31日 下午2:53:53 + * * @Copyright: 2018 www.mingsoft.net Inc. All rights reserved. */ @Service("ArticleBizImpl") public class ArticleBizImpl extends BasicBizImpl implements IArticleBiz { - + /** * 文章持久化处理 */ private IArticleDao articleDao; - - + + /** * 栏目业务处理 */ @Autowired - private ICategoryBiz categoryBiz; + private ICategoryBiz categoryBiz; /** * 自定类型义业务处理 */ @Autowired private IColumnBiz columnBiz; - + /** * 自定义模型 */ @Autowired private IContentModelBiz contentModelBiz; - + /** * 模块管理业务层 */ @@ -94,7 +95,7 @@ public class ArticleBizImpl extends BasicBizImpl implements IArticleBiz { /** * 获取Article的持久化层 - * + * * @return 返回持Article的久化对象 */ public IArticleDao getArticleDao() { @@ -133,7 +134,7 @@ public class ArticleBizImpl extends BasicBizImpl implements IArticleBiz { /** * 获取IBaseDao的持久化层 - * + * * @return 返回持articleDao的久化对象 */ @Override @@ -165,7 +166,7 @@ public class ArticleBizImpl extends BasicBizImpl implements IArticleBiz { @Override public List query(int webId, int[] basicCategoryIds, String flag, String noFlag, String orderBy, - boolean order,String beginTime,String endTime, ArticleEntity article) { + boolean order,String beginTime,String endTime, ArticleEntity article) { // TODO Auto-generated method stub if(article == null) { article = new ArticleEntity(); @@ -175,7 +176,7 @@ public class ArticleBizImpl extends BasicBizImpl implements IArticleBiz { /** * 根据页面栏目的id获取与其绑定的文章实体 - * + * * @param basicCategoryId * @return 文章实体 */ @@ -201,7 +202,7 @@ public class ArticleBizImpl extends BasicBizImpl implements IArticleBiz { /** * 设置Article的持久化层 - * + * * @param articleDao */ @Autowired @@ -212,6 +213,10 @@ public class ArticleBizImpl extends BasicBizImpl implements IArticleBiz { @Override public List queryIdsByCategoryIdForParser(int categoryId, String beginTime,String endTime) { - return this.articleDao.queryIdsByCategoryIdForParser(categoryId,BasicUtil.getAppId(), beginTime, endTime); + return this.articleDao.queryIdsByCategoryIdForParser(categoryId,BasicUtil.getAppId(), beginTime, endTime,null,null); + } + @Override + public List queryIdsByCategoryIdForParser(int categoryId, String beginTime,String endTime,String orderBy,String order) { + return this.articleDao.queryIdsByCategoryIdForParser(categoryId,BasicUtil.getAppId(), beginTime, endTime,orderBy,order); } } \ No newline at end of file diff --git a/src/main/java/net/mingsoft/cms/constant/Const.java b/src/main/java/net/mingsoft/cms/constant/Const.java new file mode 100644 index 00000000..d6fa7e1c --- /dev/null +++ b/src/main/java/net/mingsoft/cms/constant/Const.java @@ -0,0 +1,14 @@ +package net.mingsoft.cms.constant; + +import java.util.ResourceBundle; + +/** + * @Author: 铭飞开源团队--huise + * @Date: 2019/8/9 20:51 + */ +public class Const { + /** + * 资源文件 + */ + public final static ResourceBundle RESOURCES = ResourceBundle.getBundle("net.mingsoft.cms.resources.resources"); +} diff --git a/src/main/java/net/mingsoft/cms/dao/IArticleDao.java b/src/main/java/net/mingsoft/cms/dao/IArticleDao.java index d981012c..c48b6bdf 100644 --- a/src/main/java/net/mingsoft/cms/dao/IArticleDao.java +++ b/src/main/java/net/mingsoft/cms/dao/IArticleDao.java @@ -1,45 +1,45 @@ -/** -The MIT License (MIT) * Copyright (c) 2016 铭飞科技(mingsoft.net) - - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - +/** + The MIT License (MIT) * Copyright (c) 2016 铭飞科技(mingsoft.net) + + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package net.mingsoft.cms.dao; -import java.util.List; -import java.util.Map; - -import org.apache.ibatis.annotations.Param; - -import net.mingsoft.cms.bean.ColumnArticleIdBean; -import net.mingsoft.cms.entity.ArticleEntity; - -import net.mingsoft.base.dao.IBaseDao; - - -/** - * - * @ClassName: IArticleDao - * @Description:TODO(文章管理持久化层 || 继承IBaseDao持久化层) - * @author: 铭飞开发团队 - * @date: 2018年1月31日 下午2:55:33 - * - * @Copyright: 2018 www.mingsoft.net Inc. All rights reserved. +import java.util.List; +import java.util.Map; + +import org.apache.ibatis.annotations.Param; + +import net.mingsoft.cms.bean.ColumnArticleIdBean; +import net.mingsoft.cms.entity.ArticleEntity; + +import net.mingsoft.base.dao.IBaseDao; + + +/** + * + * @ClassName: IArticleDao + * @Description:TODO(文章管理持久化层 || 继承IBaseDao持久化层) + * @author: 铭飞开发团队 + * @date: 2018年1月31日 下午2:55:33 + * + * @Copyright: 2018 www.mingsoft.net Inc. All rights reserved. */ public interface IArticleDao extends IBaseDao { @@ -54,24 +54,24 @@ public interface IArticleDao extends IBaseDao { * @param article * 文章实体，便于扩展查询 * @return 文章总数 - */ + */ @Deprecated int count(@Param("webId") int webId, @Param("basicCategoryIds") int[] basicCategoryIds, @Param("flag") String flag, - @Param("noFlag") String noFlag, @Param("article") ArticleEntity article); + @Param("noFlag") String noFlag, @Param("article") ArticleEntity article); /** * 通过分类id获取文章内容 - * + * * @param categoryId * 分类编号 * @return 文章集合 - */ + */ @Deprecated List getByCategoryId(@Param("categoryId") int categoryId); /** * 通过视图表来查询文章总数 - * + * * @param basicId * 文章编号 * @param contentModelTableName @@ -81,7 +81,7 @@ public interface IArticleDao extends IBaseDao { /** * 查找basicId上一篇文章 - * + * * @param appId * 应用编号 * @param basicId @@ -91,11 +91,11 @@ public interface IArticleDao extends IBaseDao { * @return */ ArticleEntity getNextOrPrevious(@Param("appId") int appId, @Param("basicId") int basicId, - @Param("flag") boolean flag, @Param("categoryId") Integer categoryId); + @Param("flag") boolean flag, @Param("categoryId") Integer categoryId); /** * 根据查询文章实体总数 - * + * * @param tableName * :自定义生成的表名 * @param map @@ -104,11 +104,11 @@ public interface IArticleDao extends IBaseDao { * @return 文章实体总数 */ int getSearchCount(@Param("tableName") String tableName, @Param("map") Map map, - @Param("websiteId") int websiteId, @Param("ids") String ids); + @Param("websiteId") int websiteId, @Param("ids") String ids); /** * 文章查询 - * + * * @para webId 网站编号 * @param basicCategoryIds * 栏目编号集合 @@ -121,19 +121,19 @@ public interface IArticleDao extends IBaseDao { * @param order * true 升序 false 降序 排序方式 * @param article - * 文章实体，便于扩展查询 - * @param beginTime 开始时间 + * 文章实体，便于扩展查询 + * @param beginTime 开始时间 * @param endTime 结束时间 * @return 文章集合 */ List query(@Param("webId") int webId, @Param("basicCategoryIds") int[] basicCategoryIds, - @Param("flag") String flag, @Param("noFlag") String noFlag, @Param("orderBy") String orderBy, - @Param("order") boolean order, @Param("beginTime") String beginTime,@Param("endTime") String endTime, - @Param("article") ArticleEntity article); + @Param("flag") String flag, @Param("noFlag") String noFlag, @Param("orderBy") String orderBy, + @Param("order") boolean order, @Param("beginTime") String beginTime,@Param("endTime") String endTime, + @Param("article") ArticleEntity article); /** * 根据页面栏目的id获取与其绑定的文章实体 - * + * * @param basicCategoryId * @return 文章实体 */ @@ -142,7 +142,7 @@ public interface IArticleDao extends IBaseDao { /** * 根据查询文章实体 - * + * * @param tableName * :自定义生成的表名 * @param map @@ -152,16 +152,18 @@ public interface IArticleDao extends IBaseDao { */ @Deprecated List queryListForSearch(@Param("tableName") String tableName, @Param("map") Map map, - @Param("websiteId") int websiteId, @Param("ids") List ids, - @Param("sortMap") Map sortMap); - - /** - * 查询文章编号集合 - * @param categoryId 栏目编号 - * @param appId 站点编号 - * @param beginTime 开始时间 - * @param endTime 结束时间 - * @return - */ - public List queryIdsByCategoryIdForParser(@Param("categoryId")int categoryId,@Param("appId")int appId , @Param("beginTime") String beginTime,@Param("endTime") String endTime); + @Param("websiteId") int websiteId, @Param("ids") List ids, + @Param("sortMap") Map sortMap); + + /** + * 查询文章编号集合 + * @param categoryId 栏目编号 + * @param appId 站点编号 + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @return + */ + public List queryIdsByCategoryIdForParser(@Param("categoryId")int categoryId,@Param("appId")int appId , @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("orderBy")String orderBy,@Param("order")String order); + + } \ No newline at end of file diff --git a/src/main/java/net/mingsoft/cms/dao/IArticleDao.xml b/src/main/java/net/mingsoft/cms/dao/IArticleDao.xml index 5e235493..9e17ef2e 100644 --- a/src/main/java/net/mingsoft/cms/dao/IArticleDao.xml +++ b/src/main/java/net/mingsoft/cms/dao/IArticleDao.xml @@ -36,7 +36,7 @@ + javaType="net.mingsoft.basic.entity.ColumnEntity"> @@ -47,9 +47,10 @@ - - + + + @@ -68,13 +69,13 @@ - - @@ -85,7 +86,7 @@ + javaType="net.mingsoft.basic.entity.ColumnEntity"> @@ -101,7 +102,7 @@ BASIC_DISPLAY,BASIC_TITLE,BASIC_DESCRIPTION,BASIC_THUMBNAILS,BASIC_HIT,BASIC_DATETIME,BASIC_UPDATETIME,BASIC_PEOPLEID,BASIC_CATEGORYID,BASIC_SORT - + BASIC_DISPLAY,BASIC_ID,BASIC_CATEGORYID,BASIC_TITLE,BASIC_DESCRIPTION,BASIC_THUMBNAILS,BASIC_HIT,BASIC_DATETIME,BASIC_UPDATETIME,BASIC_PEOPLEID,BASIC_SORT, @@ -186,10 +187,10 @@ where a.ARTICLE_BASICID=#{basicId} - + - CONCAT('%',#{article.basicTitle},'%') + CONCAT('%',#{article.basicTitle},'%') '%'||#{ article.basicTitle}||'%' @@ -199,7 +200,7 @@ - CONCAT('%',#{flag},'%') + CONCAT('%',#{flag},'%') '%'||#{ flag}||'%' @@ -209,7 +210,7 @@ - CONCAT('%',#{noFlag},'%') + CONCAT('%',#{noFlag},'%') '%'||#{ noFlag}||'%' @@ -237,7 +238,7 @@ and b.BASIC_CATEGORYID in + open="(" separator="," close=")"> #{categoryId} @@ -250,15 +251,15 @@ - + select ARTICLE_BASICID,cl.*,c.* - FROM cms_article a LEFT JOIN basic b ON a.ARTICLE_BASICID = b.BASIC_ID - LEFT JOIN basic_column cl ON b.BASIC_CATEGORYID = cl.COLUMN_CATEGORY_ID + FROM cms_article a LEFT JOIN basic ON a.ARTICLE_BASICID = basic.BASIC_ID + LEFT JOIN basic_column cl ON basic.BASIC_CATEGORYID = cl.COLUMN_CATEGORY_ID JOIN category c ON c.CATEGORY_ID = cl.COLUMN_CATEGORY_ID - where + where a.ARTICLE_WEBID = #{appId} - and (b.basic_categoryid=#{categoryId} or b.basic_categoryid in - (select category_id FROM category where )) + and (basic.basic_categoryid=#{categoryId} or basic.basic_categoryid in + (select category_id FROM category where )) - and b.basic_updatetime >= #{beginTime} + and basic.basic_updatetime >= #{beginTime} - and b.basic_updatetime >= #{endTime} + and basic.basic_updatetime >= #{endTime} + + + ORDER BY `${orderBy}` ${order} @@ -359,24 +363,24 @@ like CONCAT("%", - - #{val} - - ,"%") + + #{val} + + ,"%") like '%'|| - - #{val} - - ||'%' + + #{val} + + ||'%' like '%'+ - - #{val} - - +'%' + + #{val} + + +'%' - select - - from + select + + from (((basic JOIN cms_article ON (BASIC_ID = ARTICLE_BASICID)) - JOIN basic_column ON (BASIC_CATEGORYID = COLUMN_CATEGORY_ID)) - JOIN category ON (COLUMN_CATEGORY_ID = CATEGORY_ID)) + JOIN basic_column ON (BASIC_CATEGORYID = COLUMN_CATEGORY_ID)) + JOIN category ON (COLUMN_CATEGORY_ID = CATEGORY_ID)) left join ${contentModelTableName} cmt on cmt.basicid=basic_id @@ -531,12 +535,12 @@ - from + from (((basic JOIN cms_article ON (BASIC_ID = ARTICLE_BASICID)) - JOIN basic_column ON (BASIC_CATEGORYID = COLUMN_CATEGORY_ID)) - JOIN category ON (COLUMN_CATEGORY_ID = CATEGORY_ID)) - - where category_appid=#{appId} + JOIN basic_column ON (BASIC_CATEGORYID = COLUMN_CATEGORY_ID)) + JOIN category ON (COLUMN_CATEGORY_ID = CATEGORY_ID)) + + where category_appid=#{appId} and basic_id < ${basicId} @@ -551,7 +555,7 @@ - select + select - from + from (((basic JOIN cms_article ON (BASIC_ID = ARTICLE_BASICID)) - JOIN basic_column ON (BASIC_CATEGORYID = COLUMN_CATEGORY_ID)) - JOIN category ON (COLUMN_CATEGORY_ID = CATEGORY_ID)) - where basic_categoryId=#{categoryId} order by basic_id desc + JOIN basic_column ON (BASIC_CATEGORYID = COLUMN_CATEGORY_ID)) + JOIN category ON (COLUMN_CATEGORY_ID = CATEGORY_ID)) + where basic_categoryId=#{categoryId} order by basic_id desc @@ -613,7 +617,7 @@ ARTICLE_BASICID in #{item} + separator="," close=")">#{item} diff --git a/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties b/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties index 6706675b..b9bb6c6a 100644 --- a/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties +++ b/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties @@ -1,5 +1,6 @@ -#mcms\u7248\u672c +#mcms\u7248\u672C version=d3a98fefcb242db78da5fc31608ff247 -templet.file=\u6a21\u677f\u6587\u4ef6\u4e0d\u5b58\u5728 -id=\u6587\u7ae0\u7f16\u53f7 -typeid=\u680f\u76ee\u7f16\u53f7 +templet.file=\u6A21\u677F\u6587\u4EF6\u4E0D\u5B58\u5728 +id=\u6587\u7AE0\u7F16\u53F7 +typeid=\u680F\u76EE\u7F16\u53F7 +order=\u6392\u5E8F From 5d39c8d47ff345111f5be1012678c41db7fbbae2 Mon Sep 17 00:00:00 2001 From: wujj <1027418825@qq.com> Date: Sat, 11 Jan 2020 10:05:14 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/manager/main.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/manager/main.ftl b/src/main/webapp/WEB-INF/manager/main.ftl index a6a6cf0b..c6e9aa45 100644 --- a/src/main/webapp/WEB-INF/manager/main.ftl +++ b/src/main/webapp/WEB-INF/manager/main.ftl @@ -445,7 +445,7 @@ }, //静态化 jumpStaticManager(){ - window.parent.indexVue.open({"modelId":406,"modelTitle":"静态化","modelModelId":23,"modelUrl":"cms/generate/index.do"}); + window.parent.indexVue.open({"modelId":709,"modelTitle":"静态化","modelModelId":706,"modelUrl":"cms/generate/index.do"}); }, //管理员管理 jumpAdmininstatorManager(){ From 4c2e749b42a764537a30a66a28d54a21cb0225f8 Mon Sep 17 00:00:00 2001 From: ms group dev Date: Sat, 11 Jan 2020 14:42:36 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E8=AF=B4=E6=98=8E=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 25a5dbf8..d1bccbb3 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,8 @@

铭飞平台：https://ms.mingsoft.net/
演示：http://demo.cms.mingsoft.net/ms/login.do
- 一键运行版本 + 代码生成器视频教程
+ 一键运行版本

------------------------------------------------------------------------------- From f11c0cb163004f91604ea3e54888df00c4230e4f Mon Sep 17 00:00:00 2001 From: ms group dev Date: Sat, 11 Jan 2020 14:44:47 +0800 Subject: [PATCH 04/27] =?UTF-8?q?=E8=AF=B4=E6=98=8E=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d1bccbb3..8e2e8529 100644 --- a/README.md +++ b/README.md @@ -24,10 +24,10 @@

- 铭飞平台：https://ms.mingsoft.net/
- 演示：http://demo.cms.mingsoft.net/ms/login.do
- 代码生成器视频教程
- 一键运行版本 + 铭飞平台：https://ms.mingsoft.net/
+ 演示：http://demo.cms.mingsoft.net/ms/login.do
+ 代码生成器视频教程
+ Windows一键运行版本\Linux一键运行版本

------------------------------------------------------------------------------- From 6996232330879cd71dc09411e3abff12a10af9e8 Mon Sep 17 00:00:00 2001 From: ms group dev Date: Sat, 11 Jan 2020 14:45:22 +0800 Subject: [PATCH 05/27] =?UTF-8?q?=E8=AF=B4=E6=98=8E=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8e2e8529..36b0fc61 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@

铭飞平台：https://ms.mingsoft.net/
演示：http://demo.cms.mingsoft.net/ms/login.do
+ 在线使用手册
代码生成器视频教程
Windows一键运行版本\Linux一键运行版本

From 299ca806346ec9172215699eab04c887e91c9bc5 Mon Sep 17 00:00:00 2001 From: ms group dev Date: Sat, 11 Jan 2020 14:47:14 +0800 Subject: [PATCH 06/27] =?UTF-8?q?=E8=AF=B4=E6=98=8E=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 36b0fc61..e7c1ef66 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@

- 铭飞平台：https://ms.mingsoft.net/
- 演示：http://demo.cms.mingsoft.net/ms/login.do
+ 铭飞平台
+ 在线演示
在线使用手册
代码生成器视频教程
Windows一键运行版本\Linux一键运行版本 From 2fdd369a0eaa0e4fe43dbaaeeb33b0ac6e55a72a Mon Sep 17 00:00:00 2001 From: ms group dev Date: Sat, 11 Jan 2020 14:47:36 +0800 Subject: [PATCH 07/27] =?UTF-8?q?=E8=AF=B4=E6=98=8E=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e7c1ef66..131dda8a 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@

铭飞平台
- 在线演示
+ 在线演示 在线使用手册
代码生成器视频教程
Windows一键运行版本\Linux一键运行版本 From 77b2762423f3194d427bf41ff911785ce6e80608 Mon Sep 17 00:00:00 2001 From: ms group dev Date: Sat, 11 Jan 2020 14:47:58 +0800 Subject: [PATCH 08/27] =?UTF-8?q?=E8=AF=B4=E6=98=8E=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 131dda8a..440ce355 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@

- 铭飞平台
+ 铭飞平台 在线演示 在线使用手册
代码生成器视频教程
From 897e577d4d105bf17304c55779143eb566c7f863 Mon Sep 17 00:00:00 2001 From: ms group dev Date: Sat, 11 Jan 2020 22:03:28 +0800 Subject: [PATCH 09/27] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 440ce355..7ff78c32 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,8 @@

铭飞平台 在线演示 - 在线使用手册
+ 在线使用手册 + 腾讯课堂在线视频
代码生成器视频教程
Windows一键运行版本\Linux一键运行版本

From 1e56e0f6419d24a63707588ddcd49ed5fa9899b9 Mon Sep 17 00:00:00 2001 From: ms group dev Date: Sat, 11 Jan 2020 22:18:57 +0800 Subject: [PATCH 10/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/db-mcms-5.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/db-mcms-5.0.sql b/doc/db-mcms-5.0.sql index dd95cdc1..4a806edb 100644 --- a/doc/db-mcms-5.0.sql +++ b/doc/db-mcms-5.0.sql @@ -66,7 +66,7 @@ CREATE TABLE `cms_category` ( `category_manager_id` int(11) NULL DEFAULT NULL COMMENT '发布用户id', `category_datetime` datetime(0) NULL DEFAULT NULL COMMENT '类别发布时间', `mdiy_model_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '栏目管理的内容模型id', - `category_diy_url` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '自定义链接', + `category_diy_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '自定义链接', `category_url` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '内容模板', `category_list_url` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '列表模板', `category_sort` int(11) NULL DEFAULT NULL COMMENT '自定义顺序', From 17f5ad42a1bb1fba05fe1304a135097b93657155 Mon Sep 17 00:00:00 2001 From: huise <995959152@qq.com> Date: Mon, 20 Jan 2020 18:17:55 +0800 Subject: [PATCH 11/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mingsoft/cms/action/GeneraterAction.java | 23 +++++++++---------- .../cms/resources/resources.properties | 1 + .../cms/resources/resources_zh_CN.properties | 1 + .../WEB-INF/manager/cms/generate/index.ftl | 10 ++++++-- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java index b02df132..ab64edd6 100644 --- a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java +++ b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java @@ -24,7 +24,6 @@ package net.mingsoft.cms.action; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.io.FileUtil; -import net.mingsoft.basic.action.BaseAction; import net.mingsoft.basic.biz.IModelBiz; import net.mingsoft.basic.entity.AppEntity; import net.mingsoft.basic.util.BasicUtil; @@ -52,12 +51,12 @@ import java.util.ArrayList; import java.util.List; /** - * + * * @ClassName: GeneraterAction * @Description:TODO 生成器 * @author: 铭飞开发团队 * @date: 2018年1月31日 下午2:52:07 - * + * * @Copyright: 2018 www.mingsoft.net Inc. All rights reserved. */ @Controller("cmsGenerater") @@ -92,7 +91,7 @@ public class GeneraterAction extends BaseAction { /** * 更新主页 - * + * * @return */ @RequestMapping("/index") @@ -102,7 +101,7 @@ public class GeneraterAction extends BaseAction { /** * 生成主页 - * + * * @param request * @param response */ @@ -114,7 +113,7 @@ public class GeneraterAction extends BaseAction { String tmpFileName = request.getParameter("url"); // 生成后的文件名称 String generateFileName = request.getParameter("position"); - + // 获取文件所在路径 首先判断用户输入的模版文件是否存在 if (!FileUtil.exist(ParserUtil.buildTempletPath())) { this.outJson(response, false, getResString("templet.file")); @@ -128,12 +127,12 @@ public class GeneraterAction extends BaseAction { } } } - + /** * 生成列表的静态页面 - * + * * @param request * @param response * @param CategoryId @@ -194,7 +193,7 @@ public class GeneraterAction extends BaseAction { /** * 根据栏目id更新所有的文章 - * + * * @param request * @param response * @param columnId @@ -219,12 +218,12 @@ public class GeneraterAction extends BaseAction { this.outJson(response, false); } } - + /** * 用户预览主页 - * + * * @param request * @return */ @@ -236,4 +235,4 @@ public class GeneraterAction extends BaseAction { + File.separator + position + ParserUtil.HTML_SUFFIX; return "redirect:" + indexPosition; } -} \ No newline at end of file +} diff --git a/src/main/java/net/mingsoft/cms/resources/resources.properties b/src/main/java/net/mingsoft/cms/resources/resources.properties index 61730331..4bf15c7b 100644 --- a/src/main/java/net/mingsoft/cms/resources/resources.properties +++ b/src/main/java/net/mingsoft/cms/resources/resources.properties @@ -33,3 +33,4 @@ category.id=\u6240\u5C5E\u680F\u76EE content.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5 content.keyword=\u5173\u952E\u5B57 +templet.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6 diff --git a/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties b/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties index 61730331..4bf15c7b 100644 --- a/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties +++ b/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties @@ -33,3 +33,4 @@ category.id=\u6240\u5C5E\u680F\u76EE content.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5 content.keyword=\u5173\u952E\u5B57 +templet.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6 diff --git a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl b/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl index 45257583..3b4a4a2c 100644 --- a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl @@ -128,7 +128,7 @@ homeLoading:false, articleLoading:false, columnLoading:false, - template:'index.htm',//主题模板 + template:'',//主题模板 templateOptions:[], position:'index', //位置 contentSection:'0', //文章栏目 @@ -205,6 +205,12 @@ var that = this; ms.http.get(ms.manager+'/template/queryTemplateFileForColumn.do', {pageSize:99999}).then(function (data) { that.templateOptions = data.data; + //寻找主页 + var template = that.templateOptions.find(function (x) { + return x.indexOf("index")!=-1||x.indexOf("default")!=-1; + }) + //没有就找其他的 + that.template = template||(that.templateOptions.length>0?that.templateOptions[0]:""); }).catch(function (err) { console.log(err); }); @@ -702,4 +708,4 @@ .el-date-editor{ width: 100%; } - \ No newline at end of file + From 2d19a084cab985247f7e6a64538ac22027ce0e49 Mon Sep 17 00:00:00 2001 From: huise <995959152@qq.com> Date: Mon, 20 Jan 2020 18:42:37 +0800 Subject: [PATCH 12/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djar=E5=8C=85=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=BF=90=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 531 ++++++++++++++++++++++++++------------------------------ 1 file changed, 249 insertions(+), 282 deletions(-) diff --git a/pom.xml b/pom.xml index 5da245d4..3e4cc33f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,291 +1,258 @@  - - net.mingsoft - ms-pom - 1.0.0 - - - 4.0.0 - net.mingsoft - ms-mcms - 5.0.0 - ${project.groupId}:${project.artifactId} - ms-mcms tools Library - https://github.com/ming-soft/ms-mcms - - - The MIT License (MIT) - http://mit-license.org - - - - - mingsoft develop group - service@mingsoft.net - mingsoft - http://www.mingsoft.net - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + net.mingsoft + ms-pom + 1.0.0 + + + 4.0.0 + net.mingsoft + ms-mcms + 5.0.0 + ${project.groupId}:${project.artifactId} + ms-mcms tools Library + https://github.com/ming-soft/ms-mcms + + + The MIT License (MIT) + http://mit-license.org + + + + + mingsoft develop group + service@mingsoft.net + mingsoft + http://www.mingsoft.net + + - - scm:git://github.com/ming-soft/ms-mcms.git - scm:git@github.com:ming-soft/ms-mcms.git - https://github.com/ming-soft/ms-mcms - - - - sonatype-nexus-snapshots - Sonatype Nexus snapshot repository - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - Sonatype Nexus release repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - 1.8 - UTF-8 - - - - - - - - - - net.mingsoft - ms-mpeople - - - net.mingsoft - ms-upgrader - - - - - - src/main/java - - - src/main/webapp - - html/ - static/ - upload/ - templets/ - - - - src/main/resources - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.6 - - - package - - jar - - - - - - - **/static/plugins/ - **/static/skin/ - **/application*.yml - **/Dockerfile - **/ehcache.xml - **/upgrade/ - **/*.java - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - **/static/plugins/ - **/static/skin/ - **/application*.yml - **/Dockerfile - **/ehcache.xml - **/upgrade/ - **/config/ - **/MSApplication.java - **/MSServletInitializer.java - - - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - true - true - - - ${java.home}/lib/rt.jar:${java.home}/lib/jce.jar - - -Xlint:unchecked - - - - org.codehaus.plexus - plexus-compiler-eclipse - 2.1 - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.8 - - - - .settings/org.eclipse.core.resources.prefs - - + scm:git://github.com/ming-soft/ms-mcms.git + scm:git@github.com:ming-soft/ms-mcms.git + https://github.com/ming-soft/ms-mcms + + + + sonatype-nexus-snapshots + Sonatype Nexus snapshot repository + https://oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus-staging + Sonatype Nexus release repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + 1.8 + UTF-8 + + + + + + + + + + net.mingsoft + ms-mpeople + + + net.mingsoft + ms-upgrader + + + + + + src/main/java + + + src/main/webapp + + html/ + static/ + upload/ + templets/ + + + + src/main/resources + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.6 + + + package + + jar + + + + + + + **/static/plugins/ + **/static/skin/ + **/Dockerfile + **/ehcache.xml + **/upgrade/ + **/*.java + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + **/static/plugins/ + **/static/skin/ + **/application*.yml + **/Dockerfile + **/ehcache.xml + **/upgrade/ + **/config/ + **/MSApplication.java + **/MSServletInitializer.java + + + + + attach-sources + + jar-no-fork + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.8 + + + + .settings/org.eclipse.core.resources.prefs + + =${project.build.sourceEncoding} ]]> - - - - - + + + + + - - maven-surefire-plugin - - -Xmx256m - - - - com.atlassian.maven.plugins - maven-clover2-plugin - 2.6.3 - - ${clover.license.file} - ${project.build.sourceEncoding} - true - - - - org.codehaus.mojo - findbugs-maven-plugin - 1.2 - - true - true - true - - + + maven-surefire-plugin + + -Xmx256m + + + + com.atlassian.maven.plugins + maven-clover2-plugin + 2.6.3 + + ${clover.license.file} + ${project.build.sourceEncoding} + true + + + + org.codehaus.mojo + findbugs-maven-plugin + 1.2 + + true + true + true + + - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - UTF-8 - UTF-8 - UTF-8 - ${java.home}/../bin/javadoc - -Xdoclint:none - - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.6 - - - - src/main/webapp/WEB-INF - WEB-INF - true - - **/*.xml - - - web.xml - - - - true - */web.xml,static - false - ms.install,html/,static/,temp,upgrader,WEB-INF/web.xml,WEB-INF/lib/,templets/,upload/,WEB-INF/classes/*.xml,WEB-INF/classes/*.properties,*.sh,WEB-INF/classes/net/mingsoft/config/,WEB-INF/classes/net/mingsoft/*.class - - - - org.apache.maven.plugins - maven-release-plugin - - -Dgpg.passphrase=${gpg.passphrase} - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - sonatype-nexus-staging - https://oss.sonatype.org/ - true - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - compile + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + UTF-8 + UTF-8 + UTF-8 + ${java.home}/../bin/javadoc + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.6 + + + + src/main/webapp/WEB-INF + WEB-INF + true + + **/*.xml + + + web.xml + + + + true + */web.xml,static + false + + ms.install,html/,static/,temp,upgrader,WEB-INF/web.xml,WEB-INF/lib/,templets/,upload/,WEB-INF/classes/*.xml,WEB-INF/classes/*.properties,*.sh,WEB-INF/classes/net/mingsoft/config/,WEB-INF/classes/net/mingsoft/*.class + + + + + org.apache.maven.plugins + maven-release-plugin + + -Dgpg.passphrase=${gpg.passphrase} + + - ms-mcms - - \ No newline at end of file + + compile + + ms-mcms + + From 70541b9a916d599d95a390b741d00247dbfef3bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=A1=20=E8=B5=B5?= Date: Fri, 31 Jan 2020 17:44:49 +0800 Subject: [PATCH 13/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/manager/cms/category/form.ftl | 155 ++++--- .../WEB-INF/manager/cms/category/index.ftl | 308 +++++++------- .../WEB-INF/manager/cms/content/form.ftl | 271 +++++++----- .../WEB-INF/manager/cms/content/index.ftl | 91 ++-- .../WEB-INF/manager/cms/content/main.ftl | 397 ++++++++++++------ .../WEB-INF/manager/cms/generate/index.ftl | 162 ++++--- src/main/webapp/WEB-INF/manager/main.ftl | 116 +++-- .../babel-polyfill/7.8.3/polyfill.min.js | 1 + .../static/plugins/ms/1.0.0/compatible.js | 20 + .../webapp/static/plugins/ms/1.0.0/ms.http.js | 4 +- .../webapp/static/plugins/ms/1.0.0/ms.util.js | 53 +-- 11 files changed, 950 insertions(+), 628 deletions(-) create mode 100644 src/main/webapp/static/plugins/babel-polyfill/7.8.3/polyfill.min.js create mode 100644 src/main/webapp/static/plugins/ms/1.0.0/compatible.js diff --git a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl index beed697d..ddbee5ba 100644 --- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl @@ -232,12 +232,12 @@ \ No newline at end of file + created: function () { + /* this.categoryListUrlOptionsGet(); + this.categoryUrlOptionsGet();*/ + this.list(); + } + }); + diff --git a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl index c59a76ba..973dfed7 100644 --- a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl @@ -247,12 +247,16 @@ \ No newline at end of file + diff --git a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl b/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl index 3b4a4a2c..f5b291f0 100644 --- a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl @@ -119,119 +119,163 @@ \ No newline at end of file + diff --git a/src/main/webapp/static/plugins/babel-polyfill/7.8.3/polyfill.min.js b/src/main/webapp/static/plugins/babel-polyfill/7.8.3/polyfill.min.js new file mode 100644 index 00000000..1b822b0e --- /dev/null +++ b/src/main/webapp/static/plugins/babel-polyfill/7.8.3/polyfill.min.js @@ -0,0 +1 @@ +!function r(c,a,f){function o(n,t){if(!a[n]){if(!c[n]){var e="function"==typeof require&&require;if(!t&&e)return e(n,!0);if(s)return s(n,!0);var i=new Error("Cannot find module '"+n+"'");throw i.code="MODULE_NOT_FOUND",i}var u=a[n]={exports:{}};c[n][0].call(u.exports,function(t){return o(c[n][1][t]||t)},u,u.exports,r,c,a,f)}return a[n].exports}for(var s="function"==typeof require&&require,t=0;tu;)o.call(t,e=i[u++])&&n.push(e);return n}},{104:104,107:107,108:108}],62:[function(t,n,r){var g=t(70),y=t(52),d=t(72),x=t(118),m=t(54),S="prototype",b=function(t,n,r){var e,i,o,u,c=t&b.F,a=t&b.G,f=t&b.S,s=t&b.P,l=t&b.B,h=a?g:f?g[n]||(g[n]={}):(g[n]||{})[S],p=a?y:y[n]||(y[n]={}),v=p[S]||(p[S]={});for(e in a&&(r=n),r)o=((i=!c&&h&&void 0!==h[e])?h:r)[e],u=l&&i?m(o,g):s&&"function"==typeof o?m(Function.call,o):o,h&&x(h,e,o,t&b.U),p[e]!=o&&d(p,e,u),s&&v[e]!=o&&(v[e]=o)};g.core=y,b.F=1,b.G=2,b.S=4,b.P=8,b.B=16,b.W=32,b.U=64,b.R=128,n.exports=b},{118:118,52:52,54:54,70:70,72:72}],63:[function(t,n,r){var e=t(152)("match");n.exports=function(n){var r=/./;try{"/./"[n](r)}catch(t){try{return r[e]=!1,!"/./"[n](r)}catch(t){}}return!0}},{152:152}],64:[function(t,n,r){arguments[4][23][0].apply(r,arguments)},{23:23}],65:[function(t,n,r){"use strict";t(248);var s=t(118),l=t(72),h=t(64),p=t(57),v=t(152),g=t(120),y=v("species"),d=!h(function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$")}),x=function(){var t=/(?:)/,n=t.exec;t.exec=function(){return n.apply(this,arguments)};var r="ab".split(t);return 2===r.length&&"a"===r[0]&&"b"===r[1]}();n.exports=function(r,t,n){var e=v(r),o=!h(function(){var t={};return t[e]=function(){return 7},7!=""[r](t)}),i=o?!h(function(){var t=!1,n=/a/;return n.exec=function(){return t=!0,null},"split"===r&&(n.constructor={},n.constructor[y]=function(){return n}),n[e](""),!t}):void 0;if(!o||!i||"replace"===r&&!d||"split"===r&&!x){var u=/./[e],c=n(p,e,""[r],function maybeCallNative(t,n,r,e,i){return n.exec===g?o&&!i?{done:!0,value:u.call(n,r,e)}:{done:!0,value:t.call(r,n,e)}:{done:!1}}),a=c[0],f=c[1];s(String.prototype,r,a),l(RegExp.prototype,e,2==t?function(t,n){return f.call(t,this,n)}:function(t){return f.call(t,this)})}}},{118:118,120:120,152:152,248:248,57:57,64:64,72:72}],66:[function(t,n,r){"use strict";var e=t(38);n.exports=function(){var t=e(this),n="";return t.global&&(n+="g"),t.ignoreCase&&(n+="i"),t.multiline&&(n+="m"),t.unicode&&(n+="u"),t.sticky&&(n+="y"),n}},{38:38}],67:[function(t,n,r){"use strict";var p=t(79),v=t(81),g=t(141),y=t(54),d=t(152)("isConcatSpreadable");n.exports=function flattenIntoArray(t,n,r,e,i,o,u,c){for(var a,f,s=i,l=0,h=!!u&&y(u,c,3);ldocument.F=Object<\/script>"),t.close(),f=t.F;r--;)delete f[a][u[r]];return f()};t.exports=Object.create||function create(t,n){var r;return null!==t?(Pq[a]=i(t),r=new Pq,Pq[a]=null,r[c]=t):r=f(),void 0===n?r:o(r,n)}},{100:100,125:125,38:38,59:59,60:60,73:73}],99:[function(t,n,r){arguments[4][29][0].apply(r,arguments)},{143:143,29:29,38:38,58:58,74:74}],100:[function(t,n,r){var u=t(99),c=t(38),a=t(107);n.exports=t(58)?Object.defineProperties:function defineProperties(t,n){c(t);for(var r,e=a(n),i=e.length,o=0;oi;)u(e,r=n[i++])&&(~a(o,r)||o.push(r));return o}},{125:125,140:140,41:41,71:71}],107:[function(t,n,r){var e=t(106),i=t(60);n.exports=Object.keys||function keys(t){return e(t,i)}},{106:106,60:60}],108:[function(t,n,r){r.f={}.propertyIsEnumerable},{}],109:[function(t,n,r){var i=t(62),o=t(52),u=t(64);n.exports=function(t,n){var r=(o.Object||{})[t]||Object[t],e={};e[t]=n(r),i(i.S+i.F*u(function(){r(1)}),"Object",e)}},{52:52,62:62,64:64}],110:[function(t,n,r){var a=t(58),f=t(107),s=t(140),l=t(108).f;n.exports=function(c){return function(t){for(var n,r=s(t),e=f(r),i=e.length,o=0,u=[];o>>0||(u.test(r)?16:10))}:e},{134:134,135:135,70:70}],114:[function(t,n,r){n.exports=function(t){try{return{e:!1,v:t()}}catch(t){return{e:!0,v:t}}}},{}],115:[function(t,n,r){var e=t(38),i=t(81),o=t(96);n.exports=function(t,n){if(e(t),i(n)&&n.constructor===t)return n;var r=o.f(t);return(0,r.resolve)(n),r.promise}},{38:38,81:81,96:96}],116:[function(t,n,r){arguments[4][30][0].apply(r,arguments)},{30:30}],117:[function(t,n,r){var i=t(118);n.exports=function(t,n,r){for(var e in n)i(t,e,n[e],r);return t}},{118:118}],118:[function(t,n,r){var o=t(70),u=t(72),c=t(71),a=t(147)("src"),e=t(69),i="toString",f=(""+e).split(i);t(52).inspectSource=function(t){return e.call(t)},(n.exports=function(t,n,r,e){var i="function"==typeof r;i&&(c(r,"name")||u(r,"name",n)),t[n]!==r&&(i&&(c(r,a)||u(r,a,t[n]?""+t[n]:f.join(String(n)))),t===o?t[n]=r:e?t[n]?t[n]=r:u(t,n,r):(delete t[n],u(t,n,r)))})(Function.prototype,i,function toString(){return"function"==typeof this&&this[a]||e.call(this)})},{147:147,52:52,69:69,70:70,71:71,72:72}],119:[function(t,n,r){"use strict";var i=t(47),o=RegExp.prototype.exec;n.exports=function(t,n){var r=t.exec;if("function"==typeof r){var e=r.call(t,n);if("object"!=typeof e)throw new TypeError("RegExp exec method returned something other than an Object or null");return e}if("RegExp"!==i(t))throw new TypeError("RegExp#exec called on incompatible receiver");return o.call(t,n)}},{47:47}],120:[function(t,n,r){"use strict";var e,i,u=t(66),c=RegExp.prototype.exec,a=String.prototype.replace,o=c,f="lastIndex",s=(e=/a/,i=/b*/g,c.call(e,"a"),c.call(i,"a"),0!==e[f]||0!==i[f]),l=void 0!==/()??/.exec("")[1];(s||l)&&(o=function exec(t){var n,r,e,i,o=this;return l&&(r=new RegExp("^"+o.source+"$(?!\\s)",u.call(o))),s&&(n=o[f]),e=c.call(o,t),s&&e&&(o[f]=o.global?e.index+e[0].length:n),l&&e&&1"+i+""}var e=t(62),i=t(64),u=t(57),c=/"/g;n.exports=function(n,t){var r={};r[n]=t(Aw),e(e.P+e.F*i(function(){var t=""[n]('"');return t!==t.toLowerCase()||3a&&(f=f.slice(0,a)),e?f+i:i+f}},{133:133,141:141,57:57}],133:[function(t,n,r){"use strict";var i=t(139),o=t(57);n.exports=function repeat(t){var n=String(o(this)),r="",e=i(t);if(e<0||e==1/0)throw RangeError("Count can't be negative");for(;0>>=1)&&(n+=n))1&e&&(r+=n);return r}},{139:139,57:57}],134:[function(t,n,r){function tx(t,n,r){var e={},i=c(function(){return!!a[t]()||"​…"!="​…"[t]()}),o=e[t]=i?n(s):a[t];r&&(e[r]=o),u(u.P+u.F*i,"String",e)}var u=t(62),e=t(57),c=t(64),a=t(135),i="["+a+"]",o=RegExp("^"+i+i+"*"),f=RegExp(i+i+"*$"),s=tx.trim=function(t,n){return t=String(e(t)),1&n&&(t=t.replace(o,"")),2&n&&(t=t.replace(f,"")),t};n.exports=tx},{135:135,57:57,62:62,64:64}],135:[function(t,n,r){n.exports="\t\n\v\f\r   ᠎             　\u2028\u2029\ufeff"},{}],136:[function(t,n,r){function Zx(){var t=+this;if(d.hasOwnProperty(t)){var n=d[t];delete d[t],n()}}function $x(t){Zx.call(t.data)}var e,i,o,u=t(54),c=t(76),a=t(73),f=t(59),s=t(70),l=s.process,h=s.setImmediate,p=s.clearImmediate,v=s.MessageChannel,g=s.Dispatch,y=0,d={},x="onreadystatechange";h&&p||(h=function setImmediate(t){for(var n=[],r=1;r>1,s=23===n?A(2,-24)-A(2,-77):0,l=0,h=t<0||0===t&&1/t<0?1:0;for((t=P(t))!=t||t===F?(i=t!=t?1:0,e=a):(e=M(k(t)/N),t*(o=A(2,-e))<1&&(e--,o*=2),2<=(t+=1<=e+f?s/o:s*A(2,1-f))*o&&(e++,o/=2),a<=e+f?(i=0,e=a):1<=e+f?(i=(t*o-1)*A(2,n),e+=f):(i=t*A(2,f-1)*A(2,n),e=0));8<=n;u[l++]=255&i,i/=256,n-=8);for(e=e<>1,c=i-7,a=r-1,f=t[a--],s=127&f;for(f>>=7;0>=-c,c+=n;0>8&255]}function packI32(t){return[255&t,t>>8&255,t>>16&255,t>>24&255]}function packF64(t){return packIEEE754(t,52,8)}function packF32(t){return packIEEE754(t,23,4)}function addGetter(t,n,r){g(t[S],n,{get:function(){return this[r]}})}function get(t,n,r,e){var i=p(+r);if(i+n>t[L])throw O(b);var o=t[T]._b,u=i+t[C],c=o.slice(u,u+n);return e?c:c.reverse()}function set(t,n,r,e,i,o){var u=p(+r);if(u+n>t[L])throw O(b);for(var c=t[T]._b,a=u+t[C],f=e(+i),s=0;sW;)(G=U[W++])in w||c(w,G,I[G]);o||(D.constructor=w)}var V=new _(new w(2)),B=_[S].setInt8;V.setInt8(0,2147483648),V.setInt8(1,2147483649),!V.getInt8(0)&&V.getInt8(1)||a(_[S],{setInt8:function setInt8(t,n){B.call(this,t,n<<24>>24)},setUint8:function setUint8(t,n){B.call(this,t,n<<24>>24)}},!0)}else w=function ArrayBuffer(t){s(this,w,x);var n=p(t);this._b=y.call(new Array(n),0),this[L]=n},_=function DataView(t,n,r){s(this,_,m),s(t,w,m);var e=t[L],i=l(n);if(i<0||e>24},getUint8:function getUint8(t){return get(this,1,t)[0]},getInt16:function getInt16(t){var n=get(this,2,t,arguments[1]);return(n[1]<<8|n[0])<<16>>16},getUint16:function getUint16(t){var n=get(this,2,t,arguments[1]);return n[1]<<8|n[0]},getInt32:function getInt32(t){return unpackI32(get(this,4,t,arguments[1]))},getUint32:function getUint32(t){return unpackI32(get(this,4,t,arguments[1]))>>>0},getFloat32:function getFloat32(t){return unpackIEEE754(get(this,4,t,arguments[1]),23,4)},getFloat64:function getFloat64(t){return unpackIEEE754(get(this,8,t,arguments[1]),52,8)},setInt8:function setInt8(t,n){set(this,1,t,packI8,n)},setUint8:function setUint8(t,n){set(this,1,t,packI8,n)},setInt16:function setInt16(t,n){set(this,2,t,packI16,n,arguments[2])},setUint16:function setUint16(t,n){set(this,2,t,packI16,n,arguments[2])},setInt32:function setInt32(t,n){set(this,4,t,packI32,n,arguments[2])},setUint32:function setUint32(t,n){set(this,4,t,packI32,n,arguments[2])},setFloat32:function setFloat32(t,n){set(this,4,t,packF32,n,arguments[2])},setFloat64:function setFloat64(t,n){set(this,8,t,packF64,n,arguments[2])}});d(w,x),d(_,m),c(_[S],u.VIEW,!0),r[x]=w,r[m]=_},{103:103,117:117,124:124,138:138,139:139,141:141,146:146,37:37,40:40,58:58,64:64,70:70,72:72,89:89,99:99}],146:[function(t,n,r){for(var e,i=t(70),o=t(72),u=t(147),c=u("typed_array"),a=u("view"),f=!(!i.ArrayBuffer||!i.DataView),s=f,l=0,h="Int8Array,Uint8Array,Uint8ClampedArray,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array".split(",");l<9;)(e=i[h[l++]])?(o(e.prototype,c,!0),o(e.prototype,a,!0)):s=!1;n.exports={ABV:f,CONSTR:s,TYPED:c,VIEW:a}},{147:147,70:70,72:72}],147:[function(t,n,r){var e=0,i=Math.random();n.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++e+i).toString(36))}},{}],148:[function(t,n,r){var e=t(70).navigator;n.exports=e&&e.userAgent||""},{70:70}],149:[function(t,n,r){var e=t(81);n.exports=function(t,n){if(!e(t)||t._t!==n)throw TypeError("Incompatible receiver, "+n+" required!");return t}},{81:81}],150:[function(t,n,r){var e=t(70),i=t(52),o=t(89),u=t(151),c=t(99).f;n.exports=function(t){var n=i.Symbol||(i.Symbol=o?{}:e.Symbol||{});"_"==t.charAt(0)||t in n||c(n,t,{value:u.f(t)})}},{151:151,52:52,70:70,89:89,99:99}],151:[function(t,n,r){r.f=t(152)},{152:152}],152:[function(t,n,r){var e=t(126)("wks"),i=t(147),o=t(70).Symbol,u="function"==typeof o;(n.exports=function(t){return e[t]||(e[t]=u&&o[t]||(u?o:i)("Symbol."+t))}).store=e},{126:126,147:147,70:70}],153:[function(t,n,r){var e=t(47),i=t(152)("iterator"),o=t(88);n.exports=t(52).getIteratorMethod=function(t){if(null!=t)return t[i]||t["@@iterator"]||o[e(t)]}},{152:152,47:47,52:52,88:88}],154:[function(t,n,r){var e=t(62);e(e.P,"Array",{copyWithin:t(39)}),t(35)("copyWithin")},{35:35,39:39,62:62}],155:[function(t,n,r){"use strict";var e=t(62),i=t(42)(4);e(e.P+e.F*!t(128)([].every,!0),"Array",{every:function every(t){return i(this,t,arguments[1])}})},{128:128,42:42,62:62}],156:[function(t,n,r){var e=t(62);e(e.P,"Array",{fill:t(40)}),t(35)("fill")},{35:35,40:40,62:62}],157:[function(t,n,r){"use strict";var e=t(62),i=t(42)(2);e(e.P+e.F*!t(128)([].filter,!0),"Array",{filter:function filter(t){return i(this,t,arguments[1])}})},{128:128,42:42,62:62}],158:[function(t,n,r){"use strict";var e=t(62),i=t(42)(6),o="findIndex",u=!0;o in[]&&Array(1)[o](function(){u=!1}),e(e.P+e.F*u,"Array",{findIndex:function findIndex(t){return i(this,t,1=t.length?(this._t=void 0,i(1)):i(0,"keys"==n?r:"values"==n?t[r]:[r,t[r]])},"values"),o.Arguments=o.Array,e("keys"),e("values"),e("entries")},{140:140,35:35,85:85,87:87,88:88}],165:[function(t,n,r){"use strict";var e=t(62),i=t(140),o=[].join;e(e.P+e.F*(t(77)!=Object||!t(128)(o)),"Array",{join:function join(t){return o.call(i(this),void 0===t?",":t)}})},{128:128,140:140,62:62,77:77}],166:[function(t,n,r){"use strict";var e=t(62),i=t(140),o=t(139),u=t(141),c=[].lastIndexOf,a=!!c&&1/[1].lastIndexOf(1,-0)<0;e(e.P+e.F*(a||!t(128)(c)),"Array",{lastIndexOf:function lastIndexOf(t){if(a)return c.apply(this,arguments)||0;var n=i(this),r=u(n.length),e=r-1;for(1>>=0)?31-Math.floor(Math.log(t+.5)*Math.LOG2E):32}})},{62:62}],189:[function(t,n,r){var e=t(62),i=Math.exp;e(e.S,"Math",{cosh:function cosh(t){return(i(t=+t)+i(-t))/2}})},{62:62}],190:[function(t,n,r){var e=t(62),i=t(90);e(e.S+e.F*(i!=Math.expm1),"Math",{expm1:i})},{62:62,90:90}],191:[function(t,n,r){var e=t(62);e(e.S,"Math",{fround:t(91)})},{62:62,91:91}],192:[function(t,n,r){var e=t(62),a=Math.abs;e(e.S,"Math",{hypot:function hypot(t,n){for(var r,e,i=0,o=0,u=arguments.length,c=0;o>>16)*u+o*(r&i>>>16)<<16>>>0)}})},{62:62,64:64}],194:[function(t,n,r){var e=t(62);e(e.S,"Math",{log10:function log10(t){return Math.log(t)*Math.LOG10E}})},{62:62}],195:[function(t,n,r){var e=t(62);e(e.S,"Math",{log1p:t(92)})},{62:62,92:92}],196:[function(t,n,r){var e=t(62);e(e.S,"Math",{log2:function log2(t){return Math.log(t)/Math.LN2}})},{62:62}],197:[function(t,n,r){var e=t(62);e(e.S,"Math",{sign:t(93)})},{62:62,93:93}],198:[function(t,n,r){var e=t(62),i=t(90),o=Math.exp;e(e.S+e.F*t(64)(function(){return-2e-17!=!Math.sinh(-2e-17)}),"Math",{sinh:function sinh(t){return Math.abs(t=+t)<1?(i(t)-i(-t))/2:(o(t-1)-o(-t-1))*(Math.E/2)}})},{62:62,64:64,90:90}],199:[function(t,n,r){var e=t(62),i=t(90),o=Math.exp;e(e.S,"Math",{tanh:function tanh(t){var n=i(t=+t),r=i(-t);return n==1/0?1:r==1/0?-1:(n-r)/(o(t)+o(-t))}})},{62:62,90:90}],200:[function(t,n,r){var e=t(62);e(e.S,"Math",{trunc:function trunc(t){return(0b;b++)i(g,m=S[b])&&!i(v,m)&&l(v,m,f(g,m));(v.prototype=y).constructor=v,t(118)(e,p,v)}},{101:101,103:103,118:118,134:134,143:143,48:48,58:58,64:64,70:70,71:71,75:75,98:98,99:99}],202:[function(t,n,r){var e=t(62);e(e.S,"Number",{EPSILON:Math.pow(2,-52)})},{62:62}],203:[function(t,n,r){var e=t(62),i=t(70).isFinite;e(e.S,"Number",{isFinite:function isFinite(t){return"number"==typeof t&&i(t)}})},{62:62,70:70}],204:[function(t,n,r){var e=t(62);e(e.S,"Number",{isInteger:t(80)})},{62:62,80:80}],205:[function(t,n,r){var e=t(62);e(e.S,"Number",{isNaN:function isNaN(t){return t!=t}})},{62:62}],206:[function(t,n,r){var e=t(62),i=t(80),o=Math.abs;e(e.S,"Number",{isSafeInteger:function isSafeInteger(t){return i(t)&&o(t)<=9007199254740991}})},{62:62,80:80}],207:[function(t,n,r){var e=t(62);e(e.S,"Number",{MAX_SAFE_INTEGER:9007199254740991})},{62:62}],208:[function(t,n,r){var e=t(62);e(e.S,"Number",{MIN_SAFE_INTEGER:-9007199254740991})},{62:62}],209:[function(t,n,r){var e=t(62),i=t(112);e(e.S+e.F*(Number.parseFloat!=i),"Number",{parseFloat:i})},{112:112,62:62}],210:[function(t,n,r){var e=t(62),i=t(113);e(e.S+e.F*(Number.parseInt!=i),"Number",{parseInt:i})},{113:113,62:62}],211:[function(t,n,r){"use strict";function XO(t,n){for(var r=-1,e=n;++r<6;)e+=t*u[r],u[r]=e%1e7,e=o(e/1e7)}function YO(t){for(var n=6,r=0;0<=--n;)r+=u[n],u[n]=o(r/t),r=r%t*1e7}function ZO(){for(var t=6,n="";0<=--t;)if(""!==n||0===t||0!==u[t]){var r=String(u[t]);n=""===n?r:n+l.call("0",7-r.length)+r}return n}var e=t(62),f=t(139),s=t(34),l=t(133),i=1..toFixed,o=Math.floor,u=[0,0,0,0,0,0],h="Number.toFixed: incorrect invocation!",p=function(t,n,r){return 0===n?r:n%2==1?p(t,n-1,r*t):p(t*t,n/2,r)};e(e.P+e.F*(!!i&&("0.000"!==8e-5.toFixed(3)||"1"!==.9.toFixed(0)||"1.25"!==1.255.toFixed(2)||"1000000000000000128"!==(0xde0b6b3a7640080).toFixed(0))||!t(64)(function(){i.call({})})),"Number",{toFixed:function toFixed(t){var n,r,e,i,o=s(this,h),u=f(t),c="",a="0";if(u<0||20t;)n(e[t++]);s._c=[],s._n=!1,r&&!s._h&&N(s)})}}function kS(t){var n=this;n._d||(n._d=!0,(n=n._w||n)._v=t,n._s=2,n._a||(n._a=n._c.slice()),gS(n,!0))}var e,i,o,u,c=r(89),a=r(70),f=r(54),s=r(47),l=r(62),h=r(81),p=r(33),v=r(37),g=r(68),y=r(127),d=r(136).set,x=r(95)(),m=r(96),S=r(114),b=r(148),w=r(115),_="Promise",E=a.TypeError,O=a.process,F=O&&O.versions,I=F&&F.v8||"",P=a[_],A="process"==s(O),M=i=m.f,k=!!function(){try{var t=P.resolve(1),n=(t.constructor={})[r(152)("species")]=function(t){t($R,$R)};return(A||"function"==typeof PromiseRejectionEvent)&&t.then($R)instanceof n&&0!==I.indexOf("6.6")&&-1===b.indexOf("Chrome/66")}catch(t){}}(),N=function(o){d.call(a,function(){var t,n,r,e=o._v,i=j(o);if(i&&(t=S(function(){A?O.emit("unhandledRejection",e,o):(n=a.onunhandledrejection)?n({promise:o,reason:e}):(r=a.console)&&r.error&&r.error("Unhandled promise rejection",e)}),o._h=A||j(o)?2:1),o._a=void 0,i&&t.e)throw t.v})},j=function(t){return 1!==t._h&&0===(t._a||t._c).length},R=function(n){d.call(a,function(){var t;A?O.emit("rejectionHandled",n):(t=a.onrejectionhandled)&&t({promise:n,reason:n._v})})},T=function(t){var r,e=this;if(!e._d){e._d=!0,e=e._w||e;try{if(e===t)throw E("Promise can't be resolved itself");(r=fS(t))?x(function(){var n={_w:e,_d:!1};try{r.call(t,f(T,n,1),f(kS,n,1))}catch(t){kS.call(n,t)}}):(e._v=t,e._s=1,gS(e,!1))}catch(t){kS.call({_w:e,_d:!1},t)}}};k||(P=function Promise(t){v(this,P,_,"_h"),p(t),e.call(this);try{t(f(T,this,1),f(kS,this,1))}catch(t){kS.call(this,t)}},(e=function Promise(t){this._c=[],this._a=void 0,this._s=0,this._d=!1,this._v=void 0,this._h=0,this._n=!1}).prototype=r(117)(P.prototype,{then:function then(t,n){var r=M(y(this,P));return r.ok="function"!=typeof t||t,r.fail="function"==typeof n&&n,r.domain=A?O.domain:void 0,this._c.push(r),this._a&&this._a.push(r),this._s&&gS(this,!1),r.promise},catch:function(t){return this.then(void 0,t)}}),o=function(){var t=new e;this.promise=t,this.resolve=f(T,t,1),this.reject=f(kS,t,1)},m.f=M=function(t){return t===P||t===u?new o(t):i(t)}),l(l.G+l.W+l.F*!k,{Promise:P}),r(124)(P,_),r(123)(_),u=r(52)[_],l(l.S+l.F*!k,_,{reject:function reject(t){var n=M(this);return(0,n.reject)(t),n.promise}}),l(l.S+l.F*(c||!k),_,{resolve:function resolve(t){return w(c&&this===u?P:this,t)}}),l(l.S+l.F*!(k&&r(86)(function(t){P.all(t).catch($R)})),_,{all:function all(t){var u=this,n=M(u),c=n.resolve,a=n.reject,r=S(function(){var e=[],i=0,o=1;g(t,!1,function(t){var n=i++,r=!1;e.push(void 0),o++,u.resolve(t).then(function(t){r||(r=!0,e[n]=t,--o||c(e))},a)}),--o||c(e)});return r.e&&a(r.v),n.promise},race:function race(t){var n=this,r=M(n),e=r.reject,i=S(function(){g(t,!1,function(t){n.resolve(t).then(r.resolve,e)})});return i.e&&e(i.v),r.promise}})},{114:114,115:115,117:117,123:123,124:124,127:127,136:136,148:148,152:152,33:33,37:37,47:47,52:52,54:54,62:62,68:68,70:70,81:81,86:86,89:89,95:95,96:96}],233:[function(t,n,r){var e=t(62),o=t(33),u=t(38),c=(t(70).Reflect||{}).apply,a=Function.apply;e(e.S+e.F*!t(64)(function(){c(function(){})}),"Reflect",{apply:function apply(t,n,r){var e=o(t),i=u(r);return c?c(e,n,i):a.call(e,n,i)}})},{33:33,38:38,62:62,64:64,70:70}],234:[function(t,n,r){var e=t(62),c=t(98),a=t(33),f=t(38),s=t(81),i=t(64),l=t(46),h=(t(70).Reflect||{}).construct,p=i(function(){function F(){}return!(h(function(){},[],F)instanceof F)}),v=!i(function(){h(function(){})});e(e.S+e.F*(p||v),"Reflect",{construct:function construct(t,n){a(t),f(n);var r=arguments.length<3?t:a(arguments[2]);if(v&&!p)return h(t,n,r);if(t==r){switch(n.length){case 0:return new t;case 1:return new t(n[0]);case 2:return new t(n[0],n[1]);case 3:return new t(n[0],n[1],n[2]);case 4:return new t(n[0],n[1],n[2],n[3])}var e=[null];return e.push.apply(e,n),new(l.apply(t,e))}var i=r.prototype,o=c(s(i)?i:Object.prototype),u=Function.apply.call(t,o,n);return s(u)?u:o}})},{33:33,38:38,46:46,62:62,64:64,70:70,81:81,98:98}],235:[function(t,n,r){var e=t(99),i=t(62),o=t(38),u=t(143);i(i.S+i.F*t(64)(function(){Reflect.defineProperty(e.f({},1,{value:1}),1,{value:2})}),"Reflect",{defineProperty:function defineProperty(t,n,r){o(t),n=u(n,!0),o(r);try{return e.f(t,n,r),!0}catch(t){return!1}}})},{143:143,38:38,62:62,64:64,99:99}],236:[function(t,n,r){var e=t(62),i=t(101).f,o=t(38);e(e.S,"Reflect",{deleteProperty:function deleteProperty(t,n){var r=i(o(t),n);return!(r&&!r.configurable)&&delete t[n]}})},{101:101,38:38,62:62}],237:[function(t,n,r){"use strict";function IU(t){this._t=i(t),this._i=0;var n,r=this._k=[];for(n in t)r.push(n)}var e=t(62),i=t(38);t(84)(IU,"Object",function(){var t,n=this._k;do{if(this._i>=n.length)return{value:void 0,done:!0}}while(!((t=n[this._i++])in this._t));return{value:t,done:!1}}),e(e.S,"Reflect",{enumerate:function enumerate(t){return new IU(t)}})},{38:38,62:62,84:84}],238:[function(t,n,r){var e=t(101),i=t(62),o=t(38);i(i.S,"Reflect",{getOwnPropertyDescriptor:function getOwnPropertyDescriptor(t,n){return e.f(o(t),n)}})},{101:101,38:38,62:62}],239:[function(t,n,r){var e=t(62),i=t(105),o=t(38);e(e.S,"Reflect",{getPrototypeOf:function getPrototypeOf(t){return i(o(t))}})},{105:105,38:38,62:62}],240:[function(t,n,r){var o=t(101),u=t(105),c=t(71),e=t(62),a=t(81),f=t(38);e(e.S,"Reflect",{get:function get(t,n){var r,e,i=arguments.length<3?t:arguments[2];return f(t)===i?t[n]:(r=o.f(t,n))?c(r,"value")?r.value:void 0!==r.get?r.get.call(i):void 0:a(e=u(t))?get(e,n,i):void 0}})},{101:101,105:105,38:38,62:62,71:71,81:81}],241:[function(t,n,r){var e=t(62);e(e.S,"Reflect",{has:function has(t,n){return n in t}})},{62:62}],242:[function(t,n,r){var e=t(62),i=t(38),o=Object.isExtensible;e(e.S,"Reflect",{isExtensible:function isExtensible(t){return i(t),!o||o(t)}})},{38:38,62:62}],243:[function(t,n,r){var e=t(62);e(e.S,"Reflect",{ownKeys:t(111)})},{111:111,62:62}],244:[function(t,n,r){var e=t(62),i=t(38),o=Object.preventExtensions;e(e.S,"Reflect",{preventExtensions:function preventExtensions(t){i(t);try{return o&&o(t),!0}catch(t){return!1}}})},{38:38,62:62}],245:[function(t,n,r){var e=t(62),i=t(122);i&&e(e.S,"Reflect",{setPrototypeOf:function setPrototypeOf(t,n){i.check(t,n);try{return i.set(t,n),!0}catch(t){return!1}}})},{122:122,62:62}],246:[function(t,n,r){var c=t(99),a=t(101),f=t(105),s=t(71),e=t(62),l=t(116),h=t(38),p=t(81);e(e.S,"Reflect",{set:function set(t,n,r){var e,i,o=arguments.length<4?t:arguments[3],u=a.f(h(t),n);if(!u){if(p(i=f(t)))return set(i,n,r,o);u=l(0)}if(s(u,"value")){if(!1===u.writable||!p(o))return!1;if(e=a.f(o,n)){if(e.get||e.set||!1===e.writable)return!1;e.value=r,c.f(o,n,e)}else c.f(o,n,l(0,r));return!0}return void 0!==u.set&&(u.set.call(o,r),!0)}})},{101:101,105:105,116:116,38:38,62:62,71:71,81:81,99:99}],247:[function(t,n,r){var e=t(70),o=t(75),i=t(99).f,u=t(103).f,c=t(82),a=t(66),f=e.RegExp,s=f,l=f.prototype,h=/a/g,p=/a/g,v=new f(h)!==h;if(t(58)&&(!v||t(64)(function(){return p[t(152)("match")]=!1,f(h)!=h||f(p)==p||"/a/i"!=f(h,"i")}))){f=function RegExp(t,n){var r=this instanceof f,e=c(t),i=void 0===n;return!r&&e&&t.constructor===f&&i?t:o(v?new s(e&&!i?t.source:t,n):s((e=t instanceof f)?t.source:t,e&&i?a.call(t):n),r?this:l,f)};function DW(n){n in f||i(f,n,{configurable:!0,get:function(){return s[n]},set:function(t){s[n]=t}})}for(var g=u(s),y=0;g.length>y;)DW(g[y++]);(l.constructor=f).prototype=l,t(118)(e,"RegExp",f)}t(123)("RegExp")},{103:103,118:118,123:123,152:152,58:58,64:64,66:66,70:70,75:75,82:82,99:99}],248:[function(t,n,r){"use strict";var e=t(120);t(62)({target:"RegExp",proto:!0,forced:e!==/./.exec},{exec:e})},{120:120,62:62}],249:[function(t,n,r){t(58)&&"g"!=/./g.flags&&t(99).f(RegExp.prototype,"flags",{configurable:!0,get:t(66)})},{58:58,66:66,99:99}],250:[function(t,n,r){"use strict";var l=t(38),h=t(141),p=t(36),v=t(119);t(65)("match",1,function(e,i,f,s){return[function match(t){var n=e(this),r=null==t?void 0:t[i];return void 0!==r?r.call(t,n):new RegExp(t)[i](String(n))},function(t){var n=s(f,t,this);if(n.done)return n.value;var r=l(t),e=String(this);if(!r.global)return v(r,e);for(var i,o=r.unicode,u=[],c=r.lastIndex=0;null!==(i=v(r,e));){var a=String(i[0]);""===(u[c]=a)&&(r.lastIndex=p(e,h(r.lastIndex),o)),c++}return 0===c?null:u}]})},{119:119,141:141,36:36,38:38,65:65}],251:[function(t,n,r){"use strict";var _=t(38),e=t(142),E=t(141),O=t(139),F=t(36),I=t(119),P=Math.max,A=Math.min,h=Math.floor,p=/\$([$&`']|\d\d?|<[^>]*>)/g,v=/\$([$&`']|\d\d?)/g;t(65)("replace",2,function(i,o,b,w){return[function replace(t,n){var r=i(this),e=null==t?void 0:t[o];return void 0!==e?e.call(t,r,n):b.call(String(r),t,n)},function(t,n){var r=w(b,t,this,n);if(r.done)return r.value;var e=_(t),i=String(this),o="function"==typeof n;o||(n=String(n));var u=e.global;if(u){var c=e.unicode;e.lastIndex=0}for(var a=[];;){var f=I(e,i);if(null===f)break;if(a.push(f),!u)break;""===String(f[0])&&(e.lastIndex=F(i,E(e.lastIndex),c))}for(var s,l="",h=0,p=0;p>>0,s=new RegExp(t.source,c+"g");(e=h.call(s,r))&&!(a<(i=s[g])&&(u.push(r.slice(a,e.index)),1=f));)s[g]===e.index&&s[g]++;return a===r[v]?!o&&s.test("")||u.push(""):u.push(r.slice(a)),u[v]>f?u.slice(0,f):u}:"0"[u](void 0,0)[v]?function(t,n){return void 0===t&&0===n?[]:y.call(this,t,n)}:y,[function split(t,n){var r=i(this),e=null==t?void 0:t[o];return void 0!==e?e.call(t,r,n):x.call(String(r),t,n)},function(t,n){var r=d(x,t,this,n,x!==y);if(r.done)return r.value;var e=m(t),i=String(this),o=S(e,RegExp),u=e.unicode,c=(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.unicode?"u":"")+(F?"y":"g"),a=new o(F?e:"^(?:"+e.source+")",c),f=void 0===n?O:n>>>0;if(0==f)return[];if(0===i.length)return null===_(a,i)?[i]:[];for(var s=0,l=0,h=[];l>10),n%1024+56320))}return r.join("")}})},{137:137,62:62}],266:[function(t,n,r){"use strict";var e=t(62),i=t(130),o="includes";e(e.P+e.F*t(63)(o),"String",{includes:function includes(t){return!!~i(this,t,o).indexOf(t,1=n.length?{value:void 0,done:!0}:(t=e(n,r),this._i+=t.length,{value:t,done:!1})})},{129:129,85:85}],269:[function(t,n,r){"use strict";t(131)("link",function(n){return function link(t){return n(this,"a","href",t)}})},{131:131}],270:[function(t,n,r){var e=t(62),u=t(140),c=t(141);e(e.S,"String",{raw:function raw(t){for(var n=u(t.raw),r=c(n.length),e=arguments.length,i=[],o=0;oi;)u(W,n=r[i++])||n==C||n==a||e.push(n);return e}function J1(t){for(var n,r=t===B,e=N(r?V:b(t)),i=[],o=0;e.length>o;)!u(W,n=e[o++])||r&&!u(B,n)||i.push(W[n]);return i}var e=t(70),u=t(71),i=t(58),o=t(62),c=t(118),a=t(94).KEY,f=t(64),s=t(126),l=t(124),h=t(147),p=t(152),v=t(151),g=t(150),y=t(61),d=t(79),x=t(38),m=t(81),S=t(142),b=t(140),w=t(143),_=t(116),E=t(98),O=t(102),F=t(101),I=t(104),P=t(99),A=t(107),M=F.f,k=P.f,N=O.f,j=e.Symbol,R=e.JSON,T=R&&R.stringify,L="prototype",C=p("_hidden"),G=p("toPrimitive"),D={}.propertyIsEnumerable,U=s("symbol-registry"),W=s("symbols"),V=s("op-symbols"),B=Object[L],q="function"==typeof j&&!!I.f,Y=e.QObject,z=!Y||!Y[L]||!Y[L].findChild,X=i&&f(function(){return 7!=E(k({},"a",{get:function(){return k(this,"a",{value:7}).a}})).a})?function(t,n,r){var e=M(B,n);e&&delete B[n],k(t,n,r),e&&t!==B&&k(B,n,e)}:k,$=q&&"symbol"==typeof j.iterator?function(t){return"symbol"==typeof t}:function(t){return t instanceof j},Q=function defineProperty(t,n,r){return t===B&&Q(V,n,r),x(t),n=w(n,!0),x(r),u(W,n)?(r.enumerable?(u(t,C)&&t[C][n]&&(t[C][n]=!1),r=E(r,{enumerable:_(0,!1)})):(u(t,C)||k(t,C,_(1,{})),t[C][n]=!0),X(t,n,r)):k(t,n,r)};q||(c((j=function Symbol(){if(this instanceof j)throw TypeError("Symbol is not a constructor!");var n=h(0J;)p(Z[J++]);for(var H=A(p.store),K=0;H.length>K;)g(H[K++]);o(o.S+o.F*!q,"Symbol",{for:function(t){return u(U,t+="")?U[t]:U[t]=j(t)},keyFor:function keyFor(t){if(!$(t))throw TypeError(t+" is not a symbol!");for(var n in U)if(U[n]===t)return n},useSetter:function(){z=!0},useSimple:function(){z=!1}}),o(o.S+o.F*!q,"Object",{create:function create(t,n){return void 0===n?E(t):E1(E(t),n)},defineProperty:Q,defineProperties:E1,getOwnPropertyDescriptor:H1,getOwnPropertyNames:I1,getOwnPropertySymbols:J1});var tt=f(function(){I.f(1)});o(o.S+o.F*tt,"Object",{getOwnPropertySymbols:function getOwnPropertySymbols(t){return I.f(S(t))}}),R&&o(o.S+o.F*(!q||f(function(){var t=j();return"[null]"!=T([t])||"{}"!=T({a:t})||"{}"!=T(Object(t))})),"JSON",{stringify:function stringify(t){for(var n,r,e=[t],i=1;ic;)void 0!==(r=i(e,n=o[c++]))&&l(u,n,r);return u}})},{101:101,111:111,140:140,53:53,62:62}],296:[function(t,n,r){var e=t(62),i=t(110)(!1);e(e.S,"Object",{values:function values(t){return i(t)}})},{110:110,62:62}],297:[function(t,n,r){"use strict";var e=t(62),i=t(52),o=t(70),u=t(127),c=t(115);e(e.P+e.R,"Promise",{finally:function(n){var r=u(this,i.Promise||o.Promise),t="function"==typeof n;return this.then(t?function(t){return c(r,n()).then(function(){return t})}:n,t?function(t){return c(r,n()).then(function(){throw t})}:n)}})},{115:115,127:127,52:52,62:62,70:70}],298:[function(t,n,r){"use strict";var e=t(62),i=t(132),o=t(148),u=/Version\/10\.\d+(\.\d+)?( Mobile\/\w+)? Safari\//.test(o);e(e.P+e.F*u,"String",{padEnd:function padEnd(t){return i(this,t,1 { - let branchArr = cloneData.filter(child => father[id] == child[parentId]); - branchArr.length > 0 ? father[children] = branchArr : '' - return !father[parentId]||father[parentId]=='0' // 如果第一层不是parentId=0，请自行修改 - }) + function treeData(source, id, parentId, children) { + var cloneData = JSON.parse(JSON.stringify(source)); + return cloneData.filter(function (father) { + var branchArr = cloneData.filter(function (child) { + return father[id] == child[parentId]; + }); + branchArr.length > 0 ? father[children] = branchArr : ''; + return !father[parentId] || father[parentId] == '0'; // 如果第一层不是parentId=0，请自行修改 + }); } //验证是否为子集 - function childValidate (sourceList,id,parentId,key,parentKey){ - var data=sourceList.find(x=>x[key]==parentId); - if(data&&data[parentKey]!='0'&&data[parentKey]){ - if(id==data[parentKey]){ - return false + function childValidate(sourceList, id, parentId, key, parentKey) { + var data = sourceList.find(function (x) { + return x[key] == parentId; + }); + if (data && data[parentKey] != '0' && data[parentKey]) { + if (id == data[parentKey]) { + return false; } - return childValidate(sourceList,id,data[parentKey],key,parentKey) + return childValidate(sourceList, id, data[parentKey], key, parentKey); } return true; } @@ -44,20 +48,19 @@ //日期处理 var date = { //格式化时间 - fmt: function(date, fmt) { - var date = new Date(date); - log(fmt); + fmt: function(de, fmt) { + var date = new Date(typeof de == "string"?de.replace(/-/g, "/"):de); if (!fmt) { fmt = "yyyy-mm-dd"; } var o = { - "M+": date.getMonth() + 1, //月份 - "d+": date.getDate(), //日 - "h+": date.getHours(), //小时 - "m+": date.getMinutes(), //分 - "s+": date.getSeconds(), //秒 - "q+": Math.floor((date.getMonth() + 3) / 3), //季度 - "S": date.getMilliseconds() //毫秒 + "M+": date.getMonth() + 1, //月份 + "d+": date.getDate(), //日 + "h+": date.getHours(), //小时 + "m+": date.getMinutes(), //分 + "s+": date.getSeconds(), //秒 + "q+": Math.floor((date.getMonth() + 3) / 3), //季度 + "S": date.getMilliseconds() //毫秒 }; if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length)); @@ -226,4 +229,4 @@ } window.ms.util = util; window.ms.debug = false -}()); \ No newline at end of file +}()); From 23fec95b10a1980c25fb421bad6a1b44114f9330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=A1=20=E8=B5=B5?= Date: Fri, 31 Jan 2020 18:06:44 +0800 Subject: [PATCH 14/27] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89sql=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/db-mcms-5.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/db-mcms-5.0.sql b/doc/db-mcms-5.0.sql index 4a806edb..11634cc9 100644 --- a/doc/db-mcms-5.0.sql +++ b/doc/db-mcms-5.0.sql @@ -535,7 +535,7 @@ INSERT INTO `model` VALUES (265, '自定义页面', '20010000', 264, 'mdiy/page/ INSERT INTO `model` VALUES (266, '修改', '20010004', 269, 'mdiy:form:update', '2018-09-06 09:38:51', NULL, 0, 0, 0, '264,269', NULL); INSERT INTO `model` VALUES (267, '新增', '20010002', 269, 'mdiy:form:save', '2018-09-06 09:38:51', NULL, 0, 0, 0, '264,269', NULL); INSERT INTO `model` VALUES (268, '查看', '20010001', 269, 'mdiy:form:view', '2018-09-06 09:38:51', NULL, 0, 0, 0, '264,269', NULL); -INSERT INTO `model` VALUES (269, '自定义表单', '20020000', 264, 'mdiy/form/index.do', '2018-09-06 09:38:51', NULL, 0, 0, 1, '264', NULL); +INSERT INTO `model` VALUES (269, '自定义表单', '20020000', 264, 'mdiy/post/index.do', '2018-09-06 09:38:51', NULL, 0, 0, 1, '264', NULL); INSERT INTO `model` VALUES (280, '自定义字典', '20050000', 264, 'mdiy/dict/index.do', '2018-09-06 09:38:53', NULL, 0, 0, 1, '264', NULL); INSERT INTO `model` VALUES (281, '删除', '20050003', 280, 'mdiy:dict:del', '2018-09-06 09:38:53', NULL, 0, 0, 0, '264,280', NULL); INSERT INTO `model` VALUES (282, '修改', '20050004', 280, 'mdiy:dict:update', '2018-09-06 09:38:53', NULL, 0, 0, 0, '264,280', NULL); From 9e5438a928e7c1845c4498bf1e6fff4f12790f30 Mon Sep 17 00:00:00 2001 From: ms group dev Date: Tue, 4 Feb 2020 11:45:35 +0800 Subject: [PATCH 15/27] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 488 +++++++++--------- .../static/plugins/ms/1.0.0/compatible.js | 5 +- 2 files changed, 246 insertions(+), 247 deletions(-) diff --git a/pom.xml b/pom.xml index 3e4cc33f..a80aff60 100644 --- a/pom.xml +++ b/pom.xml @@ -1,258 +1,254 @@  - - net.mingsoft - ms-pom - 1.0.0 - - - 4.0.0 - net.mingsoft - ms-mcms - 5.0.0 - ${project.groupId}:${project.artifactId} - ms-mcms tools Library - https://github.com/ming-soft/ms-mcms - - - The MIT License (MIT) - http://mit-license.org - - - - - mingsoft develop group - service@mingsoft.net - mingsoft - http://www.mingsoft.net - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + net.mingsoft + ms-mcms + 5.0.0 + ${project.groupId}:${project.artifactId} + ms-mcms tools Library + https://github.com/ming-soft/ms-mcms + + + The MIT License (MIT) + http://mit-license.org + + + + + mingsoft develop group + service@mingsoft.net + mingsoft + http://www.mingsoft.net + + - - scm:git://github.com/ming-soft/ms-mcms.git - scm:git@github.com:ming-soft/ms-mcms.git - https://github.com/ming-soft/ms-mcms - - - - sonatype-nexus-snapshots - Sonatype Nexus snapshot repository - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - Sonatype Nexus release repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - 1.8 - UTF-8 - - - - - - - - - - net.mingsoft - ms-mpeople - - - net.mingsoft - ms-upgrader - - - - - - src/main/java - - - src/main/webapp - - html/ - static/ - upload/ - templets/ - - - - src/main/resources - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.6 - - - package - - jar - - - - - - - **/static/plugins/ - **/static/skin/ - **/Dockerfile - **/ehcache.xml - **/upgrade/ - **/*.java - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - **/static/plugins/ - **/static/skin/ - **/application*.yml - **/Dockerfile - **/ehcache.xml - **/upgrade/ - **/config/ - **/MSApplication.java - **/MSServletInitializer.java - - - - - attach-sources - - jar-no-fork - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.8 - - - - .settings/org.eclipse.core.resources.prefs - + + scm:git://github.com/ming-soft/ms-mcms.git + scm:git@github.com:ming-soft/ms-mcms.git + https://github.com/ming-soft/ms-mcms + + + + sonatype-nexus-snapshots + Sonatype Nexus snapshot repository + https://oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus-staging + Sonatype Nexus release repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + 1.8 + UTF-8 + + + + + + + + + + net.mingsoft + ms-mpeople + 1.0.15 + + + net.mingsoft + ms-upgrader + 1.0.15 + + + + + + src/main/java + + + src/main/webapp + + html/ + static/ + upload/ + templets/ + + + + src/main/resources + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.6 + + + package + + jar + + + + + + + **/static/plugins/ + **/static/skin/ + **/Dockerfile + **/ehcache.xml + **/upgrade/ + **/*.java + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + **/static/plugins/ + **/static/skin/ + **/application*.yml + **/Dockerfile + **/ehcache.xml + **/upgrade/ + **/config/ + **/MSApplication.java + **/MSServletInitializer.java + + + + + attach-sources + + jar-no-fork + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.8 + + + + .settings/org.eclipse.core.resources.prefs + =${project.build.sourceEncoding} ]]> - - - - - + + + + + - - maven-surefire-plugin - - -Xmx256m - - - - com.atlassian.maven.plugins - maven-clover2-plugin - 2.6.3 - - ${clover.license.file} - ${project.build.sourceEncoding} - true - - - - org.codehaus.mojo - findbugs-maven-plugin - 1.2 - - true - true - true - - + + maven-surefire-plugin + + -Xmx256m + + + + com.atlassian.maven.plugins + maven-clover2-plugin + 2.6.3 + + ${clover.license.file} + ${project.build.sourceEncoding} + true + + + + org.codehaus.mojo + findbugs-maven-plugin + 1.2 + + true + true + true + + - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - UTF-8 - UTF-8 - UTF-8 - ${java.home}/../bin/javadoc - -Xdoclint:none - - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.6 - - - - src/main/webapp/WEB-INF - WEB-INF - true - - **/*.xml - - - web.xml - - - - true - */web.xml,static - false - - ms.install,html/,static/,temp,upgrader,WEB-INF/web.xml,WEB-INF/lib/,templets/,upload/,WEB-INF/classes/*.xml,WEB-INF/classes/*.properties,*.sh,WEB-INF/classes/net/mingsoft/config/,WEB-INF/classes/net/mingsoft/*.class - - - - - org.apache.maven.plugins - maven-release-plugin - - -Dgpg.passphrase=${gpg.passphrase} - - + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + UTF-8 + UTF-8 + UTF-8 + ${java.home}/../bin/javadoc + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.6 + + + + src/main/webapp/WEB-INF + WEB-INF + true + + **/*.xml + + + web.xml + + + + true + */web.xml,static + false + + ms.install,html/,static/,temp,upgrader,WEB-INF/web.xml,WEB-INF/lib/,templets/,upload/,WEB-INF/classes/*.xml,WEB-INF/classes/*.properties,*.sh,WEB-INF/classes/net/mingsoft/config/,WEB-INF/classes/net/mingsoft/*.class + + + + + org.apache.maven.plugins + maven-release-plugin + + -Dgpg.passphrase=${gpg.passphrase} + + - - compile + + compile - ms-mcms - + ms-mcms + diff --git a/src/main/webapp/static/plugins/ms/1.0.0/compatible.js b/src/main/webapp/static/plugins/ms/1.0.0/compatible.js index 28e6a06d..213b6af3 100644 --- a/src/main/webapp/static/plugins/ms/1.0.0/compatible.js +++ b/src/main/webapp/static/plugins/ms/1.0.0/compatible.js @@ -1,3 +1,6 @@ +//ie的兼容 + +//Object.assign 对ie对支持 if (typeof Object.assign != 'function') { Object.assign = function(target) { 'use strict'; @@ -17,4 +20,4 @@ if (typeof Object.assign != 'function') { } return target; }; -} +} \ No newline at end of file From da9f66831cf319ddf95340d06a9ec58b7889a74a Mon Sep 17 00:00:00 2001 From: ms group dev Date: Tue, 4 Feb 2020 14:52:25 +0800 Subject: [PATCH 16/27] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 265 +++++++++++--------------------------------------------- 1 file changed, 49 insertions(+), 216 deletions(-) diff --git a/pom.xml b/pom.xml index a80aff60..87f106f1 100644 --- a/pom.xml +++ b/pom.xml @@ -1,141 +1,52 @@  + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 net.mingsoft - ms-mcms + mcms 5.0.0 - ${project.groupId}:${project.artifactId} - ms-mcms tools Library - https://github.com/ming-soft/ms-mcms - - - The MIT License (MIT) - http://mit-license.org - - - - - mingsoft develop group - service@mingsoft.net - mingsoft - http://www.mingsoft.net - - - - - scm:git://github.com/ming-soft/ms-mcms.git - scm:git@github.com:ming-soft/ms-mcms.git - https://github.com/ming-soft/ms-mcms - - - - sonatype-nexus-snapshots - Sonatype Nexus snapshot repository - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - Sonatype Nexus release repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - + ms-mcms 1.8 - UTF-8 + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + http://repo1.maven.org/maven2/ + + true + + + true + + + + sonatype + Sonatype Snapshots + https://oss.sonatype.org/content/groups/public/ + + true + + + true + + + - - - - - - + net.mingsoft ms-mpeople - 1.0.15 - - - net.mingsoft - ms-upgrader - 1.0.15 + 1.0.17 + + - - - src/main/java - - - src/main/webapp - - html/ - static/ - upload/ - templets/ - - - - src/main/resources - - + ms-mcms - - org.apache.maven.plugins - maven-jar-plugin - 2.6 - - - package - - jar - - - - - - - **/static/plugins/ - **/static/skin/ - **/Dockerfile - **/ehcache.xml - **/upgrade/ - **/*.java - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - **/static/plugins/ - **/static/skin/ - **/application*.yml - **/Dockerfile - **/ehcache.xml - **/upgrade/ - **/config/ - **/MSApplication.java - **/MSServletInitializer.java - - - - - attach-sources - - jar-no-fork - - - - - - org.springframework.boot - spring-boot-maven-plugin - org.apache.maven.plugins maven-compiler-plugin @@ -143,112 +54,34 @@ ${java.version} ${java.version} - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.8 - - - - .settings/org.eclipse.core.resources.prefs - - =${project.build.sourceEncoding} - ]]> - - - - - - - - maven-surefire-plugin - - -Xmx256m - com.atlassian.maven.plugins - maven-clover2-plugin - 2.6.3 - - ${clover.license.file} - ${project.build.sourceEncoding} - true - - - - org.codehaus.mojo - findbugs-maven-plugin - 1.2 - - true - true - true - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - UTF-8 - UTF-8 - UTF-8 - ${java.home}/../bin/javadoc - -Xdoclint:none - + org.springframework.boot + spring-boot-maven-plugin - attach-javadocs - jar + repackage - - - org.apache.maven.plugins - maven-war-plugin - 2.6 - - - src/main/webapp/WEB-INF - WEB-INF - true - - **/*.xml - - - web.xml - - - - true - */web.xml,static - false - - ms.install,html/,static/,temp,upgrader,WEB-INF/web.xml,WEB-INF/lib/,templets/,upload/,WEB-INF/classes/*.xml,WEB-INF/classes/*.properties,*.sh,WEB-INF/classes/net/mingsoft/config/,WEB-INF/classes/net/mingsoft/*.class - + true - - org.apache.maven.plugins - maven-release-plugin - - -Dgpg.passphrase=${gpg.passphrase} - - - + + + src/main/webapp + + + src/main/resources + + + src/main/java + + compile - - ms-mcms - + \ No newline at end of file From 734418382458f7e448c31de12e5b54ed18c6a53a Mon Sep 17 00:00:00 2001 From: ms group dev Date: Tue, 4 Feb 2020 14:56:37 +0800 Subject: [PATCH 17/27] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=80=E6=96=B0mstor?= =?UTF-8?q?e=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 87f106f1..38b6828c 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,11 @@ 1.0.17 - + + net.mingsoft + ms-upgrader + 1.0.16 + ms-mcms From 085266e154e6a9a9149809aee1fbf3a22bdb5c07 Mon Sep 17 00:00:00 2001 From: ms group dev Date: Wed, 5 Feb 2020 11:34:47 +0800 Subject: [PATCH 18/27] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 38b6828c..96af01a3 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,13 @@ - + + + org.springframework.boot + spring-boot-starter-parent + 2.2.2.RELEASE + + 4.0.0 net.mingsoft mcms @@ -35,7 +41,6 @@ - net.mingsoft ms-mpeople From 713f726c4d312612df1a4e76bde94c44f0e2fe51 Mon Sep 17 00:00:00 2001 From: ms group dev Date: Wed, 5 Feb 2020 11:35:09 +0800 Subject: [PATCH 19/27] =?UTF-8?q?pom=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 96af01a3..43c72890 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,6 @@ org.springframework.boot spring-boot-starter-parent 2.2.2.RELEASE - 4.0.0 net.mingsoft From 28fd1e1061e9c12ac4b4135e80f108a8041b0eef Mon Sep 17 00:00:00 2001 From: wujj <1027418825@qq.com> Date: Sat, 8 Feb 2020 11:44:03 +0800 Subject: [PATCH 20/27] =?UTF-8?q?file=E6=96=87=E4=BB=B6=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/db-mcms-5.0.sql | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/doc/db-mcms-5.0.sql b/doc/db-mcms-5.0.sql index 11634cc9..c5295cba 100644 --- a/doc/db-mcms-5.0.sql +++ b/doc/db-mcms-5.0.sql @@ -806,3 +806,27 @@ CREATE TABLE `system_log` ( INSERT INTO `system_log` VALUES (7, NULL, 'success', '{\n \"result\":true,\n \"code\":200\n}', '{\n \"ids\":[\"291\"]\n}', '内网IP', '/ms-mcms/ms/model/delete.do', 'msopen', 'manage', 'POST', 'net.mingsoft.basic.action.ModelAction.delete()', 'delete', '127.0.0.1', '批量删除模块表', 0, NULL, NULL, '2020-01-09 21:33:16', NULL); SET FOREIGN_KEY_CHECKS = 1; + +-- ---------------------------- +-- Table structure for file +-- ---------------------------- +DROP TABLE IF EXISTS `file`; +CREATE TABLE `file` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '文件编号', + `category_id` int(11) NULL DEFAULT NULL COMMENT '文件分类编号', + `app_id` int(11) NULL DEFAULT NULL COMMENT 'APP编号', + `file_name` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件名称', + `file_url` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件链接', + `file_size` int(11) NULL DEFAULT NULL COMMENT '文件大小', + `file_json` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件详情Json数据', + `file_type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件类型：图片、音频、视频等', + `is_child` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '子业务', + `update_date` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `update_by` int(11) NULL DEFAULT NULL COMMENT '更新者', + `create_by` int(11) NULL DEFAULT NULL COMMENT '创建者', + `create_date` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `del` int(1) NULL DEFAULT NULL COMMENT '删除标记', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 67 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '基础文件表' ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file From 018f9b0951afd8605929c1f66ca0bd070f51f40c Mon Sep 17 00:00:00 2001 From: ms group dev Date: Mon, 10 Feb 2020 11:50:25 +0800 Subject: [PATCH 21/27] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 43c72890..fc049316 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ net.mingsoft ms-mpeople - 1.0.17 + 1.0.18 From 7fcab1aac84ed7e30862ff4a70aff65654de42ce Mon Sep 17 00:00:00 2001 From: ms group dev Date: Mon, 10 Feb 2020 11:55:24 +0800 Subject: [PATCH 22/27] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc049316..fbdfee43 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ net.mingsoft ms-upgrader - 1.0.16 + 1.0.17 From 7133d078db191d0053d4e9914a738bdcaca3e9fe Mon Sep 17 00:00:00 2001 From: wujj <1027418825@qq.com> Date: Thu, 13 Feb 2020 11:07:13 +0800 Subject: [PATCH 23/27] =?UTF-8?q?=E7=99=BE=E5=BA=A6=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E4=B8=8A=E4=BC=A0=E5=8F=82=E6=95=B0=E6=96=B0=E5=A2=9E?= =?UTF-8?q?appId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/manager/cms/content/form.ftl | 2 +- .../webapp/static/plugins/ms/1.0.0/ms.util.js | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl index 973dfed7..04569f67 100644 --- a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl @@ -267,7 +267,7 @@ maximumWords: 2000, initialFrameWidth: '100%', initialFrameHeight: 400, - serverUrl: ms.base + "/static/plugins/ueditor/1.4.3.1/jsp/editor.do?jsonConfig=%7BvideoUrlPrefix:\'" + ms.base + "\',fileUrlPrefix:\'" + ms.base + "\',imageUrlPrefix:\'" + ms.base + "\',imagePathFormat:\'/upload/cms/content/editor/%7Btime%7D\',filePathFormat:\'/upload/cms/content/editor/%7Btime%7D\',videoPathFormat:\'/upload/cms/content/editor/%7Btime%7D\'%7D", + serverUrl: ms.base + "/static/plugins/ueditor/1.4.3.1/jsp/editor.do?jsonConfig=%7BvideoUrlPrefix:\'" + ms.base + "\',fileUrlPrefix:\'" + ms.base + "\',imageUrlPrefix:\'" + ms.base + "\',imagePathFormat:\'cms/content/editor/%7Btime%7D\',filePathFormat:\'cms/content/editor/%7Btime%7D\',videoPathFormat:\'cms/content/editor/%7Btime%7D\',appId:true%7D", UEDITOR_HOME_URL: ms.base + '/static/plugins/ueditor/1.4.3.1/' }, contentCategoryIdOptions: [], diff --git a/src/main/webapp/static/plugins/ms/1.0.0/ms.util.js b/src/main/webapp/static/plugins/ms/1.0.0/ms.util.js index 64346f3f..137ac3cb 100644 --- a/src/main/webapp/static/plugins/ms/1.0.0/ms.util.js +++ b/src/main/webapp/static/plugins/ms/1.0.0/ms.util.js @@ -20,7 +20,18 @@ log(e.message); } } - //树形数据组织 + + /** + * 列表数据转化为树形结构的列表 + * @param source 数据源list + * @param id 编号 + * @param parentId 父级编号 + * @param children 树形子集变量 + * @returns {*} + * 支持父级编号为 0或null + * 原始数据[{id:1,titile:"标题",pid:0},{id:2,titile:"标题",pid:1}] + * 转化树形数据：[{id:1,titile:"标题",pid:0,children:[{id:2,titile:"标题",pid:1}]}] + */ function treeData(source, id, parentId, children) { var cloneData = JSON.parse(JSON.stringify(source)); return cloneData.filter(function (father) { @@ -28,7 +39,7 @@ return father[id] == child[parentId]; }); branchArr.length > 0 ? father[children] = branchArr : ''; - return !father[parentId] || father[parentId] == '0'; // 如果第一层不是parentId=0，请自行修改 + return !father[parentId] || father[parentId] == '0' || father[parentId] == null ; }); } //验证是否为子集 From e99194d202eedfc24cbc463c8b3d6637ebbc5195 Mon Sep 17 00:00:00 2001 From: wujj <1027418825@qq.com> Date: Thu, 13 Feb 2020 15:31:50 +0800 Subject: [PATCH 24/27] =?UTF-8?q?shiro=E6=9D=83=E9=99=90=E5=90=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/mingsoft/config/ShiroConfig.java | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/mingsoft/config/ShiroConfig.java b/src/main/java/net/mingsoft/config/ShiroConfig.java index f27d7b5a..9df316e3 100644 --- a/src/main/java/net/mingsoft/config/ShiroConfig.java +++ b/src/main/java/net/mingsoft/config/ShiroConfig.java @@ -1,17 +1,17 @@ package net.mingsoft.config; -import java.util.LinkedHashMap; -import java.util.Map; - +import net.mingsoft.basic.security.BaseAuthRealm; import org.apache.shiro.mgt.SecurityManager; +import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor; import org.apache.shiro.spring.web.ShiroFilterFactoryBean; import org.apache.shiro.web.mgt.DefaultWebSecurityManager; +import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; -import net.mingsoft.basic.security.BaseAuthRealm; +import java.util.LinkedHashMap; +import java.util.Map; @Configuration public class ShiroConfig { @@ -19,6 +19,29 @@ public class ShiroConfig { @Value("${ms.manager.path}") private String managerPath; + /** + * 开启Shiro的注解(如@RequiresRoles , @RequiresPermissions),需借助SspringAOP扫描使用Sshiro注解的类，并在必要时进行安全逻辑验证 + * 配置以下两个bean(Defaul tAdvisorAutoProxyCreator和uthorizat ionAttributeSourceAdvisor)即可实现此功能 + */ + @Bean + public DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator(){ + DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator = new DefaultAdvisorAutoProxyCreator(); + advisorAutoProxyCreator.setProxyTargetClass(true); + return advisorAutoProxyCreator; + } + + /** + * 开启shiro aop注解支持 + * 使用代理方式;所以需要开启代码支持 + * @param securityManager + */ + @Bean + public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor(SecurityManager securityManager){ + AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor = new AuthorizationAttributeSourceAdvisor(); + authorizationAttributeSourceAdvisor.setSecurityManager(securityManager); + return authorizationAttributeSourceAdvisor; + } + @Bean public ShiroFilterFactoryBean shirFilter(SecurityManager securityManager) { ShiroFilterFactoryBean shiroFilterFactoryBean = new ShiroFilterFactoryBean(); From 6e5bdba347ec7c23f861e1be0fa22c3fff923b21 Mon Sep 17 00:00:00 2001 From: wujj <1027418825@qq.com> Date: Thu, 13 Feb 2020 16:03:43 +0800 Subject: [PATCH 25/27] =?UTF-8?q?=E7=99=BE=E5=BA=A6=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8appId=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/mingsoft/cms/action/ContentAction.java | 1 + src/main/webapp/WEB-INF/manager/cms/content/form.ftl | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/mingsoft/cms/action/ContentAction.java b/src/main/java/net/mingsoft/cms/action/ContentAction.java index ddab9a5c..d2818ebb 100644 --- a/src/main/java/net/mingsoft/cms/action/ContentAction.java +++ b/src/main/java/net/mingsoft/cms/action/ContentAction.java @@ -102,6 +102,7 @@ public class ContentAction extends BaseAction{ BaseEntity contentEntity = contentBiz.getEntity(Integer.parseInt(content.getId())); model.addAttribute("contentEntity",contentEntity); } + model.addAttribute("appId",BasicUtil.getAppId()); return "/cms/content/form"; } diff --git a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl index 04569f67..f3fc1dcb 100644 --- a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl @@ -184,7 +184,7 @@ :limit="1" :on-exceed="contentImghandleExceed" :disabled="false" - :data="{uploadPath:'/cms/content','isRename':true,'appId':true}" + :data="{uploadPath:'/${appId}/cms/content','isRename':true}" :on-success="contentImgSuccess" accept="image/*" list-type="picture-card"> @@ -267,7 +267,7 @@ maximumWords: 2000, initialFrameWidth: '100%', initialFrameHeight: 400, - serverUrl: ms.base + "/static/plugins/ueditor/1.4.3.1/jsp/editor.do?jsonConfig=%7BvideoUrlPrefix:\'" + ms.base + "\',fileUrlPrefix:\'" + ms.base + "\',imageUrlPrefix:\'" + ms.base + "\',imagePathFormat:\'cms/content/editor/%7Btime%7D\',filePathFormat:\'cms/content/editor/%7Btime%7D\',videoPathFormat:\'cms/content/editor/%7Btime%7D\',appId:true%7D", + serverUrl: ms.base + "/static/plugins/ueditor/1.4.3.1/jsp/editor.do?jsonConfig=%7BvideoUrlPrefix:\'" + ms.base + "\',fileUrlPrefix:\'" + ms.base + "\',imageUrlPrefix:\'" + ms.base + "\',imagePathFormat:\'/upload/${appId}/cms/content/editor/%7Btime%7D\',filePathFormat:\'/upload/${appId}/cms/content/editor/%7Btime%7D\',videoPathFormat:\'/upload/${appId}/cms/content/editor/%7Btime%7D\'%7D", UEDITOR_HOME_URL: ms.base + '/static/plugins/ueditor/1.4.3.1/' }, contentCategoryIdOptions: [], From 92a99a44425719bcb80e5a401f1d10a9b02aa63b Mon Sep 17 00:00:00 2001 From: wujj <1027418825@qq.com> Date: Thu, 13 Feb 2020 18:15:03 +0800 Subject: [PATCH 26/27] =?UTF-8?q?appId=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/mingsoft/cms/action/CategoryAction.java | 1 + src/main/webapp/WEB-INF/manager/cms/category/form.ftl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/mingsoft/cms/action/CategoryAction.java b/src/main/java/net/mingsoft/cms/action/CategoryAction.java index 5d2a5f34..c56c7122 100644 --- a/src/main/java/net/mingsoft/cms/action/CategoryAction.java +++ b/src/main/java/net/mingsoft/cms/action/CategoryAction.java @@ -99,6 +99,7 @@ public class CategoryAction extends BaseAction{ BaseEntity categoryEntity = categoryBiz.getEntity(Integer.parseInt(category.getId())); model.addAttribute("categoryEntity",categoryEntity); } + model.addAttribute("appId",BasicUtil.getAppId()); return "/cms/category/form"; } diff --git a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl index ddbee5ba..a7c26d55 100644 --- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl @@ -200,7 +200,7 @@ :limit="1" :on-exceed="categoryImghandleExceed" :disabled="false" - :data="{uploadPath:'/cms/category','isRename':true,'appId':true}" + :data="{uploadPath:'/${appId}/cms/category','isRename':true}" :on-success="categoryImgSuccess" accept="image/*" list-type="picture-card"> From ccc8cda53e968a942e240b6817b709452ea2017f Mon Sep 17 00:00:00 2001 From: wujj <1027418825@qq.com> Date: Tue, 24 Mar 2020 20:48:25 +0800 Subject: [PATCH 27/27] =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/db-mcms-5.0.sql | 52 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/doc/db-mcms-5.0.sql b/doc/db-mcms-5.0.sql index c5295cba..c93e40a0 100644 --- a/doc/db-mcms-5.0.sql +++ b/doc/db-mcms-5.0.sql @@ -5,13 +5,13 @@ Source Server Type : MySQL Source Server Version : 50725 Source Host : imingsoft.cn:3307 - Source Schema : db-mcms-5.0 + Source Schema : db-mcms-5.0-test Target Server Type : MySQL Target Server Version : 50725 File Encoding : 65001 - Date: 10/01/2020 11:33:43 + Date: 24/03/2020 20:46:19 */ SET NAMES utf8mb4; @@ -281,6 +281,28 @@ INSERT INTO `cms_history_log` VALUES (3, '0', NULL, '127.0.0.1', '2', 0, NULL, N INSERT INTO `cms_history_log` VALUES (4, '0', NULL, '127.0.0.1', '8', 0, NULL, NULL, NULL, NULL); INSERT INTO `cms_history_log` VALUES (5, '0', NULL, '127.0.0.1', '7', 0, NULL, NULL, NULL, NULL); +-- ---------------------------- +-- Table structure for file +-- ---------------------------- +DROP TABLE IF EXISTS `file`; +CREATE TABLE `file` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '文件编号', + `category_id` int(11) NULL DEFAULT NULL COMMENT '文件分类编号', + `app_id` int(11) NULL DEFAULT NULL COMMENT 'APP编号', + `file_name` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件名称', + `file_url` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件链接', + `file_size` int(11) NULL DEFAULT NULL COMMENT '文件大小', + `file_json` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件详情Json数据', + `file_type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件类型：图片、音频、视频等', + `is_child` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '子业务', + `update_date` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `update_by` int(11) NULL DEFAULT NULL COMMENT '更新者', + `create_by` int(11) NULL DEFAULT NULL COMMENT '创建者', + `create_date` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `del` int(1) NULL DEFAULT NULL COMMENT '删除标记', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 67 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '基础文件表' ROW_FORMAT = Dynamic; + -- ---------------------------- -- Table structure for manager -- ---------------------------- @@ -477,7 +499,7 @@ CREATE TABLE `mdiy_tag_sql` ( INSERT INTO `mdiy_tag_sql` VALUES (5, 3, '<#assign _typeid=\"\"/>\r\n<#assign _size=\"20\"/>\r\n<#if column?? && column.id?? && column.id?number gt 0>\r\n <#assign _typeid=\"${column.id}\">\r\n\r\n<#if typeid??>\r\n <#assign _typeid=\"${typeid}\">\r\n\r\n<#if size??>\r\n <#assign _size=\"${size}\">\r\n\r\n<#if orderby?? >\r\n <#if orderby==\"date\"> \r\n <#assign _orderby=\"content_datetime\">\r\n <#elseif orderby==\"updatedate\">\r\n <#assign _orderby=\"content_updatetime\">\r\n <#elseif orderby==\"hit\"> \r\n <#assign _orderby=\"content_hit\">\r\n <#elseif orderby==\"sort\">\r\n <#assign _orderby=\"content_sort\">\r\n <#else><#assign _orderby=\"cms_content.id\">\r\n <#else>\r\n <#assign _orderby=\"cms_content.id\">\r\n \r\nSELECT\r\n cms_content.id AS id,\r\n @rownum := @rownum + 1 AS `index`,\r\n LEFT (content_title, ${titlelen ?default(40)}) AS title,\r\n content_title AS fulltitle,\r\n content_author AS author,\r\n content_source AS source,\r\n content_details AS content,\r\n category.category_title AS typename,\r\n category.category_id AS typeid,\r\n ( CASE category.category_img WHEN \'\' THEN category.category_img ELSE CONVERT ( JSON_UNQUOTE( JSON_EXTRACT( category.category_img -> \'$[0]\', \'$.path\' ) ) USING utf8 ) END ) AS typelitpic,\r\n <#--列表页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/list.do?typeid=\", category.category_id) as typelink,\r\n <#else>\r\n (SELECT \"index.html\") AS typelink,\r\n \r\n ( CASE content_img WHEN \'\' THEN content_img ELSE CONVERT ( JSON_UNQUOTE( JSON_EXTRACT( content_img -> \'$[0]\', \'$.path\' ) ) USING utf8 ) END ) AS litpic,\r\n <#--内容页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/view.do?id=\", cms_content.id,\"&orderby=${_orderby}\",\"&order=${order!\'ASC\'}\") as link,\r\n <#else>\r\n\r\n CONCAT(category.category_path,\"/\",cms_content.id,\".html\") AS link,\r\n \r\n content_datetime AS date,<#if tableName??>${tableName}.*,\r\n content_description AS descrip,\r\n content_hit AS hit,\r\n content_type AS flag,\r\n category_title AS typetitle,\r\n cms_content.content_keyword AS keyword \r\nFROM\r\n (SELECT @rownum := 0) r,\r\n cms_content\r\n LEFT JOIN cms_category as category ON content_category_id = category.id\r\n <#--判断是否有自定义模型表-->\r\n <#if tableName??>LEFT JOIN ${tableName} ON ${tableName}.link_id=cms_content.id \r\nWHERE \r\n content_display=0 \r\n <#--根据站点编号查询-->\r\n <#if appId?? >\r\n and cms_content.app_id=${appId}\r\n and cms_content.id>0\r\n \r\n <#--判断是否有搜索分类集合-->\r\n <#if search??>\r\n <#if search.categoryIds??>and FIND_IN_SET(category.id,\'${search.categoryIds}\')\r\n <#--标题-->\r\n <#if search.content_title??> and content_title like CONCAT(\"%\",\'${search.content_title}\',\"%\")\r\n <#--作者-->\r\n <#if search.content_author??> and content_author like CONCAT(\"%\",\'${search.content_author}\',\"%\")\r\n <#--来源-->\r\n <#if search.content_source??> and content_source like CONCAT(\"%\",\'${search.content_source}\',\"%\")\r\n <#--属性-->\r\n <#if search.content_type??> and content_type like CONCAT(\"%\",\'${search.content_type}\',\"%\")\r\n <#--描述-->\r\n <#if search.content_description??> and content_description like CONCAT(\"%\",\'${search.content_description}\',\"%\")\r\n <#--关键字-->\r\n <#if search.content_keyword??> and content_keyword like CONCAT(\"%\",\'${search.content_keyword}\',\"%\")\r\n <#--内容-->\r\n <#if search.content_details??> and content_details like CONCAT(\"%\",\'${search.content_details}\',\"%\")\r\n <#--自定义顺序-->\r\n <#if search.content_sort??> and content_sort=${search.content_sort}\r\n <#else><#--查询栏目-->\r\n <#if _typeid?has_content> and (content_category_id=${_typeid} or content_category_id in \r\n (select id FROM cms_category where cms_category.del=0 and find_in_set(${_typeid},CATEGORY_PARENT_ID))) \r\n \r\n <#--标题-->\r\n <#if content_title??> and content_title like CONCAT(\"%\",\'${content_title}\',\"%\")\r\n <#--作者-->\r\n <#if content_author??> and content_author like CONCAT(\"%\",\'${content_author}\',\"%\")\r\n <#--来源-->\r\n <#if content_source??> and content_source like CONCAT(\"%\",\'${content_source}\',\"%\")\r\n <#--属性-->\r\n <#if content_type??> and content_type like CONCAT(\"%\",\'${content_type}\',\"%\")\r\n <#--描述-->\r\n <#if content_description??> and content_description like CONCAT(\"%\",\'${content_description}\',\"%\")\r\n <#--关键字-->\r\n <#if content_keyword??> and content_keyword like CONCAT(\"%\",\'${content_keyword}\',\"%\")\r\n <#--内容-->\r\n <#if content_details??> and content_details like CONCAT(\"%\",\'${content_details}\',\"%\")\r\n <#--自定义顺序-->\r\n <#if content_sort??> and content_sort=${content_sort}\r\n <#--自定义模型-->\r\n <#if diyModel??> \r\n <#list diyModel as dm>\r\n and ${tableName}.${dm.key} like CONCAT(\"%\",\'${dm.value}\',\"%\") \r\n \r\n \r\n <#--文章属性-->\r\n <#if flag?? >\r\n and cms_content.content_type like CONCAT(\'%\',\'${flag}\',\'%\') \r\n \r\n <#if noflag?? >\r\n and cms_content.content_type not like CONCAT(\'%\',\'${noflag}\',\'%\') \r\n \r\n <#--字段排序-->\r\n <#if orderby?? >\r\n ORDER BY \r\n <#if orderby==\"date\"> content_datetime\r\n <#elseif orderby==\"updatedate\"> content_updatetime\r\n <#elseif orderby==\"hit\"> content_hit\r\n <#elseif orderby==\"sort\"> content_sort\r\n <#else>cms_content.id\r\n <#else>\r\n ORDER BY cms_content.id\r\n \r\n <#if order?? >\r\n <#if order==\"desc\"> desc\r\n <#if order==\"asc\"> asc\r\n \r\n LIMIT \r\n <#--判断是否分页-->\r\n <#if ispaging?? && (pageTag.pageNo)??>${((pageTag.pageNo-1)*_size?eval)?c},${_size?default(20)}\r\n <#else>${_size?default(20)}', 1); INSERT INTO `mdiy_tag_sql` VALUES (6, 4, '<#assign _typeid=\"\"/>\r\n<#if column?? && column.id?? && column.id?number gt 0>\r\n <#assign _typeid=\"${column.id}\">\r\n <#assign selfid=\"${column.id}\">\r\n\r\n<#if typeid??>\r\n <#assign _typeid=\"${typeid}\">\r\n\r\nselect \r\n @rownum := @rownum + 1 AS typeindex,\r\n id,\r\n id as typeid,\r\n category_title as typetitle,\r\n <#--返回父id集合-->\r\n category_parent_id as pids,\r\n <#--栏目选中的样式-->\r\n IF(<#if selfid?has_content>${selfid}<#else>${_typeid} = id ,\"${class!\'\'}\",\"\") as class,\r\n <#--动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/list.do?typeid=\", id) as typelink,\r\n <#else>\r\n CONCAT(category_path,\"/index.html\") as typelink,\r\n \r\n category_keyword as typekeyword,\r\n category_diy_url as typeurl,\r\n category_flag as flag,\r\n category_descrip as typedescrip,\r\n ( CASE category_img WHEN \'\' THEN category_img ELSE CONVERT ( JSON_UNQUOTE( JSON_EXTRACT( category_img -> \'$[0]\', \'$.path\' ) ) USING utf8 ) END ) as typelitpic ,\r\n(select count(*) from cms_category c where c.category_id=typeid and c.del=0) as childsize\r\n from (SELECT @rownum := 0) r,cms_category \r\n where \r\n cms_category.del=0 \r\n <#--根据站点编号查询-->\r\n <#if appId?? >\r\n and cms_category.app_id=${appId}\r\n \r\n <#--栏目属性-->\r\n <#if flag?? >\r\n and category_flag like CONCAT(\'%\',\'${flag}\',\'%\') \r\n \r\n <#if noflag?? >\r\n and category_flag not like CONCAT(\'%\',\'${noflag}\',\'%\') \r\n \r\n<#if type?has_content>\r\n <#--顶级栏目（单个）-->\r\n <#if type==\"top\">\r\n and id=(select left(category_parent_id,LOCATE(\",\",category_parent_id)-1) from cms_category where category_id = ${_typeid})\r\n <#elseif type==\"nav\">\r\n and(category_id=0 or category_id is null)\r\n <#--同级栏目（多个）-->\r\n <#elseif type==\"level\">\r\n and\r\n <#if _typeid?has_content>\r\n category_id=(select category_id from cms_category where id=${_typeid})\r\n <#else>\r\n 1=1\r\n \r\n <#--当前栏目（单个）-->\r\n <#elseif type==\"self\">\r\n and \r\n <#if _typeid?has_content>\r\n id=${_typeid}\r\n <#else>\r\n 1=1\r\n \r\n <#--当前栏目的所属栏目（多个）-->\r\n <#elseif type==\"path\">\r\n and \r\n <#if _typeid?has_content>\r\n id in (<#if column?? && column.categoryParentId??>${column.categoryParentId},${_typeid})\r\n <#else>\r\n 1=1\r\n \r\n <#--子栏目（多个）-->\r\n <#elseif type==\"son\">\r\n and \r\n <#if _typeid?has_content>\r\n category_id=${_typeid}\r\n <#else>\r\n 1=1\r\n \r\n <#--上一级栏目没有则取当前栏目（单个）-->\r\n <#elseif type==\"parent\">\r\n and \r\n <#if _typeid?has_content>\r\n <#if column?? && column.categoryId??>\r\n id=${column.categoryId}\r\n <#else>\r\n id=${_typeid}\r\n \r\n <#else>\r\n 1=1\r\n \r\n <#--子栏目或同级栏目（多个）-->\r\n <#elseif type==\"sonOrLevel\">\r\n and \r\n <#if _typeid?has_content>\r\n category_id= if((SELECT count(*) FROM cms_category\r\n WHERE id=${_typeid})>0,${_typeid},(select id from cms_category where id=${_typeid}))\r\n <#else>\r\n 1=1\r\n \r\n \r\n<#else> <#--默认son-->\r\n and\r\n <#if _typeid?has_content>\r\n category_id=${_typeid}\r\n <#else>\r\n (category_id=0 or category_id is null)\r\n \r\n\r\n<#--字段排序-->\r\n <#if orderby?? >\r\n ORDER BY \r\n <#if orderby==\"date\"> category_datetime\r\n <#elseif orderby==\"sort\"> category_sort\r\n <#else>cms_content.id\r\n <#else>\r\n ORDER BY id\r\n \r\n <#if order?? >\r\n <#if order==\"desc\"> desc\r\n <#if order==\"asc\"> asc\r\n ', 1); INSERT INTO `mdiy_tag_sql` VALUES (7, 5, 'select \r\nAPP_NAME as name,\r\napp_logo as logo,\r\napp_keyword as keyword,\r\napp_description as descrip,\r\napp_copyright as copyright,\r\n<#--动态解析 -->\r\n<#if isDo?? && isDo>\r\n\"${url}\" as url,\r\n\"${url}\" as host,\r\n<#--使用地址栏的域名 -->\r\n<#elseif url??>\r\nCONCAT(\"${url}\",\"/${html}/\",app_id,\"/<#if m??>${m}\") as url,\r\n\"${url}\" as host,\r\n<#else>\r\nCONCAT(REPLACE(REPLACE(TRIM(substring_index(app_url,\"\\n\",1)), CHAR(10),\'\'), CHAR(13),\'\'),\"/html/\",app_id,\"/<#if m??>${m}\") as url,\r\nREPLACE(REPLACE(TRIM(substring_index(app_url,\"\\n\",1)), CHAR(10),\'\'), CHAR(13),\'\') as host,\r\n\r\nCONCAT(\"templets/\",app_id,\"/\",<#if m??>CONCAT(app_style,\"/${m}\")<#else>app_style) as style <#-- 判断是否为手机端 -->\r\nfrom app where app_id = ${appId} limit 1', 1); -INSERT INTO `mdiy_tag_sql` VALUES (8, 7, 'SELECT \r\ncms_content.id as id,\r\nleft(content_title,${titlelen?default(40)}) as title,\r\ncontent_title as fulltitle,\r\ncontent_author as author, \r\ncontent_source as source, \r\ncontent_details as content,\r\ncategory_title as typetitle,\r\ncms_category.id as typeid,\r\ncategory_img AS typelitpic,\r\n<#--动态链接-->\r\n<#if isDo?? && isDo>\r\nCONCAT(\"/${modelName}/list.do?typeid=\", category.id) as typelink,\r\n<#else>\r\n(SELECT \"index.html\") as typelink,\r\n\r\ncontent_img as litpic,\r\n<#--内容页动态链接-->\r\n<#if isDo?? && isDo>\r\nCONCAT(\"/mcms/view.do?id=\", cms_content.id) as link,\r\n<#else>\r\ncontent_url AS link,\r\n\r\ncontent_datetime as date,\r\ncontent_description as descrip,\r\nCONCAT(\"\") as hit,\r\ncontent_type as flag,\r\ncategory_title as typetitle,\r\n<#if tableName??>${tableName}.*,\r\ncontent_keyword as keyword\r\nFROM cms_content\r\nLEFT JOIN cms_category ON content_category_id=cms_category.id \r\n<#--判断是否有自定义模型表-->\r\n<#if tableName??>left join ${tableName} on ${tableName}.link_id=cms_content.id\r\nWHERE \r\n1=1\r\n<#if id??> and cms_content.id=${id}', 1); +INSERT INTO `mdiy_tag_sql` VALUES (8, 7, 'SELECT \r\ncms_content.id as id,\r\nleft(content_title,${titlelen?default(40)}) as title,\r\ncontent_title as fulltitle,\r\ncontent_author as author, \r\ncontent_source as source, \r\ncontent_details as content,\r\ncategory_title as typetitle,\r\ncms_category.id as typeid,\r\n ( CASE cms_category.category_img WHEN \'\' THEN cms_category.category_img ELSE CONVERT ( JSON_UNQUOTE( JSON_EXTRACT( cms_category.category_img -> \'$[0]\', \'$.path\' ) ) USING utf8 ) END ) AS typelitpic,\r\n<#--动态链接-->\r\n<#if isDo?? && isDo>\r\nCONCAT(\"/${modelName}/list.do?typeid=\", category.id) as typelink,\r\n<#else>\r\n(SELECT \"index.html\") as typelink,\r\n\r\n( CASE cms_content.content_img WHEN \'\' THEN cms_content.content_img ELSE CONVERT ( JSON_UNQUOTE( JSON_EXTRACT( cms_content.content_img -> \'$[0]\', \'$.path\' ) ) USING utf8 ) END ) AS litpic,\r\n<#--内容页动态链接-->\r\n<#if isDo?? && isDo>\r\nCONCAT(\"/mcms/view.do?id=\", cms_content.id) as link,\r\n<#else>\r\ncontent_url AS link,\r\n\r\ncontent_datetime as date,\r\ncontent_description as descrip,\r\nCONCAT(\"\") as hit,\r\ncontent_type as flag,\r\ncategory_title as typetitle,\r\n<#if tableName??>${tableName}.*,\r\ncontent_keyword as keyword\r\nFROM cms_content\r\nLEFT JOIN cms_category ON content_category_id=cms_category.id \r\n<#--判断是否有自定义模型表-->\r\n<#if tableName??>left join ${tableName} on ${tableName}.link_id=cms_content.id\r\nWHERE \r\n1=1\r\n<#if id??> and cms_content.id=${id}', 1); INSERT INTO `mdiy_tag_sql` VALUES (9, 8, '<#assign select=\"(SELECT \'\')\"/>\r\n<#if orderby?? >\r\n <#if orderby==\"date\"> \r\n <#assign _orderby=\"content_datetime\">\r\n <#elseif orderby==\"updatedate\">\r\n <#assign _orderby=\"content_updatetime\">\r\n <#elseif orderby==\"hit\"> \r\n <#assign _orderby=\"content_hit\">\r\n <#elseif orderby==\"sort\">\r\n <#assign _orderby=\"content_sort\">\r\n <#else><#assign _orderby=\"cms_content.id\">\r\n <#else>\r\n <#assign _orderby=\"cms_content.id\">\r\n \r\n<#if (pageTag.preId) gt 0>\r\nSELECT \r\ncms_content.id as id,\r\nleft(content_title,${titlelen?default(40)}) as title,\r\ncontent_title as fulltitle,\r\ncontent_author as author, \r\ncontent_source as source, \r\ncontent_details as content,\r\ncategory.category_title as typename,\r\ncategory.category_id as typeid,\r\n(SELECT \"index.html\") as typelink,\r\ncontent_img as litpic,\r\n<#--内容页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/view.do?id=\", cms_content.id,\"&orderby=${_orderby}\",\"&order=${order!\'ASC\'}\") as link,\r\n <#else>\r\n CONCAT(category_path,\"/\",cms_content.id,\".html\") AS link,\r\n \r\ncontent_datetime as date,\r\ncontent_description as descrip,\r\ncontent_hit as hit,\r\ncontent_type as flag,\r\ncontent_keyword as keyword \r\nFROM cms_content \r\nLEFT JOIN cms_category as category ON content_category_id=category.id \r\nWHERE cms_content.id=${pageTag.preId}\r\n<#else>\r\nSELECT \r\n${select} as id,\r\n${select} as title,\r\n${select} as fulltitle,\r\n${select} as author, \r\n${select} as source, \r\n${select} as content,\r\n${select} as typename,\r\n${select} as typeid,\r\n${select} as typelink,\r\n${select} as litpic,\r\n${select} as link,\r\n${select} as date,\r\n${select} as descrip,\r\n${select} as hit,\r\n${select} as flag,\r\n${select} as keyword FROM cms_content\r\n', NULL); INSERT INTO `mdiy_tag_sql` VALUES (10, 9, ' select\r\n <#if !(pageTag.indexUrl??)>\r\n <#--判断是否有栏目对象，用于搜索不传栏目-->\r\n <#if column??>\r\n <#assign path=column.categoryPath/>\r\n <#else>\r\n <#assign path=\"\"/>\r\n \r\n <#--总记录数、总页数-->\r\n (SELECT ${pageTag.total}) as total,\r\n <#--记录总数-->\r\n (SELECT ${pageTag.size}) as rcount,\r\n <#--当前页码-->\r\n (SELECT ${pageTag.pageNo}) as cur,\r\n <#--首页-->\r\n CONCAT(\"${path}\", \"/index.html\") as `index`,\r\n <#--上一页-->\r\n <#if (pageTag.pageNo?eval-1) gt 1>\r\n CONCAT(\"${path}\",\"/list-${pageTag.pageNo?eval-1}.html\") as pre,\r\n <#else>\r\n CONCAT(\"${path}\",\"/index.html\") as pre,\r\n \r\n <#--下一页-->\r\n <#if pageTag.total==1>\r\n CONCAT(\"${path}\", \"/index.html\") as `next`,\r\n CONCAT(\"${path}\", \"/index.html\") as `last`\r\n <#else>\r\n <#if pageTag.pageNo?eval gte pageTag.total>\r\n CONCAT(\"${path}\",\"/list-${pageTag.total}.html\") as next,\r\n <#else>\r\n CONCAT(\"${path}\",\"/list-${pageTag.pageNo?eval+1}.html\") as next,\r\n \r\n <#--最后一页-->\r\n CONCAT(\"${path}\",\"/list-${pageTag.total}.html\") as last\r\n \r\n<#else><#--判断是否是搜索页面-->\r\n \"${pageTag.indexUrl}\" as `index`,\"${pageTag.lastUrl}\" as `last`,\"${pageTag.preUrl}\" as `pre`,\"${pageTag.nextUrl}\" as `next`,\'${pageTag.total}\' as total,\'${pageTag.size}\' as rcount,\'${pageTag.pageNo}\' as cur\r\n', NULL); INSERT INTO `mdiy_tag_sql` VALUES (11, 10, '<#assign select=\"(SELECT \'\')\"/>\r\n<#if orderby?? >\r\n <#if orderby==\"date\"> \r\n <#assign _orderby=\"content_datetime\">\r\n <#elseif orderby==\"updatedate\">\r\n <#assign _orderby=\"content_updatetime\">\r\n <#elseif orderby==\"hit\"> \r\n <#assign _orderby=\"content_hit\">\r\n <#elseif orderby==\"sort\">\r\n <#assign _orderby=\"content_sort\">\r\n <#else><#assign _orderby=\"cms_content.id\">\r\n <#else>\r\n <#assign _orderby=\"cms_content.id\">\r\n \r\n<#if (pageTag.nextId) gt 0>\r\nSELECT \r\ncms_content.id as id,\r\nleft(content_title,${titlelen?default(40)}) as title,\r\ncontent_title as fulltitle,\r\ncontent_author as author, \r\ncontent_source as source, \r\ncontent_details as content,\r\ncategory.category_title as typename,\r\ncategory.category_id as typeid,\r\n(SELECT \"index.html\") as typelink,\r\ncontent_img as litpic,\r\n<#--内容页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/view.do?id=\", cms_content.id,\"&orderby=${_orderby}\",\"&order=${order!\'ASC\'}\") as link,\r\n <#else>\r\n CONCAT(category_path,\"/\",cms_content.id,\".html\") AS link,\r\n \r\ncontent_datetime as date,\r\ncontent_description as descrip,\r\ncontent_hit as hit,\r\ncontent_type as flag,\r\ncontent_keyword as keyword \r\nFROM cms_content \r\nLEFT JOIN cms_category as category ON content_category_id=category.id \r\nWHERE cms_content.id=${pageTag.nextId}\r\n<#else>\r\nSELECT \r\n${select} as id,\r\n${select} as title,\r\n${select} as fulltitle,\r\n${select} as author, \r\n${select} as source, \r\n${select} as content,\r\n${select} as typename,\r\n${select} as typeid,\r\n${select} as typelink,\r\n${select} as litpic,\r\n${select} as link,\r\n${select} as date,\r\n${select} as descrip,\r\n${select} as hit,\r\n${select} as flag,\r\n${select} as keyword FROM cms_content\r\n', NULL); @@ -806,27 +828,3 @@ CREATE TABLE `system_log` ( INSERT INTO `system_log` VALUES (7, NULL, 'success', '{\n \"result\":true,\n \"code\":200\n}', '{\n \"ids\":[\"291\"]\n}', '内网IP', '/ms-mcms/ms/model/delete.do', 'msopen', 'manage', 'POST', 'net.mingsoft.basic.action.ModelAction.delete()', 'delete', '127.0.0.1', '批量删除模块表', 0, NULL, NULL, '2020-01-09 21:33:16', NULL); SET FOREIGN_KEY_CHECKS = 1; - --- ---------------------------- --- Table structure for file --- ---------------------------- -DROP TABLE IF EXISTS `file`; -CREATE TABLE `file` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '文件编号', - `category_id` int(11) NULL DEFAULT NULL COMMENT '文件分类编号', - `app_id` int(11) NULL DEFAULT NULL COMMENT 'APP编号', - `file_name` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件名称', - `file_url` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件链接', - `file_size` int(11) NULL DEFAULT NULL COMMENT '文件大小', - `file_json` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件详情Json数据', - `file_type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件类型：图片、音频、视频等', - `is_child` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '子业务', - `update_date` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - `update_by` int(11) NULL DEFAULT NULL COMMENT '更新者', - `create_by` int(11) NULL DEFAULT NULL COMMENT '创建者', - `create_date` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `del` int(1) NULL DEFAULT NULL COMMENT '删除标记', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 67 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '基础文件表' ROW_FORMAT = Dynamic; - -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file