Merge pull request #240 from Genti2024/staging

Staging
Genti2024 · Dec 6, 2024 · f5f6388 · f5f6388
2 parents 82c35f8 + d8d5087
commit f5f6388
Show file tree

Hide file tree

Showing 104 changed files with 349 additions and 3,749 deletions.
diff --git a/.github/workflows/cicd-ec2.yml b/.github/workflows/cicd-ec2.yml
@@ -66,13 +66,26 @@ jobs:
           echo "${{ secrets.APPLICATION_STAGING }}" > ./application-staging.yml
         shell: bash
 
+#      아래 코드는 json이 큰따옴표 없이 저장됨
+#      - name: Create Google key.json file
+#        if: contains(github.ref, 'staging') || contains(github.ref, 'main-test')
+#        run: |
+#          cd ./genti-api/src/main/resources
+#          mkdir -p ./jsonkey
+#          echo "${{ secrets.GOOGLE_ACCOUNT_KEY }}" > ./jsonkey/key.json
+#        shell: bash
+
+      - name: Create jsonkey directory
+        if: contains(github.ref, 'staging') || contains(github.ref, 'main-test')
+        run: mkdir -p ./genti-api/src/main/resources/jsonkey
+
       - name: Create Google key.json file
         if: contains(github.ref, 'staging') || contains(github.ref, 'main-test')
-        run: |
-          cd ./genti-api/src/main/resources
-          mkdir -p ./jsonkey
-          echo "${{ secrets.GOOGLE_ACCOUNT_KEY }}" > ./jsonkey/key.json
-        shell: bash
+        id: create-json
+        uses: jsdaniell/create-json@1.1.2
+        with:
+          name: "./genti-api/src/main/resources/jsonkey/key.json"
+          json: ${{ secrets.GOOGLE_ACCOUNT_KEY }}
 
       - name: make apple private key
         run: |

diff --git a/genti-api/build.gradle b/genti-api/build.gradle
@@ -22,9 +22,17 @@ dependencies {
     // redis
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
-    implementation "com.google.api-client:google-api-client:1.33.0"
+//    implementation "com.google.api-client:google-api-client:1.33.0"
+//    implementation 'com.google.auth:google-auth-library-oauth2-http:1.6.0'
+////    implementation 'com.google.apis:google-api-services-androidpublisher:v2-rev22-1.21.0'
+//    compileOnly('com.google.apis:google-api-services-androidpublisher:v3-rev20241016-2.0.0')
+    compileOnly "com.google.api-client:google-api-client:2.2.0"
+    implementation "com.google.api-client:google-api-client:2.2.0"
     implementation 'com.google.auth:google-auth-library-oauth2-http:1.6.0'
-    implementation 'com.google.apis:google-api-services-androidpublisher:v2-rev22-1.21.0'
+//    compileOnly 'com.google.apis:google-api-services-androidpublisher:v3-rev20220411-1.32.1'
+    implementation 'com.google.apis:google-api-services-androidpublisher:v3-rev20241016-2.0.0'
+    implementation group: 'com.google.http-client', name: 'google-http-client-jackson2', version: '1.41.7'
+
 
     // test && test h2
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

diff --git a/genti-api/src/main/java/com/gt/genti/cashout/api/AdminCashoutApi.java b/genti-api/src/main/java/com/gt/genti/cashout/api/AdminCashoutApi.java
diff --git a/genti-api/src/main/java/com/gt/genti/cashout/api/CreatorCashoutApi.java b/genti-api/src/main/java/com/gt/genti/cashout/api/CreatorCashoutApi.java
diff --git a/genti-api/src/main/java/com/gt/genti/cashout/controller/AdminCashoutController.java b/genti-api/src/main/java/com/gt/genti/cashout/controller/AdminCashoutController.java
diff --git a/genti-api/src/main/java/com/gt/genti/cashout/controller/CreatorCashoutController.java b/genti-api/src/main/java/com/gt/genti/cashout/controller/CreatorCashoutController.java
diff --git a/genti-api/src/main/java/com/gt/genti/cashout/dto/response/CashoutCompletionResponseDto.java b/genti-api/src/main/java/com/gt/genti/cashout/dto/response/CashoutCompletionResponseDto.java