Skip to content

Commit

Permalink
release 1.0.4
Browse files Browse the repository at this point in the history
	Support login
	Support Sync data use gitlab
  • Loading branch information
XueMoMo committed Nov 23, 2023
1 parent 97974e8 commit 37f84a9
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 21 deletions.
2 changes: 1 addition & 1 deletion olca-app-build/mac_dist.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

DIST="aicpLCA_macOS_x64_1.0.3_$(date '+%Y-%m-%d')"
DIST="aicpLCA_macOS_x64_1.0.4_$(date '+%Y-%m-%d')"
BUNDLE_ID="org.aicplca.app"
APP_DMG="build/tmp/macosx.cocoa.x86_64/aicpLCA_dmg/aicpLCA.app"
APP_PKG="build/tmp/macosx.cocoa.x86_64/aicpLCA_pkg/aicpLCA.app"
Expand Down
4 changes: 2 additions & 2 deletions olca-app/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: olca-app
Automatic-Module-Name: olca-app
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-SymbolicName: olca-app;singleton:=true
Bundle-Version: 1.0.3
Bundle-Version: 1.0.4
Bundle-Activator: org.openlca.app.rcp.RcpActivator
Bundle-Vendor: aicpLCA.org
Eclipse-BundleShape: dir
Expand Down Expand Up @@ -110,7 +110,7 @@ Bundle-ClassPath: .,
libs/org.eclipse.persistence.core-3.0.3.jar,
libs/org.eclipse.persistence.jpa.jpql-3.0.3.jar,
libs/org.eclipse.persistence.jpa-3.0.3.jar,
libs/osgi-resource-locator-1.0.3.jar,
libs/osgi-resource-locator-1.0.4.jar,
libs/perfmark-api-0.25.0.jar,
libs/ph-commons-10.1.2.jar,
libs/ph-css-6.3.2.jar,
Expand Down
5 changes: 2 additions & 3 deletions olca-app/aicpLCA.product
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="aicpLCA" uid="aicpLCA" id="olca-app.aicpLCA" application="org.openlca.app.Application" version="1.0.3" useFeatures="false" includeLaunchers="true" autoIncludeRequirements="true">
<product name="aicpLCA" uid="aicpLCA" id="olca-app.aicpLCA" application="org.openlca.app.Application" version="1.0.4" useFeatures="false" includeLaunchers="true" autoIncludeRequirements="true">

<aboutInfo>
<image path="/olca-app/icons/about.png"/>
<text>
AICP LCA Tool 1.0.3
AICP LCA Tool 1.0.4

Copyright (c) 2023 GTech International Ltd. All rights reserved.
Visit https://gtech.world
Expand Down Expand Up @@ -48,7 +48,6 @@ Visit https://gtech.world
<windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
</vm>


<plugins>
<plugin id="com.ibm.icu"/>
<plugin id="com.sun.jna"/>
Expand Down
6 changes: 1 addition & 5 deletions olca-app/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@
</property>
<property
name="aboutText"
value="AICP LCA Tool 1.0.3&#x0A;&#x0A;Copyright (c) 2023 GTech International Ltd. All rights reserved.&#x0A;Visit https://gtech.world">
value="AICP LCA Tool 1.0.4&#x0A;&#x0A;Copyright (c) 2023 GTech International Ltd. All rights reserved.&#x0A;Visit https://gtech.world">
</property>
<property
name="aboutImage"
Expand All @@ -609,10 +609,6 @@
<property
name="startupProgressRect"
value="0,437,586,5">
</property>
<property
name="preferenceCustomization"
value="plugin_customization.ini">
</property>
</product>
</extension>
Expand Down
19 changes: 9 additions & 10 deletions olca-app/src/org/openlca/app/util/Req.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,20 @@ public class Req {
private static HttpClient client;
private static Gson gson = new Gson();
// beta
private static final String base = "https://pre-api.gtech.world";
// private static final String base = "https://pre-api.gtech.world";
// prod
// private static final String base = "https://api-v2.gtech.world";
private static final String base = "https://api-v2.gtech.world";

public static <T> T httpGET(String path, Class<T> classz) throws Exception {
var req = HttpRequest.newBuilder(URI.create(base + path)).build();
var res = instanceClinet().send(req, HttpResponse.BodyHandlers.ofString());
return gson.fromJson(res.body(), classz);
}
public static <T> T httpPost(String path,String body, Class<T> classz) throws Exception {

public static <T> T httpPost(String path, String body, Class<T> classz) throws Exception {
var bodyPub = HttpRequest.BodyPublishers.ofString(body);
var req = HttpRequest.newBuilder(URI.create(base + path))
.header("Content-Type", "application/json;charset=utf-8")
.POST(bodyPub)
.build();
.header("Content-Type", "application/json;charset=utf-8").POST(bodyPub).build();
var res = instanceClinet().send(req, HttpResponse.BodyHandlers.ofString());
return gson.fromJson(res.body(), classz);
}
Expand All @@ -35,11 +33,12 @@ public static class RES<T> {
public int status;
public String message;
public T data;
public RES(){


public RES() {

}
}

private static HttpClient instanceClinet() {
if (client == null) {
client = HttpClient.newHttpClient();
Expand Down

0 comments on commit 37f84a9

Please sign in to comment.