Merge pull request #6 from Talexs/develop

Develop

Author: TalexDreamSoul

pom.xml

@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
-            <version>2.6.4</version>
+            <version>2.6.7</version>
         </dependency>
         <!--        <dependency>-->
         <!--            <groupId>org.springframework.boot</groupId>-->
@@ -71,12 +71,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.6.4</version>
+            <version>2.6.7</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
-            <version>2.6.4</version>
+            <version>2.6.7</version>
         </dependency>
         <!--        <dependency>-->
         <!--            <groupId>org.mybatis.spring.boot</groupId>-->
@@ -86,12 +86,12 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-config-server</artifactId>
-            <version>3.1.1</version>
+            <version>3.1.2</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-config</artifactId>
-            <version>3.1.1</version>
+            <version>3.1.2</version>
         </dependency>
         <!--        <dependency>-->
         <!--            <groupId>org.thymeleaf.extras</groupId>-->
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
-            <version>2.6.4</version>
+            <version>2.6.7</version>
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
@@ -113,18 +113,19 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
-            <version>2.6.4</version>
+            <version>2.6.7</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>2.6.4</version>
+            <version>2.6.7</version>
             <scope>test</scope>
         </dependency>
         <!--        <dependency>-->
@@ -156,13 +157,13 @@
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-boot-starter</artifactId>
-            <version>1.29.1.trial</version>
+            <version>1.30.0</version>
         </dependency>
         <!-- Sa-Token 整合 Redis （使用jackson序列化方式） -->
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-dao-redis-jackson</artifactId>
-            <version>1.29.1.trial</version>
+            <version>1.30.0</version>
         </dependency>
         <!-- 提供Redis连接池 -->
         <dependency>
@@ -172,7 +173,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.0.1-jre</version>
+            <version>31.1-jre</version>
         </dependency>
         <dependency>
             <groupId>net.minecrell</groupId>
@@ -183,7 +184,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.7.22</version>
+            <version>5.8.0</version>
         </dependency>
         <!--        <dependency>-->
         <!--            <groupId>org.springframework.boot</groupId>-->
@@ -211,7 +212,7 @@
         <dependency>
             <groupId>com.freewayso</groupId>
             <artifactId>image-combiner</artifactId>
-            <version>2.3.2</version>
+            <version>2.3.3</version>
         </dependency>
         <!--        <dependency>-->
         <!--            <groupId>com.alibaba</groupId>-->
@@ -228,18 +229,24 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
-            <version>1.2.8</version>
+            <version>1.2.9</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>13.0</version>
+            <version>23.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>3.12.0</version>
         </dependency>
+        <!-- maven 导入 -->
+        <dependency>
+            <groupId>cloud.tianai.captcha</groupId>
+            <artifactId>tianai-captcha</artifactId>
+            <version>1.3.1</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

src/main/java/com/talexframe/frame/core/modules/application/TApp.java

@@ -28,11 +28,13 @@ public TApp(String provider) {
 
         this.repo = this.getRepo();
 
-        if ( this.repo == null ) {
+        // 不强制要求 Repository
 
-            throw new RuntimeException("无法找到 Repo");
+        // if ( this.repo == null ) {
 
-        }
+            // throw new RuntimeException("无法找到 Repo");
+
+        // }
 
     }
 

src/main/java/com/talexframe/frame/core/modules/event/service/TalexEventBus.java

@@ -218,7 +218,11 @@ private void event(TalexEvent event, MethodManager methodManager) {
 
                 List<MethodManager> methodsList = mapCaches.get(listener);
 
-                methodsList.remove(methodManager);
+                if( methodsList != null ) {
+
+                    methodsList.remove(methodManager);
+
+                }
 
                 mapCaches.put(listener, methodsList);
 

src/main/java/com/talexframe/frame/core/modules/handler/RestExceptionHandler.java

@@ -1,7 +1,7 @@
 package com.talexframe.frame.core.modules.handler;
 
 import com.talexframe.frame.core.pojo.wrapper.ResultData;
-import com.talexframe.frame.exception.FrameException;
+import com.talexframe.frame.core.pojo.exception.FrameException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.HttpRequestMethodNotSupportedException;