From 0ff46185c20525b8fe79f0b0bb22eee1368e41a7 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 17 Apr 2022 15:09:10 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D1=80?= =?UTF-8?q?=D0=B0=20Discord=20=D0=B2=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D1=83=D1=8E=20=D0=BF=D0=B0=D0=BF=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.MD => discord/README.MD | 6 +++--- build.gradle => discord/build.gradle | 5 +---- {docs => discord/docs}/1.png | Bin {docs => discord/docs}/2.png | Bin {docs => discord/docs}/3.png | Bin {docs => discord/docs}/4.png | Bin {docs => discord/docs}/5.png | Bin {docs => discord/docs}/6.png | Bin {docs => discord/docs}/7.png | Bin .../example/oauth2/discord/ApplicationDiscord.java | 4 ++-- .../oauth2/discord/config/DiscordOAuth2Config.java | 0 .../example/oauth2/discord/config/MvcConfig.java | 0 .../oauth2/discord/config/WebSecurityConfig.java | 0 {src => discord/src}/main/resources/application.yml | 0 .../src}/main/resources/templates/index.html | 0 .../src}/main/resources/templates/secret.html | 0 gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 4 +++- 18 files changed, 10 insertions(+), 11 deletions(-) rename README.MD => discord/README.MD (80%) rename build.gradle => discord/build.gradle (81%) rename {docs => discord/docs}/1.png (100%) rename {docs => discord/docs}/2.png (100%) rename {docs => discord/docs}/3.png (100%) rename {docs => discord/docs}/4.png (100%) rename {docs => discord/docs}/5.png (100%) rename {docs => discord/docs}/6.png (100%) rename {docs => discord/docs}/7.png (100%) rename src/main/java/example/oauth2/discord/Application.java => discord/src/main/java/example/oauth2/discord/ApplicationDiscord.java (70%) rename {src => discord/src}/main/java/example/oauth2/discord/config/DiscordOAuth2Config.java (100%) rename {src => discord/src}/main/java/example/oauth2/discord/config/MvcConfig.java (100%) rename {src => discord/src}/main/java/example/oauth2/discord/config/WebSecurityConfig.java (100%) rename {src => discord/src}/main/resources/application.yml (100%) rename {src => discord/src}/main/resources/templates/index.html (100%) rename {src => discord/src}/main/resources/templates/secret.html (100%) diff --git a/README.MD b/discord/README.MD similarity index 80% rename from README.MD rename to discord/README.MD index 6a8e70c..5fcb3e7 100644 --- a/README.MD +++ b/discord/README.MD @@ -1,7 +1,7 @@ # Spring Boot + OAuth2 Discord - - +Spring Boot +Discord ## Перед запуском ### Создание Discord Application @@ -33,4 +33,4 @@ spring: discord: client-id: 965013316982423632 client-secret: yhb13RP26WxfOru9fcQ6CxPcAUWr_2q6 -``` \ No newline at end of file +``` diff --git a/build.gradle b/discord/build.gradle similarity index 81% rename from build.gradle rename to discord/build.gradle index 22e64fe..af22e3b 100644 --- a/build.gradle +++ b/discord/build.gradle @@ -6,16 +6,13 @@ plugins { group = 'example.oauth2' version = '1.0-SNAPSHOT' -sourceCompatibility = '11' +sourceCompatibility = JavaVersion.VERSION_11 repositories { mavenCentral() } dependencies { - annotationProcessor('org.projectlombok:lombok') - compileOnly('org.projectlombok:lombok') - implementation('org.springframework.boot:spring-boot-starter-web') implementation('org.springframework.boot:spring-boot-starter-thymeleaf') diff --git a/docs/1.png b/discord/docs/1.png similarity index 100% rename from docs/1.png rename to discord/docs/1.png diff --git a/docs/2.png b/discord/docs/2.png similarity index 100% rename from docs/2.png rename to discord/docs/2.png diff --git a/docs/3.png b/discord/docs/3.png similarity index 100% rename from docs/3.png rename to discord/docs/3.png diff --git a/docs/4.png b/discord/docs/4.png similarity index 100% rename from docs/4.png rename to discord/docs/4.png diff --git a/docs/5.png b/discord/docs/5.png similarity index 100% rename from docs/5.png rename to discord/docs/5.png diff --git a/docs/6.png b/discord/docs/6.png similarity index 100% rename from docs/6.png rename to discord/docs/6.png diff --git a/docs/7.png b/discord/docs/7.png similarity index 100% rename from docs/7.png rename to discord/docs/7.png diff --git a/src/main/java/example/oauth2/discord/Application.java b/discord/src/main/java/example/oauth2/discord/ApplicationDiscord.java similarity index 70% rename from src/main/java/example/oauth2/discord/Application.java rename to discord/src/main/java/example/oauth2/discord/ApplicationDiscord.java index ef4deda..0d9cb46 100644 --- a/src/main/java/example/oauth2/discord/Application.java +++ b/discord/src/main/java/example/oauth2/discord/ApplicationDiscord.java @@ -4,10 +4,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class Application { +public class ApplicationDiscord { public static void main(String[] args) { - SpringApplication.run(Application.class, args); + SpringApplication.run(ApplicationDiscord.class, args); } } diff --git a/src/main/java/example/oauth2/discord/config/DiscordOAuth2Config.java b/discord/src/main/java/example/oauth2/discord/config/DiscordOAuth2Config.java similarity index 100% rename from src/main/java/example/oauth2/discord/config/DiscordOAuth2Config.java rename to discord/src/main/java/example/oauth2/discord/config/DiscordOAuth2Config.java diff --git a/src/main/java/example/oauth2/discord/config/MvcConfig.java b/discord/src/main/java/example/oauth2/discord/config/MvcConfig.java similarity index 100% rename from src/main/java/example/oauth2/discord/config/MvcConfig.java rename to discord/src/main/java/example/oauth2/discord/config/MvcConfig.java diff --git a/src/main/java/example/oauth2/discord/config/WebSecurityConfig.java b/discord/src/main/java/example/oauth2/discord/config/WebSecurityConfig.java similarity index 100% rename from src/main/java/example/oauth2/discord/config/WebSecurityConfig.java rename to discord/src/main/java/example/oauth2/discord/config/WebSecurityConfig.java diff --git a/src/main/resources/application.yml b/discord/src/main/resources/application.yml similarity index 100% rename from src/main/resources/application.yml rename to discord/src/main/resources/application.yml diff --git a/src/main/resources/templates/index.html b/discord/src/main/resources/templates/index.html similarity index 100% rename from src/main/resources/templates/index.html rename to discord/src/main/resources/templates/index.html diff --git a/src/main/resources/templates/secret.html b/discord/src/main/resources/templates/secret.html similarity index 100% rename from src/main/resources/templates/secret.html rename to discord/src/main/resources/templates/secret.html diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 00e33ed..92f06b5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index a0780ad..f2479e2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,3 @@ -rootProject.name = 'spring-oauth2-discord' +rootProject.name = 'spring-oauth2-examples' + +include('discord')