From 717da138c392a43baecd2e3f407d18678ce56389 Mon Sep 17 00:00:00 2001 From: AreSain <111065574+AreSain@users.noreply.github.com> Date: Thu, 29 Feb 2024 18:28:01 +0900 Subject: [PATCH] =?UTF-8?q?[FIX]=20=ED=8F=B4=EB=8D=94=20=EA=B5=AC=EC=A1=B0?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1=20(#664)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: jungjkim Co-authored-by: yes-ee --- .../api => }/PingpongApiApplication.java | 2 +- .../controller/CategoryAdminController.java | 7 + .../controller/CommentAdminController.java | 7 + .../controller/ReportAdminController.java | 7 + .../room/controller/RoomAdminController.java | 7 + .../controller/TemplateAdminController.java | 7 + .../controller/CategoryController.java | 7 + .../comment/controller/CommentController.java | 7 + .../report/controller/ReportController.java | 7 + .../user/room/controller/RoomController.java | 7 + .../src/test/resources/application.yml | 184 ------------------ 11 files changed, 64 insertions(+), 185 deletions(-) rename gg-pingpong-api/src/main/java/gg/{pingpong/api => }/PingpongApiApplication.java (93%) create mode 100644 gg-pingpong-api/src/main/java/gg/party/api/admin/category/controller/CategoryAdminController.java create mode 100644 gg-pingpong-api/src/main/java/gg/party/api/admin/comment/controller/CommentAdminController.java create mode 100644 gg-pingpong-api/src/main/java/gg/party/api/admin/report/controller/ReportAdminController.java create mode 100644 gg-pingpong-api/src/main/java/gg/party/api/admin/room/controller/RoomAdminController.java create mode 100644 gg-pingpong-api/src/main/java/gg/party/api/admin/template/controller/TemplateAdminController.java create mode 100644 gg-pingpong-api/src/main/java/gg/party/api/user/category/controller/CategoryController.java create mode 100644 gg-pingpong-api/src/main/java/gg/party/api/user/comment/controller/CommentController.java create mode 100644 gg-pingpong-api/src/main/java/gg/party/api/user/report/controller/ReportController.java create mode 100644 gg-pingpong-api/src/main/java/gg/party/api/user/room/controller/RoomController.java delete mode 100644 gg-pingpong-api/src/test/resources/application.yml diff --git a/gg-pingpong-api/src/main/java/gg/pingpong/api/PingpongApiApplication.java b/gg-pingpong-api/src/main/java/gg/PingpongApiApplication.java similarity index 93% rename from gg-pingpong-api/src/main/java/gg/pingpong/api/PingpongApiApplication.java rename to gg-pingpong-api/src/main/java/gg/PingpongApiApplication.java index 468f1ac8b..b2b78d475 100644 --- a/gg-pingpong-api/src/main/java/gg/pingpong/api/PingpongApiApplication.java +++ b/gg-pingpong-api/src/main/java/gg/PingpongApiApplication.java @@ -1,4 +1,4 @@ -package gg.pingpong.api; +package gg; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/gg-pingpong-api/src/main/java/gg/party/api/admin/category/controller/CategoryAdminController.java b/gg-pingpong-api/src/main/java/gg/party/api/admin/category/controller/CategoryAdminController.java new file mode 100644 index 000000000..863806bf3 --- /dev/null +++ b/gg-pingpong-api/src/main/java/gg/party/api/admin/category/controller/CategoryAdminController.java @@ -0,0 +1,7 @@ +package gg.pingpong.api.party.admin.category.controller; + +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class CategoryAdminController { +} diff --git a/gg-pingpong-api/src/main/java/gg/party/api/admin/comment/controller/CommentAdminController.java b/gg-pingpong-api/src/main/java/gg/party/api/admin/comment/controller/CommentAdminController.java new file mode 100644 index 000000000..1d14e6a38 --- /dev/null +++ b/gg-pingpong-api/src/main/java/gg/party/api/admin/comment/controller/CommentAdminController.java @@ -0,0 +1,7 @@ +package gg.pingpong.api.party.admin.comment.controller; + +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class CommentAdminController { +} diff --git a/gg-pingpong-api/src/main/java/gg/party/api/admin/report/controller/ReportAdminController.java b/gg-pingpong-api/src/main/java/gg/party/api/admin/report/controller/ReportAdminController.java new file mode 100644 index 000000000..f7c613f1d --- /dev/null +++ b/gg-pingpong-api/src/main/java/gg/party/api/admin/report/controller/ReportAdminController.java @@ -0,0 +1,7 @@ +package gg.pingpong.api.party.admin.report.controller; + +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class ReportAdminController { +} diff --git a/gg-pingpong-api/src/main/java/gg/party/api/admin/room/controller/RoomAdminController.java b/gg-pingpong-api/src/main/java/gg/party/api/admin/room/controller/RoomAdminController.java new file mode 100644 index 000000000..0a1a38515 --- /dev/null +++ b/gg-pingpong-api/src/main/java/gg/party/api/admin/room/controller/RoomAdminController.java @@ -0,0 +1,7 @@ +package gg.pingpong.api.party.admin.room.controller; + +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class RoomAdminController { +} diff --git a/gg-pingpong-api/src/main/java/gg/party/api/admin/template/controller/TemplateAdminController.java b/gg-pingpong-api/src/main/java/gg/party/api/admin/template/controller/TemplateAdminController.java new file mode 100644 index 000000000..9c9c7819d --- /dev/null +++ b/gg-pingpong-api/src/main/java/gg/party/api/admin/template/controller/TemplateAdminController.java @@ -0,0 +1,7 @@ +package gg.pingpong.api.party.admin.template.controller; + +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class TemplateAdminController { +} diff --git a/gg-pingpong-api/src/main/java/gg/party/api/user/category/controller/CategoryController.java b/gg-pingpong-api/src/main/java/gg/party/api/user/category/controller/CategoryController.java new file mode 100644 index 000000000..a91e3b13f --- /dev/null +++ b/gg-pingpong-api/src/main/java/gg/party/api/user/category/controller/CategoryController.java @@ -0,0 +1,7 @@ +package gg.pingpong.api.party.user.category.controller; + +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class CategoryController { +} diff --git a/gg-pingpong-api/src/main/java/gg/party/api/user/comment/controller/CommentController.java b/gg-pingpong-api/src/main/java/gg/party/api/user/comment/controller/CommentController.java new file mode 100644 index 000000000..bb6f6676d --- /dev/null +++ b/gg-pingpong-api/src/main/java/gg/party/api/user/comment/controller/CommentController.java @@ -0,0 +1,7 @@ +package gg.pingpong.api.party.user.comment.controller; + +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class CommentController { +} diff --git a/gg-pingpong-api/src/main/java/gg/party/api/user/report/controller/ReportController.java b/gg-pingpong-api/src/main/java/gg/party/api/user/report/controller/ReportController.java new file mode 100644 index 000000000..9a2387356 --- /dev/null +++ b/gg-pingpong-api/src/main/java/gg/party/api/user/report/controller/ReportController.java @@ -0,0 +1,7 @@ +package gg.pingpong.api.party.user.report.controller; + +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class ReportController { +} diff --git a/gg-pingpong-api/src/main/java/gg/party/api/user/room/controller/RoomController.java b/gg-pingpong-api/src/main/java/gg/party/api/user/room/controller/RoomController.java new file mode 100644 index 000000000..8540db6e3 --- /dev/null +++ b/gg-pingpong-api/src/main/java/gg/party/api/user/room/controller/RoomController.java @@ -0,0 +1,7 @@ +package gg.pingpong.api.party.user.room.controller; + +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class RoomController { +} diff --git a/gg-pingpong-api/src/test/resources/application.yml b/gg-pingpong-api/src/test/resources/application.yml deleted file mode 100644 index f28374ce9..000000000 --- a/gg-pingpong-api/src/test/resources/application.yml +++ /dev/null @@ -1,184 +0,0 @@ -spring: - application: - name: 42gg - - profiles: - active: testCode - - security: - oauth2.client: - authenticationScheme: header - registration: - 42: - redirect-uri: "{baseUrl}/{action}/oauth2/code/{registrationId}" - authorization-grant-type: authorization_code - scope: public - kakao: - redirect-uri: "{baseUrl}/{action}/oauth2/code/{registrationId}" - authorization-grant-type: authorization_code - scope: profile_nickname, profile_image, account_email - provider: - 42: - authorization-uri: "https://api.intra.42.fr/oauth/authorize" - token-uri: "https://api.intra.42.fr/oauth/token" - user-info-uri: "https://api.intra.42.fr/v2/me" - user-name-attribute: id - kakao: - authorization-uri: "https://kauth.kakao.com/oauth/authorize" - token-uri: "https://kauth.kakao.com/oauth/token" - user-info-uri: "https://kapi.kakao.com/v2/user/me" - user-name-attribute: id - - mvc: - hiddenmethod: - filter: - enabled: true - data: - web: - pageable: - default-page-size: 20 - one-indexed-parameters: false - - mail: - host: smtp.gmail.com - port: 587 - username: dummy - password: dummy - properties: - mail: - smtp: - starttls: - enable: true - required: true - auth: true - - # Message 설정 - messages: - basename: 'messages/validation' - encoding: UTF-8 - -springdoc: - swagger-ui: - path: /api-docs - default-consumes-media-type: application/json - default-produces-media-type: application/json - -app: - auth: - tokenSecret: authdummydummydummydummydummydummydummydummydummy - refreshTokenSecret: refreshdummydummydummydummydummydummydummydummydummy - -info: - image: - defaultUrl: 'https://42gg-public-test-image.s3.ap-northeast-2.amazonaws.com/images/small_default.jpeg' - itemNotFoundUrl: 'https://42gg-public-test-image.s3.ap-northeast-2.amazonaws.com/images/not_found.svg' - -constant: - allowedMinimalStartDays: 2 - tournamentSchedule: "0 0 0 * * *" - -# -- actuator - -management: - server: - port: 8081 - - info: - java: - enabled: true - os: - enabled: true - env: - enabled: true - - health: - show-details: always - - endpoints: - jmx: - exposure: - exclude: "*" - - web: - exposure: - include: "prometheus" - -server: - tomcat: - mbeanregistry: - enabled: true - ---- -spring.config.activate.on-profile: testCode - -# =========================== LOCAL =========================== -spring: - flyway: - enabled: true - baselineOnMigrate: true - locations: classpath:db/migration - user: root - password: 1234 - - jpa: - database-platform: org.hibernate.dialect.MySQL8Dialect - hibernate: - ddl-auto: validate - properties: - hibernate: - show_sql: true - format_sql: true - use_sql_comments: false - - security: - oauth2.client: - registration: - 42: - client-id: "dummy" - client-secret: "dummy" - kakao: - client-id: "dummy" - client-secret: "dummy" - client-authentication-method: POST - - # Redis 설정 - cache: - type: redis - -# cors 설정 -cors: - allowed-origins: 'http://localhost:8080,http://127.0.0.1:8081' - allowed-methods: GET,POST,PUT,DELETE,OPTIONS,PATCH - allowed-headers: '*' - allowed-Credentials: false - max-age: 3600 - -logging-level: - org.hibernate.SQL: debug - org.hibernate.type: trace - -slack: - xoxbToken: "dummy" - -info: - web: - frontUrl: 'http://localhost:8080' - domain: "localhost" - -cloud: - aws: - credentials: - accessKey: dummy - secretKey: dummy - s3: - bucket: 42gg-public-test-image - dir: images/ - region: - static: ap-northeast-2 - stack: - auto: false - -app: - auth: - refreshTokenExpiry: 604800000 - tokenExpiry: 604800000