diff --git a/pom.xml b/pom.xml index f750c4a84..6d0203c89 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.18 + 1.2.19 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/IPController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/IPController.java index ecce9b59d..7310f1fae 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/IPController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/IPController.java @@ -14,8 +14,9 @@ public class IPController { private LookupService lookupService; @GetMapping("/{ipAddr}") - public String getIpInfo(@PathVariable String ipAddr) { - String city = lookupService.getLocation(ipAddr).city; - return city; + public JSONObject getIpInfo(@PathVariable String ipAddr) { + JSONObject result = new JSONObject(); + result.put("city", lookupService.getLocation(ipAddr).city); + return result; } } diff --git a/src/main/ui/static/commons/services/orderService.js b/src/main/ui/static/commons/services/orderService.js index c500dfaf1..4fb9f3b3c 100644 --- a/src/main/ui/static/commons/services/orderService.js +++ b/src/main/ui/static/commons/services/orderService.js @@ -41,7 +41,7 @@ define(['../app'], function (app) { $scope.order = order.data; $scope.getPayLocation=function (ip) { $http.get('/dev/ip/'+ip).then(function (res) { - $scope.pay_location = res.data; + $scope.pay_location = res.data.city; }) } }]);