-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #248 from sopt-makers/develop
34기 출석 점수 연산 방식 변경 사항 반영
- Loading branch information
Showing
279 changed files
with
5,497 additions
and
3,713 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,4 +38,6 @@ out/ | |
| .vscode/ | ||
|
|
||
| ### config yml ### | ||
| application-**.yml | ||
| application-**.yml | ||
|
|
||
| */src/main/generated | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,55 @@ | ||
| buildscript { | ||
| ext { | ||
| queryDslVersion = "5.0.0" | ||
| repositories { | ||
| mavenCentral() | ||
| } | ||
| } | ||
|
|
||
| plugins { | ||
| id 'java' | ||
| id 'org.springframework.boot' version '2.7.4' | ||
| id 'org.springframework.boot' version '3.0.0' | ||
| id 'io.spring.dependency-management' version '1.1.0' | ||
| id 'com.ewerk.gradle.plugins.querydsl' version '1.0.10' | ||
| } | ||
|
|
||
| group = 'org.sopt.makers' | ||
| version = '0.0.1-SNAPSHOT' | ||
| sourceCompatibility = '17' | ||
| allprojects { | ||
| apply plugin: 'java' | ||
| apply plugin: 'org.springframework.boot' | ||
| apply plugin: 'io.spring.dependency-management' | ||
|
|
||
| configurations { | ||
| compileOnly { | ||
| extendsFrom annotationProcessor | ||
| } | ||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| } | ||
| group = 'org.sopt.makers.operation' | ||
| version = '0.0.1-SNAPSHOT' | ||
| sourceCompatibility = '17' | ||
|
|
||
| dependencies { | ||
| implementation 'org.springframework.boot:spring-boot-starter-data-jpa' | ||
| implementation 'org.springframework.boot:spring-boot-starter-validation' | ||
| implementation 'org.springframework.boot:spring-boot-starter-web' | ||
| implementation 'org.springframework.boot:spring-boot-starter-security' | ||
| implementation "com.querydsl:querydsl-jpa:${queryDslVersion}" | ||
| implementation "com.querydsl:querydsl-apt:${queryDslVersion}" | ||
| repositories { | ||
| mavenCentral() | ||
| } | ||
|
|
||
| compileOnly 'org.projectlombok:lombok' | ||
| runtimeOnly 'com.h2database:h2' | ||
| runtimeOnly 'org.postgresql:postgresql' | ||
| annotationProcessor 'org.projectlombok:lombok' | ||
| configurations { | ||
| compileOnly { | ||
| extendsFrom annotationProcessor | ||
| } | ||
| } | ||
|
|
||
| // jwt | ||
| implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.2' | ||
| runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.2' | ||
| runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.2' | ||
| dependencies { | ||
| // lombok | ||
| compileOnly 'org.projectlombok:lombok' | ||
| annotationProcessor 'org.projectlombok:lombok' | ||
| testAnnotationProcessor 'org.projectlombok:lombok' | ||
| testCompileOnly 'org.projectlombok:lombok' | ||
|
|
||
| testImplementation 'org.springframework.boot:spring-boot-starter-test' | ||
| // test | ||
| testImplementation 'org.springframework.boot:spring-boot-starter-test' | ||
| testImplementation 'org.springframework.security:spring-security-test' | ||
| } | ||
|
|
||
| // swagger | ||
| implementation 'io.springfox:springfox-boot-starter:3.0.0' | ||
| implementation 'io.springfox:springfox-swagger-ui:3.0.0' | ||
| tasks.named('test') { | ||
| useJUnitPlatform() | ||
| } | ||
| } | ||
|
|
||
| tasks.named('test') { | ||
| useJUnitPlatform() | ||
| jar { | ||
| enabled = true | ||
| } | ||
|
|
||
| def querydslDir = "$buildDir/generated/querydsl" | ||
|
|
||
| querydsl { | ||
| jpa = true | ||
| querydslSourcesDir = querydslDir | ||
| } | ||
| sourceSets { | ||
| main.java.srcDir querydslDir | ||
| } | ||
| compileQuerydsl{ | ||
| options.annotationProcessorPath = configurations.querydsl | ||
| } | ||
| configurations { | ||
| compileOnly { | ||
| extendsFrom annotationProcessor | ||
| } | ||
| querydsl.extendsFrom compileClasspath | ||
| } | ||
| bootJar { | ||
| enabled = false | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| jar { | ||
| enabled = false | ||
| } | ||
|
|
||
| bootJar { | ||
| enabled = true | ||
| } | ||
|
|
||
| dependencies { | ||
| // module | ||
| implementation project(path: ':operation-auth') | ||
| implementation project(path: ':operation-common') | ||
| implementation project(path: ':operation-domain') | ||
| implementation project(path: ':operation-external') | ||
|
|
||
| implementation 'org.springframework.boot:spring-boot-starter-web' | ||
| implementation 'org.springframework.boot:spring-boot-starter-security' | ||
| implementation 'org.springframework.boot:spring-boot-starter-data-jpa' | ||
| implementation 'org.springframework.boot:spring-boot-starter-validation' | ||
|
|
||
| // swagger | ||
| implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' | ||
|
|
||
| } |
14 changes: 14 additions & 0 deletions
14
operation-api/src/main/java/org/sopt/makers/operation/OperationApplication.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package org.sopt.makers.operation; | ||
|
|
||
| import org.springframework.boot.SpringApplication; | ||
| import org.springframework.boot.autoconfigure.SpringBootApplication; | ||
|
|
||
| @SpringBootApplication( | ||
| scanBasePackageClasses = {AuthRoot.class, CommonRoot.class, DomainRoot.class, ExternalRoot.class} | ||
| ) | ||
| public class OperationApplication { | ||
|
|
||
| public static void main(String[] args) { | ||
| SpringApplication.run(OperationApplication.class, args); | ||
| } | ||
| } |
Oops, something went wrong.