UserIGOTravel/guns-admin/pom.xml
@@ -23,6 +23,14 @@ <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>com.google.cloud</groupId> <artifactId>libraries-bom</artifactId> <version>26.45.0</version> <type>pom</type> <scope>import</scope> </dependency> </dependencies> </dependencyManagement> <dependencies> @@ -285,8 +293,11 @@ <groupId>com.google.cloud</groupId> <artifactId>google-cloud-texttospeech</artifactId> </dependency> <dependency> <groupId>com.google.cloud</groupId> <artifactId>google-cloud-storage</artifactId> </dependency> </dependencies> <build> <!--打包jar包方式--> UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dao/OrderCharteredCarMapper.java
@@ -21,7 +21,7 @@ * @param size * @return */ List<Map<String, Object>> queryMyOrderList(@Param("uid") Integer uid, @Param("pageNum") Integer pageNum, @Param("size") Integer size); List<Map<String, Object>> queryMyOrderList(@Param("language") Integer language, @Param("uid") Integer uid, @Param("pageNum") Integer pageNum, @Param("size") Integer size); } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dao/mapping/OrderCharteredCarMapper.xml
@@ -51,7 +51,7 @@ DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as orderTime, DATE_FORMAT(traveltime, '%Y-%m-%d') as time, carTime as carTime, (select name from t_server_carmodel where state = 1 and type = 3 and id = a.serverCarModelId) as serverCarModel, (select if(#{language} = 1, chineseName, if(#{language} = 2, englishName, frenchName)) as name from t_server_carmodel where state = 1 and type = 3 and id = a.serverCarModelId) as serverCarModel, (6) as orderType, state as state from t_order_chartered_car as a where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size} UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
@@ -95,7 +95,7 @@ @Override public List<Map<String, Object>> queryMyOrderList(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception { pageNum = (pageNum - 1) * size; List<Map<String, Object>> maps = orderCharteredCarMapper.queryMyOrderList(uid, pageNum, size); List<Map<String, Object>> maps = orderCharteredCarMapper.queryMyOrderList(language, uid, pageNum, size); for (Map<String, Object> map : maps) { if(null != map.get("orderTime")){ String orderTime = map.get("orderTime").toString(); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
@@ -297,12 +297,12 @@ EmailUtil.send(email, language == 1 ? "邮箱验证" : language == 2 ? "Verification code" : "Code de validation", 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(); } String randomString = ToolUtil.getRandomString(10); file = new File("/usr/local/nginx/html/files/html/mainbox_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/mainbox_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -311,7 +311,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/mainbox_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/mainbox_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); @@ -1183,9 +1183,9 @@ @RequestMapping("/base/user/image") public String image(@RequestPart("file") MultipartFile file) { try { String pictureName = OBSUploadUtil.inputStreamUpload(file); String pictureName = GoogleCloudStorageUtil.upload(file); return pictureName; } catch (IOException e1) { } catch (Exception e1) { return null; } } @@ -1332,10 +1332,10 @@ ServletOutputStream outputStream = null; try { if(orderType == 1){ fileInputStream = new FileInputStream(new File("/usr/local/nginx/html/files/pdf/ride_receipt_" + orderId + ".pdf")); fileInputStream = new FileInputStream(new File("/home/igotechgh/nginx/html/files/pdf/ride_receipt_" + orderId + ".pdf")); } if(orderType == 4){ fileInputStream = new FileInputStream(new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf")); fileInputStream = new FileInputStream(new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf")); } BufferedInputStream bf = new BufferedInputStream(fileInputStream); outputStream = response.getOutputStream(); @@ -1400,7 +1400,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); } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/controller/OrderLogisticsController.java
@@ -426,7 +426,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); } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -598,7 +598,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); } @@ -819,7 +819,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); } @@ -936,7 +936,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); } @@ -1133,8 +1133,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 = TinggPayUtil.checkoutRequest(checkoutRequest); if(resultUtil.getCode()==200){ paymentRecordService.saveData(1, null, null, orderId, 4, 1, @@ -1160,8 +1160,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 = TinggPayUtil.checkoutRequest(checkoutRequest); if(resultUtil.getCode()==200){ @@ -1365,11 +1365,11 @@ dispute_chinese.remove(); } Element pdf_chinese = document.getElementById("pdf_chinese"); pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); Element lost_item_chinese = document.getElementById("lost_item_chinese"); lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); // Element track_chinese = document.getElementById("track_chinese"); // track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html"); // track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html"); Element pay_time_chinese = document.getElementById("pay_time_chinese"); pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime()))); Elements driver_chinese = document.getElementsByClass("driver_chinese"); @@ -1473,11 +1473,11 @@ dispute_english.remove(); } Element pdf_english = document.getElementById("pdf_english"); pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); Element lost_item_english = document.getElementById("lost_item_english"); lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); // Element track_english = document.getElementById("track_english"); // track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html"); // track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html"); Element pay_time_english = document.getElementById("pay_time_english"); pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime()))); Elements driver_english = document.getElementsByClass("driver_english"); @@ -1581,11 +1581,11 @@ dispute_french.remove(); } Element pdf_french = document.getElementById("pdf_french"); pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); Element lost_item_french = document.getElementById("lost_item_french"); lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); // Element track_french = document.getElementById("track_french"); // track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html"); // track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html"); Element pay_time_french = document.getElementById("pay_time_french"); pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime()))); Elements driver_french = document.getElementsByClass("driver_french"); @@ -1609,11 +1609,11 @@ EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison", 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/parcel_receipt_" + orderId + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -1622,23 +1622,23 @@ fileWriter.flush(); fileWriter.close(); File file1 = new File("/usr/local/nginx/html/files/pdf/"); File file1 = new File("/home/igotechgh/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf"); file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } try{ FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream); HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream); }catch (Exception e){ e.printStackTrace(); System.out.println("html转pdf异常"); } String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html"; String link ="https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(userInfo.getId()); @@ -1901,11 +1901,11 @@ dispute_chinese.remove(); } Element pdf_chinese = document.getElementById("pdf_chinese"); pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); Element lost_item_chinese = document.getElementById("lost_item_chinese"); lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); // Element track_chinese = document.getElementById("track_chinese"); // track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html"); // track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html"); Element pay_time_chinese = document.getElementById("pay_time_chinese"); pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime()))); Elements driver_chinese = document.getElementsByClass("driver_chinese"); @@ -2009,11 +2009,11 @@ dispute_english.remove(); } Element pdf_english = document.getElementById("pdf_english"); pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); Element lost_item_english = document.getElementById("lost_item_english"); lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); // Element track_english = document.getElementById("track_english"); // track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html"); // track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html"); Element pay_time_english = document.getElementById("pay_time_english"); pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime()))); Elements driver_english = document.getElementsByClass("driver_english"); @@ -2117,11 +2117,11 @@ dispute_french.remove(); } Element pdf_french = document.getElementById("pdf_french"); pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); Element lost_item_french = document.getElementById("lost_item_french"); lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); // Element track_french = document.getElementById("track_french"); // track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html"); // track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html"); Element pay_time_french = document.getElementById("pay_time_french"); pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime()))); Elements driver_french = document.getElementsByClass("driver_french"); @@ -2145,11 +2145,11 @@ EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison", 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/parcel_receipt_" + orderId + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -2158,23 +2158,23 @@ fileWriter.flush(); fileWriter.close(); File file1 = new File("/usr/local/nginx/html/files/pdf/"); File file1 = new File("/home/igotechgh/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf"); file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } try{ FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream); HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream); }catch (Exception e){ e.printStackTrace(); System.out.println("html转pdf异常"); } String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html"; String link ="https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(userInfo.getId()); @@ -2232,8 +2232,8 @@ checkoutRequest.setRequestDescription("Travel completion payment"); checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderLogisticsSpread"); 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"); return TinggPayUtil.checkoutRequest(checkoutRequest); } if(payType == 2){//银行卡支付 @@ -2251,8 +2251,8 @@ checkoutRequest.setRequestDescription("Travel completion payment"); checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderLogisticsSpread"); 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"); return TinggPayUtil.checkoutRequest(checkoutRequest); } @@ -2536,11 +2536,11 @@ dispute_chinese.remove(); } Element pdf_chinese = document.getElementById("pdf_chinese"); pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4"); pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4"); Element lost_item_chinese = document.getElementById("lost_item_chinese"); lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4"); lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4"); // Element track_chinese = document.getElementById("track_chinese"); // track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html"); // track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html"); Element pay_time_chinese = document.getElementById("pay_time_chinese"); pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime()))); Elements driver_chinese = document.getElementsByClass("driver_chinese"); @@ -2644,11 +2644,11 @@ dispute_english.remove(); } Element pdf_english = document.getElementById("pdf_english"); pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4"); pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4"); Element lost_item_english = document.getElementById("lost_item_english"); lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4"); lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4"); // Element track_english = document.getElementById("track_english"); // track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html"); // track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html"); Element pay_time_english = document.getElementById("pay_time_english"); pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime()))); Elements driver_english = document.getElementsByClass("driver_english"); @@ -2752,11 +2752,11 @@ dispute_french.remove(); } Element pdf_french = document.getElementById("pdf_french"); pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4"); pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4"); Element lost_item_french = document.getElementById("lost_item_french"); lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4"); lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4"); // Element track_french = document.getElementById("track_french"); // track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html"); // track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html"); Element pay_time_french = document.getElementById("pay_time_french"); pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime()))); Elements driver_french = document.getElementsByClass("driver_french"); @@ -2780,11 +2780,11 @@ EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison", 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/parcel_receipt_" + id + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + id + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -2793,23 +2793,23 @@ fileWriter.flush(); fileWriter.close(); File file1 = new File("/usr/local/nginx/html/files/pdf/"); File file1 = new File("/home/igotechgh/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + id + ".pdf"); file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + id + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } try{ FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + id + ".html", "I-GO", fileOutputStream); HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + id + ".html", "I-GO", fileOutputStream); }catch (Exception e){ e.printStackTrace(); System.out.println("html转pdf异常"); } String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + id + ".html"; String link ="https://igo.i-go.group/files/html/parcel_receipt_" + id + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(userInfo.getId()); @@ -2946,7 +2946,7 @@ Integer orderId = Integer.valueOf(String.valueOf(map.get("orderId"))); Integer state = Integer.valueOf(String.valueOf(map.get("state"))); if(state == 6){ map.put("receipt", "http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html"); map.put("receipt", "https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html"); }else{ map.put("receipt", ""); } @@ -3093,13 +3093,13 @@ String audioUrl = ""; switch (language1){ case 1: audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-CN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-CN.mp3"; break; case 2: audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-EN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-EN.mp3"; break; case 3: audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-FR.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-FR.mp3"; break; } pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), 4, orderLogistics.getState(), 0, ""); @@ -3237,7 +3237,7 @@ map.put("device", ToolUtil.isNotEmpty(driverId) ? 2 : 1); map.put("orderType", orderLogistics.getType()); if(state == 8 || state == 9){ map.put("receipt", "http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html"); map.put("receipt", "https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html"); }else{ map.put("receipt", ""); } @@ -3408,8 +3408,8 @@ checkoutRequest.setRequestDescription("Cancel a trip"); checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi"); 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){ paymentRecordService.saveData(1, null, null, id, 4, 1, amount, null, 1);//添加预支付数据 @@ -3433,8 +3433,8 @@ checkoutRequest.setRequestDescription("Cancel a trip"); checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi"); 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){ paymentRecordService.saveData(1, null, null, id, 4, 2, amount, null, 1);//添加预支付数据 @@ -3612,13 +3612,13 @@ String audioUrl = ""; switch (language1){ case 1: audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-CN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-CN.mp3"; break; case 2: audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-EN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-EN.mp3"; break; case 3: audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-FR.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-FR.mp3"; break; } pushUtil.pushModifyAddress(2, orderLogistics.getDriverId(), orderId, 4, 1, audioUrl); @@ -3738,11 +3738,11 @@ EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Lucky-promo activities" : "Activités bonus", 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/redpacket_" + orderId + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/redpacket_" + orderId + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -3751,7 +3751,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/redpacket_" + orderId + ".html"; String link ="https://igo.i-go.group/files/html/redpacket_" + orderId + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(userInfo.getId()); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -428,7 +428,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); } @@ -545,7 +545,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); } @@ -808,23 +808,23 @@ switch (language1){ case 1: if(orderPrivateCar.getState() == 6){ audioUrl = "http://182.160.16.251:81/files/audio/system/MidwayCancellation-CN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/MidwayCancellation-CN.mp3"; }else{ audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-CN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-CN.mp3"; } break; case 2: if(orderPrivateCar.getState() == 6){ audioUrl = "http://182.160.16.251:81/files/audio/system/MidwayCancellation-EN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/MidwayCancellation-EN.mp3"; }else{ audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-EN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-EN.mp3"; } break; case 3: if(orderPrivateCar.getState() == 6){ audioUrl = "http://182.160.16.251:81/files/audio/system/MidwayCancellation-FR.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/MidwayCancellation-FR.mp3"; }else{ audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-FR.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-FR.mp3"; } break; } @@ -899,8 +899,8 @@ checkoutRequest.setRequestDescription("Cancel a trip"); checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi"); 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){ paymentRecordService.saveData(1, null, null, id, 1, 1, amount, null, 1);//添加预支付数据 @@ -924,8 +924,8 @@ checkoutRequest.setRequestDescription("Cancel a trip"); checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi"); 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){ paymentRecordService.saveData(1, null, null, id, 1, 2, amount, null, 1);//添加预支付数据 @@ -1074,7 +1074,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); } @@ -1332,8 +1332,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 = TinggPayUtil.checkoutRequest(checkoutRequest); if(resultUtil.getCode()==200){ @@ -1359,8 +1359,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 = TinggPayUtil.checkoutRequest(checkoutRequest); if(resultUtil.getCode()==200){ @@ -1514,11 +1514,11 @@ dispute_chinese.remove(); } Element pdf_chinese = document.getElementById("pdf_chinese"); pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1"); pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1"); Element lost_item_chinese = document.getElementById("lost_item_chinese"); lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1"); lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1"); Element track_chinese = document.getElementById("track_chinese"); track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId); track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId); Element pay_time_chinese = document.getElementById("pay_time_chinese"); pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime()))); Elements driver_chinese = document.getElementsByClass("driver_chinese"); @@ -1621,11 +1621,11 @@ dispute_english.remove(); } Element pdf_english = document.getElementById("pdf_english"); pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1"); pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1"); Element lost_item_english = document.getElementById("lost_item_english"); lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1"); lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1"); Element track_english = document.getElementById("track_english"); track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId); track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId); Element pay_time_english = document.getElementById("pay_time_english"); pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime()))); Elements driver_english = document.getElementsByClass("driver_english"); @@ -1728,11 +1728,11 @@ dispute_french.remove(); } Element pdf_french = document.getElementById("pdf_french"); pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1"); pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1"); Element lost_item_french = document.getElementById("lost_item_french"); lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1"); lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1"); Element track_french = document.getElementById("track_french"); track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId); track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId); Element pay_time_french = document.getElementById("pay_time_french"); pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime()))); Elements driver_french = document.getElementsByClass("driver_french"); @@ -1761,11 +1761,11 @@ EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course", 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/ride_receipt_" + orderId + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/ride_receipt_" + orderId + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -1774,23 +1774,23 @@ fileWriter.flush(); fileWriter.close(); File file1 = new File("/usr/local/nginx/html/files/pdf/"); File file1 = new File("/home/igotechgh/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/ride_receipt_" + orderId + ".pdf"); file1 = new File("/home/igotechgh/nginx/html/files/pdf/ride_receipt_" + orderId + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } try { FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_receipt_" + orderId + ".html", "I-GO", fileOutputStream); HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/ride_receipt_" + orderId + ".html", "I-GO", fileOutputStream); }catch (Exception e){ e.printStackTrace(); System.out.println("html转pdf异常"); } String link ="http://182.160.16.251:81/files/html/ride_receipt_" + orderId + ".html"; String link ="https://igo.i-go.group/files/html/ride_receipt_" + orderId + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); @@ -2050,11 +2050,11 @@ dispute_chinese.remove(); } Element pdf_chinese = document.getElementById("pdf_chinese"); pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1"); pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1"); Element lost_item_chinese = document.getElementById("lost_item_chinese"); lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1"); lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1"); Element track_chinese = document.getElementById("track_chinese"); track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId); track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId); Element pay_time_chinese = document.getElementById("pay_time_chinese"); pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime()))); Elements driver_chinese = document.getElementsByClass("driver_chinese"); @@ -2157,11 +2157,11 @@ dispute_english.remove(); } Element pdf_english = document.getElementById("pdf_english"); pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1"); pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1"); Element lost_item_english = document.getElementById("lost_item_english"); lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1"); lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1"); Element track_english = document.getElementById("track_english"); track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId); track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId); Element pay_time_english = document.getElementById("pay_time_english"); pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime()))); Elements driver_english = document.getElementsByClass("driver_english"); @@ -2264,11 +2264,11 @@ dispute_french.remove(); } Element pdf_french = document.getElementById("pdf_french"); pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1"); pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1"); Element lost_item_french = document.getElementById("lost_item_french"); lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1"); lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1"); Element track_french = document.getElementById("track_french"); track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId); track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId); Element pay_time_french = document.getElementById("pay_time_french"); pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime()))); Elements driver_french = document.getElementsByClass("driver_french"); @@ -2298,11 +2298,11 @@ EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course", 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/ride_receipt_" + orderId + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/ride_receipt_" + orderId + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -2311,22 +2311,22 @@ fileWriter.flush(); fileWriter.close(); File file1 = new File("/usr/local/nginx/html/files/pdf/"); File file1 = new File("/home/igotechgh/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/ride_receipt_" + orderId + ".pdf"); file1 = new File("/home/igotechgh/nginx/html/files/pdf/ride_receipt_" + orderId + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } try { FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_receipt_" + orderId + ".html", "I-GO", fileOutputStream); HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/ride_receipt_" + orderId + ".html", "I-GO", fileOutputStream); }catch (Exception e){ e.printStackTrace(); System.out.println("html转pdf异常"); } String link ="http://182.160.16.251:81/files/html/ride_receipt_" + orderId + ".html"; String link ="https://igo.i-go.group/files/html/ride_receipt_" + orderId + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); @@ -2481,11 +2481,11 @@ EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Lucky-promo activities" : "Activités bonus", 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/redpacket_" + orderId + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/redpacket_" + orderId + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -2494,7 +2494,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/redpacket_" + orderId + ".html"; String link ="https://igo.i-go.group/files/html/redpacket_" + orderId + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(userInfo.getId()); @@ -2744,11 +2744,11 @@ dispute_chinese.remove(); } Element pdf_chinese = document.getElementById("pdf_chinese"); pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1"); pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1"); Element lost_item_chinese = document.getElementById("lost_item_chinese"); lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1"); lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1"); Element track_chinese = document.getElementById("track_chinese"); track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + id); track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id); Element pay_time_chinese = document.getElementById("pay_time_chinese"); pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime()))); Elements driver_chinese = document.getElementsByClass("driver_chinese"); @@ -2851,11 +2851,11 @@ dispute_english.remove(); } Element pdf_english = document.getElementById("pdf_english"); pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1"); pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1"); Element lost_item_english = document.getElementById("lost_item_english"); lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1"); lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1"); Element track_english = document.getElementById("track_english"); track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + id); track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id); Element pay_time_english = document.getElementById("pay_time_english"); pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime()))); Elements driver_english = document.getElementsByClass("driver_english"); @@ -2958,11 +2958,11 @@ dispute_french.remove(); } Element pdf_french = document.getElementById("pdf_french"); pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1"); pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1"); Element lost_item_french = document.getElementById("lost_item_french"); lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1"); lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1"); Element track_french = document.getElementById("track_french"); track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + id); track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id); Element pay_time_french = document.getElementById("pay_time_french"); pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime()))); Elements driver_french = document.getElementsByClass("driver_french"); @@ -2992,11 +2992,11 @@ EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course", 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/ride_receipt_" + id + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/ride_receipt_" + id + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -3005,24 +3005,24 @@ fileWriter.flush(); fileWriter.close(); File file1 = new File("/usr/local/nginx/html/files/pdf/"); File file1 = new File("/home/igotechgh/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/ride_receipt_" + id + ".pdf"); file1 = new File("/home/igotechgh/nginx/html/files/pdf/ride_receipt_" + id + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } try { FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_receipt_" + id + ".html", "I-GO", fileOutputStream); HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/ride_receipt_" + id + ".html", "I-GO", fileOutputStream); }catch (Exception e){ e.printStackTrace(); System.out.println("html转pdf异常"); } String link ="http://182.160.16.251:81/files/html/ride_receipt_" + id + ".html"; String link ="https://igo.i-go.group/files/html/ride_receipt_" + id + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course"); @@ -3089,7 +3089,7 @@ map.put("state", map.get("oldState")); } if(state == 8 || state == 9){ map.put("receipt", "http://182.160.16.251:81/files/html/ride_receipt_" + orderId + ".html"); map.put("receipt", "https://igo.i-go.group/files/html/ride_receipt_" + orderId + ".html"); }else{ map.put("receipt", ""); } @@ -3184,7 +3184,7 @@ map.put("device", ToolUtil.isNotEmpty(driverId) ? 2 : 1); map.put("orderType", 1); if(state == 8 || state == 9){ map.put("receipt", "http://182.160.16.251:81/files/html/ride_receipt_" + orderId + ".html"); map.put("receipt", "https://igo.i-go.group/files/html/ride_receipt_" + orderId + ".html"); }else{ map.put("receipt", ""); } @@ -3407,13 +3407,13 @@ String audioUrl = ""; switch (language1){ case 1: audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-CN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-CN.mp3"; break; case 2: audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-EN.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-EN.mp3"; break; case 3: audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-FR.mp3"; audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-FR.mp3"; break; } pushUtil.pushModifyAddress(2, orderPrivateCar.getDriverId(), orderId, 1, 1, audioUrl); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -157,9 +157,8 @@ CONCAT(F.`name`, d.`name`, '.', c.carColor) as carName, (select sum(fraction) / count(id) from t_order_evaluate where driverId = a.id) as score, ( (select count(id) from t_order_private_car where state in (7, 8, 9) and driverId = a.id) + (select count(id) from t_order_taxi where state in (7, 8, 9) and driverId = a.id) + (select count(id) from t_order_cross_city where state in (6, 8, 9) and driverId = a.id) (select count(id) from t_order_private_car where driverId = a.id and state in (6, 7, 8, 9)) + (select count(id) from t_order_logistics where driverId = a.id and state in (6, 7, 8, 9)) ) as num, DATE_FORMAT(b.startServiceTime, '%m月%d日 %H:%i') as `time`, b.startAddress as `start`, @@ -205,9 +204,8 @@ (select count(id) from t_order_cross_city where state not in (6, 7, 8, 9, 10, 12) and driverId = a.id) ) = 0, 2, 3)) as state, ( (select count(id) from t_order_private_car where state in (7, 8, 9) and driverId = a.id) + (select count(id) from t_order_taxi where state in (7, 8, 9) and driverId = a.id) + (select count(id) from t_order_cross_city where state in (6, 8, 9) and driverId = a.id) (select count(id) from t_order_private_car where driverId = a.id and state in (6, 7, 8, 9)) + (select count(id) from t_order_logistics where driverId = a.id and state in (6, 7, 8, 9)) ) as orderNum, ((select sum(fraction) from t_order_evaluate where driverId = a.id) / (select count(id) from t_order_evaluate where driverId = a.id)) as fraction from t_driver a UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ComplaintServiceImpl.java
@@ -105,12 +105,12 @@ } EmailUtil.send(userInfo.getEmail(), language == 1 ? "投诉司机" : language == 2 ? "Complain against driver" : "Porter plainte contre le chauffeur", 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(); } String randomString = ToolUtil.getRandomString(10); file = new File("/usr/local/nginx/html/files/html/complain_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/complain_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -119,7 +119,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/complain_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/complain_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java
@@ -108,12 +108,12 @@ EmailUtil.send(userInfo.getEmail(), language == 1 ? "反馈意见" : language == 2 ? "Feedback" : "Avis", 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(); } String randomString = ToolUtil.getRandomString(10); file = new File("/usr/local/nginx/html/files/html/feedback_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/feedback_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -122,7 +122,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/feedback_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/feedback_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReportLossServiceImpl.java
@@ -125,12 +125,12 @@ EmailUtil.send(userInfo.getEmail(), language == 1 ? "物品报失" : language == 2 ? "Report items lost" : "Signaler l'objet perdu", 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(); } String randomString = ToolUtil.getRandomString(10); file = new File("/usr/local/nginx/html/files/html/reportLoss_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/reportLoss_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -139,7 +139,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/reportLoss_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/reportLoss_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(userInfo.getId()); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -268,12 +268,12 @@ } EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès", 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(); } String randomString = ToolUtil.getRandomString(10); 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(); } @@ -282,7 +282,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(uid); @@ -370,12 +370,12 @@ } EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.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(); } String randomString = ToolUtil.getRandomString(10); 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(); } @@ -384,7 +384,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()); @@ -498,12 +498,12 @@ } EmailUtil.send(userInfo1.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte", document1.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(); } String randomString = ToolUtil.getRandomString(10); file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -512,7 +512,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); @@ -618,12 +618,12 @@ } EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès", 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(); } String randomString = ToolUtil.getRandomString(10); 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(); } @@ -632,7 +632,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(uid); @@ -727,12 +727,12 @@ } EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.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(); } String randomString = ToolUtil.getRandomString(10); 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(); } @@ -741,7 +741,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()); @@ -855,12 +855,12 @@ } EmailUtil.send(userInfo1.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte", document1.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(); } String randomString = ToolUtil.getRandomString(10); file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -869,7 +869,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); @@ -1044,12 +1044,12 @@ } EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès", 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(); } String randomString = ToolUtil.getRandomString(10); 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(); } @@ -1058,7 +1058,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(uid); @@ -1192,12 +1192,12 @@ EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte", document1.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(); } String randomString = ToolUtil.getRandomString(10); file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -1206,7 +1206,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); @@ -1342,12 +1342,12 @@ } EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès", 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(); } String randomString = ToolUtil.getRandomString(10); 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(); } @@ -1356,7 +1356,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(uid); @@ -1487,12 +1487,12 @@ } EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte", document1.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(); } String randomString = ToolUtil.getRandomString(10); file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -1501,7 +1501,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); @@ -1749,8 +1749,8 @@ checkoutRequest.setRequestDescription("Account top-up"); checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelUserBalance"); 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"); return TinggPayUtil.checkoutRequest(checkoutRequest); } @@ -1770,8 +1770,8 @@ checkoutRequest.setRequestDescription("Account top-up"); checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelUserBalance"); 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"); return TinggPayUtil.checkoutRequest(checkoutRequest); } return ResultUtil.success(""); @@ -1844,12 +1844,12 @@ EmailUtil.send(userInfo.getEmail(), language == 1 ? "重置密码" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", 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(); } String randomString = ToolUtil.getRandomString(10); file = new File("/usr/local/nginx/html/files/html/password_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/password_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -1858,7 +1858,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/password_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/password_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); @@ -2158,12 +2158,12 @@ } EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte", document1.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(); } String randomString = ToolUtil.getRandomString(10); file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -2172,7 +2172,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(userInfo.getId()); @@ -2325,12 +2325,12 @@ } EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte", document1.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(); } String randomString = ToolUtil.getRandomString(10); file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html"); file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } @@ -2339,7 +2339,7 @@ fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html"; String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(userInfo.getId()); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleCloudStorageUtil.java
New file @@ -0,0 +1,66 @@ package com.stylefeng.guns.modular.system.util; import com.google.cloud.storage.BlobId; import com.google.cloud.storage.BlobInfo; import com.google.cloud.storage.Storage; import com.google.cloud.storage.StorageOptions; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; /** * google对象存储 * @author zhibing.pu * @Date 2024/8/31 9:18 */ public class GoogleCloudStorageUtil { public static String upload(MultipartFile file){ // The ID of your GCP project // String projectId = "your-project-id"; // The ID of your GCS bucket // String bucketName = "your-unique-bucket-name"; // The ID of your GCS object // String objectName = "your-object-name"; // The path to your file to upload // String filePath = "path/to/your/file" String fileName = file.getOriginalFilename(); String bucketName = "i-go"; Storage storage = StorageOptions.newBuilder().setProjectId("i-go-gcp").build().getService(); BlobId blobId = BlobId.of(bucketName, fileName); BlobInfo blobInfo = BlobInfo.newBuilder(blobId).build(); // Optional: set a generation-match precondition to avoid potential race // conditions and data corruptions. The request returns a 412 error if the // preconditions are not met. Storage.BlobWriteOption precondition; if (storage.get(bucketName, fileName) == null) { // For a target object that does not yet exist, set the DoesNotExist precondition. // This will cause the request to fail if the object is created before the request runs. precondition = Storage.BlobWriteOption.doesNotExist(); } else { // If the destination already exists in your bucket, instead set a generation-match // precondition. This will cause the request to fail if the existing object's generation // changes before the request runs. precondition = Storage.BlobWriteOption.generationMatch( storage.get(bucketName, fileName).getGeneration()); } try { storage.createFrom(blobInfo, file.getInputStream(), precondition); System.out.println( "File uploaded to bucket " + bucketName + " as " + fileName); return "https://storage.cloud.google.com/" + bucketName + "/" + fileName + "?authuser=1"; } catch (IOException e) { throw new RuntimeException(e); } } } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java
@@ -33,25 +33,33 @@ 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 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 DRIVER_ACCOUNT = "odrd-fleetengine-driversdkuser@i-go-odrd-testing.iam.gserviceaccount.com"; private final String SERVICE_ACCOUNT = "odrd-fleetengine-ondemandadmin@i-go-gcp.iam.gserviceaccount.com"; private final String CONSUMER_ACCOUNT = "odrd-fleetengine-consumersdkus@i-go-odrd-testing.iam.gserviceaccount.com"; private final String DRIVER_ACCOUNT = "odrd-fleetengine-driversdkuser@i-go-gcp.iam.gserviceaccount.com"; private final String serverPrivateKeyId = "254e18eefa9fdcca64d5899cdcd793d466c47c7d"; private final String CONSUMER_ACCOUNT = "odrd-fleetengine-consumersdkus@i-go-gcp.iam.gserviceaccount.com"; 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 provider = "i-go-gcp"; @Autowired private RedisUtil redisUtil; @@ -69,22 +77,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; @@ -109,6 +117,8 @@ return map; } catch (SigningTokenException e) { throw new RuntimeException(e); } catch (SignerInitializationException e) { throw new RuntimeException(e); } }
@@ -293,7 +293,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/user/base/sendCellulantMessageCallback"); params.put("callback_url", "https://igo.i-go.group/user/base/sendCellulantMessageCallback"); post.body(params.toJSONString()); System.err.println("短信请求：\n请求地址：" + url + "\n请求参数：" + params.toJSONString()); HttpResponse execute = post.execute(); @@ -313,7 +313,7 @@ } public static void main(String[] ages){ //{"callback_url":"http://182.160.16.251:80/user/base/sendCellulantMessageCallback","msisdn":"233244915521","message":"Your verification code is 2358，it is valid within 5 minutes, please do not reveal it to others.","key":"ru#0flkf3993qh!!rg!@y4)nhwi08c#tg_vasek!ja)kvfnfjyoljoz(@nai(jkf","sender_id":"I-GO"} //{"callback_url":"https://igo.i-go.group/user/base/sendCellulantMessageCallback","msisdn":"233244915521","message":"Your verification code is 2358，it is valid within 5 minutes, please do not reveal it to others.","key":"ru#0flkf3993qh!!rg!@y4)nhwi08c#tg_vasek!ja)kvfnfjyoljoz(@nai(jkf","sender_id":"I-GO"} SMSUtil smsUtil = new SMSUtil(); smsUtil.sendCellulantMessage("233244915521", "Your verification code is 2358，it is valid within 5 minutes, please do not reveal it to others."); } UserIGOTravel/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(); } UserIGOTravel/guns-admin/src/main/resources/application-dev.yml
@@ -122,7 +122,7 @@ #支付回调地址 #测试环境 callbackPath: http://182.160.16.251/user callbackPath: https://igo.i-go.group/user --- @@ -139,6 +139,6 @@ 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/ --- UserIGOTravel/guns-admin/src/main/resources/application-produce.yml
@@ -1,10 +1,8 @@ server: port: 8006 tomcat: basedir: /usr/local/server/location 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) @@ -49,8 +47,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 @@ -106,12 +104,12 @@ --- filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径 filePath: /home/igotechgh/orderPostionFile/ #存储订单轨迹文件路径 #支付回调地址 callbackPath: http://182.160.16.251/user callbackPath: https://igo.i-go.group/user --- @@ -128,8 +126,8 @@ 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/ --- audioPath: /usr/local/nginx/html/files/audio audioPath: /home/igotechgh/nginx/html/files/audio UserIGOTravel/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/user"/> <property name="log.path" value="/home/igotechgh/app/log/user"/> <!--0. 日志格式和颜色渲染 --> <!-- 彩色日志依赖的渲染类 -->
