diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/controller/WpsController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/controller/WpsController.java index b12aef9..f7450a2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/controller/WpsController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/controller/WpsController.java @@ -157,18 +157,19 @@ public class WpsController { if (cookie.isPresent()) { log.info(String.valueOf(request.getRequestURL())); -// String referer = request.getHeader("Referer"); -// String r1 = referer.substring(0,referer.indexOf("//")+2); -// String r11 = referer.substring(r1.length(),referer.length()); -// String r2 = r11.substring(0,r11.indexOf("/")>=0?r11.indexOf("/"):r11.length()); -// String host = r1+r2; - String host = request.getHeader("Host"); + String referer = request.getHeader("Referer"); + String r1 = referer.substring(0,referer.indexOf("//")+2); + String r11 = referer.substring(r1.length(),referer.length()); + String r2 = r11.substring(0,r11.indexOf("/")>=0?r11.indexOf("/"):r11.length()); + String host = r1+r2; +// String host = request.getHeader("Host"); +// +// if(host.indexOf("18022")>=0){ +// host = "http://"+host; +// }else if(host.indexOf("18023")>=0){ +// host = "https://"+host; +// } log.info("getWpsUrlBy host:"+host); - if(host.indexOf("18022")>=0){ - host = "http://"+host; - }else if(host.indexOf("18023")>=0){ - host = "https://"+host; - } String authToken = cookie.get().getValue(); WpsClientInVo in = this.wpsService.getKSWpsUrlDecrypt(key,fileName); @@ -206,6 +207,21 @@ public class WpsController { in.setUserToken(userToken); in.setType(type); in.setFileExtension(fileExtension); + log.info(String.valueOf(request.getRequestURL())); + String referer = request.getHeader("Referer"); + String r1 = referer.substring(0,referer.indexOf("//")+2); + String r11 = referer.substring(r1.length(),referer.length()); + String r2 = r11.substring(0,r11.indexOf("/")>=0?r11.indexOf("/"):r11.length()); + String host = r1+r2; +// String host = request.getHeader("Host"); +// +// if(host.indexOf("18022")>=0){ +// host = "http://"+host; +// }else if(host.indexOf("18023")>=0){ +// host = "https://"+host; +// } + log.info("getWpsUrlBy host:"+host); + in.setHost(host); String str = this.wpsService.getKSWpsUrl(in); try { response.setContentType("text/html;charset=utf-8"); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/service/impl/WpsServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/service/impl/WpsServiceImpl.java index 15d8d4c..ae95af3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/service/impl/WpsServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/service/impl/WpsServiceImpl.java @@ -585,7 +585,7 @@ public class WpsServiceImpl implements WpsService { //HttpServletRequest request = HttpContextUtils.getHttpServletRequest(); - vo.setHost(kswhost); + vo.setHost(in.getHost()); vo.setLastModifiedTime(time); dataJson = JSON.toJSONString(vo); @@ -595,7 +595,7 @@ public class WpsServiceImpl implements WpsService { KingSoftWpsPreviewVo vo = new KingSoftWpsPreviewVo(); vo.setSrcId(7); - vo.setSrcWpsNgProxy(kswhost); + vo.setSrcWpsNgProxy(in.getHost()); vo.setStaffCode("ebtp"); vo.setFileKey(in.getFileId()); vo.setFileName(in.getFileName());