Skip to content

Commit 47f4c98

Browse files
authored
Merge pull request #21 from diaozxin007/master
fix bug
2 parents 1e0babc + f9f1568 commit 47f4c98

File tree

3 files changed

+27
-29
lines changed

3 files changed

+27
-29
lines changed

pom.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -186,30 +186,30 @@
186186
</dependencies>
187187
</dependencyManagement>
188188

189-
<build>
190-
<plugins>
191-
<plugin>
192-
<groupId>org.apache.maven.plugins</groupId>
193-
<artifactId>maven-gpg-plugin</artifactId>
194-
<version>1.6</version>
195-
<executions>
196-
<execution>
197-
<id>sign-artifacts</id>
198-
<phase>verify</phase>
199-
<goals>
200-
<goal>sign</goal>
201-
</goals>
202-
<configuration>
203-
<gpgArguments>
204-
<arg>--pinentry-mode</arg>
205-
<arg>loopback</arg>
206-
</gpgArguments>
207-
</configuration>
208-
</execution>
209-
</executions>
210-
</plugin>
211-
</plugins>
212-
</build>
189+
<!-- <build>-->
190+
<!-- <plugins>-->
191+
<!-- <plugin>-->
192+
<!-- <groupId>org.apache.maven.plugins</groupId>-->
193+
<!-- <artifactId>maven-gpg-plugin</artifactId>-->
194+
<!-- <version>1.6</version>-->
195+
<!-- <executions>-->
196+
<!-- <execution>-->
197+
<!-- <id>sign-artifacts</id>-->
198+
<!-- <phase>verify</phase>-->
199+
<!-- <goals>-->
200+
<!-- <goal>sign</goal>-->
201+
<!-- </goals>-->
202+
<!-- <configuration>-->
203+
<!-- <gpgArguments>-->
204+
<!-- <arg>&#45;&#45;pinentry-mode</arg>-->
205+
<!-- <arg>loopback</arg>-->
206+
<!-- </gpgArguments>-->
207+
<!-- </configuration>-->
208+
<!-- </execution>-->
209+
<!-- </executions>-->
210+
<!-- </plugin>-->
211+
<!-- </plugins>-->
212+
<!-- </build>-->
213213

214214

215215
<contributors>

wechaty-puppet-hostie/src/main/kotlin/io/github/wechaty/grpc/GrpcPuppet.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class GrpcPuppet(puppetOptions: PuppetOptions) : Puppet(puppetOptions) {
149149

150150
}
151151

152-
if (StringUtils.isEmpty(endPoint) || StringUtils.equals(discoverHostieIp.first, "0.0.0.0")) {
152+
if (StringUtils.isEmpty(discoverHostieIp.first) || StringUtils.equals(discoverHostieIp.first, "0.0.0.0")) {
153153
log.error("cannot get ip by token, check token")
154154
throw Exception("cannot get ip by token, check token")
155155
}

wechaty/pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@
8989
<groupId>net.sourceforge.htmlcleaner</groupId>
9090
<artifactId>htmlcleaner</artifactId>
9191
</dependency>
92-
93-
9492
</dependencies>
9593

9694
<build>
@@ -184,7 +182,7 @@
184182
<plugin>
185183
<groupId>org.apache.maven.plugins</groupId>
186184
<artifactId>maven-assembly-plugin</artifactId>
187-
<version>3.1.1</version>
185+
<version>3.3.0</version>
188186
<executions>
189187
<execution>
190188
<id>make-assembly</id>
@@ -195,7 +193,7 @@
195193
<configuration>
196194
<archive>
197195
<manifest>
198-
<mainClass>io.github.wechaty.example.Main</mainClass>
196+
<mainClass>io.github.wechaty.examples.Main</mainClass>
199197
</manifest>
200198
</archive>
201199
<descriptorRefs>

0 commit comments

Comments
 (0)