From 4becc1e8cdb2fbe0dcb94493b75a59ec1817028c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 04 十一月 2023 16:05:04 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 255 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 202 insertions(+), 53 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..94c967f 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,6 +9,7 @@
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.*;
@@ -22,11 +23,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 +63,14 @@
@Autowired
private IBankCardService bankCardService;
+ @Autowired
+ private IOrderService orderService;
+
@Value("${spring.mail.template-path}")
private String templatePath;
+
+ @Autowired
+ private TEmailService emailService;
@@ -104,8 +116,6 @@
}
}
-
-
/**
* 获取短信验证码
* @param phone
@@ -146,8 +156,6 @@
}
}
-
-
@ResponseBody
@PostMapping("/base/queryCaptcha1")
@ApiOperation(value = "获取短信验证码", tags = {"用户端-登录"}, notes = "")
@@ -175,10 +183,6 @@
}
}
-
-
-
-
@ResponseBody
@PostMapping("/base/sedEmail")
@ApiOperation(value = "获取邮箱验证码【1.0】", tags = {"用户端-登录"}, notes = "")
@@ -187,52 +191,62 @@
})
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");
}
+
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();
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();
Element user_chinese = document.getElementById("user_english");
user_chinese.text("Hello " + nickName + "，");
Element content_chinese = document.getElementById("content_english");
content_chinese.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();
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 code" : "Code de vérification", document.html());
}
return ResultUtil.success();
@@ -241,9 +255,6 @@
return ResultUtil.runErr();
}
}
-
-
-
/**
* 手机验证码登录
@@ -272,14 +283,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();
}
}
-
-
/**
* 手机验证码登录
@@ -307,16 +330,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 +383,6 @@
return ResultUtil.paranErr();
}
}
-
/**
* 忘记密码
@@ -386,7 +418,6 @@
return ResultUtil.paranErr();
}
}
-
/**
* 微信授权登录
@@ -441,7 +472,6 @@
}
}
-
@ResponseBody
@PostMapping("/base/user/facebookLogin")
@ApiOperation(value = "FaceBook授权登录【1.0】", tags = {"用户端-登录"}, notes = "")
@@ -457,15 +487,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 +544,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 +587,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();
+ }
+ }
/**
* 获取用户个人信息
@@ -551,7 +630,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 手机号码获取用户
@@ -585,7 +663,6 @@
}
}
-
/**
* 实名认证操作
* @param verifiedWarpper
@@ -610,7 +687,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 设置紧急联系人
@@ -648,7 +724,6 @@
}
}
-
/**
* 用户充值余额
* @param payType
@@ -679,7 +754,6 @@
}
}
-
/**
* 修改手机号码
* @param code
@@ -708,6 +782,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){
@@ -749,8 +837,6 @@
}
}
-
-
/**
* 修改登录密码
* @param password
@@ -776,7 +862,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 修改个人信息
@@ -814,7 +899,6 @@
}
}
-
@ResponseBody
@PostMapping("/api/user/queryRealName")
@ApiOperation(value = "获取实名认证的数据", tags = {"用户端-个人中心"}, notes = "")
@@ -835,7 +919,6 @@
}
}
-
/**
* 后台调用禁用用户
* @param uid
@@ -855,7 +938,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 仿socket接口（单点登录）
@@ -945,8 +1027,6 @@
}
}
-
-
@ResponseBody
@PostMapping("/api/user/editLanguage")
@ApiOperation(value = "修改多语言配置", tags = {"用户端-个人中心"}, notes = "")
@@ -970,7 +1050,6 @@
}
}
-
@ResponseBody
@PostMapping("/base/user/addReportLoss")
@ApiOperation(value = "提交报失", tags = {"用户端-个人中心"}, notes = "")
@@ -979,10 +1058,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 +1070,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")
@@ -1018,8 +1125,6 @@
return ResultUtil.runErr();
}
}
-
-
@ResponseBody
@PostMapping("/api/user/addBankCard")
@@ -1063,8 +1168,6 @@
}
}
-
-
@ResponseBody
@PostMapping("/api/user/delBankCard")
@ApiOperation(value = "删除银行卡【1.1】", tags = {"用户端-个人中心"}, notes = "")
@@ -1081,4 +1184,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