Skip to content

Commit 6af3d75

Browse files
committed
add actuator config
1 parent 19c2f01 commit 6af3d75

File tree

6 files changed

+53
-18
lines changed

6 files changed

+53
-18
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ logs/
55
work/
66
res
77
src/main/webapp/WEB-INF/classes/
8+
*.pid
89
.project
910
.classpath
1011
.settings/

pom.xml

+23
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,18 @@
7272
<groupId>org.springframework.boot</groupId>
7373
<artifactId>spring-boot-starter-logging</artifactId>
7474
</dependency>
75+
<dependency>
76+
<groupId>org.springframework.boot</groupId>
77+
<artifactId>spring-boot-starter-actuator</artifactId>
78+
</dependency>
79+
<dependency>
80+
<groupId>org.springframework.boot</groupId>
81+
<artifactId>spring-boot-starter-hateoas</artifactId>
82+
</dependency>
83+
<dependency>
84+
<groupId>org.springframework.boot</groupId>
85+
<artifactId>spring-boot-actuator-docs</artifactId>
86+
</dependency>
7587
<dependency>
7688
<groupId>org.springframework.data</groupId>
7789
<artifactId>spring-data-jdbc-core</artifactId>
@@ -222,6 +234,17 @@
222234
<plugin>
223235
<groupId>org.springframework.boot</groupId>
224236
<artifactId>spring-boot-maven-plugin</artifactId>
237+
<executions>
238+
<execution>
239+
<goals>
240+
<goal>build-info</goal>
241+
</goals>
242+
</execution>
243+
</executions>
244+
</plugin>
245+
<plugin>
246+
<groupId>pl.project13.maven</groupId>
247+
<artifactId>git-commit-id-plugin</artifactId>
225248
</plugin>
226249
</plugins>
227250
</build>

src/main/java/io/github/yangziwen/logreplay/LogreplayApplication.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.springframework.beans.factory.annotation.Autowired;
44
import org.springframework.boot.SpringApplication;
55
import org.springframework.boot.autoconfigure.SpringBootApplication;
6+
import org.springframework.boot.system.ApplicationPidFileWriter;
67
import org.springframework.boot.web.servlet.ServletComponentScan;
78
import org.springframework.context.annotation.Bean;
89
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -34,7 +35,9 @@ public AsyncEventBus eventBus(@Autowired ThreadPoolTaskExecutor executor) {
3435

3536
public static void main(String[] args) {
3637
System.setProperty("tomcat.util.http.parser.HttpParser.requestTargetAllow","|{}");
37-
SpringApplication.run(LogreplayApplication.class, args);
38+
SpringApplication application = new SpringApplication(LogreplayApplication.class);
39+
application.addListeners(new ApplicationPidFileWriter());
40+
application.run(args);
3841
}
3942

4043
}

src/main/java/io/github/yangziwen/logreplay/config/DataSourceConfig.java

+8-13
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,26 @@
33
import javax.sql.DataSource;
44

55
import org.springframework.beans.factory.annotation.Autowired;
6+
import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
7+
import org.springframework.boot.context.properties.ConfigurationProperties;
68
import org.springframework.context.annotation.Bean;
79
import org.springframework.context.annotation.Configuration;
810
import org.springframework.context.annotation.Primary;
9-
import org.springframework.core.env.Environment;
1011
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
1112

12-
import com.zaxxer.hikari.HikariConfig;
1313
import com.zaxxer.hikari.HikariDataSource;
1414

1515
@Configuration
1616
public class DataSourceConfig {
1717

18-
@Autowired
19-
private Environment env;
20-
2118
@Primary
2219
@Bean("dataSource")
23-
public DataSource dataSource() {
24-
HikariConfig config = new HikariConfig();
25-
config.setJdbcUrl(env.getProperty("spring.datasource.url"));
26-
config.setUsername(env.getProperty("spring.datasource.username"));
27-
config.setPassword(env.getProperty("spring.datasource.password"));
28-
config.setMinimumIdle(10);
29-
config.setMaximumPoolSize(100);
30-
return new HikariDataSource(config);
20+
@ConfigurationProperties("hiraki.datasource")
21+
public HikariDataSource dataSource() {
22+
return (HikariDataSource) DataSourceBuilder
23+
.create()
24+
.type(HikariDataSource.class)
25+
.build();
3126
}
3227

3328
@Bean

src/main/java/io/github/yangziwen/logreplay/config/ShiroConfig.java

+1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ public ShiroFilterFactoryBean shiroFilter(
100100
.put("/admin/**", "authc, roles[admin]")
101101
.put("/monitoring**", "roles[admin]")
102102
.put("/monitor/**", "roles[admin]")
103+
.put("/manage/**", "roles[admin]")
103104
.put("/**", "user")
104105
.build());
105106
return factoryBean;

src/main/resources/application.properties

+16-4
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,26 @@ server.tomcat.accesslog.pattern=%t %a "%r" %s (%D ms)
77

88
spring.main.banner-mode=off
99

10-
spring.datasource.url=jdbc:mysql://localhost:3306/logreplay?useUnicode=true&characterEncoding=UTF-8&useSSL=false
11-
spring.datasource.username=mobile
12-
spring.datasource.password=mobile
10+
spring.pid.file=logreplay.pid
11+
12+
hiraki.datasource.jdbc-url=jdbc:mysql://localhost:3306/logreplay?useUnicode=true&characterEncoding=UTF-8&useSSL=false
13+
hiraki.datasource.username=mobile
14+
hiraki.datasource.password=mobile
15+
hiraki.datasource.minimum-idle=10
16+
hiraki.datasource.maximum-pool-size=100
1317

1418
shiro.remember.me.cipher.key=2itfW92XazYRi5ltW0M2yA==
1519

1620
logging.file=logreplay.log
1721
logging.path=${server.tomcat.basedir}/logs
1822
logging.pattern.file=[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %-5level %logger{32} - %msg%n
1923
logging.pattern.console=${logging.pattern.file}
20-
logging.pattern.level=INFO
24+
logging.pattern.level=INFO
25+
26+
management.context-path=/manage
27+
management.security.enabled=true
28+
management.security.roles=admin
29+
#management.info.git.mode=full
30+
endpoints.sensitive=true
31+
endpoints.hypermedia.enabled=true
32+
endpoints.actuator.path=/actuator

0 commit comments

Comments
 (0)