Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
cms_sys
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
西魏
cms_sys
Commits
14366861
Commit
14366861
authored
Jul 11, 2021
by
msgroup
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
规范方法
parent
4e8fbac7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
25 deletions
+14
-25
CategoryAction.java
src/main/java/net/mingsoft/cms/action/CategoryAction.java
+1
-1
ContentAction.java
src/main/java/net/mingsoft/cms/action/ContentAction.java
+1
-1
GeneraterAction.java
src/main/java/net/mingsoft/cms/action/GeneraterAction.java
+6
-8
CategoryAction.java
...main/java/net/mingsoft/cms/action/web/CategoryAction.java
+2
-7
ContentAction.java
src/main/java/net/mingsoft/cms/action/web/ContentAction.java
+2
-6
MCmsAction.java
src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
+1
-1
main.ftl
src/main/webapp/WEB-INF/manager/cms/content/main.ftl
+1
-1
No files found.
src/main/java/net/mingsoft/cms/action/CategoryAction.java
View file @
14366861
...
...
@@ -104,7 +104,7 @@ public class CategoryAction extends BaseAction {
@ApiImplicitParam
(
name
=
"del"
,
value
=
"删除标记"
,
required
=
false
,
paramType
=
"query"
),
@ApiImplicitParam
(
name
=
"id"
,
value
=
"编号"
,
required
=
false
,
paramType
=
"query"
),
})
@RequestMapping
(
"/list"
)
@RequestMapping
(
value
=
"/list"
,
method
=
{
RequestMethod
.
GET
,
RequestMethod
.
POST
}
)
@ResponseBody
public
ResultData
list
(
@ModelAttribute
@ApiIgnore
CategoryEntity
category
,
HttpServletResponse
response
,
HttpServletRequest
request
,
@ApiIgnore
ModelMap
model
,
BindingResult
result
)
{
BasicUtil
.
startPage
();
...
...
src/main/java/net/mingsoft/cms/action/ContentAction.java
View file @
14366861
...
...
@@ -107,7 +107,7 @@ public class ContentAction extends BaseAction {
@ApiImplicitParam
(
name
=
"del"
,
value
=
"删除标记"
,
required
=
false
,
paramType
=
"query"
),
@ApiImplicitParam
(
name
=
"id"
,
value
=
"编号"
,
required
=
false
,
paramType
=
"query"
),
})
@
Reque
stMapping
(
"/list"
)
@
Po
stMapping
(
"/list"
)
@ResponseBody
public
ResultData
list
(
@ModelAttribute
@ApiIgnore
ContentBean
content
,
HttpServletResponse
response
,
HttpServletRequest
request
,
@ApiIgnore
ModelMap
model
,
BindingResult
result
)
{
BasicUtil
.
startPage
();
...
...
src/main/java/net/mingsoft/cms/action/GeneraterAction.java
View file @
14366861
...
...
@@ -51,9 +51,7 @@ import org.springframework.beans.factory.annotation.Value;
import
org.springframework.context.annotation.Scope
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.ui.ModelMap
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -111,7 +109,7 @@ public class GeneraterAction extends BaseAction {
*
* @return
*/
@
Reques
tMapping
(
"/index"
)
@
Ge
tMapping
(
"/index"
)
public
String
index
(
HttpServletRequest
request
,
ModelMap
model
)
{
return
"/cms/generate/index"
;
}
...
...
@@ -122,7 +120,7 @@ public class GeneraterAction extends BaseAction {
* @param request
* @param response
*/
@RequestMapping
(
"/generateIndex"
)
@RequestMapping
(
value
=
"/generateIndex"
,
method
=
{
RequestMethod
.
GET
,
RequestMethod
.
POST
}
)
@RequiresPermissions
(
"cms:generate:index"
)
@LogAnn
(
title
=
"生成主页"
,
businessType
=
BusinessTypeEnum
.
UPDATE
)
@ResponseBody
...
...
@@ -150,7 +148,7 @@ public class GeneraterAction extends BaseAction {
* @param response
* @param categoryId
*/
@RequestMapping
(
"/{categoryId}/genernateColumn"
)
@RequestMapping
(
value
=
"/{categoryId}/genernateColumn"
,
method
=
{
RequestMethod
.
GET
,
RequestMethod
.
POST
}
)
@LogAnn
(
title
=
"生成栏目"
,
businessType
=
BusinessTypeEnum
.
UPDATE
)
@RequiresPermissions
(
"cms:generate:column"
)
@ResponseBody
...
...
@@ -216,7 +214,7 @@ public class GeneraterAction extends BaseAction {
* @param response
* @param columnId
*/
@RequestMapping
(
"/{columnId}/generateArticle"
)
@RequestMapping
(
value
=
"/{columnId}/generateArticle"
,
method
=
{
RequestMethod
.
GET
,
RequestMethod
.
POST
}
)
@RequiresPermissions
(
"cms:generate:article"
)
@LogAnn
(
title
=
"生成文章"
,
businessType
=
BusinessTypeEnum
.
UPDATE
)
@ResponseBody
...
...
@@ -273,7 +271,7 @@ public class GeneraterAction extends BaseAction {
* @param request
* @return
*/
@RequestMapping
(
"/{position}/viewIndex"
)
@RequestMapping
(
value
=
"/{position}/viewIndex"
,
method
=
{
RequestMethod
.
GET
,
RequestMethod
.
POST
}
)
public
String
viewIndex
(
HttpServletRequest
request
,
@PathVariable
String
position
,
HttpServletResponse
response
)
{
AppEntity
app
=
BasicUtil
.
getApp
();
// 组织主页预览地址
...
...
src/main/java/net/mingsoft/cms/action/web/CategoryAction.java
View file @
14366861
...
...
@@ -37,13 +37,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import
org.springframework.ui.ModelMap
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.ModelAttribute
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.bind.annotation.ModelAttribute
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
net.mingsoft.cms.biz.ICategoryBiz
;
import
net.mingsoft.cms.entity.CategoryEntity
;
...
...
@@ -108,7 +103,7 @@ public class CategoryAction extends net.mingsoft.cms.action.BaseAction{
@ApiImplicitParam
(
name
=
"del"
,
value
=
"删除标记"
,
required
=
false
,
paramType
=
"query"
),
@ApiImplicitParam
(
name
=
"id"
,
value
=
"编号"
,
required
=
false
,
paramType
=
"query"
),
})
@RequestMapping
(
"/list"
)
@RequestMapping
(
value
=
"/list"
,
method
=
{
RequestMethod
.
GET
,
RequestMethod
.
POST
}
)
@ResponseBody
public
ResultData
list
(
@ModelAttribute
@ApiIgnore
CategoryEntity
category
,
HttpServletResponse
response
,
HttpServletRequest
request
,
@ApiIgnore
ModelMap
model
,
BindingResult
result
)
{
BasicUtil
.
startPage
();
...
...
src/main/java/net/mingsoft/cms/action/web/ContentAction.java
View file @
14366861
...
...
@@ -38,11 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Controller
;
import
org.springframework.ui.ModelMap
;
import
org.springframework.validation.BindingResult
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.ModelAttribute
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.bind.annotation.*
;
import
springfox.documentation.annotations.ApiIgnore
;
import
javax.servlet.http.HttpServletRequest
;
...
...
@@ -97,7 +93,7 @@ public class ContentAction extends net.mingsoft.cms.action.BaseAction{
@ApiImplicitParam
(
name
=
"del"
,
value
=
"删除标记"
,
required
=
false
,
paramType
=
"query"
),
@ApiImplicitParam
(
name
=
"id"
,
value
=
"编号"
,
required
=
false
,
paramType
=
"query"
),
})
@
Reque
stMapping
(
"/list"
)
@
Po
stMapping
(
"/list"
)
@ResponseBody
public
ResultData
list
(
@ModelAttribute
@ApiIgnore
ContentBean
content
,
HttpServletResponse
response
,
HttpServletRequest
request
,
@ApiIgnore
ModelMap
model
,
BindingResult
result
)
{
BasicUtil
.
startPage
();
...
...
src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
View file @
14366861
...
...
@@ -317,7 +317,7 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
* @param request 搜索id
* @param response
*/
@RequestMapping
(
value
=
"search"
)
@RequestMapping
(
value
=
"search"
,
method
=
{
RequestMethod
.
GET
,
RequestMethod
.
POST
}
)
@ResponseBody
public
String
search
(
HttpServletRequest
request
,
HttpServletResponse
response
)
{
//设置分页类
...
...
src/main/webapp/WEB-INF/manager/cms/content/main.ftl
View file @
14366861
...
...
@@ -284,7 +284,7 @@
};
var
form
=
JSON
.
parse
(
JSON
.
stringify
(
that
.
form
));
if
(
form
.
contentType
.
length
>
0
)
{
if
(
form
.
contentType
!=
null
&&
form
.
contentType
.
length
>
0
)
{
form
.
contentType
=
form
.
contentType
.
join
(
','
);
}
...
...
Write
Preview
Markdown
is supported
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