-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6 from nacos-group/develop
Develop
- Loading branch information
Showing
25 changed files
with
413 additions
and
260 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
bootstrap/src/main/java/com/alibaba/nacos/ctl/bootstrap/command/NacosBootstrapCommand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package com.alibaba.nacos.ctl.bootstrap.command; | ||
|
|
||
| import com.alibaba.nacos.ctl.command.NacosClear; | ||
| import com.alibaba.nacos.ctl.command.NacosQuit; | ||
| import com.alibaba.nacos.ctl.core.LogicHandler; | ||
| import com.alibaba.nacos.ctl.core.config.ConfigLoader; | ||
| import com.alibaba.nacos.ctl.core.config.GlobalConfig; | ||
| import picocli.CommandLine; | ||
| import picocli.CommandLine.Command; | ||
|
|
||
| import java.lang.reflect.Field; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| 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.GREETING; | ||
| 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}) | ||
| public class NacosBootstrapCommand implements Runnable { | ||
|
|
||
| @CommandLine.Option(names = {"-e", | ||
| "--endpoint"}, paramLabel = "<endpoint ip>", description = "The Nacos-Server host Ip.") | ||
| private String host; | ||
|
|
||
| @CommandLine.Option(names = {"-p", "--port"}, paramLabel = "<port>", description = "The port of Nacos-Server.") | ||
| private Integer port; | ||
|
|
||
| @CommandLine.Option(names = {"-u", | ||
| "--username"}, paramLabel = "<username>", description = "Nacos authentication username.") | ||
| private String username; | ||
|
|
||
| @CommandLine.Option(names = {"-pswd", | ||
| "--password"}, paramLabel = "<password>", description = "Nacos password username.") | ||
| private String password; | ||
|
|
||
| @CommandLine.Option(names = {"-ak", "--accessKey"}, paramLabel = "<accessKey>", description = "Nacos access key.") | ||
| private String accessKey; | ||
|
|
||
| @CommandLine.Option(names = {"-sk", "--secretKey"}, paramLabel = "<secretKey>", description = "Nacos secret key.") | ||
| private String secretKey; | ||
|
|
||
| @Override | ||
| public void run() { | ||
| System.out.println(GREETING); | ||
| Map<String, String> confs = new HashMap<>(); | ||
| for (Field f : this.getClass().getDeclaredFields()) { | ||
| if (f.isAnnotationPresent(CommandLine.Option.class)) { | ||
| try { | ||
| Object o = f.get(this); | ||
| if (o != null) { | ||
| confs.put(f.getName(), o.toString()); | ||
| } | ||
| } catch (Exception e) { | ||
| //todo | ||
| } | ||
| } | ||
| } | ||
| if (!confs.isEmpty()) { | ||
| ConfigLoader.preload(confs); | ||
| GlobalConfig.getInstance().refresh(); | ||
| LogicHandler.refresh(); | ||
| } | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
command/src/main/java/com/alibaba/nacos/ctl/command/NacosCommand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.