From 6721b9632f230ff7e63f70acfc2c7aa43c1f9188 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 21 六月 2024 16:51:58 +0800
Subject: [PATCH] 自动数据上传修改
---
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java | 4
MinistryOfTransport/.mvn/wrapper/MavenWrapperDownloader.java | 118 ++++++
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java | 4
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MinistryOfTransport.java | 224 +++++++++++-
MinistryOfTransport/mvnw.cmd | 182 ++++++++++
MinistryOfTransport/.mvn/wrapper/maven-wrapper.jar | 0
MinistryOfTransport/pom.xml | 86 +++++
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java | 14
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java | 54 +-
MinistryOfTransport/.mvn/wrapper/maven-wrapper.properties | 2
MinistryOfTransport/mvnw | 310 ++++++++++++++++++
11 files changed, 928 insertions(+), 70 deletions(-)
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
index 3efe0f3..3d3f5ba 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
@@ -57,7 +57,7 @@
@Autowired
private ITransactionDetailsService transactionDetailsService;
- private String path = "http://120.77.11.218:8868/";
+ private String path = "http://47.108.137.172:8868/";
/**
@@ -72,7 +72,7 @@
mileage += (orderPrivateCar.getMileage() == null ? 0 : orderPrivateCar.getMileage());
}
JSONObject jsonObject = new JSONObject();
- jsonObject.put("Address", 450204);//注册地行政区划代码
+ jsonObject.put("Address", 530602);//注册地行政区划代码
jsonObject.put("VehicleNo", car.getCarLicensePlate());//车辆号牌
jsonObject.put("TotalMile", Integer.valueOf(mileage / 1000));//行驶总里程（km）
jsonObject.put("Flag", 1);//操作标识（1：新增，2：更新，3：删除）
@@ -103,7 +103,7 @@
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
Map<String, Object> query = systemPriceMapper.query(orderPrivateCar.getCompanyId(), 1, orderPrivateCar.getServerCarModelId());
JSONObject jsonObject = new JSONObject();
- jsonObject.put("Address", 450204);//发起第行政区划代码
+ jsonObject.put("Address", 530602);//发起第行政区划代码
jsonObject.put("OrderId", orderPrivateCar.getOrderNum());//订单编号
jsonObject.put("DepartTime", orderPrivateCar.getTravelTime());//预计用车时间YYYYMMDDhhmmss
jsonObject.put("OrderTime", orderPrivateCar.getInsertTime());//订单发起时间YYYYMMDDhhmmss
@@ -144,7 +144,7 @@
Car car = carService.selectById(orderPrivateCar.getCarId());
String value = redisUtil.getValue("DRIVER" + orderPrivateCar.getDriverId());
JSONObject jsonObject = new JSONObject();
- jsonObject.put("Address", 450204);//发起地行政区划代码
+ jsonObject.put("Address", 530602);//发起地行政区划代码
jsonObject.put("OrderId", orderPrivateCar.getOrderNum());//订单编号
jsonObject.put("Longitude", Double.valueOf(value.split(",")[0]));//车辆经度
jsonObject.put("Latitude", Double.valueOf(value.split(",")[1]));//车辆纬度
@@ -340,7 +340,7 @@
TransactionDetails transactionDetails = transactionDetailsService.selectById(new EntityWrapper<TransactionDetails>().eq("orderType", 1).eq("orderId", orderId));
JSONObject jsonObject = new JSONObject();
jsonObject.put("OrderId", orderPrivateCar.getOrderNum());//订单号
- jsonObject.put("OnArea", 450204);//上车位置行政区划代码
+ jsonObject.put("OnArea", 530602);//上车位置行政区划代码
jsonObject.put("DriverName", driver.getName());//机动车驾驶员
jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证号
jsonObject.put("FareType", query.get("id").toString());//运价类型编码（由网约车公司定义，与运价信息接口保持一街）
@@ -458,7 +458,7 @@
JSONObject jsonObject = new JSONObject();
jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证号
- jsonObject.put("DriverRegionCode", 450204);//行政区划代码
+ jsonObject.put("DriverRegionCode", 530602);//行政区划代码
jsonObject.put("VehicleNo", car.getCarLicensePlate());//车辆号牌
jsonObject.put("PositionTime", new Date());//定位时间（时间戳）
jsonObject.put("Longitude", Longitude);//经度
@@ -527,7 +527,7 @@
}
JSONObject jsonObject = new JSONObject();
jsonObject.put("VehicleNo", car.getCarLicensePlate());//车辆号牌
- jsonObject.put("VehicleRegionCode", 450204);//行政区划代码
+ jsonObject.put("VehicleRegionCode", 530602);//行政区划代码
jsonObject.put("PositionTime", new Date());//定位时间（时间戳）
jsonObject.put("Longitude", Longitude);//经度
jsonObject.put("Latitude", Latitude);//纬度
diff --git a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
index 8ba6338..5b5618d 100644
--- a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
+++ b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
@@ -132,14 +132,14 @@
*/
public void baseInfoCompanyPay(){
JSONObject jsonObject = new JSONObject();
- jsonObject.put("PayName", "支付宝（中国）网络技术有限公司");//银行或者非银行支付机构名称
- jsonObject.put("PayId", "2000133000019");//非银行支付机构支付业务许可证编号
- jsonObject.put("PayType", "1");//支付业务类型
+ jsonObject.put("PayName", "深圳市微信支付科技有限公司");//银行或者非银行支付机构名称
+ jsonObject.put("PayId", "Z2000444000013");//非银行支付机构支付业务许可证编号
+ jsonObject.put("PayType", "互联网支付");//支付业务类型
jsonObject.put("PayScope", "全国");//业务覆盖范围
- jsonObject.put("PrepareBank", "中国工商银行");//备付金存管银行
- jsonObject.put("CountDate", 15);//结算周期
- jsonObject.put("State", 0);//状态（0：有效，1：失效）
- jsonObject.put("Flag", 1);//操作标识（1：新增，2：更新，3：删除）
+ jsonObject.put("PrepareBank", "中国建设银行股份有限公司昭通珠泉支行");//备付金存管银行
+ jsonObject.put("CountDate", 1);//结算周期
+ jsonObject.put("State", 1);//状态（0：有效，1：失效）
+ jsonObject.put("Flag", 2);//操作标识（1：新增，2：更新，3：删除）
jsonObject.put("UpdateTime", new Date());
Map<String, String> map = new HashMap<>();
map.put("baseInfoCompanyPay", jsonObject.toJSONString());
@@ -153,19 +153,19 @@
*/
public void baseInfoCompanyService(){
JSONObject jsonObject = new JSONObject();
- jsonObject.put("Address", 450204);//行政区划代码
- jsonObject.put("ServiceName", "广西云森科技有限公司");//服务机构名称
- jsonObject.put("ServiceNo", "45020401");//服务机构代码
- jsonObject.put("DetailAddress", "柳州市柳邕路新翔小区二区6栋11号");//服务机构地址
- jsonObject.put("ResponsibleName", "翁克顺");//服务机构负责人姓名
- jsonObject.put("ResponsiblePhone", "13907728585");//负责人联系电话
- jsonObject.put("ManagerName", "吴志武");//服务机构管理人姓名
- jsonObject.put("ManagerPhone", "15907720083");//管理人联系电话
- jsonObject.put("ContactPhone", "0772-3633333");//服务机构紧急联系电话
- jsonObject.put("MailAddress", "柳州市城中区滨江西路15栋2号OK充电站");//行政文书送达邮寄地址
- jsonObject.put("CreateDate", "2015年09月18日");//服务机构设立日期
- jsonObject.put("State", 0);//状态（0：有效，1：失效）
- jsonObject.put("Flag", 1);//操作标识（1：新增，2：更新，3：删除）
+ jsonObject.put("Address", 530602);//行政区划代码
+ jsonObject.put("ServiceName", "昭通市睿邦科技有限公司");//服务机构名称
+ jsonObject.put("ServiceNo", "91530600MA6K70Q50D");//服务机构代码
+ jsonObject.put("DetailAddress", "云南省昭通市昭阳区龙泉路501号");//服务机构地址
+ jsonObject.put("ResponsibleName", "虎尊彦");//服务机构负责人姓名
+ jsonObject.put("ResponsiblePhone", "13508701638");//负责人联系电话
+ jsonObject.put("ManagerName", "虎尊彦");//服务机构管理人姓名
+ jsonObject.put("ManagerPhone", "13508701638");//管理人联系电话
+ jsonObject.put("ContactPhone", "14736572423");//服务机构紧急联系电话
+ jsonObject.put("MailAddress", "云南省昭通市昭阳区龙泉路501号");//行政文书送达邮寄地址
+ jsonObject.put("CreateDate", "2016年07月19日");//服务机构设立日期
+ jsonObject.put("State", 1);//状态（0：有效，1：失效）
+ jsonObject.put("Flag", 2);//操作标识（1：新增，2：更新，3：删除）
jsonObject.put("UpdateTime", new Date());
Map<String, String> map = new HashMap<>();
map.put("baseInfoCompanyService", jsonObject.toJSONString());
@@ -183,7 +183,7 @@
JSONObject jsonObject = new JSONObject();
jsonObject.put("Address", tCompany.getAddressCode());//许可地行政区划代码
jsonObject.put("Certificate", tCompany.getLicenseNumber());//网络预约出租车经营许可证号
- jsonObject.put("OperationArea", "广西壮族自治区柳州市城区");//经营区域
+ jsonObject.put("OperationArea", tCompany.getServiceScope());//经营区域
jsonObject.put("OwnerName", tCompany.getName());//公司名称
jsonObject.put("Organization", tCompany.getLicensingAgency());//发证机构名称
jsonObject.put("StartDate", tCompany.getLicenseStartTime());//有效期起YYYYMMDD
@@ -209,7 +209,7 @@
JSONObject price = JSON.parseObject(content);
JSONObject jsonObject = new JSONObject();
- jsonObject.put("Address", 450204);//运价适用地行政区划代码
+ jsonObject.put("Address", 530602);//运价适用地行政区划代码
jsonObject.put("FareType", id);//运价类型编码（由网约车平台公司统一编码，应确保唯一性）
jsonObject.put("FareTypeNote", tSystemPrice.getFareTypeNote());//运价类型说明
jsonObject.put("FareValidOn", new Date());//运价有效期起YYYYMMDDhhmmss
@@ -273,7 +273,7 @@
System.out.println("上传图片文件：" + result_);
JSONObject jsonObject = new JSONObject();
- jsonObject.put("Address", 450204);//车辆所在城市行政区划代码
+ jsonObject.put("Address", 530602);//车辆所在城市行政区划代码
jsonObject.put("VehicleNo", tCar.getCarLicensePlate());//车辆号牌
jsonObject.put("PlateColor", tCar.getPlateColor());//车牌颜色
jsonObject.put("Seats", tCarModel.getSeat());//核定载客位
@@ -365,7 +365,7 @@
System.out.println("上传图片文件：" + result1_);
JSONObject jsonObject = new JSONObject();
- jsonObject.put("Address", 450204);//注册地行政区划代码
+ jsonObject.put("Address", 530602);//注册地行政区划代码
jsonObject.put("DriverName", tDriver.getName());//机动车驾驶员姓名
jsonObject.put("DriverPhone", tDriver.getPhone());//驾驶员手机号
jsonObject.put("DriverGender", (tDriver.getSex() == 1 ? "男" : "女"));//驾驶员性别
@@ -422,7 +422,7 @@
DriverTrain driverTrain = driverTrainMapper.selectById(id);
TDriver driver = driverService.selectById(driverTrain.getDriverId());
JSONObject jsonObject = new JSONObject();
- jsonObject.put("Address", 450204);//注册地行政区划代码
+ jsonObject.put("Address", 530602);//注册地行政区划代码
jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证号
jsonObject.put("CourseName", driverTrain.getCourseName());//驾驶员培训课程名称
jsonObject.put("CourseDate", driverTrain.getCourseDate());//培训课程日期YYYYMMDD
@@ -446,7 +446,7 @@
TDriver tDriver = driverService.selectById(driverId);
TVersionManagement type = versionManagementService.selectOne(new EntityWrapper<TVersionManagement>().eq("type", 2).orderBy("insertTime desc limit 0, 1"));
JSONObject jsonObject = new JSONObject();
- jsonObject.put("Address", 450204);//注册地行政区划代码
+ jsonObject.put("Address", 530602);//注册地行政区划代码
jsonObject.put("LicenseId", tDriver.getDriveCard());//机动车驾驶证号
jsonObject.put("DriverPhone", tDriver.getPhone());//驾驶员手机号
jsonObject.put("NetType", phoneExp(tDriver.getPhone()));//手机运营商（1：中国联通，2：中国移动，3：中国电信，4：其他）
@@ -488,7 +488,7 @@
.between("insert_time", s.getTime(), e.getTime())
);
JSONObject jsonObject = new JSONObject();
- jsonObject.put("Address", 450204);//注册地行政区划代码
+ jsonObject.put("Address", 530602);//注册地行政区划代码
jsonObject.put("LicenseId", tDriver.getDriveCard());//机动车驾驶证号
jsonObject.put("Cycle", s.getTime());//统计周期（统计周期按月，内容填写统计月份YYYYMM）
jsonObject.put("OrderCount", i);//完成订单次数
diff --git a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
index 7956aa1..98a19fb 100644
--- a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
+++ b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
@@ -7,6 +7,6 @@
public static String withdraw_auth_url = zull_user_url + "/driver/base/withdrawal/withdrawalAudit";
public static String cancel_order_url = zull_user_url + "/user/base/order/sendOrderState";
public static String freeze_user_url = zull_user_url + "/user/base/user/freeze";
- public static String ministry_of_transport_data = "http://120.77.11.218:8868/ministryOfTransport";
- public static String ministry_of_transport_ftp = "http://120.77.11.218:8868/ftp";
+ public static String ministry_of_transport_data = "http://47.108.137.172:8868/ministryOfTransport";
+ public static String ministry_of_transport_ftp = "http://47.108.137.172:8868/ftp";
}
diff --git a/MinistryOfTransport/.mvn/wrapper/MavenWrapperDownloader.java b/MinistryOfTransport/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 0000000..a45eb6b
--- /dev/null
+++ b/MinistryOfTransport/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+ private static final String WRAPPER_VERSION = "0.5.6";
+ /**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+ */
+ private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+ /**
+ * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+ * use instead of the default one.
+ */
+ private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+ ".mvn/wrapper/maven-wrapper.properties";
+
+ /**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+ private static final String MAVEN_WRAPPER_JAR_PATH =
+ ".mvn/wrapper/maven-wrapper.jar";
+
+ /**
+ * Name of the property which should be used to override the default download url for the wrapper.
+ */
+ private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+ public static void main(String args[]) {
+ System.out.println("- Downloader started");
+ File baseDirectory = new File(args[0]);
+ System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+ // If the maven-wrapper.properties exists, read it and check if it contains a custom
+ // wrapperUrl parameter.
+ File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+ String url = DEFAULT_DOWNLOAD_URL;
+ if (mavenWrapperPropertyFile.exists()) {
+ FileInputStream mavenWrapperPropertyFileInputStream = null;
+ try {
+ mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+ Properties mavenWrapperProperties = new Properties();
+ mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+ url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+ } catch (IOException e) {
+ System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+ } finally {
+ try {
+ if (mavenWrapperPropertyFileInputStream != null) {
+ mavenWrapperPropertyFileInputStream.close();
+ }
+ } catch (IOException e) {
+ // Ignore ...
+ }
+ }
+ }
+ System.out.println("- Downloading from: " + url);
+
+ File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+ if (!outputFile.getParentFile().exists()) {
+ if (!outputFile.getParentFile().mkdirs()) {
+ System.out.println(
+ "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+ }
+ }
+ System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+ try {
+ downloadFileFromURL(url, outputFile);
+ System.out.println("Done");
+ System.exit(0);
+ } catch (Throwable e) {
+ System.out.println("- Error downloading");
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+ if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+ String username = System.getenv("MVNW_USERNAME");
+ char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+ Authenticator.setDefault(new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(username, password);
+ }
+ });
+ }
+ URL website = new URL(urlString);
+ ReadableByteChannel rbc;
+ rbc = Channels.newChannel(website.openStream());
+ FileOutputStream fos = new FileOutputStream(destination);
+ fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+ fos.close();
+ rbc.close();
+ }
+
+}
diff --git a/MinistryOfTransport/.mvn/wrapper/maven-wrapper.jar b/MinistryOfTransport/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..2cc7d4a
--- /dev/null
+++ b/MinistryOfTransport/.mvn/wrapper/maven-wrapper.jar
Binary files differ
diff --git a/MinistryOfTransport/.mvn/wrapper/maven-wrapper.properties b/MinistryOfTransport/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..642d572
--- /dev/null
+++ b/MinistryOfTransport/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/MinistryOfTransport/mvnw b/MinistryOfTransport/mvnw
new file mode 100644
index 0000000..a16b543
--- /dev/null
+++ b/MinistryOfTransport/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/MinistryOfTransport/mvnw.cmd b/MinistryOfTransport/mvnw.cmd
new file mode 100644
index 0000000..c8d4337
--- /dev/null
+++ b/MinistryOfTransport/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/MinistryOfTransport/pom.xml b/MinistryOfTransport/pom.xml
new file mode 100644
index 0000000..b33a236
--- /dev/null
+++ b/MinistryOfTransport/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.3.4.RELEASE</version>
+ <relativePath/> <!-- lookup parent from repository -->
+ </parent>
+ <groupId>com.sinata</groupId>
+ <artifactId>ministryoftransport</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>ministryOfTransport</name>
+ <description>MinistryOfTransport project for Spring Boot</description>
+
+ <packaging>war</packaging>
+
+ <properties>
+ <java.version>1.8</java.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.11.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>1.2.73</version>
+ </dependency>
+ <dependency><!--FTPjar-->
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>3.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.aliyun</groupId>
+ <artifactId>aliyun-java-sdk-core</artifactId>
+ <version>4.4.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MinistryOfTransport.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MinistryOfTransport.java
index 8ccf543..2b11e05 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MinistryOfTransport.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MinistryOfTransport.java
@@ -61,7 +61,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -84,7 +89,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -112,7 +122,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -145,7 +160,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -175,7 +195,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -221,7 +246,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -276,7 +306,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -305,7 +340,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -330,7 +370,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -390,7 +435,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -419,7 +469,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -448,7 +503,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -476,7 +536,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -503,7 +568,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -535,7 +605,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -563,7 +638,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -590,7 +670,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -615,7 +700,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -640,7 +730,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -669,7 +764,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -695,7 +795,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -752,7 +857,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -783,7 +893,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -816,7 +931,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -841,7 +961,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -864,7 +989,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -886,7 +1016,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -909,7 +1044,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -938,7 +1078,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -972,7 +1117,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -1005,7 +1155,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
@@ -1057,7 +1212,12 @@
data.put("Source", Source);
data.put("IPCType", IPCType);
data.put("baseInfoCompany", jsonObject);
- String s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json");
+ String s = null;
+ try {
+ s = httpClientUtil.pushHttpRequset("POST", path, data, null, "json").getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
System.err.println(s);
}
}
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
index 58fd40d..a035618 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
@@ -66,7 +66,7 @@
@Autowired
private IOrderEvaluateService orderEvaluateService;
- private String path = "http://120.77.11.218:8868/";
+ private String path = "http://47.108.137.172:8868/";
/**
@@ -160,7 +160,7 @@
TransactionDetails transactionDetails = transactionDetailsService.selectById(new EntityWrapper<TransactionDetails>().eq("orderType", 1).eq("orderId", orderId));
JSONObject jsonObject = new JSONObject();
jsonObject.put("OrderId", orderPrivateCar.getOrderNum());//订单号
- jsonObject.put("OnArea", 450204);//上车位置行政区划代码
+ jsonObject.put("OnArea", 530602);//上车位置行政区划代码
jsonObject.put("DriverName", driver.getName());//机动车驾驶员
jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证号
jsonObject.put("FareType", query.get("id").toString());//运价类型编码（由网约车公司定义，与运价信息接口保持一街）
--
Gitblit v1.7.1