From 7558a21c1ae1b48b0888f3e3906eb4ba6a68b06f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 03 八月 2023 11:30:34 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 b14c956..744bbb1 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
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.api;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.BigDecimalCodec;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.google.code.kaptcha.Constants;
import com.stylefeng.guns.core.common.constant.JwtConstants;
@@ -26,6 +27,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.io.File;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -134,7 +136,7 @@
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 userInfoService.queryCaptcha(phone, type);
+ return userInfoService.queryCaptcha(phone, type, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -153,7 +155,7 @@
@ApiImplicitParam(value = "手机号码", name = "phone", required = true, dataType = "String"),
@ApiImplicitParam(value = "场景类型（1=身份验证，2=登录确认，3=用户注册，4=修改密码）", name = "type", required = true, dataType = "String")
})
- public ResultUtil queryCaptcha1(String phone, Integer type){
+ public ResultUtil queryCaptcha1(String phone, Integer type, Integer language){
if(ToolUtil.isNotEmpty(phone)){
try {
String substring = phone.substring(0, 1);
@@ -163,7 +165,7 @@
if(phone.indexOf("233") < 0){
phone = "233" + phone;
}
- return userInfoService.queryCaptcha(phone, type);
+ return userInfoService.queryCaptcha(phone, type, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -207,24 +209,24 @@
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");
@@ -1036,6 +1038,11 @@
if(null == uid){
return ResultUtil.tokenErr();
}
+ 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");
+ }
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");
--
Gitblit v1.7.1