nacos-group
/
nacos-ctl
mirror of https://github.com/nacos-group/nacos-ctl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: nacos-group:1.0.0
Branches Tags
nacos-group:main
nacos-group:develop
nacos-group:1.0.1
nacos-group:1.0.0
..
compare: nacos-group:main
Branches Tags
nacos-group:main
nacos-group:develop
nacos-group:1.0.1
nacos-group:1.0.0

23 Commits
1.0.0 ... main

Author SHA1 Message Date
杨翊 SionYang d2b632c3f1
Merge pull request #6 from nacos-group/develop 
Develop
 2024-05-15 15:32:30 +08:00
xiweng.yy 841a7d65a0 移除测试配置。 2024-05-15 14:33:20 +08:00
xiweng.yy 2418167265 Upgrade to 1.0.1. 2024-05-15 14:25:35 +08:00
xiweng.yy 4794b51e9b 修复配置发布时失败也提示done的问题。 2024-05-15 14:24:53 +08:00
xiweng.yy 2cb3c94916 Fix config list 403 problem 2023-01-31 14:53:56 +08:00
xiweng.yy ec89a99cf1 Fix no accessKey info for config module request. 2023-01-29 11:32:18 +08:00
xiweng.yy 986f9add3d Fix switch NPE error. 2023-01-28 13:43:01 +08:00
xiweng.yy 27aafcb849 ConfigLoader 读取的配置暴露成Properties. 2023-01-12 15:31:44 +08:00
xiweng.yy 236e1d14b2 Support quit command alias stop. 2023-01-12 15:30:05 +08:00
xiweng.yy 36701fe69b Support Ctrl+C. 2023-01-12 15:30:05 +08:00
xiweng.yy 2bf2cb06f1 修改build结果名字 2023-01-12 15:30:05 +08:00
xiweng.yy e04a15aa75 标准sdk操作走aksk 2023-01-12 15:30:04 +08:00
xiweng.yy 59b5560888 Fix Bootstrap option can't set conf. 2023-01-05 20:55:57 +08:00
杨翊 SionYang 2ac4c7c6f3
Merge pull request #5 from KomachiSion/develop-refactor 
Develop refactor
 2023-01-05 13:37:58 +08:00
xiweng.yy 1cd1ea971d Fix conf file load. 2023-01-05 13:36:05 +08:00
xiweng.yy fadb12f238 Fix version. 2023-01-05 11:57:00 +08:00
xiweng.yy 5a3462d10c 修复加载conf文件失败。 2023-01-05 11:43:28 +08:00
xiweng.yy 95942a8a7b 移除metrics 2023-01-05 11:08:58 +08:00
xiweng.yy 561fcb11e6 Completer 支持拓展。 2023-01-05 11:07:20 +08:00
xiweng.yy f0b3fcf595 Command支持拓展。 2023-01-03 20:50:41 +08:00
杨翊 SionYang c32dce9403
Merge pull request #4 from KomachiSion/develop-refactor 
Develop refactor
 2022-12-20 09:34:21 +08:00
xiweng.yy c137c44011 重构包结构，拆分成多个子module 2022-12-20 09:30:21 +08:00
lehr 185ef09ad1 update version info 2021-07-07 19:53:31 +08:00
84 changed files with 3026 additions and 2470 deletions
Show Stats Expand all files Collapse all files

58
bootstrap/pom.xml Normal file
View File

@ -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>

72
bootstrap/src/main/java/com/alibaba/nacos/ctl/bootstrap/ClientMain.java Normal file
View File

@ -0,0 +1,72 @@
package com.alibaba.nacos.ctl.bootstrap;
import com.alibaba.nacos.ctl.bootstrap.command.NacosBootstrapCommand;
import com.alibaba.nacos.ctl.command.NacosCommand;
import com.alibaba.nacos.ctl.command.NacosCtl;
import com.alibaba.nacos.ctl.command.spi.NacosCommandLoader;
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 jline.console.UserInterruptException;
import picocli.CommandLine;
/**
* 黑窗命令行客户端
*
* @author lehr
*/
public class ClientMain {
public static void main(String[] args) throws HandlerException {
System.out.println("NacosCtl Loading...");
InputGetter.init();
System.out.println("NacosCtl Load finished.\n");
System.out.println("Loading Nacos client sdk...");
LogicHandler.init();
System.out.println("Loading Nacos client sdk finished.\n");
System.out.println("Loading Extension commands...");
NacosCommandLoader.getInstance().loadCommands();
System.out.println("Loading Extension commands finish\n");
new CommandLine(new NacosBootstrapCommand()).execute(args);
loopExecute(InputGetter.getInstance());
}
private static void loopExecute(InputGetter in) {
String[] args;
CommandLine commandLine = new CommandLine(new NacosCtl());
for (NacosCommand each : NacosCommandLoader.getInstance().getLoadedCommands()) {
commandLine.getCommandSpec().addSubcommand(each.getCommandName(), new CommandLine(each));
}
// 循环执行命令
while (true) {
try {
String line = in.nextLine();
args = StringUtils.parseInput(line);
// 忽略无效输入
if (args.length < 1 || args[0].length() < 1) {
continue;
}
// 给Picocli执行命令
int ret = commandLine.execute(args);
// 特殊的流程控制，通过返回值来判断,-1是退出，-2是清屏
if (ret == -1) {
break;
}
if (ret == -2) {
in.clear();
}
} catch (UserInterruptException ignored) {
}
}
}
}

42
src/main/java/com/alibaba/nacos/cli/commands/NacosCtl.java → bootstrap/src/main/java/com/alibaba/nacos/ctl/bootstrap/command/NacosBootstrapCommand.java
View File

@ -1,11 +1,10 @@
package com.alibaba.nacos.cli.commands; package com.alibaba.nacos.ctl.bootstrap.command;
import com.alibaba.nacos.cli.commands.config.NacosConfig; import com.alibaba.nacos.ctl.command.NacosClear;
import com.alibaba.nacos.cli.commands.instance.NacosInstance; import com.alibaba.nacos.ctl.command.NacosQuit;
import com.alibaba.nacos.cli.commands.namespace.NacosNamespace; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.commands.service.NacosService; import com.alibaba.nacos.ctl.core.config.ConfigLoader;
import com.alibaba.nacos.cli.commands.switches.NacosSwitch; import com.alibaba.nacos.ctl.core.config.GlobalConfig;
import com.alibaba.nacos.cli.config.ConfigLoader;
import picocli.CommandLine; import picocli.CommandLine;
import picocli.CommandLine.Command; import picocli.CommandLine.Command;
@ -13,13 +12,13 @@ import java.lang.reflect.Field;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import static com.alibaba.nacos.cli.utils.HintUtils.APP_NAME; import static com.alibaba.nacos.ctl.command.utils.HintUtils.APP_NAME;
import static com.alibaba.nacos.cli.utils.HintUtils.CLI_DESCRIPTION; import static com.alibaba.nacos.ctl.command.utils.HintUtils.CLI_DESCRIPTION;
import static com.alibaba.nacos.cli.utils.HintUtils.COMMAND_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.COMMAND_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.FOOTER; import static com.alibaba.nacos.ctl.command.utils.HintUtils.FOOTER;
import static com.alibaba.nacos.cli.utils.HintUtils.GREETING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.GREETING;
import static com.alibaba.nacos.cli.utils.HintUtils.MIXIN_STANDARD_HELP_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.MIXIN_STANDARD_HELP_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.VERSION_NAME; import static com.alibaba.nacos.ctl.command.utils.HintUtils.VERSION_NAME;
/** /**
* the main command, based on picocli * the main command, based on picocli
@ -27,13 +26,8 @@ import static com.alibaba.nacos.cli.utils.HintUtils.VERSION_NAME;
* @author lehr * @author lehr
*/ */
@Command(name = APP_NAME, mixinStandardHelpOptions = MIXIN_STANDARD_HELP_OPTIONS, version = VERSION_NAME, description = CLI_DESCRIPTION, commandListHeading = COMMAND_LIST_HEADING, footer = FOOTER, subcommands = { @Command(name = APP_NAME, mixinStandardHelpOptions = MIXIN_STANDARD_HELP_OPTIONS, version = VERSION_NAME, description = CLI_DESCRIPTION, commandListHeading = COMMAND_LIST_HEADING, footer = FOOTER, subcommands = {
CommandLine.HelpCommand.class, NacosQuit.class, NacosClear.class, NacosConfig.class, NacosNamespace.class, CommandLine.HelpCommand.class, NacosQuit.class, NacosClear.class})
NacosInstance.class, NacosSwitch.class, NacosService.class, public class NacosBootstrapCommand implements Runnable {
// NacosMetrics.class,
NacosUse.class,
// NacosWatch.class,
})
public class NacosCtl implements Runnable {
@CommandLine.Option(names = {"-e", @CommandLine.Option(names = {"-e",
"--endpoint"}, paramLabel = "<endpoint ip>", description = "The Nacos-Server host Ip.") "--endpoint"}, paramLabel = "<endpoint ip>", description = "The Nacos-Server host Ip.")
@ -72,6 +66,10 @@ public class NacosCtl implements Runnable {
} }
} }
} }
ConfigLoader.preload(confs); if (!confs.isEmpty()) {
ConfigLoader.preload(confs);
GlobalConfig.getInstance().refresh();
LogicHandler.refresh();
}
} }
} }

2
src/main/java/com/alibaba/nacos/cli/utils/StringUtils.java → bootstrap/src/main/java/com/alibaba/nacos/ctl/bootstrap/utils/StringUtils.java
View File

@ -1,4 +1,4 @@
package com.alibaba.nacos.cli.utils; package com.alibaba.nacos.ctl.bootstrap.utils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

10
bootstrap/src/main/resources/logback.xml Normal file
View File

@ -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>

34
command/pom.xml Normal file
View File

@ -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>

29
command/src/main/java/com/alibaba/nacos/ctl/command/NacosClear.java Normal file
View File

@ -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;
}
}

26
command/src/main/java/com/alibaba/nacos/ctl/command/NacosCommand.java Normal file
View File

@ -0,0 +1,26 @@
package com.alibaba.nacos.ctl.command;
import picocli.CommandLine;
/**
* Nacos command.
*
* @author xiweng.yy
*/
public abstract class NacosCommand implements Runnable {
@CommandLine.Spec
CommandLine.Model.CommandSpec spec;
/**
* Get command name.
*
* @return command name
*/
public abstract String getCommandName();
@Override
public void run() {
spec.commandLine().usage(System.err);
}
}

35
command/src/main/java/com/alibaba/nacos/ctl/command/NacosCtl.java Normal file
View File

@ -0,0 +1,35 @@
package com.alibaba.nacos.ctl.command;
import com.alibaba.nacos.ctl.command.config.NacosConfig;
import com.alibaba.nacos.ctl.command.instance.NacosInstance;
import com.alibaba.nacos.ctl.command.namespace.NacosNamespace;
import com.alibaba.nacos.ctl.command.service.NacosService;
import com.alibaba.nacos.ctl.command.switches.NacosSwitch;
import picocli.CommandLine;
import picocli.CommandLine.Command;
import static com.alibaba.nacos.ctl.command.utils.HintUtils.APP_NAME;
import static com.alibaba.nacos.ctl.command.utils.HintUtils.CLI_DESCRIPTION;
import static com.alibaba.nacos.ctl.command.utils.HintUtils.COMMAND_LIST_HEADING;
import static com.alibaba.nacos.ctl.command.utils.HintUtils.FOOTER;
import static com.alibaba.nacos.ctl.command.utils.HintUtils.MIXIN_STANDARD_HELP_OPTIONS;
import static com.alibaba.nacos.ctl.command.utils.HintUtils.VERSION_NAME;
/**
* the main command, based on picocli
*
* @author lehr
*/
@Command(name = APP_NAME, mixinStandardHelpOptions = MIXIN_STANDARD_HELP_OPTIONS, version = VERSION_NAME, description = CLI_DESCRIPTION, commandListHeading = COMMAND_LIST_HEADING, footer = FOOTER, subcommands = {
CommandLine.HelpCommand.class, NacosQuit.class, NacosClear.class, NacosConfig.class, NacosNamespace.class,
NacosInstance.class, NacosSwitch.class, NacosService.class,
NacosUse.class,
// NacosWatch.class,
})
public class NacosCtl extends NacosCommand {
@Override
public String getCommandName() {
return APP_NAME;
}
}

38
command/src/main/java/com/alibaba/nacos/ctl/command/NacosQuit.java Normal file
View File

@ -0,0 +1,38 @@
package com.alibaba.nacos.ctl.command;
import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.ctl.core.exception.HandlerException;
import picocli.CommandLine;
import java.util.concurrent.Callable;
import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_QUIT;
import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_QUIT;
import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_QUIT_ALIAS;
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_QUIT;
/**
* quit from cli
*
* @author lehr
*/
@CommandLine.Command(name = NAME_QUIT, aliases = NAME_QUIT_ALIAS, sortOptions = SORT_OPTIONS, headerHeading = HEADER_HEADING, synopsisHeading = SYNOPSIS_HEADING, descriptionHeading = DESCRIPTION_HEADING, parameterListHeading = PARAMETER_LIST_HEADING, optionListHeading = OPTION_LIST_HEADING, header = USAGE_QUIT, description = DESCRIPTION_QUIT)
public class NacosQuit implements Callable<Integer> {
@Override
public Integer call() {
try {
LogicHandler.shutdown();
} catch (HandlerException e) {
System.out.println(e.getMessage());
}
System.out.println("bye!");
return -1;
}
}

24
src/main/java/com/alibaba/nacos/cli/commands/NacosUse.java → command/src/main/java/com/alibaba/nacos/ctl/command/NacosUse.java
View File

