From 51a9737881246b90bd221c06f5f79d32a71893b4 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期三, 13 十二月 2023 01:14:19 +0800 Subject: [PATCH] 更新 --- UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 334 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 266 insertions(+), 68 deletions(-) diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java index 53c205f..5743d27 100644 --- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java +++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java @@ -9,9 +9,11 @@ import com.stylefeng.guns.core.support.HttpKit; import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.modular.system.model.BankCard; +import com.stylefeng.guns.modular.system.model.TEmail; import com.stylefeng.guns.modular.system.model.UserInfo; import com.stylefeng.guns.modular.system.service.*; import com.stylefeng.guns.modular.system.util.*; +import com.stylefeng.guns.modular.system.util.itextpdf.HtmlToPdfUtils; import com.stylefeng.guns.modular.system.warpper.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -22,11 +24,16 @@ import org.jsoup.nodes.Element; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import java.io.File; +import java.io.*; import java.math.BigDecimal; import java.util.*; @@ -57,8 +64,14 @@ @Autowired private IBankCardService bankCardService; + @Autowired + private IOrderService orderService; + @Value("${spring.mail.template-path}") private String templatePath; + + @Autowired + private TEmailService emailService; @@ -104,8 +117,6 @@ } } - - /** * 获取短信验证码 * @param phone @@ -117,7 +128,8 @@ @ApiImplicitParams({ @ApiImplicitParam(value = "手机号码", name = "phone", required = true, dataType = "String"), @ApiImplicitParam(value = "图片验证码", name = "kaptcha", required = true, dataType = "String"), - @ApiImplicitParam(value = "场景类型(1=身份验证,2=登录确认,3=用户注册,4=修改密码)", name = "type", required = true, dataType = "String") + @ApiImplicitParam(value = "场景类型(1=身份验证,2=登录确认,3=用户注册,4=修改密码)", name = "type", required = true, dataType = "String"), + @ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int") }) public ResultUtil queryCaptcha(HttpServletRequest request,String phone, Integer type,String kaptcha, Integer language){ if(ToolUtil.isNotEmpty(phone)){ @@ -134,7 +146,7 @@ String code = redisUtil.getValue(phone+"_Code"); System.out.println("缓存中验证码为:"+code); if (ToolUtil.isEmpty(kaptcha) || !kaptcha.equalsIgnoreCase(code)) { - return ResultUtil.error(language == 1 ? "图形验证码错误" : language == 2 ? "The graphic verification code is incorrect" : "Code de vérification graphique incorrect"); + return ResultUtil.error(language == 1 ? "图形验证码错误" : language == 2 ? "Wrong CAPTCHA" : "CAPTCHA erroné"); } return userInfoService.queryCaptcha(phone, type, language); }catch (Exception e){ @@ -145,8 +157,6 @@ return ResultUtil.paranErr(); } } - - @ResponseBody @PostMapping("/base/queryCaptcha1") @@ -175,10 +185,6 @@ } } - - - - @ResponseBody @PostMapping("/base/sedEmail") @ApiOperation(value = "获取邮箱验证码【1.0】", tags = {"用户端-登录"}, notes = "") @@ -187,53 +193,109 @@ }) public ResultUtil sedEmail(String email, Integer language, HttpServletRequest request){ try { + Integer uid = userInfoService.getUserIdFormRedis(request); + if(ToolUtil.isEmpty(email)){ - return ResultUtil.error(language == 1 ? "邮箱不能为空" : language == 2 ? "The mailbox cannot be empty" : "L’email ne peut pas être vide"); + return ResultUtil.error(language == 1 ? "邮箱不能为空" : language == 2 ? "E-mail address cannot be empty." : "L’adresse e-mail ne peut pas être vide."); } + Random random = new Random(); + StringBuffer sb = new StringBuffer(); + for(int i = 0; i < 4; i++){ sb.append((int) (random.nextDouble() * 10)); } + String authCode = sb.toString(); + redisUtil.setStrValue(email, authCode, 5 * 60); UserInfo userInfo = userInfoService.selectById(uid); + String nickName = ""; + if(null != userInfo){ + nickName = userInfo.getNickName(); + } if(ToolUtil.isNotEmpty(email)){ String path = templatePath + "user/mainbox.html"; Document document = Jsoup.parse(new File(path), "UTF-8"); if(1 == language){ - document.getElementById("english").attr("style", "display: none;"); - document.getElementById("french").attr("style", "display: none;"); + document.getElementById("english").remove(); + document.getElementById("french").remove(); + document.getElementsByTag("title").get(0).text("邮箱验证"); Element user_chinese = document.getElementById("user_chinese"); user_chinese.text("您好 " + nickName + ","); Element content_chinese = document.getElementById("content_chinese"); content_chinese.text(authCode); } if(2 == language){ - document.getElementById("chinese").attr("style", "display: none;"); - document.getElementById("french").attr("style", "display: none;"); + document.getElementById("chinese").remove(); + document.getElementById("french").remove(); + document.getElementsByTag("title").get(0).text("Verification email"); Element user_chinese = document.getElementById("user_english"); user_chinese.text("Hello " + nickName + ","); - Element content_chinese = document.getElementById("content_english"); - content_chinese.text(authCode); + Element content_english = document.getElementById("content_english"); + content_english.text(authCode); } if(3 == language){ - document.getElementById("chinese").attr("style", "display: none;"); - document.getElementById("english").attr("style", "display: none;"); + document.getElementById("chinese").remove(); + document.getElementById("english").remove(); + document.getElementsByTag("title").get(0).text("Courriel de vérification"); Element user_french = document.getElementById("user_french"); user_french.text("Bonjour " + nickName + ","); Element content_french = document.getElementById("content_french"); content_french.text(authCode); } + EmailUtil.send(email, language == 1 ? "邮箱验证" : language == 2 ? "Verification mailbox" : "Courriel de vérification", document.html()); - EmailUtil.send(email, language == 1 ? "验证码" : language == 2 ? "Verification code" : "Code de vérification", document.html()); + //开始生成pdf收据和html收据 + File file = new File("/usr/local/nginx/html/files/html/"); + if(!file.exists()){ + file.mkdirs(); + } + String randomString = ToolUtil.getRandomString(10); + file = new File("/usr/local/nginx/html/files/html/mainbox_" + randomString + ".html"); + if(!file.exists()){ + file.createNewFile(); + } + FileWriter fileWriter = new FileWriter(file); + fileWriter.write(document.html()); + fileWriter.flush(); + fileWriter.close(); + FileInputStream fileInputStream = new FileInputStream(file); + File file1 = new File("/usr/local/nginx/html/files/pdf/"); + if(!file1.exists()){ + file1.mkdirs(); + } + file1 = new File("/usr/local/nginx/html/files/pdf/mainbox_" + randomString + ".pdf"); + if(!file1.exists()){ + file1.createNewFile(); + } + FileOutputStream fileOutputStream = new FileOutputStream(file1); + HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); + + String link ="http://182.160.16.251:81/files/html/mainbox_" + randomString + ".html"; + TEmail tEmail = new TEmail(); + tEmail.setLink(link); + tEmail.setUserId(uid); + tEmail.setType(1); + tEmail.setName(language == 1 ? "邮箱验证" : language == 2 ? "Verification email" : "Courriel de vérification"); + tEmail.setCreateTime(new Date()); + int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; + tEmail.setWeek(EmailUtil.getWeek(language,i)); + boolean am = cn.hutool.core.date.DateUtil.isAM(new Date()); + if(am){ + tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée"); + }else { + tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); + } + emailService.insert(tEmail); } return ResultUtil.success(); }catch (Exception e){ @@ -241,9 +303,6 @@ return ResultUtil.runErr(); } } - - - /** * 手机验证码登录 @@ -272,14 +331,26 @@ if(phone.indexOf("233") < 0){ phone = "233" + phone; } + switch (phoneOperator){ + case "MTN": + phoneOperator = "GH-MTN-B2C"; + break; + case "TIGO": + phoneOperator = "GH-TIGO-B2C"; + break; + case "VODAFONE": + phoneOperator = "GH-VODAFONE-B2C"; + break; + case "AIRTEL": + phoneOperator = "GH-AIRTEL-B2C"; + break; + } return userInfoService.captchaLogin(phoneOperator, phone, code, registIp, lat, lng,null,null,null,language); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); } } - - /** * 手机验证码登录 @@ -296,7 +367,8 @@ @ApiImplicitParam(value = "短信验证码", name = "code", required = true, dataType = "String"), @ApiImplicitParam(value = "分享的用户id", name = "uid", required = true, dataType = "int"), @ApiImplicitParam(value = "用户类型(1=用户,2=司机)", name = "type", required = true, dataType = "int"), - @ApiImplicitParam(value = "注册类型(1=司机注册,2=用户注册)", name = "userType", required = true, dataType = "int") + @ApiImplicitParam(value = "注册类型(1=司机注册,2=用户注册)", name = "userType", required = true, dataType = "int"), + @ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int") }) public ResultUtil<LoginWarpper> captchaLogin_(String phoneOperator, String phone, String code, Integer uid, Integer type, Integer userType, Integer language){ try { @@ -307,16 +379,26 @@ if(phone.indexOf("233") < 0){ phone = "233" + phone; } + switch (phoneOperator){ + case "MTN": + phoneOperator = "GH-MTN-B2C"; + break; + case "TIGO": + phoneOperator = "GH-TIGO-B2C"; + break; + case "VODAFONE": + phoneOperator = "GH-VODAFONE-B2C"; + break; + case "AIRTEL": + phoneOperator = "GH-AIRTEL-B2C"; + break; + } return userInfoService.captchaLogin(phoneOperator, phone, code, uid, type, userType, language); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); } } - - - - /** * 账号密码登录 @@ -350,7 +432,6 @@ return ResultUtil.paranErr(); } } - /** * 忘记密码 @@ -386,7 +467,6 @@ return ResultUtil.paranErr(); } } - /** * 微信授权登录 @@ -432,15 +512,14 @@ @ApiImplicitParams({ @ApiImplicitParam(value = "微信jscode(小程序登录上传)", name = "jscode", required = false, dataType = "String") }) - public ResultUtil<LoginWarpper> wxIsLogin( String jscode){ + public ResultUtil<LoginWarpper> wxIsLogin(Integer language, String jscode){ try { - return userInfoService.wxIsLogin(jscode); + return userInfoService.wxIsLogin(language, jscode); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); } } - @ResponseBody @PostMapping("/base/user/facebookLogin") @@ -457,15 +536,33 @@ }) public ResultUtil facebookLogin(String id, String name, String email, Double lat, Double lng, Integer uid, Integer language){ try { - return userInfoService.facebookLogin(id, name, email, lat, lng, uid, language); + return userInfoService.facebookLogin(id, name, email, lat, lng, uid, language,1); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); } } - - - + @ResponseBody + @PostMapping("/base/user/twitterLogin") + @ApiOperation(value = "twitter授权登录【1.0】", tags = {"用户端-登录"}, notes = "") + @ApiImplicitParams({ + @ApiImplicitParam(value = "twitter用户id", name = "id", required = true, dataType = "String"), + @ApiImplicitParam(value = "twitter用户名称", name = "name", required = true, dataType = "String"), + @ApiImplicitParam(value = "twitter绑定的email", name = "email", required = false, dataType = "String"), + @ApiImplicitParam(value = "头像", name = "avatar", required = false, dataType = "String"), + @ApiImplicitParam(value = "性别(1=男,2=女)", name = "sex", required = false, dataType = "int"), + @ApiImplicitParam(value = "纬度", name = "lat", required = false, dataType = "double"), + @ApiImplicitParam(value = "经度", name = "lng", required = false, dataType = "double"), + @ApiImplicitParam(value = "分享的用户id", name = "uid", required = false, dataType = "int"), + }) + public ResultUtil twitterLogin(String id, String name, String email, Double lat, Double lng, Integer uid, Integer language){ + try { + return userInfoService.facebookLogin(id, name, email, lat, lng, uid, language,2); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } /** * 设置电话号码 @@ -496,13 +593,26 @@ if(phone.indexOf("233") < 0){ phone = "233" + phone; } + switch (phoneOperator){ + case "MTN": + phoneOperator = "GH-MTN-B2C"; + break; + case "TIGO": + phoneOperator = "GH-TIGO-B2C"; + break; + case "VODAFONE": + phoneOperator = "GH-VODAFONE-B2C"; + break; + case "AIRTEL": + phoneOperator = "GH-AIRTEL-B2C"; + break; + } return userInfoService.bindingPhone(uid, phoneOperator, phone, code, language); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); } } - @ResponseBody @PostMapping("/api/user/bindingEmail") @@ -526,6 +636,24 @@ } } + @ResponseBody + @PostMapping("/api/user/getEmailList") + @ApiOperation(value = "获取邮箱信息", tags = {"用户端-获取邮箱信息"}, notes = "") + @ApiImplicitParams({ + @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") + }) + public ResultUtil<?> getEmailList(HttpServletRequest request){ + try { + Integer uid = userInfoService.getUserIdFormRedis(request); + if(null == uid){ + return ResultUtil.tokenErr(); + } + return ResultUtil.success(emailService.selectList(new EntityWrapper<TEmail>().eq("userId",uid).eq("type",1).orderBy("createTime",false))); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } /** * 获取用户个人信息 @@ -538,20 +666,19 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<UserInfoWarpper> queryUserInfo(HttpServletRequest request){ + public ResultUtil<UserInfoWarpper> queryUserInfo(Integer language, HttpServletRequest request){ try { Integer uid = userInfoService.getUserIdFormRedis(request); if(null == uid){ return ResultUtil.tokenErr(); } - Map<String, Object> map = userInfoService.queryUserInfo(uid); + Map<String, Object> map = userInfoService.queryUserInfo(language, uid); return ResultUtil.success(UserInfoWarpper.getUserInfoWarpper(map)); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); } } - /** * 手机号码获取用户 @@ -565,7 +692,7 @@ @ApiImplicitParam(value = "电话号码", name = "phone", required = true, dataType = "String"), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<Object> queryUser(String phone){ + public ResultUtil<Object> queryUser(Integer language, String phone){ try { String substring = phone.substring(0, 1); if("0".equals(substring)){ @@ -574,7 +701,7 @@ if(phone.indexOf("233") < 0){ phone = "233" + phone; } - Map<String, Object> map = userInfoService.queryUser(phone); + Map<String, Object> map = userInfoService.queryUser(language, phone); if(null != map){ return ResultUtil.success(UserInfoWarpper.getUserInfoWarpper(map)); } @@ -584,7 +711,6 @@ return ResultUtil.runErr(); } } - /** * 实名认证操作 @@ -610,7 +736,6 @@ return ResultUtil.runErr(); } } - /** * 设置紧急联系人 @@ -648,7 +773,6 @@ } } - /** * 用户充值余额 * @param payType @@ -679,7 +803,6 @@ } } - /** * 修改手机号码 * @param code @@ -708,6 +831,20 @@ } if(phone.indexOf("233") < 0){ phone = "233" + phone; + } + switch (phoneOperator){ + case "MTN": + phoneOperator = "GH-MTN-B2C"; + break; + case "TIGO": + phoneOperator = "GH-TIGO-B2C"; + break; + case "VODAFONE": + phoneOperator = "GH-VODAFONE-B2C"; + break; + case "AIRTEL": + phoneOperator = "GH-AIRTEL-B2C"; + break; } return userInfoService.updatePhone(code, phoneOperator, phone, uid, language); }catch (Exception e){ @@ -738,7 +875,6 @@ phone = "233" + phone; } UserInfo userInfo = userInfoService.selectById(uid); - smsrecordService.saveData(4, userInfo.getPhone(), code, "短信验证码【" + code + "】已发到您的手机,验证码将在5分钟后失效,请及时登录!"); boolean b = userInfoService.checkCaptcha(phone, code); Map<String, Object> map = new HashMap<>(); map.put("ok", b ? 1 : 0); @@ -748,8 +884,6 @@ return ResultUtil.runErr(); } } - - /** * 修改登录密码 @@ -762,6 +896,7 @@ @ApiOperation(value = "修改登录密码", tags = {"用户端-个人中心"}, notes = "") @ApiImplicitParams({ @ApiImplicitParam(value = "新密码", name = "password", required = true, dataType = "string"), + @ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int"), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil updatePassword(String password, Integer language, HttpServletRequest request){ @@ -776,7 +911,6 @@ return ResultUtil.runErr(); } } - /** * 修改个人信息 @@ -814,7 +948,6 @@ } } - @ResponseBody @PostMapping("/api/user/queryRealName") @ApiOperation(value = "获取实名认证的数据", tags = {"用户端-个人中心"}, notes = "") @@ -835,7 +968,6 @@ } } - /** * 后台调用禁用用户 * @param uid @@ -855,7 +987,6 @@ return ResultUtil.runErr(); } } - /** * 仿socket接口(单点登录) @@ -945,8 +1076,6 @@ } } - - @ResponseBody @PostMapping("/api/user/editLanguage") @ApiOperation(value = "修改多语言配置", tags = {"用户端-个人中心"}, notes = "") @@ -970,7 +1099,6 @@ } } - @ResponseBody @PostMapping("/base/user/addReportLoss") @ApiOperation(value = "提交报失", tags = {"用户端-个人中心"}, notes = "") @@ -979,10 +1107,11 @@ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"), @ApiImplicitParam(value = "提交内容", name = "remark", required = true, dataType = "int"), @ApiImplicitParam(value = "提交图片", name = "image", required = true, dataType = "int"), + @ApiImplicitParam(value = "1=中文,2=英文,3=法语", name = "language", required = true, dataType = "int"), }) - public ResultUtil addReportLoss(Integer orderType, Integer orderId, String remark, String image){ + public ResultUtil addReportLoss(Integer orderType, Integer orderId, String remark, String image, Integer language){ try { - reportLossService.addReportLoss(orderType, orderId, remark, image); + reportLossService.addReportLoss(orderType, orderId, remark, image, language); return ResultUtil.success(); }catch (Exception e){ e.printStackTrace(); @@ -990,6 +1119,33 @@ } } + @ResponseBody + @PostMapping("/base/user/queryOrderLicensePlate") + @ApiOperation(value = "获取报失也车牌等信息", tags = {"用户端-个人中心"}, notes = "") + @ApiImplicitParams({ + @ApiImplicitParam(value = "订单类型(1=专车,2=出租车,3=跨城出行,4=同城小件物流,5=跨城小件物流)", name = "orderType", required = true, dataType = "int"), + @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"), + }) + public ResultUtil queryOrderLicensePlate(Integer orderType, Integer orderId){ + try { + Map<String, Object> map = orderService.queryOrderLicensePlate(orderType, orderId); + return ResultUtil.success(map); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } + + @ResponseBody + @RequestMapping("/base/user/image") + public String image(@RequestPart("file") MultipartFile file) { + try { + String pictureName = OBSUploadUtil.inputStreamUpload(file); + return pictureName; + } catch (IOException e1) { + return null; + } + } @ResponseBody @PostMapping("/api/user/queryBankCardList") @@ -1019,8 +1175,6 @@ } } - - @ResponseBody @PostMapping("/api/user/addBankCard") @ApiOperation(value = "添加银行卡【1.1】", tags = {"用户端-个人中心"}, notes = "") @@ -1041,11 +1195,11 @@ BigDecimal bigDecimal = new BigDecimal(code); long max = Long.MAX_VALUE; if(bigDecimal.compareTo(new BigDecimal(max)) >= 0){ - return ResultUtil.error(language == 1 ? "银行卡号格式错误" : language == 2 ? "The format of bank card number is incorrect" : "Format incorrect du numéro de carte bancaire"); + return ResultUtil.error(language == 1 ? "银行卡号格式错误" : language == 2 ? "Format error of bank card" : "Erreur de format de la carte bancaire"); } BankCard bankCard = bankCardService.selectOne(new EntityWrapper<BankCard>().eq("code", code)); if(null != bankCard){ - return ResultUtil.error(language == 1 ? "银行卡重复" : language == 2 ? "Duplicate bank card" : "Double carte bancaire"); + return ResultUtil.error(language == 1 ? "银行卡重复" : language == 2 ? "Reduplication of bank card" : "Reduplication de la carte bancaire"); } bankCard = new BankCard(); bankCard.setUserId(uid); @@ -1063,8 +1217,6 @@ } } - - @ResponseBody @PostMapping("/api/user/delBankCard") @ApiOperation(value = "删除银行卡【1.1】", tags = {"用户端-个人中心"}, notes = "") @@ -1081,4 +1233,50 @@ return ResultUtil.runErr(); } } + + /** + * 下载pdf + * @param orderId + * @param orderType + * @param response + */ + @ResponseBody + @GetMapping("/base/order/uploadReceiptPdf") + public void uploadReceiptPdf(Integer orderId, Integer orderType, HttpServletResponse response){ + FileInputStream fileInputStream = null; + ServletOutputStream outputStream = null; + try { + if(orderType == 1){ + fileInputStream = new FileInputStream(new File("/usr/local/nginx/html/files/pdf/ride_receipt_" + orderId + ".pdf")); + } + if(orderType == 4){ + fileInputStream = new FileInputStream(new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf")); + } + BufferedInputStream bf = new BufferedInputStream(fileInputStream); + outputStream = response.getOutputStream(); + response.setContentType(MediaType.APPLICATION_PDF_VALUE); + response.setHeader("content-Disposition","attachment;filename=" + (orderId + "_" + orderType + ".pdf")); + byte[] b = new byte[bf.available() + 1000]; + int i; + while((i=bf.read(b))!=-1){ + outputStream.write(b,0, i); + } + outputStream.flush(); + outputStream.close(); + fileInputStream.close(); + }catch (Exception e){ + e.printStackTrace(); + }finally { + try { + if(null != outputStream){ + outputStream.close(); + } + if(null != fileInputStream){ + fileInputStream.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + } } -- Gitblit v1.7.1