refactor: rename

1. 将枚举 Server 改为字符串常量，使得 memshell 和 probeshell 都能共用
2. 移除 memshell 模块直接内置在 generator 中
3. 通用类从 memshell 移动至 javaweb 下，命名修改，增加辨识度

Author: ReaJason

boot/src/main/java/com/reajason/javaweb/boot/BootApplication.java

@@ -1,12 +1,9 @@
 package com.reajason.javaweb.boot;
 
-import com.reajason.javaweb.memshell.Server;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import java.util.Arrays;
-
 /**
  * @author ReaJason
  */
@@ -16,8 +13,5 @@ public class BootApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(BootApplication.class, args);
-        Server[] values = Server.values();
-        log.info("Supported servers: {}", Arrays.toString(values));
-        log.info("For another server, you can open a issue in GitHub, https://github.com/ReaJason/MemShellParty/issues/new?template=%E8%AF%B7%E6%B1%82%E9%80%82%E9%85%8D.md");
     }
 }

boot/src/main/java/com/reajason/javaweb/boot/controller/ConfigController.java

@@ -1,10 +1,10 @@
 package com.reajason.javaweb.boot.controller;
 
 import com.reajason.javaweb.boot.vo.CommandConfigVO;
-import com.reajason.javaweb.memshell.Server;
+import com.reajason.javaweb.memshell.ServerFactory;
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.config.CommandConfig;
-import com.reajason.javaweb.memshell.server.AbstractShell;
+import com.reajason.javaweb.memshell.server.AbstractServer;
 import com.reajason.javaweb.packer.Packers;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,11 +25,10 @@ public class ConfigController {
     @RequestMapping("/servers")
     public Map<String, List<String>> getServers() {
         Map<String, List<String>> servers = new LinkedHashMap<>();
-        for (Server server : Server.values()) {
-            if (server.getShell() != null) {
-                Set<String> supportedShellTypes = server.getShell().getShellInjectorMapping().getSupportedShellTypes();
-                servers.put(server.name(), supportedShellTypes.stream().toList());
-            }
+        List<String> supportedServers = ServerFactory.getSupportedServers();
+        for (String supportedServer : supportedServers) {
+            Set<String> supportedShellTypes = ServerFactory.getServer(supportedServer).getShellInjectorMapping().getSupportedShellTypes();
+            servers.put(supportedServer, supportedShellTypes.stream().toList());
         }
         return servers;
     }
@@ -44,20 +43,21 @@ public List<String> getPackers() {
     @RequestMapping
     public Map<String, Map<?, ?>> config() {
         Map<String, Map<?, ?>> coreMap = new HashMap<>(16);
-        for (Server value : Server.values()) {
-            AbstractShell shell = value.getShell();
-            if (shell == null) {
+        List<String> supportedServers = ServerFactory.getSupportedServers();
+        for (String supportedServer : supportedServers) {
+            AbstractServer server = ServerFactory.getServer(supportedServer);
+            if (server == null) {
                 continue;
             }
             Map<String, Set<String>> map = new LinkedHashMap<>(16);
-            for (ShellTool shellTool : shell.getSupportedShellTools()) {
-                Set<String> supportedShellTypes = shell.getSupportedShellTypes(shellTool);
+            for (ShellTool shellTool : server.getSupportedShellTools()) {
+                Set<String> supportedShellTypes = server.getSupportedShellTypes(shellTool);
                 if (supportedShellTypes.isEmpty()) {
                     continue;
                 }
                 map.put(shellTool.name(), supportedShellTypes);
             }
-            coreMap.put(value.name(), map);
+            coreMap.put(supportedServer, map);
         }
         return coreMap;
     }

…boot/controller/GeneratorController.java …troller/MemShellGeneratorController.javaboot/src/main/java/com/reajason/javaweb/boot/controller/GeneratorController.java renamed to boot/src/main/java/com/reajason/javaweb/boot/controller/MemShellGeneratorController.java boot/src/main/java/com/reajason/javaweb/boot/controller/GeneratorController.java renamed to boot/src/main/java/com/reajason/javaweb/boot/controller/MemShellGeneratorController.java

@@ -1,7 +1,7 @@
 package com.reajason.javaweb.boot.controller;
 
-import com.reajason.javaweb.boot.dto.GenerateRequest;
-import com.reajason.javaweb.boot.dto.GenerateResponse;
+import com.reajason.javaweb.boot.dto.MemShellGenerateRequest;
+import com.reajason.javaweb.boot.dto.MemShellGenerateResponse;
 import com.reajason.javaweb.memshell.MemShellGenerator;
 import com.reajason.javaweb.memshell.MemShellResult;
 import com.reajason.javaweb.memshell.config.InjectorConfig;
@@ -19,22 +19,22 @@
  * @since 2024/12/18
  */
 @RestController
-@RequestMapping("/generate")
+@RequestMapping("/memshell/generate")
 @CrossOrigin("*")
-public class GeneratorController {
+public class MemShellGeneratorController {
     @PostMapping
-    public GenerateResponse generate(@RequestBody GenerateRequest request) {
+    public MemShellGenerateResponse generate(@RequestBody MemShellGenerateRequest request) {
         ShellConfig shellConfig = request.getShellConfig();
         ShellToolConfig shellToolConfig = request.parseShellToolConfig();
         InjectorConfig injectorConfig = request.getInjectorConfig();
         MemShellResult generateResult = MemShellGenerator.generate(shellConfig, injectorConfig, shellToolConfig);
         Packer packer = request.getPacker().getInstance();
         if (packer instanceof JarPacker) {
-            return new GenerateResponse(generateResult, Base64.getEncoder().encodeToString(((JarPacker) packer).packBytes(generateResult.toJarPackerConfig())));
+            return new MemShellGenerateResponse(generateResult, Base64.getEncoder().encodeToString(((JarPacker) packer).packBytes(generateResult.toJarPackerConfig())));
         } else if (packer instanceof AggregatePacker) {
-            return new GenerateResponse(generateResult, ((AggregatePacker) packer).packAll(generateResult.toClassPackerConfig()));
+            return new MemShellGenerateResponse(generateResult, ((AggregatePacker) packer).packAll(generateResult.toClassPackerConfig()));
         } else {
-            return new GenerateResponse(generateResult, packer.pack(generateResult.toClassPackerConfig()));
+            return new MemShellGenerateResponse(generateResult, packer.pack(generateResult.toClassPackerConfig()));
         }
     }
 }

boot/src/main/java/com/reajason/javaweb/boot/controller/ProbeGeneratorController.java

@@ -0,0 +1,33 @@
+package com.reajason.javaweb.boot.controller;
+
+import com.reajason.javaweb.boot.dto.ProbeShellGenerateRequest;
+import com.reajason.javaweb.boot.dto.ProbeShellGenerateResponse;
+import com.reajason.javaweb.packer.AggregatePacker;
+import com.reajason.javaweb.packer.Packer;
+import com.reajason.javaweb.probe.ProbeShellGenerator;
+import com.reajason.javaweb.probe.ProbeShellResult;
+import com.reajason.javaweb.probe.config.ProbeConfig;
+import com.reajason.javaweb.probe.config.ProbeContentConfig;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author ReaJason
+ * @since 2025/8/10
+ */
+@RestController
+@RequestMapping("/probe/generate")
+@CrossOrigin("*")
+public class ProbeShellGeneratorController {
+    @PostMapping
+    public ProbeShellGenerateResponse generate(@RequestBody ProbeShellGenerateRequest request) {
+        ProbeConfig probeConfig = request.getProbeConfig();
+        ProbeContentConfig probeContentConfig = request.parseProbeContentConfig();
+        ProbeShellResult generateResult = ProbeShellGenerator.generate(probeConfig, probeContentConfig);
+        Packer packer = request.getPacker().getInstance();
+        if (packer instanceof AggregatePacker) {
+            return new ProbeShellGenerateResponse(generateResult, ((AggregatePacker) packer).packAll(generateResult.toClassPackerConfig()));
+        } else {
+            return new ProbeShellGenerateResponse(generateResult, packer.pack(generateResult.toClassPackerConfig()));
+        }
+    }
+}

boot/src/main/java/com/reajason/javaweb/boot/controller/ProbeShellGeneratorController.java

@@ -1,8 +1,8 @@
 package com.reajason.javaweb.boot.dto;
 
 import com.reajason.javaweb.memshell.config.*;
-import com.reajason.javaweb.memshell.utils.CommonUtil;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.utils.CommonUtil;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
@@ -11,7 +11,7 @@
  * @since 2024/12/18
  */
 @Data
-public class GenerateRequest {
+public class MemShellGenerateRequest {
     private ShellConfig shellConfig;
     private ShellToolConfigDTO shellToolConfig;
     private InjectorConfig injectorConfig;

…on/javaweb/boot/dto/GenerateRequest.java …eb/boot/dto/MemShellGenerateRequest.javaboot/src/main/java/com/reajason/javaweb/boot/dto/GenerateRequest.java renamed to boot/src/main/java/com/reajason/javaweb/boot/dto/MemShellGenerateRequest.java boot/src/main/java/com/reajason/javaweb/boot/dto/GenerateRequest.java renamed to boot/src/main/java/com/reajason/javaweb/boot/dto/MemShellGenerateRequest.java

@@ -12,18 +12,18 @@
  */
 @Data
 @NoArgsConstructor
-public class GenerateResponse {
-    private MemShellResult generateResult;
+public class MemShellGenerateResponse {
+    private MemShellResult memShellResult;
     private String packResult;
     private Map<String, String> allPackResults;
 
-    public GenerateResponse(MemShellResult generateResult, String packResult) {
-        this.generateResult = generateResult;
+    public MemShellGenerateResponse(MemShellResult memShellResult, String packResult) {
+        this.memShellResult = memShellResult;
         this.packResult = packResult;
     }
 
-    public GenerateResponse(MemShellResult generateResult, Map<String, String> allPackResults) {
+    public MemShellGenerateResponse(MemShellResult memShellResult, Map<String, String> allPackResults) {
         this.allPackResults = allPackResults;
-        this.generateResult = generateResult;
+        this.memShellResult = memShellResult;
     }
 }

…n/javaweb/boot/dto/GenerateResponse.java …b/boot/dto/MemShellGenerateResponse.javaboot/src/main/java/com/reajason/javaweb/boot/dto/GenerateResponse.java renamed to boot/src/main/java/com/reajason/javaweb/boot/dto/MemShellGenerateResponse.java boot/src/main/java/com/reajason/javaweb/boot/dto/GenerateResponse.java renamed to boot/src/main/java/com/reajason/javaweb/boot/dto/MemShellGenerateResponse.java

@@ -9,7 +9,7 @@
  * @since 2025/8/10
  */
 @Data
-public class ProbeGenerateRequest {
+public class ProbeShellGenerateRequest {
     private ProbeConfig probeConfig;
     private ProbeContentConfigDTO probeContentConfig;
     private Packers packer;

boot/src/main/java/com/reajason/javaweb/boot/dto/ProbeGenerateResponse.java

@@ -0,0 +1,29 @@
+package com.reajason.javaweb.boot.dto;
+
+import com.reajason.javaweb.probe.ProbeShellResult;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+
+/**
+ * @author ReaJason
+ * @since 2025/8/10
+ */
+@Data
+@NoArgsConstructor
+public class ProbeShellGenerateResponse {
+    private ProbeShellResult probeShellResult;
+    private String packResult;
+    private Map<String, String> allPackResults;
+
+    public ProbeShellGenerateResponse(ProbeShellResult probeShellResult, String packResult) {
+        this.probeShellResult = probeShellResult;
+        this.packResult = packResult;
+    }
+
+    public ProbeShellGenerateResponse(ProbeShellResult probeShellResult, Map<String, String> allPackResults) {
+        this.allPackResults = allPackResults;
+        this.probeShellResult = probeShellResult;
+    }
+}