LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

springboot-actuator

Browse Source
This commit is contained in:
MaxKey
2021-03-02 17:08:32 +08:00
parent 2026535275
commit cc2f20dd94
7 changed files with 68 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java
View File

@@ -29,6 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.actuate.endpoint.http.ActuatorMediaType;
import org.springframework.boot.web.server.ConfigurableWebServerFactory;
import org.springframework.boot.web.server.ErrorPage;
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
@@ -174,6 +175,8 @@ public class MvcAutoConfiguration implements InitializingBean {
new MappingJackson2HttpMessageConverter();
ArrayList<MediaType> mediaTypesList = new ArrayList<MediaType>();
mediaTypesList.add(MediaType.APPLICATION_JSON);
mediaTypesList.add(MediaType.valueOf(ActuatorMediaType.V2_JSON));
mediaTypesList.add(MediaType.valueOf(ActuatorMediaType.V3_JSON));
//mediaTypesList.add(MediaType.TEXT_PLAIN);
mappingJacksonHttpMessageConverter.setSupportedMediaTypes(mediaTypesList);
return mappingJacksonHttpMessageConverter;

12
maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java
View File

@@ -49,19 +49,19 @@ public class RedisAutoConfiguration implements InitializingBean {
public RedisConnectionFactory redisConnFactory(
@Value("${spring.redis.host}")
String host,
@Value("${spring.redis.port}")
@Value("${spring.redis.port:6379}")
int port,
@Value("${spring.redis.timeout}")
@Value("${spring.redis.timeout:10000}")
int timeout,
@Value("${spring.redis.password}")
String password,
@Value("${spring.redis.lettuce.pool.max-active}")
@Value("${spring.redis.lettuce.pool.max-active:-1}")
int maxActive,
@Value("${spring.redis.jedis.pool.max-wait}")
@Value("${spring.redis.jedis.pool.max-wait:1000}")
int maxWait,
@Value("${spring.redis.jedis.pool.max-idle}")
@Value("${spring.redis.jedis.pool.max-idle:100}")
int maxIdle,
@Value("${spring.redis.lettuce.pool.min-idle}")
@Value("${spring.redis.lettuce.pool.min-idle:0}")
int minIdle) {
_logger.debug("redisConnFactory init .");
RedisConnectionFactory factory = new RedisConnectionFactory();

4
maxkey-core/src/main/java/org/maxkey/configuration/EmailConfig.java
View File

@@ -35,10 +35,10 @@ public class EmailConfig {
@Value("${spring.mail.host}")
private String smtpHost;
@Value("${spring.mail.port}")
@Value("${spring.mail.port:465}")
private Integer port;
@Value("${spring.mail.properties.ssl}")
@Value("${spring.mail.properties.ssl:false}")
private boolean ssl;
@Value("${spring.mail.properties.sender}")