@ -1,18 +1,18 @@
package com.alibaba.nacos.cli.commands; package com.alibaba.nacos.ctl.command;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_USE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_USE;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_USE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_USE;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.USAGE_USE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.USAGE_USE;
/** /**
* switch to different namespace * switch to different namespace

20
src/main/java/com/alibaba/nacos/cli/commands/config/NacosConfig.java → command/src/main/java/com/alibaba/nacos/ctl/command/config/NacosConfig.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.config; package com.alibaba.nacos.ctl.command.config;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_CONFIG; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_CONFIG;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_CONFIG; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_CONFIG;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.USAGE_CONFIG; import static com.alibaba.nacos.ctl.command.utils.HintUtils.USAGE_CONFIG;
/** /**
* config subcommand * config subcommand

27
src/main/java/com/alibaba/nacos/cli/commands/config/NacosConfigAdd.java → command/src/main/java/com/alibaba/nacos/ctl/command/config/NacosConfigAdd.java
View File

@ -1,7 +1,7 @@
package com.alibaba.nacos.cli.commands.config; package com.alibaba.nacos.ctl.command.config;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import picocli.CommandLine; import picocli.CommandLine;
import java.io.File; import java.io.File;
@ -9,13 +9,13 @@ import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_ADD; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_ADD;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* add a config * add a config
@ -55,8 +55,11 @@ public class NacosConfigAdd implements Runnable {
} }
try { try {
LogicHandler.postConfig(group, dataId, content, type); if (LogicHandler.postConfig(group, dataId, content, type)) {
System.out.println("done"); System.out.println("done");
return;
}
System.out.printf("publish config group:%s, dataid:%s failed%n", group, dataId);
} catch (HandlerException e) { } catch (HandlerException e) {
System.out.println(e.getMessage()); System.out.println(e.getMessage());
} }

22
src/main/java/com/alibaba/nacos/cli/commands/config/NacosConfigDelete.java → command/src/main/java/com/alibaba/nacos/ctl/command/config/NacosConfigDelete.java
View File

@ -1,17 +1,17 @@
package com.alibaba.nacos.cli.commands.config; package com.alibaba.nacos.ctl.command.config;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import com.alibaba.nacos.cli.input.InputGetter; import com.alibaba.nacos.ctl.intraction.input.InputGetter;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_DELETE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_DELETE;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* delete a config * delete a config

20
src/main/java/com/alibaba/nacos/cli/commands/config/NacosConfigExport.java → command/src/main/java/com/alibaba/nacos/ctl/command/config/NacosConfigExport.java
View File

@ -1,7 +1,7 @@
package com.alibaba.nacos.cli.commands.config; package com.alibaba.nacos.ctl.command.config;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import com.google.common.io.Files; import com.google.common.io.Files;
import picocli.CommandLine; import picocli.CommandLine;
@ -10,13 +10,13 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_EXPORT; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_EXPORT;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* get a config from nacos server and export it as a file * get a config from nacos server and export it as a file

20
src/main/java/com/alibaba/nacos/cli/commands/config/NacosConfigGet.java → command/src/main/java/com/alibaba/nacos/ctl/command/config/NacosConfigGet.java
View File

@ -1,7 +1,7 @@
package com.alibaba.nacos.cli.commands.config; package com.alibaba.nacos.ctl.command.config;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import com.google.common.io.Files; import com.google.common.io.Files;
import picocli.CommandLine; import picocli.CommandLine;
@ -9,13 +9,13 @@ import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_GET; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_GET;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* get a config * get a config

20
src/main/java/com/alibaba/nacos/cli/commands/config/NacosConfigImport.java → command/src/main/java/com/alibaba/nacos/ctl/command/config/NacosConfigImport.java
View File

@ -1,7 +1,7 @@
package com.alibaba.nacos.cli.commands.config; package com.alibaba.nacos.ctl.command.config;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import picocli.CommandLine; import picocli.CommandLine;
import java.io.File; import java.io.File;
@ -9,13 +9,13 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_IMPORT; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_IMPORT;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* create a config by uploading a local file * create a config by uploading a local file

35
src/main/java/com/alibaba/nacos/cli/commands/config/NacosConfigList.java → command/src/main/java/com/alibaba/nacos/ctl/command/config/NacosConfigList.java
View File

@ -1,20 +1,21 @@
package com.alibaba.nacos.cli.commands.config; package com.alibaba.nacos.ctl.command.config;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.api.utils.StringUtils;
import com.alibaba.nacos.cli.core.bean.ConfigVO; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.bean.ConfigVO;
import com.alibaba.nacos.ctl.core.exception.HandlerException;
import de.vandermeer.asciitable.AsciiTable; import de.vandermeer.asciitable.AsciiTable;
import picocli.CommandLine; import picocli.CommandLine;
import java.util.List; import java.util.List;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_LIST; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_LIST;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* list config * list config
@ -38,9 +39,17 @@ public class NacosConfigList implements Runnable {
@Override @Override
public void run() { public void run() {
String search = "accurate";
try { try {
List<ConfigVO> list = LogicHandler.listConfigs(dataId, group, pageNo, pageSize); if (StringUtils.isEmpty(group)) {
group = "**";
search = "blur";
}
if (StringUtils.isEmpty(dataId)) {
dataId = "**";
search = "blur";
}
List<ConfigVO> list = LogicHandler.listConfigs(dataId, group, pageNo, pageSize, search);
int counter = 1; int counter = 1;
AsciiTable at = new AsciiTable(); AsciiTable at = new AsciiTable();
at.getContext().setWidth(60); at.getContext().setWidth(60);

21
src/main/java/com/alibaba/nacos/cli/commands/instance/NacosInstance.java → command/src/main/java/com/alibaba/nacos/ctl/command/instance/NacosInstance.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.instance; package com.alibaba.nacos.ctl.command.instance;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_INSTANCE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_INSTANCE;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_INSTANCE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_INSTANCE;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.USAGE_INSTANCE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.USAGE_INSTANCE;
/** /**
* instance subcommand * instance subcommand
@ -22,7 +22,6 @@ import static com.alibaba.nacos.cli.utils.HintUtils.USAGE_INSTANCE;
NacosInstanceGet.class}) NacosInstanceGet.class})
public class NacosInstance implements Runnable { public class NacosInstance implements Runnable {
@CommandLine.Spec @CommandLine.Spec
CommandLine.Model.CommandSpec spec; CommandLine.Model.CommandSpec spec;

20
src/main/java/com/alibaba/nacos/cli/commands/instance/NacosInstanceAdd.java → command/src/main/java/com/alibaba/nacos/ctl/command/instance/NacosInstanceAdd.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.instance; package com.alibaba.nacos.ctl.command.instance;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_ADD; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_ADD;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* add an instance * add an instance

22
src/main/java/com/alibaba/nacos/cli/commands/instance/NacosInstanceDelete.java → command/src/main/java/com/alibaba/nacos/ctl/command/instance/NacosInstanceDelete.java
View File

@ -1,17 +1,17 @@
package com.alibaba.nacos.cli.commands.instance; package com.alibaba.nacos.ctl.command.instance;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import com.alibaba.nacos.cli.input.InputGetter; import com.alibaba.nacos.ctl.intraction.input.InputGetter;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_DELETE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_DELETE;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* delete an instance * delete an instance

20
src/main/java/com/alibaba/nacos/cli/commands/instance/NacosInstanceGet.java → command/src/main/java/com/alibaba/nacos/ctl/command/instance/NacosInstanceGet.java
View File

@ -1,19 +1,19 @@
package com.alibaba.nacos.cli.commands.instance; package com.alibaba.nacos.ctl.command.instance;
import com.alibaba.nacos.api.naming.pojo.Instance; import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import picocli.CommandLine; import picocli.CommandLine;
import java.util.List; import java.util.List;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_GET; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_GET;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* get instances * get instances

20
src/main/java/com/alibaba/nacos/cli/commands/instance/NacosInstanceUpdate.java → command/src/main/java/com/alibaba/nacos/ctl/command/instance/NacosInstanceUpdate.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.instance; package com.alibaba.nacos.ctl.command.instance;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_UPDATE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_UPDATE;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* update an instance * update an instance

20
src/main/java/com/alibaba/nacos/cli/commands/namespace/NacosNamespace.java → command/src/main/java/com/alibaba/nacos/ctl/command/namespace/NacosNamespace.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.namespace; package com.alibaba.nacos.ctl.command.namespace;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_NAMESPACE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_NAMESPACE;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_NAMESPACE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_NAMESPACE;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.USAGE_NAMESPACE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.USAGE_NAMESPACE;
/** /**
* namespace subcommand * namespace subcommand

20
src/main/java/com/alibaba/nacos/cli/commands/namespace/NacosNamespaceAdd.java → command/src/main/java/com/alibaba/nacos/ctl/command/namespace/NacosNamespaceAdd.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.namespace; package com.alibaba.nacos.ctl.command.namespace;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_ADD; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_ADD;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* create a namespace * create a namespace

22
src/main/java/com/alibaba/nacos/cli/commands/namespace/NacosNamespaceDelete.java → command/src/main/java/com/alibaba/nacos/ctl/command/namespace/NacosNamespaceDelete.java
View File

@ -1,17 +1,17 @@
package com.alibaba.nacos.cli.commands.namespace; package com.alibaba.nacos.ctl.command.namespace;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import com.alibaba.nacos.cli.input.InputGetter; import com.alibaba.nacos.ctl.intraction.input.InputGetter;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_DELETE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_DELETE;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* delete a namespace * delete a namespace

22
src/main/java/com/alibaba/nacos/cli/commands/namespace/NacosNamespaceList.java → command/src/main/java/com/alibaba/nacos/ctl/command/namespace/NacosNamespaceList.java
View File

@ -1,20 +1,20 @@
package com.alibaba.nacos.cli.commands.namespace; package com.alibaba.nacos.ctl.command.namespace;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.bean.NamespaceVO; import com.alibaba.nacos.ctl.core.bean.NamespaceVO;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import de.vandermeer.asciitable.AsciiTable; import de.vandermeer.asciitable.AsciiTable;
import picocli.CommandLine; import picocli.CommandLine;
import java.util.List; import java.util.List;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_LIST; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_LIST;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* get the list of all the namespaces from the server. * get the list of all the namespaces from the server.

20
src/main/java/com/alibaba/nacos/cli/commands/namespace/NacosNamespaceUpdate.java → command/src/main/java/com/alibaba/nacos/ctl/command/namespace/NacosNamespaceUpdate.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.namespace; package com.alibaba.nacos.ctl.command.namespace;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_UPDATE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_UPDATE;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* update a namespace * update a namespace

20
src/main/java/com/alibaba/nacos/cli/commands/service/NacosService.java → command/src/main/java/com/alibaba/nacos/ctl/command/service/NacosService.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.service; package com.alibaba.nacos.ctl.command.service;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_SERVICE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_SERVICE;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_SERVICE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_SERVICE;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.USAGE_SERVICE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.USAGE_SERVICE;
/** /**
* service subcommand * service subcommand

20
src/main/java/com/alibaba/nacos/cli/commands/service/NacosServiceAdd.java → command/src/main/java/com/alibaba/nacos/ctl/command/service/NacosServiceAdd.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.service; package com.alibaba.nacos.ctl.command.service;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_ADD; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_ADD;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* add a service * add a service

22
src/main/java/com/alibaba/nacos/cli/commands/service/NacosServiceDelete.java → command/src/main/java/com/alibaba/nacos/ctl/command/service/NacosServiceDelete.java
View File

@ -1,17 +1,17 @@
package com.alibaba.nacos.cli.commands.service; package com.alibaba.nacos.ctl.command.service;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import com.alibaba.nacos.cli.input.InputGetter; import com.alibaba.nacos.ctl.intraction.input.InputGetter;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_DELETE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_DELETE;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* delete a service * delete a service

20
src/main/java/com/alibaba/nacos/cli/commands/service/NacosServiceGet.java → command/src/main/java/com/alibaba/nacos/ctl/command/service/NacosServiceGet.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.service; package com.alibaba.nacos.ctl.command.service;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_GET; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_GET;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* get a service * get a service

22
src/main/java/com/alibaba/nacos/cli/commands/service/NacosServiceList.java → command/src/main/java/com/alibaba/nacos/ctl/command/service/NacosServiceList.java
View File

@ -1,20 +1,20 @@
package com.alibaba.nacos.cli.commands.service; package com.alibaba.nacos.ctl.command.service;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.bean.ServiceVO; import com.alibaba.nacos.ctl.core.bean.ServiceVO;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import de.vandermeer.asciitable.AsciiTable; import de.vandermeer.asciitable.AsciiTable;
import picocli.CommandLine; import picocli.CommandLine;
import java.util.List; import java.util.List;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_LIST; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_LIST;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* list some services intro * list some services intro

20
src/main/java/com/alibaba/nacos/cli/commands/service/NacosServiceUpdate.java → command/src/main/java/com/alibaba/nacos/ctl/command/service/NacosServiceUpdate.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.service; package com.alibaba.nacos.ctl.command.service;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_UPDATE; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_UPDATE;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* update a service * update a service

51
command/src/main/java/com/alibaba/nacos/ctl/command/spi/NacosCommandLoader.java Normal file
View File

@ -0,0 +1,51 @@
package com.alibaba.nacos.ctl.command.spi;
import com.alibaba.nacos.ctl.command.NacosCommand;
import picocli.CommandLine;
import java.util.Collection;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.concurrent.ConcurrentHashMap;
/**
* Nacos command loader.
*
* @author xiweng.yy
*/
public class NacosCommandLoader {
private static final NacosCommandLoader INSTANCE = new NacosCommandLoader();
private static final Map<String, NacosCommand> COMMANDS = new ConcurrentHashMap<>();
private static final String IGNORE_INVALID_COMMANDS = "Ignore invalid command(%s) without CommandLine.Command annotation.";
private static final String LOADED_COMMANDS = "Load command(%s) finished.";
private NacosCommandLoader() {
}
public static NacosCommandLoader getInstance() {
return INSTANCE;
}
public void loadCommands() {
for (NacosCommand each : ServiceLoader.load(NacosCommand.class)) {
if (notContainCommandAnnotation(each.getClass())) {
System.out.println(String.format(IGNORE_INVALID_COMMANDS, each.getCommandName()));
continue;
}
System.out.println(String.format(LOADED_COMMANDS, each.getCommandName()));
COMMANDS.putIfAbsent(each.getCommandName(), each);
}
}
private boolean notContainCommandAnnotation(Class<? extends NacosCommand> clazz) {
return clazz.getAnnotationsByType(CommandLine.Command.class).length == 0;
}
public Collection<NacosCommand> getLoadedCommands() {
return COMMANDS.values();
}
}

