forgetest5
/
ifffff
mirror of https://gitee.com/maxjhandsome/pig
1
0
Fork 0
Code Issues Releases Wiki Activity

🔖 🔖 🔖 v3.2.0 support spring boot 2.5 

🔖 🔖 🔖 v3.2.0 support spring boot 2.5

🔖 🔖 🔖 v3.2.0 support spring boot 2.5
This commit is contained in:
lbw 2021-05-21 12:16:02 +08:00
parent 7db288afc1
commit 676744000c
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -98,7 +98,7 @@ mvn archetype:generate \
-Dpackage=com.pig4cloud.pig.demo \ -Dpackage=com.pig4cloud.pig.demo \
-DarchetypeGroupId=com.pig4cloud.archetype \ -DarchetypeGroupId=com.pig4cloud.archetype \
-DarchetypeArtifactId=pig-gen \ -DarchetypeArtifactId=pig-gen \
-DarchetypeVersion=3.1.4 \ -DarchetypeVersion=3.2.0 \
-DarchetypeCatalog=local -DarchetypeCatalog=local
``` ```

3
pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java
View File

@ -47,7 +47,6 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -195,7 +194,7 @@ public class PigTokenEndpoint {
try { try {
cursor.close(); cursor.close();
} }
catch (IOException e) { catch (Exception e) {
log.error("关闭cursor 失败"); log.error("关闭cursor 失败");
} }
return result; return result;

2
pig-common/pig-common-job/src/main/java/com/pig4cloud/pig/common/job/XxlJobAutoConfiguration.java
View File

@ -32,7 +32,7 @@ public class XxlJobAutoConfiguration {
/** /**
* 配置xxl-job 执行器，提供自动发现 xxl-job-admin 能力 * 配置xxl-job 执行器，提供自动发现 xxl-job-admin 能力
* @param xxlJobProperties xxl 配置 * @param xxlJobProperties xxl 配置
* @param environment 环境变量 * @param environment 环境变量
* @param discoveryClient 注册发现客户端 * @param discoveryClient 注册发现客户端
* @return * @return
*/ */