Skip to content
Closed
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
2 changes: 2 additions & 0 deletions .github/workflows/prod-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ jobs:
-e SPRING_DATASOURCE_URL="${{secrets.PROD_DB_URL}}" \
-e SPRING_DATASOURCE_USERNAME="${{secrets.PROD_DB_USERNAME}}" \
-e SPRING_DATASOURCE_PASSWORD="${{secrets.PROD_DB_PASSWORD}}" \
-e AWS_ACCESS_KEY_ID="${{secrets.AWS_ACCESS_KEY_ID}}" \
-e AWS_SECRET_ACCESS_KEY="${{secrets.AWS_SECRET_ACCESS_KEY}}" \
-e AWS_S3_BUCKET_NAME="${{secrets.AWS_S3_BUCKET_NAME}}" \
-e AWS_S3_PREFIX="${{secrets.PROD_AWS_S3_PREFIX}}" \
-e SPRING_RABBITMQ_HOST="${{secrets.RABBITMQ_HOST}}" \
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-server-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ jobs:
-e SPRING_DATASOURCE_URL="${{secrets.TEST_DB_URL}}" \
-e SPRING_DATASOURCE_USERNAME="${{secrets.TEST_DB_USERNAME}}" \
-e SPRING_DATASOURCE_PASSWORD="${{secrets.TEST_DB_PASSWORD}}" \
-e AWS_ACCESS_KEY_ID="${{secrets.AWS_ACCESS_KEY_ID}}" \
-e AWS_SECRET_ACCESS_KEY="${{secrets.AWS_SECRET_ACCESS_KEY}}" \
-e AWS_S3_BUCKET_NAME="${{secrets.AWS_S3_BUCKET_NAME}}" \
-e AWS_S3_PREFIX="${{secrets.TEST_AWS_S3_PREFIX}}" \
-e SPRING_RABBITMQ_HOST="${{secrets.RABBITMQ_HOST}}" \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package org.tuna.zoopzoop.backend.domain.member.controller;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand All @@ -18,11 +20,13 @@
@RestController
@RequiredArgsConstructor
@RequestMapping("api/v1/member")
@Tag(name = "ApiV1MemberController", description = "사용자 REST API 컨트롤러")
public class ApiV1MemberSearchController {
private final MemberSearchService memberSearchService;
private final MemberService memberService;

@GetMapping("/search")
@Operation(summary = "사용자 이름 기반 검색")
public ResponseEntity<RsData<List<ResBodyForSearchMember>>> searchMembers(
@RequestParam String keyword
) {
Expand Down
3 changes: 0 additions & 3 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@ spring:
#S3 설정
cloud:
aws:
credentials:
access-key: ${AWS_ACCESS_KEY_ID}
secret-key: ${AWS_SECRET_ACCESS_KEY}
region:
static: ap-northeast-2
s3:
Expand Down