Fix merge issues
This commit is contained in:
commit
e2b1394ea2
@ -1,4 +1,3 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="FrameworkDetectionExcludesConfiguration">
|
||||
|
||||
@ -6,7 +6,14 @@
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="ceecbd3e-6a84-488d-ae73-a0b5b3f4010e" name="Changes" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
|
||||
<<<<<<< HEAD
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
=======
|
||||
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/tech/nevets/ngxinstaller/Server.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/tech/nevets/ngxinstaller/Server.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/tech/nevets/ngxinstaller/TextStorage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/tech/nevets/ngxinstaller/TextStorage.java" afterDir="false" />
|
||||
>>>>>>> a954dc49f4c6943f06c97c50957ac1b1ac48088b
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@ -26,23 +33,7 @@
|
||||
</task>
|
||||
<projects_view>
|
||||
<tree_state>
|
||||
<expand>
|
||||
<path>
|
||||
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
|
||||
<item name="NginxInstallerBackend" type="f1a62948:ProjectNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
|
||||
<item name="NginxInstallerBackend" type="f1a62948:ProjectNode" />
|
||||
<item name="Tasks" type="e4a08cd1:TasksNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
|
||||
<item name="NginxInstallerBackend" type="f1a62948:ProjectNode" />
|
||||
<item name="Tasks" type="e4a08cd1:TasksNode" />
|
||||
<item name="shadow" type="c8890929:TasksNode$1" />
|
||||
</path>
|
||||
</expand>
|
||||
<expand />
|
||||
<select />
|
||||
</tree_state>
|
||||
</projects_view>
|
||||
@ -73,6 +64,7 @@
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<<<<<<< HEAD
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"Gradle.NginxInstallerBackend [:Server.main()].executor": "Debug",
|
||||
@ -90,6 +82,28 @@
|
||||
}
|
||||
}</component>
|
||||
<component name="RunManager" selected="Gradle.NginxInstallerBackend [shadowJar]">
|
||||
=======
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"Gradle.NginxInstallerBackend [:Server.main()].executor": "Debug",
|
||||
"Gradle.NginxInstallerBackend [shadowJar].executor": "Run",
|
||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"WebServerToolWindowFactoryState": "false",
|
||||
"git-widget-placeholder": "master",
|
||||
"ignore.virus.scanning.warn.message": "true",
|
||||
"kotlin-language-version-configured": "true",
|
||||
"last_opened_file_path": "F:/Projects/Web/NginxInstallerBackend",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
}
|
||||
}]]></component>
|
||||
<component name="RunManager" selected="Application.Server">
|
||||
>>>>>>> a954dc49f4c6943f06c97c50957ac1b1ac48088b
|
||||
<configuration name="Server" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="tech.nevets.ngxinstaller.Server" />
|
||||
<module name="NginxInstallerBackend.main" />
|
||||
@ -147,9 +161,14 @@
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1703015833777</updated>
|
||||
<<<<<<< HEAD
|
||||
<workItem from="1703015834937" duration="11923000" />
|
||||
<workItem from="1703098848808" duration="606000" />
|
||||
<workItem from="1704314407897" duration="15000" />
|
||||
=======
|
||||
<workItem from="1703015834937" duration="5516000" />
|
||||
<workItem from="1703185574324" duration="1576000" />
|
||||
>>>>>>> a954dc49f4c6943f06c97c50957ac1b1ac48088b
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
||||
@ -5,6 +5,10 @@ import com.google.gson.GsonBuilder;
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
import java.net.URLDecoder;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Timer;
|
||||
import java.util.TimerTask;
|
||||
@ -13,6 +17,7 @@ import static spark.Spark.*;
|
||||
|
||||
public class Server {
|
||||
private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
|
||||
public static String cachedNginxSite = "";
|
||||
public static void main(String[] args) {
|
||||
if (args.length >= 1) {
|
||||
port(Integer.parseInt(args[0]));
|
||||
@ -20,9 +25,53 @@ public class Server {
|
||||
port(8080);
|
||||
}
|
||||
|
||||
try {
|
||||
cachedNginxSite = getHTML("https://nginx.org/download/");
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
port(8080);
|
||||
options("/*",
|
||||
(request, response) -> {
|
||||
|
||||
String accessControlRequestHeaders = request
|
||||
.headers("Access-Control-Request-Headers");
|
||||
if (accessControlRequestHeaders != null) {
|
||||
response.header("Access-Control-Allow-Headers",
|
||||
accessControlRequestHeaders);
|
||||
}
|
||||
|
||||
String accessControlRequestMethod = request
|
||||
.headers("Access-Control-Request-Method");
|
||||
if (accessControlRequestMethod != null) {
|
||||
response.header("Access-Control-Allow-Methods",
|
||||
accessControlRequestMethod);
|
||||
}
|
||||
|
||||
return "OK";
|
||||
});
|
||||
|
||||
before((request, response) -> response.header("Access-Control-Allow-Origin", "*"));
|
||||
post("/ngx/dhv", (req, res) -> {
|
||||
System.out.println(req.body());
|
||||
JsonObject jsonObject = GSON.fromJson(req.body(), JsonObject.class);
|
||||
String version = jsonObject.get("version").getAsString();
|
||||
System.out.println(version);
|
||||
try {
|
||||
if (cachedNginxSite.contains(version + ".tar.gz")) {
|
||||
System.out.println("true");
|
||||
return "{ \"url\":\"true\" }";
|
||||
}
|
||||
} catch (Exception ignore) {
|
||||
System.out.println("false");
|
||||
return "{ \"url\":\"false\" }";
|
||||
}
|
||||
System.out.println("false");
|
||||
return "{ \"url\":\"false\" }";
|
||||
});
|
||||
post("/ngx/create", (req, res) -> {
|
||||
JsonObject jsonObject = GSON.fromJson(req.body(), JsonObject.class);
|
||||
TextStorage ts = TextStorage.createPaste(jsonObject.get("content").getAsString());
|
||||
TextStorage ts = TextStorage.createPaste(java.net.URLDecoder.decode(jsonObject.get("content").getAsString(), StandardCharsets.UTF_8));
|
||||
return "{ \"url\":\"https://api.nevets.tech/ngx/raw/" + ts.getId() + "\" }";
|
||||
});
|
||||
get("/ngx/raw/*", (req, res) -> {
|
||||
@ -43,7 +92,8 @@ public class Server {
|
||||
res.status(404);
|
||||
return "{\"error\":\"content not found\"}";
|
||||
}
|
||||
return GSON.toJson(ts);
|
||||
res.type("raw");
|
||||
return ts.getText();
|
||||
});
|
||||
|
||||
|
||||
@ -52,6 +102,21 @@ public class Server {
|
||||
timer.schedule(tt, 0, 60000);
|
||||
}
|
||||
|
||||
public static String getHTML(String urlToRead) throws Exception {
|
||||
StringBuilder result = new StringBuilder();
|
||||
URL url = new URL(urlToRead);
|
||||
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
|
||||
conn.setRequestMethod("GET");
|
||||
try (BufferedReader reader = new BufferedReader(
|
||||
new InputStreamReader(conn.getInputStream()))) {
|
||||
for (String line; (line = reader.readLine()) != null; ) {
|
||||
result.append(line);
|
||||
}
|
||||
}
|
||||
return result.toString();
|
||||
}
|
||||
|
||||
|
||||
static class GCTask extends TimerTask {
|
||||
@Override
|
||||
public void run() {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user