Skip to content

Solved the problem of incompatible protobuf versions #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LoopOuroboros wants to merge 3 commits into
base: v2_main
Choose a base branch
from
+592 −497
Open

Solved the problem of incompatible protobuf versions #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ed7770
feature: use maven-shade-plugin rename protobuf-java to larksuite-oap…
Oct 24, 2024
a1f0109
fixed parseUrl not use input param
Oct 24, 2024
8237fe1
fixed getConnUrl connection not autoclose
Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions larksuite-oapi-shaded-protobuf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.larksuite.oapi</groupId>
<artifactId>larksuite</artifactId>
<version>2.0.0</version>
</parent>

<artifactId>larksuite-oapi-shaded-protobuf</artifactId>
<packaging>jar</packaging>
<version>2.3.6</version>

<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.22.2</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<createDependencyReducedPom>true</createDependencyReducedPom>
</configuration>
<executions>
<execution>
<id>shade-protobuf</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<includes>
<include>com.google.protobuf:protobuf-java</include>
</includes>
</artifactSet>
<filters>
<filter>
<artifact>com.google.protobuf:*</artifact>
<includes>
<include>**/*</include>
</includes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>com/google/protobuf</pattern>
<shadedPattern>com/lark/oapi/google/protobuf</shadedPattern>
</relocation>
<relocation>
<pattern>google/</pattern>
<shadedPattern>com.lark.oapi.google.</shadedPattern>
<includes>
<include>**/*.proto</include>
</includes>
</relocation>
</relocations>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
<resources>
<resource>NOTICE</resource>
<resource>LICENSE</resource>
</resources>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
<resource>META-INF/LICENSE.txt</resource>
<file>${basedir}/../LICENSE-binary</file>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
6 changes: 3 additions & 3 deletions larksuite-oapi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@
<version>4.5.13</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.22.2</version>
<groupId>com.larksuite.oapi</groupId>
<artifactId>larksuite-oapi-shaded-protobuf</artifactId>
<version>2.3.6</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
43 changes: 22 additions & 21 deletions larksuite-oapi/src/main/java/com/lark/oapi/ws/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.protobuf.ByteString;
import com.lark.oapi.google.protobuf.ByteString;
import com.lark.oapi.core.enums.BaseUrlEnum;
import com.lark.oapi.core.utils.Jsons;
import com.lark.oapi.event.EventDispatcher;
Expand Down Expand Up @@ -194,28 +194,29 @@ private String getConnUrl() throws IOException {
.addHeader("locale", "zh")
.post(RequestBody.create(MediaType.parse("application/json; charset=utf-8"), body))
.build();
Response response = this.httpClient.newCall(request).execute();
if (response.code() != 200 || response.body() == null) {
throw new ServerException(response.code(), "system busy");
}
try (Response response = this.httpClient.newCall(request).execute()) {
if (response.code() != 200 || response.body() == null) {
throw new ServerException(response.code(), "system busy");
}

EndpointResp resp = Jsons.DEFAULT.fromJson(response.body().string(), EndpointResp.class);
if (resp.getCode() == OK) {
// do nothing
} else if (resp.getCode() == SYSTEM_BUSY) {
throw new ServerException(resp.getCode(), "system busy");
} else if (resp.getCode() == INTERNAL_ERROR) {
throw new ServerException(resp.getCode(), resp.getMsg());
} else {
throw new ClientException(resp.getCode(), resp.getMsg());
}
EndpointResp resp = Jsons.DEFAULT.fromJson(response.body().string(), EndpointResp.class);
if (resp.getCode() == OK) {
// do nothing
} else if (resp.getCode() == SYSTEM_BUSY) {
throw new ServerException(resp.getCode(), "system busy");
} else if (resp.getCode() == INTERNAL_ERROR) {
throw new ServerException(resp.getCode(), resp.getMsg());
} else {
throw new ClientException(resp.getCode(), resp.getMsg());
}

Endpoint data = resp.getData();
if (data.getClientConfig() != null) {
this.configure(data.getClientConfig());
}
Endpoint data = resp.getData();
if (data.getClientConfig() != null) {
this.configure(data.getClientConfig());
}

return data.getUrl();
return data.getUrl();
}
}

private synchronized void connect() throws IOException {
Expand Down Expand Up @@ -352,7 +353,7 @@ private void configure(ClientConfig conf) {
}

private HttpUrl parseUrl(String url) {
String httpUrl = connUrl.replace("wss://", "https://").replace("ws://", "https://");
String httpUrl = url.replace("wss://", "https://").replace("ws://", "https://");
HttpUrl u = HttpUrl.parse(httpUrl);
if (u == null) {
throw new ServerException(500, "connect url is invalid");
Expand Down
Loading