diff --git a/pluto-server/pom.xml b/pluto-server/pom.xml index e6b53aedb801192668580f711107fba139bd2752..7bc69203b92556844dbfb410fca1ef0485eacee8 100644 --- a/pluto-server/pom.xml +++ b/pluto-server/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - + <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> <version>2.4.0</version> <relativePath /> <!-- lookup parent from repository --> </parent> - + <groupId>de.itvsh.ozg.pluto</groupId> <artifactId>pluto-server</artifactId> <version>0.0.1-SNAPSHOT</version> @@ -26,6 +26,7 @@ <mapstruct.version>1.4.1.Final</mapstruct.version> <lorem.version>2.1</lorem.version> <faker.version>1.0.2</faker.version> + <spring-admin.version>2.3.1</spring-admin.version> </properties> <dependencies> @@ -39,6 +40,20 @@ <artifactId>grpc-server-spring-boot-starter</artifactId> <version>${grpc.spring-boot-starter.version}</version> </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-actuator</artifactId> + </dependency> + <dependency> + <groupId>de.codecentric</groupId> + <artifactId>spring-boot-admin-starter-client</artifactId> + <version>${spring-admin.version}</version> + </dependency> <!-- own projects --> <dependency> @@ -117,8 +132,16 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <executions> + <execution> + <id>build info</id> + <goals> + <goal>build-info</goal> + </goals> + </execution> + </executions> </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> diff --git a/pluto-server/src/main/resources/application-local.yml b/pluto-server/src/main/resources/application-local.yml index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d4988f25f8dd9475dd57964d9582ae6e7015dd37 100644 --- a/pluto-server/src/main/resources/application-local.yml +++ b/pluto-server/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +server: + port: 8085 + +spring: + boot: + admin: + client: + instance: + prefer-ip: true + url: http://localhost:8090 + \ No newline at end of file diff --git a/pluto-server/src/main/resources/application-oc.yml b/pluto-server/src/main/resources/application-oc.yml index 21b95724c030255ce5cf7f4e5e2972eb0517d397..026db0b9eb0633e8e8370d59b4316788781756e5 100644 --- a/pluto-server/src/main/resources/application-oc.yml +++ b/pluto-server/src/main/resources/application-oc.yml @@ -1,7 +1,9 @@ spring: + boot: + admin: + client: + instance: + prefer-ip: true data: mongodb: - host: 172.30.190.222 - authentication-database: admin - username: root - password: ldsjfa0avjklz \ No newline at end of file + host: 172.30.190.222 \ No newline at end of file diff --git a/pluto-server/src/main/resources/application.yml b/pluto-server/src/main/resources/application.yml index 8b137891791fe96927ad78e64b0aad7bded08bdc..7a03126c69d0b3bf8ad4df9d83e34416fb6108d8 100644 --- a/pluto-server/src/main/resources/application.yml +++ b/pluto-server/src/main/resources/application.yml @@ -1 +1,11 @@ +logging: + level: + ROOT: WARN + de.itvsh: INFO +spring: + application: + name: Pluto + data: + mongodb: + authentication-database: admin diff --git a/pluto-server/src/main/resources/banner.txt b/pluto-server/src/main/resources/banner.txt new file mode 100644 index 0000000000000000000000000000000000000000..1df2e8adffe5764e65d8f17b85b4d2ad476b7b6c --- /dev/null +++ b/pluto-server/src/main/resources/banner.txt @@ -0,0 +1,5 @@ + ___ _ _ _ _____ ___ +| _ \| | | | | ||_ _| / _ \ +| _/| |__ | |_| | | | | (_) | +|_| |____| \___/ |_| \___/ +${spring-boot.version} ${application.version} \ No newline at end of file