diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java index 29b6af2..8dbc1ca 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java @@ -8,13 +8,10 @@ import com.casic.missiles.modular.system.handler.OceanHttpHeaderHandler; import com.casic.missiles.modular.system.model.OceanDetailModel; import com.casic.missiles.modular.system.service.IOceanService; -import com.casic.missiles.modular.system.utils.Constant; -import com.casic.missiles.modular.system.utils.HttpRequestHelper; +import com.casic.missiles.modular.system.utils.EnvConstant; import com.casic.missiles.modular.system.utils.HttpUtils; -import okhttp3.*; import org.springframework.stereotype.Service; -import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -46,10 +43,9 @@ /** * 获取洋流数据Token * */ - - Map params = new HashMap<>(); - params.put("appId", Constant.OCEAN_APPID); - params.put("appKey", Constant.OCEAN_APP_KEY); + Map params = new HashMap<>(2); + params.put("appId", EnvConstant.OCEAN_APPID); + params.put("appKey", EnvConstant.OCEAN_APP_KEY); String res = HttpUtils.sendPost("http://api.meteo.open.ninecosmos.cn/us/users/open/token", params, null, new OceanHttpHeaderHandler()); if (StrUtil.isNotEmpty(res)) { /** @@ -61,9 +57,9 @@ /** * 封装请求参数 * */ - Map dataParams = new HashMap<>(); - dataParams.put("lon", lng+""); - dataParams.put("lat", lat+""); + Map dataParams = new HashMap<>(5); + dataParams.put("lon", lng + ""); + dataParams.put("lat", lat + ""); dataParams.put("date", date); dataParams.put("hour", days); dataParams.put("days", hour); @@ -76,7 +72,6 @@ } return new OceanDetailDTO(remoteData); } - } return null; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java index 29b6af2..8dbc1ca 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java @@ -8,13 +8,10 @@ import com.casic.missiles.modular.system.handler.OceanHttpHeaderHandler; import com.casic.missiles.modular.system.model.OceanDetailModel; import com.casic.missiles.modular.system.service.IOceanService; -import com.casic.missiles.modular.system.utils.Constant; -import com.casic.missiles.modular.system.utils.HttpRequestHelper; +import com.casic.missiles.modular.system.utils.EnvConstant; import com.casic.missiles.modular.system.utils.HttpUtils; -import okhttp3.*; import org.springframework.stereotype.Service; -import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -46,10 +43,9 @@ /** * 获取洋流数据Token * */ - - Map params = new HashMap<>(); - params.put("appId", Constant.OCEAN_APPID); - params.put("appKey", Constant.OCEAN_APP_KEY); + Map params = new HashMap<>(2); + params.put("appId", EnvConstant.OCEAN_APPID); + params.put("appKey", EnvConstant.OCEAN_APP_KEY); String res = HttpUtils.sendPost("http://api.meteo.open.ninecosmos.cn/us/users/open/token", params, null, new OceanHttpHeaderHandler()); if (StrUtil.isNotEmpty(res)) { /** @@ -61,9 +57,9 @@ /** * 封装请求参数 * */ - Map dataParams = new HashMap<>(); - dataParams.put("lon", lng+""); - dataParams.put("lat", lat+""); + Map dataParams = new HashMap<>(5); + dataParams.put("lon", lng + ""); + dataParams.put("lat", lat + ""); dataParams.put("date", date); dataParams.put("hour", days); dataParams.put("days", hour); @@ -76,7 +72,6 @@ } return new OceanDetailDTO(remoteData); } - } return null; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java index 9e1a85d..d9bf171 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/HttpRequestHelper.java @@ -21,17 +21,15 @@ public class HttpRequestHelper { public static final OkHttpClient HTTP_CLIENT = new OkHttpClient.Builder() .connectTimeout(30, TimeUnit.SECONDS) - .writeTimeout(30, TimeUnit.SECONDS) - .readTimeout(30, TimeUnit.SECONDS) + .writeTimeout(15, TimeUnit.SECONDS) + .readTimeout(15, TimeUnit.SECONDS) .build(); public static String doGet(String url) { Request request = new Request.Builder().url(url).build(); Call call = HTTP_CLIENT.newCall(request); try (Response response = call.execute()) { - String result = response.body() != null ? Objects.requireNonNull(response.body()).string() : ""; - log.info("result ===> " + result); - return result; + return response.body() != null ? Objects.requireNonNull(response.body()).string() : ""; } catch (IOException e) { e.printStackTrace(); }