diff --git a/WebContent/jsp/onl/admin/security/cryptoModuleManDetail.jsp b/WebContent/jsp/onl/admin/security/cryptoModuleManDetail.jsp index 20a5285..dcb9e2e 100644 --- a/WebContent/jsp/onl/admin/security/cryptoModuleManDetail.jsp +++ b/WebContent/jsp/onl/admin/security/cryptoModuleManDetail.jsp @@ -166,9 +166,14 @@ $(document).ready(function() { $.ajax({ type: 'POST', url: url, + dataType: 'json', data: postData, - success: function() { - alert('<%= localeMessage.getString("common.saveMsg") %>'); + success: function(data) { + var msg = '<%= localeMessage.getString("common.saveMsg") %>'; + if (data && data.broadcastResult) { + msg += '\n\n[서버 반영 결과]\n' + data.broadcastResult; + } + alert(msg); goNav(returnUrl); }, error: function(e) { @@ -182,9 +187,14 @@ $(document).ready(function() { $.ajax({ type: 'POST', url: url, + dataType: 'json', data: { cmd: 'DELETE', cryptoId: $('input[name=cryptoId]').val() }, - success: function() { - alert('<%= localeMessage.getString("common.deleteMsg") %>'); + success: function(data) { + var msg = '<%= localeMessage.getString("common.deleteMsg") %>'; + if (data && data.broadcastResult) { + msg += '\n\n[서버 반영 결과]\n' + data.broadcastResult; + } + alert(msg); goNav(returnUrl); }, error: function(e) { diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/crypto/CryptoModuleConfigManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/crypto/CryptoModuleConfigManController.java index 9a8a1a0..f85925e 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/crypto/CryptoModuleConfigManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/crypto/CryptoModuleConfigManController.java @@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.PostMapping; +import com.eactive.eai.agent.command.CommandResult; import com.eactive.eai.agent.command.CommonCommand; import com.eactive.eai.rms.common.base.OnlBaseAnnotationController; import com.eactive.eai.rms.common.login.SessionManager; @@ -77,12 +78,14 @@ public class CryptoModuleConfigManController extends OnlBaseAnnotationController return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errors); } String cryptoId = service.insert(ui, SessionManager.getUserId(request)); - CommonCommand.builder() + CommandResult broadcastResult = CommonCommand.builder() .name(RELOAD_CRYPTO_MODULE_COMMAND) .args(cryptoId) .build() .broadcast(agentUtilService); - return ResponseEntity.ok().build(); + Map body = new HashMap<>(); + body.put("broadcastResult", broadcastResult.getMessage(true)); + return ResponseEntity.ok(body); } @PostMapping(value = "/onl/admin/security/cryptoModuleMan.json", params = "cmd=UPDATE") @@ -96,23 +99,27 @@ public class CryptoModuleConfigManController extends OnlBaseAnnotationController return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errors); } service.update(ui, SessionManager.getUserId(request)); - CommonCommand.builder() + CommandResult broadcastResult = CommonCommand.builder() .name(RELOAD_CRYPTO_MODULE_COMMAND) .args(ui.getCryptoId()) .build() .broadcast(agentUtilService); - return ResponseEntity.ok().build(); + Map body = new HashMap<>(); + body.put("broadcastResult", broadcastResult.getMessage(true)); + return ResponseEntity.ok(body); } @PostMapping(value = "/onl/admin/security/cryptoModuleMan.json", params = "cmd=DELETE") - public ResponseEntity delete(String cryptoId) { + public ResponseEntity> delete(String cryptoId) { service.delete(cryptoId); - CommonCommand.builder() + CommandResult broadcastResult = CommonCommand.builder() .name(RELOAD_CRYPTO_MODULE_COMMAND) .args(cryptoId) .build() .broadcast(agentUtilService); - return ResponseEntity.ok().build(); + Map body = new HashMap<>(); + body.put("broadcastResult", broadcastResult.getMessage(true)); + return ResponseEntity.ok(body); } }