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

[REFACTOR] HTTP로 변경 #56

Merged
Merged
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
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ WORKDIR /app
ARG JAR_PATH=./build/libs

COPY ${JAR_PATH}/*.jar app.jar
COPY ./keystore.p12 keystore.p12

CMD ["java","-jar","/app/app.jar"]
6 changes: 2 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ services:
restart: always

backend:
image: ${DOCKER_REPO}
build:
context: .
dockerfile: Dockerfile
Expand All @@ -46,7 +47,4 @@ services:
SPRING_DATASOURCE_PASSWORD: ${MARIA_PASSWORD}
SPRING_DATASOURCE_REDIS_HOST: ${REDIS_HOST}
SPRING_DATASOURCE_REDIS_PORT: ${REDIS_PORT}
SERVER_SSL_ENABLED: "true"
SERVER_SSL_KEY_STORE: ${SERVER_SSL_KEY_STORE}
SERVER_SSL_KEY_STORE_PASSWORD: ${KEY_STORE_PASSWORD}
SERVER_SSL_KEY_STORE_TYPE: PKCS12

3 changes: 1 addition & 2 deletions src/main/java/econo/buddybridge/websocket/StompConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ public class StompConfig extends AbstractSessionWebSocketMessageBrokerConfigurer
protected void configureStompEndpoints(StompEndpointRegistry registry) {
registry.addEndpoint("/socket/connect") // ws://{BASE_URL}/socket/connect 로 연결 설정
.setAllowedOriginPatterns("*") // CORS 허용
.addInterceptors(new HttpSessionHandshakeInterceptor())
.withSockJS(); // WebSocket과 유사한 통신 가능하게 해주는 라이브러리
.addInterceptors(new HttpSessionHandshakeInterceptor());
}
@Override
public void configureMessageBroker(MessageBrokerRegistry registry){
Expand Down
14 changes: 0 additions & 14 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,6 @@ spring:
data-locations: classpath:data.sql
mode: always

server:
ssl:
key-store: keystore.p12
key-store-type: PKCS12
key-store-password: ${KEY_STORE_PASSWORD}

servlet:
session:
cookie:
name: JSESSIONID
same-site: none
secure: true


oauth:
kakao:
client-id: ${OAUTH_KAKAO_CLIENT_ID}
Expand Down
Loading