Skip to content
GitLab
Commit ab6f0e31 authored by 他是超人他会飞's avatar 他是超人他会飞 Committed by 铭飞
Browse files

!134 提交默认模版 

Merge pull request !134 from 他是超人他会飞/4.7.0
parents 622428db 7a48ed56
Expand all Hide whitespace changes
Inline Side-by-side
doc/4.6.5-to-4.7.0.sql → doc/4.6.5-to-4.7.0-mysql.sql
View file @ ab6f0e31
......@@ -36,11 +36,11 @@ CREATE TABLE `mdiy_tag` (
-- ----------------------------
INSERT INTO `mdiy_tag` VALUES (3, 'arclist', 3, '文章列表');
INSERT INTO `mdiy_tag` VALUES (4, 'channel', 3, '通用栏目');
INSERT INTO `mdiy_tag` VALUES (5, 'global', 3, '全局');
INSERT INTO `mdiy_tag` VALUES (5, 'global', 2, '全局');
INSERT INTO `mdiy_tag` VALUES (7, 'field', 3, '文章内容');
INSERT INTO `mdiy_tag` VALUES (8, 'pre', 3, '文章上一篇');
INSERT INTO `mdiy_tag` VALUES (9, 'page', 3, '通用分页');
INSERT INTO `mdiy_tag` VALUES (10, 'next', 3, '文章下一篇');
INSERT INTO `mdiy_tag` VALUES (8, 'pre', 0, '文章上一篇');
INSERT INTO `mdiy_tag` VALUES (9, 'page', 2, '通用分页');
INSERT INTO `mdiy_tag` VALUES (10, 'next', 0, '文章下一篇');
INSERT INTO `mdiy_tag` VALUES (12, 'prclist', 3, '商品列表');
INSERT INTO `mdiy_tag` VALUES (13, 'goods', 3, '商品详情');
......@@ -69,4 +69,24 @@ INSERT INTO `mdiy_tag_sql` VALUES (9, 8, '<#assign select=\"(SELECT \'\')\"/>\r\
INSERT INTO `mdiy_tag_sql` VALUES (10, 9, ' select\r\n <#--判断是否有栏目对象，用于搜索不传栏目-->\r\n <#if column??>\r\n <#--顶级栏目处理-->\r\n <#if column.categoryCategoryId==0>\r\n <#assign path=column.columnPath/>\r\n <#else>\r\n <#assign path=column.columnPath/>\r\n </#if>\r\n <#else>\r\n <#assign path=\"\"/>\r\n </#if>\r\n <#--总记录数、总页数-->\r\n (SELECT ${total}) as total,\r\n <#--记录总数-->\r\n (SELECT ${rcount}) as rcount,\r\n <#--当前页码-->\r\n (SELECT ${pageNo}) as cur,\r\n <#--首页-->\r\n CONCAT(\"${path}\", \"/index.html\") as `index`,\r\n <#--上一页-->\r\n <#if (pageNo?eval-1) gt 1>\r\n CONCAT(\"${path}\",\"/list-${pageNo?eval-1}.html\") as pre,\r\n <#else>\r\n CONCAT(\"${path}\",\"/index.html\") as pre,\r\n </#if>\r\n <#--下一页-->\r\n <#if total==1>\r\n CONCAT(\"${path}\", \"/index.html\") as `next`,\r\n CONCAT(\"${path}\", \"/index.html\") as `last`\r\n <#else>\r\n <#if pageNo?eval gte total>\r\n CONCAT(\"${path}\",\"/list-${total}.html\") as next,\r\n <#else>\r\n CONCAT(\"${path}\",\"/list-${pageNo?eval+1}.html\") as next,\r\n </#if>\r\n <#--最后一页-->\r\n CONCAT(\"${path}\",\"/list-${total}.html\") as last\r\n </#if>', NULL);
INSERT INTO `mdiy_tag_sql` VALUES (11, 10, '<#assign select=\"(SELECT \'\')\"/>\r\n<#if nextId??>\r\nSELECT \r\nbasic_id as id,\r\nleft(basic_title,${titlelen?default(40)}) as title,\r\nbasic_title as fulltitle,\r\narticle_author as author, \r\narticle_source as source, \r\narticle_content as content,\r\ncategory.category_title as typename,\r\ncategory.category_id as typeid,\r\n(SELECT \"index.html\") as typelink,\r\nbasic.basic_thumbnails as litpic,\r\ncms_article.article_url as link,\r\nbasic_datetime as date,\r\nbasic_description as descrip,\r\nbasic_hit as hit,\r\narticle_type as flag,\r\ncms_article.article_keyword as keyword \r\nFROM basic LEFT JOIN cms_article ON cms_article.article_basicid = basic.basic_id \r\nLEFT JOIN category ON basic_categoryid=category.category_id \r\nLEFT JOIN basic_column ON basic_column.column_category_id=basic.basic_categoryid \r\nWHERE basic_id=${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 basic\r\n</#if>', NULL);
INSERT INTO `mdiy_tag_sql` VALUES (13, 12, 'SELECT\r\n basic_id AS id,\r\n product_price as price,\r\n product_cost_price AS costprice,\r\n product_content AS content,\r\n product_code AS code,\r\n <#--详情页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/view.do?id=\", basic_id) as link,\r\n <#else>\r\n product_linkUrl AS link,\r\n </#if>\r\n basic_title AS title,\r\n product_sale AS sale,\r\n product_good AS specification,\r\n product_inventory AS stock,\r\n basic.basic_categoryid AS typeid,\r\n basic_thumbnails AS litpic,\r\n <#--列表页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/mmall/list.do?typeid=\", category.category_id) as typelink,\r\n <#else>\r\n (SELECT \"index.html\") AS typelink,\r\n </#if>\r\n <#--判断是否有自定义模型表-->\r\n <#if tableNname??>${tableNname}.*,</#if>\r\n category_title AS typetitle\r\nFROM\r\n mall_product \r\n LEFT JOIN basic ON mall_product.product_basicID = basic.basic_id\r\n LEFT JOIN category ON basic_categoryid = category.category_id\r\n <#--判断是否有自定义模型表-->\r\n <#if tableNname??>LEFT JOIN ${tableNname} ON ${tableNname}.basicId=mall_product.product_basicID </#if>\r\nWHERE\r\n 1 = 1 <#--查询栏目-->\r\n <#if (typeid)??> and (basic_categoryid=${typeid} or basic_categoryid in \r\n (select category_id FROM category where find_in_set(${typeid},CATEGORY_PARENT_ID)))\r\n </#if>\r\n <#--模糊查询商品标题-->\r\n <#if basic_title??> and basic_title like CONCAT(\"%\",\'${basic_title}\',\"%\")</#if> \r\n LIMIT <#--判断是否分页-->\r\n <#if ispaging?? && pageNo??>${(pageNo?eval-1)*size?eval},${size?default(20)}\r\n <#else>${size?default(20)}</#if>', NULL);
INSERT INTO `mdiy_tag_sql` VALUES (14, 13, 'SELECT\r\n basic_id AS id,\r\n product_price as price,\r\n product_cost_price AS costprice,\r\n product_content AS content,\r\n product_code AS code,\r\n <#--详情页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/view.do?id=\", basic_id) as link,\r\n <#else>\r\n product_linkUrl AS link,\r\n </#if>\r\n basic_title AS title,\r\n product_sale AS sale,\r\n product_good AS specification,\r\n product_inventory AS stock,\r\n basic.basic_categoryid AS typeid,\r\n basic_thumbnails AS litpic,\r\n <#--列表页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/mmall/list.do?id=\", category.category_id) as typelink,\r\n <#else>\r\n (SELECT \"index.html\") AS typelink,\r\n </#if>\r\n <#--判断是否有自定义模型表-->\r\n <#if tableNname??>${tableNname}.*,</#if>\r\n category_title AS typetitle\r\nFROM\r\n mall_product \r\n LEFT JOIN basic ON mall_product.product_basicID = basic.basic_id\r\n LEFT JOIN category ON basic_categoryid = category.category_id\r\n LEFT JOIN basic_column ON basic_column.column_category_id = basic.basic_categoryid\r\n <#--判断是否有自定义模型表-->\r\n <#if tableNname??>LEFT JOIN ${tableNname} ON ${tableNname}.basicId=mall_product.product_basicID </#if>\r\nWHERE\r\n 1 = 1 <#if id??> and basic_id=${id} </#if>', NULL);
\ No newline at end of file
INSERT INTO `mdiy_tag_sql` VALUES (14, 13, 'SELECT\r\n basic_id AS id,\r\n product_price as price,\r\n product_cost_price AS costprice,\r\n product_content AS content,\r\n product_code AS code,\r\n <#--详情页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/view.do?id=\", basic_id) as link,\r\n <#else>\r\n product_linkUrl AS link,\r\n </#if>\r\n basic_title AS title,\r\n product_sale AS sale,\r\n product_good AS specification,\r\n product_inventory AS stock,\r\n basic.basic_categoryid AS typeid,\r\n basic_thumbnails AS litpic,\r\n <#--列表页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/mmall/list.do?id=\", category.category_id) as typelink,\r\n <#else>\r\n (SELECT \"index.html\") AS typelink,\r\n </#if>\r\n <#--判断是否有自定义模型表-->\r\n <#if tableNname??>${tableNname}.*,</#if>\r\n category_title AS typetitle\r\nFROM\r\n mall_product \r\n LEFT JOIN basic ON mall_product.product_basicID = basic.basic_id\r\n LEFT JOIN category ON basic_categoryid = category.category_id\r\n LEFT JOIN basic_column ON basic_column.column_category_id = basic.basic_categoryid\r\n <#--判断是否有自定义模型表-->\r\n <#if tableNname??>LEFT JOIN ${tableNname} ON ${tableNname}.basicId=mall_product.product_basicID </#if>\r\nWHERE\r\n 1 = 1 <#if id??> and basic_id=${id} </#if>', NULL);
INSERT INTO `model` VALUES ('155', '自定义标签', '20060000', '104', 'mdiy/tag/index.do', '2017-09-04 11:18:51', '', '0', '0', '1', '104','');
INSERT INTO `model` VALUES ('156', '新增', '20060001', '155', 'mdiy:tag:save', '2017-09-04 14:28:41', '', '0', '0', '0', '104,155','');
INSERT INTO `model` VALUES ('157', '查看', '20060002', '155', 'mdiy:tag:view', '2018-06-20 17:53:51', '', '0', '0', '0', '104,155','');
INSERT INTO `model` VALUES ('158', '修改', '20060003', '155', 'mdiy:tag:update', '2018-06-20 17:54:43', null, '0', '0', '0', '104,155','');
INSERT INTO `model` VALUES ('159', '删除', '20060004', '155', 'mdiy:tag:del', '2018-06-20 17:55:26', null, '0', '0', '0', '104,155','');
INSERT INTO `model` VALUES ('160', '新增SQL', '20060005', '155', 'mdiy:tagSql:save', '2017-09-04 14:28:41', '', '0', '0', '0', '104,155','');
INSERT INTO `model` VALUES ('161', '查看SQL', '20060006', '155', 'mdiy:tagSql:view', '2018-06-20 17:53:51', '', '0', '0', '0', '104,155','');
INSERT INTO `model` VALUES ('162', '修改SQL', '20060007', '155', 'mdiy:tagSql:update', '2018-06-20 17:54:43', null, '0', '0', '0', '104,155','');
INSERT INTO `model` VALUES ('163', '删除SQL', '20060008', '155', 'mdiy:tagSql:del', '2018-06-20 17:55:26', null, '0', '0', '0', '104,155','');
INSERT INTO `role_model` VALUES ('155', '48');
INSERT INTO `role_model` VALUES ('156', '48');
INSERT INTO `role_model` VALUES ('157', '48');
INSERT INTO `role_model` VALUES ('158', '48');
INSERT INTO `role_model` VALUES ('159', '48');
INSERT INTO `role_model` VALUES ('160', '48');
INSERT INTO `role_model` VALUES ('161', '48');
INSERT INTO `role_model` VALUES ('162', '48');
INSERT INTO `role_model` VALUES ('163', '48');
doc/db-mcms-mysql-4.7.0.sql
View file @ ab6f0e31
......@@ -882,6 +882,7 @@ INSERT INTO `model` VALUES ('106', '自定义表单', '20020000', '104', 'mdiy/f
INSERT INTO `model` VALUES ('107', '自定义模型', '20030000', '104', 'mdiy/contentModel/index.do', '2017-09-04 11:20:15', '', '0', '0', '1', '104');
INSERT INTO `model` VALUES ('108', '自定义搜索', '20040000', '104', 'mdiy/search/index.do', '2017-09-04 11:20:31', '', '0', '0', '1', '104');
INSERT INTO `model` VALUES ('109', '自定义字典', '20050000', '104', 'mdiy/dict/index.do', '2017-09-04 11:21:09', '', '0', '0', '1', '104');
INSERT INTO `model` VALUES ('155', '自定义标签', '20060000', '104', 'mdiy/tag/index.do', '2017-09-04 11:18:51', '', '0', '0', '1', '104');
INSERT INTO `model` VALUES ('110', '查看', '20010001', '105', 'mdiy:page:view', '2017-09-04 11:21:47', null, '0', '0', '0', '104,105');
INSERT INTO `model` VALUES ('111', '查看', '20020001', '106', 'mdiy:form:view', '2017-09-04 11:22:17', '', '0', '0', '0', '104,106');
INSERT INTO `model` VALUES ('112', '查看', '20030001', '107', 'mdiy:content:view', '2017-09-04 11:22:45', '', '0', '0', '0', '104,107');
......@@ -927,7 +928,14 @@ INSERT INTO `model` VALUES ('151', '新增', '20050002', '109', 'mdiy:dict:save'
INSERT INTO `model` VALUES ('152', '删除', '02990002', '7', 'cms:column:del', '2018-06-20 17:53:51', '', '0', '0', '0', '1,7');
INSERT INTO `model` VALUES ('153', '修改', '02990003', '7', 'cms:column:update', '2018-06-20 17:54:43', null, '0', '0', '0', '1,7');
INSERT INTO `model` VALUES ('154', '新增', '02990004', '7', 'cms:column:save', '2018-06-20 17:55:26', null, '0', '0', '0', '1,7');
INSERT INTO `model` VALUES ('156', '新增', '20060001', '155', 'mdiy:tag:save', '2017-09-04 14:28:41', '', '0', '0', '0', '104,155','');
INSERT INTO `model` VALUES ('157', '查看', '20060002', '155', 'mdiy:tag:view', '2018-06-20 17:53:51', '', '0', '0', '0', '104,155','');
INSERT INTO `model` VALUES ('158', '修改', '20060003', '155', 'mdiy:tag:update', '2018-06-20 17:54:43', null, '0', '0', '0', '104,155','');
INSERT INTO `model` VALUES ('159', '删除', '20060004', '155', 'mdiy:tag:del', '2018-06-20 17:55:26', null, '0', '0', '0', '104,155','');
INSERT INTO `model` VALUES ('160', '新增SQL', '20060005', '155', 'mdiy:tagSql:save', '2017-09-04 14:28:41', '', '0', '0', '0', '104,155','');
INSERT INTO `model` VALUES ('161', '查看SQL', '20060006', '155', 'mdiy:tagSql:view', '2018-06-20 17:53:51', '', '0', '0', '0', '104,155','');
INSERT INTO `model` VALUES ('162', '修改SQL', '20060007', '155', 'mdiy:tagSql:update', '2018-06-20 17:54:43', null, '0', '0', '0', '104,155','');
INSERT INTO `model` VALUES ('163', '删除SQL', '20060008', '155', 'mdiy:tagSql:del', '2018-06-20 17:55:26', null, '0', '0', '0', '104,155','');
-- ----------------------------
-- Table structure for people
-- ----------------------------
......@@ -1090,6 +1098,15 @@ INSERT INTO `role_model` VALUES ('151', '48');
INSERT INTO `role_model` VALUES ('152', '48');
INSERT INTO `role_model` VALUES ('153', '48');
INSERT INTO `role_model` VALUES ('154', '48');
INSERT INTO `role_model` VALUES ('155', '48');
INSERT INTO `role_model` VALUES ('156', '48');
INSERT INTO `role_model` VALUES ('157', '48');
INSERT INTO `role_model` VALUES ('158', '48');
INSERT INTO `role_model` VALUES ('159', '48');
INSERT INTO `role_model` VALUES ('160', '48');
INSERT INTO `role_model` VALUES ('161', '48');
INSERT INTO `role_model` VALUES ('162', '48');
INSERT INTO `role_model` VALUES ('163', '48');
-- ----------------------------
-- Table structure for file
......@@ -1129,16 +1146,25 @@ CREATE TABLE `mdiy_tag` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '标签' ROW_FORMAT = Dynamic;
3
3
2
3
0
2
0
3
3
-- ----------------------------
-- Records of mdiy_tag
-- ----------------------------
INSERT INTO `mdiy_tag` VALUES (3, 'arclist', 3, '文章列表');
INSERT INTO `mdiy_tag` VALUES (4, 'channel', 3, '通用栏目');
INSERT INTO `mdiy_tag` VALUES (5, 'global', 3, '全局');
INSERT INTO `mdiy_tag` VALUES (5, 'global', 2, '全局');
INSERT INTO `mdiy_tag` VALUES (7, 'field', 3, '文章内容');
INSERT INTO `mdiy_tag` VALUES (8, 'pre', 3, '文章上一篇');
INSERT INTO `mdiy_tag` VALUES (9, 'page', 3, '通用分页');
INSERT INTO `mdiy_tag` VALUES (10, 'next', 3, '文章下一篇');
INSERT INTO `mdiy_tag` VALUES (8, 'pre', 0, '文章上一篇');
INSERT INTO `mdiy_tag` VALUES (9, 'page', 2, '通用分页');
INSERT INTO `mdiy_tag` VALUES (10, 'next', 0, '文章下一篇');
INSERT INTO `mdiy_tag` VALUES (12, 'prclist', 3, '商品列表');
INSERT INTO `mdiy_tag` VALUES (13, 'goods', 3, '商品详情');
......
src/main/java/net/mingsoft/cms/action/ColumnAction.java
View file @ ab6f0e31
......@@ -80,17 +80,16 @@ public class ColumnAction extends BaseAction{
*/
@RequestMapping("/add")
public String add(HttpServletRequest request,ModelMap model) {
ManagerEntity managerSession = (ManagerEntity) BasicUtil.getSession( SessionConstEnum.MANAGER_SESSION);
// 站点ID
int appId =this.getAppId(request);
List<ColumnEntity> list = columnBiz.queryAll(appId, this.getModelCodeId(request));
int appId =BasicUtil.getAppId();
List<ColumnEntity> list = columnBiz.queryAll(appId, BasicUtil.getModelCodeId(net.mingsoft.cms.constant.ModelCode.CMS_COLUMN.toString()));
ColumnEntity columnSuper = new ColumnEntity();
model.addAttribute("appId",appId);
model.addAttribute("columnSuper", columnSuper);
model.addAttribute("column",new ColumnEntity());
model.addAttribute("listColumn", JSONArray.toJSONString(list));
model.addAttribute("model", "cms");
return view("/column/form");
return "/column/form";
}
/**
......@@ -194,10 +193,10 @@ public class ColumnAction extends BaseAction{
// 获取管理实体
ManagerEntity managerSession = (ManagerEntity) BasicUtil.getSession( SessionConstEnum.MANAGER_SESSION);
// 站点ID
int appId = this.getAppId(request);
int appId = BasicUtil.getAppId();
List<ColumnEntity> list = new ArrayList<ColumnEntity>();
// 判断管理员权限,查询其管理的栏目集合
list = columnBiz.queryAll(appId, this.getModelCodeId(request));
list = columnBiz.queryAll(appId, BasicUtil.getModelCodeId(net.mingsoft.cms.constant.ModelCode.CMS_COLUMN.toString()));
//查询当前栏目实体
ColumnEntity column = (ColumnEntity) columnBiz.getEntity(columnId);
model.addAttribute("appId",appId);
......@@ -211,7 +210,7 @@ public class ColumnAction extends BaseAction{
model.addAttribute("columnSuper", columnSuper);
model.addAttribute("listColumn", JSONArray.toJSONString(list));
model.addAttribute("model", "cms");
return view("/column/form");
return "/column/form";
}
/**
......@@ -222,9 +221,9 @@ public class ColumnAction extends BaseAction{
public void list(@ModelAttribute ColumnEntity column,HttpServletResponse response, HttpServletRequest request,ModelMap model) {
// 站点ID有session获取
int websiteId = this.getAppId(request);
int websiteId = BasicUtil.getAppId();
// 需要打开的栏目节点树的栏目ID
List list = columnBiz.queryAll(websiteId, this.getModelCodeId(request));
List list = columnBiz.queryAll(websiteId, BasicUtil.getModelCodeId(net.mingsoft.cms.constant.ModelCode.CMS_COLUMN.toString()));
EUListBean _list = new EUListBean(list, list.size());
this.outJson(response, net.mingsoft.base.util.JSONArray.toJSONString(_list));
}
......@@ -241,11 +240,11 @@ public class ColumnAction extends BaseAction{
if(!checkForm(column,response)){
return;
}
column.setCategoryAppId( this.getAppId(request));
column.setCategoryAppId( BasicUtil.getAppId());
column.setAppId(BasicUtil.getAppId());
column.setCategoryManagerId(getManagerBySession(request).getManagerId());
column.setCategoryDateTime(new Timestamp(System.currentTimeMillis()));
column.setCategoryModelId(this.getModelCodeId(request));
column.setCategoryModelId(BasicUtil.getModelCodeId(net.mingsoft.cms.constant.ModelCode.CMS_COLUMN.toString()));
if(column.getColumnType()==ColumnEntity.ColumnTypeEnum.COLUMN_TYPE_COVER.toInt()){
column.setColumnListUrl(null);
}
......@@ -264,7 +263,7 @@ public class ColumnAction extends BaseAction{
@ResponseBody
public void update(@ModelAttribute ColumnEntity column,HttpServletRequest request,HttpServletResponse response) {
//获取站点ID
int websiteId = this.getAppId(request);
int websiteId = BasicUtil.getAppId();
//检测栏目信息是否合法
if(!checkForm(column,response)){
return;
......@@ -278,7 +277,7 @@ public class ColumnAction extends BaseAction{
columnBiz.updateCategory(column);
this.columnPath(request,column);
//查询当前栏目是否有子栏目，
List<ColumnEntity> childList = columnBiz.queryChild(column.getCategoryId(), websiteId,this.getModelCodeId(request),null);
List<ColumnEntity> childList = columnBiz.queryChild(column.getCategoryId(), websiteId,BasicUtil.getModelCodeId(net.mingsoft.cms.constant.ModelCode.CMS_COLUMN.toString()),null);
if(childList != null && childList.size()>0){
//改变子栏目的顶级栏目ID为当前栏目的父级栏目ID
for(int i=0;i<childList.size();i++){
......
src/main/java/net/mingsoft/cms/action/GeneraterAction.java
View file @ ab6f0e31
......@@ -119,7 +119,7 @@ public class GeneraterAction extends BaseAction {
List<ColumnEntity> list = columnBiz.queryAll(websiteId, modelId);
model.addAttribute("list", JSONArray.toJSONString(list));
model.addAttribute("now", new Date());
return view("/cms/generate/index");
return "/cms/generate/index";
}
/**
......
src/main/java/net/mingsoft/cms/action/web/ArticleAction.java
View file @ ab6f0e31
......@@ -42,9 +42,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiOperation;
import net.mingsoft.base.filter.DateValueFilter;
import io.swagger.annotations.ApiOperation;
import net.mingsoft.base.filter.DateValueFilter;
import net.mingsoft.basic.action.BaseAction;
......
src/main/resources/application-dev.yml
View file @ ab6f0e31
spring:
datasource:
url: jdbc:mysql://localhost:3306/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
url: jdbc:mysql://localhost:3306/tag?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
username: root
password: root
filters: wall,mergeStat
......
src/main/webapp/templets/1/default/about.htm 0 → 100644
View file @ ab6f0e31
<!DOCTYPE html>
<html>
<head>
<#include "head-file.htm"/>
</head>
<body>
<#include "head.htm"/>
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}images/about_us.jpg) no-repeat center;">
<p class="banner_tit_about animated fadeInLeft">关于我们</p>
<p class="banner_tit_about_des animated fadeInRight">About us</p>
</div>
<div class="ms-content-about">
<div class="ms-content-main">
<#include "menu-left.htm"/>
<div class="ms-content-right">
<div class="ms-content-right-position">
<a href="{ms:global.host/}">首页</a>
<span>></span>
<a href="{ms:field.typelink/}">{ms:field.typetitle/}</a>
</div>
<div class="ms-content-right-main">
<div class="ms-content-right-main-title">{ms:field.title/}</div>
<div class="ms-content-right-main-content">{ms:field.content/}</div>
</div>
</div>
</div>
</div>
<#include "footer.htm"/>
</body>
</html>
\ No newline at end of file
src/main/webapp/templets/1/default/advice.htm 0 → 100644
View file @ ab6f0e31
<!DOCTYPE html>
<html>
<head>
<#include "head-file.htm"/>
</head>
<body>
<#include "head.htm"/>
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}images/talk_online.jpeg) no-repeat center;">
<p class="banner_tit_other animated fadeInLeft">在线留言</p>
<p class="banner_tit_other_des animated fadeInRight">Talk online</p>
</div>
<div class="ms-content-advice">
<div class="ms-content-form-background">
<form class="ms-content-form" method="post" id="postForm">
<input class="ms-content-form-name" type="text" name="name" placeholder="姓名">
<input class="ms-content-form-phone" type="text" name="phone" placeholder="手机">
<textarea class="ms-content-form-message" name="content" placeholder="留言"></textarea>
<div class="ms-login-button">提交</div>
</form>
</div>
</div>
<#include "footer.htm"/>
</body>
</html>
<script>
/* 表单提交 */
var flag = false;
$(".ms-login-button").click(function() {
if(!flag) {
$.ajax({
type: "POST",
url: "{ms:global.host/}/mdiy/diyForm/f2c131968438246e885e0feed7256dbc.do",
data: $("#postForm").serialize(),
success: function(msg) {
flag = true;
alert("提交成功");
location.reload();
}
});
} else {
alert("您已经提交过了！");
}
})
/* 表单验证 */
function verification() {
if($('input[name="name"]').val().length > 0 && $('input[name="phone"]').val().length > 0 && $('.ms-content-form-message').val().length > 0) {
$('.ms-login-button').css("background-color", "#009aff");
$('.ms-login-button').css("pointer-events", 'visible');
$('.ms-login-button').css("color", "#fff");
} else {
$('.ms-login-button').css("background-color", "#fafafa");
$('.ms-login-button').css('pointer-events', "none");
$('.ms-login-button').css("color", "#ddd");
}
}
$('input[name="name"]').keyup(function() {
verification();
})
$('input[name="phone"]').keyup(function() {
verification();
})
$('.ms-content-form-message').keyup(function() {
verification();
})
</script>
\ No newline at end of file
src/main/webapp/templets/1/default/case-list.htm 0 → 100644
View file @ ab6f0e31
<!DOCTYPE html>
<html>
<head>
<#include "head-file.htm"/>
</head>
<body>
<#include "head.htm"/>
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}images/00.png) no-repeat center;">
<p class="banner_tit_other animated fadeInLeft">案&nbsp;&nbsp;&nbsp;例</p>
<p class="banner_tit_other_des animated fadeInRight">Case list</p>
</div>
<div class="ms-content-case">
<div class="ms-content-main">
{ms:arclist size=6 ispaging=true}
<div class="ms-content-main-case">
<div class="ms-content-main-case-img">
<img src="{ms:global.host/}[field.litpic/]">
</div>
<div class="ms-content-main-case-explain">
<div class="ms-content-main-case-title">[field.title/]</div>
<div class="ms-content-main-case-content">
<p class="ms-content-main-case-written">
[field.content/]
</p>
<!-- <p class="ms-content-main-case-QRcode">
<img src="./images/1471918025445.png">
</p> -->
</div>
<div class="ms-content-main-case-click">
<a target="_blank" href="[field.source/]">点击查看</a>
</div>
</div>
</div>
{/ms:arclist}
</div>
</div>
<#include "footer.htm"/>
</body>
</html>
<script type="text/javascript">
$(function() {
$('.ms-content-main-case').hover(function() {
$(this).find('.ms-content-main-case-explain').toggle();
});
});
</script>
\ No newline at end of file
src/main/webapp/templets/1/default/contact.htm 0 → 100644
View file @ ab6f0e31
<!DOCTYPE html>
<html>
<head>
<#include "head-file.htm"/>
</head>
<body>
<#include "head.htm"/>
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/contact_us.jpeg) no-repeat center;">
<p class="banner_tit_other animated fadeInLeft" >联系我们</p>
<p class="banner_tit_other_des animated fadeInRight">Contact us</p>
</div>
<div class="ms-content-about">
<div class="ms-content-main">
<#include "menu-left.htm"/>
<div class="ms-content-right">
<div class="ms-content-right-position">
<a href="{ms:global.host/}">首页</a>
<span>></span>
<a href="{ms:field.typelink/}">{ms:field.typetitle/}</a>
</div>
<div class="ms-content-right-main">
<div class="ms-content-right-main-title">联系我们</div>
<div class="ms-content-right-main-content"><!-- {ms:field.content/} -->
<style type="text/css">
.BMap_Marker img{
width: 100%;
height: 100%;
}
html,body{margin:0;padding:0;}
.iw_poi_title {color:#CC5522;font-size:14px;font-weight:bold;overflow:hidden;padding-right:13px;white-space:nowrap}
.iw_poi_content {font:12px arial,sans-serif;overflow:visible;padding-top:4px;white-space:-moz-pre-wrap;word-wrap:break-word}
</style>
<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
<body>
<!--百度地图容器-->
<div style="width:100%;height:550px;border:#ccc solid 1px;" id="dituContent"></div>
</body>
<script type="text/javascript">
//创建和初始化地图函数：
function initMap(){
createMap();//创建地图
setMapEvent();//设置地图事件
addMapControl();//向地图添加控件
addMarker();//向地图中添加marker
}
//创建地图函数：
function createMap(){
var map = new BMap.Map("dituContent");//在百度地图容器中创建一个地图
var point = new BMap.Point(116.737158,29.153633);//定义一个中心点坐标
map.centerAndZoom(point,9);//设定地图的中心点和坐标并将地图显示在地图容器中
window.map = map;//将map变量存储在全局
}
//地图事件设置函数：
function setMapEvent(){
map.enableDragging();//启用地图拖拽事件，默认启用(可不写)
map.enableScrollWheelZoom();//启用地图滚轮放大缩小
map.enableDoubleClickZoom();//启用鼠标双击放大，默认启用(可不写)
map.enableKeyboard();//启用键盘上下左右键移动地图
}
//地图控件添加函数：
function addMapControl(){
//向地图中添加缩放控件
var ctrl_nav = new BMap.NavigationControl({anchor:BMAP_ANCHOR_TOP_LEFT,type:BMAP_NAVIGATION_CONTROL_LARGE});
map.addControl(ctrl_nav);
//向地图中添加缩略图控件
var ctrl_ove = new BMap.OverviewMapControl({anchor:BMAP_ANCHOR_BOTTOM_RIGHT,isOpen:1});
map.addControl(ctrl_ove);
//向地图中添加比例尺控件
var ctrl_sca = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});
map.addControl(ctrl_sca);
}
//标注点数组
var markerArr = [{title:"铭飞科技(景德镇)有限公司",content:"江西省景德镇市昌江区&nbsp;枫林佳苑&nbsp;15栋A区&nbsp;三单元&nbsp;302室",point:"117.187869|29.282949",isOpen:0,icon:{w:21,h:21,l:0,t:0,x:6,lb:5}}
,{title:"铭飞科技(南昌)办事处",content:"江西省南昌市青山湖区创新一路&nbsp;绿地新都会(西门)&nbsp;12栋2单元901室",point:"116.003117|28.683521",isOpen:0,icon:{w:21,h:21,l:0,t:0,x:6,lb:5}}
];
//创建marker
function addMarker(){
for(var i=0;i<markerArr.length;i++){
var json = markerArr[i];
var p0 = json.point.split("|")[0];
var p1 = json.point.split("|")[1];
var point = new BMap.Point(p0,p1);
var iconImg = createIcon(json.icon);
var marker = new BMap.Marker(point,{icon:iconImg});
var iw = createInfoWindow(i);
var label = new BMap.Label(json.title,{"offset":new BMap.Size(json.icon.lb-json.icon.x+10,-20)});
marker.setLabel(label);
map.addOverlay(marker);
label.setStyle({
borderColor:"#808080",
color:"#333",
cursor:"pointer"
});
(function(){
var index = i;
var _iw = createInfoWindow(i);
var _marker = marker;
_marker.addEventListener("click",function(){
this.openInfoWindow(_iw);
});
_iw.addEventListener("open",function(){
_marker.getLabel().hide();
})
_iw.addEventListener("close",function(){
_marker.getLabel().show();
})
label.addEventListener("click",function(){
_marker.openInfoWindow(_iw);
})
if(!!json.isOpen){
label.hide();
_marker.openInfoWindow(_iw);
}
})()
}
}
//创建InfoWindow
function createInfoWindow(i){
var json = markerArr[i];
var iw = new BMap.InfoWindow("<b class='iw_poi_title' title='" + json.title + "'>" + json.title + "</b><div class='iw_poi_content'>"+json.content+"</div>");
return iw;
}
//创建一个Icon
function createIcon(json){
var icon = new BMap.Icon("{ms:global.host/}/{ms:global.style/}/images/img-2.png", new BMap.Size(json.w,json.h),{imageOffset: new BMap.Size(-json.l,-json.t),infoWindowOffset:new BMap.Size(json.lb+5,1),offset:new BMap.Size(json.x,json.h)})
return icon;
}
initMap();//创建和初始化地图
</script>
</div>
</div>
</div>
</div>
</div>
<#include "footer.htm"/>
</body>
</html>
\ No newline at end of file
src/main/webapp/templets/1/default/css/animate.css 0 → 100644
View file @ ab6f0e31
This diff is collapsed.
src/main/webapp/templets/1/default/css/jquery.sinaemotion.css 0 → 100644
View file @ ab6f0e31
#emotions{
left:0;
width: 395px;
font-size:12px;
background:#fff;
position:absolute;
border: 1px solid #E8E8E8;
}
#emotions a{
color: #9ABBC8;
padding:2px 7px;
text-decoration:none;
}
#emotions img{
border:0;
}
#emotions div{
margin:5px 10px;
padding:1px;
overflow: hidden;
}
#emotions #prev,
#emotions #next
{
margin-left:3px;
background:#eee;
}
#emotions .categorys{
color:#ccc;
height:23px;
color: #9ABBC8;
overflow:hidden;
}
#emotions .categorys a{
display: inline-block;
}
#emotions .categorys a:hover{
text-decoration:underline;
}
#emotions .categorys a.current{
cursor: default;
background: #F0F0F0;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
}
#emotions .container{
padding:1px;
overflow: hidden;
}
#emotions .container a{
float:left;
width:26px;
height:22px;
text-align:center;
box-sizing: content-box;
padding: 4px 2px;
margin: -1px 0 0 -1px;
border: 1px solid #e8e8e8;
}
#emotions .container a:hover{
z-index:2;
position:relative;
border:1px solid #0095cd;
}
#emotions .page{
text-align:right;
}
#emotions .page a.current{
color: #666;
background-color:#fff;
}
#emotions .page a{
margin-left:3px;
color: #0078B6;
background-color:#f3f3f3;
}
#emotions .page a:hover{
background-color:#e7e7e7;
}
\ No newline at end of file
src/main/webapp/templets/1/default/footer.htm 0 → 100644
View file @ ab6f0e31
<div class="ms-footer">
<div class="ms-footer-content">
<div class="ms-footer-left">
<div class="ms-footer-left-column">
<span class="ms-footer-left-column-about">
<a href='{ms:global.url/}/53/index.html'>关于我们</a>
</span>|
<span class="ms-footer-left-column-course">
<a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#faz'>发展历程</a>
</span>|
<span class="ms-footer-left-column-contact">
<a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#lianx'>联系我们</a>
</span>
</div>
<span class="ms-footer-left-copyright">版权所有&copy;铭飞科技有限公司2012-2018保留一切权利</span>
</div>
<div class="ms-footer-right">
<img class='ms-footer-right-img-weixin' src="{ms:global.host/}/{ms:global.style/}/images/we-chat.png">
<a target="_blank" href='http://tieba.baidu.com/f?kw=%E9%93%AD%E9%A3%9E%E7%A7%91%E6%8A%80&fr=index&fp=0&ie=utf-8'><img class="ms-footer-right-baidu" src="{ms:global.host/}/{ms:global.style/}/images/baidu.png"></a>
<a target="_blank" href='http://weibo.com/killfen'><img src="{ms:global.host/}/{ms:global.style/}/images/micro-blog.png"></a>
<div class="ms-footer-right-weixin">
<p></p>
<img alt="" src="{ms:global.host/}/{ms:global.style/}/images/weixin.jpg">
</div>
</div>
</div>
</div>
<script>
/*导航下拉*/
$(function(){
$(".head-menu-list-li").hover(function(){
$(this).find(".head-menu-son-list").fadeToggle();
});
$('.ms-footer-right-img-weixin').hover(function(){
$('.ms-footer-right-weixin').toggle();
});
});
</script>
\ No newline at end of file
src/main/webapp/templets/1/default/head-file.htm 0 → 100644
View file @ ab6f0e31
<title>{ms:global.name/}</title>
<meta charset="utf-8">
<link rel="stylesheet" type="text/css" href="http://cdn.mingsoft.net/plugins/iconfont/1.0.0/iconfont.css" />
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/base.less">
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/index.less">
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/advice.less">
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/case-list.less">
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/about.less">
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/news-list.less">
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/news-show.less">
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/center.less">
<script src="http://cdn.mingsoft.net/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
<script src="{ms:global.host/}/{ms:global.style/}/js/slider.js"></script>
<script src="http://cdn.mingsoft.net/plugins/less/2.5.3/less.min.js"></script>
<script src="http://cdn.mingsoft.net/plugins/seajs/3.0.0/sea.js"></script>
<script src="http://cdn.mingsoft.net/model/1.0.0/main.min.js"></script>
<!--vue-懒加载-表单验证-->
<script src="http://cdn.mingsoft.net/plugins/vue/2.3.3/vue.min.js"></script>
<script src="http://cdn.mingsoft.net/plugins/validator/5.5.0/validator.min.js"></script>
<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/animate.css">
<script>
ms.config({
base: "{ms:global.host/}",
filter: {
people: {
loginUrl: '{ms:global.host/}'
}
}
});
</script>
\ No newline at end of file
src/main/webapp/templets/1/default/head.htm 0 → 100644
View file @ ab6f0e31
<div class="ms-head">
<div class="head-menu">
<div class="head-men-left head-menu-flex-center">
<a href="{ms:global.host/}">
<img src="http://cdn.mingsoft.net/images/logo.png" />
</a>
<ul class="head-menu-list">
<li class="head-menu-list-li">走进铭飞
<ul class="head-menu-son-list">
<li>
<a target="_blank" href='{ms:global.url/}/53/index.html'>关于我们</a>
</li>
<li>
<a target="_blank" href='{ms:global.url/}/59/index.html'>公司动态</a>
</li>
<li>
<a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#faz'>发展历程</a>
</li>
<li>
<a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#lianx'>加入我们</a>
</li>
<li>
<a target="_blank" href='{ms:global.url/}/19/141/index.html'>联系我们</a>
</li>
</ul>
</li>
<li class="head-menu-list-li">
<a href='{ms:global.url/}/149/index.html'>案例</a>
</li>
<li class="head-menu-list-li">
<a target="_blank" href='http://mstore.mingsoft.net/mstoreShow.do'>插件&模板</a>
<!-- <ul class="head-menu-son-list">
<li><a href='http://mstore.mingsoft.net/mstoreShow.do'>模板</a></li>
<li><a href='http://mstore.mingsoft.net/mstoreShow.do'>插件</a></li>
</ul> -->
</li>
<li class="head-menu-list-li">
<a target="_blank" href='{ms:global.url/}/19/142/index.html'>在线留言</a>
</li>
<li class="head-menu-list-li">技术支持
<ul class="head-menu-son-list">
<li>
<a target="_blank" href='http://bbs.mingsoft.net/mbbs/main.do'>开源社区</a>
</li>
<li>
<a target="_blank" href='https://gitee.com/mingSoft/MCMS'>源码下载</a>
</li>
<li>
<a target="_blank" href='http://doc.ms.mingsoft.net/plugs-cms/'>使用手册</a>
</li>
</ul>
</li>
</ul>
</div>
<div class="head-men-right head-menu-flex-center">
<div class="head-menu-flex-center head-menu-right-search">
<form id="searchDataForm" action="{ms:global.host/}/cms/1/search.do" method="post">
<input type="text" class='ms-search-input' name="basic_title" placeholder="请输入关键字">
<!-- <i class="iconfont ms-search-click">&#xe85e;</i> -->
<input type="submit" value="" class="ms-search-click">
</form>
</div>
<div class="head-menu-right-content" id="ms-login-vue">
<span v-show="!isLogin" style="display: none;">
<span>
<a href='{ms:global.host/}/login.html'>登录</a>
</span>|<span><a href='{ms:global.host/}/register.html'>注册</a></span>
</span>
<div class="topbar-info J_userInfo loginSuccess hide-default" v-show="isLogin" style="display: none;">
<a class="user-name" href="{ms:global.host/}/people/center.do">
<img :src="'{ms:global.host/}'+ peopleInfo.puIcon" class="loginImg user_icon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'">
<b class="userName ms-userName" v-text="peopleInfo.puNickname"></b>
</a>
<a href="javascript:;" class="quitLogin" @click="quitLogin">退出</a>
</div>
</div>
</div>
</div>
</div>
<script>
var headVue = new Vue({
el: "#ms-login-vue",
data: {
isLogin: undefined, //登录状态
peopleInfo: "", //个人信息
},
mounted: function() {
//获取个人信息
var target = this;
$.ajax({
type: "POST",
url: "{ms:global.host/}/checkLoginStatus.do",
success: function(msg) {
target.isLogin = msg.result;
if(msg.result) {
$.ajax({
type: "POST",
url: "{ms:global.host/}/people/user/info.do",
success: function(msg) {
target.peopleInfo = msg;
}
})
}
}
})
},
methods: {
//退出登录
quitLogin: function() {
var target = this;
$.ajax({
type: "POST",
url: "{ms:global.host/}/people/quit.do",
success: function(msg) {
if(msg.result) {
$("body").append("<form id='msHeadForm' action=''></form>");
$("#msHeadForm").attr("action", "{ms:global.host/}").submit();
}
}
})
},
},
})
/* $(function(){
var r=location.href;
if(r.match("53")){
$(".head-menu-list-li").removeClass("head-active");
$(".head-menu-list-li").eq(0).addClass("head-active");
}else if(r.match("141")){
$(".head-menu-list-li").removeClass("head-active");
$(".head-menu-list-li").eq(0).addClass("head-active");
}else if(r.match("59")){
$(".head-menu-list-li").removeClass("head-active");
$(".head-menu-list-li").eq(0).addClass("head-active");
}else if(r.match("155")){
$(".head-menu-list-li").removeClass("head-active");
$(".head-menu-list-li").eq(1).addClass("head-active");
}else if(r.match("142")){
$(".head-menu-list-li").removeClass("head-active");
$(".head-menu-list-li").eq(3).addClass("head-active");
}
}) */
</script>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment