From 0eac2f6c40919b35532cb0598e284e9accfc8572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Wed, 6 Dec 2023 15:12:25 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=99=B8=EB=B6=80=20=ED=98=B8=EC=B6=9C=20s?= =?UTF-8?q?ecurity=20=EC=A0=9C=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/palnet/biz/config/WebSecurityConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/pav-server/src/main/java/com/palnet/biz/config/WebSecurityConfig.java b/pav-server/src/main/java/com/palnet/biz/config/WebSecurityConfig.java index 21a2007..e632f62 100644 --- a/pav-server/src/main/java/com/palnet/biz/config/WebSecurityConfig.java +++ b/pav-server/src/main/java/com/palnet/biz/config/WebSecurityConfig.java @@ -41,6 +41,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { "/api/server/**", "/api/comn/file/download", "/api/comn/file/download/**", + "/api/external/laanc/**", // TEST "/api/v1/utm", /* swagger v2 */ From 29f63b91c25c734b0ae7a95fe09224c6bcc7c51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Wed, 6 Dec 2023 15:39:01 +0900 Subject: [PATCH 2/2] =?UTF-8?q?TS=20=EC=97=B0=EB=8F=99=20=EC=84=B1?= =?UTF-8?q?=EA=B3=B5=EC=8B=9C=20param=20=EC=A0=84=EC=86=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExternalLaancController.java | 56 +++++++++++++++---- 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/external/controller/ExternalLaancController.java b/pav-server/src/main/java/com/palnet/biz/api/external/controller/ExternalLaancController.java index 78f5d18..934ccf6 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/external/controller/ExternalLaancController.java +++ b/pav-server/src/main/java/com/palnet/biz/api/external/controller/ExternalLaancController.java @@ -46,7 +46,7 @@ public class ExternalLaancController { TsPlanRq tsPlanRq; try { tsPlanRq = JsonUtils.fromJson(body, TsPlanRq.class); - } catch (Exception e){ + } catch (Exception e) { ErrorCode errorCode = ErrorCode.TS_PARAM; Map error = new HashMap<>(); error.put("rspCode", "300"); @@ -75,22 +75,56 @@ public class ExternalLaancController { Map error = new HashMap<>(); error.put("rspCode", ErrorCode.TS_ETC.code()); error.put("rspMessage", ErrorCode.TS_ETC.message()); - return ResponseEntity.status(300).body(error); + return ResponseEntity.status(700).body(error); } - return ResponseEntity.ok().build(); + + Map successRs = new HashMap<>(); + successRs.put("rspCode", ErrorCode.TS_SUCCESS.code().replaceAll("TS", "")); + successRs.put("rspMessage", ErrorCode.TS_SUCCESS.message()); + return ResponseEntity.ok().body(successRs); } // TS VC 유효성 검토 callback url - endpoint @PostMapping("/vc/callback") - public ResponseEntity vcCallback(@RequestBody TsQrcodeRs rs) { - log.info(">>>> vc/callback body: {}", rs); - tsService.vcCallback(rs); - return ResponseEntity.ok().build(); - } + public ResponseEntity vcCallback(@RequestBody String body) { + log.info(">>>> vc/callback body: {}", body); + TsQrcodeRs rs; + try { + rs = JsonUtils.fromJson(body, TsQrcodeRs.class); + } catch (Exception e) { + ErrorCode errorCode = ErrorCode.TS_PARAM; + Map error = new HashMap<>(); + error.put("rspCode", "300"); + error.put("rspMessage", errorCode.message()); + return ResponseEntity.status(300).body(error); + } + + try { + tsService.vcCallback(rs); + } catch (CustomException e) { + log.error("IGNORE: ", e); - public static void main(String[] args) { - ErrorCode errorCode = ErrorCode.fromCode("TS200"); - System.out.println(errorCode); + ErrorCode errorCode = ErrorCode.fromCode(e.getErrorCode()); + if (errorCode == null) errorCode = ErrorCode.TS_ETC; + + String tsErrorCode = errorCode.code().replaceAll("TS", ""); + + Map error = new HashMap<>(); + error.put("rspCode", tsErrorCode); + error.put("rspMessage", errorCode.message()); + + return ResponseEntity.status(Integer.parseInt(tsErrorCode)).body(error); + } catch (Exception e) { + log.error("IGNORE: ", e); + Map error = new HashMap<>(); + error.put("rspCode", ErrorCode.TS_ETC.code().replaceAll("TS", "")); + error.put("rspMessage", ErrorCode.TS_ETC.message()); + return ResponseEntity.status(700).body(error); + } + Map successRs = new HashMap<>(); + successRs.put("rspCode", ErrorCode.TS_SUCCESS.code().replaceAll("TS", "")); + successRs.put("rspMessage", ErrorCode.TS_SUCCESS.message()); + return ResponseEntity.ok().body(successRs); } }