mirror of
https://github.com/NotoChen/Jetbrains-Help.git
synced 2025-05-24 23:16:44 +08:00
build🪄(针对JDK8的支持):
This commit is contained in:
parent
40617ef6b5
commit
5a0e3bb295
4
pom.xml
4
pom.xml
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>3.2.4</version>
|
||||
<version>2.7.18</version>
|
||||
<relativePath/> <!-- lookup parent from repository -->
|
||||
</parent>
|
||||
<groupId>com.jetbrains.help</groupId>
|
||||
|
@ -14,7 +14,7 @@
|
|||
<name>Jetbrains-Help</name>
|
||||
<description>Jetbrains-Help</description>
|
||||
<properties>
|
||||
<java.version>21</java.version>
|
||||
<java.version>8</java.version>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
|
|
@ -21,6 +21,7 @@ import java.security.cert.Certificate;
|
|||
import java.security.cert.CertificateEncodingException;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static cn.hutool.crypto.asymmetric.SignAlgorithm.SHA1withRSA;
|
||||
|
||||
|
@ -35,7 +36,7 @@ public class LicenseContextHolder {
|
|||
.setCode(productCode)
|
||||
.setFallbackDate(expiryDate)
|
||||
.setPaidUpTo(expiryDate))
|
||||
.toList();
|
||||
.collect(Collectors.toList());
|
||||
LicensePart licensePart = new LicensePart()
|
||||
.setLicenseId(licenseId)
|
||||
.setLicenseeName(licensesName)
|
||||
|
|
|
@ -18,6 +18,7 @@ import java.io.InputStream;
|
|||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Slf4j
|
||||
@NoArgsConstructor(access = AccessLevel.PRIVATE)
|
||||
|
@ -101,7 +102,7 @@ public class PluginsContextHolder {
|
|||
.stream()
|
||||
.filter(plugin -> !PluginsContextHolder.pluginCacheList.contains(new PluginCache().setId(plugin.getId())))
|
||||
.filter(plugin -> !CharSequenceUtil.equals(plugin.getPricingModel(), "FREE"))
|
||||
.toList();
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public static List<PluginCache> pluginConversion(List<PluginList.Plugin> pluginList) {
|
||||
|
@ -117,7 +118,7 @@ public class PluginsContextHolder {
|
|||
.setIcon(PLUGIN_BASIC_URL + plugin.getIcon())
|
||||
;
|
||||
})
|
||||
.toList();
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public static PluginInfo pluginInfo(Long pluginId) {
|
||||
|
@ -147,9 +148,9 @@ public class PluginsContextHolder {
|
|||
@Override
|
||||
public final boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (!(o instanceof PluginCache that)) return false;
|
||||
if (!(o instanceof PluginCache)) return false;
|
||||
|
||||
return id.equals(that.id);
|
||||
return id.equals(((PluginCache) o).id);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -15,6 +15,7 @@ import java.util.Collection;
|
|||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
public class OpenApiController {
|
||||
|
@ -41,12 +42,12 @@ public class OpenApiController {
|
|||
.filter(StrUtil::isNotBlank)
|
||||
.map(productCode -> CharSequenceUtil.splitTrim(productCode, ","))
|
||||
.flatMap(Collection::stream)
|
||||
.toList();
|
||||
.collect(Collectors.toList());
|
||||
List<String> pluginCodeList = PluginsContextHolder.pluginCacheList()
|
||||
.stream()
|
||||
.map(PluginsContextHolder.PluginCache::getProductCode)
|
||||
.filter(StrUtil::isNotBlank)
|
||||
.toList();
|
||||
.collect(Collectors.toList());
|
||||
productCodeSet = CollUtil.newHashSet(productCodeList);
|
||||
productCodeSet.addAll(pluginCodeList);
|
||||
}else {
|
||||
|
|
|
@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
|||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static org.springframework.http.HttpHeaders.CONTENT_DISPOSITION;
|
||||
import static org.springframework.http.MediaType.APPLICATION_OCTET_STREAM;
|
||||
|
@ -50,10 +51,10 @@ public class IndexController {
|
|||
if (CharSequenceUtil.isNotBlank(search)) {
|
||||
productCacheList = productCacheList.stream()
|
||||
.filter(productCache -> CharSequenceUtil.containsIgnoreCase(productCache.getName(), search))
|
||||
.toList();
|
||||
.collect(Collectors.toList());
|
||||
pluginCacheList = pluginCacheList.stream()
|
||||
.filter(pluginCache -> CharSequenceUtil.containsIgnoreCase(pluginCache.getName(), search))
|
||||
.toList();
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
model.addAttribute("products", productCacheList);
|
||||
model.addAttribute("plugins", pluginCacheList);
|
||||
|
|
Loading…
Reference in New Issue
Block a user