diff --git a/udf-server/pom.xml b/udf-server/pom.xml index 959d23b..ccecc7f 100644 --- a/udf-server/pom.xml +++ b/udf-server/pom.xml @@ -23,6 +23,7 @@ udf-eureka-config-server + udf-admin-server diff --git a/udf-server/udf-admin-server/pom.xml b/udf-server/udf-admin-server/pom.xml new file mode 100644 index 0000000..4a0ddef --- /dev/null +++ b/udf-server/udf-admin-server/pom.xml @@ -0,0 +1,65 @@ + + + 4.0.0 + + udf-admin-server + udf-admin-server + jar + http://itkk.org:81 + + + org.itkk.udf + udf-server + 1.0 + + + + 9002 + 8002 + + + + + + de.codecentric + spring-boot-admin-starter-server + 2.1.0 + + + + de.codecentric + spring-boot-admin-starter-client + 2.1.0 + + + + org.itkk.udf + udf-starter-core + + + + + + + ${project.basedir}/src/main/resources/ + true + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${springboot.version} + + + + repackage + + + + + + + diff --git a/udf-server/udf-admin-server/src/main/java/org/itkk/udf/admin/server/UdfAdminServerApplication.java b/udf-server/udf-admin-server/src/main/java/org/itkk/udf/admin/server/UdfAdminServerApplication.java new file mode 100644 index 0000000..ad5ea1f --- /dev/null +++ b/udf-server/udf-admin-server/src/main/java/org/itkk/udf/admin/server/UdfAdminServerApplication.java @@ -0,0 +1,15 @@ +package org.itkk.udf.admin.server; + +import de.codecentric.boot.admin.server.config.EnableAdminServer; +import org.springframework.boot.SpringApplication; +import org.springframework.cloud.client.SpringCloudApplication; + +@SpringCloudApplication +@EnableAdminServer +public class UdfAdminServerApplication { + + public static void main(String[] args) { + SpringApplication.run(UdfAdminServerApplication.class, args); + } + +} diff --git a/udf-server/udf-admin-server/src/main/resources/banner.txt b/udf-server/udf-admin-server/src/main/resources/banner.txt new file mode 100644 index 0000000..1b84812 --- /dev/null +++ b/udf-server/udf-admin-server/src/main/resources/banner.txt @@ -0,0 +1,11 @@ + .----------------. .----------------. .----------------. +| .--------------. || .--------------. || .--------------. | +| | _____ _____ | || | ________ | || | _________ | | +| ||_ _||_ _|| || | |_ ___ `. | || | |_ ___ | | | +| | | | | | | || | | | `. \ | || | | |_ \_| | | +| | | ' ' | | || | | | | | | || | | _| | | +| | \ `--' / | || | _| |___.' / | || | _| |_ | | +| | `.__.' | || | |________.' | || | |_____| | | +| | | || | | || | | | +| '--------------' || '--------------' || '--------------' | + '----------------' '----------------' '----------------' \ No newline at end of file diff --git a/udf-server/udf-admin-server/src/main/resources/bootstrap-dev.properties b/udf-server/udf-admin-server/src/main/resources/bootstrap-dev.properties new file mode 100644 index 0000000..9041c04 --- /dev/null +++ b/udf-server/udf-admin-server/src/main/resources/bootstrap-dev.properties @@ -0,0 +1,16 @@ +# EUREKA.ENVIRONMENT ( EurekaServerBootstrap ) +eureka.environment=${spring.profiles.active} +# EUREKA.INSTANCE ( EurekaInstanceConfigBean ) +eureka.instance.preferIpAddress=true +# EUREKA.CLIENT (EurekaClientConfigBean , EurekaServerConfigBean ) +eureka.client.serviceUrl.defaultZone=http://127.0.0.1:9001/eureka/ +# SPRING.CLOUD.CONFIG.SERVER.GIT ( MultipleJGitEnvironmentRepository ) ({application}/{profile}/{label}) +spring.cloud.config.enabled=true +spring.cloud.config.profile=${spring.profiles.active} +spring.cloud.config.name=test +spring.cloud.config.label=2.X_and_Finchley.X +spring.cloud.config.failFast=true +spring.cloud.config.discovery.enabled=true +spring.cloud.config.discovery.serviceId=UDF-EUREKA-CONFIG-SERVER +# LOGGING +logging.file=d:/develop/application-log/${spring.application.name}_${server.port}_${spring.profiles.active}/base.log \ No newline at end of file diff --git a/udf-server/udf-admin-server/src/main/resources/bootstrap.properties b/udf-server/udf-admin-server/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..623cf73 --- /dev/null +++ b/udf-server/udf-admin-server/src/main/resources/bootstrap.properties @@ -0,0 +1,34 @@ +# INFO +info.build.group=${project.groupId} +info.build.artifact=${project.artifactId} +info.build.version=${project.version} +info.build.name=${spring.application.name} +info.build.env=${spring.profiles.active} +info.build.time=${project.build.date} +info.build.encoding=${project.build.sourceEncoding} +info.build.java.source=${java.version} +info.build.java.target=${java.version} +# SPRING +spring.application.name=${project.name} +# HTTP SERVER +server.port=${server.port} +# MANAGEMENT HTTP SERVER (ManagementServerProperties) +#management.server.address=127.0.0.1 +management.server.port=${management.port} +# ENDPOINTS WEB CONFIGURATION (WebEndpointProperties) +management.endpoints.web.exposure.include=* +# ENDPOINT +management.endpoint.health.showDetails=always +management.endpoint.shutdown.enabled=true +management.endpoint.restart.enabled=true +management.endpoint.pause.enabled=true +management.endpoint.resume.enabled=true +# JACKSON +#spring.jackson.dateFormat=${org.itkk.application.config.dateFormat} +#spring.jackson.jodaDateTimeFormat=${org.itkk.application.config.dateFormat} +spring.jackson.timeZone=Asia/Shanghai +spring.jackson.serialization.INDENT_OUTPUT=true +spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=true +spring.jackson.deserialization.FAIL_ON_UNKNOWN_PROPERTIES=true +spring.jackson.parser.ALLOW_SINGLE_QUOTES=true +spring.jackson.parser.ALLOW_UNQUOTED_CONTROL_CHARS=true \ No newline at end of file diff --git a/udf-server/udf-admin-server/src/main/resources/logback.xml b/udf-server/udf-admin-server/src/main/resources/logback.xml new file mode 100644 index 0000000..049dc97 --- /dev/null +++ b/udf-server/udf-admin-server/src/main/resources/logback.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/udf-starter/udf-starter-core/pom.xml b/udf-starter/udf-starter-core/pom.xml index 8b3bf43..e6693b4 100644 --- a/udf-starter/udf-starter-core/pom.xml +++ b/udf-starter/udf-starter-core/pom.xml @@ -81,20 +81,20 @@ ${commons-compress.version} - + - + - + org.springframework.cloud