Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 TakahashiNguyen
|
96171d3ec2 | ||
 gitea-actions
|
bb8a9c5691 | ||
|
TakahashiNguyen
|
e07ee318a7 | ||
|
gitea-actions
|
d91b20357a | ||
|
TakahashiNguyen
|
f1ffc63a5f | ||
|
TakahashiNguyen
|
a97e9ade6e | ||
|
gitea-actions
|
80ee08757d | ||
|
TakahashiNguyen
|
d925e0da22 |
+19
-36
@@ -1,47 +1,30 @@
|
||||
FROM ubuntu:26.04
|
||||
FROM jbangdev/jbang-action:latest AS jbang-provider
|
||||
|
||||
FROM node:current-trixie AS base
|
||||
|
||||
COPY --from=jbang-provider /jbang /jbang
|
||||
|
||||
ENV PATH="/jbang/bin:${PATH}"
|
||||
|
||||
ENV PNPM_HOME="/pnpm"
|
||||
ENV PATH="$PNPM_HOME:$PATH"
|
||||
|
||||
RUN npm install --global pnpm@latest
|
||||
|
||||
# Tránh các câu hỏi tương tác trong quá trình cài đặt
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt-get update && apt-get install -y ca-certificates && apt-get clean
|
||||
|
||||
RUN sed -i 's|http://archive.ubuntu.com|https://apt.demonkernel.io.vn|g' /etc/apt/sources.list.d/ubuntu.sources && \
|
||||
sed -i 's|http://security.ubuntu.com|https://apt.demonkernel.io.vn|g' /etc/apt/sources.list.d/ubuntu.sources
|
||||
|
||||
# 1. Cài đặt các công cụ cơ bản
|
||||
RUN apt-get update --fix-missing && apt-get install --no-install-recommends --no-install-suggests -y \
|
||||
curl \
|
||||
bash \
|
||||
build-essential \
|
||||
docker-buildx \
|
||||
git \
|
||||
docker-buildx \
|
||||
docker-cli \
|
||||
docker.io \
|
||||
nodejs \
|
||||
maven \
|
||||
libz-dev
|
||||
|
||||
# 5. Cấu hình Git
|
||||
RUN git config --global --add safe.directory '*'
|
||||
kubectl \
|
||||
openjdk-25-jdk-headless \
|
||||
maven
|
||||
|
||||
# 2. Cài đặt Node.js & PNPM (thay thế cho apk pnpm)
|
||||
RUN curl -fsSL https://get.pnpm.io/install.sh | bash -
|
||||
|
||||
# 3. Cài đặt Kubectl
|
||||
RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" \
|
||||
&& install -m 0755 kubectl /usr/local/bin/kubectl
|
||||
|
||||
# 4. Cài đặt Mandrel 25
|
||||
# Lưu ý: Dùng bản linux-amd64 (glibc) tiêu chuẩn cho Ubuntu
|
||||
ENV JAVA_HOME=/usr/lib/jvm/mandrel
|
||||
ENV GRAALVM_HOME=/usr/lib/jvm/mandrel
|
||||
ENV PATH="${JAVA_HOME}/bin:${PATH}"
|
||||
|
||||
RUN mkdir -p ${JAVA_HOME} && \
|
||||
curl -L https://github.com/graalvm/mandrel/releases/download/mandrel-25.0.2.0-Final/mandrel-java25-linux-amd64-25.0.2.0-Final.tar.gz | tar -xz -C ${JAVA_HOME} --strip-components=1
|
||||
|
||||
# 6. Cài đặt JBang & Quarkus CLI
|
||||
ENV JBANG_DIR="/root/.jbang"
|
||||
ENV PATH="${JBANG_DIR}/bin:${PATH}"
|
||||
|
||||
RUN curl -Ls https://sh.jbang.dev | bash -s - trust add https://repo1.maven.org/maven2/io/quarkus/quarkus-cli/
|
||||
RUN curl -Ls https://sh.jbang.dev | bash -s - app install --fresh --force quarkus@quarkusio
|
||||
RUN jbang trust add https://repo1.maven.org/maven2/io/quarkus/quarkus-cli/
|
||||
RUN jbang app install --fresh --force quarkus@quarkusio
|
||||
|
||||
@@ -1,14 +1,19 @@
|
||||
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
|
||||
// README at: https://github.com/devcontainers/templates/tree/main/src/alpine
|
||||
{
|
||||
"dockerComposeFile": "docker-compose.main.yaml",
|
||||
"build": {
|
||||
"dockerfile": "Dockerfile",
|
||||
"args": {
|
||||
"http_proxy": "http://host.docker.internal:3142"
|
||||
},
|
||||
"options": ["--add-host=host.docker.internal:host-gateway"]
|
||||
},
|
||||
"runArgs": ["--add-host=host.docker.internal:host-gateway"],
|
||||
"mounts": [
|
||||
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
|
||||
"source=${localEnv:USERPROFILE}/.kube,target=/root/.kube,type=bind"
|
||||
"source=${localEnv:USERPROFILE}/.kube,target=/root/.kube,type=bind",
|
||||
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
|
||||
],
|
||||
"remoteUser": "root",
|
||||
"service": "devcontainer",
|
||||
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
|
||||
"customizations": {
|
||||
"vscode": {
|
||||
"extensions": [
|
||||
@@ -24,7 +29,9 @@
|
||||
},
|
||||
"containerEnv": {
|
||||
"TESTCONTAINERS_RYUK_DISABLED": "true",
|
||||
"QUARKUS_DEBUG_HOST": "0.0.0.0"
|
||||
"QUARKUS_DEBUG_HOST": "0.0.0.0",
|
||||
"http_proxy": "http://host.docker.internal:3142"
|
||||
},
|
||||
"postCreateCommand": "git config --global --add safe.directory '*'",
|
||||
"forwardPorts": [5005, 8080]
|
||||
}
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
services:
|
||||
kafka:
|
||||
image: apache/kafka:latest
|
||||
restart: unless-stopped
|
||||
network_mode: host
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
environment:
|
||||
KAFKA_NODE_ID: 1
|
||||
KAFKA_PROCESS_ROLES: broker,controller
|
||||
KAFKA_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093
|
||||
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092
|
||||
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
|
||||
KAFKA_CONTROLLER_QUORUM_VOTERS: 1@localhost:9093
|
||||
KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
|
||||
KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true"
|
||||
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
|
||||
|
||||
kafdrop:
|
||||
image: obsidiandynamics/kafdrop:latest
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- kafka
|
||||
network_mode: host
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
command: sh -c "sleep 5 && exec ./start-app"
|
||||
environment:
|
||||
KAFKA_BROKERCONNECT: "localhost:9092"
|
||||
@@ -1,14 +0,0 @@
|
||||
include:
|
||||
- ./docker-compose.redis.yaml
|
||||
|
||||
services:
|
||||
devcontainer:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
volumes:
|
||||
- ../..:/workspaces:cached
|
||||
network_mode: host
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
command: sleep infinity
|
||||
@@ -1,13 +0,0 @@
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:alpine
|
||||
environment:
|
||||
- POSTGRES_PASSWORD=password
|
||||
network_mode: host
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
@@ -1,11 +0,0 @@
|
||||
services:
|
||||
redis:
|
||||
image: redis:alpine
|
||||
network_mode: host
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
volumes:
|
||||
- redis_data:/data
|
||||
|
||||
volumes:
|
||||
redis_data:
|
||||
@@ -11,9 +11,16 @@ jobs:
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- uses: gerlero/apt-install@v1
|
||||
with:
|
||||
packages: docker.io
|
||||
- name: Install dependencies with Proxy
|
||||
env:
|
||||
http_proxy: "http://host.docker.internal:3142"
|
||||
https_proxy: "http://host.docker.internal:3142"
|
||||
run: |
|
||||
# Kiểm tra proxy có hoạt động không
|
||||
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||
openjdk-25-jdk-headless docker-cli docker-buildx
|
||||
|
||||
- name: Setup SSH Key
|
||||
run: |
|
||||
@@ -28,17 +35,18 @@ jobs:
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up JDK
|
||||
uses: actions/setup-java@v5
|
||||
- name: Cache Maven packages
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
distribution: "graalvm"
|
||||
java-version: "25"
|
||||
cache: "maven"
|
||||
path: ~/.m2/repository
|
||||
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-maven-
|
||||
|
||||
- name: Log in to Gitea Container Registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: git.demonkernel.io.vn
|
||||
registry: vps.demonkernel.io.vn
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.ACCESS_TOKEN }}
|
||||
|
||||
|
||||
+29
-18
@@ -6,9 +6,14 @@ on:
|
||||
- main
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
|
||||
cancel-in-progress: true
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
actions: read
|
||||
checks: write
|
||||
|
||||
jobs:
|
||||
build-and-test:
|
||||
runs-on: ubuntu-latest
|
||||
@@ -22,29 +27,35 @@ jobs:
|
||||
with:
|
||||
redis-version: "7.x"
|
||||
|
||||
- name: Set up JDK
|
||||
uses: actions/setup-java@v5
|
||||
- name: Cache Maven packages
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
distribution: "graalvm"
|
||||
java-version: "25"
|
||||
cache: "maven"
|
||||
path: ~/.m2/repository
|
||||
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-maven-
|
||||
|
||||
- uses: gerlero/apt-install@v1
|
||||
with:
|
||||
packages: build-essential zlib1g-dev docker.io
|
||||
- name: Install dependencies with Proxy
|
||||
env:
|
||||
http_proxy: "http://host.docker.internal:3142"
|
||||
https_proxy: "http://host.docker.internal:3142"
|
||||
run: |
|
||||
# Kiểm tra proxy có hoạt động không
|
||||
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||
openjdk-25-jdk-headless docker-cli docker-buildx
|
||||
|
||||
- name: Build and Test all modules
|
||||
run: |
|
||||
./mvnw -B install \
|
||||
-Dquarkus.container-image.push=false \
|
||||
-Dquarkus.container-image.push=false
|
||||
|
||||
- name: Jacoco Report to PR
|
||||
uses: madrapps/jacoco-report@v1.7.2
|
||||
- name: Publish Test Report
|
||||
uses: dorny/test-reporter@v3
|
||||
if: always()
|
||||
with:
|
||||
paths: |
|
||||
./**/jacoco.xml,
|
||||
token: ${{ secrets.ACCESS_TOKEN }}
|
||||
min-coverage-overall: 40
|
||||
min-coverage-changed-files: 60
|
||||
title: "📊 Báo cáo Độ bao phủ Kiểm thử (Test Coverage)"
|
||||
name: "JUnit Tests Report"
|
||||
path: "**/target/surefire-reports/*.xml"
|
||||
reporter: java-junit
|
||||
fail-on-error: true
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
{
|
||||
"branches": [
|
||||
"main",
|
||||
{
|
||||
"name": "dev-*",
|
||||
"prerelease": "${name.replace('dev-', '')}",
|
||||
"channel": "${name.replace('dev-', '')}"
|
||||
}
|
||||
],
|
||||
"plugins": [
|
||||
"@semantic-release/commit-analyzer",
|
||||
"@semantic-release/release-notes-generator",
|
||||
"@semantic-release/changelog",
|
||||
[
|
||||
"@semantic-release/exec",
|
||||
{
|
||||
"prepareCmd": "./mvnw versions:set -DnewVersion=${nextRelease.version} && sed -i \"/-service:/ s|:[^:]*$|:${nextRelease.version}|\" k8s.yaml",
|
||||
"publishCmd": "if [ \"${branch.name}\" = \"main\" ]; then ./mvnw package -Dquarkus.container-image.tag=${nextRelease.version} -DskipTests; fi"
|
||||
}
|
||||
],
|
||||
[
|
||||
"@saithodev/semantic-release-gitea",
|
||||
{
|
||||
"giteaUrl": "https://git.demonkernel.io.vn/"
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
branches:
|
||||
- "main"
|
||||
- name: "dev-*"
|
||||
prerelease: "${name.replace('dev-', '')}"
|
||||
channel: "${name.replace('dev-', '')}"
|
||||
|
||||
plugins:
|
||||
- "@semantic-release/commit-analyzer"
|
||||
- "@semantic-release/release-notes-generator"
|
||||
- "@semantic-release/changelog"
|
||||
- - "@semantic-release/exec"
|
||||
- prepareCmd: |
|
||||
./mvnw versions:set -DnewVersion=${nextRelease.version} &&
|
||||
sed -i "/-service:/ s|:[^:]*$|:${nextRelease.version}|" k8s.yaml &&
|
||||
if [ "${branch.name}" = "main" ]; then
|
||||
./mvnw package -B -Dquarkus.container-image.tag=${nextRelease.version} -DskipTests
|
||||
fi
|
||||
- - "@saithodev/semantic-release-gitea"
|
||||
- giteaUrl: "https://git.demonkernel.io.vn/"
|
||||
@@ -1,3 +1,25 @@
|
||||
## [1.5.4](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.3...v1.5.4) (2026-04-17)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* connect gateway to customer service ([#26](https://git.demonkernel.io.vn/FoodSurf/backend/issues/26)) ([e07ee31](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e07ee318a7985d79689f3dc32fea97bb1051e22a))
|
||||
|
||||
## [1.5.3](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.2...v1.5.3) (2026-04-17)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* better ci script ([#25](https://git.demonkernel.io.vn/FoodSurf/backend/issues/25)) ([f1ffc63](https://git.demonkernel.io.vn/FoodSurf/backend/commit/f1ffc63a5fe3f04b7de622f4df1406ddd977e8aa))
|
||||
* Resolve runtime issue with native build ([#24](https://git.demonkernel.io.vn/FoodSurf/backend/issues/24)) ([a97e9ad](https://git.demonkernel.io.vn/FoodSurf/backend/commit/a97e9ade6e20458eb53bdb7ab9d083cef51408fc))
|
||||
|
||||
## [1.5.2](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.1...v1.5.2) (2026-04-13)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **semantic-release:** better config ([#22](https://git.demonkernel.io.vn/FoodSurf/backend/issues/22)) ([d925e0d](https://git.demonkernel.io.vn/FoodSurf/backend/commit/d925e0da2296c63384651dbe15316ad555b77bee))
|
||||
|
||||
# [1.5.0](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.4.0...v1.5.0) (2026-04-12)
|
||||
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>drinkool</artifactId>
|
||||
<version>1.5.0</version>
|
||||
<version>1.5.4</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
@@ -46,11 +46,6 @@
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-jacoco</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>lib</artifactId>
|
||||
@@ -140,6 +135,9 @@
|
||||
>org.jboss.logmanager.LogManager</java.util.logging.manager>
|
||||
<maven.home>${maven.home}</maven.home>
|
||||
</systemPropertyVariables>
|
||||
<forkCount>1</forkCount>
|
||||
<reuseForks>true</reuseForks>
|
||||
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
||||
@@ -3,21 +3,21 @@ package com.drinkool.services;
|
||||
import com.drinkool.InternalValue;
|
||||
import com.drinkool.Url;
|
||||
import com.drinkool.models.UserModel;
|
||||
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
|
||||
import jakarta.transaction.Transactional;
|
||||
import jakarta.ws.rs.*;
|
||||
import jakarta.ws.rs.core.Response;
|
||||
import java.util.UUID;
|
||||
|
||||
public abstract class BaseService {
|
||||
public abstract class BaseService<T extends UserModel> {
|
||||
|
||||
private UserModel model;
|
||||
private final PanacheRepositoryBase<T, UUID> repository;
|
||||
|
||||
public BaseService(UserModel model) {
|
||||
this.model = model;
|
||||
protected BaseService(Class<T> entityClass) {
|
||||
this.repository = new PanacheRepositoryBase<T, UUID>() {};
|
||||
}
|
||||
|
||||
@SuppressWarnings("static-access")
|
||||
@POST
|
||||
@GET
|
||||
@Path(Url.Me)
|
||||
@Transactional
|
||||
public Response me(@HeaderParam(InternalValue.userId) UUID id) {
|
||||
@@ -25,6 +25,6 @@ public abstract class BaseService {
|
||||
.entity("InvalidUserId")
|
||||
.build();
|
||||
|
||||
return Response.ok(model.find("id", id).firstResult()).build();
|
||||
return Response.ok(repository.findById(id)).build();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,13 +9,13 @@ import jakarta.ws.rs.*;
|
||||
import jakarta.ws.rs.core.*;
|
||||
|
||||
@Path(Role.Customer)
|
||||
public class CustomerService extends BaseService {
|
||||
public class CustomerService extends BaseService<CustomerEntity> {
|
||||
|
||||
@Inject
|
||||
OtpService otpService;
|
||||
|
||||
public CustomerService() {
|
||||
super(new CustomerEntity());
|
||||
super(CustomerEntity.class);
|
||||
}
|
||||
|
||||
@POST
|
||||
@@ -29,6 +29,7 @@ public class CustomerService extends BaseService {
|
||||
return Response.status(Response.Status.CREATED)
|
||||
.header(InternalValue.userId, newCustomer.id.toString())
|
||||
.header(InternalValue.role, Role.Customer)
|
||||
.entity(newCustomer)
|
||||
.build();
|
||||
}
|
||||
|
||||
@@ -43,6 +44,7 @@ public class CustomerService extends BaseService {
|
||||
return Response.status(Response.Status.CREATED)
|
||||
.header(InternalValue.userId, newCustomer.id.toString())
|
||||
.header(InternalValue.role, Role.Customer)
|
||||
.entity(newCustomer)
|
||||
.build();
|
||||
}
|
||||
|
||||
@@ -67,6 +69,7 @@ public class CustomerService extends BaseService {
|
||||
return Response.accepted()
|
||||
.header(InternalValue.userId, customer.id.toString())
|
||||
.header(InternalValue.role, Role.Customer)
|
||||
.entity(customer)
|
||||
.build();
|
||||
}
|
||||
|
||||
@@ -87,6 +90,7 @@ public class CustomerService extends BaseService {
|
||||
return Response.accepted()
|
||||
.header(InternalValue.userId, customer.id.toString())
|
||||
.header(InternalValue.role, Role.Customer)
|
||||
.entity(customer)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/postgres
|
||||
quarkus.hibernate-orm.database.generation=update
|
||||
|
||||
# Docker
|
||||
quarkus.container-image.registry=git.demonkernel.io.vn
|
||||
quarkus.container-image.registry=vps.demonkernel.io.vn
|
||||
quarkus.container-image.group=foodsurf
|
||||
quarkus.container-image.name=account-service
|
||||
quarkus.container-image.push=true
|
||||
@@ -24,6 +24,7 @@ quarkus.index-dependency.lib.group-id=com.drinkool
|
||||
quarkus.index-dependency.lib.artifact-id=lib
|
||||
|
||||
# Build
|
||||
quarkus.native.container-build=false
|
||||
quarkus.native.container-build=true
|
||||
quarkus.native.remote-container-build=true
|
||||
quarkus.native.additional-build-args=--initialize-at-run-time=com.password4j.AlgorithmFinder,--future-defaults=all
|
||||
quarkus.native.resources.includes=com/google/i18n/phonenumbers/data/.*
|
||||
quarkus.native.resources.includes=com/google/i18n/phonenumbers/data/**/*
|
||||
@@ -31,7 +31,7 @@ public class BaseServiceTest {
|
||||
.header(InternalValue.userId, testUserId)
|
||||
.contentType(ContentType.JSON)
|
||||
.when()
|
||||
.post(Role.Customer + Url.Me)
|
||||
.get(Role.Customer + Url.Me)
|
||||
.then()
|
||||
.statusCode(200)
|
||||
.body("id", is(testUserId));
|
||||
@@ -39,6 +39,6 @@ public class BaseServiceTest {
|
||||
|
||||
@Test
|
||||
public void testMeEndpointWithoutHeader() {
|
||||
given().when().post(Role.Customer + Url.Me).then().statusCode(400);
|
||||
given().when().get(Role.Customer + Url.Me).then().statusCode(400);
|
||||
}
|
||||
}
|
||||
|
||||
Executable
+5
@@ -0,0 +1,5 @@
|
||||
mvn package -DskipTests -Dquarkus.container-image.push=false \
|
||||
-Dquarkus.container-image.registry=git.demonkernel.io.vn \
|
||||
-Dquarkus.log.category."org.jboss.resteasy.reactive.client.logging".level=DEBUG \
|
||||
-Dquarkus.rest-client.logging.scope=full \
|
||||
-Dquarkus.rest-client.logging.body-limit=1024
|
||||
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>drinkool</artifactId>
|
||||
<version>1.5.0</version>
|
||||
<version>1.5.4</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
@@ -46,11 +46,6 @@
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-jacoco</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>lib</artifactId>
|
||||
@@ -126,6 +121,9 @@
|
||||
>org.jboss.logmanager.LogManager</java.util.logging.manager>
|
||||
<maven.home>${maven.home}</maven.home>
|
||||
</systemPropertyVariables>
|
||||
<forkCount>1</forkCount>
|
||||
<reuseForks>true</reuseForks>
|
||||
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
||||
@@ -9,7 +9,7 @@ quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/eatery
|
||||
quarkus.hibernate-orm.database.generation=update
|
||||
|
||||
# Docker
|
||||
quarkus.container-image.registry=git.demonkernel.io.vn
|
||||
quarkus.container-image.registry=vps.demonkernel.io.vn
|
||||
quarkus.container-image.group=foodsurf
|
||||
quarkus.container-image.name=eatery-service
|
||||
quarkus.container-image.push=true
|
||||
@@ -22,5 +22,6 @@ quarkus.index-dependency.lib.group-id=com.drinkool
|
||||
quarkus.index-dependency.lib.artifact-id=lib
|
||||
|
||||
# Build
|
||||
quarkus.native.container-build=false
|
||||
quarkus.native.container-build=true
|
||||
quarkus.native.remote-container-build=true
|
||||
quarkus.native.additional-build-args=--future-defaults=all
|
||||
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>drinkool</artifactId>
|
||||
<version>1.5.0</version>
|
||||
<version>1.5.4</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
@@ -46,11 +46,6 @@
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-jacoco</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.bitbucket.b_c</groupId>
|
||||
<artifactId>jose4j</artifactId>
|
||||
@@ -118,6 +113,9 @@
|
||||
>org.jboss.logmanager.LogManager</java.util.logging.manager>
|
||||
<maven.home>${maven.home}</maven.home>
|
||||
</systemPropertyVariables>
|
||||
<forkCount>1</forkCount>
|
||||
<reuseForks>true</reuseForks>
|
||||
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
||||
+8
-6
@@ -1,19 +1,21 @@
|
||||
package com.drinkool;
|
||||
package com.drinkool.controller;
|
||||
|
||||
import com.drinkool.*;
|
||||
import com.drinkool.dtos.*;
|
||||
import com.drinkool.services.AccountService;
|
||||
import com.drinkool.services.CustomerService;
|
||||
import io.smallrye.mutiny.Uni;
|
||||
import jakarta.inject.Inject;
|
||||
import jakarta.ws.rs.*;
|
||||
import jakarta.ws.rs.core.Response;
|
||||
import java.util.*;
|
||||
import org.eclipse.microprofile.rest.client.inject.RestClient;
|
||||
|
||||
@Path("/api/" + Role.Customer)
|
||||
class CustomerGatewayResource {
|
||||
public class CustomerController {
|
||||
|
||||
@Inject
|
||||
@RestClient
|
||||
AccountService accountService;
|
||||
CustomerService accountService;
|
||||
|
||||
@POST
|
||||
@Path(Url.Signup)
|
||||
@@ -28,7 +30,7 @@ class CustomerGatewayResource {
|
||||
}
|
||||
|
||||
@GET
|
||||
public Uni<Response> me() {
|
||||
return accountService.me();
|
||||
public Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id) {
|
||||
return accountService.me(id);
|
||||
}
|
||||
}
|
||||
+5
-8
@@ -1,16 +1,16 @@
|
||||
package com.drinkool.services;
|
||||
|
||||
import com.drinkool.Role;
|
||||
import com.drinkool.Url;
|
||||
import com.drinkool.*;
|
||||
import com.drinkool.dtos.*;
|
||||
import io.smallrye.mutiny.Uni;
|
||||
import jakarta.ws.rs.*;
|
||||
import jakarta.ws.rs.core.Response;
|
||||
import java.util.*;
|
||||
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
|
||||
|
||||
@RegisterRestClient(configKey = "account")
|
||||
@Path(Role.Customer)
|
||||
public interface AccountService {
|
||||
public interface CustomerService {
|
||||
@POST
|
||||
@Path(Url.Signup)
|
||||
Uni<Response> signup(Signup input);
|
||||
@@ -27,10 +27,7 @@ public interface AccountService {
|
||||
@Path(Url.QuickLogin)
|
||||
Uni<Response> quickLogin(QuickSignup input);
|
||||
|
||||
@POST
|
||||
@Path(Url.SmsOtp)
|
||||
Uni<Response> smsOtp(SmsOtp input);
|
||||
|
||||
@GET
|
||||
Uni<Response> me();
|
||||
@Path(Url.Me)
|
||||
Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id);
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
# Docker
|
||||
quarkus.container-image.registry=git.demonkernel.io.vn
|
||||
quarkus.container-image.registry=vps.demonkernel.io.vn
|
||||
quarkus.container-image.group=foodsurf
|
||||
quarkus.container-image.name=gateway-service
|
||||
quarkus.container-image.push=true
|
||||
@@ -8,5 +8,6 @@ quarkus.container-image.builder=docker
|
||||
quarkus.container-image.additional-tags=latest
|
||||
|
||||
# Build
|
||||
quarkus.native.container-build=false
|
||||
quarkus.native.container-build=true
|
||||
quarkus.native.remote-container-build=true
|
||||
quarkus.native.additional-build-args=--future-defaults=all
|
||||
@@ -15,7 +15,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: account-pod
|
||||
image: git.demonkernel.io.vn/foodsurf/account-service:1.5.0
|
||||
image: git.demonkernel.io.vn/foodsurf/account-service:1.5.4
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
@@ -73,7 +73,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: eatery-pod
|
||||
image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.0
|
||||
image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.4
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
@@ -129,7 +129,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: gateway-pod
|
||||
image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.0
|
||||
image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.4
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>drinkool</artifactId>
|
||||
<version>1.5.0</version>
|
||||
<version>1.5.4</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
"@semantic-release/commit-analyzer": "^13.0.1",
|
||||
"@semantic-release/exec": "^7.1.0",
|
||||
"@semantic-release/release-notes-generator": "^14.1.0",
|
||||
"prettier": "^3.8.1",
|
||||
"prettier": "^3.8.2",
|
||||
"prettier-plugin-java": "^2.8.1",
|
||||
"semantic-release": "^25.0.3"
|
||||
}
|
||||
|
||||
Generated
+90
-90
@@ -9,7 +9,7 @@ importers:
|
||||
devDependencies:
|
||||
"@prettier/plugin-xml":
|
||||
specifier: ^3.4.2
|
||||
version: 3.4.2(prettier@3.8.1)
|
||||
version: 3.4.2(prettier@3.8.2)
|
||||
"@saithodev/semantic-release-gitea":
|
||||
specifier: ^2.1.0
|
||||
version: 2.1.0
|
||||
@@ -26,11 +26,11 @@ importers:
|
||||
specifier: ^14.1.0
|
||||
version: 14.1.0(semantic-release@25.0.3)
|
||||
prettier:
|
||||
specifier: ^3.8.1
|
||||
version: 3.8.1
|
||||
specifier: ^3.8.2
|
||||
version: 3.8.2
|
||||
prettier-plugin-java:
|
||||
specifier: ^2.8.1
|
||||
version: 2.8.1(prettier@3.8.1)
|
||||
version: 2.8.1(prettier@3.8.2)
|
||||
semantic-release:
|
||||
specifier: ^25.0.3
|
||||
version: 25.0.3
|
||||
@@ -395,10 +395,10 @@ packages:
|
||||
}
|
||||
deprecated: This is a stub types definition. minimatch provides its own type definitions, so you do not need this installed.
|
||||
|
||||
"@types/node@25.5.0":
|
||||
"@types/node@25.6.0":
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==,
|
||||
integrity: sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==,
|
||||
}
|
||||
|
||||
"@types/normalize-package-data@2.4.4":
|
||||
@@ -544,16 +544,16 @@ packages:
|
||||
integrity: sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==,
|
||||
}
|
||||
|
||||
brace-expansion@1.1.12:
|
||||
brace-expansion@1.1.14:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==,
|
||||
integrity: sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==,
|
||||
}
|
||||
|
||||
brace-expansion@5.0.4:
|
||||
brace-expansion@5.0.5:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==,
|
||||
integrity: sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==,
|
||||
}
|
||||
engines: { node: 18 || 20 || >=22 }
|
||||
|
||||
@@ -738,10 +738,10 @@ packages:
|
||||
integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==,
|
||||
}
|
||||
|
||||
conventional-changelog-angular@8.3.0:
|
||||
conventional-changelog-angular@8.3.1:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-DOuBwYSqWzfwuRByY9O4oOIvDlkUCTDzfbOgcSbkY+imXXj+4tmrEFao3K+FxemClYfYnZzsvudbwrhje9VHDA==,
|
||||
integrity: sha512-6gfI3otXK5Ph5DfCOI1dblr+kN3FAm5a97hYoQkqNZxOaYa5WKfXH+AnpsmS+iUH2mgVC2Cg2Qw9m5OKcmNrIg==,
|
||||
}
|
||||
engines: { node: ">=18" }
|
||||
|
||||
@@ -760,10 +760,10 @@ packages:
|
||||
}
|
||||
engines: { node: ">=18" }
|
||||
|
||||
conventional-commits-parser@6.3.0:
|
||||
conventional-commits-parser@6.4.0:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-RfOq/Cqy9xV9bOA8N+ZH6DlrDR+5S3Mi0B5kACEjESpE+AviIpAptx9a9cFpWCCvgRtWT+0BbUw+e1BZfts9jg==,
|
||||
integrity: sha512-tvRg7FIBNlyPzjdG8wWRlPHQJJHI7DylhtRGeU9Lq+JuoPh5BKpPRX83ZdLrvXuOSu5Eo/e7SzOQhU4Hd2Miuw==,
|
||||
}
|
||||
engines: { node: ">=18" }
|
||||
hasBin: true
|
||||
@@ -1229,10 +1229,10 @@ packages:
|
||||
integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==,
|
||||
}
|
||||
|
||||
handlebars@4.7.8:
|
||||
handlebars@4.7.9:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==,
|
||||
integrity: sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==,
|
||||
}
|
||||
engines: { node: ">=0.4.7" }
|
||||
hasBin: true
|
||||
@@ -1589,10 +1589,10 @@ packages:
|
||||
integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==,
|
||||
}
|
||||
|
||||
lodash-es@4.17.23:
|
||||
lodash-es@4.18.1:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==,
|
||||
integrity: sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==,
|
||||
}
|
||||
|
||||
lodash.capitalize@4.2.1:
|
||||
@@ -1631,10 +1631,10 @@ packages:
|
||||
integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==,
|
||||
}
|
||||
|
||||
lodash@4.17.23:
|
||||
lodash@4.18.1:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==,
|
||||
integrity: sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==,
|
||||
}
|
||||
|
||||
lowercase-keys@2.0.0:
|
||||
@@ -1650,10 +1650,10 @@ packages:
|
||||
integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==,
|
||||
}
|
||||
|
||||
lru-cache@11.2.7:
|
||||
lru-cache@11.3.3:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==,
|
||||
integrity: sha512-JvNw9Y81y33E+BEYPr0U7omo+U9AySnsMsEiXgwT6yqd31VQWTLNQqmT4ou5eqPFUrTfIDFta2wKhB1hyohtAQ==,
|
||||
}
|
||||
engines: { node: 20 || >=22 }
|
||||
|
||||
@@ -1758,10 +1758,10 @@ packages:
|
||||
}
|
||||
engines: { node: ">=8" }
|
||||
|
||||
minimatch@10.2.4:
|
||||
minimatch@10.2.5:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==,
|
||||
integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==,
|
||||
}
|
||||
engines: { node: 18 || 20 || >=22 }
|
||||
|
||||
@@ -1850,10 +1850,10 @@ packages:
|
||||
}
|
||||
engines: { node: ">=18" }
|
||||
|
||||
npm@11.12.0:
|
||||
npm@11.12.1:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-xPhOap4ZbJWyd7DAOukP564WFwNSGu/2FeTRFHhiiKthcauxhH/NpkJAQm24xD+cAn8av5tQ00phi98DqtfLsg==,
|
||||
integrity: sha512-zcoUuF1kezGSAo0CqtvoLXX3mkRqzuqYdL6Y5tdo8g69NVV3CkjQ6ZBhBgB4d7vGkPcV6TcvLi3GRKPDFX+xTA==,
|
||||
}
|
||||
engines: { node: ^20.17.0 || >=22.9.0 }
|
||||
hasBin: true
|
||||
@@ -2136,17 +2136,17 @@ packages:
|
||||
integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==,
|
||||
}
|
||||
|
||||
picomatch@2.3.1:
|
||||
picomatch@2.3.2:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==,
|
||||
integrity: sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==,
|
||||
}
|
||||
engines: { node: ">=8.6" }
|
||||
|
||||
picomatch@4.0.3:
|
||||
picomatch@4.0.4:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==,
|
||||
integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==,
|
||||
}
|
||||
engines: { node: ">=12" }
|
||||
|
||||
@@ -2172,10 +2172,10 @@ packages:
|
||||
peerDependencies:
|
||||
prettier: ^3.0.0
|
||||
|
||||
prettier@3.8.1:
|
||||
prettier@3.8.2:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==,
|
||||
integrity: sha512-8c3mgTe0ASwWAJK+78dpviD+A8EqhndQPUBpNUIPt6+xWlIigCwfN01lWr9MAede4uqXGTEKeQWTvzb3vjia0Q==,
|
||||
}
|
||||
engines: { node: ">=14" }
|
||||
hasBin: true
|
||||
@@ -2570,10 +2570,10 @@ packages:
|
||||
}
|
||||
engines: { node: ">=12" }
|
||||
|
||||
tinyglobby@0.2.15:
|
||||
tinyglobby@0.2.16:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==,
|
||||
integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==,
|
||||
}
|
||||
engines: { node: ">=12.0.0" }
|
||||
|
||||
@@ -2648,10 +2648,10 @@ packages:
|
||||
engines: { node: ">=0.8.0" }
|
||||
hasBin: true
|
||||
|
||||
undici-types@7.18.2:
|
||||
undici-types@7.19.2:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==,
|
||||
integrity: sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==,
|
||||
}
|
||||
|
||||
undici@6.24.1:
|
||||
@@ -2661,10 +2661,10 @@ packages:
|
||||
}
|
||||
engines: { node: ">=18.17" }
|
||||
|
||||
undici@7.24.5:
|
||||
undici@7.24.8:
|
||||
resolution:
|
||||
{
|
||||
integrity: sha512-3IWdCpjgxp15CbJnsi/Y9TCDE7HWVN19j1hmzVhoAkY/+CJx449tVxT5wZc1Gwg8J+P0LWvzlBzxYRnHJ+1i7Q==,
|
||||
integrity: sha512-6KQ/+QxK49Z/p3HO6E5ZCZWNnCasyZLa5ExaVYyvPxUwKtbCPMKELJOqh7EqOle0t9cH/7d2TaaTRRa6Nhs4YQ==,
|
||||
}
|
||||
engines: { node: ">=20.18.1" }
|
||||
|
||||
@@ -2966,10 +2966,10 @@ snapshots:
|
||||
"@pnpm/network.ca-file": 1.0.2
|
||||
config-chain: 1.1.13
|
||||
|
||||
"@prettier/plugin-xml@3.4.2(prettier@3.8.1)":
|
||||
"@prettier/plugin-xml@3.4.2(prettier@3.8.2)":
|
||||
dependencies:
|
||||
"@xml-tools/parser": 1.0.11
|
||||
prettier: 3.8.1
|
||||
prettier: 3.8.2
|
||||
|
||||
"@saithodev/semantic-release-gitea@2.1.0":
|
||||
dependencies:
|
||||
@@ -2981,7 +2981,7 @@ snapshots:
|
||||
fs-extra: 8.1.0
|
||||
globby: 10.0.2
|
||||
got: 10.7.0
|
||||
lodash: 4.17.23
|
||||
lodash: 4.18.1
|
||||
querystring: 0.2.1
|
||||
url-join: 4.0.1
|
||||
transitivePeerDependencies:
|
||||
@@ -2994,18 +2994,18 @@ snapshots:
|
||||
"@semantic-release/error": 3.0.0
|
||||
aggregate-error: 3.1.0
|
||||
fs-extra: 11.3.4
|
||||
lodash: 4.17.23
|
||||
lodash: 4.18.1
|
||||
semantic-release: 25.0.3
|
||||
|
||||
"@semantic-release/commit-analyzer@13.0.1(semantic-release@25.0.3)":
|
||||
dependencies:
|
||||
conventional-changelog-angular: 8.3.0
|
||||
conventional-changelog-angular: 8.3.1
|
||||
conventional-changelog-writer: 8.4.0
|
||||
conventional-commits-filter: 5.0.0
|
||||
conventional-commits-parser: 6.3.0
|
||||
conventional-commits-parser: 6.4.0
|
||||
debug: 4.4.3
|
||||
import-from-esm: 2.0.0
|
||||
lodash-es: 4.17.23
|
||||
lodash-es: 4.18.1
|
||||
micromatch: 4.0.8
|
||||
semantic-release: 25.0.3
|
||||
transitivePeerDependencies:
|
||||
@@ -3023,7 +3023,7 @@ snapshots:
|
||||
aggregate-error: 3.1.0
|
||||
debug: 4.4.3
|
||||
execa: 9.6.1
|
||||
lodash-es: 4.17.23
|
||||
lodash-es: 4.18.1
|
||||
parse-json: 8.3.0
|
||||
semantic-release: 25.0.3
|
||||
transitivePeerDependencies:
|
||||
@@ -3042,12 +3042,12 @@ snapshots:
|
||||
http-proxy-agent: 7.0.2
|
||||
https-proxy-agent: 7.0.6
|
||||
issue-parser: 7.0.1
|
||||
lodash-es: 4.17.23
|
||||
lodash-es: 4.18.1
|
||||
mime: 4.1.0
|
||||
p-filter: 4.1.0
|
||||
semantic-release: 25.0.3
|
||||
tinyglobby: 0.2.15
|
||||
undici: 7.24.5
|
||||
tinyglobby: 0.2.16
|
||||
undici: 7.24.8
|
||||
url-join: 5.0.0
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
@@ -3060,10 +3060,10 @@ snapshots:
|
||||
env-ci: 11.2.0
|
||||
execa: 9.6.1
|
||||
fs-extra: 11.3.4
|
||||
lodash-es: 4.17.23
|
||||
lodash-es: 4.18.1
|
||||
nerf-dart: 1.0.0
|
||||
normalize-url: 9.0.0
|
||||
npm: 11.12.0
|
||||
npm: 11.12.1
|
||||
rc: 1.2.8
|
||||
read-pkg: 10.1.0
|
||||
registry-auth-token: 5.1.1
|
||||
@@ -3073,15 +3073,15 @@ snapshots:
|
||||
|
||||
"@semantic-release/release-notes-generator@14.1.0(semantic-release@25.0.3)":
|
||||
dependencies:
|
||||
conventional-changelog-angular: 8.3.0
|
||||
conventional-changelog-angular: 8.3.1
|
||||
conventional-changelog-writer: 8.4.0
|
||||
conventional-commits-filter: 5.0.0
|
||||
conventional-commits-parser: 6.3.0
|
||||
conventional-commits-parser: 6.4.0
|
||||
debug: 4.4.3
|
||||
get-stream: 7.0.1
|
||||
import-from-esm: 2.0.0
|
||||
into-stream: 7.0.0
|
||||
lodash-es: 4.17.23
|
||||
lodash-es: 4.18.1
|
||||
read-package-up: 11.0.0
|
||||
semantic-release: 25.0.3
|
||||
transitivePeerDependencies:
|
||||
@@ -3103,33 +3103,33 @@ snapshots:
|
||||
dependencies:
|
||||
"@types/http-cache-semantics": 4.2.0
|
||||
"@types/keyv": 3.1.4
|
||||
"@types/node": 25.5.0
|
||||
"@types/node": 25.6.0
|
||||
"@types/responselike": 1.0.3
|
||||
|
||||
"@types/glob@7.2.0":
|
||||
dependencies:
|
||||
"@types/minimatch": 6.0.0
|
||||
"@types/node": 25.5.0
|
||||
"@types/node": 25.6.0
|
||||
|
||||
"@types/http-cache-semantics@4.2.0": {}
|
||||
|
||||
"@types/keyv@3.1.4":
|
||||
dependencies:
|
||||
"@types/node": 25.5.0
|
||||
"@types/node": 25.6.0
|
||||
|
||||
"@types/minimatch@6.0.0":
|
||||
dependencies:
|
||||
minimatch: 10.2.4
|
||||
minimatch: 10.2.5
|
||||
|
||||
"@types/node@25.5.0":
|
||||
"@types/node@25.6.0":
|
||||
dependencies:
|
||||
undici-types: 7.18.2
|
||||
undici-types: 7.19.2
|
||||
|
||||
"@types/normalize-package-data@2.4.4": {}
|
||||
|
||||
"@types/responselike@1.0.3":
|
||||
dependencies:
|
||||
"@types/node": 25.5.0
|
||||
"@types/node": 25.6.0
|
||||
|
||||
"@xml-tools/parser@1.0.11":
|
||||
dependencies:
|
||||
@@ -3185,12 +3185,12 @@ snapshots:
|
||||
|
||||
bottleneck@2.19.5: {}
|
||||
|
||||
brace-expansion@1.1.12:
|
||||
brace-expansion@1.1.14:
|
||||
dependencies:
|
||||
balanced-match: 1.0.2
|
||||
concat-map: 0.0.1
|
||||
|
||||
brace-expansion@5.0.4:
|
||||
brace-expansion@5.0.5:
|
||||
dependencies:
|
||||
balanced-match: 4.0.4
|
||||
|
||||
@@ -3238,7 +3238,7 @@ snapshots:
|
||||
chevrotain-allstar@0.3.1(chevrotain@11.0.3):
|
||||
dependencies:
|
||||
chevrotain: 11.0.3
|
||||
lodash-es: 4.17.23
|
||||
lodash-es: 4.18.1
|
||||
|
||||
chevrotain@11.0.3:
|
||||
dependencies:
|
||||
@@ -3318,7 +3318,7 @@ snapshots:
|
||||
ini: 1.3.8
|
||||
proto-list: 1.2.4
|
||||
|
||||
conventional-changelog-angular@8.3.0:
|
||||
conventional-changelog-angular@8.3.1:
|
||||
dependencies:
|
||||
compare-func: 2.0.0
|
||||
|
||||
@@ -3326,13 +3326,13 @@ snapshots:
|
||||
dependencies:
|
||||
"@simple-libs/stream-utils": 1.2.0
|
||||
conventional-commits-filter: 5.0.0
|
||||
handlebars: 4.7.8
|
||||
handlebars: 4.7.9
|
||||
meow: 13.2.0
|
||||
semver: 7.7.4
|
||||
|
||||
conventional-commits-filter@5.0.0: {}
|
||||
|
||||
conventional-commits-parser@6.3.0:
|
||||
conventional-commits-parser@6.4.0:
|
||||
dependencies:
|
||||
"@simple-libs/stream-utils": 1.2.0
|
||||
meow: 13.2.0
|
||||
@@ -3477,9 +3477,9 @@ snapshots:
|
||||
dependencies:
|
||||
reusify: 1.1.0
|
||||
|
||||
fdir@6.5.0(picomatch@4.0.3):
|
||||
fdir@6.5.0(picomatch@4.0.4):
|
||||
optionalDependencies:
|
||||
picomatch: 4.0.3
|
||||
picomatch: 4.0.4
|
||||
|
||||
figures@2.0.0:
|
||||
dependencies:
|
||||
@@ -3631,7 +3631,7 @@ snapshots:
|
||||
|
||||
graceful-fs@4.2.11: {}
|
||||
|
||||
handlebars@4.7.8:
|
||||
handlebars@4.7.9:
|
||||
dependencies:
|
||||
minimist: 1.2.8
|
||||
neo-async: 2.6.2
|
||||
@@ -3664,7 +3664,7 @@ snapshots:
|
||||
|
||||
hosted-git-info@9.0.2:
|
||||
dependencies:
|
||||
lru-cache: 11.2.7
|
||||
lru-cache: 11.3.3
|
||||
|
||||
http-cache-semantics@4.2.0: {}
|
||||
|
||||
@@ -3808,7 +3808,7 @@ snapshots:
|
||||
|
||||
lodash-es@4.17.21: {}
|
||||
|
||||
lodash-es@4.17.23: {}
|
||||
lodash-es@4.18.1: {}
|
||||
|
||||
lodash.capitalize@4.2.1: {}
|
||||
|
||||
@@ -3822,13 +3822,13 @@ snapshots:
|
||||
|
||||
lodash@4.17.21: {}
|
||||
|
||||
lodash@4.17.23: {}
|
||||
lodash@4.18.1: {}
|
||||
|
||||
lowercase-keys@2.0.0: {}
|
||||
|
||||
lru-cache@10.4.3: {}
|
||||
|
||||
lru-cache@11.2.7: {}
|
||||
lru-cache@11.3.3: {}
|
||||
|
||||
make-asynchronous@1.1.0:
|
||||
dependencies:
|
||||
@@ -3860,7 +3860,7 @@ snapshots:
|
||||
micromatch@4.0.8:
|
||||
dependencies:
|
||||
braces: 3.0.3
|
||||
picomatch: 2.3.1
|
||||
picomatch: 2.3.2
|
||||
|
||||
mime-db@1.52.0: {}
|
||||
|
||||
@@ -3876,13 +3876,13 @@ snapshots:
|
||||
|
||||
mimic-response@2.1.0: {}
|
||||
|
||||
minimatch@10.2.4:
|
||||
minimatch@10.2.5:
|
||||
dependencies:
|
||||
brace-expansion: 5.0.4
|
||||
brace-expansion: 5.0.5
|
||||
|
||||
minimatch@3.1.5:
|
||||
dependencies:
|
||||
brace-expansion: 1.1.12
|
||||
brace-expansion: 1.1.14
|
||||
|
||||
minimist@1.2.8: {}
|
||||
|
||||
@@ -3930,7 +3930,7 @@ snapshots:
|
||||
path-key: 4.0.0
|
||||
unicorn-magic: 0.3.0
|
||||
|
||||
npm@11.12.0: {}
|
||||
npm@11.12.1: {}
|
||||
|
||||
object-assign@4.1.1: {}
|
||||
|
||||
@@ -4026,9 +4026,9 @@ snapshots:
|
||||
|
||||
picocolors@1.1.1: {}
|
||||
|
||||
picomatch@2.3.1: {}
|
||||
picomatch@2.3.2: {}
|
||||
|
||||
picomatch@4.0.3: {}
|
||||
picomatch@4.0.4: {}
|
||||
|
||||
pify@3.0.0: {}
|
||||
|
||||
@@ -4037,12 +4037,12 @@ snapshots:
|
||||
find-up: 2.1.0
|
||||
load-json-file: 4.0.0
|
||||
|
||||
prettier-plugin-java@2.8.1(prettier@3.8.1):
|
||||
prettier-plugin-java@2.8.1(prettier@3.8.2):
|
||||
dependencies:
|
||||
java-parser: 3.0.1
|
||||
prettier: 3.8.1
|
||||
prettier: 3.8.2
|
||||
|
||||
prettier@3.8.1: {}
|
||||
prettier@3.8.2: {}
|
||||
|
||||
pretty-ms@9.3.0:
|
||||
dependencies:
|
||||
@@ -4149,7 +4149,7 @@ snapshots:
|
||||
hook-std: 4.0.0
|
||||
hosted-git-info: 9.0.2
|
||||
import-from-esm: 2.0.0
|
||||
lodash-es: 4.17.23
|
||||
lodash-es: 4.18.1
|
||||
marked: 15.0.12
|
||||
marked-terminal: 7.3.0(marked@15.0.12)
|
||||
micromatch: 4.0.8
|
||||
@@ -4294,10 +4294,10 @@ snapshots:
|
||||
dependencies:
|
||||
convert-hrtime: 5.0.0
|
||||
|
||||
tinyglobby@0.2.15:
|
||||
tinyglobby@0.2.16:
|
||||
dependencies:
|
||||
fdir: 6.5.0(picomatch@4.0.3)
|
||||
picomatch: 4.0.3
|
||||
fdir: 6.5.0(picomatch@4.0.4)
|
||||
picomatch: 4.0.4
|
||||
|
||||
to-readable-stream@2.1.0: {}
|
||||
|
||||
@@ -4324,11 +4324,11 @@ snapshots:
|
||||
uglify-js@3.19.3:
|
||||
optional: true
|
||||
|
||||
undici-types@7.18.2: {}
|
||||
undici-types@7.19.2: {}
|
||||
|
||||
undici@6.24.1: {}
|
||||
|
||||
undici@7.24.5: {}
|
||||
undici@7.24.8: {}
|
||||
|
||||
unicode-emoji-modifier-base@1.0.0: {}
|
||||
|
||||
|
||||
@@ -7,13 +7,15 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>drinkool</artifactId>
|
||||
<version>1.5.0</version>
|
||||
<version>1.5.4</version>
|
||||
<packaging>pom</packaging>
|
||||
<properties>
|
||||
<maven.compiler.source>25</maven.compiler.source>
|
||||
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
|
||||
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
|
||||
<quarkus.platform.version>3.32.3</quarkus.platform.version>
|
||||
|
||||
<surefire-plugin.version>3.5.4</surefire-plugin.version>
|
||||
</properties>
|
||||
<modules>
|
||||
<module>lib</module>
|
||||
@@ -30,29 +32,6 @@
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-jacoco</artifactId>
|
||||
<scope>test</scope>
|
||||
<version>${quarkus.platform.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<configuration>
|
||||
<systemPropertyVariables>
|
||||
<quarkus.jacoco.data-file
|
||||
>${maven.multiModuleProjectDirectory}/target/jacoco.exec</quarkus.jacoco.data-file>
|
||||
<quarkus.jacoco.reuse-data-file
|
||||
>true</quarkus.jacoco.reuse-data-file>
|
||||
<quarkus.jacoco.report-location
|
||||
>${maven.multiModuleProjectDirectory}/target/coverage</quarkus.jacoco.report-location>
|
||||
</systemPropertyVariables>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
||||
Reference in New Issue
Block a user