Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
MCMS
Commits
17f5ad42
Commit
17f5ad42
authored
Jan 20, 2020
by
huise
Browse files
修复主页生成问题
parent
ba09b022
Changes
4
Show whitespace changes
Inline
Side-by-side
src/main/java/net/mingsoft/cms/action/GeneraterAction.java
View file @
17f5ad42
...
@@ -24,7 +24,6 @@ package net.mingsoft.cms.action;
...
@@ -24,7 +24,6 @@ package net.mingsoft.cms.action;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.bean.copier.CopyOptions
;
import
cn.hutool.core.bean.copier.CopyOptions
;
import
cn.hutool.core.io.FileUtil
;
import
cn.hutool.core.io.FileUtil
;
import
net.mingsoft.basic.action.BaseAction
;
import
net.mingsoft.basic.biz.IModelBiz
;
import
net.mingsoft.basic.biz.IModelBiz
;
import
net.mingsoft.basic.entity.AppEntity
;
import
net.mingsoft.basic.entity.AppEntity
;
import
net.mingsoft.basic.util.BasicUtil
;
import
net.mingsoft.basic.util.BasicUtil
;
...
...
src/main/java/net/mingsoft/cms/resources/resources.properties
View file @
17f5ad42
...
@@ -33,3 +33,4 @@ category.id=\u6240\u5C5E\u680F\u76EE
...
@@ -33,3 +33,4 @@ category.id=\u6240\u5C5E\u680F\u76EE
content.sort
=
\u
81EA
\u
5B9A
\u
4E49
\u
987A
\u
5E8F
content.sort
=
\u
81EA
\u
5B9A
\u
4E49
\u
987A
\u
5E8F
category.diy.url
=
\u
81EA
\u
5B9A
\u
4E49
\u
94FE
\u
63A5
category.diy.url
=
\u
81EA
\u
5B9A
\u
4E49
\u
94FE
\u
63A5
content.keyword
=
\u5173\u
952E
\u
5B57
content.keyword
=
\u5173\u
952E
\u
5B57
templet.file
=
\u
672A
\u
627E
\u5230\u
6A21
\u
677F
\u6587\u
4EF6
src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties
View file @
17f5ad42
...
@@ -33,3 +33,4 @@ category.id=\u6240\u5C5E\u680F\u76EE
...
@@ -33,3 +33,4 @@ category.id=\u6240\u5C5E\u680F\u76EE
content.sort
=
\u
81EA
\u
5B9A
\u
4E49
\u
987A
\u
5E8F
content.sort
=
\u
81EA
\u
5B9A
\u
4E49
\u
987A
\u
5E8F
category.diy.url
=
\u
81EA
\u
5B9A
\u
4E49
\u
94FE
\u
63A5
category.diy.url
=
\u
81EA
\u
5B9A
\u
4E49
\u
94FE
\u
63A5
content.keyword
=
\u5173\u
952E
\u
5B57
content.keyword
=
\u5173\u
952E
\u
5B57
templet.file
=
\u
672A
\u
627E
\u5230\u
6A21
\u
677F
\u6587\u
4EF6
src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
View file @
17f5ad42
...
@@ -128,7 +128,7 @@
...
@@ -128,7 +128,7 @@
homeLoading
:
false
,
homeLoading
:
false
,
articleLoading
:
false
,
articleLoading
:
false
,
columnLoading
:
false
,
columnLoading
:
false
,
template
:
'
index
.htm
'
,
//主题模板
template
:
''
,
//主题模板
templateOptions
:
[]
,
templateOptions
:
[]
,
position
:
'
index
'
,
//位置
position
:
'
index
'
,
//位置
contentSection
:
'
0
'
,
//文章栏目
contentSection
:
'
0
'
,
//文章栏目
...
@@ -205,6 +205,12 @@
...
@@ -205,6 +205,12 @@
var
that
=
this
;
var
that
=
this
;
ms
.http.get
(
ms
.manager
+'/
template
/
queryTemplateFileForColumn
.do
'
,
{
pageSize
:
99999
})
.then
(
function
(
data
)
{
ms
.http.get
(
ms
.manager
+'/
template
/
queryTemplateFileForColumn
.do
'
,
{
pageSize
:
99999
})
.then
(
function
(
data
)
{
that
.templateOptions
=
data
.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
)
{
})
.catch
(
function
(
err
)
{
console
.log
(
err
)
;
console
.log
(
err
)
;
})
;
})
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment