Merge pull request #4 from KomachiSion/develop-refactor

Develop refactor
nacos-group · Dec 20, 2022 · c32dce9 · c32dce9
2 parents d6ce65c + c137c44
commit c32dce9
Show file tree

Hide file tree

Showing 78 changed files with 2,841 additions and 2,438 deletions.
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>nacosctl</artifactId>
+        <groupId>com.alibaba.nacos</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>nacos-ctl-bootstrap</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.alibaba.nacos</groupId>
+            <artifactId>nacos-ctl-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.nacos</groupId>
+            <artifactId>nacos-ctl-interaction</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.nacos</groupId>
+            <artifactId>nacos-ctl-command</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>${maven-assembly-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                    <mainClass>
+                                        com.alibaba.nacos.ctl.bootstrap.ClientMain
+                                    </mainClass>
+                                </manifest>
+                            </archive>
+                            <descriptorRefs>
+                                <descriptorRef>jar-with-dependencies</descriptorRef>
+                            </descriptorRefs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/...ava/com/alibaba/nacos/cli/ClientMain.java → ...ibaba/nacos/ctl/bootstrap/ClientMain.java b/...ava/com/alibaba/nacos/cli/ClientMain.java → ...ibaba/nacos/ctl/bootstrap/ClientMain.java
@@ -1,54 +1,54 @@
-package com.alibaba.nacos.cli;
-
-import com.alibaba.nacos.cli.commands.NacosCtl;
-import com.alibaba.nacos.cli.core.LogicHandler;
-import com.alibaba.nacos.cli.core.exception.HandlerException;
-import com.alibaba.nacos.cli.input.InputGetter;
-import com.alibaba.nacos.cli.utils.StringUtils;
-import picocli.CommandLine;
-
-/**
- * 黑窗命令行客户端
- *
- * @author lehr
- */
-public class ClientMain {
-
-    public static void main(String[] args) throws HandlerException {
-
-        System.out.println("NacosCtl Loading...\n");
-        InputGetter.init();
-
-        System.out.println("Loading Nacos client sdk...\n");
-        LogicHandler.init();
-
-        new CommandLine(new NacosCtl()).execute(args);
-
-        loopExecute(InputGetter.getInstance());
-    }
-
-    private static void loopExecute(InputGetter in) {
-
-        String[] args;
-
-        // 循环执行命令
-        while (true) {
-
-            String line = in.nextLine();
-            args = StringUtils.parseInput(line);
-            // 忽略无效输入
-            if (args.length < 1 || args[0].length() < 1) {
-                continue;
-            }
-            // 给Picocli执行命令
-            int ret = new CommandLine(new NacosCtl()).execute(args);
-            // 特殊的流程控制，通过返回值来判断,-1是退出，-2是清屏
-            if (ret == -1) {
-                break;
-            }
-            if (ret == -2) {
-                in.clear();
-            }
-        }
-    }
-}
+package com.alibaba.nacos.ctl.bootstrap;
+
+import com.alibaba.nacos.ctl.command.NacosCtl;
+import com.alibaba.nacos.ctl.core.LogicHandler;
+import com.alibaba.nacos.ctl.core.exception.HandlerException;
+import com.alibaba.nacos.ctl.intraction.input.InputGetter;
+import com.alibaba.nacos.ctl.bootstrap.utils.StringUtils;
+import picocli.CommandLine;
+
+/**
+ * 黑窗命令行客户端
+ *
+ * @author lehr
+ */
+public class ClientMain {
+
+    public static void main(String[] args) throws HandlerException {
+
+        System.out.println("NacosCtl Loading...\n");
+        InputGetter.init();
+
+        System.out.println("Loading Nacos client sdk...\n");
+        LogicHandler.init();
+
+        new CommandLine(new NacosCtl()).execute(args);
+
+        loopExecute(InputGetter.getInstance());
+    }
+
+    private static void loopExecute(InputGetter in) {
+
+        String[] args;
+
+        // 循环执行命令
+        while (true) {
+
+            String line = in.nextLine();
+            args = StringUtils.parseInput(line);
+            // 忽略无效输入
+            if (args.length < 1 || args[0].length() < 1) {
+                continue;
+            }
+            // 给Picocli执行命令
+            int ret = new CommandLine(new NacosCtl()).execute(args);
+            // 特殊的流程控制，通过返回值来判断,-1是退出，-2是清屏
+            if (ret == -1) {
+                break;
+            }
+            if (ret == -2) {
+                in.clear();
+            }
+        }
+    }
+}
diff --git a/.../alibaba/nacos/cli/utils/StringUtils.java → ...acos/ctl/bootstrap/utils/StringUtils.java b/.../alibaba/nacos/cli/utils/StringUtils.java → ...acos/ctl/bootstrap/utils/StringUtils.java
@@ -1,4 +1,4 @@
-package com.alibaba.nacos.cli.utils;
+package com.alibaba.nacos.ctl.bootstrap.utils;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/bootstrap/src/main/resources/logback.xml b/bootstrap/src/main/resources/logback.xml
@@ -0,0 +1,10 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>
+        </encoder>
+    </appender>
+    <root level="ERROR">
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>
diff --git a/command/pom.xml b/command/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>nacosctl</artifactId>
+        <groupId>com.alibaba.nacos</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>nacos-ctl-command</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.alibaba.nacos</groupId>
+            <artifactId>nacos-ctl-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.nacos</groupId>
+            <artifactId>nacos-ctl-interaction</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>info.picocli</groupId>
+            <artifactId>picocli</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.vandermeer</groupId>
+            <artifactId>asciitable</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/command/src/main/java/com/alibaba/nacos/ctl/command/NacosClear.java b/command/src/main/java/com/alibaba/nacos/ctl/command/NacosClear.java
@@ -0,0 +1,29 @@
+package com.alibaba.nacos.ctl.command;
+
+import picocli.CommandLine;
+
+import java.util.concurrent.Callable;
+
+import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_CLEAR;
+import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
+import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
+import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_CLEAR;
+import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
+import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
+import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
+import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
+import static com.alibaba.nacos.ctl.command.utils.HintUtils.USAGE_CLEAR;
+
+/**
+ * clear the terminal, it only works with jline input
+ *
+ * @author lehr
+ */
+@CommandLine.Command(name = NAME_CLEAR, sortOptions = SORT_OPTIONS, headerHeading = HEADER_HEADING, synopsisHeading = SYNOPSIS_HEADING, descriptionHeading = DESCRIPTION_HEADING, parameterListHeading = PARAMETER_LIST_HEADING, optionListHeading = OPTION_LIST_HEADING, header = USAGE_CLEAR, description = DESCRIPTION_CLEAR)
+public class NacosClear implements Callable<Integer> {
+
+    @Override
+    public Integer call() throws Exception {
+        return -2;
+    }
+}