DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -1800,7 +1800,7 @@ public void run() { Process process = null; try { process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName + ".mp3"); process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName + ".mp3"); } catch (IOException e) { throw new RuntimeException(e); } DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -663,11 +663,11 @@ } EmailUtil.send(userInfo.getEmail(), language == 1 ? "取件码邮件" : language == 2 ? "Pickup code" : "Code de ramassage", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); File file = new File("/home/igotechgh/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } file = new File("/usr/local/nginx/html/files/html/code_" + orderId + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/code_" + orderId + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -676,7 +676,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/code_" + orderId + ".html"; String link ="https://igo.i-go.group/files/html/code_" + orderId + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(userInfo.getId()); DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -547,13 +547,13 @@ tripStatus = "ENROUTE_TO_DROPOFF"; switch (language){ case 1: audioUrl = "http://182.160.16.251:81/files/audio/system/OnboardReminder-CN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/OnboardReminder-CN.mp3"; break; case 2: audioUrl = "http://182.160.16.251:81/files/audio/system/OnboardReminder-EN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/OnboardReminder-EN.mp3"; break; case 3: audioUrl = "http://182.160.16.251:81/files/audio/system/OnboardReminder-FR.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/OnboardReminder-FR.mp3"; break; } break; @@ -567,13 +567,13 @@ tripStatus = "COMPLETE"; switch (language){ case 1: audioUrl = "http://182.160.16.251:81/files/audio/system/ReachDestination-CN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/ReachDestination-CN.mp3"; break; case 2: audioUrl = "http://182.160.16.251:81/files/audio/system/ReachDestination-EN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/ReachDestination-EN.mp3"; break; case 3: audioUrl = "http://182.160.16.251:81/files/audio/system/ReachDestination-FR.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/ReachDestination-FR.mp3"; break; } break; DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -215,7 +215,7 @@ <select id="queryByCompanyId" resultType="Driver"> select * from t_driver where flag != 3 from t_driver where flag != 3 and authState = 2 <choose> <when test="companyId == 1"> and (companyId = 1 or companyId is null or companyId = 0) and (franchiseeId = 0 or franchiseeId is null) DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOnlineServiceImpl.java
@@ -259,7 +259,7 @@ public void run() { Process process = null; try { process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName); process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName); } catch (IOException e) { throw new RuntimeException(e); } @@ -336,7 +336,7 @@ public void run() { Process process = null; try { process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName); process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName); } catch (IOException e) { throw new RuntimeException(e); } DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -411,11 +411,11 @@ EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); File file = new File("/home/igotechgh/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } file = new File("/usr/local/nginx/html/files/html/invitation_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/invitation_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -424,7 +424,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); @@ -607,11 +607,11 @@ EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); File file = new File("/home/igotechgh/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } file = new File("/usr/local/nginx/html/files/html/invitation_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/invitation_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -620,7 +620,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); @@ -874,11 +874,11 @@ EmailUtil.send(driver.getEmail(), language == 1 ? "成功注册" : language == 2 ? "Registered successfully" : "Enregistré avec succès", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); File file = new File("/home/igotechgh/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/registration_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -887,7 +887,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/registration_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); @@ -988,11 +988,11 @@ EmailUtil.send(driver.getEmail(), language == 1 ? "密码重置" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); File file = new File("/home/igotechgh/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } file = new File("/usr/local/nginx/html/files/html/reset_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/reset_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -1001,7 +1001,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/reset_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/reset_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); @@ -1228,13 +1228,13 @@ }).start(); switch (language){ case 1: audioUrl = "http://182.160.16.251:81/files/audio/system/AfterWork-CN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/AfterWork-CN.mp3"; break; case 2: audioUrl = "http://182.160.16.251:81/files/audio/system/AfterWork-EN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/AfterWork-EN.mp3"; break; case 3: audioUrl = "http://182.160.16.251:81/files/audio/system/AfterWork-FR.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/AfterWork-FR.mp3"; break; } }else{ @@ -1299,13 +1299,13 @@ switch (language){ case 1: audioUrl = "http://182.160.16.251:81/files/audio/system/AtWork-CN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/AtWork-CN.mp3"; break; case 2: audioUrl = "http://182.160.16.251:81/files/audio/system/AtWork-EN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/AtWork-EN.mp3"; break; case 3: audioUrl = "http://182.160.16.251:81/files/audio/system/AtWork-FR.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/AtWork-FR.mp3"; break; } } @@ -1587,11 +1587,11 @@ EmailUtil.send(driver.getEmail(), language == 1 ? "密码重置" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); File file = new File("/home/igotechgh/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } file = new File("/usr/local/nginx/html/files/html/reset_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/reset_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -1600,7 +1600,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/reset_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/reset_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); @@ -1986,7 +1986,7 @@ Element rewardToday_award = document1.getElementById("rewardToday_award"); rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney()); Element rewardToday_content = document1.getElementById("rewardToday_content"); rewardToday_content.text("邀请司机注册即可获得奖励。\n注意此活动是有时间限制的，详情请查看I-GO平台。"); rewardToday_content.text("邀请司机注册即可获得奖励。<br/>注意此活动是有时间限制的，详情请查看I-GO平台。"); } if (2 == language) { document1.getElementById("chinese").remove(); @@ -2007,7 +2007,7 @@ Element rewardToday1_award = document1.getElementById("rewardToday1_award"); rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS"); Element rewardToday1_content = document1.getElementById("rewardToday1_content"); rewardToday1_content.text("Get a bonus on I-GO today.\nInvite drivers to register to get the bonus.\nNote that this is a limited-time offer. Check your app for more details."); rewardToday1_content.text("Invite drivers to register to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details."); } if (3 == language) { document1.getElementById("chinese").remove(); @@ -2028,16 +2028,16 @@ Element rewardToday2_award = document1.getElementById("rewardToday2_award"); rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney()); Element rewardToday2_content = document1.getElementById("rewardToday2_content"); rewardToday2_content.text("Obtenez un bonus sur I-GO dès aujourd’hui.\nInvitez les chauffeurs à s’inscrire pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails."); rewardToday2_content.text("Invitez les chauffeurs à s’inscrire pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails."); } EmailUtil.send(driver.getEmail(), language == 1 ? "邀请司机奖励（活动）" : language == 2 ? "Invite drivers and earn" : "Invitez des chauffeurs et gagnez de l’argent", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); File file = new File("/home/igotechgh/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/activity_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -2046,7 +2046,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/activity_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); @@ -2109,7 +2109,7 @@ Element rewardToday_award = document1.getElementById("rewardToday_award"); rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney()); Element rewardToday_content = document1.getElementById("rewardToday_content"); rewardToday_content.text("邀请用户注册即可获得奖励。\n 注意此活动是有时间限制的，详情请查看I-GO平台。"); rewardToday_content.text("邀请用户注册即可获得奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。"); } if (2 == language) { document1.getElementById("chinese").remove(); @@ -2130,7 +2130,7 @@ Element rewardToday1_award = document1.getElementById("rewardToday1_award"); rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS"); Element rewardToday1_content = document1.getElementById("rewardToday1_content"); rewardToday1_content.text("Get a bonus on I-GO today.\nInvite users to register to get the bonus.\nNote that this is a limited-time offer. Check your app for more details."); rewardToday1_content.text("Invite users to register to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details."); } if (3 == language) { document1.getElementById("chinese").remove(); @@ -2151,16 +2151,16 @@ Element rewardToday2_award = document1.getElementById("rewardToday2_award"); rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney()); Element rewardToday2_content = document1.getElementById("rewardToday2_content"); rewardToday2_content.text("Obtenez un bonus sur I-GO dès aujourd’hui.\nInvitez les utilisateurs à s’inscrire pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails."); rewardToday2_content.text("Invitez les utilisateurs à s’inscrire pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails."); } EmailUtil.send(driver.getEmail(), language == 1 ? "邀请用户奖励(活动)" : language == 2 ? "Invite users and earn" : "Invitez des utilisateurs et gagnez de l’argent", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); File file = new File("/home/igotechgh/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/activity_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -2169,7 +2169,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/activity_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); @@ -2233,7 +2233,7 @@ 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() + "小时即可活动奖励。\n 注意此活动是有时间限制的，详情请查看I-GO平台。"); rewardToday_content.text("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。"); } if (2 == language) { document1.getElementById("chinese").remove(); @@ -2254,7 +2254,7 @@ Element rewardToday1_award = document1.getElementById("rewardToday1_award"); rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS"); Element rewardToday1_content = document1.getElementById("rewardToday1_content"); rewardToday1_content.text("Get a bonus for driving on I-GO today.\nStay online for " + driverActivityOnline.getOnline() + " hours to get the bonus.\nNote that this is a limited-time offer. Check your app for more details."); rewardToday1_content.text("Stay online for " + driverActivityOnline.getOnline() + " hours to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details."); } if (3 == language) { document1.getElementById("chinese").remove(); @@ -2275,16 +2275,16 @@ Element rewardToday2_award = document1.getElementById("rewardToday2_award"); rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney()); Element rewardToday2_content = document1.getElementById("rewardToday2_content"); rewardToday2_content.text("Obtenez un bonus pour conduire sur I-GO dès aujourd’hui.\nRestez en ligne pendant " + driverActivityOnline.getOnline() + " heures pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails."); rewardToday2_content.text("Restez en ligne pendant " + driverActivityOnline.getOnline() + " heures pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails."); } EmailUtil.send(driver.getEmail(), language == 1 ? "在线时长奖励（活动）" : language == 2 ? "Online-duration reward activity" : "Activité de récompense en ligne", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); File file = new File("/home/igotechgh/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/activity_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -2293,7 +2293,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/activity_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); @@ -2357,7 +2357,7 @@ 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() + "单即可活动奖励。\n 注意此活动是有时间限制的，详情请查看I-GO平台。"); rewardToday_content.text("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。"); } if (2 == language) { document1.getElementById("chinese").remove(); @@ -2378,7 +2378,7 @@ Element rewardToday1_award = document1.getElementById("rewardToday1_award"); rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS"); Element rewardToday1_content = document1.getElementById("rewardToday1_content"); rewardToday1_content.text("Get a bonus for driving on I-GO today.\nStay online and complete " + driverActivityOrder.getOrderNum() + " trips to get the bonus.\nNote that this is a limited-time offer. Check your app for more details."); rewardToday1_content.text("Stay online and complete " + driverActivityOrder.getOrderNum() + " trips to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details."); } if (3 == language) { document1.getElementById("chinese").remove(); @@ -2399,16 +2399,16 @@ Element rewardToday2_award = document1.getElementById("rewardToday2_award"); rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney()); Element rewardToday2_content = document1.getElementById("rewardToday2_content"); rewardToday2_content.text("Obtenez un bonus pour conduire sur I-GO dès aujourd’hui.\nRestez en ligne et effectuez " + driverActivityOrder.getOrderNum() + " trajets pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails."); rewardToday2_content.text("Restez en ligne et effectuez " + driverActivityOrder.getOrderNum() + " trajets pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails."); } EmailUtil.send(driver.getEmail(), language == 1 ? "累计接单奖励（活动）" : language == 2 ? "Cumulative order activity" : "Activité cumulée des commandes", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); File file = new File("/home/igotechgh/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/activity_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -2417,7 +2417,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/activity_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); @@ -2502,7 +2502,7 @@ Element reward_user = document1.getElementById("reward_user"); reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，"); Element reward_content = document1.getElementById("reward_content"); reward_content.text("今日累计在线" + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收。\n详情请查看I-GO平台。"); reward_content.text("今日累计在线" + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收。<br/>详情请查看I-GO平台。"); } if (2 == language) { document1.getElementById("chinese").remove(); @@ -2521,7 +2521,7 @@ Element reward1_user = document1.getElementById("reward1_user"); reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，"); Element reward1_content = document1.getElementById("reward1_content"); reward1_content.text("You stayed online for " + dao.getOnline() + " hours today, and got a bonus of GHS" + dah.getMoney() + ", please check.\nCheck your app for more details."); reward1_content.text("You stayed online for " + dao.getOnline() + " hours today, and got a bonus of GHS" + dah.getMoney() + ", please check.<br/>Check your app for more details."); } if (3 == language) { document1.getElementById("chinese").remove(); @@ -2540,16 +2540,16 @@ Element reward2_user = document1.getElementById("reward2_user"); reward2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，"); Element reward2_content = document1.getElementById("reward2_content"); reward2_content.text("Vous êtes resté en ligne pendant " + dao.getOnline() + " heures aujourd’hui et avez obtenu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.\nConsultez votre application pour plus de détails."); reward2_content.text("Vous êtes resté en ligne pendant " + dao.getOnline() + " heures aujourd’hui et avez obtenu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.<br/>Consultez votre application pour plus de détails."); } EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); File file = new File("/home/igotechgh/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } file = new File("/usr/local/nginx/html/files/html/rewards_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/rewards_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -2558,7 +2558,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/rewards_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/rewards_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); @@ -2621,7 +2621,7 @@ Element reward_user = document1.getElementById("reward_user"); reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，"); Element reward_content = document1.getElementById("reward_content"); reward_content.text("今日累计接单" + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收。\n详情请查看I-GO平台。"); reward_content.text("今日累计接单" + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收。<br/>详情请查看I-GO平台。"); } if (2 == language) { document1.getElementById("chinese").remove(); @@ -2640,7 +2640,7 @@ Element reward1_user = document1.getElementById("reward1_user"); reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，"); Element reward1_content = document1.getElementById("reward1_content"); reward1_content.text("You completed " + dao.getOrderNum() + " trips today, and got a bonus of GHS" + dah.getMoney() + ", please check.\nCheck your app for more details."); reward1_content.text("You completed " + dao.getOrderNum() + " trips today, and got a bonus of GHS" + dah.getMoney() + ", please check.<br/>Check your app for more details."); } if (3 == language) { document1.getElementById("chinese").remove(); @@ -2659,17 +2659,17 @@ Element reward2_user = document1.getElementById("reward2_user"); reward2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，"); Element reward2_content = document1.getElementById("reward2_content"); reward2_content.text("Vous avez effectué " + dao.getOrderNum() + " trajets aujourd’hui et avez reçu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.\nConsultez votre application pour plus de détails."); reward2_content.text("Vous avez effectué " + dao.getOrderNum() + " trajets aujourd’hui et avez reçu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.<br/>Consultez votre application pour plus de détails."); } EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); File file = new File("/home/igotechgh/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } file = new File("/usr/local/nginx/html/files/html/rewards_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/rewards_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -2678,7 +2678,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/rewards_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/rewards_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -1164,8 +1164,8 @@ checkoutRequest.setRequestDescription("Travel completion payment"); checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi"); checkoutRequest.setPendingRedirectUrl(""); checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html"); checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html"); checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html"); checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html"); ResultUtil resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest); if(resultUtil.getCode()==200){ paymentRecordService.saveData(1, uid, 2, orderId, orderType, 1, money, null, 1);//添加预支付数据 @@ -1190,8 +1190,8 @@ checkoutRequest.setRequestDescription("Travel completion payment"); checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi"); checkoutRequest.setPendingRedirectUrl(""); checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html"); checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html"); checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html"); checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html"); ResultUtil resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest); if(resultUtil.getCode()==200){ DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -245,7 +245,7 @@ public void run() { Process process = null; try { process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName); process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName); } catch (IOException e) { throw new RuntimeException(e); } @@ -496,7 +496,7 @@ public void run() { Process process = null; try { process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName); process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName); } catch (IOException e) { throw new RuntimeException(e); } DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java
@@ -165,8 +165,8 @@ checkoutRequest.setRequestDescription("Settlement cost"); checkoutRequest.setCallbackUrl(callbackPath + "/base/settlementRecord/paymentSettlementAmountCallback"); checkoutRequest.setPendingRedirectUrl(""); checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html"); checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html"); checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html"); checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html"); resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest); if(resultUtil.getCode()!=200){ @@ -189,8 +189,8 @@ checkoutRequest.setRequestDescription("Settlement cost"); checkoutRequest.setCallbackUrl(callbackPath + "/base/settlementRecord/paymentSettlementAmountCallback"); checkoutRequest.setPendingRedirectUrl(""); checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html"); checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html"); checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html"); checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html"); resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest); if(resultUtil.getCode()!=200){ DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java
@@ -34,27 +34,35 @@ static Logger logger = LoggerFactory.getLogger(FleetEngineUtil.class); private final String SERVICE_ACCOUNT = "odrd-fleetengine-ondemandadmin@i-go-odrd-testing.iam.gserviceaccount.com"; private final String DRIVER_ACCOUNT = "odrd-fleetengine-driversdkuser@i-go-odrd-testing.iam.gserviceaccount.com"; private final String CONSUMER_ACCOUNT = "odrd-fleetengine-consumersdkus@i-go-odrd-testing.iam.gserviceaccount.com"; private final String serverPrivateKeyId = "254e18eefa9fdcca64d5899cdcd793d466c47c7d"; private final String serverPrivateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCfbNAWnukqLKIxItqmSABxsH5glySEHJ2gfL5KsRF0M02e0Z8/KNKZkoh7I6bOMt1fEtttFaWOeq70IdI2WAd5wVazL3upvl5FW4P08ly33LklfGyLljlJ7ChPny9x6OjAaiS0yD9fh7NWti7rZKU7gzcGL8HddNYXgXV5OajvoG3TGdu52WTxce9AUzU6gLPboz/RbGqrdrmgVJVb0EPlhTJf/NSsaiW4NoL8SEzf/pJGYBmqJs97mXwCHTY4avaC+CP/zz9yS8AQEJlApbVT6lSOhYoR0hNOBj5B886EZOssjubO6hQaiwRnGrV2RdpHynqA1iekfGpUGEtWTsqjAgMBAAECggEALyPbMd0iP8y71sCiG4nty7Au5ju62e+mMkbAc9CAwzXKTVxZdLEK+MsJ3TNxBsami47FYC+G6SbgpaJ8iIImD7v5+XjgXZRDRsnlLmAdx2YWPv3YELxGS1PvpX+B5XJDpGWeXfBaQNKc1lZ/cC4t53eIpSUo82UxSvkGNea1S8lR6vIByhNyCQOvLG4yqaxUy0hZi0kge37XrjYMGS+BivBBnDiVlBPLBVbrNBxOf31Lzz+XX0iwXX7Zl2jN759oe0xQyuIGWUSj8xBDIF8nNaJrla7rWVml3sZJh6/3r1Acj0mhZtE0ZMu5hiPGiIXgb1ng30j3dMP4yVPhXrpAtQKBgQDaU01VnHsnHxc0DQHE2vEOPGmPxVS0/JAssePAEUmKEueUogGef91YY+Vm/ItbhLwGjbytnXxe88zRAdB1u07efZ83ey93TrGl2CJUzLHIcgb+Q1tT642rqlfl+q8ep86hcZ+63pDiIPt2Z+HkbKIR0SWf5LIH4flquQOTQufXXQKBgQC674qDsjOJepZjMMN6PkVMcWBYDNmXHnqa5Oto0rZM745UulbXqEFGuBOsXPU7O33Kfz1vbtoluubKZi5B6cFNnPypE2SCfvdObHq4FuTuKPV6lN93SyhZchmSEXEs0PU4cGDRt+RRqQcjft1Wigiy4Y1y1SInCtcaP1hLejEJ/wKBgFAhvwKrGnBzctrB42JTUaJ9/eis7rg28tvUttjp/2nUIndlNt7r41vr3mj8TFHc1/43y4aVhO584THdTpvHkd0LkoKUjglmMsHCIGercZ02bOap5j1Y+XiGXxij995yjN6oi43U3qyAmosM+dYTITEU6JBVKhrGj/rhyTQlnF5pAoGBAKFGmo0mR/pbDbYD0xH6+VSLGCC+7VbIT+SkjUjBSdA0eOo2XUfvfGmj1C1HgbcZi1wRzJH/5CrbBdQmtc/d+QyZ3Q2NkpBXM8uwIWwDLH0gTzDzkZvc9rG8k70GWUrd+EI6Cf3FFjExj9wazqCjs/+IQr2Ijc97NbsKXYW4pOhHAoGAKf5wYk+cn0cVTsyAom0UbGD5Uijqh5732MeqFYs2Rcwx0OErJZo68COSFFF40hJmmIKn7p3qycIyd1FcYlXN1l4s8mEWTGTInRE0OlBU0+jLtIV9pwNgffpbPYcrWZU6s6YVeJ2nDwl+aD+4QvN0rkPTfho9kjgeyF3PW0I2u4E="; private final String driverPrivateKeyId = "859e85fb3aa4d18b4afaac3e24e8f65700da5cc9"; private final String driverPrivateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCmzL1BqSH+Zh9Fct5mXqe5sYOMTnJtOJhwKXnjjo2tNPXv4alzUHz8Vbj6nMar5u5IuKRZMeRBlhoRSFrLm+J1+sfvpH8N4wsnG7hDANknqWzdsk9a68qMHxNQF3hFzs9+KKrR1LAG8e9ytMfliN0kX+xls4uPZDPu1Q39K6V9KXrH/GrMA56i3TtWi7Hmakt5YTELeGjhx4nGrfuQLFFovs1Z9uJtf7E8R95+65StrOAmbJNf7VciEqwBpWYlU5VeyLXMg/oHwnTv2cjdcFozyDrlUHbDmtTiVeBBsYFVLyAsDGfl1p6eiVTiBBuo56YSYLWfaLgYvTyEcZ9jBQsfAgMBAAECggEAQzbTuObX3PT3+vtb5XKVMf33XY2rDJo2y1PbWzhxnO9vf3e22dIAW4qLnOmaIWFQeht1lr/FFCzRWk+Gzu+FJTemY8osrMLmFp9T9CQeXZ4nUXruAVxs5WQMW0Tp4W+CK3tlwmJrgJDzhYyV1Mf/HQ5Oa3kbbu/ZAY/3MCLrb/ClJQvD2rZSDdzAkNMQm8P2hsE71+rH7mI2hHrSCHl2OIp2A64QT8HjtyRc5yHZtTp6ZST1ge9SSIsT0ZfmXKtKF7yGEIPtKNU+oLrGyK5P30xBWJ/bwb3PEz2MZcPvz31+B2+UvZMm7OTkqfcRwEztAf8Ckiuo4im2BRYbVmd9OQKBgQDd0MeLxR+Qtv12bVA0bHtagFEq36THgWG7IM1/1vS4Cl9sveKSOS8A6oKLy624fGE7PKcuTTIzkVA81GXtWBQ9Coq/4TmllQkFTH7pz9C2PNHSCychPwNNV8qUx3lE3d4DOjGKgoVFD4l90AO7lOvmLTSc3pDpr+jSjUH4lqGrbQKBgQDAgXBmpXfCTxwqkBzGwxX+hwJen9qSkCM47qnQ1L4NnXPL6s0EN6rQ3FnFemGIzBUGJ2tajntkKlUu5DzsQeoBGu/SaSwgqD+1UQDcUyo+retmqZ+QYbpeyd3l53bLJJuJNsfak0X76Ft6hrm4julx6RGlmboQyx4kZWbhx4YNOwKBgEG9/2aNpi1eDwFqpLrk7CqGnYf3gP8gebbcoguhyiZB7MZuARkVmbjLyKVmWLa1JpxH/cTbXGWsS/u7d/pAgL8WwMjeGBfbdDD92x+xWEqq/AUlCRPxeSkTPBech3TBzWtndAd5Z8ZwNG/1lyWhnck63L0huhGI8Zh2BXeILaKBAoGAKK3xq69BvGztPc1QV2w4RJ4RER/kl14gI1LDzd52/veL1cabZk3BKfu2eLWg0MCXnMJNvEgpqQQNFiii+yX+phckIKma6pfDRrSEYwqr/azQ9tPXZTJRqOAtpPyhrNHikD9kQjsm6dGzKxQ3QNnqWOjwkrcGi6/wga5v7Dw2hqsCgYEA2T/kSNQ9dqpVBAkfi2J50hqnfFESPjKeirJJZllqhVqsiV0ly8a8Fz8SjGqTzrq+UErko+QmtSlo5h3Uq9Ln+0CwYfrUL+74q2zLHdS0DpY3QsGTEDJXTxCyy9kO26X2UsM3Ez3YUAkdMwdpVz0uVZtinv2735QZOBxoVQV2kQ8="; private final String consumerPrivateKeyId = "40acf82cbd5250de2f5123caff40738bdd403b08"; private final String consumerPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDSwtbSBFgIXna6mWeKFWCK31NXUJH6uGduR1XrODGRedrqrTgr0BdNg8PDo6/zh/T+K0Svor6kgqpwnl9soOdn73oC4Nu+Ad7EiKa38j650jlZdLAr4hR0Ou9Kcnv45x/94auUO8jBz844cu24swLKiPsK9OnX65wVlKRfhhkGFuS/4OI76CmE7NqZDqPOW16o8tBO5TsgPVNkglFAU73fTp0kcHoLauT9QOB0+yZi39mnNXyU+2cL3Ylp5oaQCJpyssDRUqz/EiHa7FxUUgzCadG00+ePf5iYSnZKQRKWoOIawFvcCfcHx8GAl8Nn+79HtVQHB9hLsQ5+jqcdfKPfAgMBAAECggEAE9Ufz912xzrUY1TCKH1Ae3Dub732Lqihmv/9dsfv6ieUURcBvSW0u6eViVhi20DE7hH2QazH0cU18qkEg71UaTRgv9qW8vdMFiRhw9d4zZWZrfBMD6UTlahiEhhZ0B83pHVS5v0FNC+w0SEHe6Tks1hWfz5yrs3N/z3ghdihjC/5i1jeBoHXs1262SMazuwNGHblLApGPG+86taeFtbDI+31TKvZ8nomZHkEVFnARRUoBBcIwowRMqNfwlpcJhlz6kDWnoD08kHJ2zzJokozu7Lim+Ugt/MWwUOcA0hgq2QdymZFpkRkDl7tZmJtwTfTirjbGlpnPHVXEc1bWM7ocQKBgQD0LJ8e7JXf6bVFngq0jSJNKK7XDHYg0KhHXMApF59xxi29hdHXWPzgRJ45KkoUJc7MITpIJLXfCmi1XyDMf9m8lIf/oaqhJ7idYi7iAAPOJkdnHbSt0lebyjBWzCQ6OgS4NfF1+LEibTzRqiFs5K8EAyPYAVSTrpWoguoWtTzIGQKBgQDc9/I2PS+91Eb5RvuidTNsDqZJliTJQFlBjlDViFo3+l1N7jDFYwPBR/Tv4TVM5p9Zb+/Lo9X1pjDbm8QriTR4V+4HaLXkcCnmOsdSRInFUW4UIafwLX5ifjgfyaWgdKdn2UP1Lu/1qBN6GU1xjSfBQ6N3UqQiKkNPb7tuPJGqtwKBgQCQ4hU8vTclGMC14VQK1B/BVt1/vuYtDIJ9bZycBWdXlDc52LitpiDOVgjodJ5mHBT77M9vVVERWlTNIfgNP+OL0TptRZlAbJhP0p1s/oNDhFUj6211InVXfH54UkNAxYJdZ6yxynIYsma/JcsVmQ/8Ony/Q/LSempVBfEurjW1qQKBgQCQWPjFLdtOKqnildg0HFPnNvqx/38waPTluk5b76LgBpGFIyCBEVmWnacIPRpQjidyiYkggnp26oXoMC1KM2svYmGAPYr1G8CDQcqLl3JYkAVU6VeHsnBpbwLC4TttQkdJs8iNFohy9cUjcfwBPbDGs6TJghbuqqUl81uBe9e8qQKBgQDZm8T2KB34J7HAc5A+vqkmAo7mQLZg51OrzB1KnDU86pSAf0o3eSvfDUT6dpU9fRuZ1XYnbPnpoJwjFH3m4u9gqKF3PtVYfZyJrEqYwmhB9z6vd+dcsUlXM0fi37bGZkKBD0JGGt5OljM1qJG15x/LYfC/nwOmqWoOhNPCst2Z7w=="; private final String provider = "i-go-odrd-testing"; // private final String SERVICE_ACCOUNT = "odrd-fleetengine-ondemandadmin@i-go-odrd-testing.iam.gserviceaccount.com"; // // private final String DRIVER_ACCOUNT = "odrd-fleetengine-driversdkuser@i-go-odrd-testing.iam.gserviceaccount.com"; // // private final String CONSUMER_ACCOUNT = "odrd-fleetengine-consumersdkus@i-go-odrd-testing.iam.gserviceaccount.com"; // // private final String serverPrivateKeyId = "254e18eefa9fdcca64d5899cdcd793d466c47c7d"; // // private final String serverPrivateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCfbNAWnukqLKIxItqmSABxsH5glySEHJ2gfL5KsRF0M02e0Z8/KNKZkoh7I6bOMt1fEtttFaWOeq70IdI2WAd5wVazL3upvl5FW4P08ly33LklfGyLljlJ7ChPny9x6OjAaiS0yD9fh7NWti7rZKU7gzcGL8HddNYXgXV5OajvoG3TGdu52WTxce9AUzU6gLPboz/RbGqrdrmgVJVb0EPlhTJf/NSsaiW4NoL8SEzf/pJGYBmqJs97mXwCHTY4avaC+CP/zz9yS8AQEJlApbVT6lSOhYoR0hNOBj5B886EZOssjubO6hQaiwRnGrV2RdpHynqA1iekfGpUGEtWTsqjAgMBAAECggEALyPbMd0iP8y71sCiG4nty7Au5ju62e+mMkbAc9CAwzXKTVxZdLEK+MsJ3TNxBsami47FYC+G6SbgpaJ8iIImD7v5+XjgXZRDRsnlLmAdx2YWPv3YELxGS1PvpX+B5XJDpGWeXfBaQNKc1lZ/cC4t53eIpSUo82UxSvkGNea1S8lR6vIByhNyCQOvLG4yqaxUy0hZi0kge37XrjYMGS+BivBBnDiVlBPLBVbrNBxOf31Lzz+XX0iwXX7Zl2jN759oe0xQyuIGWUSj8xBDIF8nNaJrla7rWVml3sZJh6/3r1Acj0mhZtE0ZMu5hiPGiIXgb1ng30j3dMP4yVPhXrpAtQKBgQDaU01VnHsnHxc0DQHE2vEOPGmPxVS0/JAssePAEUmKEueUogGef91YY+Vm/ItbhLwGjbytnXxe88zRAdB1u07efZ83ey93TrGl2CJUzLHIcgb+Q1tT642rqlfl+q8ep86hcZ+63pDiIPt2Z+HkbKIR0SWf5LIH4flquQOTQufXXQKBgQC674qDsjOJepZjMMN6PkVMcWBYDNmXHnqa5Oto0rZM745UulbXqEFGuBOsXPU7O33Kfz1vbtoluubKZi5B6cFNnPypE2SCfvdObHq4FuTuKPV6lN93SyhZchmSEXEs0PU4cGDRt+RRqQcjft1Wigiy4Y1y1SInCtcaP1hLejEJ/wKBgFAhvwKrGnBzctrB42JTUaJ9/eis7rg28tvUttjp/2nUIndlNt7r41vr3mj8TFHc1/43y4aVhO584THdTpvHkd0LkoKUjglmMsHCIGercZ02bOap5j1Y+XiGXxij995yjN6oi43U3qyAmosM+dYTITEU6JBVKhrGj/rhyTQlnF5pAoGBAKFGmo0mR/pbDbYD0xH6+VSLGCC+7VbIT+SkjUjBSdA0eOo2XUfvfGmj1C1HgbcZi1wRzJH/5CrbBdQmtc/d+QyZ3Q2NkpBXM8uwIWwDLH0gTzDzkZvc9rG8k70GWUrd+EI6Cf3FFjExj9wazqCjs/+IQr2Ijc97NbsKXYW4pOhHAoGAKf5wYk+cn0cVTsyAom0UbGD5Uijqh5732MeqFYs2Rcwx0OErJZo68COSFFF40hJmmIKn7p3qycIyd1FcYlXN1l4s8mEWTGTInRE0OlBU0+jLtIV9pwNgffpbPYcrWZU6s6YVeJ2nDwl+aD+4QvN0rkPTfho9kjgeyF3PW0I2u4E="; // // private final String driverPrivateKeyId = "859e85fb3aa4d18b4afaac3e24e8f65700da5cc9"; // // private final String driverPrivateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCmzL1BqSH+Zh9Fct5mXqe5sYOMTnJtOJhwKXnjjo2tNPXv4alzUHz8Vbj6nMar5u5IuKRZMeRBlhoRSFrLm+J1+sfvpH8N4wsnG7hDANknqWzdsk9a68qMHxNQF3hFzs9+KKrR1LAG8e9ytMfliN0kX+xls4uPZDPu1Q39K6V9KXrH/GrMA56i3TtWi7Hmakt5YTELeGjhx4nGrfuQLFFovs1Z9uJtf7E8R95+65StrOAmbJNf7VciEqwBpWYlU5VeyLXMg/oHwnTv2cjdcFozyDrlUHbDmtTiVeBBsYFVLyAsDGfl1p6eiVTiBBuo56YSYLWfaLgYvTyEcZ9jBQsfAgMBAAECggEAQzbTuObX3PT3+vtb5XKVMf33XY2rDJo2y1PbWzhxnO9vf3e22dIAW4qLnOmaIWFQeht1lr/FFCzRWk+Gzu+FJTemY8osrMLmFp9T9CQeXZ4nUXruAVxs5WQMW0Tp4W+CK3tlwmJrgJDzhYyV1Mf/HQ5Oa3kbbu/ZAY/3MCLrb/ClJQvD2rZSDdzAkNMQm8P2hsE71+rH7mI2hHrSCHl2OIp2A64QT8HjtyRc5yHZtTp6ZST1ge9SSIsT0ZfmXKtKF7yGEIPtKNU+oLrGyK5P30xBWJ/bwb3PEz2MZcPvz31+B2+UvZMm7OTkqfcRwEztAf8Ckiuo4im2BRYbVmd9OQKBgQDd0MeLxR+Qtv12bVA0bHtagFEq36THgWG7IM1/1vS4Cl9sveKSOS8A6oKLy624fGE7PKcuTTIzkVA81GXtWBQ9Coq/4TmllQkFTH7pz9C2PNHSCychPwNNV8qUx3lE3d4DOjGKgoVFD4l90AO7lOvmLTSc3pDpr+jSjUH4lqGrbQKBgQDAgXBmpXfCTxwqkBzGwxX+hwJen9qSkCM47qnQ1L4NnXPL6s0EN6rQ3FnFemGIzBUGJ2tajntkKlUu5DzsQeoBGu/SaSwgqD+1UQDcUyo+retmqZ+QYbpeyd3l53bLJJuJNsfak0X76Ft6hrm4julx6RGlmboQyx4kZWbhx4YNOwKBgEG9/2aNpi1eDwFqpLrk7CqGnYf3gP8gebbcoguhyiZB7MZuARkVmbjLyKVmWLa1JpxH/cTbXGWsS/u7d/pAgL8WwMjeGBfbdDD92x+xWEqq/AUlCRPxeSkTPBech3TBzWtndAd5Z8ZwNG/1lyWhnck63L0huhGI8Zh2BXeILaKBAoGAKK3xq69BvGztPc1QV2w4RJ4RER/kl14gI1LDzd52/veL1cabZk3BKfu2eLWg0MCXnMJNvEgpqQQNFiii+yX+phckIKma6pfDRrSEYwqr/azQ9tPXZTJRqOAtpPyhrNHikD9kQjsm6dGzKxQ3QNnqWOjwkrcGi6/wga5v7Dw2hqsCgYEA2T/kSNQ9dqpVBAkfi2J50hqnfFESPjKeirJJZllqhVqsiV0ly8a8Fz8SjGqTzrq+UErko+QmtSlo5h3Uq9Ln+0CwYfrUL+74q2zLHdS0DpY3QsGTEDJXTxCyy9kO26X2UsM3Ez3YUAkdMwdpVz0uVZtinv2735QZOBxoVQV2kQ8="; // // private final String consumerPrivateKeyId = "40acf82cbd5250de2f5123caff40738bdd403b08"; // // private final String consumerPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDSwtbSBFgIXna6mWeKFWCK31NXUJH6uGduR1XrODGRedrqrTgr0BdNg8PDo6/zh/T+K0Svor6kgqpwnl9soOdn73oC4Nu+Ad7EiKa38j650jlZdLAr4hR0Ou9Kcnv45x/94auUO8jBz844cu24swLKiPsK9OnX65wVlKRfhhkGFuS/4OI76CmE7NqZDqPOW16o8tBO5TsgPVNkglFAU73fTp0kcHoLauT9QOB0+yZi39mnNXyU+2cL3Ylp5oaQCJpyssDRUqz/EiHa7FxUUgzCadG00+ePf5iYSnZKQRKWoOIawFvcCfcHx8GAl8Nn+79HtVQHB9hLsQ5+jqcdfKPfAgMBAAECggEAE9Ufz912xzrUY1TCKH1Ae3Dub732Lqihmv/9dsfv6ieUURcBvSW0u6eViVhi20DE7hH2QazH0cU18qkEg71UaTRgv9qW8vdMFiRhw9d4zZWZrfBMD6UTlahiEhhZ0B83pHVS5v0FNC+w0SEHe6Tks1hWfz5yrs3N/z3ghdihjC/5i1jeBoHXs1262SMazuwNGHblLApGPG+86taeFtbDI+31TKvZ8nomZHkEVFnARRUoBBcIwowRMqNfwlpcJhlz6kDWnoD08kHJ2zzJokozu7Lim+Ugt/MWwUOcA0hgq2QdymZFpkRkDl7tZmJtwTfTirjbGlpnPHVXEc1bWM7ocQKBgQD0LJ8e7JXf6bVFngq0jSJNKK7XDHYg0KhHXMApF59xxi29hdHXWPzgRJ45KkoUJc7MITpIJLXfCmi1XyDMf9m8lIf/oaqhJ7idYi7iAAPOJkdnHbSt0lebyjBWzCQ6OgS4NfF1+LEibTzRqiFs5K8EAyPYAVSTrpWoguoWtTzIGQKBgQDc9/I2PS+91Eb5RvuidTNsDqZJliTJQFlBjlDViFo3+l1N7jDFYwPBR/Tv4TVM5p9Zb+/Lo9X1pjDbm8QriTR4V+4HaLXkcCnmOsdSRInFUW4UIafwLX5ifjgfyaWgdKdn2UP1Lu/1qBN6GU1xjSfBQ6N3UqQiKkNPb7tuPJGqtwKBgQCQ4hU8vTclGMC14VQK1B/BVt1/vuYtDIJ9bZycBWdXlDc52LitpiDOVgjodJ5mHBT77M9vVVERWlTNIfgNP+OL0TptRZlAbJhP0p1s/oNDhFUj6211InVXfH54UkNAxYJdZ6yxynIYsma/JcsVmQ/8Ony/Q/LSempVBfEurjW1qQKBgQCQWPjFLdtOKqnildg0HFPnNvqx/38waPTluk5b76LgBpGFIyCBEVmWnacIPRpQjidyiYkggnp26oXoMC1KM2svYmGAPYr1G8CDQcqLl3JYkAVU6VeHsnBpbwLC4TttQkdJs8iNFohy9cUjcfwBPbDGs6TJghbuqqUl81uBe9e8qQKBgQDZm8T2KB34J7HAc5A+vqkmAo7mQLZg51OrzB1KnDU86pSAf0o3eSvfDUT6dpU9fRuZ1XYnbPnpoJwjFH3m4u9gqKF3PtVYfZyJrEqYwmhB9z6vd+dcsUlXM0fi37bGZkKBD0JGGt5OljM1qJG15x/LYfC/nwOmqWoOhNPCst2Z7w=="; // // private final String provider = "i-go-odrd-testing"; private final static String key = "AIzaSyCG6PsfkaCEc94VK2vIAZk1YYKvOS_Ewts"; private final String SERVICE_ACCOUNT = "odrd-fleetengine-ondemandadmin@i-go-gcp.iam.gserviceaccount.com"; private final String DRIVER_ACCOUNT = "odrd-fleetengine-driversdkuser@i-go-gcp.iam.gserviceaccount.com"; private final String CONSUMER_ACCOUNT = "odrd-fleetengine-consumersdkus@i-go-gcp.iam.gserviceaccount.com"; private final String provider = "i-go-gcp"; @Autowired private RedisUtil redisUtil; @@ -72,22 +80,22 @@ public Map<String, Object> fleetEngineAuth(int type, String id){ try { //谷歌云服务器使用这部分代码 // AuthTokenMinter minter = AuthTokenMinter.builder() // //服务端签名 // .setServerSigner(ImpersonatedSigner.create(SERVICE_ACCOUNT)) // //司机端签名 // .setDriverSigner(ImpersonatedSigner.create(DRIVER_ACCOUNT)) // //乘客端签名 // .setConsumerSigner(ImpersonatedSigner.create(CONSUMER_ACCOUNT)) // .build(); AuthTokenMinter minter = AuthTokenMinter.builder() //服务端签名 .setServerSigner(LocalSigner.create(SERVICE_ACCOUNT, serverPrivateKeyId, serverPrivateKey)) .setServerSigner(ImpersonatedSigner.create(SERVICE_ACCOUNT)) //司机端签名 .setDriverSigner(LocalSigner.create(DRIVER_ACCOUNT, driverPrivateKeyId, driverPrivateKey)) .setDriverSigner(ImpersonatedSigner.create(DRIVER_ACCOUNT)) //乘客端签名 .setConsumerSigner(LocalSigner.create(CONSUMER_ACCOUNT, consumerPrivateKeyId, consumerPrivateKey)) .setConsumerSigner(ImpersonatedSigner.create(CONSUMER_ACCOUNT)) .build(); // AuthTokenMinter minter = AuthTokenMinter.builder() // //服务端签名 // .setServerSigner(LocalSigner.create(SERVICE_ACCOUNT, serverPrivateKeyId, serverPrivateKey)) // //司机端签名 // .setDriverSigner(LocalSigner.create(DRIVER_ACCOUNT, driverPrivateKeyId, driverPrivateKey)) // //乘客端签名 // .setConsumerSigner(LocalSigner.create(CONSUMER_ACCOUNT, consumerPrivateKeyId, consumerPrivateKey)) // .build(); String jwt = ""; Long expirationTimestamp = 0L; @@ -112,6 +120,8 @@ return map; } catch (SigningTokenException e) { throw new RuntimeException(e); } catch (SignerInitializationException e) { throw new RuntimeException(e); } }
@@ -291,7 +291,7 @@ params.put("msisdn", toPhone); params.put("message", msg); params.put("sender_id", "I-GO"); params.put("callback_url", "http://182.160.16.251:80/driver/base/sendCellulantMessageCallback"); params.put("callback_url", "https://igo.i-go.group/driver/base/sendCellulantMessageCallback"); post.body(params.toJSONString()); System.err.println("短信请求：\n请求地址：" + url + "\n请求参数：" + params.toJSONString()); HttpResponse execute = post.execute(); DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TextToSpeechUtil.java
@@ -48,9 +48,9 @@ ByteString audioContents = response.getAudioContent(); // Write the response to the output file. try (OutputStream out = new FileOutputStream("/usr/local/nginx/html/files/audio/" + fileName)) { try (OutputStream out = new FileOutputStream("/home/igotechgh/nginx/html/files/audio/" + fileName)) { out.write(audioContents.toByteArray()); return "http://182.160.16.251:81/files/audio/" + fileName; return "https://igo.i-go.group/files/audio/" + fileName; }catch (Exception e){ e.printStackTrace(); } DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/quartz/jobs/OrderTimeOutJob.java
@@ -212,7 +212,7 @@ public void run() { Process process = null; try { process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName); process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName); } catch (IOException e) { throw new RuntimeException(e); } DriverIGOTravel/guns-admin/src/main/resources/application-dev.yml
@@ -101,7 +101,7 @@ #支付回调地址 callbackPath: http://182.160.16.251/driver callbackPath: https://igo.i-go.group/driver --- @@ -119,9 +119,9 @@ socketFactoryClass: javax.net.ssl.SSLSocketFactory # 配饰 SSL 加密工厂 debug: true from: i-gotech@i-go.group # 发送方邮件，配在yml中可方便更改 template-path: /usr/local/nginx/html/mailbox/ template-path: /home/igotechgh/nginx/html/mailbox/ --- share: url: http://182.160.16.251:81/share/share/pages/changeStyle/changeStyle.html url: https://igo.i-go.group/share/share/pages/changeStyle/changeStyle.html DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml
@@ -2,7 +2,7 @@ port: 8007 guns: swagger-open: true #是否开启swagger (true/false) swagger-open: false #是否开启swagger (true/false) kaptcha-open: false #是否开启登录时验证码 (true/false) # file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录) spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false) @@ -41,8 +41,8 @@ spring: datasource: url: jdbc:mysql://127.0.0.1:3306/igotravel2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0 username: root url: jdbc:mysql://172.16.0.4:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0 username: i-go password: HjKbXilb9zajmXbl db-name: guns #用来搜集数据库的所有表 filters: wall,mergeStat @@ -96,12 +96,12 @@ --- filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径 filePath: /home/igotechgh/orderPostionFile/ #存储订单轨迹文件路径 #支付回调地址 callbackPath: http://182.160.16.251/driver callbackPath: https://igo.i-go.group/driver --- @@ -119,9 +119,9 @@ socketFactoryClass: javax.net.ssl.SSLSocketFactory # 配饰 SSL 加密工厂 debug: true from: i-gotech@i-go.group # 发送方邮件，配在yml中可方便更改 template-path: /usr/local/nginx/html/mailbox/ template-path: /home/igotechgh/nginx/html/mailbox/ --- share: url: http://182.160.16.251:81/share/share/pages/changeStyle/changeStyle.html url: https://igo.i-go.group/share/share/pages/changeStyle/changeStyle.html DriverIGOTravel/guns-admin/src/main/resources/logback-spring.xml
@@ -7,7 +7,7 @@ <contextName>logback</contextName> <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 --> <property name="log.path" value="/usr/local/server/logs/driver"/> <property name="log.path" value="/home/igotechgh/app/log/driver"/> <!--0. 日志格式和颜色渲染 --> <!-- 彩色日志依赖的渲染类 --> DriverIGOTravel/guns-admin/src/main/resources/quartz.properties
@@ -33,7 +33,7 @@ # 数据源配置 org.quartz.jobStore.dataSource=myDS org.quartz.dataSource.myDS.driver=com.mysql.cj.jdbc.Driver org.quartz.dataSource.myDS.URL=jdbc:mysql://127.0.0.1:3306/igotravel2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0 org.quartz.dataSource.myDS.user=root org.quartz.dataSource.myDS.URL=jdbc:mysql://172.16.0.4:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0 org.quartz.dataSource.myDS.user=i-go org.quartz.dataSource.myDS.password=HjKbXilb9zajmXbl org.quartz.dataSource.myDS.maxConnections=10
