Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ver 2 DEPLOY #483

Merged
merged 54 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
2fe798e
Merge pull request #217 from Travel-in-nanaland/develop
Te-H0 May 27, 2024
e85e33b
Merge pull request #225 from Travel-in-nanaland/develop
heeeeeseok May 31, 2024
c4de014
Merge pull request #227 from Travel-in-nanaland/develop
heeeeeseok Jun 2, 2024
85dac30
Merge pull request #229 from Travel-in-nanaland/develop
heeeeeseok Jun 2, 2024
25f19d2
Merge pull request #235 from Travel-in-nanaland/develop
jyajoo Jun 6, 2024
afa71bd
Merge pull request #241 from Travel-in-nanaland/develop
heeeeeseok Jun 10, 2024
4449f5c
Merge pull request #243 from Travel-in-nanaland/develop
jyajoo Jun 13, 2024
b1ac46d
[#244] refactor: μΆ”μ²œ 이미지 origin μ΄λ―Έμ§€λ‘œ λ°˜ν™˜
heeeeeseok Jun 14, 2024
e5d9ce1
Merge pull request #247 from Travel-in-nanaland/develop
Te-H0 Jun 15, 2024
3f83121
Merge pull request #249 from Travel-in-nanaland/develop
Te-H0 Jun 15, 2024
7a2e5f6
Merge pull request #251 from Travel-in-nanaland/develop
Te-H0 Jun 15, 2024
58484fa
Update gradle.yml
jyajoo Jun 19, 2024
568e4d3
Update gradle.yml
jyajoo Jun 19, 2024
15ce0f9
Update gradle.yml
jyajoo Jun 19, 2024
8ade03c
Update gradle.yml
jyajoo Jun 19, 2024
d2317fe
Update gradle.yml
Te-H0 Jun 23, 2024
5e33b80
Update gradle.yml
Te-H0 Jun 23, 2024
a5ddb36
Update gradle.yml
Te-H0 Jun 23, 2024
19a80fb
Update gradle.yml
Te-H0 Jun 23, 2024
b0a116b
Update gradle.yml
Te-H0 Jun 23, 2024
1e8c9bb
Merge pull request #245 from Travel-in-nanaland/refactor/#244-recomme…
heeeeeseok Jun 24, 2024
d7e3562
Merge pull request #258 from Travel-in-nanaland/develop
heeeeeseok Jun 24, 2024
d48c865
[#269] hotfix: s3ImageService 썸넀일 높이 aspectRatio 0일 경우 450 λ°˜ν™˜
Te-H0 Jul 1, 2024
053ace8
Merge pull request #270 from Travel-in-nanaland/hotfix/#269-s3-thumbn…
Te-H0 Jul 1, 2024
b9a7831
[#269] hotfix: findNanaThumbnailPostDto Test μ£Όμ„μ²˜λ¦¬
Te-H0 Jul 1, 2024
300b6c5
Merge pull request #272 from Travel-in-nanaland/hotfix/#269-s3-thumbn…
Te-H0 Jul 1, 2024
d68703a
[#273] hotfix: 쀑ꡭ어, λ§λ ˆμ΄μ–΄ 컨셉 이름 μˆ˜μ •
heeeeeseok Jul 2, 2024
b859a8d
[#273] hotfix: μΆ”μ²œ κ²Œμ‹œλ¬Ό 이미지
heeeeeseok Jul 4, 2024
a590f1c
[#273] hotfix: μΆ”μ²œ νƒ€μž… ν…ŒμŠ€νŠΈμ½”λ“œ
heeeeeseok Jul 5, 2024
c71c131
[#273] hotfix: μΆ”μ²œ νƒ€μž… ν…ŒμŠ€νŠΈ
heeeeeseok Jul 5, 2024
6f997a8
[#273] hotfix: μ•ˆλ“œλ‘œμ΄λ“œ λ”₯링크 경둜 μˆ˜μ •
heeeeeseok Jul 5, 2024
521e509
Merge pull request #274 from Travel-in-nanaland/hotfix/#273-traveltype
heeeeeseok Jul 5, 2024
26b22ec
[#284] hotfix: nginx μ„€μ •
heeeeeseok Jul 7, 2024
02c3908
[#284] hotfix: nginx deploy μ„€μ •
heeeeeseok Jul 7, 2024
d8a7c99
Merge pull request #285 from Travel-in-nanaland/hotfix/#284-nginx
heeeeeseok Jul 7, 2024
196b81a
[#284] hotfix: nginx deploy μ„€μ •
heeeeeseok Jul 7, 2024
8a2c8b0
Merge pull request #286 from Travel-in-nanaland/hotfix/#284-nginx
heeeeeseok Jul 7, 2024
ac05388
[#287] hotfix: version API
heeeeeseok Jul 7, 2024
20cc878
Merge pull request #288 from Travel-in-nanaland/hotfix/#287-version-api
heeeeeseok Jul 7, 2024
dd108b0
[#294] deploy: gitignore μΆ”κ°€
heeeeeseok Jul 12, 2024
33e8d3e
[#294] deploy: github actions μˆ˜μ •
heeeeeseok Jul 12, 2024
a966d50
[#294] deploy: appspec.yml, scripts/ λ‚΄ 파일 μ‚­μ œ
heeeeeseok Jul 12, 2024
dc72d25
Merge pull request #295 from Travel-in-nanaland/deploy/#294-main-deploy
heeeeeseok Jul 12, 2024
cae3c34
[#294] deploy: main github actions μˆ˜μ •
heeeeeseok Jul 12, 2024
8d8c000
[#294] deploy: main github actions μˆ˜μ •
heeeeeseok Jul 12, 2024
d11116a
[#294] deploy: main github actions μˆ˜μ •
heeeeeseok Jul 12, 2024
557ec8f
[#294] deploy: main github actions μˆ˜μ •
heeeeeseok Jul 12, 2024
b853d2b
[#294] deploy: main github actions μˆ˜μ •
heeeeeseok Jul 12, 2024
20bbe05
[#294] deploy: main github actions μˆ˜μ •
heeeeeseok Jul 12, 2024
a35aae3
[#471] refactor: swagger https 적용
Te-H0 Oct 28, 2024
8d75cb5
Merge remote-tracking branch 'refs/remotes/origin/develop'
Te-H0 Oct 30, 2024
c57f619
Merge remote-tracking branch 'refs/remotes/origin/main'
Te-H0 Oct 30, 2024
41bc423
[#479] feat: ci/cd μˆ˜μ •
Te-H0 Oct 30, 2024
8a6b5b9
merge develop to main
Te-H0 Oct 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-mail'
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'

// actuator
implementation 'org.springframework.boot:spring-boot-starter-actuator'

// FCM - notification
implementation 'com.google.firebase:firebase-admin:9.2.0'

Expand All @@ -65,6 +68,11 @@ dependencies {

implementation 'com.github.maricn:logback-slack-appender:1.4.0'
}

springBoot {
buildInfo()
}

test {
systemProperty "spring.profiles.active", "test"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package com.jeju.nanaland.global.config;

import io.swagger.v3.oas.annotations.OpenAPIDefinition;
import io.swagger.v3.oas.annotations.servers.Server;
import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.security.SecurityRequirement;
import io.swagger.v3.oas.models.security.SecurityScheme;
import io.swagger.v3.oas.models.servers.Server;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@Configuration
@OpenAPIDefinition(servers = {@Server(url = "https://nanaland.site")})
public class SwaggerConfig {

@Value("${springdoc.version}")
Expand All @@ -32,7 +34,7 @@ public OpenAPI openAPI() {
.version(version);

return new OpenAPI()
.addServersItem(new Server().url("/"))
.addServersItem(new io.swagger.v3.oas.models.servers.Server().url("/"))
.info(info)
.components(components)
.addSecurityItem(securityRequirement);
Expand Down
Loading