diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 523c6d2..67af49d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -7,7 +7,7 @@ import com.casic.missiles.modular.system.model.TyphoonDetailModel; import com.casic.missiles.modular.system.model.TyphoonModel; import com.casic.missiles.modular.system.service.ITyphoonService; -import com.casic.missiles.modular.system.utils.Constant; +import com.casic.missiles.modular.system.utils.EnvConstant; import com.casic.missiles.modular.system.utils.HttpRequestHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -38,7 +38,7 @@ /** * 获取第三方台风接口数据 * */ - String res = HttpRequestHelper.doGet(Constant.TYPHOON_LIST + System.currentTimeMillis()); + String res = HttpRequestHelper.doGet(EnvConstant.TYPHOON_LIST + System.currentTimeMillis()); if (SUCCESS_CODE.equals(HttpRequestHelper.getTyphoonCode(res))) { TyphoonModel remoteData = JSON.parseObject(res, new TypeReference() { }); @@ -62,7 +62,7 @@ * 获取台风接口数据 * */ String res = HttpRequestHelper.doGet( - Constant.TYPHOON_DETAIL.replace("ID", typhoonId) + EnvConstant.TYPHOON_DETAIL.replace("ID", typhoonId) + System.currentTimeMillis()); if (SUCCESS_CODE.equals(HttpRequestHelper.getTyphoonCode(res))) { TyphoonDetailModel remoteData = JSON.parseObject(res, new TypeReference() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 523c6d2..67af49d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -7,7 +7,7 @@ import com.casic.missiles.modular.system.model.TyphoonDetailModel; import com.casic.missiles.modular.system.model.TyphoonModel; import com.casic.missiles.modular.system.service.ITyphoonService; -import com.casic.missiles.modular.system.utils.Constant; +import com.casic.missiles.modular.system.utils.EnvConstant; import com.casic.missiles.modular.system.utils.HttpRequestHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -38,7 +38,7 @@ /** * 获取第三方台风接口数据 * */ - String res = HttpRequestHelper.doGet(Constant.TYPHOON_LIST + System.currentTimeMillis()); + String res = HttpRequestHelper.doGet(EnvConstant.TYPHOON_LIST + System.currentTimeMillis()); if (SUCCESS_CODE.equals(HttpRequestHelper.getTyphoonCode(res))) { TyphoonModel remoteData = JSON.parseObject(res, new TypeReference() { }); @@ -62,7 +62,7 @@ * 获取台风接口数据 * */ String res = HttpRequestHelper.doGet( - Constant.TYPHOON_DETAIL.replace("ID", typhoonId) + EnvConstant.TYPHOON_DETAIL.replace("ID", typhoonId) + System.currentTimeMillis()); if (SUCCESS_CODE.equals(HttpRequestHelper.getTyphoonCode(res))) { TyphoonDetailModel remoteData = JSON.parseObject(res, new TypeReference() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java deleted file mode 100644 index c34600a..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -/** - * @author a203 - */ -public class Constant { - /** - * 热带气旋/台风相关常量 - */ - private static final String BASE_URL = "https://route.showapi.com"; - private static final String API_APPID = "780330"; - private static final String API_SIGN_KEY = "f30ac28b65cc447da936448c57bc5d99"; - - public static final String TYPHOON_LIST = BASE_URL - + "/342-1?" - + "showapi_appid=" + API_APPID + "&" - + "showapi_sign=" + API_SIGN_KEY + "&" - + "showapi_timestamp="; - - public static final String TYPHOON_DETAIL = BASE_URL - + "/342-2?" - + "showapi_appid=" + API_APPID + "&" - + "showapi_sign=" + API_SIGN_KEY + "&" - + "tfid=ID" + "&" - + "showapi_timestamp="; - - /** - * 洋流相关常量 - */ - public static final String OCEAN_APPID = "WXZH888888"; - public static final String OCEAN_APP_KEY = "xb#bD&xtho@b80scbDb"; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 523c6d2..67af49d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -7,7 +7,7 @@ import com.casic.missiles.modular.system.model.TyphoonDetailModel; import com.casic.missiles.modular.system.model.TyphoonModel; import com.casic.missiles.modular.system.service.ITyphoonService; -import com.casic.missiles.modular.system.utils.Constant; +import com.casic.missiles.modular.system.utils.EnvConstant; import com.casic.missiles.modular.system.utils.HttpRequestHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -38,7 +38,7 @@ /** * 获取第三方台风接口数据 * */ - String res = HttpRequestHelper.doGet(Constant.TYPHOON_LIST + System.currentTimeMillis()); + String res = HttpRequestHelper.doGet(EnvConstant.TYPHOON_LIST + System.currentTimeMillis()); if (SUCCESS_CODE.equals(HttpRequestHelper.getTyphoonCode(res))) { TyphoonModel remoteData = JSON.parseObject(res, new TypeReference() { }); @@ -62,7 +62,7 @@ * 获取台风接口数据 * */ String res = HttpRequestHelper.doGet( - Constant.TYPHOON_DETAIL.replace("ID", typhoonId) + EnvConstant.TYPHOON_DETAIL.replace("ID", typhoonId) + System.currentTimeMillis()); if (SUCCESS_CODE.equals(HttpRequestHelper.getTyphoonCode(res))) { TyphoonDetailModel remoteData = JSON.parseObject(res, new TypeReference() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java deleted file mode 100644 index c34600a..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -/** - * @author a203 - */ -public class Constant { - /** - * 热带气旋/台风相关常量 - */ - private static final String BASE_URL = "https://route.showapi.com"; - private static final String API_APPID = "780330"; - private static final String API_SIGN_KEY = "f30ac28b65cc447da936448c57bc5d99"; - - public static final String TYPHOON_LIST = BASE_URL - + "/342-1?" - + "showapi_appid=" + API_APPID + "&" - + "showapi_sign=" + API_SIGN_KEY + "&" - + "showapi_timestamp="; - - public static final String TYPHOON_DETAIL = BASE_URL - + "/342-2?" - + "showapi_appid=" + API_APPID + "&" - + "showapi_sign=" + API_SIGN_KEY + "&" - + "tfid=ID" + "&" - + "showapi_timestamp="; - - /** - * 洋流相关常量 - */ - public static final String OCEAN_APPID = "WXZH888888"; - public static final String OCEAN_APP_KEY = "xb#bD&xtho@b80scbDb"; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/EnvConstant.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/EnvConstant.java new file mode 100644 index 0000000..a3be21e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/EnvConstant.java @@ -0,0 +1,32 @@ +package com.casic.missiles.modular.system.utils; + +/** + * @author a203 + */ +public class EnvConstant { + /** + * 热带气旋/台风相关常量 + */ + private static final String BASE_URL = "https://route.showapi.com"; + private static final String API_APPID = "780330"; + private static final String API_SIGN_KEY = "f30ac28b65cc447da936448c57bc5d99"; + + public static final String TYPHOON_LIST = BASE_URL + + "/342-1?" + + "showapi_appid=" + API_APPID + "&" + + "showapi_sign=" + API_SIGN_KEY + "&" + + "showapi_timestamp="; + + public static final String TYPHOON_DETAIL = BASE_URL + + "/342-2?" + + "showapi_appid=" + API_APPID + "&" + + "showapi_sign=" + API_SIGN_KEY + "&" + + "tfid=ID" + "&" + + "showapi_timestamp="; + + /** + * 洋流相关常量 + */ + public static final String OCEAN_APPID = "WXZH888888"; + public static final String OCEAN_APP_KEY = "xb#bD&xtho@b80scbDb"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 523c6d2..67af49d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -7,7 +7,7 @@ import com.casic.missiles.modular.system.model.TyphoonDetailModel; import com.casic.missiles.modular.system.model.TyphoonModel; import com.casic.missiles.modular.system.service.ITyphoonService; -import com.casic.missiles.modular.system.utils.Constant; +import com.casic.missiles.modular.system.utils.EnvConstant; import com.casic.missiles.modular.system.utils.HttpRequestHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -38,7 +38,7 @@ /** * 获取第三方台风接口数据 * */ - String res = HttpRequestHelper.doGet(Constant.TYPHOON_LIST + System.currentTimeMillis()); + String res = HttpRequestHelper.doGet(EnvConstant.TYPHOON_LIST + System.currentTimeMillis()); if (SUCCESS_CODE.equals(HttpRequestHelper.getTyphoonCode(res))) { TyphoonModel remoteData = JSON.parseObject(res, new TypeReference() { }); @@ -62,7 +62,7 @@ * 获取台风接口数据 * */ String res = HttpRequestHelper.doGet( - Constant.TYPHOON_DETAIL.replace("ID", typhoonId) + EnvConstant.TYPHOON_DETAIL.replace("ID", typhoonId) + System.currentTimeMillis()); if (SUCCESS_CODE.equals(HttpRequestHelper.getTyphoonCode(res))) { TyphoonDetailModel remoteData = JSON.parseObject(res, new TypeReference() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java deleted file mode 100644 index c34600a..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -/** - * @author a203 - */ -public class Constant { - /** - * 热带气旋/台风相关常量 - */ - private static final String BASE_URL = "https://route.showapi.com"; - private static final String API_APPID = "780330"; - private static final String API_SIGN_KEY = "f30ac28b65cc447da936448c57bc5d99"; - - public static final String TYPHOON_LIST = BASE_URL - + "/342-1?" - + "showapi_appid=" + API_APPID + "&" - + "showapi_sign=" + API_SIGN_KEY + "&" - + "showapi_timestamp="; - - public static final String TYPHOON_DETAIL = BASE_URL - + "/342-2?" - + "showapi_appid=" + API_APPID + "&" - + "showapi_sign=" + API_SIGN_KEY + "&" - + "tfid=ID" + "&" - + "showapi_timestamp="; - - /** - * 洋流相关常量 - */ - public static final String OCEAN_APPID = "WXZH888888"; - public static final String OCEAN_APP_KEY = "xb#bD&xtho@b80scbDb"; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/EnvConstant.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/EnvConstant.java new file mode 100644 index 0000000..a3be21e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/EnvConstant.java @@ -0,0 +1,32 @@ +package com.casic.missiles.modular.system.utils; + +/** + * @author a203 + */ +public class EnvConstant { + /** + * 热带气旋/台风相关常量 + */ + private static final String BASE_URL = "https://route.showapi.com"; + private static final String API_APPID = "780330"; + private static final String API_SIGN_KEY = "f30ac28b65cc447da936448c57bc5d99"; + + public static final String TYPHOON_LIST = BASE_URL + + "/342-1?" + + "showapi_appid=" + API_APPID + "&" + + "showapi_sign=" + API_SIGN_KEY + "&" + + "showapi_timestamp="; + + public static final String TYPHOON_DETAIL = BASE_URL + + "/342-2?" + + "showapi_appid=" + API_APPID + "&" + + "showapi_sign=" + API_SIGN_KEY + "&" + + "tfid=ID" + "&" + + "showapi_timestamp="; + + /** + * 洋流相关常量 + */ + public static final String OCEAN_APPID = "WXZH888888"; + public static final String OCEAN_APP_KEY = "xb#bD&xtho@b80scbDb"; +} 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 c819054..9e1a85d 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 @@ -28,8 +28,7 @@ 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(); + try (Response response = call.execute()) { String result = response.body() != null ? Objects.requireNonNull(response.body()).string() : ""; log.info("result ===> " + result); return result; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 523c6d2..67af49d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -7,7 +7,7 @@ import com.casic.missiles.modular.system.model.TyphoonDetailModel; import com.casic.missiles.modular.system.model.TyphoonModel; import com.casic.missiles.modular.system.service.ITyphoonService; -import com.casic.missiles.modular.system.utils.Constant; +import com.casic.missiles.modular.system.utils.EnvConstant; import com.casic.missiles.modular.system.utils.HttpRequestHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -38,7 +38,7 @@ /** * 获取第三方台风接口数据 * */ - String res = HttpRequestHelper.doGet(Constant.TYPHOON_LIST + System.currentTimeMillis()); + String res = HttpRequestHelper.doGet(EnvConstant.TYPHOON_LIST + System.currentTimeMillis()); if (SUCCESS_CODE.equals(HttpRequestHelper.getTyphoonCode(res))) { TyphoonModel remoteData = JSON.parseObject(res, new TypeReference() { }); @@ -62,7 +62,7 @@ * 获取台风接口数据 * */ String res = HttpRequestHelper.doGet( - Constant.TYPHOON_DETAIL.replace("ID", typhoonId) + EnvConstant.TYPHOON_DETAIL.replace("ID", typhoonId) + System.currentTimeMillis()); if (SUCCESS_CODE.equals(HttpRequestHelper.getTyphoonCode(res))) { TyphoonDetailModel remoteData = JSON.parseObject(res, new TypeReference() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java deleted file mode 100644 index c34600a..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -/** - * @author a203 - */ -public class Constant { - /** - * 热带气旋/台风相关常量 - */ - private static final String BASE_URL = "https://route.showapi.com"; - private static final String API_APPID = "780330"; - private static final String API_SIGN_KEY = "f30ac28b65cc447da936448c57bc5d99"; - - public static final String TYPHOON_LIST = BASE_URL - + "/342-1?" - + "showapi_appid=" + API_APPID + "&" - + "showapi_sign=" + API_SIGN_KEY + "&" - + "showapi_timestamp="; - - public static final String TYPHOON_DETAIL = BASE_URL - + "/342-2?" - + "showapi_appid=" + API_APPID + "&" - + "showapi_sign=" + API_SIGN_KEY + "&" - + "tfid=ID" + "&" - + "showapi_timestamp="; - - /** - * 洋流相关常量 - */ - public static final String OCEAN_APPID = "WXZH888888"; - public static final String OCEAN_APP_KEY = "xb#bD&xtho@b80scbDb"; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/EnvConstant.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/EnvConstant.java new file mode 100644 index 0000000..a3be21e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/EnvConstant.java @@ -0,0 +1,32 @@ +package com.casic.missiles.modular.system.utils; + +/** + * @author a203 + */ +public class EnvConstant { + /** + * 热带气旋/台风相关常量 + */ + private static final String BASE_URL = "https://route.showapi.com"; + private static final String API_APPID = "780330"; + private static final String API_SIGN_KEY = "f30ac28b65cc447da936448c57bc5d99"; + + public static final String TYPHOON_LIST = BASE_URL + + "/342-1?" + + "showapi_appid=" + API_APPID + "&" + + "showapi_sign=" + API_SIGN_KEY + "&" + + "showapi_timestamp="; + + public static final String TYPHOON_DETAIL = BASE_URL + + "/342-2?" + + "showapi_appid=" + API_APPID + "&" + + "showapi_sign=" + API_SIGN_KEY + "&" + + "tfid=ID" + "&" + + "showapi_timestamp="; + + /** + * 洋流相关常量 + */ + public static final String OCEAN_APPID = "WXZH888888"; + public static final String OCEAN_APP_KEY = "xb#bD&xtho@b80scbDb"; +} 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 c819054..9e1a85d 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 @@ -28,8 +28,7 @@ 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(); + try (Response response = call.execute()) { String result = response.body() != null ? Objects.requireNonNull(response.body()).string() : ""; log.info("result ===> " + result); return result; diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java index 5c47c73..128b924 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java @@ -7,7 +7,7 @@ import com.casic.missiles.modular.system.dto.ShipDTO; import com.casic.missiles.modular.system.model.ShipModel; import com.casic.missiles.modular.system.service.IShipService; -import com.casic.missiles.modular.system.utils.Constant; +import com.casic.missiles.modular.system.utils.AisConstant; import okhttp3.*; import org.springframework.stereotype.Service; @@ -41,7 +41,7 @@ if (rgn == null || rgn.isEmpty()) { throw new NullPointerException("搜索区域不能为空"); } - if (age < Constant.MIN_AGE || age > Constant.MAX_AGE) { + if (age < AisConstant.MIN_AGE || age > AisConstant.MAX_AGE) { throw new IllegalArgumentException("时间范围错误"); } /** @@ -59,9 +59,9 @@ * 获取AIS接口数据 * */ Request request = new Request.Builder() - .addHeader(Constant.AIS_HEADER_NAME, Constant.AIS_KEY_VALUE) - .url(Constant.SHIPS_IN_CIRCLE) - .post(RequestBody.create(MediaType.parse(Constant.CONTENT_TYPE), jsonObject.toJSONString())) + .addHeader(AisConstant.AIS_HEADER_NAME, AisConstant.AIS_KEY_VALUE) + .url(AisConstant.SHIPS_IN_CIRCLE) + .post(RequestBody.create(MediaType.parse(AisConstant.CONTENT_TYPE), jsonObject.toJSONString())) .build(); Call call = HTTP_CLIENT.newCall(request); try { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 523c6d2..67af49d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -7,7 +7,7 @@ import com.casic.missiles.modular.system.model.TyphoonDetailModel; import com.casic.missiles.modular.system.model.TyphoonModel; import com.casic.missiles.modular.system.service.ITyphoonService; -import com.casic.missiles.modular.system.utils.Constant; +import com.casic.missiles.modular.system.utils.EnvConstant; import com.casic.missiles.modular.system.utils.HttpRequestHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -38,7 +38,7 @@ /** * 获取第三方台风接口数据 * */ - String res = HttpRequestHelper.doGet(Constant.TYPHOON_LIST + System.currentTimeMillis()); + String res = HttpRequestHelper.doGet(EnvConstant.TYPHOON_LIST + System.currentTimeMillis()); if (SUCCESS_CODE.equals(HttpRequestHelper.getTyphoonCode(res))) { TyphoonModel remoteData = JSON.parseObject(res, new TypeReference() { }); @@ -62,7 +62,7 @@ * 获取台风接口数据 * */ String res = HttpRequestHelper.doGet( - Constant.TYPHOON_DETAIL.replace("ID", typhoonId) + EnvConstant.TYPHOON_DETAIL.replace("ID", typhoonId) + System.currentTimeMillis()); if (SUCCESS_CODE.equals(HttpRequestHelper.getTyphoonCode(res))) { TyphoonDetailModel remoteData = JSON.parseObject(res, new TypeReference() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java deleted file mode 100644 index c34600a..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -/** - * @author a203 - */ -public class Constant { - /** - * 热带气旋/台风相关常量 - */ - private static final String BASE_URL = "https://route.showapi.com"; - private static final String API_APPID = "780330"; - private static final String API_SIGN_KEY = "f30ac28b65cc447da936448c57bc5d99"; - - public static final String TYPHOON_LIST = BASE_URL - + "/342-1?" - + "showapi_appid=" + API_APPID + "&" - + "showapi_sign=" + API_SIGN_KEY + "&" - + "showapi_timestamp="; - - public static final String TYPHOON_DETAIL = BASE_URL - + "/342-2?" - + "showapi_appid=" + API_APPID + "&" - + "showapi_sign=" + API_SIGN_KEY + "&" - + "tfid=ID" + "&" - + "showapi_timestamp="; - - /** - * 洋流相关常量 - */ - public static final String OCEAN_APPID = "WXZH888888"; - public static final String OCEAN_APP_KEY = "xb#bD&xtho@b80scbDb"; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/EnvConstant.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/EnvConstant.java new file mode 100644 index 0000000..a3be21e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/EnvConstant.java @@ -0,0 +1,32 @@ +package com.casic.missiles.modular.system.utils; + +/** + * @author a203 + */ +public class EnvConstant { + /** + * 热带气旋/台风相关常量 + */ + private static final String BASE_URL = "https://route.showapi.com"; + private static final String API_APPID = "780330"; + private static final String API_SIGN_KEY = "f30ac28b65cc447da936448c57bc5d99"; + + public static final String TYPHOON_LIST = BASE_URL + + "/342-1?" + + "showapi_appid=" + API_APPID + "&" + + "showapi_sign=" + API_SIGN_KEY + "&" + + "showapi_timestamp="; + + public static final String TYPHOON_DETAIL = BASE_URL + + "/342-2?" + + "showapi_appid=" + API_APPID + "&" + + "showapi_sign=" + API_SIGN_KEY + "&" + + "tfid=ID" + "&" + + "showapi_timestamp="; + + /** + * 洋流相关常量 + */ + public static final String OCEAN_APPID = "WXZH888888"; + public static final String OCEAN_APP_KEY = "xb#bD&xtho@b80scbDb"; +} 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 c819054..9e1a85d 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 @@ -28,8 +28,7 @@ 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(); + try (Response response = call.execute()) { String result = response.body() != null ? Objects.requireNonNull(response.body()).string() : ""; log.info("result ===> " + result); return result; diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java index 5c47c73..128b924 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java @@ -7,7 +7,7 @@ import com.casic.missiles.modular.system.dto.ShipDTO; import com.casic.missiles.modular.system.model.ShipModel; import com.casic.missiles.modular.system.service.IShipService; -import com.casic.missiles.modular.system.utils.Constant; +import com.casic.missiles.modular.system.utils.AisConstant; import okhttp3.*; import org.springframework.stereotype.Service; @@ -41,7 +41,7 @@ if (rgn == null || rgn.isEmpty()) { throw new NullPointerException("搜索区域不能为空"); } - if (age < Constant.MIN_AGE || age > Constant.MAX_AGE) { + if (age < AisConstant.MIN_AGE || age > AisConstant.MAX_AGE) { throw new IllegalArgumentException("时间范围错误"); } /** @@ -59,9 +59,9 @@ * 获取AIS接口数据 * */ Request request = new Request.Builder() - .addHeader(Constant.AIS_HEADER_NAME, Constant.AIS_KEY_VALUE) - .url(Constant.SHIPS_IN_CIRCLE) - .post(RequestBody.create(MediaType.parse(Constant.CONTENT_TYPE), jsonObject.toJSONString())) + .addHeader(AisConstant.AIS_HEADER_NAME, AisConstant.AIS_KEY_VALUE) + .url(AisConstant.SHIPS_IN_CIRCLE) + .post(RequestBody.create(MediaType.parse(AisConstant.CONTENT_TYPE), jsonObject.toJSONString())) .build(); Call call = HTTP_CLIENT.newCall(request); try { diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/AisConstant.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/AisConstant.java new file mode 100644 index 0000000..2572e80 --- /dev/null +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/AisConstant.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.system.utils; + +/** + * 船舶相关常量 + * + * @author a203 + */ +public class AisConstant { + private static final String AIS_BASE_URL = "https://api3.myships.com"; + public static final String AIS_HEADER_NAME = "appKey"; + public static final String AIS_KEY_VALUE = "de26d070af5f42fabb13a02f7c0ec065"; + public static final String CONTENT_TYPE = "application/json; charset=utf-8"; + + public static final String SHIPS_IN_CIRCLE = AIS_BASE_URL + "/sp/region/latest/shipinfoCircle"; + + public static final int MIN_AGE = 1; + public static final int MAX_AGE = 240; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java index 523c6d2..67af49d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TyphoonServiceImpl.java @@ -7,7 +7,7 @@ import com.casic.missiles.modular.system.model.TyphoonDetailModel; import com.casic.missiles.modular.system.model.TyphoonModel; import com.casic.missiles.modular.system.service.ITyphoonService; -import com.casic.missiles.modular.system.utils.Constant; +import com.casic.missiles.modular.system.utils.EnvConstant; import com.casic.missiles.modular.system.utils.HttpRequestHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -38,7 +38,7 @@ /** * 获取第三方台风接口数据 * */ - String res = HttpRequestHelper.doGet(Constant.TYPHOON_LIST + System.currentTimeMillis()); + String res = HttpRequestHelper.doGet(EnvConstant.TYPHOON_LIST + System.currentTimeMillis()); if (SUCCESS_CODE.equals(HttpRequestHelper.getTyphoonCode(res))) { TyphoonModel remoteData = JSON.parseObject(res, new TypeReference() { }); @@ -62,7 +62,7 @@ * 获取台风接口数据 * */ String res = HttpRequestHelper.doGet( - Constant.TYPHOON_DETAIL.replace("ID", typhoonId) + EnvConstant.TYPHOON_DETAIL.replace("ID", typhoonId) + System.currentTimeMillis()); if (SUCCESS_CODE.equals(HttpRequestHelper.getTyphoonCode(res))) { TyphoonDetailModel remoteData = JSON.parseObject(res, new TypeReference() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java deleted file mode 100644 index c34600a..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Constant.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -/** - * @author a203 - */ -public class Constant { - /** - * 热带气旋/台风相关常量 - */ - private static final String BASE_URL = "https://route.showapi.com"; - private static final String API_APPID = "780330"; - private static final String API_SIGN_KEY = "f30ac28b65cc447da936448c57bc5d99"; - - public static final String TYPHOON_LIST = BASE_URL - + "/342-1?" - + "showapi_appid=" + API_APPID + "&" - + "showapi_sign=" + API_SIGN_KEY + "&" - + "showapi_timestamp="; - - public static final String TYPHOON_DETAIL = BASE_URL - + "/342-2?" - + "showapi_appid=" + API_APPID + "&" - + "showapi_sign=" + API_SIGN_KEY + "&" - + "tfid=ID" + "&" - + "showapi_timestamp="; - - /** - * 洋流相关常量 - */ - public static final String OCEAN_APPID = "WXZH888888"; - public static final String OCEAN_APP_KEY = "xb#bD&xtho@b80scbDb"; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/EnvConstant.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/EnvConstant.java new file mode 100644 index 0000000..a3be21e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/EnvConstant.java @@ -0,0 +1,32 @@ +package com.casic.missiles.modular.system.utils; + +/** + * @author a203 + */ +public class EnvConstant { + /** + * 热带气旋/台风相关常量 + */ + private static final String BASE_URL = "https://route.showapi.com"; + private static final String API_APPID = "780330"; + private static final String API_SIGN_KEY = "f30ac28b65cc447da936448c57bc5d99"; + + public static final String TYPHOON_LIST = BASE_URL + + "/342-1?" + + "showapi_appid=" + API_APPID + "&" + + "showapi_sign=" + API_SIGN_KEY + "&" + + "showapi_timestamp="; + + public static final String TYPHOON_DETAIL = BASE_URL + + "/342-2?" + + "showapi_appid=" + API_APPID + "&" + + "showapi_sign=" + API_SIGN_KEY + "&" + + "tfid=ID" + "&" + + "showapi_timestamp="; + + /** + * 洋流相关常量 + */ + public static final String OCEAN_APPID = "WXZH888888"; + public static final String OCEAN_APP_KEY = "xb#bD&xtho@b80scbDb"; +} 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 c819054..9e1a85d 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 @@ -28,8 +28,7 @@ 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(); + try (Response response = call.execute()) { String result = response.body() != null ? Objects.requireNonNull(response.body()).string() : ""; log.info("result ===> " + result); return result; diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java index 5c47c73..128b924 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/ShipServiceImpl.java @@ -7,7 +7,7 @@ import com.casic.missiles.modular.system.dto.ShipDTO; import com.casic.missiles.modular.system.model.ShipModel; import com.casic.missiles.modular.system.service.IShipService; -import com.casic.missiles.modular.system.utils.Constant; +import com.casic.missiles.modular.system.utils.AisConstant; import okhttp3.*; import org.springframework.stereotype.Service; @@ -41,7 +41,7 @@ if (rgn == null || rgn.isEmpty()) { throw new NullPointerException("搜索区域不能为空"); } - if (age < Constant.MIN_AGE || age > Constant.MAX_AGE) { + if (age < AisConstant.MIN_AGE || age > AisConstant.MAX_AGE) { throw new IllegalArgumentException("时间范围错误"); } /** @@ -59,9 +59,9 @@ * 获取AIS接口数据 * */ Request request = new Request.Builder() - .addHeader(Constant.AIS_HEADER_NAME, Constant.AIS_KEY_VALUE) - .url(Constant.SHIPS_IN_CIRCLE) - .post(RequestBody.create(MediaType.parse(Constant.CONTENT_TYPE), jsonObject.toJSONString())) + .addHeader(AisConstant.AIS_HEADER_NAME, AisConstant.AIS_KEY_VALUE) + .url(AisConstant.SHIPS_IN_CIRCLE) + .post(RequestBody.create(MediaType.parse(AisConstant.CONTENT_TYPE), jsonObject.toJSONString())) .build(); Call call = HTTP_CLIENT.newCall(request); try { diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/AisConstant.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/AisConstant.java new file mode 100644 index 0000000..2572e80 --- /dev/null +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/AisConstant.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.system.utils; + +/** + * 船舶相关常量 + * + * @author a203 + */ +public class AisConstant { + private static final String AIS_BASE_URL = "https://api3.myships.com"; + public static final String AIS_HEADER_NAME = "appKey"; + public static final String AIS_KEY_VALUE = "de26d070af5f42fabb13a02f7c0ec065"; + public static final String CONTENT_TYPE = "application/json; charset=utf-8"; + + public static final String SHIPS_IN_CIRCLE = AIS_BASE_URL + "/sp/region/latest/shipinfoCircle"; + + public static final int MIN_AGE = 1; + public static final int MAX_AGE = 240; +} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/Constant.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/Constant.java deleted file mode 100644 index 8edaeff..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/Constant.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -/** - * 船舶相关常量 - * - * @author a203 - */ -public class Constant { - private static final String AIS_BASE_URL = "https://api3.myships.com"; - public static final String AIS_HEADER_NAME = "appKey"; - public static final String AIS_KEY_VALUE = "de26d070af5f42fabb13a02f7c0ec065"; - public static final String CONTENT_TYPE = "application/json; charset=utf-8"; - - public static final String SHIPS_IN_CIRCLE = AIS_BASE_URL + "/sp/region/latest/shipinfoCircle"; - - public static final int MIN_AGE = 1; - public static final int MAX_AGE = 240; -}