20
src/main/java/com/alibaba/nacos/cli/commands/switches/NacosSwitch.java → command/src/main/java/com/alibaba/nacos/ctl/command/switches/NacosSwitch.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.switches; package com.alibaba.nacos.ctl.command.switches;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_SWITCH; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_SWITCH;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_SWITCH; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_SWITCH;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.USAGE_SWITCH; import static com.alibaba.nacos.ctl.command.utils.HintUtils.USAGE_SWITCH;
/** /**
* switch subcommand * switch subcommand

20
src/main/java/com/alibaba/nacos/cli/commands/switches/NacosSwitchAdd.java → command/src/main/java/com/alibaba/nacos/ctl/command/switches/NacosSwitchAdd.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.switches; package com.alibaba.nacos.ctl.command.switches;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_ADD; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_ADD;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* for some switches in the type of map and list, add an element * for some switches in the type of map and list, add an element

20
src/main/java/com/alibaba/nacos/cli/commands/switches/NacosSwitchGet.java → command/src/main/java/com/alibaba/nacos/ctl/command/switches/NacosSwitchGet.java
View File

@ -1,18 +1,18 @@
package com.alibaba.nacos.cli.commands.switches; package com.alibaba.nacos.ctl.command.switches;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import picocli.CommandLine; import picocli.CommandLine;
import java.util.Map; import java.util.Map;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_GET; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_GET;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* get the value of a switch * get the value of a switch

20
src/main/java/com/alibaba/nacos/cli/commands/switches/NacosSwitchRemove.java → command/src/main/java/com/alibaba/nacos/ctl/command/switches/NacosSwitchRemove.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.switches; package com.alibaba.nacos.ctl.command.switches;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import com.alibaba.nacos.cli.input.InputGetter; import com.alibaba.nacos.ctl.intraction.input.InputGetter;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* for some switches in the type of map and list, remove an element * for some switches in the type of map and list, remove an element

20
src/main/java/com/alibaba/nacos/cli/commands/switches/NacosSwitchSet.java → command/src/main/java/com/alibaba/nacos/ctl/command/switches/NacosSwitchSet.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.switches; package com.alibaba.nacos.ctl.command.switches;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_SET; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_SET;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* set the value of the switch * set the value of the switch

6
src/main/java/com/alibaba/nacos/cli/utils/HintUtils.java → command/src/main/java/com/alibaba/nacos/ctl/command/utils/HintUtils.java
View File

@ -1,4 +1,4 @@
package com.alibaba.nacos.cli.utils; package com.alibaba.nacos.ctl.command.utils;
/** /**
* @author lehr 用来统一记录各种指令的提示信息的，方便编辑和浏览所以写一起了 * @author lehr 用来统一记录各种指令的提示信息的，方便编辑和浏览所以写一起了
@ -10,7 +10,7 @@ public class HintUtils {
*/ */
public static final String APP_NAME = "nacosctl"; public static final String APP_NAME = "nacosctl";
public static final String VERSION_NAME = "v1.0.0-Beta"; public static final String VERSION_NAME = "v1.0.1";
public static final String CLI_DESCRIPTION = "NacosCtl is a fast, scalable, helpful client that can let you connect to nacos-server easily."; public static final String CLI_DESCRIPTION = "NacosCtl is a fast, scalable, helpful client that can let you connect to nacos-server easily.";
@ -51,6 +51,8 @@ public class HintUtils {
public static final String NAME_QUIT = "quit"; public static final String NAME_QUIT = "quit";
public static final String NAME_QUIT_ALIAS = "stop";
public static final String USAGE_QUIT = "Quit from the Cli"; public static final String USAGE_QUIT = "Quit from the Cli";
public static final String DESCRIPTION_QUIT = "Quit from the cli, and close the connection with current server."; public static final String DESCRIPTION_QUIT = "Quit from the cli, and close the connection with current server.";

18
src/main/java/com/alibaba/nacos/cli/commands/watch/NacosWatch.java → command/src/main/java/com/alibaba/nacos/ctl/command/watch/NacosWatch.java
View File

@ -1,15 +1,15 @@
package com.alibaba.nacos.cli.commands.watch; package com.alibaba.nacos.ctl.command.watch;
import com.alibaba.nacos.cli.commands.watch.config.NacosWatchConfig; import com.alibaba.nacos.ctl.command.watch.config.NacosWatchConfig;
import com.alibaba.nacos.cli.commands.watch.service.NacosWatchInstance; import com.alibaba.nacos.ctl.command.watch.service.NacosWatchInstance;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* watch subcommand * watch subcommand

14
src/main/java/com/alibaba/nacos/cli/commands/watch/config/NacosWatchConfig.java → command/src/main/java/com/alibaba/nacos/ctl/command/watch/config/NacosWatchConfig.java
View File

@ -1,13 +1,13 @@
package com.alibaba.nacos.cli.commands.watch.config; package com.alibaba.nacos.ctl.command.watch.config;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* watch config subcommand * watch config subcommand

18
src/main/java/com/alibaba/nacos/cli/commands/watch/config/NacosWatchConfigAdd.java → command/src/main/java/com/alibaba/nacos/ctl/command/watch/config/NacosWatchConfigAdd.java
View File

@ -1,15 +1,15 @@
package com.alibaba.nacos.cli.commands.watch.config; package com.alibaba.nacos.ctl.command.watch.config;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_ADD; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_ADD;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* add config listener * add config listener

18
src/main/java/com/alibaba/nacos/cli/commands/watch/config/NacosWatchConfigList.java → command/src/main/java/com/alibaba/nacos/ctl/command/watch/config/NacosWatchConfigList.java
View File

@ -1,17 +1,17 @@
package com.alibaba.nacos.cli.commands.watch.config; package com.alibaba.nacos.ctl.command.watch.config;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import picocli.CommandLine; import picocli.CommandLine;
import java.util.List; import java.util.List;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_LIST; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_LIST;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* get the watcher list * get the watcher list

16
src/main/java/com/alibaba/nacos/cli/commands/watch/config/NacosWatchConfigRemove.java → command/src/main/java/com/alibaba/nacos/ctl/command/watch/config/NacosWatchConfigRemove.java
View File

@ -1,14 +1,14 @@
package com.alibaba.nacos.cli.commands.watch.config; package com.alibaba.nacos.ctl.command.watch.config;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* remove a watcher * remove a watcher

18
src/main/java/com/alibaba/nacos/cli/commands/watch/service/NacosWatchInstance.java → command/src/main/java/com/alibaba/nacos/ctl/command/watch/service/NacosWatchInstance.java
View File

@ -1,15 +1,15 @@
package com.alibaba.nacos.cli.commands.watch.service; package com.alibaba.nacos.ctl.command.watch.service;
import picocli.CommandLine; import picocli.CommandLine;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_SWITCH; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_SWITCH;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.USAGE_SWITCH; import static com.alibaba.nacos.ctl.command.utils.HintUtils.USAGE_SWITCH;
/** /**
* watch instance subcommand * watch instance subcommand

18
src/main/java/com/alibaba/nacos/cli/commands/watch/service/NacosWatchInstanceAdd.java → command/src/main/java/com/alibaba/nacos/ctl/command/watch/service/NacosWatchInstanceAdd.java
View File

@ -1,17 +1,17 @@
package com.alibaba.nacos.cli.commands.watch.service; package com.alibaba.nacos.ctl.command.watch.service;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import picocli.CommandLine; import picocli.CommandLine;
import java.util.List; import java.util.List;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_ADD; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_ADD;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* add a listener to instance * add a listener to instance

18
src/main/java/com/alibaba/nacos/cli/commands/watch/service/NacosWatchInstanceList.java → command/src/main/java/com/alibaba/nacos/ctl/command/watch/service/NacosWatchInstanceList.java
View File

@ -1,17 +1,17 @@
package com.alibaba.nacos.cli.commands.watch.service; package com.alibaba.nacos.ctl.command.watch.service;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import picocli.CommandLine; import picocli.CommandLine;
import java.util.List; import java.util.List;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_LIST; import static com.alibaba.nacos.ctl.command.utils.HintUtils.NAME_LIST;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* get the watcher list * get the watcher list

16
src/main/java/com/alibaba/nacos/cli/commands/watch/service/NacosWatchInstanceRemove.java → command/src/main/java/com/alibaba/nacos/ctl/command/watch/service/NacosWatchInstanceRemove.java
View File

@ -1,16 +1,16 @@
package com.alibaba.nacos.cli.commands.watch.service; package com.alibaba.nacos.ctl.command.watch.service;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import picocli.CommandLine; import picocli.CommandLine;
import java.util.List; import java.util.List;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING; import static com.alibaba.nacos.ctl.command.utils.HintUtils.SYNOPSIS_HEADING;
/** /**
* remove a watcher * remove a watcher

28
core/pom.xml Normal file
View File

@ -0,0 +1,28 @@
<?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-core</artifactId>
<dependencies>
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
</dependencies>
</project>

43
src/main/java/com/alibaba/nacos/cli/core/LogicHandler.java → core/src/main/java/com/alibaba/nacos/ctl/core/LogicHandler.java
View File

@ -1,15 +1,15 @@
package com.alibaba.nacos.cli.core; package com.alibaba.nacos.ctl.core;
import com.alibaba.nacos.api.naming.pojo.Instance; import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.cli.config.GlobalConfig; import com.alibaba.nacos.ctl.core.bean.ConfigVO;
import com.alibaba.nacos.cli.core.bean.ConfigVO; import com.alibaba.nacos.ctl.core.bean.NamespaceVO;
import com.alibaba.nacos.cli.core.bean.NamespaceVO; import com.alibaba.nacos.ctl.core.bean.ServiceVO;
import com.alibaba.nacos.cli.core.bean.ServiceVO; import com.alibaba.nacos.ctl.core.config.GlobalConfig;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import com.alibaba.nacos.cli.core.service.openapi.OpenApiService; import com.alibaba.nacos.ctl.core.service.openapi.OpenApiService;
import com.alibaba.nacos.cli.core.service.sdk.SdkConfigService; import com.alibaba.nacos.ctl.core.service.sdk.SdkConfigService;
import com.alibaba.nacos.cli.core.service.sdk.SdkNamingService; import com.alibaba.nacos.ctl.core.service.sdk.SdkNamingService;
import com.alibaba.nacos.cli.utils.SwitchUtils; import com.alibaba.nacos.ctl.core.utils.SwitchUtils;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -39,6 +39,20 @@ public class LogicHandler {
sdkNamingService = new SdkNamingService(); sdkNamingService = new SdkNamingService();
} }
public static void refresh() {
try {
sdkConfigService.shutdown();
sdkNamingService.shutdown();
config = GlobalConfig.getInstance();
openApiService = new OpenApiService();
sdkConfigService = new SdkConfigService();
sdkNamingService = new SdkNamingService();
} catch (Exception e) {
System.out.println("refresh Logic Handler failed.");
e.printStackTrace();
}
}
/** /**
* 切换当前的默认Namespace ，读取到新到Namespace和Id后，需要： * 切换当前的默认Namespace ，读取到新到Namespace和Id后，需要：
* *
@ -73,13 +87,14 @@ public class LogicHandler {
return sdkConfigService.getConfig(dataId, group); return sdkConfigService.getConfig(dataId, group);
} }
public static void postConfig(String group, String dataId, String content, String type) throws HandlerException { public static boolean postConfig(String group, String dataId, String content, String type) throws HandlerException {
sdkConfigService.publishConfig(dataId, group, content, type); return sdkConfigService.publishConfig(dataId, group, content, type);
} }
public static List<ConfigVO> listConfigs(String dataId, String group, Integer pageNo, Integer pageSize) public static List<ConfigVO> listConfigs(String dataId, String group, Integer pageNo, Integer pageSize,
String search)
throws HandlerException { throws HandlerException {
return openApiService.listConfigs(dataId, group, pageNo, pageSize); return openApiService.listConfigs(dataId, group, pageNo, pageSize, search);
} }
public static void deleteConfig(String group, String dataId) throws HandlerException { public static void deleteConfig(String group, String dataId) throws HandlerException {

2
src/main/java/com/alibaba/nacos/cli/core/bean/ConfigVO.java → core/src/main/java/com/alibaba/nacos/ctl/core/bean/ConfigVO.java
View File

@ -1,4 +1,4 @@
package com.alibaba.nacos.cli.core.bean; package com.alibaba.nacos.ctl.core.bean;
/** /**
* @author lehr * @author lehr

2
src/main/java/com/alibaba/nacos/cli/core/bean/NamespaceVO.java → core/src/main/java/com/alibaba/nacos/ctl/core/bean/NamespaceVO.java
View File

@ -1,4 +1,4 @@
package com.alibaba.nacos.cli.core.bean; package com.alibaba.nacos.ctl.core.bean;
/** /**
* @author lehr * @author lehr

2
src/main/java/com/alibaba/nacos/cli/core/bean/ServiceVO.java → core/src/main/java/com/alibaba/nacos/ctl/core/bean/ServiceVO.java
View File

@ -1,4 +1,4 @@
package com.alibaba.nacos.cli.core.bean; package com.alibaba.nacos.ctl.core.bean;
/** /**
* @author lehr * @author lehr

36
src/main/java/com/alibaba/nacos/cli/config/ConfigLoader.java → core/src/main/java/com/alibaba/nacos/ctl/core/config/ConfigLoader.java
View File

@ -1,17 +1,19 @@
package com.alibaba.nacos.cli.config; package com.alibaba.nacos.ctl.core.config;
import java.io.InputStream;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -28,11 +30,19 @@ public class ConfigLoader {
private static void readFile() { private static void readFile() {
try { try {
List<String> lines = Files.readAllLines(Paths.get(CONF_PATH), StandardCharsets.UTF_8); Path configFilePath = Paths.get(System.getProperty("config.dir"), CONF_PATH);
Map<String, String> confs = lines.stream().peek(s -> s.trim()).filter(s -> !s.startsWith("#")) if (!Files.exists(configFilePath)) {
.filter(s -> s.contains("=")).map(s -> s.split("=")).filter(sa -> sa.length == 2) System.out.println(
.collect(Collectors.toMap(s -> s[0].trim(), s -> s[1].trim())); String.format("[WARN] Can't find %s file in dir %s, skip load properties from file.", CONF_PATH,
tinyDb.putAll(confs); System.getProperty("config.dir")));
return;
}
InputStream inputStream = Files.newInputStream(configFilePath, StandardOpenOption.READ);
Properties properties = new Properties();
properties.load(inputStream);
Map<String, String> propertiesMap = properties.entrySet().stream()
.collect(Collectors.toMap(e -> e.getKey().toString(), e -> e.getValue().toString()));
tinyDb.putAll(propertiesMap);
} catch (Exception e) { } catch (Exception e) {
//...不存在就不加载 //...不存在就不加载
} }
@ -60,7 +70,7 @@ public class ConfigLoader {
public static boolean fill(Object o) { public static boolean fill(Object o) {
boolean flag = true; boolean flag = true;
for (Field f : o.getClass().getDeclaredFields()) { for (Field f : o.getClass().getDeclaredFields()) {
if (f.isAnnotationPresent(FromPropertie.class)) { if (f.isAnnotationPresent(FromProperties.class)) {
String name = f.getName(); String name = f.getName();
String value = tinyDb.get(name); String value = tinyDb.get(name);
if (value != null) { if (value != null) {
@ -81,13 +91,19 @@ public class ConfigLoader {
return flag; return flag;
} }
public static Properties toProperties() {
Properties result = new Properties();
result.putAll(tinyDb);
return result;
}
/** /**
* @author lehr * @author lehr
*/ */
@Documented @Documented
@Target({ElementType.FIELD}) @Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface FromPropertie { public @interface FromProperties {
} }
} }

