From d61812d87aa8ffc54eca9a8bfae078a1349e45d4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 10:40:54 +0800
Subject: [PATCH] 新增加国外短信

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java |  966 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 488 insertions(+), 478 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index de77901..2fd68d8 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -168,11 +168,22 @@
             sb.append((int) (random.nextDouble() * 10));
         }
         String authCode = sb.toString();
-        String sms = "短信验证码【" + authCode + "】已发到您的手机，验证码将在5分钟后失效.";
+        String sms = "";
 
         //发送验证码短信
         redisUtil.setStrValue(phone, authCode, 5 * 60);//设置五分钟过期
-        SMSUtil.send_huawei_sms("b793ae3d41a049059197bfe92cf8bc83", "+233" + phone, "[\"" + authCode + "\"]");
+        switch (language){
+            case 1:
+                sms = "您的验证码为：" + authCode + "，该验证码5分钟内有效，请勿泄漏于他人！";
+                break;
+            case 2:
+                sms = "Your verification code is: " + authCode + ", the verification code is valid within 5 minutes, do not leak to others!";
+                break;
+            case 3:
+                sms = "Votre code de vérification est: " + authCode + ". Ce code est valide pendant 5 minutes. Ne le divulguez pas aux autres!";
+                break;
+        }
+        SMSUtil.sendTwilioMessage("+" + phone, sms);
         System.out.println(sms);
         return ResultUtil.success();
     }
@@ -193,17 +204,17 @@
         String path = templatePath + "index.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("invite").attr("style", "display: none;");
-            document.getElementById("user").attr("style", "display: none;");
-            document.getElementById("settle").attr("style", "display: none;");
-            document.getElementById("pass").attr("style", "display: none;");
-            document.getElementById("bill").attr("style", "display: none;");
-            document.getElementById("reward").attr("style", "display: none;");
-            document.getElementById("rewardToday").attr("style", "display: none;");
-            document.getElementById("driverAudit").attr("style", "display: none;");
-            document.getElementById("carAudit").attr("style", "display: none;");
+            document.getElementById("english").remove();
+            document.getElementById("french").remove();
+            document.getElementById("invite").remove();
+            document.getElementById("user").remove();
+            document.getElementById("settle").remove();
+            document.getElementById("pass").remove();
+            document.getElementById("bill").remove();
+            document.getElementById("reward").remove();
+            document.getElementById("rewardToday").remove();
+            document.getElementById("driverAudit").remove();
+            document.getElementById("carAudit").remove();
 
             Element email_user = document.getElementById("email_user");
             email_user.text("您好 ，");
