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