java/IgoTravel.git

			@@ -25,6 +25,7 @@

			/**
			* Fleet Engine API 工具类
			*
			* @author zhibing.pu
			* @Date 2024/5/17 9:59
			*/
			@@ -33,6 +34,8 @@
			public class FleetEngineUtil {

			static Logger logger = LoggerFactory.getLogger(FleetEngineUtil.class);

			private final static String key = "AIzaSyCG6PsfkaCEc94VK2vIAZk1YYKvOS_Ewts";

			private final String SERVICE_ACCOUNT = "odrd-fleetengine-ondemandadmin@i-go-odrd-testing.iam.gserviceaccount.com";

			@@ -51,41 +54,45 @@
			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 static String key = "AIzaSyCG6PsfkaCEc94VK2vIAZk1YYKvOS_Ewts";
			private final String provider = "i-go-odrd-testing";

			// private final String SERVICE_ACCOUNT = "odrd-fleetengine-ondemandadmin@i-go-gcp.iam.gserviceaccount.com";
			//
			// private final String DRIVER_ACCOUNT = "odrd-fleetengine-driversdkuser@i-go-gcp.iam.gserviceaccount.com";
			//
			// private final String CONSUMER_ACCOUNT = "odrd-fleetengine-consumersdkus@i-go-gcp.iam.gserviceaccount.com";
			//
			// private final String provider = "i-go-gcp";

			@Autowired
			private RedisUtil redisUtil;






			/**
			* 获取jwt token
			*
			* @param type 0=服务端，1=乘客，2=司机
			* @return
			*/
			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;
			@@ -110,9 +117,10 @@
			return map;
			} catch (SigningTokenException e) {
			throw new RuntimeException(e);
			} catch (SignerInitializationException e) {
			throw new RuntimeException(e);
			}
			}



			public String getToken(){
			@@ -136,11 +144,9 @@
			}





			/**
			* 添加车辆
			*
			* @param maximumCapacity 这辆车可以搭载的乘客总数
			* @param licensePlate 车牌号
			* @param id 车辆id
			@@ -213,6 +219,7 @@

			/**
			* 上报google可结算订单
			*
			* @param tripId 行程id
			* @return
			*/
			@@ -229,14 +236,6 @@
			post.body(body.toJSONString());










			//上线客户测试和上线运营开放
			// HttpResponse response = post.execute();
			// if(200 != response.getStatus()){
			@@ -245,8 +244,10 @@
			// }
			return true;
			}

			/**
			* 修改车辆信息
			*
			* @param maximumCapacity
			* @param licensePlate
			* @param id
			@@ -345,6 +346,7 @@

			/**
			* 获取车辆信息
			*
			* @param id 车辆id
			* @return
			*/
			@@ -429,9 +431,9 @@
			}



			/**
			* 获取最后一个数字
			*
			* @param str
			* @return
			*/
			@@ -448,6 +450,7 @@

			/**
			* 创建新的行程
			*
			* @param vehicleId 车辆id
			* @param numberOfPassengers 人数
			* @param tripId 订单id
			@@ -629,6 +632,7 @@

			/**
			* 修改行程
			*
			* @param tripStatus 行程状态
			* @param vehicleId 车辆id
			* @param numberOfPassengers 人数
			@@ -849,9 +853,9 @@
			}



			/**
			* 获取行程信息
			*
			* @param tripId 订单id
			* @return
			*/