From 9607c718abcdbe129a056125f05fa8ee8f191000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=A2=A6=E6=8A=80=E6=9C=AF?= <596392912@qq.com>
Date: Fri, 19 Mar 2021 16:45:47 +0800
Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20=E5=8D=87=E7=BA=A7=20jfinal-weix?=
 =?UTF-8?q?in=20=E5=88=B0=203.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mica-weixin/build.gradle                               | 10 +++++-----
 mica-weixin/gradle.properties                          |  2 +-
 .../weixin/config/DreamWeixinAutoConfiguration.java    |  3 ++-
 .../java/net/dreamlu/weixin/spring/MsgController.java  |  6 ------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/mica-weixin/build.gradle b/mica-weixin/build.gradle
index 1a05e4e..de01f21 100644
--- a/mica-weixin/build.gradle
+++ b/mica-weixin/build.gradle
@@ -3,12 +3,12 @@ version = VERSION
 
 ext {
     javaVersion = JavaVersion.VERSION_1_8
-    springBootVersion = "2.3.4.RELEASE"
-    jfinalVersion = "4.9.05"
-    jfinalWeixinVersion = "2.9"
+    springBootVersion = "2.4.4"
+    jfinalVersion = "4.9.08"
+    jfinalWeixinVersion = "3.0"
     okhttpVersion = "3.14.9"
-    micaAutoVersion = "1.2.5"
-    lombokVersion = "1.18.12"
+    micaAutoVersion = "2.0.3"
+    lombokVersion = "1.18.18"
 }
 
 allprojects {
diff --git a/mica-weixin/gradle.properties b/mica-weixin/gradle.properties
index f059a48..f797009 100644
--- a/mica-weixin/gradle.properties
+++ b/mica-weixin/gradle.properties
@@ -1,4 +1,4 @@
-VERSION=2.0.5
+VERSION=2.0.6
 GROUPID=net.dreamlu
 
 userName=chunmeng
diff --git a/mica-weixin/src/main/java/net/dreamlu/weixin/config/DreamWeixinAutoConfiguration.java b/mica-weixin/src/main/java/net/dreamlu/weixin/config/DreamWeixinAutoConfiguration.java
index e95c7c8..b5bead8 100644
--- a/mica-weixin/src/main/java/net/dreamlu/weixin/config/DreamWeixinAutoConfiguration.java
+++ b/mica-weixin/src/main/java/net/dreamlu/weixin/config/DreamWeixinAutoConfiguration.java
@@ -24,7 +24,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 public class DreamWeixinAutoConfiguration {
 
 	@Bean
-	public SpringAccessTokenCache springAccessTokenCache(CacheManager cacheManager, DreamWeixinProperties properties) {
+	public SpringAccessTokenCache springAccessTokenCache(CacheManager cacheManager,
+														 DreamWeixinProperties properties) {
 		Cache cache = cacheManager.getCache(properties.getAccessTokenCache());
 		return new SpringAccessTokenCache(cache);
 	}
diff --git a/mica-weixin/src/main/java/net/dreamlu/weixin/spring/MsgController.java b/mica-weixin/src/main/java/net/dreamlu/weixin/spring/MsgController.java
index 40f2b79..6326587 100644
--- a/mica-weixin/src/main/java/net/dreamlu/weixin/spring/MsgController.java
+++ b/mica-weixin/src/main/java/net/dreamlu/weixin/spring/MsgController.java
@@ -128,12 +128,6 @@ public abstract class MsgController {
 			processInEqubindEvent((InEqubindEvent) msg);
 		else if (msg instanceof InEquDataMsg)
 			processInEquDataMsg((InEquDataMsg) msg);
-			//===================微信智能硬件========================//
-		else if (msg instanceof InEqubindEvent)
-			processInEqubindEvent((InEqubindEvent) msg);
-		else if (msg instanceof InEquDataMsg)
-			processInEquDataMsg((InEquDataMsg) msg);
-			//===================微信智能硬件========================//
 		else if (msg instanceof InNotDefinedEvent) {
 			logger.error("未能识别的事件类型。 消息 xml 内容为：\n" + imXmlMsg);
 			processIsNotDefinedEvent((InNotDefinedEvent) msg);
-- 
GitLab