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/system/service/impl/UserInfoServiceImpl.java | 172 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 92 insertions(+), 80 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
index 45402a0..b4f607e 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -120,7 +120,7 @@
* @return
*/
@Override
- public ResultUtil queryCaptcha(String phone, Integer type) throws Exception {
+ public ResultUtil queryCaptcha(String phone, Integer type, Integer language) throws Exception {
Random random = new Random();
Object value = redisUtil.getValue(phone);
if(value==null){
@@ -133,7 +133,19 @@
//发送验证码短信
redisUtil.setStrValue(phone, authCode, 5 * 60);//设置五分钟过期
- SMSUtil.send_huawei_sms("b793ae3d41a049059197bfe92cf8bc83", "+" + phone, "[\"" + authCode + "\"]");
+ String templateId = "";
+ switch (language){
+ case 1:
+ templateId = "b793ae3d41a049059197bfe92cf8bc83";
+ break;
+ case 2:
+ templateId = "058c7d11ce594d668841cceb49fb5c9a";
+ break;
+ case 3:
+ templateId = "4edbe604da6546808ffda582085b3c83";
+ break;
+ }
+ SMSUtil.send_huawei_sms(templateId, "+" + phone, "[\"" + authCode + "\"]");
System.out.println(sms);
}
return ResultUtil.success();
@@ -221,20 +233,20 @@
String path = templatePath + "user/register.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("您好 " + userInfo.getNickName() + "，");
}
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_english = document.getElementById("user_english");
user_english.text("Hello " + userInfo.getNickName() + "，");
}
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 " + userInfo.getNickName() + "，");
}
@@ -262,14 +274,14 @@
String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if(1 == language){
- document1.getElementById("english").attr("style", "display: none;");
- document1.getElementById("french").attr("style", "display: none;");
- document1.getElementById("invite").attr("style", "display: none;");
- document1.getElementById("settle").attr("style", "display: none;");
- document1.getElementById("pass").attr("style", "display: none;");
- document1.getElementById("bill").attr("style", "display: none;");
- document1.getElementById("reward").attr("style", "display: none;");
- document1.getElementById("rewardToday").attr("style", "display: none;");
+ document1.getElementById("english").remove();
+ document1.getElementById("french").remove();
+ document1.getElementById("invite").remove();
+ document1.getElementById("settle").remove();
+ document1.getElementById("pass").remove();
+ document1.getElementById("bill").remove();
+ document1.getElementById("reward").remove();
+ document1.getElementById("rewardToday").remove();
Element user_user = document1.getElementById("user_user");
user_user.text("您好 " + driver.getFirstName() + " " + driver.getLastName() + "，");
@@ -277,14 +289,14 @@
user_content.text("您已成功邀请一位用户注册I-GO，获得奖励GHS " + bigDecimal.doubleValue() + "，请查收");
}
if(2 == language){
- document1.getElementById("chinese").attr("style", "display: none;");
- document1.getElementById("french").attr("style", "display: none;");
- document1.getElementById("invite1").attr("style", "display: none;");
- document1.getElementById("settle1").attr("style", "display: none;");
- document1.getElementById("pass1").attr("style", "display: none;");
- document1.getElementById("bill1").attr("style", "display: none;");
- document1.getElementById("reward1").attr("style", "display: none;");
- document1.getElementById("rewardToday1").attr("style", "display: none;");
+ document1.getElementById("chinese").remove();
+ document1.getElementById("french").remove();
+ document1.getElementById("invite1").remove();
+ document1.getElementById("settle1").remove();
+ document1.getElementById("pass1").remove();
+ document1.getElementById("bill1").remove();
+ document1.getElementById("reward1").remove();
+ document1.getElementById("rewardToday1").remove();
Element user1_user = document1.getElementById("user1_user");
user1_user.text("Hello " + driver.getFirstName() + " " + driver.getLastName() + "，");
@@ -292,14 +304,14 @@
user1_content.text("You have succeeded to invite a rider to register with I-GO, so you received a GHS " + bigDecimal.doubleValue() + " bonus, please check your balance.");
}
if(3 == language){
- document1.getElementById("chinese").attr("style", "display: none;");
- document1.getElementById("english").attr("style", "display: none;");
- document1.getElementById("invite1").attr("style", "display: none;");
- document1.getElementById("settle1").attr("style", "display: none;");
- document1.getElementById("pass1").attr("style", "display: none;");
- document1.getElementById("bill1").attr("style", "display: none;");
- document1.getElementById("reward1").attr("style", "display: none;");
- document1.getElementById("rewardToday1").attr("style", "display: none;");
+ document1.getElementById("chinese").remove();
+ document1.getElementById("english").remove();
+ document1.getElementById("invite1").remove();
+ document1.getElementById("settle1").remove();
+ document1.getElementById("pass1").remove();
+ document1.getElementById("bill1").remove();
+ document1.getElementById("reward1").remove();
+ document1.getElementById("rewardToday1").remove();
Element user2_user = document1.getElementById("user2_user");
user2_user.text("Bonjour " + driver.getFirstName() + " " + driver.getLastName() + "，");
@@ -352,8 +364,8 @@
String path1 = templatePath + "user/coupon.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if(language == 1){
- document1.getElementById("english").attr("style", "display: none;");
- document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("english").remove();
+ document1.getElementById("french").remove();
Element chinese_user = document1.getElementById("chinese_user");
chinese_user.text("您好 " + userInfo1.getNickName() + "，");
Element chinese_number = document1.getElementById("chinese_number");
@@ -362,8 +374,8 @@
chinese_date.text("此活动有效期在" + startTime + "至" + endTime + "，详情请查看I-GO平台");
}
if(language == 2){
- document1.getElementById("chinese").attr("style", "display: none;");
- document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("chinese").remove();
+ document1.getElementById("french").remove();
Element english_user = document1.getElementById("english_user");
english_user.text("Hello " + userInfo1.getNickName() + "，");
Element english_number = document1.getElementById("english_number");
@@ -372,8 +384,8 @@
english_date.text("You could use them from" + startTime + "to" + endTime);
}
if(language == 3){
- document1.getElementById("chinese").attr("style", "display: none;");
- document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("chinese").remove();
+ document1.getElementById("english").remove();
Element french_user = document1.getElementById("french_user");
french_user.text("Bonjour " + userInfo1.getNickName() + "，");
Element french_number = document1.getElementById("french_number");
@@ -541,20 +553,20 @@
String path = templatePath + "user/register.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("您好 " + userInfo.getNickName() + "，");
}
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_english = document.getElementById("user_english");
user_english.text("Hello " + userInfo.getNickName() + "，");
}
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 " + userInfo.getNickName() + "，");
}
@@ -624,8 +636,8 @@
String path = templatePath + "user/coupon.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
if(language == 1){
- document.getElementById("english").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
Element chinese_user = document.getElementById("chinese_user");
chinese_user.text("您好 " + userInfo.getNickName() + "，");
Element chinese_number = document.getElementById("chinese_number");
@@ -634,8 +646,8 @@
chinese_date.text("此活动有效期在" + startTime + "至" + endTime + "，详情请查看I-GO平台");
}
if(language == 2){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
Element english_user = document.getElementById("english_user");
english_user.text("Hello " + userInfo.getNickName() + "，");
Element english_number = document.getElementById("english_number");
@@ -644,8 +656,8 @@
english_date.text("You could use them from" + startTime + "to" + endTime);
}
if(language == 3){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
Element french_user = document.getElementById("french_user");
french_user.text("Bonjour " + userInfo.getNickName() + "，");
Element french_number = document.getElementById("french_number");
@@ -743,20 +755,20 @@
String path = templatePath + "user/register.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("您好 " + userInfo.getNickName() + "，");
}
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_english = document.getElementById("user_english");
user_english.text("Hello " + userInfo.getNickName() + "，");
}
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 " + userInfo.getNickName() + "，");
}
@@ -826,8 +838,8 @@
String path = templatePath + "user/coupon.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
if(language == 1){
- document.getElementById("english").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
Element chinese_user = document.getElementById("chinese_user");
chinese_user.text("您好 " + userInfo.getNickName() + "，");
Element chinese_number = document.getElementById("chinese_number");
@@ -836,8 +848,8 @@
chinese_date.text("此活动有效期在" + startTime + "至" + endTime + "，详情请查看I-GO平台");
}
if(language == 2){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
Element english_user = document.getElementById("english_user");
english_user.text("Hello " + userInfo.getNickName() + "，");
Element english_number = document.getElementById("english_number");
@@ -846,8 +858,8 @@
english_date.text("You could use them from" + startTime + "to" + endTime);
}
if(language == 3){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
Element french_user = document.getElementById("french_user");
french_user.text("Bonjour " + userInfo.getNickName() + "，");
Element french_number = document.getElementById("french_number");
@@ -1196,20 +1208,20 @@
String path = templatePath + "user/passwordReset.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("您好 " + userInfo.getNickName() + "，");
}
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 " + userInfo.getNickName() + "，");
}
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 " + userInfo.getNickName() + "，");
}
@@ -1451,8 +1463,8 @@
String path = templatePath + "user/coupon.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
if(language == 1){
- document.getElementById("english").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
Element chinese_user = document.getElementById("chinese_user");
chinese_user.text("您好 " + userInfo.getNickName() + "，");
Element chinese_number = document.getElementById("chinese_number");
@@ -1461,8 +1473,8 @@
chinese_date.text("此活动有效期在" + startTime + "至" + endTime + "，详情请查看I-GO平台");
}
if(language == 2){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
Element english_user = document.getElementById("english_user");
english_user.text("Hello " + userInfo.getNickName() + "，");
Element english_number = document.getElementById("english_number");
@@ -1471,8 +1483,8 @@
english_date.text("You could use them from" + startTime + "to" + endTime);
}
if(language == 3){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
Element french_user = document.getElementById("french_user");
french_user.text("Bonjour " + userInfo.getNickName() + "，");
Element french_number = document.getElementById("french_number");
@@ -1576,8 +1588,8 @@
String path = templatePath + "user/coupon.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
if(language == 1){
- document.getElementById("english").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
Element chinese_user = document.getElementById("chinese_user");
chinese_user.text("您好 " + userInfo.getNickName() + "，");
Element chinese_number = document.getElementById("chinese_number");
@@ -1586,8 +1598,8 @@
chinese_date.text("此活动有效期在" + startTime + "至" + endTime + "，详情请查看I-GO平台");
}
if(language == 2){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
Element english_user = document.getElementById("english_user");
english_user.text("Hello " + userInfo.getNickName() + "，");
Element english_number = document.getElementById("english_number");
@@ -1596,8 +1608,8 @@
english_date.text("You could use them from" + startTime + "to" + endTime);
}
if(language == 3){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
Element french_user = document.getElementById("french_user");
french_user.text("Bonjour " + userInfo.getNickName() + "，");
Element french_number = document.getElementById("french_number");
--
Gitblit v1.7.1