Merge remote-tracking branch 'origin/master'

mhotel/src/com/happy/action/bookAction.java

@@ -296,7 +296,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
             // 导出文件
             new toExcel().book(vectorsList, path + filePathName,
                     "sheet1", columnName);
-            String url = "http://"+request.getServerName()+":"+request.getServerPort() + request.getSession().getServletContext().getContextPath();
+            String url = "https://chtech.ncjti.edu.cn/hotelReservation/mhotel";
             resultJson.put("downurl", url + "/download/" + filePathName);
             resultJson.put("code", 200);
             resultJson.put("message", "导出成功");
@@ -429,7 +429,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
         }
         // 项目路径地址
         String path = request.getSession().getServletContext()
-                .getRealPath("/download/");// File.separator
+                .getRealPath("/download/");;// File.separator
 
         try{
             Vector columnName = new Vector();
@@ -444,7 +444,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
             // 导出文件
             new toExcel().book(vectorsList, path + filePathName,
                     "sheet1", columnName);
-            String url = "http://"+request.getServerName()+":"+request.getServerPort() + request.getSession().getServletContext().getContextPath();
+            String url = "https://chtech.ncjti.edu.cn/hotelReservation/mhotel";
             resultJson.put("downurl", url + "/download/" + filePathName);
             resultJson.put("code", 200);
             resultJson.put("message", "导出成功");
@@ -527,7 +527,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
             // 导出文件
             new toExcel().book(vectorsList, path + filePathName,
                     "sheet1", columnName);
-            String url = "http://"+request.getServerName()+":"+request.getServerPort() + request.getSession().getServletContext().getContextPath();
+            String url = "https://chtech.ncjti.edu.cn/hotelReservation/mhotel";
             resultJson.put("downurl", url + "/download/" + filePathName);
             resultJson.put("code", 200);
             resultJson.put("message", "导出成功");