Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
IEQEFCR
halo
提交
af29d32d
H
halo
项目概览
IEQEFCR
/
halo
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
H
halo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
af29d32d
编写于
4月 24, 2019
作者:
RYAN0UP
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change run.halo.app.web.controller to run.halo.app.controller
上级
56f55773
变更
36
隐藏空白更改
内联
并排
Showing
36 changed file
with
39 addition
and
39 deletion
+39
-39
src/main/java/run/halo/app/config/SwaggerConfiguration.java
src/main/java/run/halo/app/config/SwaggerConfiguration.java
+2
-2
src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java
...ain/java/run/halo/app/config/WebMvcAutoConfiguration.java
+2
-2
src/main/java/run/halo/app/controller/admin/MainController.java
...in/java/run/halo/app/controller/admin/MainController.java
+1
-1
src/main/java/run/halo/app/controller/admin/api/AdminController.java
...va/run/halo/app/controller/admin/api/AdminController.java
+1
-1
src/main/java/run/halo/app/controller/admin/api/AttachmentController.java
...n/halo/app/controller/admin/api/AttachmentController.java
+1
-1
src/main/java/run/halo/app/controller/admin/api/CategoryController.java
...run/halo/app/controller/admin/api/CategoryController.java
+1
-1
src/main/java/run/halo/app/controller/admin/api/CommentController.java
.../run/halo/app/controller/admin/api/CommentController.java
+1
-1
src/main/java/run/halo/app/controller/admin/api/GalleryController.java
.../run/halo/app/controller/admin/api/GalleryController.java
+1
-1
src/main/java/run/halo/app/controller/admin/api/LinkController.java
...ava/run/halo/app/controller/admin/api/LinkController.java
+1
-1
src/main/java/run/halo/app/controller/admin/api/LogController.java
...java/run/halo/app/controller/admin/api/LogController.java
+1
-1
src/main/java/run/halo/app/controller/admin/api/MenuController.java
...ava/run/halo/app/controller/admin/api/MenuController.java
+1
-1
src/main/java/run/halo/app/controller/admin/api/OptionController.java
...a/run/halo/app/controller/admin/api/OptionController.java
+1
-1
src/main/java/run/halo/app/controller/admin/api/PostController.java
...ava/run/halo/app/controller/admin/api/PostController.java
+1
-1
src/main/java/run/halo/app/controller/admin/api/TagController.java
...java/run/halo/app/controller/admin/api/TagController.java
+1
-1
src/main/java/run/halo/app/controller/admin/api/ThemeController.java
...va/run/halo/app/controller/admin/api/ThemeController.java
+1
-1
src/main/java/run/halo/app/controller/admin/api/UserController.java
...ava/run/halo/app/controller/admin/api/UserController.java
+1
-1
src/main/java/run/halo/app/controller/base/CommonResultControllerAdvice.java
...alo/app/controller/base/CommonResultControllerAdvice.java
+2
-2
src/main/java/run/halo/app/controller/base/ControllerExceptionHandler.java
.../halo/app/controller/base/ControllerExceptionHandler.java
+1
-1
src/main/java/run/halo/app/controller/content/ContentArchiveController.java
...halo/app/controller/content/ContentArchiveController.java
+1
-1
src/main/java/run/halo/app/controller/content/ContentCategoryController.java
...alo/app/controller/content/ContentCategoryController.java
+1
-1
src/main/java/run/halo/app/controller/content/ContentFeedController.java
...un/halo/app/controller/content/ContentFeedController.java
+1
-1
src/main/java/run/halo/app/controller/content/ContentIndexController.java
...n/halo/app/controller/content/ContentIndexController.java
+1
-1
src/main/java/run/halo/app/controller/content/ContentSearchController.java
.../halo/app/controller/content/ContentSearchController.java
+1
-1
src/main/java/run/halo/app/controller/content/ContentSheetController.java
...n/halo/app/controller/content/ContentSheetController.java
+1
-1
src/main/java/run/halo/app/controller/content/ContentTagController.java
...run/halo/app/controller/content/ContentTagController.java
+1
-1
src/main/java/run/halo/app/controller/content/api/ArchiveController.java
...un/halo/app/controller/content/api/ArchiveController.java
+1
-1
src/main/java/run/halo/app/controller/content/api/CommentController.java
...un/halo/app/controller/content/api/CommentController.java
+1
-1
src/main/java/run/halo/app/controller/content/api/LinkController.java
...a/run/halo/app/controller/content/api/LinkController.java
+1
-1
src/main/java/run/halo/app/controller/content/api/MenuController.java
...a/run/halo/app/controller/content/api/MenuController.java
+1
-1
src/main/java/run/halo/app/controller/content/api/OptionController.java
...run/halo/app/controller/content/api/OptionController.java
+1
-1
src/main/java/run/halo/app/controller/content/api/PostController.java
...a/run/halo/app/controller/content/api/PostController.java
+1
-1
src/main/java/run/halo/app/controller/content/api/TagController.java
...va/run/halo/app/controller/content/api/TagController.java
+1
-1
src/main/java/run/halo/app/controller/content/api/UserController.java
...a/run/halo/app/controller/content/api/UserController.java
+1
-1
src/main/java/run/halo/app/controller/core/CommonController.java
...n/java/run/halo/app/controller/core/CommonController.java
+1
-1
src/main/java/run/halo/app/controller/core/InstallController.java
.../java/run/halo/app/controller/core/InstallController.java
+1
-1
src/main/java/run/halo/app/controller/support/PageJacksonSerializer.java
...un/halo/app/controller/support/PageJacksonSerializer.java
+1
-1
未找到文件。
src/main/java/run/halo/app/config/SwaggerConfiguration.java
浏览文件 @
af29d32d
...
...
@@ -64,7 +64,7 @@ public class SwaggerConfiguration {
log
.
debug
(
"Doc disabled: [{}]"
,
haloProperties
.
isDocDisabled
());
// TODO Build with different security configuration
return
buildApiDocket
(
"run.halo.app.content.api"
,
"run.halo.app.
web.
controller.content.api"
,
"run.halo.app.controller.content.api"
,
"/api/**"
)
.
enable
(!
haloProperties
.
isDocDisabled
());
}
...
...
@@ -74,7 +74,7 @@ public class SwaggerConfiguration {
log
.
debug
(
"Doc disabled: [{}]"
,
haloProperties
.
isDocDisabled
());
// TODO Build with different security configuration
return
buildApiDocket
(
"run.halo.app.admin"
,
"run.halo.app.
web.
controller.admin"
,
"run.halo.app.controller.admin"
,
"/api/admin/**"
)
.
enable
(!
haloProperties
.
isDocDisabled
());
}
...
...
src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java
浏览文件 @
af29d32d
...
...
@@ -23,7 +23,7 @@ import run.halo.app.config.properties.HaloProperties;
import
run.halo.app.factory.StringToEnumConverterFactory
;
import
run.halo.app.model.support.HaloConst
;
import
run.halo.app.security.resolver.AuthenticationArgumentResolver
;
import
run.halo.app.
web.
controller.support.PageJacksonSerializer
;
import
run.halo.app.controller.support.PageJacksonSerializer
;
import
java.util.List
;
...
...
@@ -36,7 +36,7 @@ import java.util.List;
@Slf4j
@Configuration
@EnableWebMvc
@ComponentScan
(
basePackages
=
"run.halo.app.
web.
controller"
)
@ComponentScan
(
basePackages
=
"run.halo.app.controller"
)
@PropertySource
(
value
=
"classpath:application.yaml"
,
ignoreResourceNotFound
=
true
,
encoding
=
"UTF-8"
)
public
class
WebMvcAutoConfiguration
implements
WebMvcConfigurer
{
...
...
src/main/java/run/halo/app/
web/
controller/admin/MainController.java
→
src/main/java/run/halo/app/controller/admin/MainController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.admin
;
package
run.halo.app.controller.admin
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.GetMapping
;
...
...
src/main/java/run/halo/app/
web/
controller/admin/api/AdminController.java
→
src/main/java/run/halo/app/controller/admin/api/AdminController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.admin.api
;
package
run.halo.app.controller.admin.api
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
...
...
src/main/java/run/halo/app/
web/
controller/admin/api/AttachmentController.java
→
src/main/java/run/halo/app/controller/admin/api/AttachmentController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.admin.api
;
package
run.halo.app.controller.admin.api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.data.domain.Page
;
...
...
src/main/java/run/halo/app/
web/
controller/admin/api/CategoryController.java
→
src/main/java/run/halo/app/controller/admin/api/CategoryController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.admin.api
;
package
run.halo.app.controller.admin.api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.data.domain.Sort
;
...
...
src/main/java/run/halo/app/
web/
controller/admin/api/CommentController.java
→
src/main/java/run/halo/app/controller/admin/api/CommentController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.admin.api
;
package
run.halo.app.controller.admin.api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.data.domain.Page
;
...
...
src/main/java/run/halo/app/
web/
controller/admin/api/GalleryController.java
→
src/main/java/run/halo/app/controller/admin/api/GalleryController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.admin.api
;
package
run.halo.app.controller.admin.api
;
import
run.halo.app.model.dto.GalleryDTO
;
import
run.halo.app.service.GalleryService
;
...
...
src/main/java/run/halo/app/
web/
controller/admin/api/LinkController.java
→
src/main/java/run/halo/app/controller/admin/api/LinkController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.admin.api
;
package
run.halo.app.controller.admin.api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.data.domain.Sort
;
...
...
src/main/java/run/halo/app/
web/
controller/admin/api/LogController.java
→
src/main/java/run/halo/app/controller/admin/api/LogController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.admin.api
;
package
run.halo.app.controller.admin.api
;
import
run.halo.app.model.dto.LogDTO
;
import
run.halo.app.service.LogService
;
...
...
src/main/java/run/halo/app/
web/
controller/admin/api/MenuController.java
→
src/main/java/run/halo/app/controller/admin/api/MenuController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.admin.api
;
package
run.halo.app.controller.admin.api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.data.domain.Sort
;
...
...
src/main/java/run/halo/app/
web/
controller/admin/api/OptionController.java
→
src/main/java/run/halo/app/controller/admin/api/OptionController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.admin.api
;
package
run.halo.app.controller.admin.api
;
import
run.halo.app.model.dto.OptionDTO
;
import
run.halo.app.model.params.OptionParam
;
...
...
src/main/java/run/halo/app/
web/
controller/admin/api/PostController.java
→
src/main/java/run/halo/app/controller/admin/api/PostController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.admin.api
;
package
run.halo.app.controller.admin.api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.data.domain.Page
;
...
...
src/main/java/run/halo/app/
web/
controller/admin/api/TagController.java
→
src/main/java/run/halo/app/controller/admin/api/TagController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.admin.api
;
package
run.halo.app.controller.admin.api
;
import
run.halo.app.model.dto.TagDTO
;
import
run.halo.app.model.entity.Tag
;
...
...
src/main/java/run/halo/app/
web/
controller/admin/api/ThemeController.java
→
src/main/java/run/halo/app/controller/admin/api/ThemeController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.admin.api
;
package
run.halo.app.controller.admin.api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.http.HttpStatus
;
...
...
src/main/java/run/halo/app/
web/
controller/admin/api/UserController.java
→
src/main/java/run/halo/app/controller/admin/api/UserController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.admin.api
;
package
run.halo.app.controller.admin.api
;
import
run.halo.app.model.dto.UserDTO
;
import
run.halo.app.model.entity.User
;
...
...
src/main/java/run/halo/app/
web/
controller/base/CommonResultControllerAdvice.java
→
src/main/java/run/halo/app/controller/base/CommonResultControllerAdvice.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.base
;
package
run.halo.app.controller.base
;
import
run.halo.app.model.support.BaseResponse
;
import
org.springframework.core.MethodParameter
;
...
...
@@ -20,7 +20,7 @@ import run.halo.app.model.support.BaseResponse;
*
* @author johnniang
*/
@ControllerAdvice
(
"run.halo.app.
web.
controller"
)
@ControllerAdvice
(
"run.halo.app.controller"
)
public
class
CommonResultControllerAdvice
implements
ResponseBodyAdvice
<
Object
>
{
@Override
...
...
src/main/java/run/halo/app/
web/
controller/base/ControllerExceptionHandler.java
→
src/main/java/run/halo/app/controller/base/ControllerExceptionHandler.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.base
;
package
run.halo.app.controller.base
;
import
org.springframework.web.HttpMediaTypeNotAcceptableException
;
import
run.halo.app.exception.HaloException
;
...
...
src/main/java/run/halo/app/
web/
controller/content/ContentArchiveController.java
→
src/main/java/run/halo/app/controller/content/ContentArchiveController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.content
;
package
run.halo.app.controller.content
;
import
cn.hutool.core.util.PageUtil
;
import
lombok.extern.slf4j.Slf4j
;
...
...
src/main/java/run/halo/app/
web/
controller/content/ContentCategoryController.java
→
src/main/java/run/halo/app/controller/content/ContentCategoryController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.content
;
package
run.halo.app.controller.content
;
import
cn.hutool.core.util.PageUtil
;
import
org.springframework.data.domain.Page
;
...
...
src/main/java/run/halo/app/
web/
controller/content/ContentFeedController.java
→
src/main/java/run/halo/app/controller/content/ContentFeedController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.content
;
package
run.halo.app.controller.content
;
import
freemarker.template.Template
;
import
freemarker.template.TemplateException
;
...
...
src/main/java/run/halo/app/
web/
controller/content/ContentIndexController.java
→
src/main/java/run/halo/app/controller/content/ContentIndexController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.content
;
package
run.halo.app.controller.content
;
import
cn.hutool.core.util.PageUtil
;
import
lombok.extern.slf4j.Slf4j
;
...
...
src/main/java/run/halo/app/
web/
controller/content/ContentSearchController.java
→
src/main/java/run/halo/app/controller/content/ContentSearchController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.content
;
package
run.halo.app.controller.content
;
import
cn.hutool.core.util.PageUtil
;
import
org.springframework.data.domain.Page
;
...
...
src/main/java/run/halo/app/
web/
controller/content/ContentSheetController.java
→
src/main/java/run/halo/app/controller/content/ContentSheetController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.content
;
package
run.halo.app.controller.content
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.ui.Model
;
...
...
src/main/java/run/halo/app/
web/
controller/content/ContentTagController.java
→
src/main/java/run/halo/app/controller/content/ContentTagController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.content
;
package
run.halo.app.controller.content
;
import
cn.hutool.core.util.PageUtil
;
import
org.springframework.data.domain.Page
;
...
...
src/main/java/run/halo/app/
web/
controller/content/api/ArchiveController.java
→
src/main/java/run/halo/app/controller/content/api/ArchiveController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.content.api
;
package
run.halo.app.controller.content.api
;
import
run.halo.app.model.vo.ArchiveMonthVO
;
import
run.halo.app.model.vo.ArchiveYearVO
;
...
...
src/main/java/run/halo/app/
web/
controller/content/api/CommentController.java
→
src/main/java/run/halo/app/controller/content/api/CommentController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.content.api
;
package
run.halo.app.controller.content.api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.web.bind.annotation.PostMapping
;
...
...
src/main/java/run/halo/app/
web/
controller/content/api/LinkController.java
→
src/main/java/run/halo/app/controller/content/api/LinkController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.content.api
;
package
run.halo.app.controller.content.api
;
import
run.halo.app.model.vo.LinkTeamVO
;
import
run.halo.app.service.LinkService
;
...
...
src/main/java/run/halo/app/
web/
controller/content/api/MenuController.java
→
src/main/java/run/halo/app/controller/content/api/MenuController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.content.api
;
package
run.halo.app.controller.content.api
;
import
run.halo.app.model.dto.MenuDTO
;
import
run.halo.app.service.MenuService
;
...
...
src/main/java/run/halo/app/
web/
controller/content/api/OptionController.java
→
src/main/java/run/halo/app/controller/content/api/OptionController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.content.api
;
package
run.halo.app.controller.content.api
;
import
run.halo.app.model.dto.OptionDTO
;
import
run.halo.app.model.support.BaseResponse
;
...
...
src/main/java/run/halo/app/
web/
controller/content/api/PostController.java
→
src/main/java/run/halo/app/controller/content/api/PostController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.content.api
;
package
run.halo.app.controller.content.api
;
import
run.halo.app.model.dto.post.PostDetailOutputDTO
;
import
run.halo.app.model.dto.post.PostSimpleOutputDTO
;
...
...
src/main/java/run/halo/app/
web/
controller/content/api/TagController.java
→
src/main/java/run/halo/app/controller/content/api/TagController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.content.api
;
package
run.halo.app.controller.content.api
;
import
run.halo.app.model.dto.TagDTO
;
import
run.halo.app.model.dto.post.PostSimpleOutputDTO
;
...
...
src/main/java/run/halo/app/
web/
controller/content/api/UserController.java
→
src/main/java/run/halo/app/controller/content/api/UserController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.content.api
;
package
run.halo.app.controller.content.api
;
import
run.halo.app.model.dto.UserDTO
;
import
run.halo.app.service.UserService
;
...
...
src/main/java/run/halo/app/
web/
controller/core/CommonController.java
→
src/main/java/run/halo/app/controller/core/CommonController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.core
;
package
run.halo.app.controller.core
;
import
cn.hutool.core.text.StrBuilder
;
import
lombok.extern.slf4j.Slf4j
;
...
...
src/main/java/run/halo/app/
web/
controller/core/InstallController.java
→
src/main/java/run/halo/app/controller/core/InstallController.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.core
;
package
run.halo.app.controller.core
;
import
cn.hutool.core.util.StrUtil
;
import
freemarker.template.Configuration
;
...
...
src/main/java/run/halo/app/
web/
controller/support/PageJacksonSerializer.java
→
src/main/java/run/halo/app/controller/support/PageJacksonSerializer.java
浏览文件 @
af29d32d
package
run.halo.app.
web.
controller.support
;
package
run.halo.app.controller.support
;
import
run.halo.app.model.support.CommentPage
;
import
com.fasterxml.jackson.core.JsonGenerator
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录