Skip to content

Commit

Permalink
Eureka client 적용 (#101)
Browse files Browse the repository at this point in the history
* issue/60 💚 CI : 릴리즈 인프라 구축 (#64) (#65)

* Ci : 릴리즈 인프라 구축

* Ci : release 인프라 구축

* 👷 CI : 릴리즈 인프라 구축 (#67)

* issue/60 💚 CI : 릴리즈 인프라 구축 (#64)

* Ci : 릴리즈 인프라 구축

* Ci : release 인프라 구축

* issue/60 🐛 FIX : release_deploy.yml 수정 (#66)

* Ci : 릴리즈 인프라 구축

* Ci : release 인프라 구축

* Fix : release_deploy.yml 수정

* 🚀 2023 10 13 release 릴리즈 인프라 application.yml profile 분리 (#73)

* issue/60 💚 CI : 릴리즈 인프라 구축 (#64)

* Ci : 릴리즈 인프라 구축

* Ci : release 인프라 구축

* issue/60 🐛 FIX : release_deploy.yml 수정 (#66)

* Ci : 릴리즈 인프라 구축

* Ci : release 인프라 구축

* Fix : release_deploy.yml 수정

* Ci : 개발 인프라 이전 (#69)

* Ci/68 🐛 [FIX] application.yml profile 수정 (#70)

* Ci : 개발 인프라 이전

* application.yml profile 분리 수정

* Ci : release 인프라 application.yml profile 분리 (#72)

* 💚 Change CI/CD script

릴리즈 인프라 CI/CD Push때도 돌도록 변경

* 💚 Change CI/CD Script

release_deploy.yml 변경

* 🐛 Fix : redis 연결 정보 수정

* 🔨 Eureka client 적용

* ♻️ Refactor : spring security 설정 변경

---------

Co-authored-by: swa07016 <[email protected]>
  • Loading branch information
CYY1007 and swa07016 authored Dec 9, 2023
1 parent 52787e7 commit 2651d44
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 5 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/release_deploy.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
name: Breifing Release CI/CD

on:
push:
branches:
- release
pull_request:
branches:
- release
types: [closed]
workflow_dispatch: # (2).수동 실행도 가능하도록

jobs:
build:
runs-on: ubuntu-latest # (3).OS환경
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'release'
if: (github.event_name == 'push' && github.ref == 'refs/heads/release') || (github.event.pull_request && github.event.pull_request.merged == true)


steps:
Expand Down
8 changes: 7 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ repositories {

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'

// eureka client 설정
implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'

// querydsl
// == 스프링 부트 3.0 이상 ==
implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
Expand All @@ -41,11 +45,13 @@ dependencies {
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
implementation 'mysql:mysql-connector-java' // 추가 작성

implementation platform("org.springframework.cloud:spring-cloud-dependencies:2022.0.3")
compileOnly 'org.projectlombok:lombok'
runtimeOnly 'com.h2database:h2'
// runtimeOnly 'org.postgresql:postgresql'
runtimeOnly 'com.mysql:mysql-connector-j'
// runtimeOnly 'com.mysql:mysql-connector-j'
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
annotationProcessor 'org.projectlombok:lombok'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.springframework.data.redis.connection.lettuce.observability.LettuceObservationContext;

import java.time.LocalDateTime;
import java.util.List;

public class MemberResponse {

Expand All @@ -27,6 +28,12 @@ public static class ReIssueTokenDTO{
private String accessToken;
private String refreshToken;
}
@Builder @Getter
@NoArgsConstructor
@AllArgsConstructor
public static class ListReIssueTokenDTO{
List<ReIssueTokenDTO> ReIssueTokenList;
}

@Builder @Getter
@NoArgsConstructor
Expand Down
16 changes: 13 additions & 3 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# default profile
spring:
application:
name: briefing-dev
profiles:
active: local
active: dev
springdoc:
swagger-ui:
tags-sorter: alpha # alpha: 알파벳 순 태그 정렬, method: HTTP Method 순 정렬
operations-sorter: alpha # alpha: 알파벳 순 태그 정렬, method: HTTP Method 순 정렬
cache:
disabled: true
use-fqn: true

---
spring:
config:
Expand Down Expand Up @@ -56,6 +57,15 @@ spring:
config:
activate:
on-profile: dev
eureka:
instance:
# 표기되는 규칙 변경
instance-id: dev_briefing_server
hostname: dev.newsbreifing.store
ip-address: dev.newsbreifing.store
client:
service-url:
defaultZone: http://eureka.newsbreifing.store:8761/eureka
datasource:
username: ${aws.db.username}
password: ${aws.db.password}
Expand Down Expand Up @@ -117,7 +127,7 @@ spring:
default_batch_fetch_size: 1000
data:
redis:
host: briefing-redis-cluster.0ot2cs.ng.0001.apn2.cache.amazonaws.com
host: briefing-release-redis.0ot2cs.ng.0001.apn2.cache.amazonaws.com
port: 6379
jwt:
header: Authorization
Expand Down

0 comments on commit 2651d44

Please sign in to comment.