Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Carpe diem
MCMS
Commits
15b5c15b
Commit
15b5c15b
authored
3 years ago
by
mingsoft
Browse files
Options
Download
Email Patches
Plain Diff
5.2.6 发布
parent
446ac0ec
Changes
27
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
doc/mcms-5.2.6.sql
+73
-26
doc/mcms-5.2.6.sql
src/main/java/net/mingsoft/cms/action/BaseAction.java
+3
-1
src/main/java/net/mingsoft/cms/action/BaseAction.java
src/main/java/net/mingsoft/cms/action/CategoryAction.java
+3
-1
src/main/java/net/mingsoft/cms/action/CategoryAction.java
src/main/java/net/mingsoft/cms/action/ContentAction.java
+3
-1
src/main/java/net/mingsoft/cms/action/ContentAction.java
src/main/java/net/mingsoft/cms/action/GeneraterAction.java
+3
-1
src/main/java/net/mingsoft/cms/action/GeneraterAction.java
src/main/java/net/mingsoft/cms/action/web/CategoryAction.java
+3
-1
...main/java/net/mingsoft/cms/action/web/CategoryAction.java
src/main/java/net/mingsoft/cms/action/web/ContentAction.java
+3
-1
src/main/java/net/mingsoft/cms/action/web/ContentAction.java
src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
+3
-1
src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
src/main/java/net/mingsoft/cms/aop/ContentAop.java
+3
-1
src/main/java/net/mingsoft/cms/aop/ContentAop.java
src/main/java/net/mingsoft/cms/bean/CategoryBean.java
+3
-1
src/main/java/net/mingsoft/cms/bean/CategoryBean.java
src/main/java/net/mingsoft/cms/bean/ContentBean.java
+3
-1
src/main/java/net/mingsoft/cms/bean/ContentBean.java
src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java
+3
-1
src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java
src/main/java/net/mingsoft/cms/biz/IContentBiz.java
+3
-1
src/main/java/net/mingsoft/cms/biz/IContentBiz.java
src/main/java/net/mingsoft/cms/biz/IHistoryLogBiz.java
+3
-1
src/main/java/net/mingsoft/cms/biz/IHistoryLogBiz.java
src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java
+5
-3
src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java
src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java
+3
-1
src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java
src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java
+3
-1
...ain/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java
src/main/java/net/mingsoft/cms/constant/Const.java
+3
-1
src/main/java/net/mingsoft/cms/constant/Const.java
src/main/java/net/mingsoft/cms/constant/e/CategoryTypeEnum.java
+3
-1
...in/java/net/mingsoft/cms/constant/e/CategoryTypeEnum.java
src/main/java/net/mingsoft/cms/dao/ICategoryDao.java
+3
-1
src/main/java/net/mingsoft/cms/dao/ICategoryDao.java
with
132 additions
and
47 deletions
+132
-47
doc/mcms-5.2.
5
.sql
→
doc/mcms-5.2.
6
.sql
+
73
-
26
View file @
15b5c15b
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/action/BaseAction.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -18,6 +18,8 @@
* 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.action
;
import
java.util.MissingResourceException
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/action/CategoryAction.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -18,6 +18,8 @@
* 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.action
;
import
cn.hutool.core.util.StrUtil
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/action/ContentAction.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -18,6 +18,8 @@
* 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.action
;
import
io.swagger.annotations.Api
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/action/GeneraterAction.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -20,6 +20,8 @@
*/
package
net.mingsoft.cms.action
;
import
cn.hutool.core.bean.BeanUtil
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/action/web/CategoryAction.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -18,6 +18,8 @@
* 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.action.web
;
import
io.swagger.annotations.Api
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/action/web/ContentAction.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -18,6 +18,8 @@
* 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.action.web
;
import
cn.hutool.core.util.ObjectUtil
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -20,6 +20,8 @@
*/
package
net.mingsoft.cms.action.web
;
import
cn.hutool.core.util.ObjectUtil
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/aop/ContentAop.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -18,6 +18,8 @@
* 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.aop
;
import
net.mingsoft.basic.aop.BaseAop
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/bean/CategoryBean.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -18,6 +18,8 @@
* 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.bean
;
import
net.mingsoft.cms.entity.CategoryEntity
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/bean/ContentBean.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -18,6 +18,8 @@
* 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.bean
;
import
com.alibaba.fastjson.annotation.JSONField
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -18,6 +18,8 @@
* 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
net.mingsoft.base.biz.IBaseBiz
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/biz/IContentBiz.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -18,6 +18,8 @@
* 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
net.mingsoft.base.biz.IBaseBiz
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/biz/IHistoryLogBiz.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -18,6 +18,8 @@
* 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
net.mingsoft.base.biz.IBaseBiz
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java
+
5
-
3
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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:
* <p>
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
* <p>
* 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
...
...
@@ -20,6 +20,8 @@
*/
package
net.mingsoft.cms.biz.impl
;
import
cn.hutool.core.util.ObjectUtil
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -20,6 +20,8 @@
*/
package
net.mingsoft.cms.biz.impl
;
import
net.mingsoft.base.biz.impl.BaseBizImpl
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -20,6 +20,8 @@
*/
package
net.mingsoft.cms.biz.impl
;
import
net.mingsoft.cms.biz.IHistoryLogBiz
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/constant/Const.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -18,6 +18,8 @@
* 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.constant
;
/**
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/constant/e/CategoryTypeEnum.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -19,6 +19,8 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package
net.mingsoft.cms.constant.e
;
import
net.mingsoft.base.constant.e.BaseEnum
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/dao/ICategoryDao.java
+
3
-
1
View file @
15b5c15b
/**
* The MIT License (MIT)
* Copyright (c) 202
0
铭软科技(mingsoft.net)
* Copyright (c) 20
12-202
2 铭软科技(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
...
...
@@ -18,6 +18,8 @@
* 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
net.mingsoft.base.dao.IBaseDao
;
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
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