yeyinlaoying/neutrino-proxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

启动参数调整

Browse Source
This commit is contained in:
aoshiguchen
2023-02-14 17:58:56 +08:00
parent aa48af86a6
commit e7b2c17a35
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
neutrino-core/src/main/java/fun/asgc/neutrino/core/context/Environment.java
+17
View File
@@ -120,8 +120,25 @@ public class Environment {
return (null != res) ? res : defaultValue;
}
public Boolean getMainArgsForBoolean(String key, Boolean defaultValue) {
String val = getMainArgs(key);
Boolean res = null;
try {
if (!StringUtil.isEmpty(val)) {
res = Boolean.valueOf(val);
}
} catch (Exception e) {
// ignore
}
return (null != res) ? res : defaultValue;
}
public String getMainArgsForString(String key, String defaultValue) {
String res = getMainArgs(key);
return !StringUtil.isEmpty(res) ? res : defaultValue;
}
public String getMainArgsForString(String key) {
return getMainArgsForString(key, null);
}
}
neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java
+9 -23
View File
@@ -99,38 +99,24 @@ public class LicenseObtainService {
private CustomConfig getCustomConfigByCliParams(String[] args) {
CustomConfig customConfig = new CustomConfig();
// 默认无需输入
customConfig.setJksPath(proxyConfig.getClient().getJksPath());
customConfig.setServerIp(proxyConfig.getClient().getServerIp());
customConfig.setServerPort(proxyConfig.getClient().getServerPort());
customConfig.setSslEnable(proxyConfig.getClient().getSslEnable());
// 从cli参数中取
Map<String, String> cliParams = getCliParams(args);
if (cliParams.containsKey("jksPath")) {
customConfig.setJksPath(cliParams.get("jksPath"));
}
if (cliParams.containsKey("serverIp")) {
customConfig.setServerIp(cliParams.get("serverIp"));
}
if (cliParams.containsKey("serverPort")) {
customConfig.setServerPort(Integer.valueOf(cliParams.get("serverPort")));
}
if (cliParams.containsKey("sslEnable")) {
customConfig.setSslEnable(Boolean.valueOf(cliParams.get("sslEnable")));
}
if (cliParams.containsKey("licenseKey")) {
customConfig.setLicenseKey(cliParams.get("licenseKey"));
}
customConfig.setJksPath(environment.getMainArgsForString("jksPath", proxyConfig.getClient().getJksPath()));
customConfig.setServerIp(environment.getMainArgsForString("serverIp", proxyConfig.getClient().getServerIp()));
customConfig.setServerPort(environment.getMainArgsForInteger("serverPort", proxyConfig.getClient().getServerPort()));
customConfig.setSslEnable(environment.getMainArgsForBoolean("sslEnable", proxyConfig.getClient().getSslEnable()));
customConfig.setLicenseKey(environment.getMainArgsForString("licenseKey"));
// 启动参数指定了license，则无需后续处理
if (StringUtil.notEmpty(customConfig.getLicenseKey())) {
// FileUtil.write("./.neutrino-proxy-client.json", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
return customConfig;
}
// 启动参数未指定license，则优先读取外部配置
String config = FileUtil.readContentAsString("./.neutrino-proxy-client.json");
if (StringUtil.notEmpty(config)) {
try {
customConfig = JSONObject.parseObject(config, CustomConfig.class);
} catch (Exception e) {
log.error("配置异常!", e);
log.error("file '.neutrino-proxy-client.json' config exception!", e);
}
if (StringUtil.notEmpty(customConfig.getLicenseKey())) {
// FileUtil.write("./.neutrino-proxy-client.json", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
@@ -140,7 +126,7 @@ public class LicenseObtainService {
String license = "";
while (StringUtil.isEmpty(license)) {
System.out.print("请输入license:");
System.out.print("Please input license:");
license = scanner.next();
}
customConfig.setLicenseKey(license);