Skip to content

C
cms_sys
Commit e4f6f467 authored by sgjj's avatar sgjj
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 8bb777f9 26deb589
Expand all Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 589 deletions
pom.xml
View file @ e4f6f467
......@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.mingsoft</groupId>
<artifactId>mcms</artifactId>
<version>4.7.2</version>
<version>5.0.0-SNAPSHOT</version>
<name>ms-mcms</name>
<properties>
<java.version>1.8</java.version>
......@@ -35,27 +35,12 @@
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-basic</artifactId>
<version>1.0.17-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-mdiy</artifactId>
<version>1.0.12-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-mpeople</artifactId>
<version>1.0.11</version>
</dependency>
<!-- 此部分是铭飞平台MStroe的客户端（MStore不在铭飞开源产品范围），如果不需要使用MStore可以删除掉 -->
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-upgrader</artifactId>
<version>1.0.13</version>
<version>1.0.13-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<finalName>ms-mcms</finalName>
......
src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
View file @ e4f6f467
......@@ -417,7 +417,7 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
//读取模板的分页数量
int size = BasicUtil.getInt(ParserUtil.SIZE,10);
try {
size = TagParser.getPageSize(ParserUtil.read(ParserUtil.SEARCH+ParserUtil.HTM_SUFFIX,false ));
size = TagParser.getPageSize(ParserUtil.read(SEARCH+ParserUtil.HTM_SUFFIX,false ));
} catch (TemplateNotFoundException e1) {
e1.printStackTrace();
} catch (MalformedTemplateNameException e1) {
......@@ -471,7 +471,7 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
String content = "";
try {
//根据模板路径，参数生成
content = CmsParserUtil.generate(ParserUtil.SEARCH+ParserUtil.HTM_SUFFIX,map, isMobileDevice(request));
content = CmsParserUtil.generate(SEARCH+ParserUtil.HTM_SUFFIX,map, isMobileDevice(request));
} catch (TemplateNotFoundException e) {
e.printStackTrace();
} catch (MalformedTemplateNameException e) {
......
src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java
View file @ e4f6f467
......@@ -21,7 +21,7 @@ public interface ICategoryBiz extends IBaseBiz {
*/
List<CategoryEntity> queryChilds(CategoryEntity category);
int saveEntity(CategoryEntity entity);
void saveEntity(CategoryEntity entity);
void updateEntity(CategoryEntity entity);
}
\ No newline at end of file
src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java
View file @ e4f6f467
......@@ -62,10 +62,19 @@ public class CategoryBizImpl extends BaseBizImpl implements ICategoryBiz {
return categoryDao.queryChildren(category);
}
@Override
public int saveEntity(CategoryEntity categoryEntity) {
public void saveEntity(CategoryEntity categoryEntity) {
// TODO Auto-generated method stub
setParentId(categoryEntity);
return super.saveEntity(categoryEntity);
super.saveEntity(categoryEntity);
//保存链接地址
String path=ObjectUtil.isNotNull(categoryEntity.getCategoryParentId())?categoryEntity.getCategoryParentId():"";
//判断是否有parentIds
if(StringUtils.isNotBlank(path)){
categoryEntity.setCategoryPath("/" + path.replaceAll(",", "/") + "/" + categoryEntity.getId());
} else {
categoryEntity.setCategoryPath("/" + categoryEntity.getId());
}
super.updateEntity(categoryEntity);
}
private void setParentId(CategoryEntity categoryEntity) {
......@@ -79,8 +88,16 @@ public class CategoryBizImpl extends BaseBizImpl implements ICategoryBiz {
}else {
categoryEntity.setCategoryParentId(null);
}
String path=ObjectUtil.isNotNull(categoryEntity.getCategoryParentId())?categoryEntity.getCategoryParentId():"";
categoryEntity.setCategoryPath("/"+path.replaceAll(",","/")+"/"+categoryEntity.getId());
//保存时先保存再修改链接地址，修改时直接修改
if(StringUtils.isNotBlank(categoryEntity.getId())) {
String path = ObjectUtil.isNotNull(categoryEntity.getCategoryParentId()) ? categoryEntity.getCategoryParentId() : "";
//判断是否有parentIds
if(StringUtils.isNotBlank(path)){
categoryEntity.setCategoryPath("/" + path.replaceAll(",", "/") + "/" + categoryEntity.getId());
} else {
categoryEntity.setCategoryPath("/" + categoryEntity.getId());
}
}
}
private void setChildParentId(CategoryEntity categoryEntity) {
......@@ -94,7 +111,12 @@ public class CategoryBizImpl extends BaseBizImpl implements ICategoryBiz {
x.setCategoryParentId(categoryEntity.getCategoryParentId()+","+categoryEntity.getId());
}
String path=ObjectUtil.isNotNull(x.getCategoryParentId())?x.getCategoryParentId():"";
//判断是否有parentIds
if(StringUtils.isNotBlank(path)){
x.setCategoryPath("/"+path.replaceAll(",","/")+"/"+x.getId());
} else {
x.setCategoryPath("/"+x.getId());
}
super.updateEntity(x);
setChildParentId(x);
});
......
src/main/webapp/WEB-INF/manager/cms/category/form.ftl
View file @ e4f6f467
......@@ -270,7 +270,7 @@
var that = this;
ms.http.get(ms.manager + "/mdiy/model/list.do",{modelType:'zdymx_wz'}).then(
function (data) {
that.mdiyModelIdOptions = data.rows;
that.mdiyModelIdOptions = data.data.rows;
}).catch(function (err) {
console.log(err);
});
......@@ -298,7 +298,7 @@
categoryListUrlOptionsGet() {
var that = this;
ms.http.get(ms.manager+"/template/queryTemplateFileForColumn.do", {}).then(function (data) {
that.categoryListUrlOptions = data;
that.categoryListUrlOptions = data.data;
}).catch(function (err) {
console.log(err);
});
......@@ -307,7 +307,7 @@
categoryUrlOptionsGet() {
var that = this;
ms.http.get(ms.manager+"/template/queryTemplateFileForColumn.do", {}).then(function (data) {
that.categoryUrlOptions = data;
that.categoryUrlOptions = data.data;
}).catch(function (err) {
console.log(err);
});
......
src/main/webapp/WEB-INF/manager/cms/category/index.ftl
View file @ e4f6f467
......@@ -30,6 +30,7 @@
{{emptyText}}
</template>
<el-table-column type="selection" width="40"></el-table-column>
<el-table-column label="编号" width="60" prop="id"></el-table-column>
<el-table-column label="标题" align="left" prop="categoryTitle">
</el-table-column>
<el-table-column label="属性" align="center" prop="categoryType" :formatter="categoryTypeFormat" width="65">
......
src/main/webapp/WEB-INF/manager/cms/content/main.ftl
View file @ e4f6f467
......@@ -60,6 +60,7 @@
{{emptyText}}
</template>
<el-table-column type="selection" width="40"></el-table-column>
<el-table-column label="编号" width="60" prop="id"></el-table-column>
<el-table-column label="栏目名" align="left" prop="contentCategoryId" :formatter="contentCategoryIdFormat" width="100">
</el-table-column>
<el-table-column label="文章标题" align="left" prop="contentTitle" show-overflow-tooltip>
......
src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
View file @ e4f6f467
......@@ -207,7 +207,7 @@
templateOptionsGet() {
var that = this;
ms.http.get(ms.manager+'/template/queryTemplateFileForColumn.do', {pageSize:99999}).then(function (data) {
that.templateOptions = data;
that.templateOptions = data.data;
}).catch(function (err) {
console.log(err);
});
......
src/main/webapp/static/ms-admin/4.7.2/css/index.css
View file @ e4f6f467
......@@ -133,6 +133,7 @@ textarea::-webkit-input-placeholder {
}
.el-submenu .el-menu-item.is-active {
border-radius: 4px;
opacity:1.0;
}
.el-card,
.el-message {
......@@ -156,11 +157,12 @@ textarea::-webkit-input-placeholder {
.ms-admin-header {
display: flex;
padding: 0;
background-color: #0099ff;
background-color: rgba(255,255,255,1);
height: 50px !important;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
z-index: 1;
}
.ms-admin-header .ms-admin-header-menu {
background-color: #0099ff;
border-bottom: none;
position: relative;
}
......@@ -168,19 +170,17 @@ textarea::-webkit-input-placeholder {
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item {
height: 50px !important;
line-height: 50px !important;
background-color: #0099ff !important;
color: rgba(255, 255, 255, 0.65) !important;
border-bottom: none !important;
font-size: 1em;
}
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item > *:hover,
/*.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item > *:hover,
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item:hover {
color: #fff !important;
}
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item > *.is-active,
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item.is-active {
color: #fff !important;
}
}*/
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu {
padding: 0;
user-select: none;
......@@ -196,8 +196,7 @@ textarea::-webkit-input-placeholder {
top: 0;
z-index: 9;
background: #ffffff;
border: 1px solid #e6e6e6;
box-shadow: 2px 3px 5px 0.1px rgba(0, 0, 0, 0.1);
box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
}
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu > li {
margin: 0;
......@@ -215,7 +214,7 @@ textarea::-webkit-input-placeholder {
cursor: pointer;
color: #0099ff;
}
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu i {
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu .ms-admin-shortcut-menu-shrink {
position: absolute;
top: 18px;
right: 19px;
......@@ -223,19 +222,17 @@ textarea::-webkit-input-placeholder {
font-size: 14px;
color: #333;
}
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu i:hover {
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu .ms-admin-shortcut-menu-shrink:hover {
cursor: pointer;
}
.ms-admin-logo {
min-width: 200px;
width: 200px;
display: flex;
align-items: center;
overflow: hidden;
}
.ms-admin-logo > img {
padding: 20px 0 20px 20px;
width: 80px;
padding: 14px 0;
width: 50px;
}
.ms-admin-logo > div {
display: flex;
......@@ -250,6 +247,8 @@ textarea::-webkit-input-placeholder {
position: absolute;
margin-left: 10px;
font-size: 12px;
color:rgba(0,153,255,1);
}
.ms-admin-logo .iconfont {
color: #fff;
......@@ -257,6 +256,9 @@ textarea::-webkit-input-placeholder {
margin-right: 20px;
cursor: pointer;
}
.ms-admin-logo-pack{
width: 64px!important;
}
.ms-admin-mstore {
margin-left: auto;
min-width: 200px;
......@@ -274,8 +276,8 @@ textarea::-webkit-input-placeholder {
display: flex;
align-items: center;
justify-content: center;
background: #fff;
color: #0099ff;
background: #0099ff;
color: #fff;
}
.ms-admin-mstore .ms-admin-mstore-icon {
min-width: 50px;
......@@ -284,7 +286,6 @@ textarea::-webkit-input-placeholder {
background-color: #0080FF;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
}
.ms-admin-mstore .ms-admin-mstore-icon span {
......@@ -328,7 +329,7 @@ textarea::-webkit-input-placeholder {
margin-right: 8px;
}
.ms-admin-login > span span {
color: #fff;
color: #333333;
}
.ms-admin-login .active {
background: #fff;
......@@ -338,7 +339,7 @@ textarea::-webkit-input-placeholder {
color: #fff;
}
.ms-admin-login .active span {
color: #333;
color: #409EFF;
}
.ms-admin-login-down {
width: 130px;
......@@ -353,7 +354,7 @@ textarea::-webkit-input-placeholder {
display: none;
}
.ms-admin-menu-aside {
width: 200px !important;
width: auto !important;
height: 100%;
position: relative;
overflow: visible;
......@@ -414,11 +415,12 @@ textarea::-webkit-input-placeholder {
width: 60px !important;
}
.ms-admin-container {
height: calc(100vh - 60px);
height:auto;
}
.ms-admin-container > .ms-admin-main {
padding: 0;
background-color: #fff;
z-index: 0;
}
.ms-admin-container > .ms-admin-main .ms-admin-tabs {
height: 100%;
......
src/main/webapp/static/ms-admin/4.7.2/iconfont/demo.css deleted 100644 → 0
View file @ 8bb777f9
/* Logo 字体 */
@font-face {
font-family: "iconfont logo";
src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
}
.logo {
font-family: "iconfont logo";
font-size: 160px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
/* tabs */
.nav-tabs {
position: relative;
}
.nav-tabs .nav-more {
position: absolute;
right: 0;
bottom: 0;
height: 42px;
line-height: 42px;
color: #666;
}
#tabs {
border-bottom: 1px solid #eee;
}
#tabs li {
cursor: pointer;
width: 100px;
height: 40px;
line-height: 40px;
text-align: center;
font-size: 16px;
border-bottom: 2px solid transparent;
position: relative;
z-index: 1;
margin-bottom: -1px;
color: #666;
}
#tabs .active {
border-bottom-color: #f00;
color: #222;
}
.tab-container .content {
display: none;
}
/* 页面布局 */
.main {
padding: 30px 100px;
width: 960px;
margin: 0 auto;
}
.main .logo {
color: #333;
text-align: left;
margin-bottom: 30px;
line-height: 1;
height: 110px;
margin-top: -50px;
overflow: hidden;
*zoom: 1;
}
.main .logo a {
font-size: 160px;
color: #333;
}
.helps {
margin-top: 40px;
}
.helps pre {
padding: 20px;
margin: 10px 0;
border: solid 1px #e7e1cd;
background-color: #fffdef;
overflow: auto;
}
.icon_lists {
width: 100% !important;
overflow: hidden;
*zoom: 1;
}
.icon_lists li {
width: 100px;
margin-bottom: 10px;
margin-right: 20px;
text-align: center;
list-style: none !important;
cursor: default;
}
.icon_lists li .code-name {
line-height: 1.2;
}
.icon_lists .icon {
display: block;
height: 100px;
line-height: 100px;
font-size: 42px;
margin: 10px auto;
color: #333;
-webkit-transition: font-size 0.25s linear, width 0.25s linear;
-moz-transition: font-size 0.25s linear, width 0.25s linear;
transition: font-size 0.25s linear, width 0.25s linear;
}
.icon_lists .icon:hover {
font-size: 100px;
}
.icon_lists .svg-icon {
/* 通过设置 font-size 来改变图标大小 */
width: 1em;
/* 图标和文字相邻时，垂直对齐 */
vertical-align: -0.15em;
/* 通过设置 color 来改变 SVG 的颜色/fill */
fill: currentColor;
/* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
normalize.css 中也包含这行 */
overflow: hidden;
}
.icon_lists li .name,
.icon_lists li .code-name {
color: #666;
}
/* markdown 样式 */
.markdown {
color: #666;
font-size: 14px;
line-height: 1.8;
}
.highlight {
line-height: 1.5;
}
.markdown img {
vertical-align: middle;
max-width: 100%;
}
.markdown h1 {
color: #404040;
font-weight: 500;
line-height: 40px;
margin-bottom: 24px;
}
.markdown h2,
.markdown h3,
.markdown h4,
.markdown h5,
.markdown h6 {
color: #404040;
margin: 1.6em 0 0.6em 0;
font-weight: 500;
clear: both;
}
.markdown h1 {
font-size: 28px;
}
.markdown h2 {
font-size: 22px;
}
.markdown h3 {
font-size: 16px;
}
.markdown h4 {
font-size: 14px;
}
.markdown h5 {
font-size: 12px;
}
.markdown h6 {
font-size: 12px;
}
.markdown hr {
height: 1px;
border: 0;
background: #e9e9e9;
margin: 16px 0;
clear: both;
}
.markdown p {
margin: 1em 0;
}
.markdown>p,
.markdown>blockquote,
.markdown>.highlight,
.markdown>ol,
.markdown>ul {
width: 80%;
}
.markdown ul>li {
list-style: circle;
}
.markdown>ul li,
.markdown blockquote ul>li {
margin-left: 20px;
padding-left: 4px;
}
.markdown>ul li p,
.markdown>ol li p {
margin: 0.6em 0;
}
.markdown ol>li {
list-style: decimal;
}
.markdown>ol li,
.markdown blockquote ol>li {
margin-left: 20px;
padding-left: 4px;
}
.markdown code {
margin: 0 3px;
padding: 0 5px;
background: #eee;
border-radius: 3px;
}
.markdown strong,
.markdown b {
font-weight: 600;
}
.markdown>table {
border-collapse: collapse;
border-spacing: 0px;
empty-cells: show;
border: 1px solid #e9e9e9;
width: 95%;
margin-bottom: 24px;
}
.markdown>table th {
white-space: nowrap;
color: #333;
font-weight: 600;
}
.markdown>table th,
.markdown>table td {
border: 1px solid #e9e9e9;
padding: 8px 16px;
text-align: left;
}
.markdown>table th {
background: #F7F7F7;
}
.markdown blockquote {
font-size: 90%;
color: #999;
border-left: 4px solid #e9e9e9;
padding-left: 0.8em;
margin: 1em 0;
}
.markdown blockquote p {
margin: 0;
}
.markdown .anchor {
opacity: 0;
transition: opacity 0.3s ease;
margin-left: 8px;
}
.markdown .waiting {
color: #ccc;
}
.markdown h1:hover .anchor,
.markdown h2:hover .anchor,
.markdown h3:hover .anchor,
.markdown h4:hover .anchor,
.markdown h5:hover .anchor,
.markdown h6:hover .anchor {
opacity: 1;
display: inline-block;
}
.markdown>br,
.markdown>p>br {
clear: both;
}
.hljs {
display: block;
background: white;
padding: 0.5em;
color: #333333;
overflow-x: auto;
}
.hljs-comment,
.hljs-meta {
color: #969896;
}
.hljs-string,
.hljs-variable,
.hljs-template-variable,
.hljs-strong,
.hljs-emphasis,
.hljs-quote {
color: #df5000;
}
.hljs-keyword,
.hljs-selector-tag,
.hljs-type {
color: #a71d5d;
}
.hljs-literal,
.hljs-symbol,
.hljs-bullet,
.hljs-attribute {
color: #0086b3;
}
.hljs-section,
.hljs-name {
color: #63a35c;
}
.hljs-tag {
color: #333333;
}
.hljs-title,
.hljs-attr,
.hljs-selector-id,
.hljs-selector-class,
.hljs-selector-attr,
.hljs-selector-pseudo {
color: #795da3;
}
.hljs-addition {
color: #55a532;
background-color: #eaffea;
}
.hljs-deletion {
color: #bd2c00;
background-color: #ffecec;
}
.hljs-link {
text-decoration: underline;
}
/* 代码高亮 */
/* PrismJS 1.15.0
https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
/**
* prism.js default theme for JavaScript, CSS and HTML
* Based on dabblet (http://dabblet.com)
* @author Lea Verou
*/
code[class*="language-"],
pre[class*="language-"] {
color: black;
background: none;
text-shadow: 0 1px white;
font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
text-align: left;
white-space: pre;
word-spacing: normal;
word-break: normal;
word-wrap: normal;
line-height: 1.5;
-moz-tab-size: 4;
-o-tab-size: 4;
tab-size: 4;
-webkit-hyphens: none;
-moz-hyphens: none;
-ms-hyphens: none;
hyphens: none;
}
pre[class*="language-"]::-moz-selection,
pre[class*="language-"] ::-moz-selection,
code[class*="language-"]::-moz-selection,
code[class*="language-"] ::-moz-selection {
text-shadow: none;
background: #b3d4fc;
}
pre[class*="language-"]::selection,
pre[class*="language-"] ::selection,
code[class*="language-"]::selection,
code[class*="language-"] ::selection {
text-shadow: none;
background: #b3d4fc;
}
@media print {
code[class*="language-"],
pre[class*="language-"] {
text-shadow: none;
}
}
/* Code blocks */
pre[class*="language-"] {
padding: 1em;
margin: .5em 0;
overflow: auto;
}
:not(pre)>code[class*="language-"],
pre[class*="language-"] {
background: #f5f2f0;
}
/* Inline code */
:not(pre)>code[class*="language-"] {
padding: .1em;
border-radius: .3em;
white-space: normal;
}
.token.comment,
.token.prolog,
.token.doctype,
.token.cdata {
color: slategray;
}
.token.punctuation {
color: #999;
}
.namespace {
opacity: .7;
}
.token.property,
.token.tag,
.token.boolean,
.token.number,
.token.constant,
.token.symbol,
.token.deleted {
color: #905;
}
.token.selector,
.token.attr-name,
.token.string,
.token.char,
.token.builtin,
.token.inserted {
color: #690;
}
.token.operator,
.token.entity,
.token.url,
.language-css .token.string,
.style .token.string {
color: #9a6e3a;
background: hsla(0, 0%, 100%, .5);
}
.token.atrule,
.token.attr-value,
.token.keyword {
color: #07a;
}
.token.function,
.token.class-name {
color: #DD4A68;
}
.token.regex,
.token.important,
.token.variable {
color: #e90;
}
.token.important,
.token.bold {
font-weight: bold;
}
.token.italic {
font-style: italic;
}
.token.entity {
cursor: help;
}
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.css
View file @ e4f6f467
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.svg
View file @ e4f6f467
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
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