From 4adf49cd01c70e3867ddcad214e690619ddc3d07 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 08 十二月 2023 18:11:27 +0800
Subject: [PATCH] BUG修改
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 94c967f..e243b4f 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
@@ -127,7 +127,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)){
@@ -144,7 +145,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){
@@ -195,7 +196,7 @@
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();
@@ -319,7 +320,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 {
@@ -463,9 +465,9 @@
@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();
@@ -617,13 +619,13 @@
@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();
@@ -643,7 +645,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)){
@@ -652,7 +654,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));
}
@@ -848,6 +850,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){
@@ -1146,11 +1149,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);
--
Gitblit v1.7.1