From 3f8cc7b0e6921dbae66f777b49546424bf8b939a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=B4=AA=E9=BE=99?= <599179587@qq.com> Date: Mon, 4 Sep 2017 10:19:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ifish/socket/action/PublicAction.java | 6 +++++- src/main/webapp/view/index.jsp | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ifish/socket/action/PublicAction.java b/src/main/java/com/ifish/socket/action/PublicAction.java index ed482dc..34b15ab 100644 --- a/src/main/java/com/ifish/socket/action/PublicAction.java +++ b/src/main/java/com/ifish/socket/action/PublicAction.java @@ -27,7 +27,11 @@ public class PublicAction { */ @RequestMapping("/index.do") public ModelAndView login(ModelMap map) { - map.put("socketAddress", address.getIp() + ":" + address.getServerPort() + "/"); + String port = "8080"; +// if (address.getServerPort().equals("8080")) { +// port = "7080"; +// } + map.put("socketAddress", address.getIp() + ":" + port + "/"); return new ModelAndView("index", map); } diff --git a/src/main/webapp/view/index.jsp b/src/main/webapp/view/index.jsp index f5eaa16..cff9c17 100644 --- a/src/main/webapp/view/index.jsp +++ b/src/main/webapp/view/index.jsp @@ -52,8 +52,8 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. var data = obj(id,mac.toString(),hardType.toString()); $.ajax({ type: 'POST', - url: "http://192.168.199.129:8080/IfishSystemEnglish/saveMacAddress?rm="+Math.random(), - //url: "https://bg.ifish7.com/page/public/saveMacAddress.do?rm="+Math.random(), + //url: "http://192.168.199.129:8080/IfishSystemEnglish/saveMacAddress?rm="+Math.random(), + url: "https://bg.ifish7.com/page/public/saveMacAddress.do?rm="+Math.random(), data: {"subStr":data}, dataType: "json", success:function(re){