From e84aa9c2045fc5fd9d6c55b54ee42f149654f045 Mon Sep 17 00:00:00 2001
From: Zhengxin <diaozxin@163.com>
Date: Wed, 22 Jul 2020 22:40:06 +0800
Subject: [PATCH 1/3] add log4j

---
 examples/pom.xml                       |  5 ++++-
 examples/src/main/resources/log4j2.xml | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 examples/src/main/resources/log4j2.xml

diff --git a/examples/pom.xml b/examples/pom.xml
index f550c80..1993f24 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -43,17 +43,20 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
             <version>2.13.2</version>
+            <scope>compile</scope>
         </dependency>
         <dependency> <!-- 桥接：告诉Slf4j使用Log4j2 -->
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
             <version>2.13.1</version>
+            <scope>compile</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.lmax/disruptor -->
         <dependency>
             <groupId>com.lmax</groupId>
             <artifactId>disruptor</artifactId>
             <version>3.4.2</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
@@ -155,7 +158,7 @@
                         <configuration>
                             <archive>
                                 <manifest>
-                                    <mainClass>io.github.wechaty.example.Main</mainClass>
+                                    <mainClass>io.github.wechaty.example.Main2</mainClass>
                                 </manifest>
                             </archive>
                             <descriptorRefs>
diff --git a/examples/src/main/resources/log4j2.xml b/examples/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..1d4c1dd
--- /dev/null
+++ b/examples/src/main/resources/log4j2.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="INFO">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t]%-5level %logger{36}-[%L]  - %msg%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <AsyncRoot level="INFO" includeLocation="true">
+            <AppenderRef ref="Console"/>
+        </AsyncRoot>
+        <Logger name="io.github.wechaty" level="DEBUG">
+        </Logger>
+    </Loggers>
+</Configuration>

From ac14acf1d2bae3d99957cc87d1a41453a1cf61df Mon Sep 17 00:00:00 2001
From: Zhengxin <diaozxin@163.com>
Date: Fri, 24 Jul 2020 22:17:46 +0800
Subject: [PATCH 2/3] add getType in Friendship.kt

---
 .../main/kotlin/io/github/wechaty/user/Friendship.kt   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/wechaty/src/main/kotlin/io/github/wechaty/user/Friendship.kt b/wechaty/src/main/kotlin/io/github/wechaty/user/Friendship.kt
index 8afcb75..bcda82b 100644
--- a/wechaty/src/main/kotlin/io/github/wechaty/user/Friendship.kt
+++ b/wechaty/src/main/kotlin/io/github/wechaty/user/Friendship.kt
@@ -3,10 +3,8 @@ package io.github.wechaty.user
 import io.github.wechaty.Accessory
 import io.github.wechaty.Wechaty
 import io.github.wechaty.schemas.FriendshipPayload
-import io.github.wechaty.schemas.FriendshipSearchCondition
 import io.github.wechaty.schemas.FriendshipType
 import io.github.wechaty.utils.JsonUtils
-import org.apache.commons.lang3.StringUtils
 import org.slf4j.LoggerFactory
 
 class Friendship (wechaty: Wechaty,val id:String):Accessory(wechaty){
@@ -50,7 +48,7 @@ class Friendship (wechaty: Wechaty,val id:String):Accessory(wechaty){
 
     fun hello():String{
         if(payload==null){
-            throw Exception("ne payload")
+            throw Exception("no payload")
         }
         return this.payload?.hello ?: "";
     }
@@ -61,11 +59,15 @@ class Friendship (wechaty: Wechaty,val id:String):Accessory(wechaty){
 
     fun toJson():String{
         if(payload==null){
-            throw Exception("ne payload")
+            throw Exception("no payload")
         }
         return JsonUtils.write(payload!!);
     }
 
+    fun getType():FriendshipType{
+        return payload?.type ?: throw Exception("no payload")
+    }
+
     companion object{
         private val log = LoggerFactory.getLogger(Friendship::class.java)
     }

From 08ca71f74df386017ded80022c802d28083770c6 Mon Sep 17 00:00:00 2001
From: Zhengxin <diaozxin@163.com>
Date: Fri, 24 Jul 2020 22:22:55 +0800
Subject: [PATCH 3/3] add getType in Friendship.kt

---
 examples/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index 1993f24..02f29dd 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -158,7 +158,7 @@
                         <configuration>
                             <archive>
                                 <manifest>
-                                    <mainClass>io.github.wechaty.example.Main2</mainClass>
+                                    <mainClass>io.github.wechaty.example.Main</mainClass>
                                 </manifest>
                             </archive>
                             <descriptorRefs>