feat 使用spring-shell 最新用法

wertycn · Feb 4, 2024 · d82076b · d82076b
1 parent 7b3da4c
commit d82076b
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -37,10 +37,10 @@
             <version>3.10.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-web</artifactId>-->
+<!--        </dependency>-->
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.modulith</groupId>-->
 <!--            <artifactId>spring-modulith-starter-core</artifactId>-->

diff --git a/spring-shell.log b/spring-shell.log
@@ -0,0 +1,7 @@
+1707063293854:你好
+1707063298440:gen
+1707063304922:ls
+1707063306664:help
+1707063408183:generate help
+1707063432086:generate --struct_file_path ./
+1707063473729:generate --struct_file_path D:\\mycode\\wgnet-register\\wireguard-registry-core\\src\\test\\resources\\wireguard-network-example.json
diff --git a/wireguard-registry-client/src/main/java/icu/debug/net/wg/client/Application.java b/wireguard-registry-client/src/main/java/icu/debug/net/wg/client/Application.java
@@ -1,14 +1,19 @@
 package icu.debug.net.wg.client;
 
+import icu.debug.net.wg.client.command.LightCommand;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.shell.command.annotation.CommandScan;
+import org.springframework.shell.command.annotation.EnableCommand;
 
 /**
  * @author hanjinxiang@debug.icu
  * @date 2024-02-04 1:13
  */
 @Slf4j
+//@CommandScan
+@EnableCommand(LightCommand.class)
 @SpringBootApplication
 public class Application {
 

diff --git a/wireguard-registry-client/src/main/java/icu/debug/net/wg/client/command/LightCommand.java b/wireguard-registry-client/src/main/java/icu/debug/net/wg/client/command/LightCommand.java
@@ -1,6 +1,8 @@
 package icu.debug.net.wg.client.command;
 
 import icu.debug.net.wg.client.module.ConfigGenerateModule;
+import org.springframework.shell.command.annotation.Command;
+import org.springframework.shell.context.InteractionMode;
 import org.springframework.shell.standard.ShellComponent;
 import org.springframework.shell.standard.ShellMethod;
 import org.springframework.shell.standard.ShellOption;
@@ -14,7 +16,7 @@
  * @author hanjinxiang@debug.icu
  * @date 2024-02-04 0:44
  */
-@ShellComponent("light")
+@Command(interactionMode = InteractionMode.NONINTERACTIVE)
 public class LightCommand {
 
     private final ConfigGenerateModule module;
@@ -23,7 +25,7 @@ public LightCommand(ConfigGenerateModule module) {
         this.module = module;
     }
 
-    @ShellMethod(key = "generate")
+    @Command(command = "generate", alias = "gen", description = "基于组网规划配置生成组网配置文件", interactionMode = InteractionMode.NONINTERACTIVE)
     public String helloWorld(
             @ShellOption(value = "struct_file_path", help = "网络规划JSON配置") String structFile,
             @ShellOption(value = "output_path", defaultValue = "./", help = "生成结果存储路径") String output

diff --git a/...rd-registry-client/src/main/java/icu/debug/net/wg/client/module/ConfigGenerateModule.java b/...rd-registry-client/src/main/java/icu/debug/net/wg/client/module/ConfigGenerateModule.java
@@ -5,6 +5,7 @@
 import icu.debug.net.wg.core.model.config.WireGuardIniConfig;
 import icu.debug.net.wg.core.model.config.WireGuardNetProperties;
 import icu.debug.net.wg.core.model.network.WireGuardNetworkStruct;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 
@@ -22,13 +23,15 @@
  * @author hanjinxiang@debug.icu
  * @date 2024-02-04 1:53
  */
+@Slf4j
 @Component
 public class ConfigGenerateModule {
 
     private final WireGuardNetProperties defaultProperties;
 
     public ConfigGenerateModule(WireGuardNetProperties defaultProperties) {
         this.defaultProperties = defaultProperties;
+        log.info("default properties {}", this.defaultProperties);
     }
 
     public List<Path> generateFiles(String structFilePath, String outputPath) {
@@ -80,7 +83,7 @@ private static String readFile(String structFilePath) {
         try {
             return FileHelper.read(structFilePath);
         } catch (IOException e) {
-            throw new IllegalArgumentException("file: [" + structFilePath + "] struct file load failed:" + e.getMessage(), e);
+            throw new IllegalArgumentException("file: [" + Paths.get(structFilePath) + "] struct file load failed:" + e.getMessage(), e);
         }
     }
 }
diff --git a/...lient/src/main/resources/appliaction.yaml → ...lient/src/main/resources/application.yaml b/...lient/src/main/resources/appliaction.yaml → ...lient/src/main/resources/application.yaml
@@ -1,3 +1,5 @@
+spring:
+
 wireguard:
   default:
     address: "10.201.1.1"
@@ -9,7 +11,7 @@ wireguard:
     table: "auto"
     mtu: 1500
     preUp:
-#      - "ip rule add ipproto tcp dport 22 table 1234"
+    #      - "ip rule add ipproto tcp dport 22 table 1234"
     postUp:
       - "echo 'hello wireguard'"
     preDown:

diff --git a/wireguard-registry-core/pom.xml b/wireguard-registry-core/pom.xml
@@ -18,5 +18,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-json</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+        </dependency>
+    </dependencies>
 </project>