Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 7 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,21 @@ jobs:
docker rm attraction-api-server || true
docker pull ${{ steps.ecr-login.outputs.registry }}/attraction-api-server:latest

# Redis 연결용 네트워크 생성
# docker network rm redis-network || true && docker network create redis-network


# Redis 컨테이너 실행
docker stop redis-server || true
docker rm redis-server || true
docker run -d --name redis-server -p 6379:6379 redis:latest
# docker run -d --name redis-server --network redis-network -p 6379:6379 redis:latest

# Spring Boot 애플리케이션 컨테이너 실행
docker run -d --name attraction-api-server --link redis-server:redis -e TZ=Asia/Seoul -p 8080:8080 -v /home/ec2-user/workspace/logs:/logs ${{ steps.ecr-login.outputs.registry }}/attraction-api-server:latest
# docker run -d --name attraction-api-server --network redis-network -e TZ=Asia/Seoul -p 8080:8080 -v /home/ec2-user/workspace/logs:/logs ${{ steps.ecr-login.outputs.registry }}/attraction-api-server:latest

# filebeat 실행
# filebeat 실행
docker stop filebeat || true
docker rm filebeat || true
docker run -d --name filebeat -v "$HOME/workspace/logs:/usr/share/filebeat/logs" -v "$HOME/workspace/filebeat/filebeat.yml:/usr/share/filebeat/filebeat.yml" docker.elastic.co/beats/filebeat:8.14.1
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,11 @@ jobs:

- name: 빌드하기 및 테스트 하기
run: ./gradlew clean build

# 임시추가
- name: Upload Test Report
if: always()
uses: actions/upload-artifact@v3
with:
name: test-report
path: build/reports/tests/test
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ dependencies {
//swagger - https://springdoc.org/
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'

// // Session(Redis)
// implementation 'org.springframework.session:spring-session-data-redis'
// Session(Redis)
implementation 'org.springframework.session:spring-session-data-redis'
}

tasks.withType(JavaCompile).configureEach {
Expand Down
50 changes: 25 additions & 25 deletions src/main/java/run/attraction/api/v1/auth/config/RedisConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,30 +32,30 @@ public RedisConnectionFactory redisConnectionFactory() {
return new LettuceConnectionFactory(host, port);
}

// @Bean
// public RedisTemplate<String,Object> redisTemplate() {
// final RedisTemplate<String,Object> redisTemplate = new RedisTemplate<>();
// redisTemplate.setKeySerializer(new StringRedisSerializer());
// redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer(objectMapper()));
// redisTemplate.setHashKeySerializer(new StringRedisSerializer());
// redisTemplate.setHashValueSerializer(RedisSerializer.java());
// redisTemplate.setConnectionFactory(redisConnectionFactory());
// return redisTemplate;
// }
//
// private ObjectMapper objectMapper() {
// PolymorphicTypeValidator ptv = BasicPolymorphicTypeValidator
// .builder()
// .allowIfSubType(Object.class)
// .build();
//
// return new ObjectMapper()
// .findAndRegisterModules()
// .enable(SerializationFeature.INDENT_OUTPUT)
// .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
// .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,false)
// .registerModule(new JavaTimeModule())
// .activateDefaultTyping(ptv, ObjectMapper.DefaultTyping.NON_FINAL);
// }
@Bean
public RedisTemplate<String,Object> redisTemplate() {
final RedisTemplate<String,Object> redisTemplate = new RedisTemplate<>();
redisTemplate.setKeySerializer(new StringRedisSerializer());
redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer(objectMapper()));
redisTemplate.setHashKeySerializer(new StringRedisSerializer());
redisTemplate.setHashValueSerializer(RedisSerializer.java());
redisTemplate.setConnectionFactory(redisConnectionFactory());
return redisTemplate;
}

private ObjectMapper objectMapper() {
PolymorphicTypeValidator ptv = BasicPolymorphicTypeValidator
.builder()
.allowIfSubType(Object.class)
.build();

return new ObjectMapper()
.findAndRegisterModules()
.enable(SerializationFeature.INDENT_OUTPUT)
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,false)
.registerModule(new JavaTimeModule())
.activateDefaultTyping(ptv, ObjectMapper.DefaultTyping.NON_FINAL);
}
}

3 changes: 3 additions & 0 deletions src/test/java/run/attraction/AttractionApplicationTests.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package run.attraction;

import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;

@SpringBootTest
@ImportAutoConfiguration(exclude = {RedisAutoConfiguration.class})
class AttractionApplicationTests {

@Test
Expand Down
Loading