Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yujianwangzivayy
MaxKey
提交
cc2f20dd
MaxKey
项目概览
yujianwangzivayy
/
MaxKey
与 Fork 源项目一致
Fork自
MaxKey单点登录官方(MaxKeyTop) / MaxKey
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
MaxKey
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
cc2f20dd
编写于
3月 02, 2021
作者:
M
MaxKey
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
springboot-actuator
上级
20265352
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
68 addition
and
47 deletion
+68
-47
build.gradle
build.gradle
+8
-3
maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java
...n/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java
+3
-0
maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java
...java/org/maxkey/autoconfigure/RedisAutoConfiguration.java
+6
-6
maxkey-core/src/main/java/org/maxkey/configuration/EmailConfig.java
...e/src/main/java/org/maxkey/configuration/EmailConfig.java
+2
-2
maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java
...manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java
+1
-2
maxkey-web-manage/src/main/resources/application.properties
maxkey-web-manage/src/main/resources/application.properties
+26
-17
maxkey-web-maxkey/src/main/resources/application.properties
maxkey-web-maxkey/src/main/resources/application.properties
+22
-17
未找到文件。
build.gradle
浏览文件 @
cc2f20dd
...
...
@@ -201,9 +201,9 @@ subprojects {
//kafka support
// https://mvnrepository.com/artifact/org.apache.kafka/kafka-clients
compile
group:
'org.apache.kafka'
,
name:
'kafka-clients'
,
version:
'2.
5.0
'
compile
group:
'org.apache.kafka'
,
name:
'kafka-clients'
,
version:
'2.
6.1
'
// https://mvnrepository.com/artifact/org.springframework.kafka/spring-kafka
compile
group:
'org.springframework.kafka'
,
name:
'spring-kafka'
,
version:
'2.
5.2.RELEASE
'
compile
group:
'org.springframework.kafka'
,
name:
'spring-kafka'
,
version:
'2.
6.6
'
// https://mvnrepository.com/artifact/org.springframework.retry/spring-retry
compile
group:
'org.springframework.retry'
,
name:
'spring-retry'
,
version:
'1.3.0'
...
...
@@ -215,6 +215,8 @@ subprojects {
compile
group:
'org.springframework.boot'
,
name:
'spring-boot'
,
version:
"${springBootVersion}"
compile
group:
'org.springframework.boot'
,
name:
'spring-boot-starter'
,
version:
"${springBootVersion}"
compile
group:
'org.springframework.boot'
,
name:
'spring-boot-actuator'
,
version:
"${springBootVersion}"
compile
group:
'org.springframework.boot'
,
name:
'spring-boot-starter-actuator'
,
version:
"${springBootVersion}"
compile
group:
'org.springframework.boot'
,
name:
'spring-boot-actuator-autoconfigure'
,
version:
"${springBootVersion}"
compile
group:
'org.springframework.boot'
,
name:
'spring-boot-autoconfigure'
,
version:
"${springBootVersion}"
compile
group:
'org.springframework.boot'
,
name:
'spring-boot-starter-freemarker'
,
version:
"${springBootVersion}"
compile
group:
'org.springframework.boot'
,
name:
'spring-boot-starter-log4j2'
,
version:
"${springBootVersion}"
...
...
@@ -320,7 +322,10 @@ subprojects {
compile
group:
'org.ogce'
,
name:
'xpp3'
,
version:
'1.1.6'
compile
group:
'com.thoughtworks.xstream'
,
name:
'xstream'
,
version:
'1.4.10'
compile
group:
'org.passay'
,
name:
'passay'
,
version:
'1.6.0'
compile
group:
'io.micrometer'
,
name:
'micrometer-core'
,
version:
'1.6.4'
compile
group:
'org.latencyutils'
,
name:
'LatencyUtils'
,
version:
'2.0.3'
compile
group:
'org.codehaus.woodstox'
,
name:
'stax2-api'
,
version:
'4.2.1'
//docs
compile
group:
'org.mapstruct'
,
name:
'mapstruct'
,
version:
'1.4.1.Final'
compile
group:
'io.swagger'
,
name:
'swagger-annotations'
,
version:
"${swaggerVersion}"
...
...
maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java
浏览文件 @
cc2f20dd
...
...
@@ -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
;
...
...
maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java
浏览文件 @
cc2f20dd
...
...
@@ -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
();
...
...
maxkey-core/src/main/java/org/maxkey/configuration/EmailConfig.java
浏览文件 @
cc2f20dd
...
...
@@ -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}"
)
...
...
maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java
浏览文件 @
cc2f20dd
...
...
@@ -19,7 +19,6 @@ package org.maxkey;
import
java.util.Date
;
import
javax.servlet.ServletException
;
import
org.maxkey.configuration.ApplicationConfig
;
import
org.maxkey.web.InitializeContext
;
import
org.mybatis.spring.annotation.MapperScan
;
...
...
@@ -32,7 +31,6 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.annotation.ComponentScan
;
@SpringBootApplication
@ComponentScan
(
basePackages
=
{
"org.maxkey.MaxKeyMgtConfig"
,
"org.maxkey.MaxKeyMgtMvcConfig"
,
...
...
@@ -54,6 +52,7 @@ import org.springframework.context.annotation.ComponentScan;
"org.maxkey.identity.rest"
})
@MapperScan
(
"org.maxkey.persistence.mapper,"
)
@SpringBootApplication
public
class
MaxKeyMgtApplication
extends
SpringBootServletInitializer
{
private
static
final
Logger
_logger
=
LoggerFactory
.
getLogger
(
MaxKeyMgtApplication
.
class
);
...
...
maxkey-web-manage/src/main/resources/application.properties
浏览文件 @
cc2f20dd
...
...
@@ -25,24 +25,25 @@ mybatis.type-aliases-package=org.maxkey.domain,org.maxkey.domain.apps,
mybatis.mapper-locations
=
classpath*:/org/maxkey/persistence/mapper/xml/mysql/*.xml
mybatis.table-column-escape
=
true
#redis
spring.redis.host
=
127.0.0.1
spring.redis.port
=
6379
spring.redis.password
=
password
spring.redis.timeout
=
10000
spring.redis.jedis.pool.max-wait
=
1000
spring.redis.jedis.pool.max-idle
=
200
spring.redis.lettuce.pool.max-active
=
-1
spring.redis.lettuce.pool.min-idle
=
0
#
spring.redis.host=127.0.0.1
#
spring.redis.port=6379
#
spring.redis.password=password
#
spring.redis.timeout=10000
#
spring.redis.jedis.pool.max-wait=1000
#
spring.redis.jedis.pool.max-idle=200
#
spring.redis.lettuce.pool.max-active=-1
#
spring.redis.lettuce.pool.min-idle=0
#mail
spring.mail.default-encoding
=
utf-8
spring.mail.host
=
smtp.163.com
spring.mail.port
=
465
spring.mail.username
=
maxkey@163.com
spring.mail.password
=
password
spring.mail.protocol
=
smtp
spring.mail.properties.ssl
=
true
spring.mail.properties.sender
=
maxkey@163.com
#spring.mail.default-encoding=utf-8
#spring.mail.host=smtp.163.com
#spring.mail.port=465
#spring.mail.username=maxkey@163.com
#spring.mail.password=password
#spring.mail.protocol=smtp
#spring.mail.properties.ssl=true
#spring.mail.properties.sender=maxkey@163.com
#freemarker
spring.freemarker.template-loader-path
=
classpath:/templates/views
spring.freemarker.cache
=
false
...
...
@@ -91,4 +92,12 @@ spring.kafka.producer.buffer-memory = 33554432
spring.kafka.producer.key-serializer
=
org.apache.kafka.common.serialization.StringSerializer
spring.kafka.producer.value-serializer
=
org.apache.kafka.common.serialization.StringSerializer
# \u81ea\u5b9a\u4e49\u5206\u533a\u5668
#
spring.kafka.producer.properties.partitioner.class
=
com.felix.kafka.producer.CustomizePartitioner
\ No newline at end of file
# spring.kafka.producer.properties.partitioner.class=com.felix.kafka.producer.CustomizePartitioner
#management.server.port=9522
#management.server.servlet.context-path=/maxkey-mgt-actuate
#management.endpoints.enabled-by-default=false
management.security.enabled
=
false
#management.endpoints.jmx.exposure.include=health,info
management.endpoints.web.exposure.include
=
metrics,health,info,env,beans
maxkey-web-maxkey/src/main/resources/application.properties
浏览文件 @
cc2f20dd
...
...
@@ -39,24 +39,24 @@ mybatis.mapper-locations=classpath*:/org/maxkey/persistence/mapper/xml/mysql/*.x
mybatis.table-column-escape
=
true
#redis
spring.redis.host
=
127.0.0.1
spring.redis.port
=
6379
spring.redis.password
=
password
spring.redis.timeout
=
10000
spring.redis.jedis.pool.max-wait
=
1000
spring.redis.jedis.pool.max-idle
=
200
spring.redis.lettuce.pool.max-active
=
-1
spring.redis.lettuce.pool.min-idle
=
0
#
spring.redis.host=127.0.0.1
#
spring.redis.port=6379
#
spring.redis.password=password
#
spring.redis.timeout=10000
#
spring.redis.jedis.pool.max-wait=1000
#
spring.redis.jedis.pool.max-idle=200
#
spring.redis.lettuce.pool.max-active=-1
#
spring.redis.lettuce.pool.min-idle=0
#mail
spring.mail.default-encoding
=
utf-8
spring.mail.host
=
smtp.163.com
spring.mail.port
=
465
spring.mail.username
=
maxkey@163.com
spring.mail.password
=
password
spring.mail.protocol
=
smtp
spring.mail.properties.ssl
=
true
spring.mail.properties.sender
=
maxkey@163.com
#
spring.mail.default-encoding=utf-8
#
spring.mail.host=smtp.163.com
#
spring.mail.port=465
#
spring.mail.username=maxkey@163.com
#
spring.mail.password=password
#
spring.mail.protocol=smtp
#
spring.mail.properties.ssl=true
#
spring.mail.properties.sender=maxkey@163.com
spring.mail.properties.mailotp.message.subject
=
MaxKey One Time PassWord
spring.mail.properties.mailotp.message.template
=
{0} You Token is {1} , it validity in {2} minutes.
...
...
@@ -117,4 +117,9 @@ spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.Str
maxkey.swagger.enable
=
true
maxkey.swagger.title
=
MaxKey
\u5355\u
70b9
\u
767b
\u
5f55
\u
8ba4
\u
8bc1
\u
7cfb
\u
7edfapi
\u6587\u6863
maxkey.swagger.description
=
MaxKey
\u5355\u
70b9
\u
767b
\u
5f55
\u
8ba4
\u
8bc1
\u
7cfb
\u
7edfapi
\u6587\u6863
maxkey.swagger.version
=
${application.formatted-version}
\ No newline at end of file
maxkey.swagger.version
=
${application.formatted-version}
management.security.enabled
=
false
#management.endpoints.jmx.exposure.include=health,info
management.endpoints.web.exposure.include
=
metrics,health,info,env
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录