From 4d4aeaf8fc0cad6cbe01d0e51456e0245745e457 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Tue, 18 Oct 2022 17:54:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- .neutrino-proxy-client.json | 7 +++++++ .../neutrino/proxy/client/core/LicenseObtainService.java | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 .neutrino-proxy-client.json 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; }