root
/
ifishTools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

睿芯错误修改

This commit is contained in:
谢洪龙 2017-09-05 09:55:45 +08:00
parent 3f8cc7b0e6
commit 373288d6e7
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/ifish/socket/action/PublicAction.java
View File

@ -28,10 +28,13 @@ public class PublicAction {
@RequestMapping("/index.do") @RequestMapping("/index.do")
public ModelAndView login(ModelMap map) { public ModelAndView login(ModelMap map) {
String port = "8080"; String port = "8080";
// if (address.getServerPort().equals("8080")) { String ip = address.getIp();
// port = "7080"; if (address.getServerPort().equals("7080")) {
// } port = "7080";
map.put("socketAddress", address.getIp() + ":" + port + "/"); map.put("socketAddress", ip + ":" + port + "//ifishTools" + "/");
return new ModelAndView("index", map);
}
map.put("socketAddress", ip + ":" + port + "/");
return new ModelAndView("index", map); return new ModelAndView("index", map);
} }

4
src/main/resources/property.properties
View File

@ -1,6 +1,6 @@
#\u670d\u52a1\u5668\u7aef\u53e3 #\u670d\u52a1\u5668\u7aef\u53e3
ifish.port=8080 ifish.port=7080
ifish_port=8080 ifish_port=7080
#\u662f\u5426\u56de\u590d\u5fc3\u8df3 #\u662f\u5426\u56de\u590d\u5fc3\u8df3
ifish.replay=true ifish.replay=true
ifish_replay=true ifish_replay=true

4
src/main/webapp/static/js/socket.js
View File

@ -882,8 +882,8 @@ function getFactoryInfo() {
$.ajax({ $.ajax({
//url: "https://bg.zhangxinyanv5.top/page/public/getVenderList.do?rm=" + Math.random() + "&factoryCode=" + $("#factoryCode").val(), //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: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: "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: "https://bg.ifish7.com/page/public/getVenderList.do?rm=" + Math.random() + "&factoryCode=" + $("#factoryCode").val(),
type: "get", type: "get",
dataType: "json", dataType: "json",
success: function (evt) { success: function (evt) {