refactor: use platform to manage dependency

1. rename Packer.INSTANCE
2. gradle platform is a good thing (resolved #31)
This commit is contained in:
ReaJason
2025-01-25 20:30:08 +08:00
parent ecbde7dbae
commit 988d751129
89 changed files with 1411 additions and 1347 deletions
+1 -1
View File
@@ -49,7 +49,7 @@ dependencies {
implementation(project(":deserialize")) {
exclude group: 'commons-logging', module: 'commons-logging'
}
implementation 'org.apache.bcel:bcel:5.2'
implementation 'org.apache.bcel:bcel'
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation('org.springframework.boot:spring-boot-starter-web') {
exclude group:'org.springframework.boot', module:'spring-boot-starter-tomcat'
@@ -4,7 +4,7 @@ import com.reajason.javaweb.boot.entity.Config;
import com.reajason.javaweb.memshell.AbstractShell;
import com.reajason.javaweb.memshell.config.Server;
import com.reajason.javaweb.memshell.config.ShellTool;
import com.reajason.javaweb.memshell.packer.Packer;
import com.reajason.javaweb.memshell.packer.Packers;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -51,7 +51,7 @@ public class ConfigController {
.collect(Collectors.toList())
);
config.setCore(coreMap);
config.setPackers(Arrays.stream(Packer.INSTANCE.values()).map(Packer.INSTANCE::name).toList());
config.setPackers(Arrays.stream(Packers.values()).map(Packers::name).toList());
return ResponseEntity.ok(config);
}
}
@@ -28,10 +28,10 @@ public class GeneratorController {
InjectorConfig injectorConfig = request.getInjectorConfig();
GenerateResult generateResult = GeneratorMain.generate(shellConfig, injectorConfig, shellToolConfig);
String packResult = null;
if (request.getPacker().getPacker() instanceof JarPacker) {
packResult = Base64.getEncoder().encodeToString(request.getPacker().getPacker().packBytes(generateResult));
if (request.getPacker().getInstance() instanceof JarPacker) {
packResult = Base64.getEncoder().encodeToString(request.getPacker().getInstance().packBytes(generateResult));
} else {
packResult = request.getPacker().getPacker().pack(generateResult);
packResult = request.getPacker().getInstance().pack(generateResult);
}
return ResponseEntity.ok(new GenerateResponse(generateResult, packResult));
}
@@ -1,7 +1,7 @@
package com.reajason.javaweb.boot.dto;
import com.reajason.javaweb.memshell.config.*;
import com.reajason.javaweb.memshell.packer.Packer;
import com.reajason.javaweb.memshell.packer.Packers;
import lombok.Data;
/**
@@ -13,7 +13,7 @@ public class GenerateRequest {
private ShellConfig shellConfig;
private ShellToolConfigDTO shellToolConfig;
private InjectorConfig injectorConfig;
private Packer.INSTANCE packer;
private Packers packer;
@Data
static class ShellToolConfigDTO {