Skip to content

Commit f23e528

Browse files
thomasm1thomasm1
committed
mapl-data: config-server, setup with registry service
1 parent 6a75d39 commit f23e528

File tree

788 files changed

+28565
-46323
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

788 files changed

+28565
-46323
lines changed

‎README.md‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11

22
### 1 start registry-service first: http://localhost:8761/
3-
4-
* Application AMIs Availability Zones Status
53

6-
* API-GATEWAY n/a (1) (1) UP (1) - LAPTOP-OBA52PO9.lan:API-GATEWAY:9191
74

8-
* AUTH-SERVICE n/a (1) (1) UP (1) - LAPTOP-OBA52PO9.lan:AUTH-SERVICE:8081
9-
10-
* CONFIG-SERVER n/a (1) (1) UP (1) - LAPTOP-OBA52PO9.lan:CONFIG-SERVER:8888
11-
12-
* DASHBOARD-SERVICE n/a (1) (1) UP (1) - LAPTOP-OBA52PO9.lan:DASHBOARD-SERVICE:8082
13-
14-
![image](https://github.com/user-attachments/assets/25bd3492-59d4-4a63-8ade-48cd02bac4d5)
5+
Application AMIs Availability Zones Status
6+
* API-GATEWAY n/a (1) (1) UP (1) - host.docker.internal:API-GATEWAY:9191
7+
* AUTH-SERVICE n/a (1) (1) UP (1) - host.docker.internal:AUTH-SERVICE:8081
8+
* CONFIG-SERVER n/a (1) (1) UP (1) - host.docker.internal:CONFIG-SERVER:8888
9+
* CRYPTOMAVEN-REST n/a (1) (1) UP (1) - host.docker.internal:CRYPTOMAVEN-REST:8083
10+
* DAILYTECH-REST n/a (1) (1) UP (1) - host.docker.internal:DAILYTECH-REST:8082
11+
* DASHBOARD-SERVICE n/a (1) (1) UP (1) - host.docker.internal:DASHBOARD-SERVICE:8084
12+
![image](https://github.com/user-attachments/assets/25bd3492-59d4-4a63-8ade-48cd02bac4d5)
1513

‎_kafka.code-workspace‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33
{
44
"path": ".."
55
},
6-
{
7-
"path": "../../daily/daily-microservices"
8-
},
96
{
107
"path": "../../daily/env"
118
},
129
{
1310
"path": "../../tmm"
11+
},
12+
{
13+
"path": "../../daily"
14+
},
15+
{
16+
"path": "../../_jsFunctions"
1417
}
1518
],
1619
"settings": {}

‎client-mapl-integration/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ FROM openjdk:17-jdk-slim
22

33
LABEL maintainer="[email protected]"
44

5-
COPY target/client-mapl-integration-1.2.0.jar mapl-integration.jar
5+
COPY target/client-mapl-integration-1.3.0.jar mapl-integration.jar
66

7-
ENTRYPOINT ["java", "-jar", "mapl-integration.jar"]
7+
ENTRYPOINT ["java", "-jar", "mapl-integration.jar"]

‎client-mapl-integration/pom.xml‎

Lines changed: 32 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.1.0</version>
8+
<version>3.3.9</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>app.mapl</groupId>
12-
<artifactId>client-mapl-integration</artifactId>
12+
<artifactId>mapl-integration</artifactId>
1313
<version>1.2.0</version>
1414
<packaging>jar</packaging>
15-
<name>client-mapl-integration</name>
15+
<name>mapl-integration</name>
1616
<description>client-mapl-integration</description>
1717
<url/>
1818
<licenses>
@@ -30,8 +30,7 @@
3030
<properties>
3131
<java.version>17</java.version>
3232
<maven.compiler.release>17</maven.compiler.release>
33-
<spring-cloud.version>2022.0.4</spring-cloud.version>
34-
<!-- <spring-cloud.version>2023.0.0-RC1</spring-cloud.version>-->
33+
<spring-cloud.version>2023.0.5</spring-cloud.version>
3534

3635
<project.report.sourceEncoding>UTF-8</project.report.sourceEncoding>
3736
<spring.version>3.1.0</spring.version>
@@ -72,27 +71,6 @@
7271
</dependency>
7372

7473
<!-- CLOUD -->
75-
<dependency>
76-
<groupId>org.springframework.boot</groupId>
77-
<artifactId>spring-boot-starter-actuator</artifactId>
78-
</dependency>
79-
<dependency>
80-
<groupId>org.springframework.boot</groupId>
81-
<artifactId>spring-boot-starter-web</artifactId>
82-
</dependency>
83-
<dependency>
84-
<groupId>jakarta.servlet</groupId>
85-
<artifactId>jakarta.servlet-api</artifactId>
86-
<version>${jakarta-servlet-api.version}</version>
87-
<scope>provided</scope>
88-
</dependency>
89-
<dependency>
90-
<groupId>org.springframework.boot</groupId>
91-
<artifactId>spring-boot-devtools</artifactId>
92-
<scope>runtime</scope>
93-
<optional>true</optional>
94-
</dependency>
95-
9674
<dependency>
9775
<groupId>org.springframework.cloud</groupId>
9876
<artifactId>spring-cloud-starter-config</artifactId>
@@ -101,48 +79,58 @@
10179
<groupId>org.springframework.cloud</groupId>
10280
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
10381
</dependency>
104-
<!-- REACTIVE -->
105-
<dependency>
106-
<groupId>org.springframework.boot</groupId>
107-
<artifactId>spring-boot-starter-data-mongodb-reactive</artifactId>
108-
</dependency>
10982
<dependency>
110-
<groupId>org.springframework.boot</groupId>
111-
<artifactId>spring-boot-starter-webflux</artifactId>
83+
<groupId>org.springframework.cloud</groupId>
84+
<artifactId>spring-cloud-starter-openfeign</artifactId>
11285
</dependency>
11386

11487
<dependency>
115-
<groupId>org.springframework.cloud</groupId>
116-
<artifactId>spring-cloud-starter-openfeign</artifactId>
88+
<groupId>org.springframework.boot</groupId>
89+
<artifactId>spring-boot-starter-actuator</artifactId>
11790
</dependency>
11891

11992
<dependency>
12093
<groupId>org.springframework.boot</groupId>
12194
<artifactId>spring-boot-configuration-processor</artifactId>
12295
<optional>true</optional>
12396
</dependency>
124-
<!-- <dependency>-->
125-
<!-- <groupId>org.springframework.cloud</groupId>-->
126-
<!-- <artifactId>spring-cloud-starter-sleuth</artifactId>-->
127-
<!-- </dependency>-->
128-
<!-- <dependency>-->
129-
<!-- <groupId>org.springframework.cloud</groupId>-->
130-
<!-- <artifactId>spring-cloud-sleuth-zipkin</artifactId>-->
131-
<!-- </dependency>-->
97+
13298
<!-- <dependency>-->
13399
<!-- <groupId>org.springframework.cloud</groupId>-->
134100
<!-- <artifactId>spring-cloud-starter-circuitbreaker-resilience4j</artifactId>-->
135101
<!-- </dependency>-->
102+
136103
<dependency>
137104
<groupId>org.springframework.boot</groupId>
138-
<artifactId>spring-boot-starter-aop</artifactId>
105+
<artifactId>spring-boot-starter-web</artifactId>
106+
</dependency>
107+
<dependency>
108+
<groupId>jakarta.servlet</groupId>
109+
<artifactId>jakarta.servlet-api</artifactId>
110+
<version>${jakarta-servlet-api.version}</version>
111+
<scope>provided</scope>
112+
</dependency>
113+
<dependency>
114+
<groupId>org.springframework.boot</groupId>
115+
<artifactId>spring-boot-devtools</artifactId>
116+
<scope>runtime</scope>
117+
<optional>true</optional>
139118
</dependency>
140119

141120
<dependency>
142121
<groupId>org.springdoc</groupId>
143122
<artifactId>springdoc-openapi-ui</artifactId>
144123
<version>${springdoc-openapi-ui.version}</version>
145124
</dependency>
125+
<!-- REACTIVE -->
126+
<dependency>
127+
<groupId>org.springframework.boot</groupId>
128+
<artifactId>spring-boot-starter-data-mongodb-reactive</artifactId>
129+
</dependency>
130+
<dependency>
131+
<groupId>org.springframework.boot</groupId>
132+
<artifactId>spring-boot-starter-webflux</artifactId>
133+
</dependency>
146134

147135
<!-- TEST -->
148136
<dependency>

‎client-mapl-integration/src/main/resources/application-docker.properties‎ renamed to ‎client-mapl-integration/src/main/resources/application-docker.yaml‎

File renamed without changes.

‎client-mapl-integration/src/main/resources/application-h2.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
# H2
3+
spring.h2.console.enabled: true
4+
spring.h2.console.path: /h2-console/
5+
spring.h2.console.settings.trace: false
6+
spring.h2.console.settings.web-allow-others: false
7+
8+

‎client-mapl-integration/src/main/resources/application-local.properties‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎client-mapl-integration/src/main/resources/application.properties‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎client-mapl-integration/src/main/resources/application.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
spring.application.name: MAPL-INTEGRATION
2+
spring.profiles.active: local
3+
spring.cloud.config.uri: http://localhost:8888
4+
## Configuring info endpoint
5+
6+
spring.config.import: optional:configserver:http://localhost:8888
7+
eureka.instance.client.serverUrl.defaultZone: http://localhost:8761/eureka/
8+
9+
info.app.name: MAPL-INTEGRATION
10+
info.app.description: Mapl Server Application
11+
info.app.version: 1.0.0
12+
management.info.env.enabled: true
13+
management.endpoints.web.exposure.include: "*"
14+
15+
## Configuring actuator endpoints
16+
spring.ai.openai.api-key: ${OPENAI_API_KEY}
17+
spring.ai.openai.chat.options.model: gpt-4
18+
19+
20+
logging.level.org.springdoc: DEBUG
21+
logging.level.org.springframework.web: DEBUG
22+
23+
#openapi
24+
springdoc.api-docs.path: /v3/api-docs
25+
springdoc.swagger-ui.enabled: true
26+
springdoc.swagger-ui.path: /swagger-ui/index.html
27+

‎docker-compose.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
version: "3.8"
2+
3+
services:
4+
mysqldb:
5+
container_name: mysqldb
6+
image: mysql
7+
environment:
8+
MYSQL_ROOT_PASSWORD: root
9+
MYSQL_DATABASE: dailytech
10+
networks:
11+
dailytech-mysql-net:
12+
13+
dailytech-rest:
14+
container_name: dailytech-rest
15+
build:
16+
context: ./
17+
dockerfile: Dockerfile
18+
ports:
19+
- "8082:8082"
20+
depends_on:
21+
- mysqldb
22+
networks:
23+
dailytech-mysql-net:
24+
restart: on-failure
25+
26+
networks:
27+
dailytech-mysql-net:

0 commit comments

Comments
 (0)