Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
git test
Halo
Commits
ec92b35f
Commit
ec92b35f
authored
7 years ago
by
RYAN0UP_
Browse files
Options
Download
Email Patches
Plain Diff
优化了大量重复代码,持续优化中
parent
d0d7e90a
master
next
release-1.4
release-1.5
v1.5.3
v1.5.2
v1.5.1
v1.5.0
v1.5.0-beta.1
v1.5.0-alpha.3
v1.5.0-alpha.2
v1.5.0-alpha.1
v1.4.17
v1.4.16
v1.4.15
v1.4.14
v1.4.13
v1.4.12
v1.4.11
v1.4.10
v1.4.9
v1.4.8
v1.4.7
v1.4.7-beta.1
v1.4.6
v1.4.5
v1.4.4
v1.4.3
v1.4.3-beta.3
v1.4.3-beta.2
v1.4.3-beta.1
v1.4.2
v1.4.1
v1.4.0
v1.4.0-beta.3
v1.4.0-beta.2
v1.4.0-beta.1
v1.3.2
v1.3.1
v1.3.0
v1.3.0-beta.4
v1.3.0-beta.3
v1.3.0-beta.2
v1.3.0-beta.1
v1.2.0
v1.2.0-beta.5
v1.2.0-beta.4
v1.2.0-beta.3
v1.2.0-beta.2
v1.2.0-beta.1
v1.1.3-beta.2
v1.1.3-beta.1
v1.1.1
v1.1.0
v1.1.0-beta.3
v1.1.0-beta.2
v1.1.0-beta.1
v1.0.3
v1.0.2
v1.0.2-beta.1
v1.0.1
v1.0.0
v1.0.0-beta.9
v1.0.0-beta.8
v1.0.0-beta.7
v1.0.0-beta.6
v1.0.0-beta.5
v1.0.0-beta.4
v1.0.0-beta.3
v1.0.0-beta.2
v0.4.4
v0.4.3
v0.4.2
v0.4.1
v0.4.0
v0.3.0
v0.2.2
v0.2.1
v0.2.0
v0.1.1
v0.1
v0.0.9
v0.0.8
v0.0.7
v0.0.6
v0.0.5
v0.0.4
v0.0.3
v0.0.2
v0.0.1
No related merge requests found
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
src/main/java/cc/ryanc/halo/config/FreeMarkerConfig.java
+47
-0
src/main/java/cc/ryanc/halo/config/FreeMarkerConfig.java
src/main/java/cc/ryanc/halo/config/MvcConfig.java
+1
-1
src/main/java/cc/ryanc/halo/config/MvcConfig.java
src/main/java/cc/ryanc/halo/config/StartupConfig.java
+1
-1
src/main/java/cc/ryanc/halo/config/StartupConfig.java
src/main/java/cc/ryanc/halo/model/tag/ArticleTagDirective.java
+40
-0
...ain/java/cc/ryanc/halo/model/tag/ArticleTagDirective.java
src/main/java/cc/ryanc/halo/model/tag/CommonTagDirective.java
+47
-0
...main/java/cc/ryanc/halo/model/tag/CommonTagDirective.java
src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java
+3
-8
...a/cc/ryanc/halo/web/controller/admin/AdminController.java
src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
+0
-5
...ryanc/halo/web/controller/admin/AttachmentController.java
src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
+1
-6
.../cc/ryanc/halo/web/controller/admin/BackupController.java
src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java
+0
-10
...c/ryanc/halo/web/controller/admin/CategoryController.java
src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
+0
-3
...cc/ryanc/halo/web/controller/admin/CommentController.java
src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java
+0
-10
...va/cc/ryanc/halo/web/controller/admin/MenuController.java
src/main/java/cc/ryanc/halo/web/controller/admin/OptionController.java
+1
-5
.../cc/ryanc/halo/web/controller/admin/OptionController.java
src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java
+1
-11
...va/cc/ryanc/halo/web/controller/admin/PageController.java
src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
+0
-10
...va/cc/ryanc/halo/web/controller/admin/PostController.java
src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java
+0
-4
...ava/cc/ryanc/halo/web/controller/admin/TagController.java
src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java
+0
-6
...a/cc/ryanc/halo/web/controller/admin/ThemeController.java
src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java
+1
-6
...va/cc/ryanc/halo/web/controller/admin/UserController.java
src/main/java/cc/ryanc/halo/web/controller/front/ArchivesController.java
+0
-66
...c/ryanc/halo/web/controller/front/ArchivesController.java
src/main/java/cc/ryanc/halo/web/controller/front/IndexController.java
+0
-31
...a/cc/ryanc/halo/web/controller/front/IndexController.java
src/main/java/cc/ryanc/halo/web/controller/front/PagesController.java
+5
-38
...a/cc/ryanc/halo/web/controller/front/PagesController.java
with
148 additions
and
221 deletions
+148
-221
src/main/java/cc/ryanc/halo/config/FreeMarkerConfig.java
0 → 100644
+
47
-
0
View file @
ec92b35f
package
cc.ryanc.halo.config
;
import
cc.ryanc.halo.model.tag.ArticleTagDirective
;
import
cc.ryanc.halo.model.tag.CommonTagDirective
;
import
cc.ryanc.halo.service.OptionsService
;
import
cc.ryanc.halo.service.UserService
;
import
freemarker.template.TemplateModelException
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.context.annotation.Configuration
;
import
javax.annotation.PostConstruct
;
/**
* @author : RYAN0UP
* @version : 1.0
* @date : 2018/4/26
*/
@Configuration
public
class
FreeMarkerConfig
{
@Autowired
private
freemarker
.
template
.
Configuration
configuration
;
@Autowired
private
OptionsService
optionsService
;
@Autowired
private
UserService
userService
;
@Autowired
private
CommonTagDirective
commonTagDirective
;
@Autowired
private
ArticleTagDirective
articleTagDirective
;
@PostConstruct
public
void
setSharedVariable
(){
configuration
.
setSharedVariable
(
"commonTag"
,
commonTagDirective
);
configuration
.
setSharedVariable
(
"articleTag"
,
articleTagDirective
);
try
{
configuration
.
setSharedVariable
(
"options"
,
optionsService
.
findAllOptions
());
configuration
.
setSharedVariable
(
"user"
,
userService
.
findUser
());
}
catch
(
TemplateModelException
e
){
e
.
printStackTrace
();
}
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/config/MvcConfig
uration
.java
→
src/main/java/cc/ryanc/halo/config/MvcConfig.java
+
1
-
1
View file @
ec92b35f
...
...
@@ -29,7 +29,7 @@ import java.util.Map;
@EnableWebMvc
@ComponentScan
(
basePackages
=
"cc.ryanc.halo.web.controller"
)
@PropertySource
(
value
=
"classpath:application.yaml"
,
ignoreResourceNotFound
=
true
,
encoding
=
"UTF-8"
)
public
class
MvcConfig
uration
implements
WebMvcConfigurer
{
public
class
MvcConfig
implements
WebMvcConfigurer
{
@Autowired
private
LoginInterceptor
loginInterceptor
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/config/StartupConfig
uration
.java
→
src/main/java/cc/ryanc/halo/config/StartupConfig.java
+
1
-
1
View file @
ec92b35f
...
...
@@ -24,7 +24,7 @@ import java.util.Map;
*/
@Slf4j
@Configuration
public
class
StartupConfig
uration
implements
ApplicationListener
<
ContextRefreshedEvent
>{
public
class
StartupConfig
implements
ApplicationListener
<
ContextRefreshedEvent
>{
@Autowired
private
OptionsService
optionsService
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/model/tag/ArticleTagDirective.java
0 → 100644
+
40
-
0
View file @
ec92b35f
package
cc.ryanc.halo.model.tag
;
import
cc.ryanc.halo.service.PostService
;
import
freemarker.core.Environment
;
import
freemarker.template.*
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.io.IOException
;
import
java.util.Map
;
/**
* @author : RYAN0UP
* @version : 1.0
* @date : 2018/4/26
*/
@Component
public
class
ArticleTagDirective
implements
TemplateDirectiveModel
{
private
static
final
String
METHOD_KEY
=
"method"
;
@Autowired
private
PostService
postService
;
@Override
public
void
execute
(
Environment
environment
,
Map
map
,
TemplateModel
[]
templateModels
,
TemplateDirectiveBody
templateDirectiveBody
)
throws
TemplateException
,
IOException
{
DefaultObjectWrapperBuilder
builder
=
new
DefaultObjectWrapperBuilder
(
Configuration
.
VERSION_2_3_25
);
if
(
map
.
containsKey
(
METHOD_KEY
)){
String
method
=
map
.
get
(
METHOD_KEY
).
toString
();
switch
(
method
){
case
"postsCount"
:
environment
.
setVariable
(
"postsCount"
,
builder
.
build
().
wrap
(
postService
.
findAllPosts
().
size
()));
break
;
default
:
break
;
}
}
templateDirectiveBody
.
render
(
environment
.
getOut
());
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/model/tag/CommonTagDirective.java
0 → 100644
+
47
-
0
View file @
ec92b35f
package
cc.ryanc.halo.model.tag
;
import
cc.ryanc.halo.service.CategoryService
;
import
cc.ryanc.halo.service.MenuService
;
import
freemarker.core.Environment
;
import
freemarker.template.*
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.io.IOException
;
import
java.util.Map
;
/**
* @author : RYAN0UP
* @version : 1.0
* @date : 2018/4/26
*/
@Component
public
class
CommonTagDirective
implements
TemplateDirectiveModel
{
private
static
final
String
METHOD_KEY
=
"method"
;
@Autowired
private
MenuService
menuService
;
@Autowired
private
CategoryService
categoryService
;
@Override
public
void
execute
(
Environment
environment
,
Map
map
,
TemplateModel
[]
templateModels
,
TemplateDirectiveBody
templateDirectiveBody
)
throws
TemplateException
,
IOException
{
DefaultObjectWrapperBuilder
builder
=
new
DefaultObjectWrapperBuilder
(
Configuration
.
VERSION_2_3_25
);
if
(
map
.
containsKey
(
METHOD_KEY
)){
String
method
=
map
.
get
(
METHOD_KEY
).
toString
();
switch
(
method
){
case
"menus"
:
environment
.
setVariable
(
"menus"
,
builder
.
build
().
wrap
(
menuService
.
findAllMenus
()));
break
;
case
"categories"
:
environment
.
setVariable
(
"categories"
,
builder
.
build
().
wrap
(
categoryService
.
findAllCategories
()));
break
;
default
:
break
;
}
}
templateDirectiveBody
.
render
(
environment
.
getOut
());
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java
+
3
-
8
View file @
ec92b35f
...
...
@@ -86,8 +86,6 @@ public class AdminController extends BaseController{
model
.
addAttribute
(
"mediaCount"
,
HaloConst
.
ATTACHMENTS
.
size
());
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
this
.
getNewComments
(
session
);
return
"admin/admin_index"
;
}
...
...
@@ -99,9 +97,8 @@ public class AdminController extends BaseController{
* @return 模板路径admin/admin_login
*/
@GetMapping
(
value
=
"/login"
)
public
String
login
(
HttpSession
session
,
Model
model
){
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
User
user
=
(
User
)
session
.
getAttribute
(
"user"
);
public
String
login
(
HttpSession
session
){
User
user
=
(
User
)
session
.
getAttribute
(
HaloConst
.
USER_SESSION_KEY
);
//如果session存在,跳转到后台首页
if
(
null
!=
user
){
return
"redirect:/admin"
;
...
...
@@ -210,12 +207,10 @@ public class AdminController extends BaseController{
/**
* 不可描述的页面
*
* @param model model
* @return 模板路径admin/admin_halo
*/
@GetMapping
(
value
=
"/halo"
)
public
String
halo
(
Model
model
){
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
public
String
halo
(){
return
"admin/admin_halo"
;
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
+
0
-
5
View file @
ec92b35f
...
...
@@ -69,8 +69,6 @@ public class AttachmentController {
Page
<
Attachment
>
attachments
=
attachmentService
.
findAllAttachments
(
pageable
);
model
.
addAttribute
(
"attachments"
,
attachments
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"admin/admin_attachment"
;
}
...
...
@@ -90,9 +88,6 @@ public class AttachmentController {
Page
<
Attachment
>
attachments
=
attachmentService
.
findAllAttachments
(
pageable
);
model
.
addAttribute
(
"attachments"
,
attachments
);
model
.
addAttribute
(
"id"
,
id
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"admin/widget/_attachment-select"
;
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
+
1
-
6
View file @
ec92b35f
package
cc.ryanc.halo.web.controller.admin
;
import
cc.ryanc.halo.model.domain.Post
;
import
cc.ryanc.halo.model.dto.HaloConst
;
import
cc.ryanc.halo.service.PostService
;
import
cc.ryanc.halo.util.HaloUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.ui.Model
;
import
org.springframework.util.ResourceUtils
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -36,10 +34,7 @@ public class BackupController {
* @return 模板路径admin/admin_backup
*/
@GetMapping
public
String
backup
(
Model
model
){
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
public
String
backup
(){
return
"admin/admin_backup"
;
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java
+
0
-
10
View file @
ec92b35f
package
cc.ryanc.halo.web.controller.admin
;
import
cc.ryanc.halo.model.domain.Category
;
import
cc.ryanc.halo.model.dto.HaloConst
;
import
cc.ryanc.halo.service.CategoryService
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -10,7 +9,6 @@ import org.springframework.ui.Model;
import
org.springframework.web.bind.annotation.*
;
import
javax.websocket.server.PathParam
;
import
java.util.List
;
import
java.util.Optional
;
/**
...
...
@@ -35,11 +33,7 @@ public class CategoryController {
*/
@GetMapping
public
String
categories
(
Model
model
){
List
<
Category
>
categories
=
categoryService
.
findAllCategories
();
model
.
addAttribute
(
"categories"
,
categories
);
model
.
addAttribute
(
"statusName"
,
"添加"
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"admin/admin_category"
;
}
...
...
@@ -102,13 +96,9 @@ public class CategoryController {
*/
@GetMapping
(
value
=
"/edit"
)
public
String
toEditCategory
(
Model
model
,
@PathParam
(
"cateId"
)
Long
cateId
){
List
<
Category
>
categories
=
categoryService
.
findAllCategories
();
Optional
<
Category
>
category
=
categoryService
.
findByCateId
(
cateId
);
model
.
addAttribute
(
"updateCategory"
,
category
.
get
());
model
.
addAttribute
(
"categories"
,
categories
);
model
.
addAttribute
(
"statusName"
,
"修改"
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"admin/admin_category"
;
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
+
0
-
3
View file @
ec92b35f
...
...
@@ -73,9 +73,6 @@ public class CommentController extends BaseController{
model
.
addAttribute
(
"checkCount"
,
commentService
.
findAllComments
(
1
,
pageable
).
getTotalElements
());
model
.
addAttribute
(
"trashCount"
,
commentService
.
findAllComments
(
2
,
pageable
).
getTotalElements
());
model
.
addAttribute
(
"status"
,
status
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"admin/admin_comment"
;
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java
+
0
-
10
View file @
ec92b35f
package
cc.ryanc.halo.web.controller.admin
;
import
cc.ryanc.halo.model.domain.Menu
;
import
cc.ryanc.halo.model.dto.HaloConst
;
import
cc.ryanc.halo.service.MenuService
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -10,7 +9,6 @@ import org.springframework.ui.Model;
import
org.springframework.web.bind.annotation.*
;
import
javax.websocket.server.PathParam
;
import
java.util.List
;
/**
* @author : RYAN0UP
...
...
@@ -34,11 +32,7 @@ public class MenuController {
*/
@GetMapping
public
String
menus
(
Model
model
){
List
<
Menu
>
menus
=
menuService
.
findAllMenus
();
model
.
addAttribute
(
"menus"
,
menus
);
model
.
addAttribute
(
"statusName"
,
"添加"
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"/admin/admin_menu"
;
}
...
...
@@ -67,13 +61,9 @@ public class MenuController {
*/
@GetMapping
(
value
=
"/edit"
)
public
String
updateMenu
(
@RequestParam
(
"menuId"
)
Long
menuId
,
Model
model
){
List
<
Menu
>
menus
=
menuService
.
findAllMenus
();
Menu
menu
=
menuService
.
findByMenuId
(
menuId
).
get
();
model
.
addAttribute
(
"statusName"
,
"修改"
);
model
.
addAttribute
(
"updateMenu"
,
menu
);
model
.
addAttribute
(
"menus"
,
menus
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"/admin/admin_menu"
;
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/web/controller/admin/OptionController.java
+
1
-
5
View file @
ec92b35f
...
...
@@ -5,7 +5,6 @@ import cc.ryanc.halo.service.OptionsService;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.ui.Model
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.Map
;
...
...
@@ -26,13 +25,10 @@ public class OptionController {
/**
* 请求跳转到option页面并完成渲染
*
* @param model model
* @return 模板路径admin/admin_option
*/
@GetMapping
public
String
options
(
Model
model
){
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
public
String
options
(){
return
"admin/admin_option"
;
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java
+
1
-
11
View file @
ec92b35f
...
...
@@ -2,7 +2,6 @@ package cc.ryanc.halo.web.controller.admin;
import
cc.ryanc.halo.model.domain.Gallery
;
import
cc.ryanc.halo.model.domain.Link
;
import
cc.ryanc.halo.model.dto.HaloConst
;
import
cc.ryanc.halo.service.GalleryService
;
import
cc.ryanc.halo.service.LinkService
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -43,8 +42,7 @@ public class PageController {
* @return 模板路径admin/admin_page
*/
@GetMapping
public
String
pages
(
Model
model
){
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
public
String
pages
(){
return
"admin/admin_page"
;
}
...
...
@@ -59,9 +57,6 @@ public class PageController {
List
<
Link
>
links
=
linkService
.
findAllLinks
();
model
.
addAttribute
(
"links"
,
links
);
model
.
addAttribute
(
"statusName"
,
"添加"
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"admin/admin_page_link"
;
}
...
...
@@ -79,8 +74,6 @@ public class PageController {
model
.
addAttribute
(
"updateLink"
,
link
.
get
());
model
.
addAttribute
(
"statusName"
,
"修改"
);
model
.
addAttribute
(
"links"
,
links
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"admin/admin_page_link"
;
}
...
...
@@ -134,7 +127,6 @@ public class PageController {
Pageable
pageable
=
new
PageRequest
(
page
,
size
,
sort
);
Page
<
Gallery
>
galleries
=
galleryService
.
findAllGalleries
(
pageable
);
model
.
addAttribute
(
"galleries"
,
galleries
);
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"admin/admin_page_gallery"
;
}
...
...
@@ -168,8 +160,6 @@ public class PageController {
public
String
gallery
(
Model
model
,
@PathParam
(
"galleryId"
)
Long
galleryId
){
Optional
<
Gallery
>
gallery
=
galleryService
.
findByGalleryId
(
galleryId
);
model
.
addAttribute
(
"gallery"
,
gallery
.
get
());
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"admin/widget/_gallery-detail"
;
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
+
0
-
10
View file @
ec92b35f
...
...
@@ -72,10 +72,6 @@ public class PostController extends BaseController{
model
.
addAttribute
(
"draftCount"
,
postService
.
findPostByStatus
(
1
,
pageable
).
getTotalElements
());
model
.
addAttribute
(
"trashCount"
,
postService
.
findPostByStatus
(
2
,
pageable
).
getTotalElements
());
model
.
addAttribute
(
"status"
,
status
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"admin/admin_post"
;
}
...
...
@@ -115,8 +111,6 @@ public class PostController extends BaseController{
public
String
viewPost
(
@PathParam
(
"postId"
)
Long
postId
,
Model
model
){
Optional
<
Post
>
post
=
postService
.
findByPostId
(
postId
);
model
.
addAttribute
(
"post"
,
post
.
get
());
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
this
.
render
(
"post"
);
}
...
...
@@ -134,8 +128,6 @@ public class PostController extends BaseController{
model
.
addAttribute
(
"categories"
,
categories
);
model
.
addAttribute
(
"tags"
,
tags
);
model
.
addAttribute
(
"btnPush"
,
"发布"
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
}
catch
(
Exception
e
){
log
.
error
(
"未知错误:{0}"
,
e
.
getMessage
());
}
...
...
@@ -247,8 +239,6 @@ public class PostController extends BaseController{
List
<
Category
>
categories
=
categoryService
.
findAllCategories
();
model
.
addAttribute
(
"categories"
,
categories
);
model
.
addAttribute
(
"btnPush"
,
"更新"
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
}
catch
(
Exception
e
){
log
.
error
(
"未知错误:{0}"
,
e
.
getMessage
());
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java
+
0
-
4
View file @
ec92b35f
package
cc.ryanc.halo.web.controller.admin
;
import
cc.ryanc.halo.model.domain.Tag
;
import
cc.ryanc.halo.model.dto.HaloConst
;
import
cc.ryanc.halo.service.TagService
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -37,8 +36,6 @@ public class TagController {
List
<
Tag
>
tags
=
tagService
.
findAllTags
();
model
.
addAttribute
(
"tags"
,
tags
);
model
.
addAttribute
(
"statusName"
,
"新增"
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"admin/admin_tag"
;
}
...
...
@@ -106,7 +103,6 @@ public class TagController {
model
.
addAttribute
(
"statusName"
,
"修改"
);
model
.
addAttribute
(
"updateTag"
,
tag
);
model
.
addAttribute
(
"tags"
,
tags
);
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"admin/admin_tag"
;
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java
+
0
-
6
View file @
ec92b35f
...
...
@@ -52,8 +52,6 @@ public class ThemeController extends BaseController{
if
(
null
!=
HaloConst
.
THEMES
){
model
.
addAttribute
(
"themes"
,
HaloConst
.
THEMES
);
}
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"admin/admin_theme"
;
}
...
...
@@ -147,8 +145,6 @@ public class ThemeController extends BaseController{
@GetMapping
(
value
=
"/options"
)
public
String
setting
(
Model
model
,
@RequestParam
(
"theme"
)
String
theme
){
model
.
addAttribute
(
"themeDir"
,
theme
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"themes/"
+
theme
+
"/module/options"
;
}
...
...
@@ -162,8 +158,6 @@ public class ThemeController extends BaseController{
public
String
editor
(
Model
model
){
List
<
String
>
tpls
=
HaloUtil
.
getTplName
(
BaseController
.
THEME
);
model
.
addAttribute
(
"tpls"
,
tpls
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
"admin/admin_theme-editor"
;
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java
+
1
-
6
View file @
ec92b35f
package
cc.ryanc.halo.web.controller.admin
;
import
cc.ryanc.halo.model.domain.User
;
import
cc.ryanc.halo.model.dto.HaloConst
;
import
cc.ryanc.halo.service.UserService
;
import
cc.ryanc.halo.util.HaloUtil
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -29,14 +28,10 @@ public class UserController {
/**
* 获取用户信息并跳转
*
* @param model model
* @return 模板路径admin/admin_profile
*/
@GetMapping
public
String
profile
(
Model
model
){
model
.
addAttribute
(
"user"
,
userService
.
findUser
());
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
public
String
profile
(){
return
"admin/admin_profile"
;
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/web/controller/front/ArchivesController.java
+
0
-
66
View file @
ec92b35f
package
cc.ryanc.halo.web.controller.front
;
import
cc.ryanc.halo.model.domain.Category
;
import
cc.ryanc.halo.model.domain.Menu
;
import
cc.ryanc.halo.model.domain.Post
;
import
cc.ryanc.halo.model.domain.User
;
import
cc.ryanc.halo.model.dto.Archive
;
import
cc.ryanc.halo.model.dto.HaloConst
;
import
cc.ryanc.halo.service.CategoryService
;
import
cc.ryanc.halo.service.MenuService
;
import
cc.ryanc.halo.service.PostService
;
import
cc.ryanc.halo.service.UserService
;
import
cc.ryanc.halo.web.controller.core.BaseController
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -39,14 +32,6 @@ public class ArchivesController extends BaseController {
@Autowired
private
PostService
postService
;
@Autowired
private
UserService
userService
;
@Autowired
private
CategoryService
categoryService
;
@Autowired
private
MenuService
menuService
;
/**
* 文章归档
...
...
@@ -76,9 +61,6 @@ public class ArchivesController extends BaseController {
Page
<
Post
>
posts
=
postService
.
findPostByStatus
(
0
,
pageable
);
model
.
addAttribute
(
"posts"
,
posts
);
//文章总数
model
.
addAttribute
(
"postsCount"
,
postService
.
findAllPosts
().
size
());
model
.
addAttribute
(
"is_archives"
,
true
);
//包含[List<Post>,year,month,count]
...
...
@@ -89,23 +71,9 @@ public class ArchivesController extends BaseController {
List
<
Archive
>
archivesLess
=
postService
.
findPostGroupByYear
();
model
.
addAttribute
(
"archivesLess"
,
archivesLess
);
//用户信息
User
user
=
userService
.
findUser
();
model
.
addAttribute
(
"user"
,
user
);
//菜单列表
List
<
Menu
>
menus
=
menuService
.
findAllMenus
();
model
.
addAttribute
(
"menus"
,
menus
);
//所有分类目录
List
<
Category
>
categories
=
categoryService
.
findAllCategories
();
model
.
addAttribute
(
"categories"
,
categories
);
//是否是归档页,用于判断输出链接
model
.
addAttribute
(
"isArchives"
,
"true"
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
this
.
render
(
"archives"
);
}
...
...
@@ -130,21 +98,6 @@ public class ArchivesController extends BaseController {
Page
<
Post
>
posts
=
postService
.
findPostByYearAndMonth
(
year
,
month
,
pageable
);
model
.
addAttribute
(
"posts"
,
posts
);
//文章总数
model
.
addAttribute
(
"postsCount"
,
postService
.
findAllPosts
().
size
());
//用户信息
User
user
=
userService
.
findUser
();
model
.
addAttribute
(
"user"
,
user
);
//分类目录
List
<
Category
>
categories
=
categoryService
.
findAllCategories
();
model
.
addAttribute
(
"categories"
,
categories
);
//菜单列表
List
<
Menu
>
menus
=
menuService
.
findAllMenus
();
model
.
addAttribute
(
"menus"
,
menus
);
//归档数据,包含[year,month,count,List<Post>]
List
<
Archive
>
archives
=
postService
.
findPostGroupByYearAndMonth
();
model
.
addAttribute
(
"archives"
,
archives
);
...
...
@@ -152,8 +105,6 @@ public class ArchivesController extends BaseController {
//是否是归档页,用于判断输出链接
model
.
addAttribute
(
"isArchives"
,
"true"
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
this
.
render
(
"archives"
);
}
...
...
@@ -187,28 +138,11 @@ public class ArchivesController extends BaseController {
}
model
.
addAttribute
(
"post"
,
post
);
//文章总数
model
.
addAttribute
(
"postsCount"
,
postService
.
findAllPosts
().
size
());
//用户信息
User
user
=
userService
.
findUser
();
model
.
addAttribute
(
"user"
,
user
);
//所有分类目录
List
<
Category
>
categories
=
categoryService
.
findAllCategories
();
model
.
addAttribute
(
"categories"
,
categories
);
//归档数据,包含[year,month,count,List<Post>]
List
<
Archive
>
archives
=
postService
.
findPostGroupByYearAndMonth
();
//菜单列表
List
<
Menu
>
menus
=
menuService
.
findAllMenus
();
model
.
addAttribute
(
"menus"
,
menus
);
model
.
addAttribute
(
"archives"
,
archives
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
this
.
render
(
"post"
);
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/web/controller/front/IndexController.java
+
0
-
31
View file @
ec92b35f
package
cc.ryanc.halo.web.controller.front
;
import
cc.ryanc.halo.model.domain.Category
;
import
cc.ryanc.halo.model.domain.Menu
;
import
cc.ryanc.halo.model.domain.Post
;
import
cc.ryanc.halo.model.domain.User
;
import
cc.ryanc.halo.model.dto.Archive
;
import
cc.ryanc.halo.model.dto.HaloConst
;
import
cc.ryanc.halo.service.CategoryService
;
import
cc.ryanc.halo.service.MenuService
;
import
cc.ryanc.halo.service.PostService
;
import
cc.ryanc.halo.service.UserService
;
import
cc.ryanc.halo.web.controller.core.BaseController
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -39,14 +33,6 @@ public class IndexController extends BaseController {
@Autowired
private
PostService
postService
;
@Autowired
private
UserService
userService
;
@Autowired
private
CategoryService
categoryService
;
@Autowired
private
MenuService
menuService
;
/**
* 请求首页
...
...
@@ -83,29 +69,12 @@ public class IndexController extends BaseController {
Page
<
Post
>
posts
=
postService
.
findPostByStatus
(
0
,
pageable
);
model
.
addAttribute
(
"posts"
,
posts
);
//文章总数
model
.
addAttribute
(
"postsCount"
,
postService
.
findAllPosts
().
size
());
model
.
addAttribute
(
"is_home"
,
true
);
//用户信息
User
user
=
userService
.
findUser
();
model
.
addAttribute
(
"user"
,
user
);
//所有分类目录
List
<
Category
>
categories
=
categoryService
.
findAllCategories
();
model
.
addAttribute
(
"categories"
,
categories
);
//菜单列表
List
<
Menu
>
menus
=
menuService
.
findAllMenus
();
model
.
addAttribute
(
"menus"
,
menus
);
//归档数据,包含[year,month,count,List<Post>]
List
<
Archive
>
archives
=
postService
.
findPostGroupByYearAndMonth
();
model
.
addAttribute
(
"archives"
,
archives
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
this
.
render
(
"index"
);
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cc/ryanc/halo/web/controller/front/PagesController.java
+
5
-
38
View file @
ec92b35f
package
cc.ryanc.halo.web.controller.front
;
import
cc.ryanc.halo.model.domain.*
;
import
cc.ryanc.halo.model.domain.Gallery
;
import
cc.ryanc.halo.model.domain.Link
;
import
cc.ryanc.halo.model.dto.Archive
;
import
cc.ryanc.halo.model.dto.HaloConst
;
import
cc.ryanc.halo.service.*
;
import
cc.ryanc.halo.service.GalleryService
;
import
cc.ryanc.halo.service.LinkService
;
import
cc.ryanc.halo.service.PostService
;
import
cc.ryanc.halo.web.controller.core.BaseController
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
...
...
@@ -23,18 +25,9 @@ public class PagesController extends BaseController {
@Autowired
private
GalleryService
galleryService
;
@Autowired
private
UserService
userService
;
@Autowired
private
PostService
postService
;
@Autowired
private
MenuService
menuService
;
@Autowired
private
CategoryService
categoryService
;
@Autowired
private
LinkService
linkService
;
...
...
@@ -48,9 +41,6 @@ public class PagesController extends BaseController {
@GetMapping
(
value
=
"/about"
)
public
String
about
(
Model
model
){
model
.
addAttribute
(
"about"
,
"709831589"
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
this
.
render
(
"about"
);
}
...
...
@@ -64,14 +54,8 @@ public class PagesController extends BaseController {
List
<
Gallery
>
galleries
=
galleryService
.
findAllGalleries
();
model
.
addAttribute
(
"galleries"
,
galleries
);
//用户信息
User
user
=
userService
.
findUser
();
model
.
addAttribute
(
"user"
,
user
);
model
.
addAttribute
(
"is_gallery"
,
true
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
this
.
render
(
"gallery"
);
}
...
...
@@ -88,29 +72,12 @@ public class PagesController extends BaseController {
List
<
Link
>
links
=
linkService
.
findAllLinks
();
model
.
addAttribute
(
"links"
,
links
);
//用户信息
User
user
=
userService
.
findUser
();
model
.
addAttribute
(
"user"
,
user
);
model
.
addAttribute
(
"is_links"
,
true
);
//文章总数
model
.
addAttribute
(
"postsCount"
,
postService
.
findAllPosts
().
size
());
//菜单列表
List
<
Menu
>
menus
=
menuService
.
findAllMenus
();
model
.
addAttribute
(
"menus"
,
menus
);
//所有分类目录
List
<
Category
>
categories
=
categoryService
.
findAllCategories
();
model
.
addAttribute
(
"categories"
,
categories
);
//归档数据,包含[year,month,count,List<Post>]
List
<
Archive
>
archives
=
postService
.
findPostGroupByYearAndMonth
();
model
.
addAttribute
(
"archives"
,
archives
);
//设置选项
model
.
addAttribute
(
"options"
,
HaloConst
.
OPTIONS
);
return
this
.
render
(
"links"
);
}
}
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
Menu
Projects
Groups
Snippets
Help