mirror of
https://gitee.com/dromara/MaxKey.git
synced 2025-12-07 01:18:27 +08:00
remove maxkey-monitor , is non-essential
This commit is contained in:
MaxKey
parent
472267c2da
commit
a424bc47c1
17
build.gradle
17
build.gradle
@ -53,8 +53,7 @@ def libjarsmapper=[
|
|||||||
'maxkey-synchronizer-ldap' :'maxkey_mgt',
|
'maxkey-synchronizer-ldap' :'maxkey_mgt',
|
||||||
'maxkey-synchronizer-dingtalk' :'maxkey_mgt',
|
'maxkey-synchronizer-dingtalk' :'maxkey_mgt',
|
||||||
'maxkey-synchronizer-workweixin' :'maxkey_mgt',
|
'maxkey-synchronizer-workweixin' :'maxkey_mgt',
|
||||||
'maxkey-synchronizer-reorgdept' :'maxkey_mgt',
|
'maxkey-synchronizer-reorgdept' :'maxkey_mgt'
|
||||||
'maxkey-monitor' :'maxkey_monitor'
|
|
||||||
]
|
]
|
||||||
|
|
||||||
configurations.all {
|
configurations.all {
|
||||||
@ -494,20 +493,6 @@ project('maxkey-common') {
|
|||||||
build.configure { finalizedBy copyDepJars }
|
build.configure { finalizedBy copyDepJars }
|
||||||
}
|
}
|
||||||
|
|
||||||
//copy Dep Jars to /build/maxkey-depjars,only maxkey-boot-monitor deps
|
|
||||||
project('maxkey-webs:maxkey-monitor') {
|
|
||||||
task copyDepJars(type:Copy) {
|
|
||||||
dependsOn assemble
|
|
||||||
//项目名 项目所在的group version 版本号
|
|
||||||
println "subproject " + project.name + ", group " + project.group +" , version " + project.version
|
|
||||||
//copy runtime
|
|
||||||
from configurations.runtimeClasspath
|
|
||||||
into "$rootDir/build/MaxKey-v${project.version}GA/maxkey_monitor";
|
|
||||||
}
|
|
||||||
|
|
||||||
build.configure { finalizedBy copyDepJars }
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register("buildRelease") {
|
tasks.register("buildRelease") {
|
||||||
dependsOn 'copyShellScript','copyWindowsShellScript'
|
dependsOn 'copyShellScript','copyWindowsShellScript'
|
||||||
|
|
||||||
|
|||||||
@ -53,8 +53,7 @@ def libjarsmapper=[
|
|||||||
'maxkey-synchronizer-ldap' :'maxkey_mgt',
|
'maxkey-synchronizer-ldap' :'maxkey_mgt',
|
||||||
'maxkey-synchronizer-dingtalk' :'maxkey_mgt',
|
'maxkey-synchronizer-dingtalk' :'maxkey_mgt',
|
||||||
'maxkey-synchronizer-workweixin' :'maxkey_mgt',
|
'maxkey-synchronizer-workweixin' :'maxkey_mgt',
|
||||||
'maxkey-synchronizer-reorgdept' :'maxkey_mgt',
|
'maxkey-synchronizer-reorgdept' :'maxkey_mgt'
|
||||||
'maxkey-boot-monitor' :'maxkey_monitor'
|
|
||||||
]
|
]
|
||||||
|
|
||||||
configurations.all {
|
configurations.all {
|
||||||
@ -490,20 +489,6 @@ project('maxkey-common') {
|
|||||||
build.configure { finalizedBy copyDepJars }
|
build.configure { finalizedBy copyDepJars }
|
||||||
}
|
}
|
||||||
|
|
||||||
//copy Dep Jars to /build/maxkey-depjars,only maxkey-boot-monitor deps
|
|
||||||
project('maxkey-webs:maxkey-boot-monitor') {
|
|
||||||
task copyDepJars(type:Copy) {
|
|
||||||
dependsOn assemble
|
|
||||||
//项目名 项目所在的group version 版本号
|
|
||||||
println "subproject " + project.name + ", group " + project.group +" , version " + project.version
|
|
||||||
//copy runtime
|
|
||||||
from configurations.runtimeClasspath
|
|
||||||
into "$rootDir/build/MaxKey-v${project.version}GA/maxkey_monitor";
|
|
||||||
}
|
|
||||||
|
|
||||||
build.configure { finalizedBy copyDepJars }
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register("buildRelease") {
|
tasks.register("buildRelease") {
|
||||||
dependsOn 'copyShellScript','copyWindowsShellScript'
|
dependsOn 'copyShellScript','copyWindowsShellScript'
|
||||||
|
|
||||||
|
|||||||
@ -1,29 +0,0 @@
|
|||||||
description = "maxkey-boot-monitor"
|
|
||||||
|
|
||||||
//add support for Java
|
|
||||||
apply plugin: 'java'
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation project(":maxkey-common")
|
|
||||||
|
|
||||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf', version: "${springBootVersion}"
|
|
||||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: "${springBootVersion}"
|
|
||||||
implementation group: 'org.springframework.security', name: 'spring-security-config', version: '5.5.1'
|
|
||||||
|
|
||||||
implementation group: 'de.codecentric', name: 'spring-boot-admin-server', version: "${springbootadminVersion}"
|
|
||||||
implementation group: 'de.codecentric', name: 'spring-boot-admin-server-ui', version: "${springbootadminVersion}"
|
|
||||||
implementation group: 'de.codecentric', name: 'spring-boot-admin-starter-server', version: "${springbootadminVersion}"
|
|
||||||
|
|
||||||
implementation group: 'org.thymeleaf', name: 'thymeleaf', version: "${thymeleafVersion}"
|
|
||||||
implementation group: 'org.thymeleaf', name: 'thymeleaf-spring5', version: "${thymeleafVersion}"
|
|
||||||
|
|
||||||
implementation group: 'io.projectreactor.netty', name: 'reactor-netty', version: "${reactornettyVersion}"
|
|
||||||
implementation group: 'io.projectreactor.netty', name: 'reactor-netty-http', version: "${reactornettyVersion}"
|
|
||||||
implementation group: 'io.projectreactor.netty', name: 'reactor-netty-core', version: "${reactornettyVersion}"
|
|
||||||
implementation group: 'io.projectreactor.addons', name: 'reactor-extra', version: "${reactorextraVersion}"
|
|
||||||
|
|
||||||
implementation group: 'io.netty', name: 'netty-all', version: "${nettyVersion}"
|
|
||||||
implementation group: 'com.hazelcast', name: 'hazelcast', version: "${hazelcastVersion}"
|
|
||||||
implementation group: 'org.attoparser', name: 'attoparser', version: "${attoparserVersion}"
|
|
||||||
implementation group: 'org.unbescape', name: 'unbescape', version: "${unbescapeVersion}"
|
|
||||||
}
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
maxkey monitor service
|
|
||||||
|
|
||||||
spring-boot-admin-server
|
|
||||||
version 2.5.6
|
|
||||||
Admin UI for administration of spring boot applications
|
|
||||||
https://github.com/codecentric/spring-boot-admin
|
|
||||||
Apache-2.0 License
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright [2022] [MaxKey of copyright http://www.maxkey.top]
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
package org.maxkey.boot.monitor;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
|
|
||||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
|
||||||
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
|
|
||||||
|
|
||||||
import de.codecentric.boot.admin.server.config.EnableAdminServer;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
@EnableAdminServer
|
|
||||||
@EnableDiscoveryClient
|
|
||||||
@SpringBootApplication(
|
|
||||||
exclude={
|
|
||||||
RedisAutoConfiguration.class,
|
|
||||||
DruidDataSourceAutoConfigure.class,
|
|
||||||
DataSourceAutoConfiguration.class
|
|
||||||
})
|
|
||||||
public class MaxKeyBootMonitor {
|
|
||||||
|
|
||||||
private static final Logger _logger = LoggerFactory.getLogger(MaxKeyBootMonitor.class);
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
_logger.info("Start MaxKeyBootMonitor ...");
|
|
||||||
SpringApplication.run(MaxKeyBootMonitor.class, args);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,62 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright [2022] [MaxKey of copyright http://www.maxkey.top]
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
package org.maxkey.boot.monitor;
|
|
||||||
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
|
||||||
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
|
|
||||||
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
|
|
||||||
import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
|
|
||||||
import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
@EnableWebSecurity
|
|
||||||
public class MonitorSecurityConfigurer extends WebSecurityConfigurerAdapter {
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void configure(HttpSecurity http) throws Exception {
|
|
||||||
// 登录成功处理类
|
|
||||||
SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
|
|
||||||
successHandler.setTargetUrlParameter("redirectTo");
|
|
||||||
successHandler.setDefaultTargetUrl("/");
|
|
||||||
|
|
||||||
http.authorizeRequests()
|
|
||||||
//无需认证
|
|
||||||
.antMatchers(
|
|
||||||
"/login", //登录页面
|
|
||||||
"/assets/**", //静态文件允许访问
|
|
||||||
"/actuator/**", //springboot-admin监控的请求
|
|
||||||
"/instances/**" //springboot-admin监控的实例信息请求
|
|
||||||
).permitAll()
|
|
||||||
//其他所有请求需要登录
|
|
||||||
.anyRequest().authenticated()
|
|
||||||
//登录
|
|
||||||
.and().formLogin().loginPage("/login").successHandler(successHandler)
|
|
||||||
//登出
|
|
||||||
.and().logout().logoutUrl("/logout").logoutSuccessUrl("/login")
|
|
||||||
.and().httpBasic()
|
|
||||||
.and().csrf()
|
|
||||||
.csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
|
|
||||||
.ignoringAntMatchers(
|
|
||||||
"/instances",
|
|
||||||
"/actuator/**"
|
|
||||||
);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
############################################################################
|
|
||||||
# Copyright [2021] [MaxKey of copyright http://www.maxkey.top]
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
############################################################################
|
|
||||||
#MaxKey Title and Version #
|
|
||||||
############################################################################
|
|
||||||
application.title =MaxKey
|
|
||||||
#for dynamic service discovery
|
|
||||||
spring.application.name =maxkey-monitor
|
|
||||||
application.formatted-version =v3.5.5 GA
|
|
||||||
|
|
||||||
server.port =9528
|
|
||||||
|
|
||||||
spring.security.user.name =monitor
|
|
||||||
spring.security.user.password =maxkey
|
|
||||||
spring.security.basic.enabled =false
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
#nacos config
|
|
||||||
spring.cloud.nacos.config.server-addr =${NACOS_CONFIG_SERVER_ADDR:127.0.0.1:8848}
|
|
||||||
# Nacos Console add configuration:
|
|
||||||
# Data ID:maxkey.properties
|
|
||||||
# Group:DEFAULT_GROUP
|
|
||||||
# configuration:useLocalCache=true
|
|
||||||
spring.application.name =maxkey-monitor
|
|
||||||
# Suffix for the configuration. Supports properties,yaml,yml,default is properties
|
|
||||||
spring.cloud.nacos.config.file-extension =properties
|
|
||||||
#spring.cloud.nacos.config.file-extension=yaml
|
|
||||||
#nacos enabled
|
|
||||||
spring.cloud.nacos.config.enabled =${NACOS_CONFIG_ENABLED:false}
|
|
||||||
spring.cloud.nacos.config.namespace =${NACOS_CONFIG_NAMESPACE:net-maxsso}
|
|
||||||
|
|
||||||
#nacos discovery
|
|
||||||
spring.cloud.nacos.discovery.enabled =${NACOS_DISCOVERY_ENABLED:false}
|
|
||||||
spring.cloud.nacos.discovery.server-addr =${NACOS_DISCOVERY_SERVER_ADDR:127.0.0.1:8848}
|
|
||||||
spring.cloud.nacos.discovery.namespace =${NACOS_DISCOVERY_NAMESPACE:net-maxsso}
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<Configuration status="INFO" monitorInterval="300">
|
|
||||||
<Appenders>
|
|
||||||
<Console name="consolePrint" target="SYSTEM_OUT">
|
|
||||||
<PatternLayout pattern="%d{YYYY-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger{36}:%L - %msg%n" />
|
|
||||||
</Console>
|
|
||||||
|
|
||||||
<!-- 输出到文件，按天或者超过128MB分割 每天进行归档yyyy-MM-dd -->
|
|
||||||
<RollingFile name="RollingFile" fileName="logs/maxkey-boot-admin.log" filePattern="logs/$${date:yyyyMMdd}/maxkey-boot-admin-%d{yyyy-MM-dd}-%i.log.gz">
|
|
||||||
<!-- 需要记录的级别 -->
|
|
||||||
<!-- <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY" /> -->
|
|
||||||
<PatternLayout pattern="%d{YYYY-MM-dd HH:mm:ss,SSS} %-5level [%t] %logger{36}:%L - %msg%n" />
|
|
||||||
<Policies>
|
|
||||||
<OnStartupTriggeringPolicy />
|
|
||||||
<TimeBasedTriggeringPolicy />
|
|
||||||
<SizeBasedTriggeringPolicy size="128 MB" />
|
|
||||||
</Policies>
|
|
||||||
<DefaultRolloverStrategy max="100"/>
|
|
||||||
</RollingFile>
|
|
||||||
</Appenders>
|
|
||||||
|
|
||||||
<Loggers>
|
|
||||||
<Logger level="INFO" name="org.springframework" ></Logger>
|
|
||||||
<Logger level="INFO" name="org.apache.logging" ></Logger>
|
|
||||||
<Logger level="DEBUG" name="org.maxkey" ></Logger>
|
|
||||||
<Logger level="ERROR" name="org.reflections.Reflections" ></Logger>
|
|
||||||
<Logger level="OFF" name="org.hibernate.validator.internal.util.Version" ></Logger>
|
|
||||||
|
|
||||||
<Root level="INFO">
|
|
||||||
<AppenderRef ref="consolePrint" />
|
|
||||||
<AppenderRef ref="RollingFile" />
|
|
||||||
</Root >
|
|
||||||
</Loggers>
|
|
||||||
</Configuration>
|
|
||||||
@ -56,8 +56,6 @@ include (
|
|||||||
'maxkey-webs:maxkey-web-maxkey',
|
'maxkey-webs:maxkey-web-maxkey',
|
||||||
//management(mgt)
|
//management(mgt)
|
||||||
'maxkey-webs:maxkey-web-mgt',
|
'maxkey-webs:maxkey-web-mgt',
|
||||||
//monitor
|
|
||||||
'maxkey-webs:maxkey-monitor',
|
|
||||||
//gataway
|
//gataway
|
||||||
'maxkey-webs:maxkey-gataway'
|
'maxkey-webs:maxkey-gataway'
|
||||||
)
|
)
|
||||||
Loading…
x
Reference in New Issue
Block a user