Merge branch 'Api-Release' into dev

TEAMMatchDev · Nov 14, 2023 · 1217e63 · 1217e63
2 parents d21629e + 7b810df
commit 1217e63
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/aligo_api_ci_cd.yml b/.github/workflows/aligo_api_ci_cd.yml
@@ -78,6 +78,10 @@ jobs:
           json: ${{ secrets.FCM_JSON }}
           dir: "Match-Common/src/main/resources/"
 
+      - name: Create Auth Key File
+        run: |
+          echo "${{ secrets.AUTH_KEY }}" > ./Match-Common/src/main/resources/AuthKey_HR7JU89RQ6.p8
+
       - name: Grant execute permission for gradlew
         run: chmod +x ./gradlew
         shell: bash

diff --git a/.github/workflows/batch_api_ci_cd.yml b/.github/workflows/batch_api_ci_cd.yml
@@ -81,9 +81,10 @@ jobs:
           json: ${{ secrets.FCM_JSON }}
           dir: "Match-Common/src/main/resources/"
 
-      - run: ./Match-Common/src/main/resources/AuthKey_HR7JU89RQ6.p8
-      - run: echo "${{ secrets.AUTH_KEY }}" > ./Match-Common/src/main/resources/AuthKey_HR7JU89RQ6.p8
-      - run: cat ./Match-Common/src/main/resources/AuthKey_HR7JU89RQ6.p8
+
+      - name: Create Auth Key File
+        run: |
+          echo "${{ secrets.AUTH_KEY }}" > ./Match-Common/src/main/resources/AuthKey_HR7JU89RQ6.p8
 
       - name: Grant execute permission for gradlew
         run: chmod +x ./gradlew

diff --git a/.github/workflows/prod_api_ci_cd.yml b/.github/workflows/prod_api_ci_cd.yml
@@ -63,7 +63,7 @@ jobs:
           portone.key: ${{ secrets.PORTONE_KEY }}
           portone.secret: ${{ secrets.PORTONE_SECRET }}
           portone.billmid: ${{ secrets.PROD_PORTONE_BILL_MID}}
-
+          private.aes.key: ${{ secrets.AES_PRIVATE_KEY }}
 
 
       - name: Set Environment Domain - Domain Prod Yml
@@ -87,9 +87,9 @@ jobs:
           json: ${{ secrets.FCM_JSON }}
           dir: "Match-Common/src/main/resources/"
 
-      - run: ./Match-Common/src/main/resources/AuthKey_HR7JU89RQ6.p8
-      - run: echo "${{ secrets.AUTH_KEY }}" > ./Match-Common/src/main/resources/AuthKey_HR7JU89RQ6.p8
-      - run: cat ./Match-Common/src/main/resources/AuthKey_HR7JU89RQ6.p8
+      - name: Create Auth Key File
+        run: |
+          echo "${{ secrets.AUTH_KEY }}" > ./Match-Common/src/main/resources/AuthKey_HR7JU89RQ6.p8
 
       - name: Grant execute permission for gradlew
         run: chmod +x ./gradlew

diff --git a/Match-Api/src/main/java/com/example/matchapi/order/service/OrderService.java b/Match-Api/src/main/java/com/example/matchapi/order/service/OrderService.java
@@ -216,10 +216,10 @@ public String saveRequestPrepare(User user, Long projectId, int amount) {
 
         orderRequestRepository.save(orderConverter.convertToRequestPrepare(user.getId(), projectId, amount, orderId));
 
-        PortOnePrepareReq portOnePrepareReq = portOneConverter.convertToRequestPrepare(orderId, amount);
+        //PortOnePrepareReq portOnePrepareReq = portOneConverter.convertToRequestPrepare(orderId, amount);
 
-        portOneFeignClient.preparePayments(portOneAuthService.getToken(), portOnePrepareReq);
+        //portOneFeignClient.preparePayments(portOneAuthService.getToken(), portOnePrepareReq);
 
         return orderId;
     }
-}
+}