@@ -211,17 +222,17 @@
             email_content.text("邮件验证码是：" + authCode + "，请在5分钟内完成验证");
         }
         if(2 == language){
-            document.getElementById("chinese").attr("style", "display: none;");
-            document.getElementById("french").attr("style", "display: none;");
-            document.getElementById("invite1").attr("style", "display: none;");
-            document.getElementById("user1").attr("style", "display: none;");
-            document.getElementById("settle1").attr("style", "display: none;");
-            document.getElementById("pass1").attr("style", "display: none;");
-            document.getElementById("bill1").attr("style", "display: none;");
-            document.getElementById("reward1").attr("style", "display: none;");
-            document.getElementById("rewardToday1").attr("style", "display: none;");
-            document.getElementById("driverAudit1").attr("style", "display: none;");
-            document.getElementById("carAudit1").attr("style", "display: none;");
+            document.getElementById("chinese").remove();
+            document.getElementById("french").remove();
+            document.getElementById("invite1").remove();
+            document.getElementById("user1").remove();
+            document.getElementById("settle1").remove();
+            document.getElementById("pass1").remove();
+            document.getElementById("bill1").remove();
+            document.getElementById("reward1").remove();
+            document.getElementById("rewardToday1").remove();
+            document.getElementById("driverAudit1").remove();
+            document.getElementById("carAudit1").remove();
 
             Element email1_user = document.getElementById("email1_user");
             email1_user.text("Hello ，");
@@ -229,17 +240,17 @@
             email1_content.text("verification code is " + authCode + ", please complete the verification within 5 minutes. If the request wasn't made by you, please ignore this email.");
         }
         if(3 == language){
-            document.getElementById("chinese").attr("style", "display: none;");
-            document.getElementById("english").attr("style", "display: none;");
-            document.getElementById("invite2").attr("style", "display: none;");
-            document.getElementById("user2").attr("style", "display: none;");
-            document.getElementById("settle2").attr("style", "display: none;");
-            document.getElementById("pass2").attr("style", "display: none;");
-            document.getElementById("bill2").attr("style", "display: none;");
-            document.getElementById("reward2").attr("style", "display: none;");
-            document.getElementById("rewardToday2").attr("style", "display: none;");
-            document.getElementById("driverAudit2").attr("style", "display: none;");
-            document.getElementById("carAudit2").attr("style", "display: none;");
+            document.getElementById("chinese").remove();
+            document.getElementById("english").remove();
+            document.getElementById("invite2").remove();
+            document.getElementById("user2").remove();
+            document.getElementById("settle2").remove();
+            document.getElementById("pass2").remove();
+            document.getElementById("bill2").remove();
+            document.getElementById("reward2").remove();
+            document.getElementById("rewardToday2").remove();
+            document.getElementById("driverAudit2").remove();
+            document.getElementById("carAudit2").remove();
 
             Element email2_user = document.getElementById("email2_user");
             email2_user.text("Hello ，");
@@ -258,8 +269,8 @@
      * @throws Exception
      */
     @Override
-    public boolean checkCaptcha(String phone, String code) throws Exception {
-        Object value = redisUtil.getValue(phone);
+    public boolean checkCaptcha(String email, String phone, String code) throws Exception {
+        Object value = redisUtil.getValue(ToolUtil.isNotEmpty(email) ? email : phone);
         if("1246".equals(code)){
             return true;
         }
@@ -277,8 +288,8 @@
      * @throws Exception
      */
     @Override
-    public ResultUtil registeredDriver(String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language) throws Exception {
-        ResultUtil<LoginWarpper> result = this.registeredDriver(phone, code, password,uid,type);
+    public ResultUtil registeredDriver(String phoneOperator, String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language) throws Exception {
+        ResultUtil<LoginWarpper> result = this.registeredDriver(phoneOperator, phone, code, password,uid,type, language);
         if(result.getCode() == 200 && null != uid){
             if(type == 2){
                 Driver driver = driverMapper.selectById(uid);
@@ -299,56 +310,56 @@
                     String path = templatePath + "index.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("user").attr("style", "display: none;");
-                        document.getElementById("settle").attr("style", "display: none;");
-                        document.getElementById("pass").attr("style", "display: none;");
-                        document.getElementById("email").attr("style", "display: none;");
-                        document.getElementById("bill").attr("style", "display: none;");
-                        document.getElementById("reward").attr("style", "display: none;");
-                        document.getElementById("rewardToday").attr("style", "display: none;");
-                        document.getElementById("driverAudit").attr("style", "display: none;");
-                        document.getElementById("carAudit").attr("style", "display: none;");
+                        document.getElementById("english").remove();
+                        document.getElementById("french").remove();
+                        document.getElementById("user").remove();
+                        document.getElementById("settle").remove();
+                        document.getElementById("pass").remove();
+                        document.getElementById("email").remove();
+                        document.getElementById("bill").remove();
+                        document.getElementById("reward").remove();
+                        document.getElementById("rewardToday").remove();
+                        document.getElementById("driverAudit").remove();
+                        document.getElementById("carAudit").remove();
 
                         Element invite_user = document.getElementById("invite_user");
-                        invite_user.text("您好 " + driver.getName() + "，");
+                        invite_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
                         Element invite_content = document.getElementById("invite_content");
                         invite_content.text("您已成功邀请一位司机注册I-GO，获得奖励GHS " + bigDecimal.doubleValue() + "，请查收");
                     }
                     if(2 == language){
-                        document.getElementById("chinese").attr("style", "display: none;");
-                        document.getElementById("french").attr("style", "display: none;");
-                        document.getElementById("user1").attr("style", "display: none;");
-                        document.getElementById("settle1").attr("style", "display: none;");
-                        document.getElementById("pass1").attr("style", "display: none;");
-                        document.getElementById("email1").attr("style", "display: none;");
-                        document.getElementById("bill1").attr("style", "display: none;");
-                        document.getElementById("reward1").attr("style", "display: none;");
-                        document.getElementById("rewardToday1").attr("style", "display: none;");
-                        document.getElementById("driverAudit1").attr("style", "display: none;");
-                        document.getElementById("carAudit1").attr("style", "display: none;");
+                        document.getElementById("chinese").remove();
+                        document.getElementById("french").remove();
+                        document.getElementById("user1").remove();
+                        document.getElementById("settle1").remove();
+                        document.getElementById("pass1").remove();
+                        document.getElementById("email1").remove();
+                        document.getElementById("bill1").remove();
+                        document.getElementById("reward1").remove();
+                        document.getElementById("rewardToday1").remove();
+                        document.getElementById("driverAudit1").remove();
+                        document.getElementById("carAudit1").remove();
 
                         Element invite1_user = document.getElementById("invite1_user");
-                        invite1_user.text("Hello " + driver.getName() + "，");
+                        invite1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                         Element invite1_content = document.getElementById("invite1_content");
                         invite1_content.text("You have succeeded to invite a driver to register with I-GO, so you received a GHS " + bigDecimal.doubleValue() + " bonus, please check your balance.");
                     }
                     if(3 == language){
-                        document.getElementById("chinese").attr("style", "display: none;");
-                        document.getElementById("english").attr("style", "display: none;");
-                        document.getElementById("user2").attr("style", "display: none;");
-                        document.getElementById("settle2").attr("style", "display: none;");
-                        document.getElementById("pass2").attr("style", "display: none;");
-                        document.getElementById("email2").attr("style", "display: none;");
-                        document.getElementById("bill2").attr("style", "display: none;");
-                        document.getElementById("reward2").attr("style", "display: none;");
-                        document.getElementById("rewardToday2").attr("style", "display: none;");
-                        document.getElementById("driverAudit2").attr("style", "display: none;");
-                        document.getElementById("carAudit2").attr("style", "display: none;");
+                        document.getElementById("chinese").remove();
+                        document.getElementById("english").remove();
+                        document.getElementById("user2").remove();
+                        document.getElementById("settle2").remove();
+                        document.getElementById("pass2").remove();
+                        document.getElementById("email2").remove();
+                        document.getElementById("bill2").remove();
+                        document.getElementById("reward2").remove();
+                        document.getElementById("rewardToday2").remove();
+                        document.getElementById("driverAudit2").remove();
+                        document.getElementById("carAudit2").remove();
 
                         Element invite2_user = document.getElementById("invite2_user");
-                        invite2_user.text("Bonjour " + driver.getName() + "，");
+                        invite2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
                         Element invite2_content = document.getElementById("invite2_content");
                         invite2_content.text("Vous avez invité avec succès un conducteur à s’inscrire à i-go pour recevoir une récompense GHS " + bigDecimal.doubleValue() + ". Veuillez vérifier");
                     }
@@ -398,10 +409,10 @@
      * @throws Exception
      */
     @Override
-    public ResultUtil<LoginWarpper> registeredDriver(String phone, String code, String password,Integer uid,Integer uType) throws Exception {
-        boolean b = this.checkCaptcha(phone, code);
+    public ResultUtil<LoginWarpper> registeredDriver(String phoneOperator, String phone, String code, String password,Integer uid,Integer uType, Integer language) throws Exception {
+        boolean b = this.checkCaptcha("", phone, code);
         if(!b){
-            return ResultUtil.error("验证码无效");
+            return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
         }
 
         Driver driver1 = driverMapper.queryByPhone_(phone, 4);//获取审核不通过的数据
@@ -423,6 +434,7 @@
         Driver driver = new Driver();
         driver.setAccount(phone);
         driver.setJobNumber(getCode());
+        driver.setPhoneOperator(phoneOperator);
         driver.setPhone(phone);
         driver.setPassword(ShiroKit.md5(password, salt));
         driver.setAuthState(1);
@@ -465,7 +477,8 @@
     @Override
     public ResultUtil updateDriver(RegisteredWarpper registeredWarpper, Integer uid, Integer language) throws Exception {
         Driver driver = this.selectById(uid);
-        driver.setName(registeredWarpper.getName());
+        driver.setLastName(registeredWarpper.getLastName());
+        driver.setFirstName(registeredWarpper.getFirstName());
         driver.setSex(registeredWarpper.getSex());
         driver.setIdCard(registeredWarpper.getIdCard());
         driver.setBirthday(registeredWarpper.getBirthday());
@@ -474,7 +487,7 @@
         String[] city = new String[]{city1.getEnglishName()};
         Company query = companyCityService.query(city);
         if(null == query){
-            return ResultUtil.error("选择从业地暂未开通业务");
+            return ResultUtil.error(language == 1 ? "选择从业地暂未开通业务" : language == 2 ? "The selected place of employment has not yet opened business" : "Choisir un lieu de pratique pas encore ouvert");
         }
         if(null != query){
             switch (query.getType()){
@@ -535,52 +548,52 @@
             String path1 = templatePath + "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("user").attr("style", "display: none;");
-                document1.getElementById("pass").attr("style", "display: none;");
-                document1.getElementById("email").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("driverAudit").attr("style", "display: none;");
-                document1.getElementById("carAudit").attr("style", "display: none;");
+                document1.getElementById("english").remove();
+                document1.getElementById("french").remove();
+                document1.getElementById("invite").remove();
+                document1.getElementById("user").remove();
+                document1.getElementById("pass").remove();
+                document1.getElementById("email").remove();
+                document1.getElementById("bill").remove();
+                document1.getElementById("reward").remove();
+                document1.getElementById("rewardToday").remove();
+                document1.getElementById("driverAudit").remove();
+                document1.getElementById("carAudit").remove();
 
                 Element settle_user = document1.getElementById("settle_user");
-                settle_user.text("您好 " + driver.getName() + "，");
+                settle_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
             }
             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("user1").attr("style", "display: none;");
-                document1.getElementById("pass1").attr("style", "display: none;");
-                document1.getElementById("email1").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("driverAudit1").attr("style", "display: none;");
-                document1.getElementById("carAudit1").attr("style", "display: none;");
+                document1.getElementById("chinese").remove();
+                document1.getElementById("french").remove();
+                document1.getElementById("invite1").remove();
+                document1.getElementById("user1").remove();
+                document1.getElementById("pass1").remove();
+                document1.getElementById("email1").remove();
+                document1.getElementById("bill1").remove();
+                document1.getElementById("reward1").remove();
+                document1.getElementById("rewardToday1").remove();
+                document1.getElementById("driverAudit1").remove();
+                document1.getElementById("carAudit1").remove();
 
                 Element settle1_user = document1.getElementById("settle1_user");
-                settle1_user.text("Hello " + driver.getName() + "，");
+                settle1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
             }
             if(3 == language){
-                document1.getElementById("chinese").attr("style", "display: none;");
-                document1.getElementById("english").attr("style", "display: none;");
-                document1.getElementById("invite2").attr("style", "display: none;");
-                document1.getElementById("user2").attr("style", "display: none;");
-                document1.getElementById("pass2").attr("style", "display: none;");
-                document1.getElementById("email2").attr("style", "display: none;");
-                document1.getElementById("bill2").attr("style", "display: none;");
-                document1.getElementById("reward2").attr("style", "display: none;");
-                document1.getElementById("rewardToday2").attr("style", "display: none;");
-                document1.getElementById("driverAudit2").attr("style", "display: none;");
-                document1.getElementById("carAudit2").attr("style", "display: none;");
+                document1.getElementById("chinese").remove();
+                document1.getElementById("english").remove();
+                document1.getElementById("invite2").remove();
+                document1.getElementById("user2").remove();
+                document1.getElementById("pass2").remove();
+                document1.getElementById("email2").remove();
+                document1.getElementById("bill2").remove();
+                document1.getElementById("reward2").remove();
+                document1.getElementById("rewardToday2").remove();
+                document1.getElementById("driverAudit2").remove();
+                document1.getElementById("carAudit2").remove();
 
                 Element settle2_user = document1.getElementById("settle2_user");
-                settle2_user.text("Bonjour " + driver.getName() + "，");
+                settle2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
             }
             EmailUtil.send(driver.getEmail(), language == 1 ? "注册成功" : language == 2 ? "registration success" : "succès de l'inscription",  document1.html());
         }
@@ -599,13 +612,13 @@
      */
     @Override
     public ResultUtil resetPassword(String phone, String code, String password, Integer language) throws Exception {
-        boolean b = this.checkCaptcha(phone, code);
+        boolean b = this.checkCaptcha("", phone, code);
         if(!b){
-            return ResultUtil.error("验证码无效");
+            return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
         }
         Driver driver = driverMapper.queryByPhone(phone);
         if(null == driver){
-            return ResultUtil.error("电话号码未注册");
+            return ResultUtil.error(language == 1 ? "电话号码未注册" : language == 2 ? "The phone number is not registered" : "Numéro de téléphone non enregistré");
         }
         driver.setPassword(ShiroKit.md5(password, salt));
         driverMapper.updateById(driver);
@@ -614,52 +627,52 @@
             String path1 = templatePath + "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("user").attr("style", "display: none;");
-                document1.getElementById("settle").attr("style", "display: none;");
-                document1.getElementById("email").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("driverAudit").attr("style", "display: none;");
-                document1.getElementById("carAudit").attr("style", "display: none;");
+                document1.getElementById("english").remove();
+                document1.getElementById("french").remove();
+                document1.getElementById("invite").remove();
+                document1.getElementById("user").remove();
+                document1.getElementById("settle").remove();
+                document1.getElementById("email").remove();
+                document1.getElementById("bill").remove();
+                document1.getElementById("reward").remove();
+                document1.getElementById("rewardToday").remove();
+                document1.getElementById("driverAudit").remove();
+                document1.getElementById("carAudit").remove();
 
                 Element pass_user = document1.getElementById("pass_user");
-                pass_user.text("您好 " + driver.getName() + "，");
+                pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
             }
             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("user1").attr("style", "display: none;");
-                document1.getElementById("settle1").attr("style", "display: none;");
-                document1.getElementById("email1").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("driverAudit1").attr("style", "display: none;");
-                document1.getElementById("carAudit1").attr("style", "display: none;");
+                document1.getElementById("chinese").remove();
+                document1.getElementById("french").remove();
+                document1.getElementById("invite1").remove();
+                document1.getElementById("user1").remove();
+                document1.getElementById("settle1").remove();
+                document1.getElementById("email1").remove();
+                document1.getElementById("bill1").remove();
+                document1.getElementById("reward1").remove();
+                document1.getElementById("rewardToday1").remove();
+                document1.getElementById("driverAudit1").remove();
+                document1.getElementById("carAudit1").remove();
 
                 Element pass1_user = document1.getElementById("pass1_user");
-                pass1_user.text("Hello " + driver.getName() + "，");
+                pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
             }
             if(3 == language){
-                document1.getElementById("chinese").attr("style", "display: none;");
-                document1.getElementById("english").attr("style", "display: none;");
-                document1.getElementById("invite2").attr("style", "display: none;");
-                document1.getElementById("user2").attr("style", "display: none;");
-                document1.getElementById("settle2").attr("style", "display: none;");
-                document1.getElementById("email2").attr("style", "display: none;");
-                document1.getElementById("bill2").attr("style", "display: none;");
-                document1.getElementById("reward2").attr("style", "display: none;");
-                document1.getElementById("rewardToday2").attr("style", "display: none;");
-                document1.getElementById("driverAudit2").attr("style", "display: none;");
-                document1.getElementById("carAudit2").attr("style", "display: none;");
+                document1.getElementById("chinese").remove();
+                document1.getElementById("english").remove();
+                document1.getElementById("invite2").remove();
+                document1.getElementById("user2").remove();
+                document1.getElementById("settle2").remove();
+                document1.getElementById("email2").remove();
+                document1.getElementById("bill2").remove();
+                document1.getElementById("reward2").remove();
+                document1.getElementById("rewardToday2").remove();
+                document1.getElementById("driverAudit2").remove();
+                document1.getElementById("carAudit2").remove();
 
                 Element pass2_user = document1.getElementById("pass2_user");
-                pass2_user.text("Bonjour " + driver.getName() + "，");
+                pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
             }
             EmailUtil.send(driver.getEmail(), language == 1 ? "重置密码" : language == 2 ? "reset Password" : "réinitialiser le mot de passe",  document1.html());
         }
@@ -706,24 +719,24 @@
      * @throws Exception
      */
     @Override
-    public ResultUtil<LoginWarpper> driverLogin(String phone, String password) throws Exception {
+    public ResultUtil<LoginWarpper> driverLogin(String phone, String password, Integer language) throws Exception {
         Driver driver = driverMapper.queryByPhone(phone);
         if(null == driver){
-            return ResultUtil.error("账号未注册");
+            return ResultUtil.error(language == 1 ? "账号未注册" : language == 2 ? "Account not registered" : "Compte non enregistré");
         }
         if(driver.getAuthState() == 1){
-            return ResultUtil.error("账号正在审核中，请耐心等待");
+            return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
         }
         if(driver.getAuthState() == 3){
-            return ResultUtil.error("账号已被冻结，请联系管理员");
+            return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
         }
         if(!driver.getPassword().equals(ShiroKit.md5(password, salt))){
-            return ResultUtil.error("密码错误");
+            return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
         }
 
         String value = redisUtil.getValue("DEVICE_" + driver.getId());
         if(ToolUtil.isNotEmpty(value)){
-            return ResultUtil.error("当前账户正在车载端登录");
+            return ResultUtil.error(language == 1 ? "当前账户正在车载端登录" : language == 2 ? "The current account is logging in to the vehicle terminal" : "Le compte actuel est connecté côté voiture");
         }
 
         //调用单点登录逻辑
@@ -734,11 +747,6 @@
         loginWarpper.setId(driver.getId());
         loginWarpper.setToken(token);
         loginWarpper.setAppid(UUIDUtil.getRandomCode());
-
-        //创建高德猎鹰的终端数据
-        String tid = gdFalconUtil.createTerminal(phone);
-        loginWarpper.setServerId(gdFalconUtil.getServerId());
-        loginWarpper.setTerminalId(tid);
         if(driver.getCompanyId()==null){
             loginWarpper.setJumpCode("100000");
         }else{
@@ -757,9 +765,9 @@
      * @throws Exception
      */
     @Override
-    public Map<String, Object> queryHomeData(Integer uid) throws Exception {
+    public Map<String, Object> queryHomeData(Integer uid, Integer language) throws Exception {
         Map<String, Object> map = driverMapper.queryHomeData(uid);
-        int size = this.queryMyActivity(uid, new Date()).size();
+        int size = this.queryMyActivity(uid, new Date(), language).size();
         map.put("activity", size);
         //获取司机待支付的现金支付订单推送司机支付
         new Thread(new Runnable() {
@@ -816,14 +824,14 @@
      * @throws Exception
      */
     @Override
-    public ResultUtil work(Integer uid, String type) throws Exception {
+    public ResultUtil work(Integer uid, String type, Integer language) throws Exception {
         DriverWork driverWork = driverWorkMapper.queryNewWork(uid, null, 1);
         Driver driver = this.selectById(uid);
         if(null != driverWork){//作下班操作
             //检测是否有未完成的订单
-            List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid);
+            List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid, language);
             if(list.size() > 0){
-                return ResultUtil.error("还有未完成的订单，不能进行下班操作");
+                return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "There are still outstanding orders, can not be off-duty operation" : "Il y a encore des commandes en suspens qui ne peuvent pas être exécutées");
             }
             driverWork.setEndTime(new Date());
             driverWork.setState(2);
@@ -842,20 +850,20 @@
             }
             //判断是否存在审核中的资料
             if(driver.getAuthState()==1){
-                return ResultUtil.error("资料审核中，不能出车");
+                return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data review, can't get out of the car" : "Données en cours de vérification, pas de voiture disponible");
             }
             if(driver.getAuthState()==4){
-                return ResultUtil.error("请完善资料后再出车");
+                return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
             }
             Car car = carService.selectById(driver.getCarId());
             if(car==null){
-                return ResultUtil.error("请完善资料后再出车");
+                return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
             }
             if(car.getAuthState()==1){
-                return ResultUtil.error("资料审核中，不能出车");
+                return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data review, can't get out of the car" : "Données en cours de vérification, pas de voiture disponible");
             }
             if(car.getAuthState()==4){
-                return ResultUtil.error("请完善资料后再出车");
+                return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
             }
             driverWork = new DriverWork();
             driverWork.setState(1);
@@ -873,12 +881,12 @@
 
 
     @Override
-    public ResultUtil work2(Integer uid, String type) throws Exception {
+    public ResultUtil work2(Integer uid, String type, Integer language) throws Exception {
         //判断是否已经上班，如果已经上班则先下班操作
         DriverWork driverWork1 = driverWorkMapper.queryNewWork(uid, null, 1);
         if(null != driverWork1){
             if(!driverWork1.getType().equals("2")){
-                return ResultUtil.error("请先将其他业务下班后再进行上班操作");
+                return ResultUtil.error(language == 1 ? "请先将其他业务下班后再进行上班操作" : language == 2 ? "Please do other business after work first" : "S’il vous plaît faire d’autres affaires après les heures de travail avant de travailler");
             }
         }
 
@@ -886,9 +894,9 @@
         Driver driver = this.selectById(uid);
         if(null != driverWork){//作下班操作
             //检测是否有未完成的订单
-            List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid);
+            List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid, language);
             if(list.size() > 0){
-                return ResultUtil.error("还有未完成的订单，不能进行下班操作");
+                return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "There are still outstanding orders, can not be off-duty operation" : "Il y a encore des commandes en suspens qui ne peuvent pas être exécutées");
             }
             driverWork.setEndTime(new Date());
             driverWork.setState(2);
@@ -920,7 +928,7 @@
                 if(Integer.valueOf(t) == 3){
                     CarService query1 = carServiceMapper.query(3, driver.getCarId());
                     if(query1 == null){
-                        return ResultUtil.error("车辆未添加跨城服务");
+                        return ResultUtil.error(language == 1 ? "车辆未添加跨城服务" : language == 2 ? "No cross-city service is added to the vehicle" : "Véhicule non ajouté pour le service cross city");
                     }
                 }
                 DriverOrders query = driverOrdersMapper.query(uid, Integer.valueOf(t));
@@ -944,16 +952,16 @@
      * @throws Exception
      */
     @Override
-    public Map<String, Object> queryHomeNum(Integer uid) throws Exception {
+    public Map<String, Object> queryHomeNum(Integer uid, Integer language) throws Exception {
         Map<String, Object> map = new HashMap<>();
         //出租车
         List<Map<String, Object>> list = orderTaxiService.queryOrderList(1, uid);
         map.put("service", list.size());//服务中
         list = orderTaxiService.queryOrderList(2, uid);
         map.put("reservation", list.size());//预约
-        List<Map<String, Object>> list1 = orderLogisticsService.queryOrderList(uid);
+        List<Map<String, Object>> list1 = orderLogisticsService.queryOrderList(uid, language);
         map.put("small", list1.size());//小件
-        int size = this.queryMyActivity(uid, new Date()).size();
+        int size = this.queryMyActivity(uid, new Date(), language).size();
         map.put("activity", size);//活动
         return map;
     }
@@ -966,7 +974,7 @@
      * @throws Exception
      */
     @Override
-    public List<BaseWarpper> queryMyBusiness(Integer uid) throws Exception {
+    public List<BaseWarpper> queryMyBusiness(Integer uid, Integer language) throws Exception {
         List<DriverService> list = driverServiceMapper.queryMyBusiness(uid);
         List<BaseWarpper> maps = new ArrayList<>();
         for (DriverService d : list){
@@ -974,19 +982,19 @@
             baseWarpper.setId(d.getType());
             switch (d.getType()){
                 case 1:
-                    baseWarpper.setName("专车");
+                    baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course ");
                     break;
                 case 2:
-                    baseWarpper.setName("出租车");
+                    baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "taxi" : "taxi");
                     break;
                 case 3:
-                    baseWarpper.setName("跨城出行");
+                    baseWarpper.setName(language == 1 ? "跨城出行" : language == 2 ? "Cross-town travel" : "Se déplacer à travers la ville");
                     break;
                 case 4:
-                    baseWarpper.setName("市内小件物流");
+                    baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
                     break;
                 case 5:
-                    baseWarpper.setName("跨城小件物流");
+                    baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville");
                     break;
             }
             maps.add(baseWarpper);
@@ -1032,17 +1040,18 @@
      * @throws Exception
      */
     @Override
-    public ResultUtil updatePhone(String phone, String code, Integer uid) throws Exception {
+    public ResultUtil updatePhone(String phoneOperator, String phone, String code, Integer uid, Integer language) throws Exception {
         Driver driver = driverMapper.queryByPhone(phone);
         if(null != driver){
-            return ResultUtil.error("电话号码已被注册");
+            return ResultUtil.error(language == 1 ? "电话号码已被注册" : language == 2 ? "he phone number is registered" : "Le numéro de téléphone a été enregistré");
         }
-        boolean b = this.checkCaptcha(phone, code);
+        boolean b = this.checkCaptcha("", phone, code);
         if(!b){
-            return ResultUtil.error("验证码无效");
+            return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
         }
         Driver driver1 = this.selectById(uid);
         driver1.setAccount(phone);
+        driver1.setPhoneOperator(phoneOperator);
         driver1.setPhone(phone);
         this.updateById(driver1);
 
@@ -1085,52 +1094,52 @@
             String path1 = templatePath + "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("user").attr("style", "display: none;");
-                document1.getElementById("settle").attr("style", "display: none;");
-                document1.getElementById("email").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("driverAudit").attr("style", "display: none;");
-                document1.getElementById("carAudit").attr("style", "display: none;");
+                document1.getElementById("english").remove();
+                document1.getElementById("french").remove();
+                document1.getElementById("invite").remove();
+                document1.getElementById("user").remove();
+                document1.getElementById("settle").remove();
+                document1.getElementById("email").remove();
+                document1.getElementById("bill").remove();
+                document1.getElementById("reward").remove();
+                document1.getElementById("rewardToday").remove();
+                document1.getElementById("driverAudit").remove();
+                document1.getElementById("carAudit").remove();
 
                 Element pass_user = document1.getElementById("pass_user");
-                pass_user.text("您好 " + driver.getName() + "，");
+                pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
             }
             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("user1").attr("style", "display: none;");
-                document1.getElementById("settle1").attr("style", "display: none;");
-                document1.getElementById("email1").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("driverAudit1").attr("style", "display: none;");
-                document1.getElementById("carAudit1").attr("style", "display: none;");
+                document1.getElementById("chinese").remove();
+                document1.getElementById("french").remove();
+                document1.getElementById("invite1").remove();
+                document1.getElementById("user1").remove();
+                document1.getElementById("settle1").remove();
+                document1.getElementById("email1").remove();
+                document1.getElementById("bill1").remove();
+                document1.getElementById("reward1").remove();
+                document1.getElementById("rewardToday1").remove();
+                document1.getElementById("driverAudit1").remove();
+                document1.getElementById("carAudit1").remove();
 
                 Element pass1_user = document1.getElementById("pass1_user");
-                pass1_user.text("Hello " + driver.getName() + "，");
+                pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
             }
             if(2 == language){
-                document1.getElementById("chinese").attr("style", "display: none;");
-                document1.getElementById("english").attr("style", "display: none;");
-                document1.getElementById("invite2").attr("style", "display: none;");
-                document1.getElementById("user2").attr("style", "display: none;");
-                document1.getElementById("settle2").attr("style", "display: none;");
-                document1.getElementById("email2").attr("style", "display: none;");
-                document1.getElementById("bill2").attr("style", "display: none;");
-                document1.getElementById("reward2").attr("style", "display: none;");
-                document1.getElementById("rewardToday2").attr("style", "display: none;");
-                document1.getElementById("driverAudit2").attr("style", "display: none;");
-                document1.getElementById("carAudit2").attr("style", "display: none;");
+                document1.getElementById("chinese").remove();
+                document1.getElementById("english").remove();
+                document1.getElementById("invite2").remove();
+                document1.getElementById("user2").remove();
+                document1.getElementById("settle2").remove();
+                document1.getElementById("email2").remove();
+                document1.getElementById("bill2").remove();
+                document1.getElementById("reward2").remove();
+                document1.getElementById("rewardToday2").remove();
+                document1.getElementById("driverAudit2").remove();
+                document1.getElementById("carAudit2").remove();
 
                 Element pass2_user = document1.getElementById("pass2_user");
-                pass2_user.text("Bonjour " + driver.getName() + "，");
+                pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
             }
             EmailUtil.send(driver.getEmail(), language == 1 ? "重置密码" : language == 2 ? "reset Password" : "réinitialiser le mot de passe",  document1.html());
         }
@@ -1145,24 +1154,24 @@
      * @throws Exception
      */
     @Override
-    public ResultUtil replaceCar(Integer carId, Integer uid) throws Exception {
+    public ResultUtil replaceCar(Integer carId, Integer uid, Integer language) throws Exception {
         Driver driver = this.selectById(uid);
         if(driver.getState() == 3){
-            return ResultUtil.error("还在服务中，不能更换");
+            return ResultUtil.error(language == 1 ? "还在服务中，不能更换" : language == 2 ? "It is still in service and cannot be replaced" : "Toujours en service, non échangeable");
         }
         Car car = carService.selectById(carId);
         if(null == car){
-            return ResultUtil.error("车辆无效");
+            return ResultUtil.error(language == 1 ? "车辆无效" : language == 2 ? "Invalid vehicle" : "Véhicule non valide");
         }
         if(car.getAuthState() == 1){
-            return ResultUtil.error("车辆正在审核中");
+            return ResultUtil.error(language == 1 ? "车辆正在审核中" : language == 2 ? "The vehicle is under review" : "Véhicule en révision");
         }
         if(car.getAuthState() == 3){
-            return ResultUtil.error("车辆已冻结");
+            return ResultUtil.error(language == 1 ? "车辆已冻结" : language == 2 ? "Vehicle frozen" : "Le véhicule a été gelé");
         }
         boolean idle = carService.idle(carId);
         if(!idle){
-            return ResultUtil.error("车辆已被绑定了");
+            return ResultUtil.error(language == 1 ? "车辆已被绑定了" : language == 2 ? "The vehicle has been bound" : "e véhicule a été lié");
         }
         driver.setCarId(carId);
         this.updateById(driver);
@@ -1277,7 +1286,7 @@
      * @throws Exception
      */
     @Override
-    public List<ActivityWarpper> queryMyActivity(Integer uid, Date time) throws Exception {
+    public List<ActivityWarpper> queryMyActivity(Integer uid, Date time, Integer language) throws Exception {
         List<ActivityWarpper> list = new ArrayList<>();
         Map<String, Date> date = dateUtil.getStartAndEndDate(time);
         List<DriverActivityHistory> driverActivityHistories = driverActivityHistoryMapper.queryList(uid, null, null, date.get("startTime"), date.get("endTime"));
@@ -1305,7 +1314,7 @@
                     }
                     switch (driverActivityOnline.getType()){
                         case 1:
-                            sb.append("专车");
+                            sb.append(language == 1 ? "打车" : language == 2 ? "Ride" : "Rouler");
                             break;
                         case 2:
                             sb.append("出租车");
@@ -1315,6 +1324,7 @@
                             sb.append("城际出行");
                             break;
                         case 4:
+                            sb.append(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
                             break;
                     }
                     String str = "累计在线" +driverActivityOnline.getOnline() + "小时奖励" +driverActivityOnline.getMoney() + "元";
@@ -1381,60 +1391,60 @@
                         String path1 = templatePath + "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("user").attr("style", "display: none;");
-                            document1.getElementById("settle").attr("style", "display: none;");
-                            document1.getElementById("pass").attr("style", "display: none;");
-                            document1.getElementById("email").attr("style", "display: none;");
-                            document1.getElementById("bill").attr("style", "display: none;");
-                            document1.getElementById("reward").attr("style", "display: none;");
-                            document1.getElementById("driverAudit").attr("style", "display: none;");
-                            document1.getElementById("carAudit").attr("style", "display: none;");
+                            document1.getElementById("english").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite").remove();
+                            document1.getElementById("user").remove();
+                            document1.getElementById("settle").remove();
+                            document1.getElementById("pass").remove();
+                            document1.getElementById("email").remove();
+                            document1.getElementById("bill").remove();
+                            document1.getElementById("reward").remove();
+                            document1.getElementById("driverAudit").remove();
+                            document1.getElementById("carAudit").remove();
 
                             Element rewardToday_user = document1.getElementById("rewardToday_user");
-                            rewardToday_user.text("您好 " + driver.getName() + "，");
+                            rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday_award = document1.getElementById("rewardToday_award");
                             rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
                             Element rewardToday_content = document1.getElementById("rewardToday_content");
                             rewardToday_content.text("邀请司机注册即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
                         }
                         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("user1").attr("style", "display: none;");
-                            document1.getElementById("settle1").attr("style", "display: none;");
-                            document1.getElementById("pass1").attr("style", "display: none;");
-                            document1.getElementById("email1").attr("style", "display: none;");
-                            document1.getElementById("bill1").attr("style", "display: none;");
-                            document1.getElementById("reward1").attr("style", "display: none;");
-                            document1.getElementById("driverAudit1").attr("style", "display: none;");
-                            document1.getElementById("carAudit1").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite1").remove();
+                            document1.getElementById("user1").remove();
+                            document1.getElementById("settle1").remove();
+                            document1.getElementById("pass1").remove();
+                            document1.getElementById("email1").remove();
+                            document1.getElementById("bill1").remove();
+                            document1.getElementById("reward1").remove();
+                            document1.getElementById("driverAudit1").remove();
+                            document1.getElementById("carAudit1").remove();
 
                             Element rewardToday1_user = document1.getElementById("rewardToday1_user");
-                            rewardToday1_user.text("Hello " + driver.getName() + "，");
+                            rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday1_award = document1.getElementById("rewardToday1_award");
                             rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
                             Element rewardToday1_content = document1.getElementById("rewardToday1_content");
                             rewardToday1_content.text("Invite drivers to register and get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
                         }
                         if (3 == language) {
-                            document1.getElementById("chinese").attr("style", "display: none;");
-                            document1.getElementById("french").attr("style", "display: none;");
-                            document1.getElementById("invite2").attr("style", "display: none;");
-                            document1.getElementById("user2").attr("style", "display: none;");
-                            document1.getElementById("settle2").attr("style", "display: none;");
-                            document1.getElementById("pass2").attr("style", "display: none;");
-                            document1.getElementById("email2").attr("style", "display: none;");
-                            document1.getElementById("bill2").attr("style", "display: none;");
-                            document1.getElementById("reward2").attr("style", "display: none;");
-                            document1.getElementById("driverAudit2").attr("style", "display: none;");
-                            document1.getElementById("carAudit2").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite2").remove();
+                            document1.getElementById("user2").remove();
+                            document1.getElementById("settle2").remove();
+                            document1.getElementById("pass2").remove();
+                            document1.getElementById("email2").remove();
+                            document1.getElementById("bill2").remove();
+                            document1.getElementById("reward2").remove();
+                            document1.getElementById("driverAudit2").remove();
+                            document1.getElementById("carAudit2").remove();
 
                             Element rewardToday2_user = document1.getElementById("rewardToday2_user");
-                            rewardToday2_user.text("Bonjour " + driver.getName() + "，");
+                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday2_award = document1.getElementById("rewardToday2_award");
                             rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
                             Element rewardToday2_content = document1.getElementById("rewardToday2_content");
@@ -1462,60 +1472,60 @@
                         String path1 = templatePath + "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("user").attr("style", "display: none;");
-                            document1.getElementById("settle").attr("style", "display: none;");
-                            document1.getElementById("pass").attr("style", "display: none;");
-                            document1.getElementById("email").attr("style", "display: none;");
-                            document1.getElementById("bill").attr("style", "display: none;");
-                            document1.getElementById("reward").attr("style", "display: none;");
-                            document1.getElementById("driverAudit").attr("style", "display: none;");
-                            document1.getElementById("carAudit").attr("style", "display: none;");
+                            document1.getElementById("english").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite").remove();
+                            document1.getElementById("user").remove();
+                            document1.getElementById("settle").remove();
+                            document1.getElementById("pass").remove();
+                            document1.getElementById("email").remove();
+                            document1.getElementById("bill").remove();
+                            document1.getElementById("reward").remove();
+                            document1.getElementById("driverAudit").remove();
+                            document1.getElementById("carAudit").remove();
 
                             Element rewardToday_user = document1.getElementById("rewardToday_user");
-                            rewardToday_user.text("您好 " + driver.getName() + "，");
+                            rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday_award = document1.getElementById("rewardToday_award");
                             rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
                             Element rewardToday_content = document1.getElementById("rewardToday_content");
                             rewardToday_content.text("邀请用户注册即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
                         }
                         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("user1").attr("style", "display: none;");
-                            document1.getElementById("settle1").attr("style", "display: none;");
-                            document1.getElementById("pass1").attr("style", "display: none;");
-                            document1.getElementById("email1").attr("style", "display: none;");
-                            document1.getElementById("bill1").attr("style", "display: none;");
-                            document1.getElementById("reward1").attr("style", "display: none;");
-                            document1.getElementById("driverAudit1").attr("style", "display: none;");
-                            document1.getElementById("carAudit1").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite1").remove();
+                            document1.getElementById("user1").remove();
+                            document1.getElementById("settle1").remove();
+                            document1.getElementById("pass1").remove();
+                            document1.getElementById("email1").remove();
+                            document1.getElementById("bill1").remove();
+                            document1.getElementById("reward1").remove();
+                            document1.getElementById("driverAudit1").remove();
+                            document1.getElementById("carAudit1").remove();
 
                             Element rewardToday1_user = document1.getElementById("rewardToday1_user");
-                            rewardToday1_user.text("Hello " + driver.getName() + "，");
+                            rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday1_award = document1.getElementById("rewardToday1_award");
                             rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
                             Element rewardToday1_content = document1.getElementById("rewardToday1_content");
                             rewardToday1_content.text("Invite users to register and get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
                         }
                         if (3 == language) {
-                            document1.getElementById("chinese").attr("style", "display: none;");
-                            document1.getElementById("english").attr("style", "display: none;");
-                            document1.getElementById("invite2").attr("style", "display: none;");
-                            document1.getElementById("user2").attr("style", "display: none;");
-                            document1.getElementById("settle2").attr("style", "display: none;");
-                            document1.getElementById("pass2").attr("style", "display: none;");
-                            document1.getElementById("email2").attr("style", "display: none;");
-                            document1.getElementById("bill2").attr("style", "display: none;");
-                            document1.getElementById("reward2").attr("style", "display: none;");
-                            document1.getElementById("driverAudit2").attr("style", "display: none;");
-                            document1.getElementById("carAudit2").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("english").remove();
+                            document1.getElementById("invite2").remove();
+                            document1.getElementById("user2").remove();
+                            document1.getElementById("settle2").remove();
+                            document1.getElementById("pass2").remove();
+                            document1.getElementById("email2").remove();
+                            document1.getElementById("bill2").remove();
+                            document1.getElementById("reward2").remove();
+                            document1.getElementById("driverAudit2").remove();
+                            document1.getElementById("carAudit2").remove();
 
                             Element rewardToday2_user = document1.getElementById("rewardToday2_user");
-                            rewardToday2_user.text("Bonjour " + driver.getName() + "，");
+                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday2_award = document1.getElementById("rewardToday2_award");
                             rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
                             Element rewardToday2_content = document1.getElementById("rewardToday2_content");
@@ -1544,60 +1554,60 @@
                         String path1 = templatePath + "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("user").attr("style", "display: none;");
-                            document1.getElementById("settle").attr("style", "display: none;");
-                            document1.getElementById("pass").attr("style", "display: none;");
-                            document1.getElementById("email").attr("style", "display: none;");
-                            document1.getElementById("bill").attr("style", "display: none;");
-                            document1.getElementById("reward").attr("style", "display: none;");
-                            document1.getElementById("driverAudit").attr("style", "display: none;");
-                            document1.getElementById("carAudit").attr("style", "display: none;");
+                            document1.getElementById("english").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite").remove();
+                            document1.getElementById("user").remove();
+                            document1.getElementById("settle").remove();
+                            document1.getElementById("pass").remove();
+                            document1.getElementById("email").remove();
+                            document1.getElementById("bill").remove();
+                            document1.getElementById("reward").remove();
+                            document1.getElementById("driverAudit").remove();
+                            document1.getElementById("carAudit").remove();
 
                             Element rewardToday_user = document1.getElementById("rewardToday_user");
-                            rewardToday_user.text("您好 " + driver.getName() + "，");
+                            rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday_award = document1.getElementById("rewardToday_award");
                             rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
                             Element rewardToday_content = document1.getElementById("rewardToday_content");
                             rewardToday_content.text("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
                         }
                         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("user1").attr("style", "display: none;");
-                            document1.getElementById("settle1").attr("style", "display: none;");
-                            document1.getElementById("pass1").attr("style", "display: none;");
-                            document1.getElementById("email1").attr("style", "display: none;");
-                            document1.getElementById("bill1").attr("style", "display: none;");
-                            document1.getElementById("reward1").attr("style", "display: none;");
-                            document1.getElementById("driverAudit1").attr("style", "display: none;");
-                            document1.getElementById("carAudit1").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite1").remove();
+                            document1.getElementById("user1").remove();
+                            document1.getElementById("settle1").remove();
+                            document1.getElementById("pass1").remove();
+                            document1.getElementById("email1").remove();
+                            document1.getElementById("bill1").remove();
+                            document1.getElementById("reward1").remove();
+                            document1.getElementById("driverAudit1").remove();
+                            document1.getElementById("carAudit1").remove();
 
                             Element rewardToday1_user = document1.getElementById("rewardToday1_user");
-                            rewardToday1_user.text("Hello " + driver.getName() + "，");
+                            rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday1_award = document1.getElementById("rewardToday1_award");
                             rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
                             Element rewardToday1_content = document1.getElementById("rewardToday1_content");
                             rewardToday1_content.text("Accumulated online " + driverActivityOnline.getOnline() + " hours today to get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
                         }
                         if (3 == language) {
-                            document1.getElementById("chinese").attr("style", "display: none;");
-                            document1.getElementById("english").attr("style", "display: none;");
-                            document1.getElementById("invite2").attr("style", "display: none;");
-                            document1.getElementById("user2").attr("style", "display: none;");
-                            document1.getElementById("settle2").attr("style", "display: none;");
-                            document1.getElementById("pass2").attr("style", "display: none;");
-                            document1.getElementById("email2").attr("style", "display: none;");
-                            document1.getElementById("bill2").attr("style", "display: none;");
-                            document1.getElementById("reward2").attr("style", "display: none;");
-                            document1.getElementById("driverAudit2").attr("style", "display: none;");
-                            document1.getElementById("carAudit2").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("english").remove();
+                            document1.getElementById("invite2").remove();
+                            document1.getElementById("user2").remove();
+                            document1.getElementById("settle2").remove();
+                            document1.getElementById("pass2").remove();
+                            document1.getElementById("email2").remove();
+                            document1.getElementById("bill2").remove();
+                            document1.getElementById("reward2").remove();
+                            document1.getElementById("driverAudit2").remove();
+                            document1.getElementById("carAudit2").remove();
 
                             Element rewardToday2_user = document1.getElementById("rewardToday2_user");
-                            rewardToday2_user.text("Bonjour " + driver.getName() + "，");
+                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday2_award = document1.getElementById("rewardToday2_award");
                             rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
                             Element rewardToday2_content = document1.getElementById("rewardToday2_content");
@@ -1626,60 +1636,60 @@
                         String path1 = templatePath + "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("user").attr("style", "display: none;");
-                            document1.getElementById("settle").attr("style", "display: none;");
-                            document1.getElementById("pass").attr("style", "display: none;");
-                            document1.getElementById("email").attr("style", "display: none;");
-                            document1.getElementById("bill").attr("style", "display: none;");
-                            document1.getElementById("reward").attr("style", "display: none;");
-                            document1.getElementById("driverAudit").attr("style", "display: none;");
-                            document1.getElementById("carAudit").attr("style", "display: none;");
+                            document1.getElementById("english").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite").remove();
+                            document1.getElementById("user").remove();
+                            document1.getElementById("settle").remove();
+                            document1.getElementById("pass").remove();
+                            document1.getElementById("email").remove();
+                            document1.getElementById("bill").remove();
+                            document1.getElementById("reward").remove();
+                            document1.getElementById("driverAudit").remove();
+                            document1.getElementById("carAudit").remove();
 
                             Element rewardToday_user = document1.getElementById("rewardToday_user");
-                            rewardToday_user.text("您好 " + driver.getName() + "，");
+                            rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday_award = document1.getElementById("rewardToday_award");
                             rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
                             Element rewardToday_content = document1.getElementById("rewardToday_content");
                             rewardToday_content.text("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
                         }
                         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("user1").attr("style", "display: none;");
-                            document1.getElementById("settle1").attr("style", "display: none;");
-                            document1.getElementById("pass1").attr("style", "display: none;");
-                            document1.getElementById("email1").attr("style", "display: none;");
-                            document1.getElementById("bill1").attr("style", "display: none;");
-                            document1.getElementById("reward1").attr("style", "display: none;");
-                            document1.getElementById("driverAudit1").attr("style", "display: none;");
-                            document1.getElementById("carAudit1").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite1").remove();
+                            document1.getElementById("user1").remove();
+                            document1.getElementById("settle1").remove();
+                            document1.getElementById("pass1").remove();
+                            document1.getElementById("email1").remove();
+                            document1.getElementById("bill1").remove();
+                            document1.getElementById("reward1").remove();
+                            document1.getElementById("driverAudit1").remove();
+                            document1.getElementById("carAudit1").remove();
 
                             Element rewardToday1_user = document1.getElementById("rewardToday1_user");
-                            rewardToday1_user.text("Hello " + driver.getName() + "，");
+                            rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday1_award = document1.getElementById("rewardToday1_award");
                             rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
                             Element rewardToday1_content = document1.getElementById("rewardToday1_content");
                             rewardToday1_content.text("Complete " + driverActivityOrder.getOrderNum() + " orders in total today to get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
                         }
                         if (3 == language) {
-                            document1.getElementById("chinese").attr("style", "display: none;");
-                            document1.getElementById("english").attr("style", "display: none;");
-                            document1.getElementById("invite2").attr("style", "display: none;");
-                            document1.getElementById("user2").attr("style", "display: none;");
-                            document1.getElementById("settle2").attr("style", "display: none;");
-                            document1.getElementById("pass2").attr("style", "display: none;");
-                            document1.getElementById("email2").attr("style", "display: none;");
-                            document1.getElementById("bill2").attr("style", "display: none;");
-                            document1.getElementById("reward2").attr("style", "display: none;");
-                            document1.getElementById("driverAudit2").attr("style", "display: none;");
-                            document1.getElementById("carAudit2").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("english").remove();
+                            document1.getElementById("invite2").remove();
+                            document1.getElementById("user2").remove();
+                            document1.getElementById("settle2").remove();
+                            document1.getElementById("pass2").remove();
+                            document1.getElementById("email2").remove();
+                            document1.getElementById("bill2").remove();
+                            document1.getElementById("reward2").remove();
+                            document1.getElementById("driverAudit2").remove();
+                            document1.getElementById("carAudit2").remove();
 
                             Element rewardToday2_user = document1.getElementById("rewardToday2_user");
-                            rewardToday2_user.text("Bonjour " + driver.getName() + "，");
+                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday2_award = document1.getElementById("rewardToday2_award");
                             rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
                             Element rewardToday2_content = document1.getElementById("rewardToday2_content");
@@ -1730,56 +1740,56 @@
                         String path1 = templatePath + "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("user").attr("style", "display: none;");
-                            document1.getElementById("settle").attr("style", "display: none;");
-                            document1.getElementById("pass").attr("style", "display: none;");
-                            document1.getElementById("email").attr("style", "display: none;");
-                            document1.getElementById("bill").attr("style", "display: none;");
-                            document1.getElementById("rewardToday").attr("style", "display: none;");
-                            document1.getElementById("driverAudit").attr("style", "display: none;");
-                            document1.getElementById("carAudit").attr("style", "display: none;");
+                            document1.getElementById("english").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite").remove();
+                            document1.getElementById("user").remove();
+                            document1.getElementById("settle").remove();
+                            document1.getElementById("pass").remove();
+                            document1.getElementById("email").remove();
+                            document1.getElementById("bill").remove();
+                            document1.getElementById("rewardToday").remove();
+                            document1.getElementById("driverAudit").remove();
+                            document1.getElementById("carAudit").remove();
 
                             Element reward_user = document1.getElementById("reward_user");
-                            reward_user.text("您好 " + driver.getName() + "，");
+                            reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element reward_content = document1.getElementById("reward_content");
                             reward_content.text("今日累计在线 " + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收");
                         }
                         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("user1").attr("style", "display: none;");
-                            document1.getElementById("settle1").attr("style", "display: none;");
-                            document1.getElementById("pass1").attr("style", "display: none;");
-                            document1.getElementById("email1").attr("style", "display: none;");
-                            document1.getElementById("bill1").attr("style", "display: none;");
-                            document1.getElementById("rewardToday1").attr("style", "display: none;");
-                            document1.getElementById("driverAudit1").attr("style", "display: none;");
-                            document1.getElementById("carAudit1").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite1").remove();
+                            document1.getElementById("user1").remove();
+                            document1.getElementById("settle1").remove();
+                            document1.getElementById("pass1").remove();
+                            document1.getElementById("email1").remove();
+                            document1.getElementById("bill1").remove();
+                            document1.getElementById("rewardToday1").remove();
+                            document1.getElementById("driverAudit1").remove();
+                            document1.getElementById("carAudit1").remove();
 
                             Element reward1_user = document1.getElementById("reward1_user");
-                            reward1_user.text("Hello " + driver.getName() + "，");
+                            reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element reward1_content = document1.getElementById("reward1_content");
                             reward1_content.text("accumulated online for " + dao.getOnline() + " hour today, get reward GHS" + dah.getMoney() + ", please check");
                         }
                         if (3 == language) {
-                            document1.getElementById("chinese").attr("style", "display: none;");
-                            document1.getElementById("english").attr("style", "display: none;");
-                            document1.getElementById("invite2").attr("style", "display: none;");
-                            document1.getElementById("user2").attr("style", "display: none;");
-                            document1.getElementById("settle2").attr("style", "display: none;");
-                            document1.getElementById("pass2").attr("style", "display: none;");
-                            document1.getElementById("email2").attr("style", "display: none;");
-                            document1.getElementById("bill2").attr("style", "display: none;");
-                            document1.getElementById("rewardToday2").attr("style", "display: none;");
-                            document1.getElementById("driverAudit2").attr("style", "display: none;");
-                            document1.getElementById("carAudit2").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("english").remove();
+                            document1.getElementById("invite2").remove();
+                            document1.getElementById("user2").remove();
+                            document1.getElementById("settle2").remove();
+                            document1.getElementById("pass2").remove();
+                            document1.getElementById("email2").remove();
+                            document1.getElementById("bill2").remove();
+                            document1.getElementById("rewardToday2").remove();
+                            document1.getElementById("driverAudit2").remove();
+                            document1.getElementById("carAudit2").remove();
 
                             Element reward2_user = document1.getElementById("reward2_user");
-                            reward2_user.text("Bonjour " + driver.getName() + "，");
+                            reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element reward2_content = document1.getElementById("reward2_content");
                             reward2_content.text("Accumulé en ligne pendant " + dao.getOnline() + " heure aujourd’hui, obtenez la récompense GHS " + dah.getMoney() + ", s’il vous plaît vérifier");
                         }
@@ -1814,56 +1824,56 @@
                     String path1 = templatePath + "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("user").attr("style", "display: none;");
-                        document1.getElementById("settle").attr("style", "display: none;");
-                        document1.getElementById("pass").attr("style", "display: none;");
-                        document1.getElementById("email").attr("style", "display: none;");
-                        document1.getElementById("bill").attr("style", "display: none;");
-                        document1.getElementById("rewardToday").attr("style", "display: none;");
-                        document1.getElementById("driverAudit").attr("style", "display: none;");
-                        document1.getElementById("carAudit").attr("style", "display: none;");
+                        document1.getElementById("english").remove();
+                        document1.getElementById("french").remove();
+                        document1.getElementById("invite").remove();
+                        document1.getElementById("user").remove();
+                        document1.getElementById("settle").remove();
+                        document1.getElementById("pass").remove();
+                        document1.getElementById("email").remove();
+                        document1.getElementById("bill").remove();
+                        document1.getElementById("rewardToday").remove();
+                        document1.getElementById("driverAudit").remove();
+                        document1.getElementById("carAudit").remove();
 
                         Element reward_user = document1.getElementById("reward_user");
-                        reward_user.text("您好 " + driver.getName() + "，");
+                        reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
                         Element reward_content = document1.getElementById("reward_content");
                         reward_content.text("今日累计接单 " + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收");
                     }
                     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("user1").attr("style", "display: none;");
-                        document1.getElementById("settle1").attr("style", "display: none;");
-                        document1.getElementById("pass1").attr("style", "display: none;");
-                        document1.getElementById("email1").attr("style", "display: none;");
-                        document1.getElementById("bill1").attr("style", "display: none;");
-                        document1.getElementById("rewardToday1").attr("style", "display: none;");
-                        document1.getElementById("driverAudit1").attr("style", "display: none;");
-                        document1.getElementById("carAudit1").attr("style", "display: none;");
+                        document1.getElementById("chinese").remove();
+                        document1.getElementById("french").remove();
+                        document1.getElementById("invite1").remove();
+                        document1.getElementById("user1").remove();
+                        document1.getElementById("settle1").remove();
+                        document1.getElementById("pass1").remove();
+                        document1.getElementById("email1").remove();
+                        document1.getElementById("bill1").remove();
+                        document1.getElementById("rewardToday1").remove();
+                        document1.getElementById("driverAudit1").remove();
+                        document1.getElementById("carAudit1").remove();
 
                         Element reward1_user = document1.getElementById("reward1_user");
-                        reward1_user.text("Hello " + driver.getName() + "，");
+                        reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                         Element reward1_content = document1.getElementById("reward1_content");
                         reward1_content.text("A total of " + dao.getOrderNum() + " orders have been received today, and the reward GHS" + dah.getMoney() + " will be awarded, please check");
                     }
                     if (3 == language) {
-                        document1.getElementById("chinese").attr("style", "display: none;");
-                        document1.getElementById("english").attr("style", "display: none;");
-                        document1.getElementById("invite2").attr("style", "display: none;");
-                        document1.getElementById("user2").attr("style", "display: none;");
-                        document1.getElementById("settle2").attr("style", "display: none;");
-                        document1.getElementById("pass2").attr("style", "display: none;");
-                        document1.getElementById("email2").attr("style", "display: none;");
-                        document1.getElementById("bill2").attr("style", "display: none;");
-                        document1.getElementById("rewardToday2").attr("style", "display: none;");
-                        document1.getElementById("driverAudit2").attr("style", "display: none;");
-                        document1.getElementById("carAudit2").attr("style", "display: none;");
+                        document1.getElementById("chinese").remove();
+                        document1.getElementById("english").remove();
+                        document1.getElementById("invite2").remove();
+                        document1.getElementById("user2").remove();
+                        document1.getElementById("settle2").remove();
+                        document1.getElementById("pass2").remove();
+                        document1.getElementById("email2").remove();
+                        document1.getElementById("bill2").remove();
+                        document1.getElementById("rewardToday2").remove();
+                        document1.getElementById("driverAudit2").remove();
+                        document1.getElementById("carAudit2").remove();
 
                         Element reward2_user = document1.getElementById("reward2_user");
-                        reward2_user.text("Bonjour " + driver.getName() + "，");
+                        reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
                         Element reward2_content = document1.getElementById("reward2_content");
                         reward2_content.text("Un total de " + dao.getOrderNum() + " commandes ont été reçues aujourd’hui, et la récompense GHS " + dah.getMoney() + " sera décernée, s’il vous plaît vérifier");
                     }
@@ -1879,16 +1889,16 @@
      * @return
      */
     @Override
-    public ResultUtil loginByJobNumber(String jobNum) {
+    public ResultUtil loginByJobNumber(String jobNum, Integer language) {
         Driver driver = driverMapper.queryByJobNum(jobNum);
         if(null == driver){
-            return ResultUtil.error("账号未注册，请先注册账号");
+            return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
         }
         if(driver.getAuthState() == 1){
-            return ResultUtil.error("账号正在审核中，请耐心等待");
+            return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
         }
         if(driver.getAuthState() == 3){
-            return ResultUtil.error("账号已被冻结，请联系管理员");
+            return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
         }
         List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
         boolean b = true;
@@ -1899,7 +1909,7 @@
             }
         }
         if(b){
-            return ResultUtil.error("没有出租车业务权限");
+            return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
         }
 
         //开始自动设置接单类型，出车类型，上班状态
@@ -1977,16 +1987,16 @@
      * @throws Exception
      */
     @Override
-    public ResultUtil loginByIdentification(String identification) throws Exception {
+    public ResultUtil loginByIdentification(String identification, Integer language) throws Exception {
         Driver driver = driverMapper.queryByIdentification(identification);
         if(null == driver){
-            return ResultUtil.error("账号未注册，请先注册账号");
+            return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
         }
         if(driver.getAuthState() == 1){
-            return ResultUtil.error("账号正在审核中，请耐心等待");
+            return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
         }
         if(driver.getAuthState() == 3){
-            return ResultUtil.error("账号已被冻结，请联系管理员");
+            return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
         }
         List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
         boolean b = true;
@@ -1997,7 +2007,7 @@
             }
         }
         if(b){
-            return ResultUtil.error("没有出租车业务权限");
+            return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
         }
 
         //开始自动设置接单类型，出车类型，上班状态
@@ -2063,16 +2073,16 @@
      * @throws Exception
      */
     @Override
-    public ResultUtil loginByTaxiAptitudeCard(String taxiAptitudeCard) throws Exception {
+    public ResultUtil loginByTaxiAptitudeCard(String taxiAptitudeCard, Integer language) throws Exception {
         Driver driver = driverMapper.queryByTaxiAptitudeCard(taxiAptitudeCard);
         if(null == driver){
-            return ResultUtil.error("账号未注册，请先注册账号");
+            return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
         }
         if(driver.getAuthState() == 1){
-            return ResultUtil.error("账号正在审核中，请耐心等待");
+            return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
         }
         if(driver.getAuthState() == 3){
-            return ResultUtil.error("账号已被冻结，请联系管理员");
+            return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
         }
         List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
         boolean b = true;
@@ -2083,7 +2093,7 @@
             }
         }
         if(b){
-            return ResultUtil.error("没有出租车业务权限");
+            return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
         }
 
         //开始自动设置接单类型，出车类型，上班状态
@@ -2169,13 +2179,13 @@
      * @throws Exception
      */
     @Override
-    public ResultUtil verificationPassword(String password, Integer driverId) throws Exception {
+    public ResultUtil verificationPassword(String password, Integer driverId, Integer language) throws Exception {
         Driver driver = this.selectById(driverId);
         if(null == driver){
-            return ResultUtil.error("账户无效，请重新登录");
+            return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
         }
         if(!driver.getPassword().equals(ShiroKit.md5(password, salt))){
-            return ResultUtil.error("密码错误");
+            return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
         }
         return ResultUtil.success();
     }
@@ -2188,10 +2198,10 @@
      * @throws Exception
      */
     @Override
-    public ResultUtil setWithdrawPassword(String withdrawPassword, Integer driverId) throws Exception {
+    public ResultUtil setWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception {
         Driver driver = this.selectById(driverId);
         if(null == driver){
-            return ResultUtil.error("账户无效，请重新登录");
+            return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
         }
         driver.setWithdrawPassword(ShiroKit.md5(withdrawPassword, salt));
         this.updateById(driver);
@@ -2207,16 +2217,16 @@
      * @throws Exception
      */
     @Override
-    public ResultUtil verificationWithdrawPassword(String withdrawPassword, Integer driverId) throws Exception {
+    public ResultUtil verificationWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception {
         Driver driver = this.selectById(driverId);
         if(null == driver){
-            return ResultUtil.error("账户无效，请重新登录");
+            return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
         }
         if(null == driver.getWithdrawPassword()){
-            return ResultUtil.error("请先设置提现密码");
+            return ResultUtil.error(language == 1 ? "请先设置提现密码" : language == 2 ? "Please set the withdrawal password first" : "Veuillez d’abord définir un mot de passe de retrait");
         }
         if(!driver.getWithdrawPassword().equals(ShiroKit.md5(withdrawPassword, salt))){
-            return ResultUtil.error("密码错误");
+            return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
         }
         return ResultUtil.success();
     }

--
Gitblit v1.7.1