24
src/main/java/com/alibaba/nacos/cli/config/GlobalConfig.java → core/src/main/java/com/alibaba/nacos/ctl/core/config/GlobalConfig.java
View File

@ -1,6 +1,6 @@
package com.alibaba.nacos.cli.config; package com.alibaba.nacos.ctl.core.config;
import com.alibaba.nacos.cli.config.ConfigLoader.FromPropertie; import com.alibaba.nacos.ctl.core.config.ConfigLoader.FromProperties;
import java.util.Properties; import java.util.Properties;
@ -22,25 +22,25 @@ public class GlobalConfig {
private String namespaceId = ""; private String namespaceId = "";
@FromPropertie @FromProperties
private boolean confirmEnabled = true; private boolean confirmEnabled = true;
@FromPropertie @FromProperties
private String host = "localhost"; private String host = "localhost";
@FromPropertie @FromProperties
private Integer port = 8848; private Integer port = 8848;
@FromPropertie @FromProperties
private String username = "nacos"; private String username = "nacos";
@FromPropertie @FromProperties
private String password = "nacos"; private String password = "nacos";
@FromPropertie @FromProperties
private String accessKey = "accessKey"; private String accessKey = "accessKey";
@FromPropertie @FromProperties
private String secretKey = "secretKey"; private String secretKey = "secretKey";
@ -57,9 +57,13 @@ public class GlobalConfig {
} }
private GlobalConfig() { private GlobalConfig() {
refresh();
}
public void refresh() {
boolean fillAll = ConfigLoader.fill(this); boolean fillAll = ConfigLoader.fill(this);
if (fillAll) { if (fillAll) {
System.out.println("Successfully load all configuration from file.\n"); System.out.println("Successfully load all configuration.\n");
} }
System.out.println(this); System.out.println(this);
} }

2
src/main/java/com/alibaba/nacos/cli/core/exception/HandlerException.java → core/src/main/java/com/alibaba/nacos/ctl/core/exception/HandlerException.java
View File

