Merge remote-tracking branch 'origin/master'

Author: LuSingTea

README.md

@@ -1,9 +1,9 @@
 # java-wechaty
 
 ![Java CI with Maven](https://github.com/wechaty/java-wechaty/workflows/Java%20CI%20with%20Maven/badge.svg)
-[![Java Version](https://img.shields.io/maven-central/v/io.github.wechaty/wechaty?label=Java)](https://mvnrepository.com/artifact/io.github.wechaty/wechaty)
+[![Java Version](https://img.shields.io/maven-central/v/io.github.wechaty/wechaty?label=Maven)](https://mvnrepository.com/artifact/io.github.wechaty/wechaty)
 
-![Java Wechaty](https://wechaty.github.io/java-wechaty/images/java-wechaty.png)
+![Java Wechaty](docs/images/java-wechaty.png)
 
 [![Java Wechaty Getting Started](https://img.shields.io/badge/Java%20Wechaty-Getting%20Started-orange)](https://github.com/wechaty/java-wechaty-getting-started)
 [![Wechaty in Kotlin](https://img.shields.io/badge/Wechaty-Kotlin-orange)](https://github.com/wechaty/java-wechaty)
@@ -15,12 +15,6 @@
 
 Wechaty is a RPA SDK for Wechat **Individual** Account that can help you create a chatbot in 6 lines of Java.
 
-## WORK IN PROGRESS
-
-Work in progress...
-
-Please come back after 4 weeks...
-
 ## Voice of the Developers
 
 > "Wechaty is a great solution, I believe there would be much more users recognize it." [link](https://github.com/Wechaty/wechaty/pull/310#issuecomment-285574472)  
@@ -278,6 +272,14 @@ mvn install wechaty
 
 ### master
 
+### v0.4 (Jun 19, 2020)
+
+Java(Kotlin) Wechaty **BETA** Released!
+
+Read more from our Multi-language Wechaty Beta Release event from our blog:
+
+- [Multi Language Wechaty Beta Release Announcement!](https://wechaty.github.io/2020/06/19/multi-language-wechaty-beta-release/)
+
 ### v0.1.4 (June 13 2020)
 1. use `PuppetManager` to manage multi puppet implementations.
 2. add mock puppet.
@@ -343,8 +345,9 @@ We decided to use Kotlin to develop the Java Wechaty!
 ## Committers
 
 - [@redmaple1](https://github.com/redmaple1) Xiaoya Ren
+- [@huan](https://github.com/huan) - Huan LI (李卓桓)
 
-## Author
+## Creator
 
 - [@diaozxin007](https://github.com/diaozxin007) diaozxin@gmail.com
   - Website: [犀利豆的博客](https://xilidou.com/)

VERSION

@@ -1 +1 @@
-0.1.1
+0.4.0

examples/pom.xml

@@ -1,14 +1,20 @@
 <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/maven-v4_0_0.xsd">
 
+
     <parent>
         <groupId>io.github.wechaty</groupId>
         <artifactId>wechaty-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.1.5-SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>wechaty-example</artifactId>
+
+    <name>wechaty/example</name>
+
     <packaging>jar</packaging>
+    <version>1.0.0-SNAPSHOT</version>
 
     <properties>
         <kotlin.version>1.3.72</kotlin.version>
@@ -17,7 +23,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
         <dokka.version>0.10.1</dokka.version>
-        <wechaty.version>0.1.4-SNAPSHOT</wechaty.version>
+        <wechaty.version>0.1.5-SNAPSHOT</wechaty.version>
     </properties>
 
     <dependencies>
@@ -48,7 +54,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.13.1</version>
+            <version>2.13.2</version>
         </dependency>
         <dependency> <!-- 桥接：告诉Slf4j使用Log4j2 -->
             <groupId>org.apache.logging.log4j</groupId>
@@ -72,7 +78,6 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.10</version>
         </dependency>
 
         <dependency>

pom.xml

@@ -5,7 +5,7 @@
     <groupId>io.github.wechaty</groupId>
     <artifactId>wechaty-parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.4-SNAPSHOT</version>
+    <version>0.1.5-SNAPSHOT</version>
     <name>kotlin-wechaty</name>
 
     <description>
@@ -31,6 +31,7 @@
         <module>wechaty-puppet</module>
         <module>wechaty-puppet-hostie</module>
         <module>wechaty-puppet-mock</module>
+<!--        <module>examples</module>-->
     </modules>
 
     <dependencyManagement>
@@ -79,7 +80,7 @@
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-core</artifactId>
-                <version>2.13.1</version>
+                <version>2.13.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>

wechaty-puppet-hostie/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.github.wechaty</groupId>
         <artifactId>wechaty-parent</artifactId>
-        <version>0.1.4-SNAPSHOT</version>
+        <version>0.1.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>wechaty-puppet-hostie</artifactId>

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

@@ -945,7 +945,7 @@ class GrpcPuppet(puppetOptions: PuppetOptions) : Puppet(puppetOptions) {
             log.debug("PuppetHostie $type payload $payload")
 
             if (type != Event.EventType.EVENT_TYPE_HEARTBEAT) {
-                emit(EventEnum.HEART_BEAT, EventHeartbeatPayload("heartbeat"))
+                emit(EventEnum.HEART_BEAT, EventHeartbeatPayload("heartbeat",6000))
             }
 
             when (type) {

wechaty-puppet-mock/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wechaty-parent</artifactId>
         <groupId>io.github.wechaty</groupId>
-        <version>0.1.4-SNAPSHOT</version>
+        <version>0.1.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

wechaty-puppet/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.github.wechaty</groupId>
         <artifactId>wechaty-parent</artifactId>
-        <version>0.1.4-SNAPSHOT</version>
+        <version>0.1.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>wechaty-puppet</artifactId>

wechaty-puppet/src/main/kotlin/io/github/wechaty/schemas/Event.kt

@@ -135,7 +135,8 @@ data class EventResetPayload(
 }
 
 data class EventHeartbeatPayload(
-        var data:String
+        var data:String,
+        var timeout:Long
 ) {
     override fun toString(): String {
         return "EventHeartbeatPayload(data='$data')"

wechaty/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.github.wechaty</groupId>
         <artifactId>wechaty-parent</artifactId>
-        <version>0.1.4-SNAPSHOT</version>
+        <version>0.1.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>wechaty</artifactId>
@@ -27,6 +27,12 @@
             <artifactId>wechaty-puppet-hostie</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.github.wechaty</groupId>
+            <artifactId>wechaty-puppet-hostie</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>io.github.wechaty</groupId>
             <artifactId>wechaty-puppet-mock</artifactId>