From a15ad575e7bba5a99bf8a1843631453c43bc6495 Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Sun, 4 Dec 2022 13:40:32 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gitlab-app/Dockerfile-debug | 23 ------------------- .../bot/gitlab/GitLabBotApplication.java | 13 +++++++++++ .../bot/gitlab/app/GitLabBotApplication.java | 17 -------------- .../gitlab/{app => }/config/AppConfig.java | 2 +- .../{app => }/scheduler/SchedulerService.java | 2 +- pom.xml | 12 ---------- 6 files changed, 15 insertions(+), 54 deletions(-) delete mode 100644 gitlab-app/Dockerfile-debug create mode 100644 gitlab-app/src/main/java/dev/struchkov/bot/gitlab/GitLabBotApplication.java delete mode 100644 gitlab-app/src/main/java/dev/struchkov/bot/gitlab/app/GitLabBotApplication.java rename gitlab-app/src/main/java/dev/struchkov/bot/gitlab/{app => }/config/AppConfig.java (98%) rename gitlab-app/src/main/java/dev/struchkov/bot/gitlab/{app => }/scheduler/SchedulerService.java (96%) diff --git a/gitlab-app/Dockerfile-debug b/gitlab-app/Dockerfile-debug deleted file mode 100644 index eab6676..0000000 --- a/gitlab-app/Dockerfile-debug +++ /dev/null @@ -1,23 +0,0 @@ -FROM openjdk:17.0.2-jdk-slim-buster -MAINTAINER uPagge -RUN apt upgrade && addgroup gitlabbot --disabled-password && \ - adduser gitlabbot --ingroup gitlabbot && \ - mkdir -p /bot && \ - chown -R gitlabbot:gitlabbot /bot -WORKDIR /bot -USER gitlabbot:gitlabbot -COPY target/gitlab-notification.jar app.jar -ENV TELEGRAM_PERSON_ID=TELEGRAM_PERSON_ID DATASOURCE_URL=DATASOURCE_URL \ - DATASOURCE_PASSWORD=DATASOURCE_PASSWORD DATASOURCE_USERNAME=DATASOURCE_USERNAME \ - GITLAB_PERSONAL_TOKEN=GITLAB_PERSONAL_TOKEN TELEGRAM_BOT_TOKEN=TELEGRAM_BOT_TOKEN \ - TELEGRAM_BOT_USERNAME=TELEGRAM_BOT_USERNAME GITLAB_URL=GITLAB_URL GITLAB_REPLACE_URL=GITLAB_REPLACE_URL -ENTRYPOINT java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -DTELEGRAM_BOT_USERNAME=${TELEGRAM_BOT_USERNAME} \ - -DTELEGRAM_BOT_TOKEN=$TELEGRAM_BOT_TOKEN \ - -DTELEGRAM_PERSON_ID=$TELEGRAM_PERSON_ID \ - -DDATASOURCE_URL=$DATASOURCE_URL \ - -DDATASOURCE_PASSWORD=$DATASOURCE_PASSWORD \ - -DDATASOURCE_USERNAME=$DATASOURCE_USERNAME \ - -DGITLAB_PERSONAL_TOKEN=$GITLAB_PERSONAL_TOKEN \ - -DGITLAB_URL=$GITLAB_URL \ - -DGITLAB_REPLACE_URL=$GITLAB_REPLACE_URL \ - -jar app.jar \ No newline at end of file diff --git a/gitlab-app/src/main/java/dev/struchkov/bot/gitlab/GitLabBotApplication.java b/gitlab-app/src/main/java/dev/struchkov/bot/gitlab/GitLabBotApplication.java new file mode 100644 index 0000000..6e162ee --- /dev/null +++ b/gitlab-app/src/main/java/dev/struchkov/bot/gitlab/GitLabBotApplication.java @@ -0,0 +1,13 @@ +package dev.struchkov.bot.gitlab; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class GitLabBotApplication { + + public static void main(String[] args) { + SpringApplication.run(GitLabBotApplication.class, args); + } + +} diff --git a/gitlab-app/src/main/java/dev/struchkov/bot/gitlab/app/GitLabBotApplication.java b/gitlab-app/src/main/java/dev/struchkov/bot/gitlab/app/GitLabBotApplication.java deleted file mode 100644 index b17448f..0000000 --- a/gitlab-app/src/main/java/dev/struchkov/bot/gitlab/app/GitLabBotApplication.java +++ /dev/null @@ -1,17 +0,0 @@ -package dev.struchkov.bot.gitlab.app; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; - -@EnableJpaRepositories(basePackages = {"dev.struchkov.bot.gitlab.data.jpa"}) -@SpringBootApplication(scanBasePackages = "dev.struchkov.bot.gitlab") -@EntityScan(basePackages = {"dev.struchkov.bot.gitlab.context.domain.entity"}) -public class GitLabBotApplication { - - public static void main(String[] args) { - SpringApplication.run(GitLabBotApplication.class, args); - } - -} diff --git a/gitlab-app/src/main/java/dev/struchkov/bot/gitlab/app/config/AppConfig.java b/gitlab-app/src/main/java/dev/struchkov/bot/gitlab/config/AppConfig.java similarity index 98% rename from gitlab-app/src/main/java/dev/struchkov/bot/gitlab/app/config/AppConfig.java rename to gitlab-app/src/main/java/dev/struchkov/bot/gitlab/config/AppConfig.java index efa0b6d..f2ae9d8 100644 --- a/gitlab-app/src/main/java/dev/struchkov/bot/gitlab/app/config/AppConfig.java +++ b/gitlab-app/src/main/java/dev/struchkov/bot/gitlab/config/AppConfig.java @@ -1,4 +1,4 @@ -package dev.struchkov.bot.gitlab.app.config; +package dev.struchkov.bot.gitlab.config; import dev.struchkov.bot.gitlab.context.domain.PersonInformation; import dev.struchkov.bot.gitlab.core.config.properties.GitlabProperty; diff --git a/gitlab-app/src/main/java/dev/struchkov/bot/gitlab/app/scheduler/SchedulerService.java b/gitlab-app/src/main/java/dev/struchkov/bot/gitlab/scheduler/SchedulerService.java similarity index 96% rename from gitlab-app/src/main/java/dev/struchkov/bot/gitlab/app/scheduler/SchedulerService.java rename to gitlab-app/src/main/java/dev/struchkov/bot/gitlab/scheduler/SchedulerService.java index 45c7f57..f058b70 100644 --- a/gitlab-app/src/main/java/dev/struchkov/bot/gitlab/app/scheduler/SchedulerService.java +++ b/gitlab-app/src/main/java/dev/struchkov/bot/gitlab/scheduler/SchedulerService.java @@ -1,4 +1,4 @@ -package dev.struchkov.bot.gitlab.app.scheduler; +package dev.struchkov.bot.gitlab.scheduler; import dev.struchkov.bot.gitlab.context.service.CleanService; import dev.struchkov.bot.gitlab.core.service.parser.DiscussionParser; diff --git a/pom.xml b/pom.xml index b9eb7b5..58f5bc7 100644 --- a/pom.xml +++ b/pom.xml @@ -182,18 +182,6 @@ - - org.springframework.boot - spring-boot-starter-web - 2.2.4.RELEASE - - - ch.qos.logback - logback-classic - - - -