Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-23 09:01:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/5.2.1'

Browse source
This commit is contained in:
Gravita 2021-08-31 18:28:01 +07:00
commit 92cdaa446e
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/JsonCoreProvider.java
View file

@ -58,7 +58,7 @@ public static <T, R> R jsonRequest(T request, String url, String bearerToken, Cl
.header("Accept", "application/json") .header("Accept", "application/json")
.timeout(Duration.ofMillis(10000)); .timeout(Duration.ofMillis(10000));
if (bearerToken != null) { if (bearerToken != null) {
request1.header("Authentication", "Bearer ".concat(bearerToken)); request1.header("Authorization", "Bearer ".concat(bearerToken));
} }
HttpResponse<InputStream> response = client.send(request1.build(), HttpResponse.BodyHandlers.ofInputStream()); HttpResponse<InputStream> response = client.send(request1.build(), HttpResponse.BodyHandlers.ofInputStream());
int statusCode = response.statusCode(); int statusCode = response.statusCode();

2
LaunchServer/src/main/java/pro/gravit/launchserver/socket/Client.java
View file

@ -81,7 +81,7 @@ public String getSerializableProperty(String name) {
public void setSerializableProperty(String name, String value) { public void setSerializableProperty(String name, String value) {
if (serializableProperties == null) serializableProperties = new HashMap<>(); if (serializableProperties == null) serializableProperties = new HashMap<>();
properties.put(name, value); serializableProperties.put(name, value);
} }
public pro.gravit.launchserver.auth.core.User getUser() { public pro.gravit.launchserver.auth.core.User getUser() {

4
LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyWebAPIHandler.java
View file

@ -12,7 +12,7 @@
import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.IOHelper;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.nio.charset.Charset; import java.nio.charset.StandardCharsets;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -86,7 +86,7 @@ default Map<String, String> getParamsFromUri(String uri) {
String[] result = sub.split("&"); String[] result = sub.split("&");
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
for (String s : result) { for (String s : result) {
String c = URLDecoder.decode(s, Charset.defaultCharset()); String c = URLDecoder.decode(s, StandardCharsets.UTF_8);
int index = c.indexOf("="); int index = c.indexOf("=");
if (index <= 0) { if (index <= 0) {
continue; continue;

2
LauncherCore/src/main/java/pro/gravit/utils/Version.java
View file

@ -6,7 +6,7 @@ public final class Version implements Comparable<Version> {
public static final int MAJOR = 5; public static final int MAJOR = 5;
public static final int MINOR = 2; public static final int MINOR = 2;
public static final int PATCH = 0; public static final int PATCH = 1;
public static final int BUILD = 1; public static final int BUILD = 1;
public static final Version.Type RELEASE = Type.STABLE; public static final Version.Type RELEASE = Type.STABLE;
public final int major; public final int major;

2
build.gradle
View file

@ -5,7 +5,7 @@
id 'org.openjfx.javafxplugin' version '0.0.8' apply false id 'org.openjfx.javafxplugin' version '0.0.8' apply false
} }
group = 'pro.gravit.launcher' group = 'pro.gravit.launcher'
version = '5.2.0' version = '5.2.1'
apply from: 'props.gradle' apply from: 'props.gradle'

2
modules

@ -1 +1 @@
Subproject commit 9407d4bcd90f282969433d29b7598372f56917b9 Subproject commit 84a5599243bddf0f7a8081cc7f5672e9140893bd