diff --git a/src/main/java/com/ifish/socket/action/PublicAction.java b/src/main/java/com/ifish/socket/action/PublicAction.java index 34b15ab..b24b35d 100644 --- a/src/main/java/com/ifish/socket/action/PublicAction.java +++ b/src/main/java/com/ifish/socket/action/PublicAction.java @@ -28,10 +28,13 @@ public class PublicAction { @RequestMapping("/index.do") public ModelAndView login(ModelMap map) { String port = "8080"; -// if (address.getServerPort().equals("8080")) { -// port = "7080"; -// } - map.put("socketAddress", address.getIp() + ":" + port + "/"); + String ip = address.getIp(); + if (address.getServerPort().equals("7080")) { + port = "7080"; + map.put("socketAddress", ip + ":" + port + "//ifishTools" + "/"); + return new ModelAndView("index", map); + } + map.put("socketAddress", ip + ":" + port + "/"); return new ModelAndView("index", map); } diff --git a/src/main/resources/property.properties b/src/main/resources/property.properties index 6cbb4b9..3b9c981 100644 --- a/src/main/resources/property.properties +++ b/src/main/resources/property.properties @@ -1,6 +1,6 @@ #\u670d\u52a1\u5668\u7aef\u53e3 -ifish.port=8080 -ifish_port=8080 +ifish.port=7080 +ifish_port=7080 #\u662f\u5426\u56de\u590d\u5fc3\u8df3 ifish.replay=true ifish_replay=true diff --git a/src/main/webapp/static/js/socket.js b/src/main/webapp/static/js/socket.js index bc699d0..db2dda8 100644 --- a/src/main/webapp/static/js/socket.js +++ b/src/main/webapp/static/js/socket.js @@ -882,8 +882,8 @@ function getFactoryInfo() { $.ajax({ //url: "https://bg.zhangxinyanv5.top/page/public/getVenderList.do?rm=" + Math.random() + "&factoryCode=" + $("#factoryCode").val(), //url: "http://192.168.199.129:7080/page/public/getVenderList.do?rm=" + Math.random() + "&factoryCode=" + $("#factoryCode").val(), - url: "http://192.168.199.129:8080/IfishSystem/page/public/getVenderList.do?rm=" + Math.random() + "&factoryCode=" + $("#factoryCode").val(), - //url: "https://bg.ifish7.com/page/public/getVenderList.do?rm=" + Math.random() + "&factoryCode=" + $("#factoryCode").val(), + //url: "http://192.168.199.129:8080/IfishSystem/page/public/getVenderList.do?rm=" + Math.random() + "&factoryCode=" + $("#factoryCode").val(), + url: "https://bg.ifish7.com/page/public/getVenderList.do?rm=" + Math.random() + "&factoryCode=" + $("#factoryCode").val(), type: "get", dataType: "json", success: function (evt) {