From ef28e4268fbd93fe9eb64ff7b25421dda52e6c08 Mon Sep 17 00:00:00 2001 From: fuxinji9527 <1992666531@qq.com> Date: Fri, 26 Apr 2024 14:29:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E5=AE=89?= =?UTF-8?q?=E5=85=A8ssl=E9=80=9A=E4=BF=A1=E5=8D=8F=E8=AE=AE=EF=BC=8C?= =?UTF-8?q?=E5=92=8C=E4=BD=BF=E7=94=A8=E4=B8=8D=E5=AE=89=E5=85=A8=E9=9A=8F?= =?UTF-8?q?=E6=9C=BA=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/config/RedisConfiguration.java | 4 +-- .../common/constant/HttpConstant.java | 5 ++-- .../common/utils/HttpClientUtil.java | 29 ++++++++++--------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/easysoftware/common/config/RedisConfiguration.java b/src/main/java/com/easysoftware/common/config/RedisConfiguration.java index 447b200..e28f983 100644 --- a/src/main/java/com/easysoftware/common/config/RedisConfiguration.java +++ b/src/main/java/com/easysoftware/common/config/RedisConfiguration.java @@ -110,8 +110,8 @@ public class RedisConfiguration { trustManagerFactory.init(keyStore); //创建SSLContext - SSLContext context = SSLContext.getInstance("TLS"); - context.init(null, trustManagerFactory.getTrustManagers(), new SecureRandom()); + SSLContext context = SSLContext.getInstance("TLSv1.2"); + context.init(null, trustManagerFactory.getTrustManagers(), SecureRandom.getInstanceStrong()); return context.getSocketFactory(); } diff --git a/src/main/java/com/easysoftware/common/constant/HttpConstant.java b/src/main/java/com/easysoftware/common/constant/HttpConstant.java index 17187dd..5310766 100644 --- a/src/main/java/com/easysoftware/common/constant/HttpConstant.java +++ b/src/main/java/com/easysoftware/common/constant/HttpConstant.java @@ -1,6 +1,7 @@ package com.easysoftware.common.constant; public class HttpConstant { - public static final int timeOut = 5000; - + public static final int TIME_OUT = 5000; + public static final String GET = "GET"; + public static final String POST = "POST"; } diff --git a/src/main/java/com/easysoftware/common/utils/HttpClientUtil.java b/src/main/java/com/easysoftware/common/utils/HttpClientUtil.java index ed3c084..67c5499 100644 --- a/src/main/java/com/easysoftware/common/utils/HttpClientUtil.java +++ b/src/main/java/com/easysoftware/common/utils/HttpClientUtil.java @@ -2,10 +2,12 @@ package com.easysoftware.common.utils; import java.io.BufferedReader; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; +import java.nio.charset.StandardCharsets; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -26,23 +28,23 @@ public class HttpClientUtil { private static final Logger logger = LoggerFactory.getLogger(HttpClientUtil.class); private static final RequestConfig requestConfig = RequestConfig.custom() - .setConnectTimeout(HttpConstant.timeOut) - .setSocketTimeout(HttpConstant.timeOut).build(); + .setConnectTimeout(HttpConstant.TIME_OUT) + .setSocketTimeout(HttpConstant.TIME_OUT).build(); public static String getRequest(String urlStr) { try { URL url = new URL(urlStr); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - connection.setRequestMethod("GET"); - connection.setConnectTimeout(5000); // 设置连接超时，单位毫秒 - connection.setReadTimeout(5000); // 设置读取超时，单位毫秒 + connection.setRequestMethod(HttpConstant.GET); + connection.setConnectTimeout(HttpConstant.TIME_OUT); // 设置连接超时，单位毫秒 + connection.setReadTimeout(HttpConstant.TIME_OUT); // 设置读取超时，单位毫秒 int responseCode = connection.getResponseCode(); if (responseCode != HttpURLConnection.HTTP_OK) { throw new IOException("HTTP error code: " + responseCode); - } - - try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"))) { + } + try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), + StandardCharsets.UTF_8))) { String line; StringBuilder response = new StringBuilder(); while ((line = reader.readLine()) != null) { @@ -61,9 +63,9 @@ public class HttpClientUtil { URL url = new URL(urlStr); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - connection.setRequestMethod("POST"); - connection.setConnectTimeout(HttpConstant.timeOut); - connection.setReadTimeout(HttpConstant.timeOut); + connection.setRequestMethod(HttpConstant.POST); + connection.setConnectTimeout(HttpConstant.TIME_OUT); + connection.setReadTimeout(HttpConstant.TIME_OUT); connection.setRequestProperty("Content-Type", "application/json"); connection.setDoOutput(true); @@ -75,8 +77,9 @@ public class HttpClientUtil { try (OutputStream outputStream = connection.getOutputStream()) { outputStream.write(body.getBytes()); } - - try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"))) { + try (InputStream inputStream = connection.getInputStream(); + InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8); + BufferedReader reader = new BufferedReader(inputStreamReader)) { String line; StringBuilder response = new StringBuilder(); while ((line = reader.readLine()) != null) { -- Gitee From 3b38ac4dc261c88b193ef5e7550e5012e0235fba Mon Sep 17 00:00:00 2001 From: fuxinji9527 <1992666531@qq.com> Date: Sun, 28 Apr 2024 10:44:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E3=80=81=E8=A7=84=E8=8C=83=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=90=91=E4=B8=8D?= =?UTF-8?q?=E5=8F=98MAP=E6=8F=92=E5=85=A5=E4=BF=AE=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9A=90=E6=82=A3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApplicationPackageServiceImpl.java | 8 ++-- .../DomainPackageServiceImpl.java | 5 ++- .../rpmpackage/RPMPackageServiceImpl.java | 16 +++---- .../common/constant/HttpConstant.java | 6 ++- .../common/constant/MapConstant.java | 45 +++++++++---------- .../common/interceptor/OneidInterceptor.java | 3 +- .../easysoftware/common/utils/ApiUtil.java | 5 ++- .../common/utils/HttpClientUtil.java | 10 ++--- .../ApplicationPackageGatewayImpl.java | 22 +++------ 9 files changed, 57 insertions(+), 63 deletions(-) diff --git a/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java b/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java index b43fd6b..3afb034 100644 --- a/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java +++ b/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java @@ -120,9 +120,9 @@ public class ApplicationPackageServiceImpl implements ApplicationPackageService public ApplicationPackage addAppPkgInfo(ApplicationPackage appPkg) { Map maintainer = ApiUtil.getApiResponseMaintainer(String.format(repoMaintainerApi, appPkg.getName())); - appPkg.setMaintainerGiteeId(maintainer.get("gitee_id")); - appPkg.setMaintainerId(maintainer.get("id")); - appPkg.setMaintainerEmail(maintainer.get("email")); + appPkg.setMaintainerGiteeId(maintainer.get(MapConstant.MAINTAINER_GITEE_ID)); + appPkg.setMaintainerId(maintainer.get(MapConstant.MAINTAINER_ID)); + appPkg.setMaintainerEmail(maintainer.get(MapConstant.MAINTAINER_EMAIL)); Map info = ApiUtil.getApiResponseMap(String.format(repoInfoApi, appPkg.getName(), "app_openeuler")); appPkg.setOs(info.get("os")); @@ -151,7 +151,7 @@ public class ApplicationPackageServiceImpl implements ApplicationPackageService if (resp != null && MapConstant.CATEGORY_MAP.containsKey(resp)) { appPkg.setCategory(MapConstant.CATEGORY_MAP.get(resp)); } else { - appPkg.setCategory(MapConstant.CATEGORY_MAP.get("Other")); + appPkg.setCategory(MapConstant.CATEGORY_MAP.get(MapConstant.CATEGORY_OTHER)); } return appPkg; } diff --git a/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java b/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java index c78bc7a..254e7e6 100644 --- a/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java +++ b/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java @@ -149,12 +149,13 @@ public class DomainPackageServiceImpl implements DomainPackageService { private ResponseEntity searchAllEntity(DomainSearchCondition condition) { // 根据请求参数生成唯一redis key String redisKeyStr = RedisUtil.objectToString(condition); - String redisKey = String.format("domainPage_%s",RedisUtil.getSHA256(redisKeyStr)); + String redisKeyFormat = "domainPage_%s"; + String redisKey = String.format(redisKeyFormat,RedisUtil.getSHA256(redisKeyStr)); try { // 结果未过期，直接返回 - if(redisGateway.hasKey(redisKey) == true){ + if(redisGateway.hasKey(redisKey)){ String resJson = redisGateway.get(redisKey); Object res = RedisUtil.convertToObject(resJson); return ResultUtil.success(HttpStatus.OK, res); diff --git a/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java b/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java index d3e6c5a..59865ff 100644 --- a/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java +++ b/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java @@ -86,7 +86,7 @@ public class RPMPackageServiceImpl extends ServiceImpl rpmList = rPMPkgGateway.queryDetailByPkgId(pkgId); - if (rpmList.size() != 0) { + if (!rpmList.isEmpty()) { Map res = Map.ofEntries( Map.entry("total", rpmList.size()), Map.entry("list", rpmList) @@ -144,19 +144,17 @@ public class RPMPackageServiceImpl extends ServiceImpl maintainer = ApiUtil.getApiResponseMaintainer(String.format(repoMaintainerApi, rPMPkg.getName())); - rPMPkg.setMaintainerGiteeId(maintainer.get("gitee_id")); - rPMPkg.setMaintainerId(maintainer.get("id")); - rPMPkg.setMaintainerEmail(maintainer.get("email")); + rPMPkg.setMaintainerGiteeId(maintainer.get(MapConstant.MAINTAINER_GITEE_ID)); + rPMPkg.setMaintainerId(maintainer.get(MapConstant.MAINTAINER_ID)); + rPMPkg.setMaintainerEmail(maintainer.get(MapConstant.MAINTAINER_EMAIL)); return rPMPkg; } public RPMPackage addRPMPkgRepoSig(RPMPackage rPMPkg) { String resp = ApiUtil.getApiResponseData(String.format(repoSigApi, rPMPkg.getName())); - if (resp != null && MapConstant.CATEGORY_MAP.containsKey(resp)) { - rPMPkg.setCategory(MapConstant.CATEGORY_MAP.get(resp)); - } else { - rPMPkg.setCategory(MapConstant.CATEGORY_MAP.get("Other")); - } + String category = (resp != null && MapConstant.CATEGORY_MAP.containsKey(resp)) ? + MapConstant.CATEGORY_MAP.get(resp) : MapConstant.CATEGORY_MAP.get(MapConstant.CATEGORY_OTHER); + rPMPkg.setCategory(category); return rPMPkg; } diff --git a/src/main/java/com/easysoftware/common/constant/HttpConstant.java b/src/main/java/com/easysoftware/common/constant/HttpConstant.java index 5310766..9009cc5 100644 --- a/src/main/java/com/easysoftware/common/constant/HttpConstant.java +++ b/src/main/java/com/easysoftware/common/constant/HttpConstant.java @@ -1,7 +1,11 @@ package com.easysoftware.common.constant; -public class HttpConstant { +public final class HttpConstant { public static final int TIME_OUT = 5000; public static final String GET = "GET"; public static final String POST = "POST"; + public static final String TOKEN = "token"; + public static final String COOKIE = "Cookie"; + public static final String USER_TOKEN = "user-token"; + public static final String CONTENT_TYPE = "Content-Type"; } diff --git a/src/main/java/com/easysoftware/common/constant/MapConstant.java b/src/main/java/com/easysoftware/common/constant/MapConstant.java index 262b912..b900da5 100644 --- a/src/main/java/com/easysoftware/common/constant/MapConstant.java +++ b/src/main/java/com/easysoftware/common/constant/MapConstant.java @@ -1,29 +1,28 @@ package com.easysoftware.common.constant; -import java.util.Collections; -import java.util.HashMap; import java.util.Map; public class MapConstant { - public static final Map CATEGORY_MAP; - public static final Map MAINTAINER; - - static { - Map categoryMap = new HashMap<>(); - categoryMap.put("bigdata", "大数据"); - categoryMap.put("ai", "AI"); - categoryMap.put("Storage", "分布式存储"); - categoryMap.put("sig-CloudNative", "云服务"); - categoryMap.put("sig-HPC", "HPC"); - categoryMap.put("Other", "其他"); - CATEGORY_MAP = Collections.unmodifiableMap(categoryMap); - } - - static { - Map maintainerMap = new HashMap<>(); - maintainerMap.put("id", "openEuler Community"); - maintainerMap.put("email", "contact@openeuler.io"); - maintainerMap.put("gitee_id", "openeuler-ci-bot"); - MAINTAINER = Collections.unmodifiableMap(maintainerMap); - } + public static final String CATEGORY_BIGDATA = "bigdata"; + public static final String CATEGORY_AI = "ai"; + public static final String CATEGORY_STORAGE = "Storage"; + public static final String CATEGORY_CLOUD_NATIVE = "sig-CloudNative"; + public static final String CATEGORY_HPC = "sig-HPC"; + public static final String CATEGORY_OTHER = "Other"; + public static final String MAINTAINER_ID = "id"; + public static final String MAINTAINER_EMAIL = "email"; + public static final String MAINTAINER_GITEE_ID = "gitee_id"; + public static final Map CATEGORY_MAP = Map.of( + CATEGORY_BIGDATA, "大数据", + CATEGORY_AI, "AI", + CATEGORY_STORAGE, "分布式存储", + CATEGORY_CLOUD_NATIVE, "云服务", + CATEGORY_HPC, "HPC", + CATEGORY_OTHER, "其他" + ); + public static final Map MAINTAINER = Map.of( + MAINTAINER_ID, "openEuler Community", + MAINTAINER_EMAIL, "contact@openeuler.io", + MAINTAINER_GITEE_ID, "openeuler-ci-bot" + ); } diff --git a/src/main/java/com/easysoftware/common/interceptor/OneidInterceptor.java b/src/main/java/com/easysoftware/common/interceptor/OneidInterceptor.java index e4faca3..01ce316 100644 --- a/src/main/java/com/easysoftware/common/interceptor/OneidInterceptor.java +++ b/src/main/java/com/easysoftware/common/interceptor/OneidInterceptor.java @@ -3,6 +3,7 @@ package com.easysoftware.common.interceptor; import java.lang.reflect.Method; import java.util.*; +import com.easysoftware.common.constant.HttpConstant; import com.easysoftware.common.exception.AuthException; import com.easysoftware.common.utils.HttpClientUtil; import com.easysoftware.common.utils.ObjectMapperUtil; @@ -61,7 +62,7 @@ public class OneidInterceptor implements HandlerInterceptor { throw new AuthException("unauthorized, missing cookie"); } - String userToken = httpServletRequest.getHeader("token"); + String userToken = httpServletRequest.getHeader(HttpConstant.TOKEN); if (userToken == null) { throw new AuthException("unauthorized, missing token"); } diff --git a/src/main/java/com/easysoftware/common/utils/ApiUtil.java b/src/main/java/com/easysoftware/common/utils/ApiUtil.java index 00a7318..c0149ce 100644 --- a/src/main/java/com/easysoftware/common/utils/ApiUtil.java +++ b/src/main/java/com/easysoftware/common/utils/ApiUtil.java @@ -22,14 +22,15 @@ public class ApiUtil { } public static Map getApiResponseMaintainer(String url) { - Map maintainer = MapConstant.MAINTAINER; + //创建一个新的可修改的 Map，并将不可修改的 Map 中的所有元素复制到其中 + Map maintainer = new HashMap<>(MapConstant.MAINTAINER); String response = HttpClientUtil.getHttpClient(url, null, null, null); if (response != null) { JsonNode info = ObjectMapperUtil.toJsonNode(response); if (info.get("code").asInt() == 200 && !info.get("data").isNull()) { JsonNode infoData = info.get("data"); maintainer = ObjectMapperUtil.jsonToMap(infoData); - maintainer.put("id", maintainer.get("gitee_id")); + maintainer.put(MapConstant.MAINTAINER_ID, maintainer.get(MapConstant.MAINTAINER_GITEE_ID)); } } return maintainer; diff --git a/src/main/java/com/easysoftware/common/utils/HttpClientUtil.java b/src/main/java/com/easysoftware/common/utils/HttpClientUtil.java index 67c5499..2d0cde2 100644 --- a/src/main/java/com/easysoftware/common/utils/HttpClientUtil.java +++ b/src/main/java/com/easysoftware/common/utils/HttpClientUtil.java @@ -66,7 +66,7 @@ public class HttpClientUtil { connection.setRequestMethod(HttpConstant.POST); connection.setConnectTimeout(HttpConstant.TIME_OUT); connection.setReadTimeout(HttpConstant.TIME_OUT); - connection.setRequestProperty("Content-Type", "application/json"); + connection.setRequestProperty(HttpConstant.CONTENT_TYPE, "application/json"); connection.setDoOutput(true); int responseCode = connection.getResponseCode(); @@ -98,9 +98,9 @@ public class HttpClientUtil { HttpGet httpGet = new HttpGet(uri); httpGet.setConfig(requestConfig); - if (token != null) httpGet.addHeader("token", token); - if (userToken != null) httpGet.addHeader("user-token", userToken); - if (cookie != null) httpGet.addHeader("Cookie", "_Y_G_=" + cookie); + if (token != null) httpGet.addHeader(HttpConstant.TOKEN, token); + if (userToken != null) httpGet.addHeader(HttpConstant.USER_TOKEN, userToken); + if (cookie != null) httpGet.addHeader(HttpConstant.COOKIE, "_Y_G_=" + cookie); try { HttpResponse response = httpClient.execute(httpGet); @@ -116,7 +116,7 @@ public class HttpClientUtil { HttpPost httpPost = new HttpPost(uri); httpPost.setConfig(requestConfig); try { - httpPost.setHeader("Content-Type", "application/json"); + httpPost.setHeader(HttpConstant.CONTENT_TYPE, "application/json"); StringEntity stringEntity = new StringEntity(requestBody); httpPost.setEntity(stringEntity); HttpResponse response = httpClient.execute(httpPost); diff --git a/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java index 5614670..2650a1c 100644 --- a/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java @@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.BadSqlGrammarException; import org.springframework.stereotype.Component; -import org.springframework.web.bind.MethodArgumentNotValidException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -18,8 +17,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.easysoftware.application.applicationpackage.dto.ApplicationPackageSearchCondition; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageDetailVo; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageMenuVo; -import com.easysoftware.application.rpmpackage.dto.RPMPackageSearchCondition; -import com.easysoftware.common.entity.MessageCode; import com.easysoftware.common.exception.ParamErrorException; import com.easysoftware.common.utils.ClassField; import com.easysoftware.common.utils.QueryWrapperUtil; @@ -28,10 +25,8 @@ import com.easysoftware.domain.applicationpackage.gateway.ApplicationPackageGate import com.easysoftware.infrastructure.applicationpackage.gatewayimpl.converter.ApplicationPackageConverter; import com.easysoftware.infrastructure.applicationpackage.gatewayimpl.dataobject.ApplicationPackageDO; import com.easysoftware.infrastructure.mapper.ApplicationPackageDOMapper; -import com.easysoftware.infrastructure.rpmpackage.gatewayimpl.dataobject.RPMPackageDO; import com.power.common.util.StringUtil; -import okhttp3.internal.ws.RealWebSocket.Message; @Component public class ApplicationPackageGatewayImpl implements ApplicationPackageGateway { @@ -111,18 +106,16 @@ public class ApplicationPackageGatewayImpl implements ApplicationPackageGateway List appDetails = ApplicationPackageConverter.toDetail(appDOs); long total = resPage.getTotal(); - Map res = Map.ofEntries( + return Map.ofEntries( Map.entry("total", total), Map.entry("list", appDetails) ); - return res; } private Page createPage(ApplicationPackageSearchCondition condition) { int pageNum = condition.getPageNum(); int pageSize = condition.getPageSize(); - Page page = new Page<>(pageNum, pageSize); - return page; + return new Page<>(pageNum, pageSize); } @Override @@ -141,8 +134,7 @@ public class ApplicationPackageGatewayImpl implements ApplicationPackageGateway if (appList.size() == 0) { return new ApplicationPackageMenuVo(); } - ApplicationPackageMenuVo res =ApplicationPackageConverter.toMenu(appList.get(0)); - return res; + return ApplicationPackageConverter.toMenu(appList.get(0)); } @@ -151,8 +143,7 @@ public class ApplicationPackageGatewayImpl implements ApplicationPackageGateway QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("pkg_id", pkgId); List appList = appPkgMapper.selectList(wrapper); - List res = ApplicationPackageConverter.toDetail(appList); - return res; + return ApplicationPackageConverter.toDetail(appList); } @Override @@ -177,8 +168,7 @@ public class ApplicationPackageGatewayImpl implements ApplicationPackageGateway } column = StringUtil.underlineToCamel(column); - List res = ApplicationPackageConverter.toColumn(rpmColumn, column); - - return res; + + return ApplicationPackageConverter.toColumn(rpmColumn, column); } } -- Gitee