@ -1,4 +1,4 @@
package com.alibaba.nacos.cli.core.exception; package com.alibaba.nacos.ctl.core.exception;
/** /**
* @author lehr * @author lehr

32
src/main/java/com/alibaba/nacos/cli/core/service/openapi/OpenApiService.java → core/src/main/java/com/alibaba/nacos/ctl/core/service/openapi/OpenApiService.java
View File

@ -1,11 +1,12 @@
package com.alibaba.nacos.cli.core.service.openapi; package com.alibaba.nacos.ctl.core.service.openapi;
import com.alibaba.nacos.cli.config.GlobalConfig; import com.alibaba.nacos.api.utils.StringUtils;
import com.alibaba.nacos.cli.core.bean.ConfigVO; import com.alibaba.nacos.ctl.core.config.GlobalConfig;
import com.alibaba.nacos.cli.core.bean.NamespaceVO; import com.alibaba.nacos.ctl.core.bean.ConfigVO;
import com.alibaba.nacos.cli.core.bean.ServiceVO; import com.alibaba.nacos.ctl.core.bean.NamespaceVO;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.bean.ServiceVO;
import com.alibaba.nacos.cli.core.service.openapi.network.HttpProvider; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import com.alibaba.nacos.ctl.core.service.openapi.network.HttpProvider;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
@ -17,10 +18,10 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Stream; import java.util.stream.Stream;
import static com.alibaba.nacos.cli.core.service.openapi.network.HttpProvider.Method.DELETE; import static com.alibaba.nacos.ctl.core.service.openapi.network.HttpProvider.Method.DELETE;
import static com.alibaba.nacos.cli.core.service.openapi.network.HttpProvider.Method.GET; import static com.alibaba.nacos.ctl.core.service.openapi.network.HttpProvider.Method.GET;
import static com.alibaba.nacos.cli.core.service.openapi.network.HttpProvider.Method.POST; import static com.alibaba.nacos.ctl.core.service.openapi.network.HttpProvider.Method.POST;
import static com.alibaba.nacos.cli.core.service.openapi.network.HttpProvider.Method.PUT; import static com.alibaba.nacos.ctl.core.service.openapi.network.HttpProvider.Method.PUT;
/** /**
* @author lehr Access the server by nacos http open-api * @author lehr Access the server by nacos http open-api
@ -58,7 +59,7 @@ public class OpenApiService {
return httpProvider.nacosRequest(PUT, SWITCH_URL, params); return httpProvider.nacosRequest(PUT, SWITCH_URL, params);
} }
public List<ConfigVO> listConfigs(String dataId, String group, Integer pageNo, Integer pageSize) public List<ConfigVO> listConfigs(String dataId, String group, Integer pageNo, Integer pageSize, String search)
throws HandlerException { throws HandlerException {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
@ -66,9 +67,10 @@ public class OpenApiService {
params.put("group", group); params.put("group", group);
params.put("pageNo", pageNo); params.put("pageNo", pageNo);
params.put("pageSize", pageSize); params.put("pageSize", pageSize);
params.put("search", "accurate"); params.put("search", search);
params.put("search", "accurate"); if (!StringUtils.isEmpty(config.getNamespaceId())) {
params.put("tenant", config.getNamespaceId()); params.put("tenant", config.getNamespaceId());
}
String ret = httpProvider.nacosRequest(GET, CONF_URL, params); String ret = httpProvider.nacosRequest(GET, CONF_URL, params);
JsonObject data = new JsonParser().parse(ret).getAsJsonObject(); JsonObject data = new JsonParser().parse(ret).getAsJsonObject();

47
src/main/java/com/alibaba/nacos/cli/core/service/openapi/network/HttpProvider.java → core/src/main/java/com/alibaba/nacos/ctl/core/service/openapi/network/HttpProvider.java
View File

@ -1,8 +1,11 @@
package com.alibaba.nacos.cli.core.service.openapi.network; package com.alibaba.nacos.ctl.core.service.openapi.network;
import com.alibaba.nacos.cli.config.GlobalConfig; import com.alibaba.nacos.common.http.param.Header;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.config.ConfigLoader;
import com.alibaba.nacos.cli.core.service.openapi.network.bean.HttpDelete; import com.alibaba.nacos.ctl.core.config.GlobalConfig;
import com.alibaba.nacos.ctl.core.exception.HandlerException;
import com.alibaba.nacos.ctl.core.service.openapi.network.bean.HttpDelete;
import com.alibaba.nacos.ctl.core.utils.AuthUtils;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import org.apache.http.NameValuePair; import org.apache.http.NameValuePair;
@ -24,11 +27,12 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties;
import static com.alibaba.nacos.cli.core.service.openapi.network.HttpProvider.Method.DELETE; import static com.alibaba.nacos.ctl.core.service.openapi.network.HttpProvider.Method.DELETE;
import static com.alibaba.nacos.cli.core.service.openapi.network.HttpProvider.Method.GET; import static com.alibaba.nacos.ctl.core.service.openapi.network.HttpProvider.Method.GET;
import static com.alibaba.nacos.cli.core.service.openapi.network.HttpProvider.Method.POST; import static com.alibaba.nacos.ctl.core.service.openapi.network.HttpProvider.Method.POST;
import static com.alibaba.nacos.cli.core.service.openapi.network.HttpProvider.Method.PUT; import static com.alibaba.nacos.ctl.core.service.openapi.network.HttpProvider.Method.PUT;
import static org.apache.http.client.config.RequestConfig.custom; import static org.apache.http.client.config.RequestConfig.custom;
/** /**
@ -40,6 +44,10 @@ public class HttpProvider {
private String authStr = ""; private String authStr = "";
private String serverIdentityKey;
private String serverIdentityValue;
public HttpProvider() { public HttpProvider() {
String username = config.getUsername(); String username = config.getUsername();
String password = config.getPassword(); String password = config.getPassword();
@ -48,6 +56,9 @@ public class HttpProvider {
} catch (HandlerException e) { } catch (HandlerException e) {
System.out.println("nacos login failed:" + e.getMessage()); System.out.println("nacos login failed:" + e.getMessage());
} }
Properties properties = ConfigLoader.toProperties();
serverIdentityKey = properties.getProperty("serverIdentityKey", "");
serverIdentityValue = properties.getProperty("serverIdentityValue", "");
} }
private static final String LOGIN_FAILED = "unknown user!"; private static final String LOGIN_FAILED = "unknown user!";
@ -118,18 +129,26 @@ public class HttpProvider {
// 拼接完整url // 拼接完整url
String url = getNacosUrl() + "/v1" + path; String url = getNacosUrl() + "/v1" + path;
List<NameValuePair> params = new ArrayList<>(); List<NameValuePair> params = new ArrayList<>();
String accessKey = GlobalConfig.getInstance().getAccessKey();
String secretKey = GlobalConfig.getInstance().getSecretKey();
Map<String, String> tempStringParameters = new HashMap<>();
if (parameterMap != null) { if (parameterMap != null) {
parameterMap.entrySet().forEach(e -> { parameterMap.forEach((key, value) -> tempStringParameters.put(key, String.valueOf(value)));
if (e.getValue() != null) {
params.add(new BasicNameValuePair(e.getKey(), String.valueOf(e.getValue())));
}
});
} }
Header header = AuthUtils.buildConfigSpas(tempStringParameters, accessKey, secretKey);
AuthUtils.injectNamingSpas(tempStringParameters, accessKey, secretKey);
AuthUtils.injectIdentity(header, serverIdentityKey, serverIdentityValue);
tempStringParameters.forEach((key, value) -> {
if (value != null) {
params.add(new BasicNameValuePair(key, value));
}
});
// 根据请求类型不同，构造请求，拼接参数，发送请求 // 根据请求类型不同，构造请求，拼接参数，发送请求
try { try {
HttpRequestBase req = generateRequest(method, url, params); HttpRequestBase req = generateRequest(method, url, params);
header.getHeader().forEach(req::addHeader);
String ret = sendRequest(req); String ret = sendRequest(req);
if (ret != null && ret.contains(FORBIDDEN)) { if (ret != null && ret.contains(FORBIDDEN)) {
throw new HandlerException("403 Forbidden! Please check your permission."); throw new HandlerException("403 Forbidden! Please check your permission.");
@ -158,7 +177,7 @@ public class HttpProvider {
httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8"));
return httpPost; return httpPost;
} else if (DELETE.equals(method)) { } else if (DELETE.equals(method)) {
com.alibaba.nacos.cli.core.service.openapi.network.bean.HttpDelete httpDelete = new HttpDelete( com.alibaba.nacos.ctl.core.service.openapi.network.bean.HttpDelete httpDelete = new HttpDelete(
url + "?accessToken=" + authStr); url + "?accessToken=" + authStr);
httpDelete.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); httpDelete.setEntity(new UrlEncodedFormEntity(params, "UTF-8"));

2
src/main/java/com/alibaba/nacos/cli/core/service/openapi/network/bean/HttpDelete.java → core/src/main/java/com/alibaba/nacos/ctl/core/service/openapi/network/bean/HttpDelete.java
View File

@ -1,4 +1,4 @@
package com.alibaba.nacos.cli.core.service.openapi.network.bean; package com.alibaba.nacos.ctl.core.service.openapi.network.bean;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;

8
src/main/java/com/alibaba/nacos/cli/core/service/sdk/SdkConfigService.java → core/src/main/java/com/alibaba/nacos/ctl/core/service/sdk/SdkConfigService.java
View File

@ -1,11 +1,11 @@
package com.alibaba.nacos.cli.core.service.sdk; package com.alibaba.nacos.ctl.core.service.sdk;
import com.alibaba.nacos.api.NacosFactory; import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.config.ConfigService; import com.alibaba.nacos.api.config.ConfigService;
import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.cli.config.GlobalConfig; import com.alibaba.nacos.ctl.core.config.GlobalConfig;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import com.alibaba.nacos.cli.core.service.sdk.watcher.ConfigWatcher; import com.alibaba.nacos.ctl.core.service.sdk.watcher.ConfigWatcher;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

8
src/main/java/com/alibaba/nacos/cli/core/service/sdk/SdkNamingService.java → core/src/main/java/com/alibaba/nacos/ctl/core/service/sdk/SdkNamingService.java
View File

@ -1,12 +1,12 @@
package com.alibaba.nacos.cli.core.service.sdk; package com.alibaba.nacos.ctl.core.service.sdk;
import com.alibaba.nacos.api.NacosFactory; import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService; import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance; import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.cli.config.GlobalConfig; import com.alibaba.nacos.ctl.core.config.GlobalConfig;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import com.alibaba.nacos.cli.core.service.sdk.watcher.InstanceWatcher; import com.alibaba.nacos.ctl.core.service.sdk.watcher.InstanceWatcher;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

2
src/main/java/com/alibaba/nacos/cli/core/service/sdk/watcher/ConfigWatcher.java → core/src/main/java/com/alibaba/nacos/ctl/core/service/sdk/watcher/ConfigWatcher.java
View File

@ -1,4 +1,4 @@
package com.alibaba.nacos.cli.core.service.sdk.watcher; package com.alibaba.nacos.ctl.core.service.sdk.watcher;
import com.alibaba.nacos.api.config.listener.Listener; import com.alibaba.nacos.api.config.listener.Listener;

2
src/main/java/com/alibaba/nacos/cli/core/service/sdk/watcher/InstanceWatcher.java → core/src/main/java/com/alibaba/nacos/ctl/core/service/sdk/watcher/InstanceWatcher.java
View File

@ -1,4 +1,4 @@
package com.alibaba.nacos.cli.core.service.sdk.watcher; package com.alibaba.nacos.ctl.core.service.sdk.watcher;
import com.alibaba.nacos.api.naming.listener.AbstractEventListener; import com.alibaba.nacos.api.naming.listener.AbstractEventListener;
import com.alibaba.nacos.api.naming.listener.Event; import com.alibaba.nacos.api.naming.listener.Event;

63
core/src/main/java/com/alibaba/nacos/ctl/core/utils/AuthUtils.java Normal file
View File

@ -0,0 +1,63 @@
package com.alibaba.nacos.ctl.core.utils;
import com.alibaba.nacos.api.common.Constants;
import com.alibaba.nacos.client.config.impl.SpasAdapter;
import com.alibaba.nacos.client.naming.utils.SignUtil;
import com.alibaba.nacos.common.constant.HttpHeaderConsts;
import com.alibaba.nacos.common.http.param.Header;
import com.alibaba.nacos.common.utils.StringUtils;
import com.alibaba.nacos.common.utils.UuidUtils;
import java.util.Map;
/**
* Auth utils
*
* @author xiweng.yy
*/
public class AuthUtils {
public static Header buildConfigSpas(Map<String, String> paramValues, String accessKey, String secretKey) {
Header header = Header.newInstance();
header.getHeader().remove(HttpHeaderConsts.CONTENT_TYPE);
if (StringUtils.isNotEmpty(accessKey) && StringUtils.isNotEmpty(secretKey)) {
header.addParam("Spas-AccessKey", accessKey);
Map<String, String> signHeaders = SpasAdapter.getSignHeaders(paramValues, secretKey);
if (signHeaders != null) {
header.addAll(signHeaders);
}
}
String ts = String.valueOf(System.currentTimeMillis());
header.addParam(Constants.CLIENT_REQUEST_TS_HEADER, ts);
header.addParam("exConfigInfo", "true");
header.addParam(HttpHeaderConsts.REQUEST_ID, UuidUtils.generateUuid());
return header;
}
public static void injectNamingSpas(Map<String, String> paramValues, String accessKey, String secretKey) {
if (StringUtils.isNotBlank(accessKey) && StringUtils.isNotBlank(secretKey)) {
try {
String signData = getSignData(paramValues.get("serviceName"));
String signature = SignUtil.sign(signData, secretKey);
paramValues.put("signature", signature);
paramValues.put("data", signData);
paramValues.put("ak", accessKey);
} catch (Exception e) {
System.out.println("inject ak/sk failed.");
e.printStackTrace();
}
}
}
private static String getSignData(String serviceName) {
return StringUtils.isNotEmpty(serviceName) ? System.currentTimeMillis() + "@@" + serviceName
: String.valueOf(System.currentTimeMillis());
}
public static void injectIdentity(Header header, String identityKey, String identityValue) {
if (StringUtils.isNotBlank(identityKey) && StringUtils.isNotBlank(identityValue)) {
header.addParam(identityKey, identityValue);
}
}
}

6
src/main/java/com/alibaba/nacos/cli/utils/SwitchUtils.java → core/src/main/java/com/alibaba/nacos/ctl/core/utils/SwitchUtils.java
View File

@ -1,7 +1,7 @@
package com.alibaba.nacos.cli.utils; package com.alibaba.nacos.ctl.core.utils;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

