Skip to content

Commit ca4c904

Browse files
committed
升级springboot为2.1.2.RELEASE版本
整合spring-boot-admin监控功功
1 parent 16a449f commit ca4c904

File tree

6 files changed

+184
-165
lines changed

6 files changed

+184
-165
lines changed

pom.xml

+12-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>2.0.2.RELEASE</version>
14+
<version>2.1.2.RELEASE</version>
1515
<relativePath/>
1616
</parent>
1717

@@ -54,7 +54,7 @@
5454
<mysql.version>5.1.29</mysql.version>
5555
<jackson.version>2.8.5</jackson.version>
5656
<servlet.version>3.0.1</servlet.version>
57-
<spring.boot.admin.version>2.1.1</spring.boot.admin.version>
57+
<spring.boot.admin.version>2.1.2</spring.boot.admin.version>
5858
</properties>
5959

6060
<dependencies>
@@ -107,8 +107,15 @@
107107
</dependency>
108108

109109
<dependency>
110-
<groupId>org.springframework.boot</groupId>
111-
<artifactId>spring-boot-starter-actuator</artifactId>
110+
<groupId>de.codecentric</groupId>
111+
<artifactId>spring-boot-admin-starter-client</artifactId>
112+
<version>${spring.boot.admin.version}</version>
113+
</dependency>
114+
115+
<dependency>
116+
<groupId>de.codecentric</groupId>
117+
<artifactId>spring-boot-admin-starter-server</artifactId>
118+
<version>${spring.boot.admin.version}</version>
112119
</dependency>
113120

114121
<!-- shiro spring. -->
@@ -264,6 +271,7 @@
264271
</dependency>
265272
</dependencies>
266273
<configuration>
274+
<mainClass>com.geekcattle.Application</mainClass>
267275
<fork>true</fork><!-- 如果没有该项配置,这个devtools不会起作用,即应用不会restart -->
268276
</configuration>
269277
</plugin>

src/main/java/com/geekcattle/Application.java

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package com.geekcattle;
1919

20+
import de.codecentric.boot.admin.server.config.EnableAdminServer;
2021
import org.springframework.boot.SpringApplication;
2122
import org.springframework.boot.autoconfigure.SpringBootApplication;
2223
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -27,6 +28,7 @@
2728
@EnableConfigurationProperties
2829
@EnableTransactionManagement
2930
@MapperScan("com.geekcattle.mapper")
31+
@EnableAdminServer
3032
public class Application {
3133
//启动文件
3234
public static void main(String[] args){

src/main/java/com/geekcattle/controller/IndexController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class IndexController {
3636

3737
@RequestMapping
3838
public String index(Model model) {
39-
return "index";
39+
return "home/index";
4040
}
4141

4242
@RequestMapping(value = "/test",method = {RequestMethod.GET})

src/main/java/com/geekcattle/core/shiro/ShiroConfiguration.java

+4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.springframework.context.annotation.Bean;
4343
import org.springframework.context.annotation.Configuration;
4444
import org.springframework.context.annotation.DependsOn;
45+
import org.springframework.core.annotation.Order;
4546
import org.springframework.web.filter.DelegatingFilterProxy;
4647

4748
import javax.servlet.Filter;
@@ -202,6 +203,7 @@ public FilterRegistrationBean filterProxy(){
202203
* 2、当设置多个过滤器时,全部验证通过,才视为通过
203204
* 3、部分过滤器可指定参数,如perms,roles
204205
*/
206+
@Order(-1)
205207
@Bean(name = "shiroFilter")
206208
public ShiroFilterFactoryBean shiroFilter(DefaultWebSecurityManager securityManager){
207209
logger.debug("ShiroConfiguration.shirFilter()");
@@ -234,6 +236,8 @@ public ShiroFilterFactoryBean shiroFilter(DefaultWebSecurityManager securityMana
234236

235237
//<!-- 过滤链定义,从上向下顺序执行,一般将 /**放在最为下边 -->:这是一个坑呢,一不小心代码就不好使了;
236238
//<!-- authc:所有url都必须认证通过才可以访问; anon:所有url都都可以匿名访问-->
239+
filterChainDefinitionMap.put("/monitor/**", "anon");
240+
filterChainDefinitionMap.put("/error", "anon");
237241
filterChainDefinitionMap.put("/console/login", "anon");
238242
filterChainDefinitionMap.put("/console/logout", "logout");
239243
//配置记住我或认证通过可以访问的地址

src/main/resources/application.yml

+12-7
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,20 @@ server:
1010
#日志配置
1111
logging:
1212
level:
13-
com.geekcattle.mapper : DEBUG
13+
com.springframework.boot.web: warn
14+
com.geekcattl : debug
15+
de.codecentric.boot.admin: warn
1416
file : "${user.home}/logs/spring-boot-logging.log"
1517

1618
management:
1719
endpoints:
1820
web:
1921
exposure:
2022
include: ["*"]
23+
base-path: /monitor/actuator
2124
endpoint:
22-
env:
23-
enabled: true
2425
health:
25-
enabled: true
2626
show-details: always
27-
info:
28-
enabled: true
29-
3027

3128
spring:
3229
application:
@@ -52,6 +49,13 @@ spring:
5249
datasource:
5350
type : com.alibaba.druid.pool.DruidDataSource
5451
driver-class-name : com.mysql.jdbc.Driver
52+
boot:
53+
admin:
54+
client:
55+
url: http://localhost:${server.port}/admin
56+
instance:
57+
service-base-url: http://localhost:${server.port}
58+
context-path: monitor
5559
#json配置
5660
jackson:
5761
time-zone : Asia/Chongqing
@@ -197,6 +201,7 @@ spring:
197201
host : 127.0.0.1
198202
port : 6379
199203
password : Hao123
204+
200205
server:
201206
port: 8000
202207
j2cache:

0 commit comments

Comments
 (0)