Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
guns-vip
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenjunxiong
guns-vip
Commits
0524c159
Commit
0524c159
authored
Oct 08, 2018
by
fengshuonan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新404页面
parent
7919acd5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
src/main/java/cn/stylefeng/guns/GunsApplication.java
+2
-1
src/main/java/cn/stylefeng/guns/config/web/WebConfig.java
+11
-2
No files found.
src/main/java/cn/stylefeng/guns/GunsApplication.java
View file @
0524c159
...
...
@@ -15,6 +15,7 @@
*/
package
cn
.
stylefeng
.
guns
;
import
cn.stylefeng.roses.core.config.WebAutoConfiguration
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.boot.SpringApplication
;
...
...
@@ -26,7 +27,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* @author stylefeng
* @Date 2017/5/21 12:06
*/
@SpringBootApplication
@SpringBootApplication
(
exclude
=
WebAutoConfiguration
.
class
)
public
class
GunsApplication
{
private
final
static
Logger
logger
=
LoggerFactory
.
getLogger
(
GunsApplication
.
class
);
...
...
src/main/java/cn/stylefeng/guns/config/web/WebConfig.java
View file @
0524c159
...
...
@@ -16,6 +16,7 @@
package
cn
.
stylefeng
.
guns
.
config
.
web
;
import
cn.stylefeng.guns.config.properties.GunsProperties
;
import
cn.stylefeng.guns.core.controller.GunsErrorView
;
import
cn.stylefeng.guns.core.intercept.RestApiInteceptor
;
import
cn.stylefeng.guns.core.listener.ConfigListener
;
import
cn.stylefeng.roses.core.xss.XssFilter
;
...
...
@@ -38,7 +39,7 @@ import org.springframework.context.annotation.Configuration;
import
org.springframework.web.context.request.RequestContextListener
;
import
org.springframework.web.servlet.config.annotation.InterceptorRegistry
;
import
org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurer
Adapter
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurer
;
import
java.util.Arrays
;
import
java.util.Properties
;
...
...
@@ -50,7 +51,7 @@ import java.util.Properties;
* @date 2016年11月12日 下午5:03:32
*/
@Configuration
public
class
WebConfig
extends
WebMvcConfigurerAdapt
er
{
public
class
WebConfig
implements
WebMvcConfigur
er
{
@Autowired
private
GunsProperties
gunsProperties
;
...
...
@@ -75,6 +76,14 @@ public class WebConfig extends WebMvcConfigurerAdapter {
}
/**
* 默认错误页面,返回json
*/
@Bean
(
"error"
)
public
GunsErrorView
error
()
{
return
new
GunsErrorView
();
}
/**
* druidServlet注册
*/
@Bean
...
...
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