From b2eda32b99ddc336372f1cd601d4df23d5f729a8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 三月 2023 18:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/GaoDe/MapUtil.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/GaoDe/MapUtil.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/GaoDe/MapUtil.java
index 7f5e0b8..1068762 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/GaoDe/MapUtil.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/GaoDe/MapUtil.java
@@ -14,8 +14,6 @@
import java.util.List;
import java.util.Map;
-import static com.supersavedriving.driver.modular.system.util.GaoDe.MapConfig.key;
-
/**
* 地图工具类
* @author pzb
@@ -37,7 +35,7 @@
*/
public static Map<String, String> getDistance(String origins, String destination, Integer type){
try {
- String url = "https://restapi.amap.com/v3/distance?key=" + key + "&origins=" + origins + "&destination=" + destination +
+ String url = "https://restapi.amap.com/v3/distance?key=" + MapConfig.key + "&origins=" + origins + "&destination=" + destination +
"&type=" + type;
HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", url, null, null, "json");
if(httpResult.getCode() != 200){
@@ -71,7 +69,7 @@
*/
public static List<String> geocoding(String address){
try {
- String url = "https://restapi.amap.com/v3/geocode/geo?key=" + key + "&output=JSON&address=" + address;
+ String url = "https://restapi.amap.com/v3/geocode/geo?key=" + MapConfig.key + "&output=JSON&address=" + address;
HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", url, null, null, "json");
if(httpResult.getCode() != 200){
return null;
@@ -104,7 +102,7 @@
*/
public static District geocode(String lon, String lan) {
try {
- String url = "https://restapi.amap.com/v3/geocode/regeo?key=" + key + "&location=" + lon + "," + lan;
+ String url = "https://restapi.amap.com/v3/geocode/regeo?key=" + MapConfig.key + "&location=" + lon + "," + lan;
HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", url, null, null, "json");
if(httpResult.getCode() != 200){
return null;
--
Gitblit v1.7.1