30
distrobution/assembly/release.xml Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
<id>release</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>dir</format>
<format>tar.gz</format>
</formats>
<fileSets>
<fileSet>
<includes>
<include>conf/**</include>
</includes>
</fileSet>
<fileSet>
<includes>
<include>bin/*</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
</fileSets>
<files>
<file>
<!--打好的jar包名称和放置目录-->
<source>../bootstrap/target/nacos-ctl-bootstrap-${project.version}-jar-with-dependencies.jar</source>
<outputDirectory>target/</outputDirectory>
<destName>nacosctl.jar</destName>
</file>
</files>
</assembly>

80
distrobution/bin/nacosctl.sh Executable file
View File

@ -0,0 +1,80 @@
#!/bin/bash
cygwin=false
darwin=false
os400=false
case "`uname`" in
CYGWIN*) cygwin=true;;
Darwin*) darwin=true;;
OS400*) os400=true;;
esac
error_exit ()
{
echo "ERROR: $1 !!"
exit 1
}
[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=$HOME/jdk/java
[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/usr/java
[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/opt/taobao/java
[ ! -e "$JAVA_HOME/bin/java" ] && unset JAVA_HOME
if [ -z "$JAVA_HOME" ]; then
if $darwin; then
if [ -x '/usr/libexec/java_home' ] ; then
export JAVA_HOME=`/usr/libexec/java_home`
elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then
export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home"
fi
else
JAVA_PATH=`dirname $(readlink -f $(which javac))`
if [ "x$JAVA_PATH" != "x" ]; then
export JAVA_HOME=`dirname $JAVA_PATH 2>/dev/null`
fi
fi
if [ -z "$JAVA_HOME" ]; then
error_exit "Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better!"
fi
fi
export SERVER="nacosctl"
export JAVA_HOME
export JAVA="$JAVA_HOME/bin/java"
export BASE_DIR=`cd $(dirname $0)/..; pwd`
export CONFIG_DIR=${BASE_DIR}/conf/
#===========================================================================================
# JVM Configuration
#===========================================================================================
JAVA_OPT="${JAVA_OPT} -Xms512m -Xmx512m -Xmn256m"
JAVA_MAJOR_VERSION=$($JAVA -version 2>&1 | sed -E -n 's/.* version "([0-9]*).*$/\1/p')
if [[ "$JAVA_MAJOR_VERSION" -ge "9" ]] ; then
JAVA_OPT_EXT_FIX=""
else
JAVA_OPT_EXT_FIX="-Djava.ext.dirs=${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext"
fi
JAVA_OPT="${JAVA_OPT} -Dconfig.dir=${CONFIG_DIR}"
JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/target/${SERVER}.jar"
JAVA_OPT="${JAVA_OPT} ${JAVA_OPT_EXT}"
if [ ! -d "${BASE_DIR}/logs" ]; then
mkdir ${BASE_DIR}/logs
fi
echo "$JAVA $JAVA_OPT_EXT_FIX ${JAVA_OPT} $@"
# check the start.out log output file
if [ ! -f "${BASE_DIR}/logs/start.out" ]; then
touch "${BASE_DIR}/logs/start.out"
fi
if [[ "$JAVA_OPT_EXT_FIX" == "" ]]; then
"$JAVA" ${JAVA_OPT} "$@"
else
"$JAVA" "$JAVA_OPT_EXT_FIX" ${JAVA_OPT} "$@"
fi

7
distrobution/conf/conf.properties Normal file
View File

@ -0,0 +1,7 @@
#username = nacos
#password = nacos
#confirmEnabled = true
#accessKey =
#secretKey =
#host = localhost
#port = 8848

47
distrobution/pom.xml Normal file
View File

@ -0,0 +1,47 @@
<?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>distrobution</artifactId>
<dependencies>
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-ctl-bootstrap</artifactId>
</dependency>
</dependencies>
<build>
<finalName>nacos-ctl</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>assembly/release.xml</descriptor>
</descriptors>
<tarLongFileMode>posix</tarLongFileMode>
</configuration>
<executions>
<execution>
<id>assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

26
interaction/pom.xml Normal file
View File

@ -0,0 +1,26 @@
<?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-interaction</artifactId>
<dependencies>
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-ctl-core</artifactId>
</dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</dependency>
</dependencies>
</project>

9
src/main/java/com/alibaba/nacos/cli/input/InputGetter.java → interaction/src/main/java/com/alibaba/nacos/ctl/intraction/input/InputGetter.java
View File

@ -1,8 +1,8 @@
package com.alibaba.nacos.cli.input; package com.alibaba.nacos.ctl.intraction.input;
import com.alibaba.nacos.cli.config.GlobalConfig; import com.alibaba.nacos.ctl.core.config.GlobalConfig;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import com.alibaba.nacos.cli.input.completer.NacosCtlCompleter; import com.alibaba.nacos.ctl.intraction.input.completer.NacosCtlCompleter;
import jline.console.ConsoleReader; import jline.console.ConsoleReader;
import java.io.IOException; import java.io.IOException;
@ -31,6 +31,7 @@ public class InputGetter {
public static void init() throws HandlerException { public static void init() throws HandlerException {
try { try {
instance.console = new ConsoleReader(); instance.console = new ConsoleReader();
instance.console.setHandleUserInterrupt(true);
instance.console.addCompleter(new NacosCtlCompleter()); instance.console.addCompleter(new NacosCtlCompleter());
} catch (IOException e) { } catch (IOException e) {
throw new HandlerException("Failed to load JLine", e); throw new HandlerException("Failed to load JLine", e);

17
src/main/java/com/alibaba/nacos/cli/input/completer/CompleterFactory.java → interaction/src/main/java/com/alibaba/nacos/ctl/intraction/input/completer/CompleterFactory.java
View File

@ -1,4 +1,4 @@
package com.alibaba.nacos.cli.input.completer; package com.alibaba.nacos.ctl.intraction.input.completer;
import jline.console.completer.ArgumentCompleter; import jline.console.completer.ArgumentCompleter;
import jline.console.completer.Completer; import jline.console.completer.Completer;
@ -13,7 +13,10 @@ import java.lang.annotation.Target;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.ServiceLoader;
/** /**
* 提供各种命令用到的completer group * 提供各种命令用到的completer group
@ -22,6 +25,8 @@ import java.util.List;
*/ */
public class CompleterFactory { public class CompleterFactory {
private static final String LOADED_COMPLETER = "LOAD completer(%s) finished.";
/** /**
* @author lehr * @author lehr
*/ */
@ -30,6 +35,7 @@ public class CompleterFactory {
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
private @interface Enabled { private @interface Enabled {
} }
public static List<Completer> loadAll() throws InvocationTargetException, IllegalAccessException { public static List<Completer> loadAll() throws InvocationTargetException, IllegalAccessException {
@ -45,6 +51,15 @@ public class CompleterFactory {
return completers; return completers;
} }
public static Collection<? extends Completer> loadExtensionCompleter() {
List<Completer> result = new LinkedList<>();
for (NacosCompleterBuilder each : ServiceLoader.load(NacosCompleterBuilder.class)) {
result.add(each.build());
System.out.println(String.format(LOADED_COMPLETER, each.getCompleterName()));
}
return result;
}
/** /**
* 对于不提供后续补全的几个基本指令，简单提供String补全组 * 对于不提供后续补全的几个基本指令，简单提供String补全组
* *

25
interaction/src/main/java/com/alibaba/nacos/ctl/intraction/input/completer/NacosCompleterBuilder.java Normal file
View File

@ -0,0 +1,25 @@
package com.alibaba.nacos.ctl.intraction.input.completer;
import jline.console.completer.Completer;
/**
* Nacos completer builder
*
* @author xiweng.yy
*/
public interface NacosCompleterBuilder {
/**
* Get completer name.
*
* @return completer name
*/
String getCompleterName();
/**
* Build target completer.
*
* @return completer
*/
Completer build();
}

5
src/main/java/com/alibaba/nacos/cli/input/completer/NacosCtlCompleter.java → interaction/src/main/java/com/alibaba/nacos/ctl/intraction/input/completer/NacosCtlCompleter.java
View File

@ -1,6 +1,6 @@
package com.alibaba.nacos.cli.input.completer; package com.alibaba.nacos.ctl.intraction.input.completer;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import jline.console.completer.Completer; import jline.console.completer.Completer;
import jline.internal.Preconditions; import jline.internal.Preconditions;
@ -23,6 +23,7 @@ public class NacosCtlCompleter implements Completer {
public NacosCtlCompleter() throws HandlerException { public NacosCtlCompleter() throws HandlerException {
try { try {
completers = CompleterFactory.loadAll(); completers = CompleterFactory.loadAll();
completers.addAll(CompleterFactory.loadExtensionCompleter());
} catch (Exception e) { } catch (Exception e) {
throw new HandlerException("failed to load completer groups", e); throw new HandlerException("failed to load completer groups", e);
} }

6
src/main/java/com/alibaba/nacos/cli/input/completer/NacosSwitchSetCompleter.java → interaction/src/main/java/com/alibaba/nacos/ctl/intraction/input/completer/NacosSwitchSetCompleter.java
View File

@ -1,7 +1,7 @@
package com.alibaba.nacos.cli.input.completer; package com.alibaba.nacos.ctl.intraction.input.completer;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import jline.console.completer.Completer; import jline.console.completer.Completer;
import java.util.Collections; import java.util.Collections;

8
src/main/java/com/alibaba/nacos/cli/input/completer/NacosUseCompleter.java → interaction/src/main/java/com/alibaba/nacos/ctl/intraction/input/completer/NacosUseCompleter.java
View File

@ -1,8 +1,8 @@
package com.alibaba.nacos.cli.input.completer; package com.alibaba.nacos.ctl.intraction.input.completer;
import com.alibaba.nacos.cli.core.LogicHandler; import com.alibaba.nacos.ctl.core.LogicHandler;
import com.alibaba.nacos.cli.core.bean.NamespaceVO; import com.alibaba.nacos.ctl.core.bean.NamespaceVO;
import com.alibaba.nacos.cli.core.exception.HandlerException; import com.alibaba.nacos.ctl.core.exception.HandlerException;
import jline.console.completer.Completer; import jline.console.completer.Completer;
import java.util.Collections; import java.util.Collections;

228
pom.xml
View File

@ -1,100 +1,196 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.alibaba.nacos</groupId> <groupId>com.alibaba.nacos</groupId>
<artifactId>nacosctl</artifactId> <artifactId>nacosctl</artifactId>
<version>1.0.0</version> <packaging>pom</packaging>
<version>${revision}</version>
<modules>
<module>distrobution</module>
<module>core</module>
<module>interaction</module>
<module>command</module>
<module>bootstrap</module>
</modules>
<properties> <properties>
<revision>1.0.1</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
<nacos.client.version>1.4.4</nacos.client.version>
<picocli.version>4.6.3</picocli.version>
<asciitable.version>0.3.2</asciitable.version>
<jline.version>2.14.6</jline.version>
<httpcomponents.version>4.5.14</httpcomponents.version>
<gson.version>2.8.9</gson.version>
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.11</logback.version>
<junit.version>4.13.2</junit.version>
<mockito.version>4.0.0</mockito.version>
<maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
<maven-assembly-plugin.version>3.4.2</maven-assembly-plugin.version>
<maven-flatten-version>1.1.0</maven-flatten-version>
</properties> </properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-ctl-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-ctl-interaction</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-ctl-command</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-ctl-bootstrap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>${picocli.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-client</artifactId>
<version>${nacos.client.version}</version>
</dependency>
<dependency>
<groupId>de.vandermeer</groupId>
<artifactId>asciitable</artifactId>
<version>${asciitable.version}</version>
</dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>${jline.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpcomponents.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.6.1</version>
</dependency>
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-client</artifactId>
<version>1.4.2</version>
</dependency>
<dependency>
<groupId>de.vandermeer</groupId>
<artifactId>asciitable</artifactId>
<version>0.3.2</version>
</dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>2.14.6</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.5</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.11</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.5</version>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.22</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<version>1.1.7</version>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId>
<artifactId>maven-assembly-plugin</artifactId> <version>${maven-resources-plugin.version}</version>
<version>2.2-beta-5</version> <configuration>
<!-- We are not suppose to setup the customer resources here -->
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${maven-flatten-version}</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
<pomElements>
<dependencies>expand</dependencies>
</pomElements>
</configuration>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <id>flatten</id>
<phase>process-resources</phase>
<goals> <goals>
<goal>single</goal> <goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals> </goals>
<configuration>
<archive>
<manifest>
<mainClass>
com.alibaba.nacos.cli.ClientMain
</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>

54
src/main/java/com/alibaba/nacos/cli/ClientMain.java
View File

@ -1,54 +0,0 @@
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();
}
}
}
}

29
src/main/java/com/alibaba/nacos/cli/commands/NacosClear.java
View File

@ -1,29 +0,0 @@
package com.alibaba.nacos.cli.commands;
import picocli.CommandLine;
import java.util.concurrent.Callable;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_CLEAR;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_CLEAR;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING;
import static com.alibaba.nacos.cli.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;
}
}

152
src/main/java/com/alibaba/nacos/cli/commands/NacosMetrics.java
View File

@ -1,152 +0,0 @@
package com.alibaba.nacos.cli.commands;
import com.alibaba.nacos.cli.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException;
import picocli.CommandLine;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Stream;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_METRICS;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_METRICS;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.USAGE_METRICS;
/**
* get metrics data from nacos prometheus http port
*
* @author lehr
*/
@CommandLine.Command(name = NAME_METRICS, sortOptions = SORT_OPTIONS, headerHeading = HEADER_HEADING, synopsisHeading = SYNOPSIS_HEADING, descriptionHeading = DESCRIPTION_HEADING, parameterListHeading = PARAMETER_LIST_HEADING, optionListHeading = OPTION_LIST_HEADING, header = USAGE_METRICS, description = DESCRIPTION_METRICS, subcommands = {
CommandLine.HelpCommand.class})
@Deprecated
public class NacosMetrics implements Runnable {
@CommandLine.Parameters(paramLabel = "<module>", description = "The module name of the metrics")
public Module module;
@Override
public void run() {
try {
Stream<String> metrics = LogicHandler.getMetrics();
metrics.map(this::mapModule).filter(Objects::nonNull).sorted().forEachOrdered(System.out::println);
} catch (HandlerException e) {
System.out.println(e.getMessage());
}
}
private enum Module {
/**
* nacos 客户端模块参数
*/
CLIENT,
/**
* nacos server的参数
*/
NACOS,
/**
* jvm和gc相关信息
*/
JVM,
/**
* 异常信息
*/
EXCEPTION
}
/**
* translate metrics name to chinese.
*
* @param s
* @return
*/
public String mapModule(String s) {
String backup = s;
Map<String, String> map = enumMap.get(module);
for (Map.Entry<String, String> e : map.entrySet()) {
if (s.startsWith(e.getKey())) {
s = s.replace(e.getKey(), e.getValue());
break;
}
}
if (backup.equals(s)) {
return null;
} else {
return s;
}
}
private static Map<String, String> clientMap;
private static Map<String, String> exceptionMap;
private static Map<String, String> nacosMap;
private static Map<String, String> jvmMap;
private static Map<Module, Map<String, String>> enumMap = new HashMap<>();
static {
jvmMap = new HashMap<>();
jvmMap.put("system_cpu_usage", "CPU使用率");
jvmMap.put("system_load_average_1m", "CPU负载");
jvmMap.put("jvm_memory_used_bytes", "内存使用字节");
jvmMap.put("jvm_memory_max_bytes", "内存最大字节");
jvmMap.put("jvm_gc_pause_seconds_count", "GC次数");
jvmMap.put("jvm_gc_pause_seconds_sum", "GC耗时");
jvmMap.put("jvm_threads_daemon", "线程数");
clientMap = new HashMap<>();
clientMap.put("nacos_monitor{name='subServiceCount'}", "订阅的服务数");
clientMap.put("nacos_monitor{name='pubServiceCount'}", "发布的服务数");
clientMap.put("nacos_monitor{name='configListenSize'}", "监听的配置数");
clientMap.put("nacos_client_request_seconds_count", "请求次数");
clientMap.put("nacos_client_request_seconds_sum", "请求总耗时");
nacosMap = new HashMap<>();
nacosMap.put("http_server_requests_seconds_count", "http请求次数");
nacosMap.put("http_server_requests_seconds_sum", "http请求总耗时");
nacosMap.put("nacos_timer_seconds_sum", "Nacos config水平通知耗时");
nacosMap.put("nacos_timer_seconds_count", "Nacos config水平通知次数");
nacosMap.put("nacos_monitor{module=\"config\",name=\"longPolling\",}", "Nacos config长连接数");
nacosMap.put("nacos_monitor{module=\"config\",name=\"configCount\",}", "Nacos config配置个数");
nacosMap.put("nacos_monitor{module=\"config\",name=\"dumpTask\",}", "Nacos config配置落盘任务堆积数");
nacosMap.put("nacos_monitor{module=\"config\",name=\"notifyTask\",}", "Nacos config配置水平通知任务堆积数");
nacosMap.put("nacos_monitor{module=\"config\",name=\"getConfig\",}", "Nacos config读配置统计数");
nacosMap.put("nacos_monitor{module=\"config\",name=\"publish\",}", "Nacos config写配置统计数");
nacosMap.put("nacos_monitor{module=\"naming\",name=\"ipCount\",}", "Nacos naming ip个数");
nacosMap.put("nacos_monitor{module=\"naming\",name=\"domCount\",}", "Nacos naming域名个数");
nacosMap.put("nacos_monitor{module=\"naming\",name=\"failedPush\",}", "Nacos naming推送失败数");
nacosMap.put("nacos_monitor{module=\"naming\",name=\"avgPushCost\",}", "Nacos naming平均推送耗时");
nacosMap.put("nacos_monitor{module=\"naming\",name=\"leaderStatus\",}", "Nacos naming角色状态");
nacosMap.put("nacos_monitor{module=\"naming\",name=\"maxPushCost\",}", "Nacos naming最大推送耗时");
nacosMap.put("nacos_monitor{module=\"naming\",name=\"mysqlhealthCheck\",}", "Nacos naming mysql健康检查次数");
nacosMap.put("nacos_monitor{module=\"naming\",name=\"httpHealthCheck\",}", "Nacos naming http健康检查次数");
nacosMap.put("nacos_monitor{module=\"naming\",name=\"tcpHealthCheck\",}", "Nacos naming tcp健康检查次数");
exceptionMap = new HashMap<>();
exceptionMap.put("nacos_exception_total{name='db'}", "数据库异常");
exceptionMap.put("nacos_exception_total{name='configNotify'}", "Nacos config水平通知失败");
exceptionMap.put("nacos_exception_total{name='unhealth'}", "Nacos config server之间健康检查异常");
exceptionMap.put("nacos_exception_total{name='disk'}", "Nacos naming写磁盘异常");
exceptionMap.put("nacos_exception_total{name='leaderSendBeatFailed'}", "Nacos naming leader发送心跳异常");
exceptionMap.put("nacos_exception_total{name='illegalArgument'}", "请求参数不合法");
exceptionMap.put("nacos_exception_total{name='nacos'}", "Nacos请求响应内部错误异常");
enumMap.put(Module.NACOS, nacosMap);
enumMap.put(Module.JVM, jvmMap);
enumMap.put(Module.EXCEPTION, exceptionMap);
enumMap.put(Module.CLIENT, clientMap);
}
}

38
src/main/java/com/alibaba/nacos/cli/commands/NacosQuit.java
View File

@ -1,38 +0,0 @@
package com.alibaba.nacos.cli.commands;
import com.alibaba.nacos.cli.core.LogicHandler;
import com.alibaba.nacos.cli.core.exception.HandlerException;
import picocli.CommandLine;
import java.util.concurrent.Callable;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.DESCRIPTION_QUIT;
import static com.alibaba.nacos.cli.utils.HintUtils.HEADER_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.NAME_QUIT;
import static com.alibaba.nacos.cli.utils.HintUtils.OPTION_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.PARAMETER_LIST_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.SORT_OPTIONS;
import static com.alibaba.nacos.cli.utils.HintUtils.SYNOPSIS_HEADING;
import static com.alibaba.nacos.cli.utils.HintUtils.USAGE_QUIT;
/**
* quit from cli
*
* @author lehr
*/
@CommandLine.Command(name = NAME_QUIT, sortOptions = SORT_OPTIONS, headerHeading = HEADER_HEADING, synopsisHeading = SYNOPSIS_HEADING, descriptionHeading = DESCRIPTION_HEADING, parameterListHeading = PARAMETER_LIST_HEADING, optionListHeading = OPTION_LIST_HEADING, header = USAGE_QUIT, description = DESCRIPTION_QUIT)
public class NacosQuit implements Callable<Integer> {
@Override
public Integer call() {
try {
LogicHandler.shutdown();
} catch (HandlerException e) {
System.out.println(e.getMessage());
}
System.out.println("bye!");
return -1;
}
}

10
src/main/resources/logback.xml
View File

@ -1,10 +0,0 @@
<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>