diff --git a/.gitignore b/.gitignore index d1f28b7e..83909f75 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ *.class data.db* .neutrino-proxy.license -.neutrino-proxy-client.config +.neutrino-proxy-client.json lib/* diff --git a/.neutrino-proxy-client.json b/.neutrino-proxy-client.json new file mode 100644 index 00000000..85b0517b --- /dev/null +++ b/.neutrino-proxy-client.json @@ -0,0 +1,7 @@ +{ + "jksPath":"classpath:/test.jks", + "licenseKey":"9495b00018fd4d2eac4d485a4c923b6d", + "serverIp":"1.15.57.136", + "serverPort":9002, + "sslEnable":true +} \ No newline at end of file diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java index bb07c725..6b523a3e 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java +++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java @@ -121,11 +121,11 @@ public class LicenseObtainService { customConfig.setLicenseKey(cliParams.get("licenseKey")); } if (StringUtil.notEmpty(customConfig.getLicenseKey())) { - FileUtil.write("./.neutrino-proxy-client.config", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat)); + FileUtil.write("./.neutrino-proxy-client.json", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat)); return customConfig; } - String config = FileUtil.readContentAsString("./.neutrino-proxy-client.config"); + String config = FileUtil.readContentAsString("./.neutrino-proxy-client.json"); if (StringUtil.notEmpty(config)) { try { customConfig = JSONObject.parseObject(config, CustomConfig.class); @@ -133,7 +133,7 @@ public class LicenseObtainService { log.error("配置异常!", e); } if (StringUtil.notEmpty(customConfig.getLicenseKey())) { - FileUtil.write("./.neutrino-proxy-client.config", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat)); + FileUtil.write("./.neutrino-proxy-client.json", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat)); return customConfig; } } @@ -144,7 +144,7 @@ public class LicenseObtainService { license = scanner.next(); } customConfig.setLicenseKey(license); - FileUtil.write("./.neutrino-proxy-client.config", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat)); + FileUtil.write("./.neutrino-proxy-client.json", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat)); return customConfig; }