Merge remote-tracking branch 'origin/Api-Release' into feature/issue-104

# Conflicts:
#	Match-Api/src/main/java/com/example/matchapi/common/NicepayController.java
#	Match-Api/src/main/java/com/example/matchapi/donation/service/DonationService.java
#	Match-Api/src/main/java/com/example/matchapi/order/controller/OrderController.java
#	Match-Api/src/main/java/com/example/matchapi/order/convertor/OrderConvertor.java
#	Match-Api/src/main/java/com/example/matchapi/order/service/OrderService.java
#	Match-Api/src/main/java/com/example/matchapi/portone/controller/PaymentController.java
#	Match-Api/src/main/java/com/example/matchapi/portone/service/PaymentService.java
#	Match-Batch/src/main/java/com/example/matchbatch/service/OrderService.java
#	Match-Common/src/main/java/com/example/matchcommon/config/RedisConfig.java
#	Match-Common/src/main/java/com/example/matchcommon/constants/MatchStatic.java
#	Match-Domain/src/main/java/com/example/matchdomain/order/exception/PortOneAuthErrorCode.java
#	Match-Infrastructure/src/main/java/com/example/matchinfrastructure/pay/portone/client/PortOneFeignClient.java
#	Match-Infrastructure/src/main/java/com/example/matchinfrastructure/pay/portone/convertor/PortOneConvertor.java
#	Match-Infrastructure/src/main/java/com/example/matchinfrastructure/pay/portone/service/PortOneAuthService.java

Match-Api/src/main/java/com/example/matchapi/order/helper/DataEncrypt.java

@@ -0,0 +1,35 @@
+package com.example.matchapi.order.helper;
+
+import org.apache.commons.codec.binary.Hex;
+import org.springframework.stereotype.Service;
+
+import java.security.MessageDigest;
+
+@Service
+public class DataEncrypt{
+    MessageDigest md;
+    String strSRCData = "";
+    String strENCData = "";
+    String strOUTData = "";
+
+    public DataEncrypt(){ }
+    public String encrypt(String strData){
+        String passACL = null;
+        MessageDigest md = null;
+        try{
+            md = MessageDigest.getInstance("SHA-256");
+            md.reset();
+            md.update(strData.getBytes());
+            byte[] raw = md.digest();
+            passACL = encodeHex(raw);
+        }catch(Exception e){
+            System.out.print("암호화 에러" + e.toString());
+        }
+        return passACL;
+    }
+
+    public String encodeHex(byte [] b){
+        char [] c = Hex.encodeHex(b);
+        return new String(c);
+    }
+}

Match-Domain/src/main/java/com/example/matchdomain/redis/entity/OrderRequest.java

@@ -22,6 +22,7 @@ public class OrderRequest {
 
 
 
+
     @TimeToLive
     private long ttl;